lingo.dev 0.85.6 → 0.86.0

package/build/cli.mjs

@@ -1032,6 +1032,8 @@ function createLoader(lDefinition) {
   const state = {
     defaultLocale: void 0,
     originalInput: void 0,
+    pullInput: void 0,
+    pullOutput: void 0,
     initCtx: void 0
   };
   return {
@@ -1059,7 +1061,10 @@ function createLoader(lDefinition) {
       if (locale === state.defaultLocale) {
         state.originalInput = input2 || null;
       }
-      return lDefinition.pull(locale, input2, state.initCtx);
+      state.pullInput = input2;
+      const result = await lDefinition.pull(locale, input2, state.initCtx);
+      state.pullOutput = result;
+      return result;
     },
     async push(locale, data) {
       if (!state.defaultLocale) {
@@ -1068,7 +1073,14 @@ function createLoader(lDefinition) {
       if (state.originalInput === void 0) {
         throw new Error("Cannot push data without pulling first");
       }
-      const pushResult = await lDefinition.push(locale, data, state.originalInput, state.defaultLocale);
+      const pushResult = await lDefinition.push(
+        locale,
+        data,
+        state.originalInput,
+        state.defaultLocale,
+        state.pullInput,
+        state.pullOutput
+      );
       return pushResult;
     }
   };
@@ -1629,25 +1641,41 @@ ${content}`;
 import _9 from "lodash";
 import { unified } from "unified";
 import remarkParse from "remark-parse";
-import remarkMdx from "remark-mdx";
 import remarkFrontmatter from "remark-frontmatter";
 import remarkGfm from "remark-gfm";
 import remarkStringify from "remark-stringify";
-import remarkMdxFrontmatter from "remark-mdx-frontmatter";
 import { VFile } from "vfile";
-var parser = unified().use(remarkParse).use(remarkMdx).use(remarkFrontmatter, ["yaml"]).use(remarkMdxFrontmatter).use(remarkGfm);
-var serializer = unified().use(remarkStringify).use(remarkMdx).use(remarkFrontmatter, ["yaml"]).use(remarkMdxFrontmatter).use(remarkGfm);
+var parser = unified().use(remarkParse).use(remarkFrontmatter, ["yaml"]).use(remarkGfm);
+var serializer = unified().use(remarkStringify).use(remarkFrontmatter, ["yaml"]).use(remarkGfm);
 function createMdxFormatLoader() {
+  const skippedTypes = ["code", "inlineCode"];
   return createLoader({
     async pull(locale, input2) {
       const file = new VFile(input2);
       const ast = parser.parse(file);
-      return JSON.parse(JSON.stringify(ast));
+      const result = _9.cloneDeep(ast);
+      traverseMdast(result, (node) => {
+        if (skippedTypes.includes(node.type)) {
+          if ("value" in node) {
+            node.value = "";
+          }
+        }
+      });
+      return result;
     },
-    async push(locale, data) {
-      const ast = data;
-      const content = String(serializer.stringify(ast));
-      return content;
+    async push(locale, data, originalInput, originalLocale, pullInput, pullOutput) {
+      const file = new VFile(originalInput);
+      const ast = parser.parse(file);
+      const result = _9.cloneDeep(ast);
+      traverseMdast(result, (node, indexPath) => {
+        if ("value" in node) {
+          const incomingValue = findNodeByIndexPath(data, indexPath);
+          if (incomingValue && "value" in incomingValue && !_9.isEmpty(incomingValue.value)) {
+            node.value = incomingValue.value;
+          }
+        }
+      });
+      return String(serializer.stringify(result));
     }
   });
 }
@@ -1676,6 +1704,28 @@ function createMdxStructureLoader() {
     }
   });
 }
+function traverseMdast(ast, visitor, indexPath = []) {
+  visitor(ast, indexPath);
+  if ("children" in ast && Array.isArray(ast.children)) {
+    for (let i = 0; i < ast.children.length; i++) {
+      traverseMdast(ast.children[i], visitor, [...indexPath, i]);
+    }
+  }
+}
+function findNodeByIndexPath(ast, indexPath) {
+  let result = null;
+  const stringifiedIndexPath = indexPath.join(".");
+  traverseMdast(ast, (node, path18) => {
+    if (result) {
+      return;
+    }
+    const currentStringifiedPath = path18.join(".");
+    if (currentStringifiedPath === stringifiedIndexPath) {
+      result = node;
+    }
+  });
+  return result;
+}
 
 // src/cli/loaders/properties.ts
 function createPropertiesLoader() {
@@ -1996,14 +2046,27 @@ function createPoDataLoader(params) {
       }
       return result;
     },
-    async push(locale, data, originalInput) {
-      const sections = originalInput?.split("\n\n").filter(Boolean) || [];
-      const result = sections.map((section) => {
+    async push(locale, data, originalInput, originalLocale, pullInput) {
+      const currentSections = pullInput?.split("\n\n").filter(Boolean) || [];
+      const originalSections = originalInput?.split("\n\n").filter(Boolean) || [];
+      const result = originalSections.map((section) => {
         const sectionPo = gettextParser.po.parse(section);
         const contextKey = _12.keys(sectionPo.translations)[0];
         const entries = sectionPo.translations[contextKey];
         const msgid = Object.keys(entries).find((key) => entries[key].msgid);
-        if (!msgid) return section;
+        if (!msgid) {
+          const currentSection = currentSections.find((cs) => {
+            const csPo = gettextParser.po.parse(cs);
+            const csContextKey = _12.keys(csPo.translations)[0];
+            const csEntries = csPo.translations[csContextKey];
+            const csMsgid = Object.keys(csEntries).find((key) => csEntries[key].msgid);
+            return csMsgid === msgid;
+          });
+          if (currentSection) {
+            return currentSection;
+          }
+          return section;
+        }
         if (data[msgid]) {
           const updatedPo = _12.merge({}, sectionPo, {
             translations: {
@@ -5460,7 +5523,7 @@ function validateParams2(i18nConfig, flags) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.85.6",
+  version: "0.86.0",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {