lingo.dev 0.92.3 → 0.92.5

package/build/cli.mjs

@@ -3134,18 +3134,17 @@ function parseVueFile(input2) {
 
 // src/cli/loaders/typescript/index.ts
 import { parse as parse2 } from "@babel/parser";
+import _18 from "lodash";
 import babelTraverseModule from "@babel/traverse";
 import * as t from "@babel/types";
 import babelGenerateModule from "@babel/generator";
-import { flatten as flatten2, unflatten as unflatten2 } from "flat";
-import _18 from "lodash";
 
 // src/cli/loaders/typescript/cjs-interop.ts
 function resolveCjsExport(mod, name = "module") {
   if (typeof mod === "function" || typeof mod !== "object" || mod === null) {
     return mod;
   }
-  if (typeof mod.default !== "undefined") {
+  if ("default" in mod && typeof mod.default !== "undefined") {
     return mod.default;
   }
   console.error(
@@ -3165,33 +3164,20 @@ function createTypescriptLoader() {
       if (!input2) {
         return {};
       }
-      try {
-        const ast = parseTypeScript(input2);
-        const extractedStrings = extractStringsFromDefaultExport(ast);
-        return flattenExtractedStrings(extractedStrings);
-      } catch (error) {
-        console.error("Error parsing TypeScript file:", error);
-        return {};
-      }
+      const ast = parseTypeScript(input2);
+      const extractedStrings = extractStringsFromDefaultExport(ast);
+      return extractedStrings;
     },
     push: async (locale, data, originalInput, defaultLocale, pullInput, pullOutput) => {
-      if (!data) {
-        return "";
-      }
-      const input2 = originalInput;
-      try {
-        const ast = parseTypeScript(input2);
-        const nestedData = unflattenStringData(data);
-        const modified = updateStringsInDefaultExport(ast, nestedData);
-        if (!modified) {
-          return input2;
+      const ast = parseTypeScript(originalInput || "");
+      const finalData = _18.merge({}, pullOutput, data);
+      updateStringsInDefaultExport(ast, finalData);
+      const { code } = generate(ast, {
+        jsescOption: {
+          minimal: true
         }
-        const { code } = generate(ast);
-        return code;
-      } catch (error) {
-        console.error("Error updating TypeScript file:", error);
-        return input2;
-      }
+      });
+      return code;
     }
   });
 }
@@ -3201,218 +3187,159 @@ function parseTypeScript(input2) {
     plugins: ["typescript"]
   });
 }
-function flattenExtractedStrings(obj) {
-  const flattened = flatten2(obj, { delimiter: "/" });
-  return Object.entries(flattened).reduce(
-    (acc, [key, value]) => {
-      if (typeof value === "string") {
-        acc[key] = value;
-      }
-      return acc;
-    },
-    {}
-  );
-}
-function unflattenStringData(data) {
-  return unflatten2(data, { delimiter: "/" });
-}
 function extractStringsFromDefaultExport(ast) {
-  const result = {};
+  let extracted = {};
   traverse(ast, {
     ExportDefaultDeclaration(path17) {
-      if (t.isObjectExpression(path17.node.declaration)) {
-        extractStringsFromObjectExpression(path17.node.declaration, result, "");
-      } else if (t.isIdentifier(path17.node.declaration)) {
-        extractStringsFromExportedIdentifier(path17, result, "");
+      const { declaration } = path17.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];
+        if (binding && t.isVariableDeclarator(binding.path.node) && binding.path.node.init) {
+          const initRaw = binding.path.node.init;
+          const init = initRaw ? unwrapTSAsExpression(initRaw) : initRaw;
+          if (t.isObjectExpression(init)) {
+            extracted = objectExpressionToObject(init);
+          } else if (t.isArrayExpression(init)) {
+            extracted = arrayExpressionToArray(init);
+          }
+        }
       }
     }
   });
-  return result;
+  return extracted;
+}
+function unwrapTSAsExpression(node) {
+  let current = node;
+  while (t.isTSAsExpression(current)) {
+    current = current.expression;
+  }
+  return current;
 }
-function extractStringsFromObjectExpression(objectExpression, result, path17) {
+function objectExpressionToObject(objectExpression) {
+  const obj = {};
   objectExpression.properties.forEach((prop) => {
-    if (t.isObjectProperty(prop)) {
-      const key = getPropertyKey(prop);
-      const currentPath = path17 ? `${path17}/${key}` : key;
-      if (t.isStringLiteral(prop.value)) {
-        _18.set(result, currentPath, prop.value.value);
-      } else if (t.isObjectExpression(prop.value)) {
-        extractStringsFromObjectExpression(prop.value, result, currentPath);
-      } else if (t.isArrayExpression(prop.value)) {
-        extractStringsFromArrayExpression(prop.value, result, currentPath);
+    if (!t.isObjectProperty(prop)) return;
+    const key = getPropertyKey(prop);
+    if (t.isStringLiteral(prop.value)) {
+      obj[key] = prop.value.value;
+    } else if (t.isObjectExpression(prop.value)) {
+      const nested = objectExpressionToObject(prop.value);
+      if (Object.keys(nested).length > 0) {
+        obj[key] = nested;
+      }
+    } else if (t.isArrayExpression(prop.value)) {
+      const arr = arrayExpressionToArray(prop.value);
+      if (arr.length > 0) {
+        obj[key] = arr;
       }
     }
   });
+  return obj;
 }
-function extractStringsFromArrayExpression(arrayExpression, result, path17) {
-  arrayExpression.elements.forEach((element, index) => {
-    const currentPath = `${path17}/${index}`;
+function arrayExpressionToArray(arrayExpression) {
+  const arr = [];
+  arrayExpression.elements.forEach((element) => {
+    if (!element) return;
     if (t.isStringLiteral(element)) {
-      _18.set(result, currentPath, element.value);
+      arr.push(element.value);
     } else if (t.isObjectExpression(element)) {
-      extractStringsFromObjectExpression(element, result, currentPath);
+      const nestedObj = objectExpressionToObject(element);
+      arr.push(nestedObj);
     } else if (t.isArrayExpression(element)) {
-      extractStringsFromArrayExpression(element, result, currentPath);
+      arr.push(arrayExpressionToArray(element));
     }
   });
-}
-function extractStringsFromExportedIdentifier(path17, result, basePath) {
-  const exportName = path17.node.declaration.name;
-  const binding = path17.scope.bindings[exportName];
-  if (binding && binding.path.node) {
-    const bindingPath = binding.path;
-    if (t.isVariableDeclarator(bindingPath.node) && bindingPath.node.init) {
-      if (t.isObjectExpression(bindingPath.node.init)) {
-        extractStringsFromObjectExpression(
-          bindingPath.node.init,
-          result,
-          basePath
-        );
-      } else if (t.isArrayExpression(bindingPath.node.init)) {
-        extractStringsFromArrayExpression(
-          bindingPath.node.init,
-          result,
-          basePath
-        );
-      }
-    }
-  }
+  return arr;
 }
 function updateStringsInDefaultExport(ast, data) {
   let modified = false;
   traverse(ast, {
     ExportDefaultDeclaration(path17) {
-      if (t.isObjectExpression(path17.node.declaration)) {
-        modified = updateStringsInObjectExpression(path17.node.declaration, data, "") || modified;
-      } else if (t.isIdentifier(path17.node.declaration)) {
-        modified = updateStringsInExportedIdentifier(path17, data, "") || modified;
+      const { declaration } = path17.node;
+      const decl = unwrapTSAsExpression(declaration);
+      if (t.isObjectExpression(decl)) {
+        modified = updateStringsInObjectExpression(decl, data) || modified;
+      } else if (t.isArrayExpression(decl)) {
+        if (Array.isArray(data)) {
+          modified = updateStringsInArrayExpression(decl, data) || modified;
+        }
+      } else if (t.isIdentifier(decl)) {
+        modified = updateStringsInExportedIdentifier(path17, data) || modified;
       }
     }
   });
   return modified;
 }
-function updateStringsInObjectExpression(objectExpression, data, path17) {
+function updateStringsInObjectExpression(objectExpression, data) {
   let modified = false;
   objectExpression.properties.forEach((prop) => {
-    if (t.isObjectProperty(prop)) {
-      const key = getPropertyKey(prop);
-      const currentPath = path17 ? `${path17}/${key}` : key;
-      if (t.isStringLiteral(prop.value)) {
-        if (data[currentPath] !== void 0) {
-          prop.value.value = data[currentPath];
-          modified = true;
-        } else if (path17 === "" && data[key] !== void 0) {
-          prop.value.value = data[key];
-          modified = true;
-        }
-      } else if (t.isObjectExpression(prop.value)) {
-        if (data[key] && typeof data[key] === "object") {
-          const subModified = updateStringsInObjectExpression(
-            prop.value,
-            data[key],
-            ""
-          );
-          modified = subModified || modified;
-        } else {
-          const subModified = updateStringsInObjectExpression(
-            prop.value,
-            data,
-            currentPath
-          );
-          modified = subModified || modified;
-        }
-      } else if (t.isArrayExpression(prop.value)) {
-        if (data[key] && Array.isArray(data[key])) {
-          const subModified = updateStringsInArrayExpression(
-            prop.value,
-            data[key],
-            ""
-          );
-          modified = subModified || modified;
-        } else {
-          const subModified = updateStringsInArrayExpression(
-            prop.value,
-            data,
-            currentPath
-          );
-          modified = subModified || modified;
-        }
+    if (!t.isObjectProperty(prop)) return;
+    const key = getPropertyKey(prop);
+    const incomingVal = data?.[key];
+    if (incomingVal === void 0) {
+      return;
+    }
+    if (t.isStringLiteral(prop.value) && typeof incomingVal === "string") {
+      if (prop.value.value !== incomingVal) {
+        prop.value.value = incomingVal;
+        modified = true;
       }
+    } else if (t.isObjectExpression(prop.value) && typeof incomingVal === "object" && !Array.isArray(incomingVal)) {
+      const subModified = updateStringsInObjectExpression(
+        prop.value,
+        incomingVal
+      );
+      modified = subModified || modified;
+    } else if (t.isArrayExpression(prop.value) && Array.isArray(incomingVal)) {
+      const subModified = updateStringsInArrayExpression(
+        prop.value,
+        incomingVal
+      );
+      modified = subModified || modified;
     }
   });
   return modified;
 }
-function updateStringsInArrayExpression(arrayExpression, data, path17) {
+function updateStringsInArrayExpression(arrayExpression, incoming) {
   let modified = false;
   arrayExpression.elements.forEach((element, index) => {
-    const currentPath = `${path17}/${index}`;
-    if (t.isStringLiteral(element)) {
-      if (Array.isArray(data) && data[index] !== void 0) {
-        element.value = data[index];
-        modified = true;
-      } else if (!Array.isArray(data) && data[currentPath] !== void 0) {
-        element.value = data[currentPath];
+    if (!element) return;
+    const incomingVal = incoming?.[index];
+    if (incomingVal === void 0) return;
+    if (t.isStringLiteral(element) && typeof incomingVal === "string") {
+      if (element.value !== incomingVal) {
+        element.value = incomingVal;
         modified = true;
       }
-    } else if (t.isObjectExpression(element)) {
-      if (Array.isArray(data) && data[index] && typeof data[index] === "object") {
-        const subModified = updateStringsInObjectExpression(
-          element,
-          data[index],
-          ""
-        );
-        modified = subModified || modified;
-      } else {
-        const subModified = updateStringsInObjectExpression(
-          element,
-          data,
-          currentPath
-        );
-        modified = subModified || modified;
-      }
-    } else if (t.isArrayExpression(element)) {
-      if (Array.isArray(data) && data[index] && Array.isArray(data[index])) {
-        const subModified = updateStringsInArrayExpression(
-          element,
-          data[index],
-          ""
-        );
-        modified = subModified || modified;
-      } else {
-        const subModified = updateStringsInArrayExpression(
-          element,
-          data,
-          currentPath
-        );
-        modified = subModified || modified;
-      }
+    } else if (t.isObjectExpression(element) && typeof incomingVal === "object" && !Array.isArray(incomingVal)) {
+      const subModified = updateStringsInObjectExpression(element, incomingVal);
+      modified = subModified || modified;
+    } else if (t.isArrayExpression(element) && Array.isArray(incomingVal)) {
+      const subModified = updateStringsInArrayExpression(element, incomingVal);
+      modified = subModified || modified;
     }
   });
   return modified;
 }
-function updateStringsInExportedIdentifier(path17, data, basePath) {
-  let modified = false;
+function updateStringsInExportedIdentifier(path17, data) {
   const exportName = path17.node.declaration.name;
   const binding = path17.scope.bindings[exportName];
-  if (binding && binding.path.node) {
-    const bindingPath = binding.path;
-    if (t.isVariableDeclarator(bindingPath.node) && bindingPath.node.init) {
-      if (t.isObjectExpression(bindingPath.node.init)) {
-        modified = updateStringsInObjectExpression(
-          bindingPath.node.init,
-          data,
-          basePath
-        ) || modified;
-      } else if (t.isArrayExpression(bindingPath.node.init)) {
-        modified = updateStringsInArrayExpression(
-          bindingPath.node.init,
-          data,
-          basePath
-        ) || modified;
-      }
+  if (!binding || !binding.path.node) return false;
+  if (t.isVariableDeclarator(binding.path.node) && binding.path.node.init) {
+    const initRaw = binding.path.node.init;
+    const init = initRaw ? unwrapTSAsExpression(initRaw) : initRaw;
+    if (t.isObjectExpression(init)) {
+      return updateStringsInObjectExpression(init, data);
+    } else if (t.isArrayExpression(init)) {
+      return updateStringsInArrayExpression(init, data);
     }
   }
-  return modified;
+  return false;
 }
 function getPropertyKey(prop) {
   if (t.isIdentifier(prop.key)) {
@@ -4114,11 +4041,14 @@ function withExponentialBackoff(fn, maxAttempts = 3, baseDelay = 1e3) {
 }
 
 // src/cli/utils/observability.ts
+import pkg from "node-machine-id";
+var { machineIdSync } = pkg;
 async function trackEvent(distinctId, event, properties) {
   if (process.env.DO_NOT_TRACK) {
     return;
   }
   try {
+    const actualId = distinctId || `device-${machineIdSync()}`;
     const { PostHog } = await import("posthog-node");
     const safeProperties = properties ? JSON.parse(
       JSON.stringify(properties, (key, value) => {
@@ -4141,7 +4071,7 @@ async function trackEvent(distinctId, event, properties) {
       }
     );
     await posthog.capture({
-      distinctId,
+      distinctId: actualId,
       event,
       properties: {
         ...safeProperties,
@@ -4267,7 +4197,7 @@ function createDeltaProcessor(fileKey) {
 }
 
 // src/cli/cmd/i18n.ts
-import { flatten as flatten3, unflatten as unflatten3 } from "flat";
+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",
@@ -4327,9 +4257,15 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
     validateParams(i18nConfig, flags);
     ora.succeed("Localization configuration is valid");
     ora.start("Connecting to Lingo.dev Localization Engine...");
-    const auth = await validateAuth(settings);
-    authId = auth.id;
-    ora.succeed(`Authenticated as ${auth.email}`);
+    const isByokMode = i18nConfig?.provider && i18nConfig.provider.id !== "lingo";
+    if (isByokMode) {
+      authId = null;
+      ora.succeed("Using external provider (BYOK mode)");
+    } else {
+      const auth = await validateAuth(settings);
+      authId = auth.id;
+      ora.succeed(`Authenticated as ${auth.email}`);
+    }
     trackEvent(authId, "cmd.i18n.start", {
       i18nConfig,
       flags
@@ -4417,7 +4353,7 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
         );
         const sourceContent = tryReadFile(sourcePath, null);
         const sourceData = JSON.parse(sourceContent || "{}");
-        const sourceFlattenedData = flatten3(sourceData, {
+        const sourceFlattenedData = flatten2(sourceData, {
           delimiter: "/",
           transformKey(key) {
             return encodeURIComponent(key);
@@ -4434,7 +4370,7 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
           );
           const targetContent = tryReadFile(targetPath, null);
           const targetData = JSON.parse(targetContent || "{}");
-          const targetFlattenedData = flatten3(targetData, {
+          const targetFlattenedData = flatten2(targetData, {
             delimiter: "/",
             transformKey(key) {
               return encodeURIComponent(key);
@@ -4453,7 +4389,7 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
             targetFlattenedData[newKey] = targetFlattenedData[oldKey];
             delete targetFlattenedData[oldKey];
           }
-          const updatedTargetData = unflatten3(targetFlattenedData, {
+          const updatedTargetData = unflatten2(targetFlattenedData, {
             delimiter: "/",
             transformKey(key) {
               return decodeURIComponent(key);
@@ -4706,7 +4642,7 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
     console.log();
     if (!hasErrors) {
       ora.succeed("Localization completed.");
-      trackEvent(auth.id, "cmd.i18n.success", {
+      trackEvent(authId, "cmd.i18n.success", {
         i18nConfig,
         flags
       });
@@ -6355,7 +6291,7 @@ async function renderHero() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.92.3",
+  version: "0.92.5",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {
@@ -6456,6 +6392,7 @@ var package_default = {
     "mdast-util-from-markdown": "^2.0.2",
     "mdast-util-gfm": "^3.1.0",
     "micromark-extension-gfm": "^3.0.0",
+    "node-machine-id": "^1.1.12",
     "node-webvtt": "^1.9.4",
     "object-hash": "^3.0.0",
     octokit: "^4.0.2",