@formatjs/icu-skeleton-parser 1.2.10 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/number.d.ts.map +1 -1
  2. package/lib/number.js +14 -3
  3. package/number.d.ts.map +1 -1
  4. package/number.js +14 -3
  5. package/package.json +2 -2
package/lib/number.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../../../packages/icu-skeleton-parser/number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,4BAA4B,CAAA;AAG9D,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB;IACtE,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,GACf,mBAAmB,EAAE,CA0BvB;AA4HD;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,mBAAmB,EAAE,GAC5B,2BAA2B,CAmL7B"}
1
+ {"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../../../packages/icu-skeleton-parser/number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,4BAA4B,CAAA;AAG9D,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB;IACtE,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,GACf,mBAAmB,EAAE,CA0BvB;AAiID;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,mBAAmB,EAAE,GAC5B,2BAA2B,CAuL7B"}
package/lib/number.js CHANGED
@@ -30,11 +30,17 @@ function icuUnitToEcma(unit) {
30
30
  return unit.replace(/^(.*?)-/, '');
31
31
  }
32
32
  var FRACTION_PRECISION_REGEX = /^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g;
33
- var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?$/g;
33
+ var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?[rs]?$/g;
34
34
  var INTEGER_WIDTH_REGEX = /(\*)(0+)|(#+)(0+)|(0+)/g;
35
35
  var CONCISE_INTEGER_WIDTH_REGEX = /^(0+)$/;
36
36
  function parseSignificantPrecision(str) {
37
37
  var result = {};
38
+ if (str[str.length - 1] === 'r') {
39
+ result.roundingPriority = 'morePrecision';
40
+ }
41
+ else if (str[str.length - 1] === 's') {
42
+ result.roundingPriority = 'lessPrecision';
43
+ }
38
44
  str.replace(SIGNIFICANT_PRECISION_REGEX, function (_, g1, g2) {
39
45
  // @@@ case
40
46
  if (typeof g2 !== 'string') {
@@ -261,8 +267,13 @@ export function parseNumberSkeleton(tokens) {
261
267
  }
262
268
  return '';
263
269
  });
264
- if (token.options.length) {
265
- result = __assign(__assign({}, result), parseSignificantPrecision(token.options[0]));
270
+ var opt = token.options[0];
271
+ // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#trailing-zero-display
272
+ if (opt === 'w') {
273
+ result = __assign(__assign({}, result), { trailingZeroDisplay: 'stripIfInteger' });
274
+ }
275
+ else if (opt) {
276
+ result = __assign(__assign({}, result), parseSignificantPrecision(opt));
266
277
  }
267
278
  continue;
268
279
  }
package/number.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../../packages/icu-skeleton-parser/number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,4BAA4B,CAAA;AAG9D,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB;IACtE,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,GACf,mBAAmB,EAAE,CA0BvB;AA4HD;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,mBAAmB,EAAE,GAC5B,2BAA2B,CAmL7B"}
1
+ {"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../../packages/icu-skeleton-parser/number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,4BAA4B,CAAA;AAG9D,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB;IACtE,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,GACf,mBAAmB,EAAE,CA0BvB;AAiID;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,mBAAmB,EAAE,GAC5B,2BAA2B,CAuL7B"}
package/number.js CHANGED
@@ -34,11 +34,17 @@ function icuUnitToEcma(unit) {
34
34
  return unit.replace(/^(.*?)-/, '');
35
35
  }
36
36
  var FRACTION_PRECISION_REGEX = /^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g;
37
- var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?$/g;
37
+ var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?[rs]?$/g;
38
38
  var INTEGER_WIDTH_REGEX = /(\*)(0+)|(#+)(0+)|(0+)/g;
39
39
  var CONCISE_INTEGER_WIDTH_REGEX = /^(0+)$/;
40
40
  function parseSignificantPrecision(str) {
41
41
  var result = {};
42
+ if (str[str.length - 1] === 'r') {
43
+ result.roundingPriority = 'morePrecision';
44
+ }
45
+ else if (str[str.length - 1] === 's') {
46
+ result.roundingPriority = 'lessPrecision';
47
+ }
42
48
  str.replace(SIGNIFICANT_PRECISION_REGEX, function (_, g1, g2) {
43
49
  // @@@ case
44
50
  if (typeof g2 !== 'string') {
@@ -265,8 +271,13 @@ function parseNumberSkeleton(tokens) {
265
271
  }
266
272
  return '';
267
273
  });
268
- if (token.options.length) {
269
- result = tslib_1.__assign(tslib_1.__assign({}, result), parseSignificantPrecision(token.options[0]));
274
+ var opt = token.options[0];
275
+ // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#trailing-zero-display
276
+ if (opt === 'w') {
277
+ result = tslib_1.__assign(tslib_1.__assign({}, result), { trailingZeroDisplay: 'stripIfInteger' });
278
+ }
279
+ else if (opt) {
280
+ result = tslib_1.__assign(tslib_1.__assign({}, result), parseSignificantPrecision(opt));
270
281
  }
271
282
  continue;
272
283
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@formatjs/icu-skeleton-parser",
3
- "version": "1.2.10",
3
+ "version": "1.3.0",
4
4
  "main": "index.js",
5
5
  "module": "lib/index.js",
6
6
  "types": "index.d.ts",
7
7
  "license": "MIT",
8
8
  "dependencies": {
9
- "@formatjs/ecma402-abstract": "1.9.6",
9
+ "@formatjs/ecma402-abstract": "1.10.0",
10
10
  "tslib": "^2.1.0"
11
11
  }
12
12
  }