lingo.dev 0.85.6 → 0.85.7

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;
     }
   };
@@ -1996,14 +2008,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 +5485,7 @@ function validateParams2(i18nConfig, flags) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.85.6",
+  version: "0.85.7",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {