lingo.dev 0.87.10 → 0.87.12

package/build/cli.cjs

@@ -1066,7 +1066,12 @@ function createLoader(lDefinition) {
         state.originalInput = input2 || null;
       }
       state.pullInput = input2;
-      const result = await lDefinition.pull(locale, input2, state.initCtx);
+      const result = await lDefinition.pull(
+        locale,
+        input2,
+        state.initCtx,
+        state.defaultLocale
+      );
       state.pullOutput = result;
       return result;
     },
@@ -1990,7 +1995,9 @@ function createPoDataLoader(params) {
             const csPo = _gettextparser2.default.po.parse(cs);
             const csContextKey = _lodash2.default.keys(csPo.translations)[0];
             const csEntries = csPo.translations[csContextKey];
-            const csMsgid = Object.keys(csEntries).find((key) => csEntries[key].msgid);
+            const csMsgid = Object.keys(csEntries).find(
+              (key) => csEntries[key].msgid
+            );
             return csMsgid === msgid;
           });
           if (currentSection) {
@@ -2008,7 +2015,10 @@ function createPoDataLoader(params) {
               }
             }
           });
-          return _gettextparser2.default.po.compile(updatedPo, { foldLength: params.multiline ? 76 : false }).toString().replace([`msgid ""`, `msgstr "Content-Type: text/plain\\n"`].join("\n"), "").trim();
+          return _gettextparser2.default.po.compile(updatedPo, { foldLength: params.multiline ? 76 : false }).toString().replace(
+            [`msgid ""`, `msgstr "Content-Type: text/plain\\n"`].join("\n"),
+            ""
+          ).trim();
         }
         return section.trim();
       }).join("\n\n");
@@ -2018,14 +2028,19 @@ function createPoDataLoader(params) {
 }
 function createPoContentLoader() {
   return createLoader({
-    async pull(locale, input2) {
-      const result = _lodash2.default.chain(input2).entries().filter(([, entry]) => !!entry.msgid).map(([, entry]) => [
-        entry.msgid,
-        {
-          singular: entry.msgstr[0] || entry.msgid,
-          plural: entry.msgstr[1] || entry.msgid_plural || null
-        }
-      ]).fromPairs().value();
+    async pull(locale, input2, initCtx, originalLocale) {
+      const result = _lodash2.default.chain(input2).entries().filter(([, entry]) => !!entry.msgid).map(([, entry]) => {
+        const singularFallback = locale === originalLocale ? entry.msgid : null;
+        const pluralFallback = locale === originalLocale ? entry.msgid_plural || entry.msgid : null;
+        const hasPlural = entry.msgstr.length > 1;
+        return [
+          entry.msgid,
+          {
+            singular: entry.msgstr[0] || singularFallback,
+            plural: hasPlural ? entry.msgstr[1] || pluralFallback : null
+          }
+        ];
+      }).fromPairs().value();
       return result;
     },
     async push(locale, data, originalInput) {
@@ -2033,7 +2048,10 @@ function createPoContentLoader() {
         entry.msgid,
         {
           ...entry,
-          msgstr: [_optionalChain([data, 'access', _95 => _95[entry.msgid], 'optionalAccess', _96 => _96.singular]), _optionalChain([data, 'access', _97 => _97[entry.msgid], 'optionalAccess', _98 => _98.plural]) || null].filter(Boolean)
+          msgstr: [
+            _optionalChain([data, 'access', _95 => _95[entry.msgid], 'optionalAccess', _96 => _96.singular]),
+            _optionalChain([data, 'access', _97 => _97[entry.msgid], 'optionalAccess', _98 => _98.plural]) || null
+          ].filter(Boolean)
         }
       ]).fromPairs().value();
       return result;
@@ -3156,12 +3174,15 @@ function createMdxCodePlaceholderLoader() {
       const response = extractCodePlaceholders(input2);
       return response.content;
     },
-    async push(locale, data, originalInput) {
-      const response = extractCodePlaceholders(_nullishCoalesce(originalInput, () => ( "")));
+    async push(locale, data, originalInput, originalLocale, pullInput) {
+      const sourceInfo = extractCodePlaceholders(_nullishCoalesce(originalInput, () => ( "")));
+      const currentInfo = extractCodePlaceholders(_nullishCoalesce(pullInput, () => ( "")));
+      const codePlaceholders = _lodash2.default.merge(
+        sourceInfo.codePlaceholders,
+        currentInfo.codePlaceholders
+      );
       let result = data;
-      for (const [placeholder, original] of Object.entries(
-        response.codePlaceholders
-      )) {
+      for (const [placeholder, original] of Object.entries(codePlaceholders)) {
         const replacement = original.startsWith(">") ? _lodash2.default.trimStart(original, "> ") : original;
         result = result.replaceAll(placeholder, replacement);
       }
@@ -3279,11 +3300,11 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys)
     case "mdx":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createMdxCodePlaceholderLoader(),
         createPrettierLoader({
           parser: "mdx",
           bucketPathPattern
         }),
+        createMdxCodePlaceholderLoader(),
         createMdxFrontmatterSplitLoader(),
         createMdxSectionsSplit2Loader(),
         createLocalizableMdxDocumentLoader(),
@@ -5658,7 +5679,7 @@ function validateParams2(i18nConfig, flags) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.87.10",
+  version: "0.87.12",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {