lingo.dev 0.116.3 → 0.116.4

package/build/cli.mjs

@@ -1615,8 +1615,8 @@ function createLoader(lDefinition) {
       state.defaultLocale = locale;
       return this;
     },
-    async pullHints() {
-      return lDefinition.pullHints?.(state.originalInput);
+    async pullHints(originalInput) {
+      return lDefinition.pullHints?.(originalInput || state.originalInput);
     },
     async pull(locale, input2) {
       if (!state.defaultLocale) {
@@ -4188,19 +4188,44 @@ function _removeLocale(input2, locale) {
 
 // src/cli/loaders/xcode-xcstrings-v2.ts
 import _10 from "lodash";
-function buildIcuPluralString(forms) {
-  const parts = Object.entries(forms).map(
-    ([form, text]) => `${form} {${text}}`
-  );
+function getRequiredPluralCategories(locale) {
+  try {
+    const pluralRules = new Intl.PluralRules(locale);
+    const categories = pluralRules.resolvedOptions().pluralCategories;
+    if (!categories || categories.length === 0) {
+      return ["other"];
+    }
+    return categories;
+  } catch (error) {
+    return ["other"];
+  }
+}
+function isValidPluralForm(form, locale) {
+  if (form.startsWith("=")) return true;
+  const requiredCategories = getRequiredPluralCategories(locale);
+  return requiredCategories.includes(form);
+}
+function buildIcuPluralString(forms, sourceLocale) {
+  const requiredCategories = new Set(getRequiredPluralCategories(sourceLocale));
+  const parts = Object.entries(forms).map(([form, text]) => {
+    let normalizedForm = form;
+    if (!requiredCategories.has(form)) {
+      if (form === "zero") normalizedForm = "=0";
+      else if (form === "one") normalizedForm = "=1";
+      else if (form === "two") normalizedForm = "=2";
+    }
+    return `${normalizedForm} {${text}}`;
+  });
   return `{count, plural, ${parts.join(" ")}}`;
 }
-function parseIcuPluralString(icuString) {
+function parseIcuPluralString(icuString, locale) {
   const pluralMatch = icuString.match(/\{[\w]+,\s*plural,\s*(.+)\}$/);
   if (!pluralMatch) {
     throw new Error(`Invalid ICU plural format: ${icuString}`);
   }
   const formsText = pluralMatch[1];
   const forms = {};
+  const exactMatches = /* @__PURE__ */ new Set();
   let i = 0;
   while (i < formsText.length) {
     while (i < formsText.length && /\s/.test(formsText[i])) {
@@ -4222,6 +4247,16 @@ function parseIcuPluralString(icuString) {
       }
     }
     if (!formName) break;
+    if (formName === "=0") {
+      formName = "zero";
+      exactMatches.add("zero");
+    } else if (formName === "=1") {
+      formName = "one";
+      exactMatches.add("one");
+    } else if (formName === "=2") {
+      formName = "two";
+      exactMatches.add("two");
+    }
     while (i < formsText.length && /\s/.test(formsText[i])) {
       i++;
     }
@@ -4252,7 +4287,13 @@ function parseIcuPluralString(icuString) {
     }
     forms[formName] = formText;
   }
-  return forms;
+  const filteredForms = {};
+  for (const [form, text] of Object.entries(forms)) {
+    if (exactMatches.has(form) || isValidPluralForm(form, locale)) {
+      filteredForms[form] = text;
+    }
+  }
+  return filteredForms;
 }
 function isIcuPluralString(value) {
   return typeof value === "string" && /^\{[\w]+,\s*plural,\s*.+\}$/.test(value);
@@ -4287,7 +4328,7 @@ function createXcodeXcstringsV2Loader(defaultLocale) {
                   for (const [form, formData] of Object.entries(pluralForms)) {
                     forms[form] = formData.stringUnit.value;
                   }
-                  const icuString = buildIcuPluralString(forms);
+                  const icuString = buildIcuPluralString(forms, locale);
                   resultData[translationKey].substitutions[subName] = {
                     variations: {
                       plural: icuString
@@ -4310,7 +4351,7 @@ function createXcodeXcstringsV2Loader(defaultLocale) {
                   forms[form] = formData.stringUnit.value;
                 }
               }
-              const icuString = buildIcuPluralString(forms);
+              const icuString = buildIcuPluralString(forms, locale);
               resultData[translationKey].variations = {
                 plural: icuString
               };
@@ -4352,7 +4393,7 @@ function createXcodeXcstringsV2Loader(defaultLocale) {
             const pluralValue = subData?.variations?.plural;
             if (pluralValue && isIcuPluralString(pluralValue)) {
               try {
-                const pluralForms = parseIcuPluralString(pluralValue);
+                const pluralForms = parseIcuPluralString(pluralValue, locale);
                 const pluralOut = {};
                 for (const [form, text] of Object.entries(pluralForms)) {
                   pluralOut[form] = {
@@ -4392,7 +4433,7 @@ ${error instanceof Error ? error.message : String(error)}`
           const pluralValue = keyData.variations.plural;
           if (isIcuPluralString(pluralValue)) {
             try {
-              const pluralForms = parseIcuPluralString(pluralValue);
+              const pluralForms = parseIcuPluralString(pluralValue, locale);
               const pluralOut = {};
               for (const [form, text] of Object.entries(pluralForms)) {
                 pluralOut[form] = {
@@ -9797,35 +9838,6 @@ function createDeltaProcessor(fileKey) {
   };
 }
 
-// src/cli/loaders/xcode-xcstrings-icu.ts
-var ICU_TYPE_MARKER = Symbol.for("@lingo.dev/icu-plural-object");
-function isICUPluralObject(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  if (ICU_TYPE_MARKER in value) {
-    return true;
-  }
-  if (!("icu" in value) || typeof value.icu !== "string") {
-    return false;
-  }
-  const icuPluralPattern = /^\{[\w]+,\s*plural,\s*.+\}$/;
-  if (!icuPluralPattern.test(value.icu)) {
-    return false;
-  }
-  if (value._meta !== void 0) {
-    if (typeof value._meta !== "object" || !value._meta.variables || typeof value._meta.variables !== "object") {
-      return false;
-    }
-    for (const [varName, varMeta] of Object.entries(value._meta.variables)) {
-      if (!varMeta || typeof varMeta !== "object" || typeof varMeta.format !== "string" || varMeta.role !== "plural" && varMeta.role !== "other") {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
 // src/cli/cmd/i18n.ts
 var i18n_default = new Command14().command("i18n").description(
   "DEPRECATED: Run localization pipeline (prefer `run` command instead)"
@@ -10190,11 +10202,8 @@ var i18n_default = new Command14().command("i18n").description(
               }
               const finalDiffSize = _32.chain(finalTargetData).omitBy((value, key) => {
                 const targetValue = targetData[key];
-                if (isICUPluralObject(value) && isICUPluralObject(targetValue)) {
-                  return _32.isEqual(
-                    { icu: value.icu, _meta: value._meta },
-                    { icu: targetValue.icu, _meta: targetValue._meta }
-                  );
+                if (typeof value === "object" && value !== null) {
+                  return _32.isEqual(value, targetValue);
                 }
                 return value === targetValue;
               }).size().value();
@@ -13452,7 +13461,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.116.3",
+  version: "0.116.4",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {