@formatjs/intl-getcanonicallocales 1.7.3 → 1.8.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.
- package/index.js +4 -4
- package/lib/src/canonicalizer.js +1 -1
- package/lib/src/emitter.js +3 -3
- package/package.json +1 -1
- package/polyfill.iife.js +9 -9
- package/polyfill.js +1 -1
- package/src/canonicalizer.js +13 -13
- package/src/emitter.js +3 -3
- package/src/parser.js +1 -1
package/index.js
CHANGED
|
@@ -19,7 +19,7 @@ function CanonicalizeLocaleList(locales) {
|
|
|
19
19
|
}
|
|
20
20
|
for (var _i = 0, locales_1 = locales; _i < locales_1.length; _i++) {
|
|
21
21
|
var locale = locales_1[_i];
|
|
22
|
-
var canonicalizedTag = emitter_1.emitUnicodeLocaleId(canonicalizer_1.canonicalizeUnicodeLocaleId(parser_1.parseUnicodeLocaleId(locale)));
|
|
22
|
+
var canonicalizedTag = (0, emitter_1.emitUnicodeLocaleId)((0, canonicalizer_1.canonicalizeUnicodeLocaleId)((0, parser_1.parseUnicodeLocaleId)(locale)));
|
|
23
23
|
if (seen.indexOf(canonicalizedTag) < 0) {
|
|
24
24
|
seen.push(canonicalizedTag);
|
|
25
25
|
}
|
|
@@ -37,6 +37,6 @@ Object.defineProperty(exports, "isStructurallyValidLanguageTag", { enumerable: t
|
|
|
37
37
|
Object.defineProperty(exports, "isUnicodeRegionSubtag", { enumerable: true, get: function () { return parser_2.isUnicodeRegionSubtag; } });
|
|
38
38
|
Object.defineProperty(exports, "isUnicodeScriptSubtag", { enumerable: true, get: function () { return parser_2.isUnicodeScriptSubtag; } });
|
|
39
39
|
Object.defineProperty(exports, "isUnicodeLanguageSubtag", { enumerable: true, get: function () { return parser_2.isUnicodeLanguageSubtag; } });
|
|
40
|
-
tslib_1.__exportStar(require("./src/types"), exports);
|
|
41
|
-
tslib_1.__exportStar(require("./src/emitter"), exports);
|
|
42
|
-
tslib_1.__exportStar(require("./src/likelySubtags.generated"), exports);
|
|
40
|
+
(0, tslib_1.__exportStar)(require("./src/types"), exports);
|
|
41
|
+
(0, tslib_1.__exportStar)(require("./src/emitter"), exports);
|
|
42
|
+
(0, tslib_1.__exportStar)(require("./src/likelySubtags.generated"), exports);
|
package/lib/src/canonicalizer.js
CHANGED
|
@@ -34,7 +34,7 @@ function compareExtension(e1, e2) {
|
|
|
34
34
|
return e1.type < e2.type ? -1 : e1.type > e2.type ? 1 : 0;
|
|
35
35
|
}
|
|
36
36
|
function mergeVariants(v1, v2) {
|
|
37
|
-
var result = __spreadArray([], v1);
|
|
37
|
+
var result = __spreadArray([], v1, true);
|
|
38
38
|
for (var _i = 0, v2_1 = v2; _i < v2_1.length; _i++) {
|
|
39
39
|
var v = v2_1[_i];
|
|
40
40
|
if (v1.indexOf(v) < 0) {
|
package/lib/src/emitter.js
CHANGED
|
@@ -3,7 +3,7 @@ export function emitUnicodeLanguageId(lang) {
|
|
|
3
3
|
if (!lang) {
|
|
4
4
|
return '';
|
|
5
5
|
}
|
|
6
|
-
return __spreadArray([lang.lang, lang.script, lang.region], (lang.variants || [])).filter(Boolean)
|
|
6
|
+
return __spreadArray([lang.lang, lang.script, lang.region], (lang.variants || []), true).filter(Boolean)
|
|
7
7
|
.join('-');
|
|
8
8
|
}
|
|
9
9
|
export function emitUnicodeLocaleId(_a) {
|
|
@@ -14,10 +14,10 @@ export function emitUnicodeLocaleId(_a) {
|
|
|
14
14
|
chunks.push(ext.type);
|
|
15
15
|
switch (ext.type) {
|
|
16
16
|
case 'u':
|
|
17
|
-
chunks.push.apply(chunks, __spreadArray(__spreadArray([], ext.attributes), ext.keywords.reduce(function (all, kv) { return all.concat(kv); }, [])));
|
|
17
|
+
chunks.push.apply(chunks, __spreadArray(__spreadArray([], ext.attributes, false), ext.keywords.reduce(function (all, kv) { return all.concat(kv); }, []), false));
|
|
18
18
|
break;
|
|
19
19
|
case 't':
|
|
20
|
-
chunks.push.apply(chunks, __spreadArray([emitUnicodeLanguageId(ext.lang)], ext.fields.reduce(function (all, kv) { return all.concat(kv); }, [])));
|
|
20
|
+
chunks.push.apply(chunks, __spreadArray([emitUnicodeLanguageId(ext.lang)], ext.fields.reduce(function (all, kv) { return all.concat(kv); }, []), false));
|
|
21
21
|
break;
|
|
22
22
|
default:
|
|
23
23
|
chunks.push(ext.value);
|
package/package.json
CHANGED
package/polyfill.iife.js
CHANGED
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
throw new RangeError("Missing unicode_language_subtag");
|
|
59
59
|
}
|
|
60
60
|
if (lang === "root") {
|
|
61
|
-
return {lang: "root", variants: []};
|
|
61
|
+
return { lang: "root", variants: [] };
|
|
62
62
|
}
|
|
63
63
|
if (!isUnicodeLanguageSubtag(lang)) {
|
|
64
64
|
throw new RangeError("Malformed unicode_language_subtag");
|
|
@@ -183,7 +183,7 @@
|
|
|
183
183
|
}
|
|
184
184
|
function parseExtensions(chunks) {
|
|
185
185
|
if (!chunks.length) {
|
|
186
|
-
return {extensions: []};
|
|
186
|
+
return { extensions: [] };
|
|
187
187
|
}
|
|
188
188
|
var extensions = [];
|
|
189
189
|
var unicodeExtension;
|
|
@@ -233,12 +233,12 @@
|
|
|
233
233
|
break;
|
|
234
234
|
}
|
|
235
235
|
} while (chunks.length);
|
|
236
|
-
return {extensions: extensions};
|
|
236
|
+
return { extensions: extensions };
|
|
237
237
|
}
|
|
238
238
|
function parseUnicodeLocaleId(locale) {
|
|
239
239
|
var chunks = locale.split(SEPARATOR);
|
|
240
240
|
var lang = parseUnicodeLanguageId(chunks);
|
|
241
|
-
return __assign({lang: lang}, parseExtensions(chunks));
|
|
241
|
+
return __assign({ lang: lang }, parseExtensions(chunks));
|
|
242
242
|
}
|
|
243
243
|
|
|
244
244
|
// bazel-out/darwin-fastbuild/bin/packages/intl-getcanonicallocales/lib/src/emitter.js
|
|
@@ -246,7 +246,7 @@
|
|
|
246
246
|
if (!lang) {
|
|
247
247
|
return "";
|
|
248
248
|
}
|
|
249
|
-
return __spreadArray([lang.lang, lang.script, lang.region], lang.variants || []).filter(Boolean).join("-");
|
|
249
|
+
return __spreadArray([lang.lang, lang.script, lang.region], lang.variants || [], true).filter(Boolean).join("-");
|
|
250
250
|
}
|
|
251
251
|
function emitUnicodeLocaleId(_a) {
|
|
252
252
|
var lang = _a.lang, extensions = _a.extensions;
|
|
@@ -256,14 +256,14 @@
|
|
|
256
256
|
chunks.push(ext.type);
|
|
257
257
|
switch (ext.type) {
|
|
258
258
|
case "u":
|
|
259
|
-
chunks.push.apply(chunks, __spreadArray(__spreadArray([], ext.attributes), ext.keywords.reduce(function(all, kv) {
|
|
259
|
+
chunks.push.apply(chunks, __spreadArray(__spreadArray([], ext.attributes, false), ext.keywords.reduce(function(all, kv) {
|
|
260
260
|
return all.concat(kv);
|
|
261
|
-
}, [])));
|
|
261
|
+
}, []), false));
|
|
262
262
|
break;
|
|
263
263
|
case "t":
|
|
264
264
|
chunks.push.apply(chunks, __spreadArray([emitUnicodeLanguageId(ext.lang)], ext.fields.reduce(function(all, kv) {
|
|
265
265
|
return all.concat(kv);
|
|
266
|
-
}, [])));
|
|
266
|
+
}, []), false));
|
|
267
267
|
break;
|
|
268
268
|
default:
|
|
269
269
|
chunks.push(ext.value);
|
|
@@ -3298,7 +3298,7 @@
|
|
|
3298
3298
|
return e1.type < e2.type ? -1 : e1.type > e2.type ? 1 : 0;
|
|
3299
3299
|
}
|
|
3300
3300
|
function mergeVariants(v1, v2) {
|
|
3301
|
-
var result = __spreadArray([], v1);
|
|
3301
|
+
var result = __spreadArray([], v1, true);
|
|
3302
3302
|
for (var _i = 0, v2_1 = v2; _i < v2_1.length; _i++) {
|
|
3303
3303
|
var v = v2_1[_i];
|
|
3304
3304
|
if (v1.indexOf(v) < 0) {
|
package/polyfill.js
CHANGED
package/src/canonicalizer.js
CHANGED
|
@@ -37,7 +37,7 @@ function compareExtension(e1, e2) {
|
|
|
37
37
|
return e1.type < e2.type ? -1 : e1.type > e2.type ? 1 : 0;
|
|
38
38
|
}
|
|
39
39
|
function mergeVariants(v1, v2) {
|
|
40
|
-
var result = tslib_1.__spreadArray([], v1);
|
|
40
|
+
var result = (0, tslib_1.__spreadArray)([], v1, true);
|
|
41
41
|
for (var _i = 0, v2_1 = v2; _i < v2_1.length; _i++) {
|
|
42
42
|
var v = v2_1[_i];
|
|
43
43
|
if (v1.indexOf(v) < 0) {
|
|
@@ -69,11 +69,11 @@ function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
|
|
|
69
69
|
for (var _i = 0, _a = unicodeLanguageId.variants; _i < _a.length; _i++) {
|
|
70
70
|
var variant = _a[_i];
|
|
71
71
|
if ((replacedLang_1 =
|
|
72
|
-
aliases_generated_1.languageAlias[emitter_1.emitUnicodeLanguageId({
|
|
72
|
+
aliases_generated_1.languageAlias[(0, emitter_1.emitUnicodeLanguageId)({
|
|
73
73
|
lang: unicodeLanguageId.lang,
|
|
74
74
|
variants: [variant],
|
|
75
75
|
})])) {
|
|
76
|
-
var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang_1.split(parser_1.SEPARATOR));
|
|
76
|
+
var replacedLangAst = (0, parser_1.parseUnicodeLanguageId)(replacedLang_1.split(parser_1.SEPARATOR));
|
|
77
77
|
finalLangAst = {
|
|
78
78
|
lang: replacedLangAst.lang,
|
|
79
79
|
script: finalLangAst.script || replacedLangAst.script,
|
|
@@ -87,14 +87,14 @@ function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
|
|
|
87
87
|
// language _ script _ country
|
|
88
88
|
// ug-Arab-CN -> ug-CN
|
|
89
89
|
if (finalLangAst.script && finalLangAst.region) {
|
|
90
|
-
var replacedLang_2 = aliases_generated_1.languageAlias[emitter_1.emitUnicodeLanguageId({
|
|
90
|
+
var replacedLang_2 = aliases_generated_1.languageAlias[(0, emitter_1.emitUnicodeLanguageId)({
|
|
91
91
|
lang: finalLangAst.lang,
|
|
92
92
|
script: finalLangAst.script,
|
|
93
93
|
region: finalLangAst.region,
|
|
94
94
|
variants: [],
|
|
95
95
|
})];
|
|
96
96
|
if (replacedLang_2) {
|
|
97
|
-
var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang_2.split(parser_1.SEPARATOR));
|
|
97
|
+
var replacedLangAst = (0, parser_1.parseUnicodeLanguageId)(replacedLang_2.split(parser_1.SEPARATOR));
|
|
98
98
|
finalLangAst = {
|
|
99
99
|
lang: replacedLangAst.lang,
|
|
100
100
|
script: replacedLangAst.script,
|
|
@@ -106,13 +106,13 @@ function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
|
|
|
106
106
|
// language _ country
|
|
107
107
|
// eg. az_AZ -> az_Latn_A
|
|
108
108
|
if (finalLangAst.region) {
|
|
109
|
-
var replacedLang_3 = aliases_generated_1.languageAlias[emitter_1.emitUnicodeLanguageId({
|
|
109
|
+
var replacedLang_3 = aliases_generated_1.languageAlias[(0, emitter_1.emitUnicodeLanguageId)({
|
|
110
110
|
lang: finalLangAst.lang,
|
|
111
111
|
region: finalLangAst.region,
|
|
112
112
|
variants: [],
|
|
113
113
|
})];
|
|
114
114
|
if (replacedLang_3) {
|
|
115
|
-
var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang_3.split(parser_1.SEPARATOR));
|
|
115
|
+
var replacedLangAst = (0, parser_1.parseUnicodeLanguageId)(replacedLang_3.split(parser_1.SEPARATOR));
|
|
116
116
|
finalLangAst = {
|
|
117
117
|
lang: replacedLangAst.lang,
|
|
118
118
|
script: finalLangAst.script || replacedLangAst.script,
|
|
@@ -123,12 +123,12 @@ function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
|
|
|
123
123
|
}
|
|
124
124
|
// only language
|
|
125
125
|
// e.g. twi -> ak
|
|
126
|
-
var replacedLang = aliases_generated_1.languageAlias[emitter_1.emitUnicodeLanguageId({
|
|
126
|
+
var replacedLang = aliases_generated_1.languageAlias[(0, emitter_1.emitUnicodeLanguageId)({
|
|
127
127
|
lang: finalLangAst.lang,
|
|
128
128
|
variants: [],
|
|
129
129
|
})];
|
|
130
130
|
if (replacedLang) {
|
|
131
|
-
var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang.split(parser_1.SEPARATOR));
|
|
131
|
+
var replacedLangAst = (0, parser_1.parseUnicodeLanguageId)(replacedLang.split(parser_1.SEPARATOR));
|
|
132
132
|
finalLangAst = {
|
|
133
133
|
lang: replacedLangAst.lang,
|
|
134
134
|
script: finalLangAst.script || replacedLangAst.script,
|
|
@@ -143,13 +143,13 @@ function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
|
|
|
143
143
|
if (regionAlias) {
|
|
144
144
|
var regions = regionAlias.split(' ');
|
|
145
145
|
replacedRegion = regions[0];
|
|
146
|
-
var likelySubtag = likelySubtags_generated_1.likelySubtags[emitter_1.emitUnicodeLanguageId({
|
|
146
|
+
var likelySubtag = likelySubtags_generated_1.likelySubtags[(0, emitter_1.emitUnicodeLanguageId)({
|
|
147
147
|
lang: finalLangAst.lang,
|
|
148
148
|
script: finalLangAst.script,
|
|
149
149
|
variants: [],
|
|
150
150
|
})];
|
|
151
151
|
if (likelySubtag) {
|
|
152
|
-
var likelyRegion = parser_1.parseUnicodeLanguageId(likelySubtag.split(parser_1.SEPARATOR)).region;
|
|
152
|
+
var likelyRegion = (0, parser_1.parseUnicodeLanguageId)(likelySubtag.split(parser_1.SEPARATOR)).region;
|
|
153
153
|
if (likelyRegion && regions.indexOf(likelyRegion) > -1) {
|
|
154
154
|
replacedRegion = likelyRegion;
|
|
155
155
|
}
|
|
@@ -173,10 +173,10 @@ function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
|
|
|
173
173
|
var variant = finalLangAst.variants[i].toLowerCase();
|
|
174
174
|
if (aliases_generated_1.variantAlias[variant]) {
|
|
175
175
|
var alias = aliases_generated_1.variantAlias[variant];
|
|
176
|
-
if (parser_1.isUnicodeVariantSubtag(alias)) {
|
|
176
|
+
if ((0, parser_1.isUnicodeVariantSubtag)(alias)) {
|
|
177
177
|
finalLangAst.variants[i] = alias;
|
|
178
178
|
}
|
|
179
|
-
else if (parser_1.isUnicodeLanguageSubtag(alias)) {
|
|
179
|
+
else if ((0, parser_1.isUnicodeLanguageSubtag)(alias)) {
|
|
180
180
|
// Yes this can happen per the spec
|
|
181
181
|
finalLangAst.lang = alias;
|
|
182
182
|
}
|
package/src/emitter.js
CHANGED
|
@@ -6,7 +6,7 @@ function emitUnicodeLanguageId(lang) {
|
|
|
6
6
|
if (!lang) {
|
|
7
7
|
return '';
|
|
8
8
|
}
|
|
9
|
-
return tslib_1.__spreadArray([lang.lang, lang.script, lang.region], (lang.variants || [])).filter(Boolean)
|
|
9
|
+
return (0, tslib_1.__spreadArray)([lang.lang, lang.script, lang.region], (lang.variants || []), true).filter(Boolean)
|
|
10
10
|
.join('-');
|
|
11
11
|
}
|
|
12
12
|
exports.emitUnicodeLanguageId = emitUnicodeLanguageId;
|
|
@@ -18,10 +18,10 @@ function emitUnicodeLocaleId(_a) {
|
|
|
18
18
|
chunks.push(ext.type);
|
|
19
19
|
switch (ext.type) {
|
|
20
20
|
case 'u':
|
|
21
|
-
chunks.push.apply(chunks, tslib_1.__spreadArray(tslib_1.__spreadArray([], ext.attributes), ext.keywords.reduce(function (all, kv) { return all.concat(kv); }, [])));
|
|
21
|
+
chunks.push.apply(chunks, (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], ext.attributes, false), ext.keywords.reduce(function (all, kv) { return all.concat(kv); }, []), false));
|
|
22
22
|
break;
|
|
23
23
|
case 't':
|
|
24
|
-
chunks.push.apply(chunks, tslib_1.__spreadArray([emitUnicodeLanguageId(ext.lang)], ext.fields.reduce(function (all, kv) { return all.concat(kv); }, [])));
|
|
24
|
+
chunks.push.apply(chunks, (0, tslib_1.__spreadArray)([emitUnicodeLanguageId(ext.lang)], ext.fields.reduce(function (all, kv) { return all.concat(kv); }, []), false));
|
|
25
25
|
break;
|
|
26
26
|
default:
|
|
27
27
|
chunks.push(ext.value);
|
package/src/parser.js
CHANGED
|
@@ -238,6 +238,6 @@ function parseExtensions(chunks) {
|
|
|
238
238
|
function parseUnicodeLocaleId(locale) {
|
|
239
239
|
var chunks = locale.split(exports.SEPARATOR);
|
|
240
240
|
var lang = parseUnicodeLanguageId(chunks);
|
|
241
|
-
return tslib_1.__assign({ lang: lang }, parseExtensions(chunks));
|
|
241
|
+
return (0, tslib_1.__assign)({ lang: lang }, parseExtensions(chunks));
|
|
242
242
|
}
|
|
243
243
|
exports.parseUnicodeLocaleId = parseUnicodeLocaleId;
|