Skip to content

Commit cf04d7d

Browse files
committed
Number and Currency format to parts support
1 parent 12ca00d commit cf04d7d

File tree

4 files changed

+25
-39
lines changed

4 files changed

+25
-39
lines changed

lib/compile.js

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var COMPILED_ORDER, DEPENDENCIES, DEPENDENCIES_VARS, dataCache, fnPlaceholder, f
66
COMPILED_ORDER = [
77

88
// No dependencies.
9+
"numberToPartsFormatter",
910
"numberFormatter",
1011
"numberParser",
1112
"pluralGenerator",
@@ -14,6 +15,7 @@ COMPILED_ORDER = [
1415
"messageFormatter",
1516

1617
// Depends on number and/or plural.
18+
"currencyToPartsFormatter",
1719
"currencyFormatter",
1820
"dateToPartsFormatter",
1921
"dateFormatter",
@@ -37,62 +39,42 @@ DEPENDENCIES = {
3739

3840
DEPENDENCIES_VARS = {
3941
currencyFormatter: {
40-
currencyFormatterFn: true,
41-
currencyNameFormat: true,
42-
validateParameterPresence: true,
43-
validateParameterTypeNumber: true
42+
currencyFormatterFn: true
43+
},
44+
currencyToPartsFormatter: {
45+
currencyToPartsFormatterFn: true
4446
},
4547
dateFormatter: {
46-
dateFormatterFn: true,
47-
dateFormat: true,
48-
validateParameterPresence: true,
49-
validateParameterTypeDate: true
48+
dateFormatterFn: true
5049
},
5150
dateToPartsFormatter: {
52-
dateToPartsFormatterFn: true,
53-
dateToPartsFormat: true,
54-
validateParameterPresence: true,
55-
validateParameterTypeDate: true
51+
dateToPartsFormatterFn: true
5652
},
5753
dateParser: {
58-
dateParserFn: true,
59-
dateParse: true,
60-
dateTokenizer: true,
61-
validateParameterPresence: true,
62-
validateParameterTypeString: true
54+
dateParserFn: true
6355
},
6456
messageFormatter: {
65-
messageFormatterFn: true,
66-
messageFormat: true,
67-
validateParameterTypeMessageVariables: true
57+
messageFormatterFn: true
6858
},
6959
numberFormatter: {
7060
numberFormatterFn: true,
71-
numberFormat: true,
72-
numberRound: true,
73-
validateParameterPresence: true,
74-
validateParameterTypeNumber: true
61+
numberRound: true
62+
},
63+
numberToPartsFormatter: {
64+
numberToPartsFormatterFn: true,
65+
numberRound: true
7566
},
7667
numberParser: {
77-
numberParserFn: true,
78-
numberParse: true,
79-
validateParameterPresence: true,
80-
validateParameterTypeString: true
68+
numberParserFn: true
8169
},
8270
pluralGenerator: {
83-
pluralGeneratorFn: true,
84-
validateParameterPresence: true,
85-
validateParameterTypeNumber: true
71+
pluralGeneratorFn: true
8672
},
8773
relativeTimeFormatter: {
88-
relativeTimeFormatterFn: true,
89-
validateParameterPresence: true,
90-
validateParameterTypeNumber: true
74+
relativeTimeFormatterFn: true
9175
},
9276
unitFormatter: {
93-
unitFormatterFn: true,
94-
validateParameterPresence: true,
95-
validateParameterTypeNumber: true
77+
unitFormatterFn: true
9678
}
9779
};
9880

lib/extract-visitors/global-various-formatters-and-parsers-aliases.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ var Syntax = esprima.Syntax;
55

66
var map = {
77
formatCurrency: "currencyFormatter",
8+
formatCurrencyToParts: "currencyToPartsFormatter",
89
formatDate: "dateFormatter",
910
formatDateToParts: "dateToPartsFormatter",
1011
formatNumber: "numberFormatter",
12+
formatNumberToParts: "numberToPartsFormatter",
1113
formatRelativeTime: "relativeTimeFormatter",
1214
formatUnit: "unitFormatter",
1315
parseNumber: "numberParser",

lib/extract-visitors/global-various-formatters-and-parsers.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ module.exports = {
1111
node.callee.object.name === "Globalize" &&
1212
node.callee.property.type === Syntax.Identifier && (
1313
node.callee.property.name === "currencyFormatter" ||
14+
node.callee.property.name === "currencyToPartsFormatter" ||
1415
node.callee.property.name === "dateFormatter" ||
1516
node.callee.property.name === "dateParser" ||
1617
node.callee.property.name === "dateToPartsFormatter" ||
1718
node.callee.property.name === "numberFormatter" ||
1819
node.callee.property.name === "numberParser" ||
20+
node.callee.property.name === "numberToPartsFormatter" ||
1921
node.callee.property.name === "pluralGenerator" ||
2022
node.callee.property.name === "relativeTimeFormatter" ||
2123
node.callee.property.name === "unitFormatter"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"peerDependencies": {
4141
"cldr-data": ">=25",
42-
"globalize": "^1.3.0",
42+
"globalize": "^1.5.0",
4343
"iana-tz-data": ">=2017.0.0"
4444
},
4545
"devDependencies": {
@@ -48,7 +48,7 @@
4848
"cldr-data": ">=25",
4949
"eslint": "^6.6.0",
5050
"eslint-config-defaults": "^9.0.0",
51-
"globalize": "^1.3.0",
51+
"globalize": "^1.5.0",
5252
"iana-tz-data": ">=2017.0.0",
5353
"jshint": "2.6.x",
5454
"mocha": "2.1.0"

0 commit comments

Comments
 (0)