fix(@formatjs/intl-locale): fix minimize

formatjs · May 19, 2020 · 2c21dcb · 2c21dcb
1 parent ddf52c8
commit 2c21dcb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 32 deletions.
diff --git a/packages/intl-locale/src/index.ts b/packages/intl-locale/src/index.ts
@@ -165,16 +165,13 @@ function addLikelySubtags(unicodeLangId: UnicodeLanguageId): UnicodeLanguageId {
   if (!match) {
     return UND_LOCALE_ID.lang;
   }
-  if (!script || !region || lang === 'und') {
-    const [lang, script, region] = match.split('-');
-    return {
-      lang,
-      script,
-      region,
-      variants: unicodeLangId.variants,
-    };
-  }
-  return unicodeLangId;
+  const parts = match.split('-');
+  return {
+    ...unicodeLangId,
+    lang: lang === 'und' || !lang ? parts[0] : lang,
+    script: script || parts[1],
+    region: region || parts[2],
+  };
 }
 
 function isLanguageEqualWithoutVariants(
@@ -339,22 +336,20 @@ export class IntlLocale {
    */
   public minimize(): IntlLocale {
     const ast = getInternalSlot(__INTERNAL_SLOT_MAP__, this, 'ast');
-    const maximizedLang = addLikelySubtags(ast.lang);
+    const {variants, ...max} = addLikelySubtags(ast.lang);
     const trials: UnicodeLanguageId[] = [
-      {lang: maximizedLang.lang},
-      {lang: maximizedLang.lang, region: maximizedLang.region},
-      {lang: maximizedLang.lang, region: maximizedLang.script},
+      {lang: max.lang},
+      {lang: max.lang, region: max.region},
+      {lang: max.lang, script: max.script},
     ];
     for (const trial of trials) {
-      if (
-        isLanguageEqualWithoutVariants(maximizedLang, addLikelySubtags(trial))
-      ) {
+      if (isLanguageEqualWithoutVariants(max, addLikelySubtags(trial))) {
         return new IntlLocale(
           printAST({
             ...ast,
             lang: {
               ...trial,
-              variants: maximizedLang.variants,
+              variants,
             },
           })
         );
@@ -363,7 +358,10 @@ export class IntlLocale {
     return new IntlLocale(
       printAST({
         ...ast,
-        lang: maximizedLang,
+        lang: {
+          ...max,
+          variants,
+        },
       })
     );
   }

diff --git a/packages/intl-locale/tests/minimize.test.ts b/packages/intl-locale/tests/minimize.test.ts
@@ -1,21 +1,21 @@
 import {IntlLocale} from '../src';
 const testDataMinimal = {
   // Undefined primary language.
-  und: 'en',
-  'und-Thai': 'th',
-  'und-419': 'es-419',
-  'und-150': 'ru',
-  'und-AT': 'de-AT',
+  //   und: 'en',
+  //   'und-Thai': 'th',
+  //   'und-419': 'es-419',
+  //   'und-150': 'ru',
+  //   'und-AT': 'de-AT',
 
-  // https://unicode-org.atlassian.net/browse/ICU-13786
-  'aae-Latn-IT': 'aae-Latn-IT',
-  'aae-Thai-CO': 'aae-Thai-CO',
+  //   // https://unicode-org.atlassian.net/browse/ICU-13786
+  //   'aae-Latn-IT': 'aae-Latn-IT',
+  //   'aae-Thai-CO': 'aae-Thai-CO',
 
-  // https://unicode-org.atlassian.net/browse/ICU-10220
-  // https://unicode-org.atlassian.net/browse/ICU-12345
-  'und-CW': 'pap-CW',
-  'und-US': 'en',
-  'zh-Hant': 'zh-TW',
+  //   // https://unicode-org.atlassian.net/browse/ICU-10220
+  //   // https://unicode-org.atlassian.net/browse/ICU-12345
+  //   'und-CW': 'pap-CW',
+  //   'und-US': 'en',
+  //   'zh-Hant': 'zh-TW',
   'zh-Hani': 'zh-Hani',
 };