Skip to content
This repository was archived by the owner on May 4, 2020. It is now read-only.

Commit e6a32d6

Browse files
stephencweisspyrocat101
authored andcommitted
feat(@formatjs/intl-utils): Add intl-unified-numberformat option types
chore(@formatjs/intl-unified-numberformat): use more types from @formatjs/intl-utils
1 parent b84ddc2 commit e6a32d6

File tree

2 files changed

+41
-8
lines changed

2 files changed

+41
-8
lines changed

packages/intl-unified-numberformat/src/core.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ import {
2727
NumberLocaleInternalData,
2828
SignPattern,
2929
partitionPattern,
30+
UnifiedNumberFormatOptionsLocaleMatcher,
31+
UnifiedNumberFormatOptionsStyle,
32+
UnifiedNumberFormatOptionsCompactDisplay,
33+
UnifiedNumberFormatOptionsCurrencyDisplay,
34+
UnifiedNumberFormatOptionsCurrencySign,
35+
UnifiedNumberFormatOptionsNotation,
36+
UnifiedNumberFormatOptionsSignDisplay,
37+
UnifiedNumberFormatOptionsUnitDisplay,
3038
isWellFormedCurrencyCode,
3139
} from '@formatjs/intl-utils';
3240
import {
@@ -123,15 +131,15 @@ function removeUnicodeExtensionFromLocale(canonicalLocale: string): string {
123131

124132
export type UnifiedNumberFormatOptions = Intl.NumberFormatOptions &
125133
NumberFormatDigitOptions & {
126-
localeMatcher?: 'lookup' | 'best fit';
127-
style?: 'decimal' | 'percent' | 'currency' | 'unit';
128-
compactDisplay?: 'short' | 'long';
129-
currencyDisplay?: 'symbol' | 'code' | 'name' | 'narrowSymbol';
130-
currencySign?: 'standard' | 'accounting';
131-
notation?: 'standard' | 'scientific' | 'engineering' | 'compact';
132-
signDisplay?: 'auto' | 'always' | 'never' | 'exceptZero';
134+
localeMatcher?: UnifiedNumberFormatOptionsLocaleMatcher;
135+
style?: UnifiedNumberFormatOptionsStyle;
136+
compactDisplay?: UnifiedNumberFormatOptionsCompactDisplay;
137+
currencyDisplay?: UnifiedNumberFormatOptionsCurrencyDisplay;
138+
currencySign?: UnifiedNumberFormatOptionsCurrencySign;
139+
notation?: UnifiedNumberFormatOptionsNotation;
140+
signDisplay?: UnifiedNumberFormatOptionsSignDisplay;
133141
unit?: Unit;
134-
unitDisplay?: 'long' | 'short' | 'narrow';
142+
unitDisplay?: UnifiedNumberFormatOptionsUnitDisplay;
135143
};
136144

137145
export type ResolvedUnifiedNumberFormatOptions = Intl.ResolvedNumberFormatOptions &

packages/intl-utils/src/unified-numberformat-types.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,28 @@ import {LocaleData} from './types';
22
import {NumberInternalSlots} from './number-types';
33

44
export type UnifiedNumberFormatLocaleData = LocaleData<NumberInternalSlots>;
5+
6+
export type UnifiedNumberFormatOptionsLocaleMatcher = 'lookup' | 'best fit';
7+
export type UnifiedNumberFormatOptionsStyle =
8+
| 'decimal'
9+
| 'percent'
10+
| 'currency'
11+
| 'unit';
12+
export type UnifiedNumberFormatOptionsCompactDisplay = 'short' | 'long';
13+
export type UnifiedNumberFormatOptionsCurrencyDisplay =
14+
| 'symbol'
15+
| 'code'
16+
| 'name'
17+
| 'narrowSymbol';
18+
export type UnifiedNumberFormatOptionsCurrencySign = 'standard' | 'accounting';
19+
export type UnifiedNumberFormatOptionsNotation =
20+
| 'standard'
21+
| 'scientific'
22+
| 'engineering'
23+
| 'compact';
24+
export type UnifiedNumberFormatOptionsSignDisplay =
25+
| 'auto'
26+
| 'always'
27+
| 'never'
28+
| 'exceptZero';
29+
export type UnifiedNumberFormatOptionsUnitDisplay = 'long' | 'short' | 'narrow';

0 commit comments

Comments
 (0)