lingo.dev 0.92.11 → 0.92.13

package/build/cli.mjs

@@ -621,9 +621,9 @@ function makeGitlabInitializer(spinner) {
 
 // src/cli/cmd/init.ts
 import open2 from "open";
-var openUrl = (path17) => {
+var openUrl = (path16) => {
   const settings = getSettings(void 0);
-  open2(`${settings.auth.webUrl}${path17}`, { wait: false });
+  open2(`${settings.auth.webUrl}${path16}`, { wait: false });
 };
 var throwHelpError = (option, value) => {
   if (value === "help") {
@@ -997,8 +997,8 @@ var files_default = new Command4().command("files").description("Print out the l
           } else if (type.target) {
             result.push(...targetPaths);
           }
-          result.forEach((path17) => {
-            console.log(path17);
+          result.forEach((path16) => {
+            console.log(path16);
           });
         }
       }
@@ -1026,7 +1026,6 @@ import {
 import { Command as Command6 } from "interactive-commander";
 import Z3 from "zod";
 import _25 from "lodash";
-import * as path14 from "path";
 import Ora5 from "ora";
 
 // src/cli/loaders/_utils.ts
@@ -1674,9 +1673,9 @@ function createHtmlLoader() {
         const bDepth = b.split("/").length;
         return aDepth - bDepth;
       });
-      paths.forEach((path17) => {
-        const value = data[path17];
-        const [nodePath, attribute] = path17.split("#");
+      paths.forEach((path16) => {
+        const value = data[path16];
+        const [nodePath, attribute] = path16.split("#");
         const [rootTag, ...indices] = nodePath.split("/");
         let parent = rootTag === "head" ? document.head : document.body;
         let current = parent;
@@ -2766,18 +2765,18 @@ function createRawDatoValue(parsedDatoValue, originalRawDatoValue, isClean = fal
 }
 function serializeStructuredText(rawStructuredText) {
   return serializeStructuredTextNode(rawStructuredText);
-  function serializeStructuredTextNode(node, path17 = [], acc = {}) {
+  function serializeStructuredTextNode(node, path16 = [], acc = {}) {
     if ("document" in node) {
-      return serializeStructuredTextNode(node.document, [...path17, "document"], acc);
+      return serializeStructuredTextNode(node.document, [...path16, "document"], acc);
     }
     if (!_15.isNil(node.value)) {
-      acc[[...path17, "value"].join(".")] = node.value;
+      acc[[...path16, "value"].join(".")] = node.value;
     } else if (_15.get(node, "type") === "block") {
-      acc[[...path17, "item"].join(".")] = serializeBlock(node.item);
+      acc[[...path16, "item"].join(".")] = serializeBlock(node.item);
     }
     if (node.children) {
       for (let i = 0; i < node.children.length; i++) {
-        serializeStructuredTextNode(node.children[i], [...path17, i.toString()], acc);
+        serializeStructuredTextNode(node.children[i], [...path16, i.toString()], acc);
       }
     }
     return acc;
@@ -2836,8 +2835,8 @@ function deserializeBlockList(parsedBlockList, originalRawBlockList, isClean = f
 }
 function deserializeStructuredText(parsedStructuredText, originalRawStructuredText) {
   const result = _15.cloneDeep(originalRawStructuredText);
-  for (const [path17, value] of _15.entries(parsedStructuredText)) {
-    const realPath = _15.chain(path17.split(".")).flatMap((s) => !_15.isNaN(_15.toNumber(s)) ? ["children", s] : s).value();
+  for (const [path16, value] of _15.entries(parsedStructuredText)) {
+    const realPath = _15.chain(path16.split(".")).flatMap((s) => !_15.isNaN(_15.toNumber(s)) ? ["children", s] : s).value();
     const deserializedValue = createRawDatoValue(value, _15.get(originalRawStructuredText, realPath), true);
     _15.set(result, realPath, deserializedValue);
   }
@@ -2963,8 +2962,10 @@ function variableContentLoader() {
       const result = _16.mapValues(input2, (payload) => payload.value);
       return result;
     },
-    push: async (locale, data, originalInput) => {
-      const result = _16.cloneDeep(originalInput || {});
+    push: async (locale, data, originalInput, defaultLocale, pullInput) => {
+      const result = _16.cloneDeep(
+        pullInput || {}
+      );
       for (const [key, originalValueObj] of Object.entries(result)) {
         result[key] = {
           ...originalValueObj,
@@ -3217,15 +3218,15 @@ function parseTypeScript(input2) {
 function extractStringsFromDefaultExport(ast) {
   let extracted = {};
   traverse(ast, {
-    ExportDefaultDeclaration(path17) {
-      const { declaration } = path17.node;
+    ExportDefaultDeclaration(path16) {
+      const { declaration } = path16.node;
       const decl = unwrapTSAsExpression(declaration);
       if (t.isObjectExpression(decl)) {
         extracted = objectExpressionToObject(decl);
       } else if (t.isArrayExpression(decl)) {
         extracted = arrayExpressionToArray(decl);
       } else if (t.isIdentifier(decl)) {
-        const binding = path17.scope.bindings[decl.name];
+        const binding = path16.scope.bindings[decl.name];
         if (binding && t.isVariableDeclarator(binding.path.node) && binding.path.node.init) {
           const initRaw = binding.path.node.init;
           const init = initRaw ? unwrapTSAsExpression(initRaw) : initRaw;
@@ -3290,8 +3291,8 @@ function arrayExpressionToArray(arrayExpression) {
 function updateStringsInDefaultExport(ast, data) {
   let modified = false;
   traverse(ast, {
-    ExportDefaultDeclaration(path17) {
-      const { declaration } = path17.node;
+    ExportDefaultDeclaration(path16) {
+      const { declaration } = path16.node;
       const decl = unwrapTSAsExpression(declaration);
       if (t.isObjectExpression(decl)) {
         modified = updateStringsInObjectExpression(decl, data) || modified;
@@ -3300,7 +3301,7 @@ function updateStringsInDefaultExport(ast, data) {
           modified = updateStringsInArrayExpression(decl, data) || modified;
         }
       } else if (t.isIdentifier(decl)) {
-        modified = updateStringsInExportedIdentifier(path17, data) || modified;
+        modified = updateStringsInExportedIdentifier(path16, data) || modified;
       }
     }
   });
@@ -3371,9 +3372,9 @@ function updateStringsInArrayExpression(arrayExpression, incoming) {
   });
   return modified;
 }
-function updateStringsInExportedIdentifier(path17, data) {
-  const exportName = path17.node.declaration.name;
-  const binding = path17.scope.bindings[exportName];
+function updateStringsInExportedIdentifier(path16, data) {
+  const exportName = path16.node.declaration.name;
+  const binding = path16.scope.bindings[exportName];
   if (!binding || !binding.path.node) return false;
   if (t.isVariableDeclarator(binding.path.node) && binding.path.node.init) {
     const initRaw = binding.path.node.init;
@@ -4284,7 +4285,6 @@ function createDeltaProcessor(fileKey) {
 }
 
 // src/cli/cmd/i18n.ts
-import { flatten as flatten2, unflatten as unflatten2 } from "flat";
 var i18n_default = new Command6().command("i18n").description("Run Localization engine").helpOption("-h, --help", "Show help").option(
   "--locale <locale>",
   "Locale to process",
@@ -4367,7 +4367,7 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
     if (flags.file?.length) {
       buckets = buckets.map((bucket) => {
         const paths = bucket.paths.filter(
-          (path17) => flags.file.find((file) => path17.pathPattern?.includes(file))
+          (path16) => flags.file.find((file) => path16.pathPattern?.includes(file))
         );
         return { ...bucket, paths };
       }).filter((bucket) => bucket.paths.length > 0);
@@ -4380,8 +4380,8 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
         ora.info(`\x1B[36mProcessing only filtered buckets:\x1B[0m`);
         buckets.map((bucket) => {
           ora.info(`  ${bucket.type}:`);
-          bucket.paths.forEach((path17) => {
-            ora.info(`    - ${path17.pathPattern}`);
+          bucket.paths.forEach((path16) => {
+            ora.info(`    - ${path16.pathPattern}`);
           });
         });
       }
@@ -4424,73 +4424,6 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
     } else {
       ora.succeed("Localization cache loaded");
     }
-    for (const bucket of buckets) {
-      if (bucket.type !== "json") {
-        continue;
-      }
-      ora.start("Validating localization state...");
-      for (const bucketPath of bucket.paths) {
-        const sourceLocale = resolveOverriddenLocale3(
-          i18nConfig.locale.source,
-          bucketPath.delimiter
-        );
-        const deltaProcessor = createDeltaProcessor(bucketPath.pathPattern);
-        const sourcePath = path14.join(
-          process.cwd(),
-          bucketPath.pathPattern.replace("[locale]", sourceLocale)
-        );
-        const sourceContent = tryReadFile(sourcePath, null);
-        const sourceData = JSON.parse(sourceContent || "{}");
-        const sourceFlattenedData = flatten2(sourceData, {
-          delimiter: "/",
-          transformKey(key) {
-            return encodeURIComponent(key);
-          }
-        });
-        for (const _targetLocale of targetLocales) {
-          const targetLocale = resolveOverriddenLocale3(
-            _targetLocale,
-            bucketPath.delimiter
-          );
-          const targetPath = path14.join(
-            process.cwd(),
-            bucketPath.pathPattern.replace("[locale]", targetLocale)
-          );
-          const targetContent = tryReadFile(targetPath, null);
-          const targetData = JSON.parse(targetContent || "{}");
-          const targetFlattenedData = flatten2(targetData, {
-            delimiter: "/",
-            transformKey(key) {
-              return encodeURIComponent(key);
-            }
-          });
-          const checksums = await deltaProcessor.loadChecksums();
-          const delta = await deltaProcessor.calculateDelta({
-            sourceData: sourceFlattenedData,
-            targetData: targetFlattenedData,
-            checksums
-          });
-          if (!delta.hasChanges) {
-            continue;
-          }
-          for (const [oldKey, newKey] of delta.renamed) {
-            targetFlattenedData[newKey] = targetFlattenedData[oldKey];
-            delete targetFlattenedData[oldKey];
-          }
-          const updatedTargetData = unflatten2(targetFlattenedData, {
-            delimiter: "/",
-            transformKey(key) {
-              return decodeURIComponent(key);
-            }
-          });
-          await writeFile(
-            targetPath,
-            JSON.stringify(updatedTargetData, null, 2)
-          );
-        }
-      }
-      ora.succeed("Localization state check completed");
-    }
     if (flags.frozen) {
       ora.start("Checking for lockfile updates...");
       let requiresUpdate = null;
@@ -4666,6 +4599,15 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
                 targetData,
                 processedTargetData
               );
+              finalTargetData = _25.chain(finalTargetData).entries().map(([key, value]) => {
+                const renaming = delta.renamed.find(
+                  ([oldKey, newKey]) => oldKey === key
+                );
+                if (!renaming) {
+                  return [key, value];
+                }
+                return [renaming[1], value];
+              }).fromPairs().value();
               if (flags.interactive) {
                 bucketOra.stop();
                 const reviewedData = await reviewChanges({
@@ -4921,7 +4863,7 @@ import Ora6 from "ora";
 
 // src/cli/utils/lockfile.ts
 import fs11 from "fs";
-import path15 from "path";
+import path14 from "path";
 import Z4 from "zod";
 import YAML5 from "yaml";
 import { MD5 as MD52 } from "object-hash";
@@ -4970,7 +4912,7 @@ function createLockfileHelper() {
     fs11.writeFileSync(lockfilePath, content);
   }
   function _getLockfilePath() {
-    return path15.join(process.cwd(), "i18n.lock");
+    return path14.join(process.cwd(), "i18n.lock");
   }
 }
 var LockfileSchema = Z4.object({
@@ -5177,7 +5119,7 @@ import { execSync as execSync2 } from "child_process";
 
 // src/cli/cmd/ci/flows/in-branch.ts
 import { execSync } from "child_process";
-import path16 from "path";
+import path15 from "path";
 
 // src/cli/cmd/ci/flows/_base.ts
 var IntegrationFlow = class {
@@ -5273,7 +5215,7 @@ var InBranchFlow = class extends IntegrationFlow {
         return false;
       }
     }
-    const workingDir = path16.resolve(
+    const workingDir = path15.resolve(
       process.cwd(),
       this.platformKit.config.workingDir
     );
@@ -5930,7 +5872,7 @@ var status_default = new Command11().command("status").description("Show the sta
     ora.succeed("Buckets retrieved");
     if (flags.file?.length) {
       buckets = buckets.map((bucket) => {
-        const paths = bucket.paths.filter((path17) => flags.file.find((file) => path17.pathPattern?.match(file)));
+        const paths = bucket.paths.filter((path16) => flags.file.find((file) => path16.pathPattern?.match(file)));
         return { ...bucket, paths };
       }).filter((bucket) => bucket.paths.length > 0);
       if (buckets.length === 0) {
@@ -5940,8 +5882,8 @@ var status_default = new Command11().command("status").description("Show the sta
         ora.info(`\x1B[36mProcessing only filtered buckets:\x1B[0m`);
         buckets.map((bucket) => {
           ora.info(`  ${bucket.type}:`);
-          bucket.paths.forEach((path17) => {
-            ora.info(`    - ${path17.pathPattern}`);
+          bucket.paths.forEach((path16) => {
+            ora.info(`    - ${path16.pathPattern}`);
           });
         });
       }
@@ -6170,10 +6112,10 @@ var status_default = new Command11().command("status").description("Show the sta
     if (flags.confirm && Object.keys(fileStats).length > 0) {
       console.log(chalk3.bold(`
 \u{1F4D1} BREAKDOWN BY FILE:`));
-      Object.entries(fileStats).sort((a, b) => b[1].wordCount - a[1].wordCount).forEach(([path17, stats]) => {
+      Object.entries(fileStats).sort((a, b) => b[1].wordCount - a[1].wordCount).forEach(([path16, stats]) => {
         if (stats.sourceKeys === 0) return;
         console.log(chalk3.bold(`
-\u2022 ${path17}:`));
+\u2022 ${path16}:`));
         console.log(`  ${stats.sourceKeys} source keys, ~${stats.wordCount.toLocaleString()} source words`);
         const fileTable = new Table({
           head: ["Language", "Status", "Details"],
@@ -6375,7 +6317,7 @@ async function renderHero() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.92.11",
+  version: "0.92.13",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {
@@ -7094,12 +7036,21 @@ function createWorkerTask(args) {
                 });
               }
             );
-            const finalTargetData = _28.merge(
+            let finalTargetData = _28.merge(
               {},
               sourceData,
               targetData,
               processedTargetData
             );
+            finalTargetData = _28.chain(finalTargetData).entries().map(([key, value]) => {
+              const renaming = delta.renamed.find(
+                ([oldKey]) => oldKey === key
+              );
+              if (!renaming) {
+                return [key, value];
+              }
+              return [renaming[1], value];
+            }).fromPairs().value();
             await args.ioLimiter(async () => {
               await bucketLoader.pull(assignedTask.sourceLocale);
               await bucketLoader.push(