lingo.dev 0.87.11 → 0.87.13

package/build/cli.mjs

@@ -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;
     },
@@ -1185,7 +1190,7 @@ function denormalizeObjectKeys(obj) {
       obj,
       (result, value, key) => {
         const newKey = !isNaN(Number(key)) ? `${OBJECT_NUMERIC_KEY_PREFIX}${key}` : key;
-        result[newKey] = _6.isObject(value) ? denormalizeObjectKeys(value) : value;
+        result[newKey] = _6.isObject(value) && !_6.isDate(value) ? denormalizeObjectKeys(value) : value;
       },
       {}
     );
@@ -1199,7 +1204,7 @@ function normalizeObjectKeys(obj) {
       obj,
       (result, value, key) => {
         const newKey = `${key}`.replace(OBJECT_NUMERIC_KEY_PREFIX, "");
-        result[newKey] = _6.isObject(value) ? normalizeObjectKeys(value) : value;
+        result[newKey] = _6.isObject(value) && !_6.isDate(value) ? normalizeObjectKeys(value) : value;
       },
       {}
     );
@@ -1990,7 +1995,9 @@ function createPoDataLoader(params) {
             const csPo = gettextParser.po.parse(cs);
             const csContextKey = _11.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 gettextParser.po.compile(updatedPo, { foldLength: params.multiline ? 76 : false }).toString().replace([`msgid ""`, `msgstr "Content-Type: text/plain\\n"`].join("\n"), "").trim();
+          return gettextParser.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 = _11.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 = _11.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: [data[entry.msgid]?.singular, data[entry.msgid]?.plural || null].filter(Boolean)
+          msgstr: [
+            data[entry.msgid]?.singular,
+            data[entry.msgid]?.plural || null
+          ].filter(Boolean)
         }
       ]).fromPairs().value();
       return result;
@@ -3073,11 +3091,13 @@ function createLockedKeysLoader(lockedKeys, isCacheRestore = false) {
 
 // src/cli/loaders/mdx2/frontmatter-split.ts
 import matter2 from "gray-matter";
+import YAML3 from "yaml";
 function createMdxFrontmatterSplitLoader() {
+  const fmEngine = createFmEngine();
   return createLoader({
     async pull(locale, input2) {
       const source = input2 || "";
-      const { data: frontmatter, content } = matter2(source);
+      const { data: frontmatter, content } = fmEngine.parse(source);
       return {
         frontmatter,
         content
@@ -3085,11 +3105,29 @@ function createMdxFrontmatterSplitLoader() {
     },
     async push(locale, data) {
       const { frontmatter = {}, content = "" } = data || {};
-      const result = matter2.stringify(content, frontmatter).trim();
+      const result = fmEngine.stringify(content, frontmatter).trim();
       return result;
     }
   });
 }
+function createFmEngine() {
+  const yamlEngine2 = {
+    parse: (str) => YAML3.parse(str),
+    stringify: (obj) => YAML3.stringify(obj, { defaultStringType: "PLAIN" })
+  };
+  return {
+    parse: (input2) => matter2(input2, {
+      engines: {
+        yaml: yamlEngine2
+      }
+    }),
+    stringify: (content, frontmatter) => matter2.stringify(content, frontmatter, {
+      engines: {
+        yaml: yamlEngine2
+      }
+    })
+  };
+}
 
 // src/cli/utils/md5.ts
 import { MD5 } from "object-hash";
@@ -3282,15 +3320,16 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys)
     case "mdx":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createMdxCodePlaceholderLoader(),
         createPrettierLoader({
           parser: "mdx",
           bucketPathPattern
         }),
+        createMdxCodePlaceholderLoader(),
         createMdxFrontmatterSplitLoader(),
         createMdxSectionsSplit2Loader(),
         createLocalizableMdxDocumentLoader(),
         createFlatLoader(),
+        createLockedKeysLoader(lockedKeys || [], options.isCacheRestore),
         createSyncLoader(),
         createUnlocalizableLoader(
           options.isCacheRestore,
@@ -3668,7 +3707,7 @@ function checkIfFileExists(filePath) {
 
 // src/cli/utils/delta.ts
 import * as path13 from "path";
-import YAML3 from "yaml";
+import YAML4 from "yaml";
 var LockSchema = z.object({
   version: z.literal(1).default(1),
   checksums: z.record(
@@ -3718,7 +3757,7 @@ function createDeltaProcessor(fileKey) {
     },
     async loadLock() {
       const lockfileContent = tryReadFile(lockfilePath, null);
-      const lockfileYaml = lockfileContent ? YAML3.parse(lockfileContent) : null;
+      const lockfileYaml = lockfileContent ? YAML4.parse(lockfileContent) : null;
       const lockfileData = lockfileYaml ? LockSchema.parse(lockfileYaml) : {
         version: 1,
         checksums: {}
@@ -3726,7 +3765,7 @@ function createDeltaProcessor(fileKey) {
       return lockfileData;
     },
     async saveLock(lockData) {
-      const lockfileYaml = YAML3.stringify(lockData);
+      const lockfileYaml = YAML4.stringify(lockData);
       writeFile(lockfilePath, lockfileYaml);
     },
     async loadChecksums() {
@@ -4382,7 +4421,7 @@ import Ora6 from "ora";
 import fs11 from "fs";
 import path15 from "path";
 import Z4 from "zod";
-import YAML4 from "yaml";
+import YAML5 from "yaml";
 import { MD5 as MD52 } from "object-hash";
 import _24 from "lodash";
 function createLockfileHelper() {
@@ -4420,12 +4459,12 @@ function createLockfileHelper() {
       return LockfileSchema.parse({});
     }
     const content = fs11.readFileSync(lockfilePath, "utf-8");
-    const result = LockfileSchema.parse(YAML4.parse(content));
+    const result = LockfileSchema.parse(YAML5.parse(content));
     return result;
   }
   function _saveLockfile(lockfile) {
     const lockfilePath = _getLockfilePath();
-    const content = YAML4.stringify(lockfile);
+    const content = YAML5.stringify(lockfile);
     fs11.writeFileSync(lockfilePath, content);
   }
   function _getLockfilePath() {
@@ -5661,7 +5700,7 @@ function validateParams2(i18nConfig, flags) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.87.11",
+  version: "0.87.13",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {