Merge branch 'main' into main

Author: maxprilutskiy

content/banner.dark.png

@@ -1,20 +1,26 @@
 version: 1
 checksums:
   29ba5363b2b0f1cc53dd4a667d52f86e:
-    md-section-0: 93f48a7bb94abe74e46afbc7a5b3e253
-    md-section-1: 3620411d5d5269697098a2f48fd2300c
-    md-section-2: eb15721f4377325b8a64dea0f17a72f0
-    md-section-3: cf8a21e4c83c137124f41aa2a86a6079
-    md-section-4: 894e1ef13294725c03168d9f805fab8c
-    md-section-5: bd84bf8a5e87bff887a84135b7bafa90
-    md-section-6: 70a57e8c1442871a6b0d3fd2d820ff89
-    md-section-7: 7d3d675756bbddc8ee496dce08022027
-    md-section-8: dcc90be77da35ad96b4479c2f4a4beb8
-    md-section-9: e2c36c043b1acc8c382997262556b3bd
-    md-section-10: b9e3ff36c6e347b874d27ae61a7bdd06
-    md-section-11: abe59bab6da32419b929894bb2e99f98
-    md-section-12: 4b3ff0e6be9e9225bb7dfb58e054701d
-    md-section-13: 1e8667055ff27abe990690dcd44b9fd4
-    md-section-14: 98722b9330d01727cf5fc81a36aad5f4
-    md-section-15: f8c2f53155acc08b4ced42864d396221
-    md-section-16: 8ad16307794a2555d2e67a1fee6b877b
+    md-section-0: 86fec84d2e13b5c02b68be8ed6890c7b
+    md-section-1: 4728a6287bfa989bd038a1427917764e
+    md-section-2: e33cd9539da0b03b8e630f00c6497708
+    md-section-3: 3620411d5d5269697098a2f48fd2300c
+    md-section-4: 10921a1656fe70cee91794ef88b334bb
+    md-section-5: 547902a82d48ac6ac19b63797a21b6e3
+    md-section-6: 1439973e5f597922d3fa6ed72280280e
+    md-section-7: d807b6dfe81b5dc694070761d5f84ff0
+    md-section-8: e7881ae7cd5323a925de529e0455c464
+    md-section-9: 75fd9ee4563cf5658cee2bd08cfac285
+    md-section-10: 1d18b63126baa6ec29d364cd1fa43268
+    md-section-11: 3735c646f4a45b76cfc8d17876ca9e78
+    md-section-12: b9e3ff36c6e347b874d27ae61a7bdd06
+    md-section-13: 296b62b8246655783abb052076e160ce
+    md-section-14: 9f9f799b09b5a2bdad13a45e5ba3cfd6
+    md-section-15: cf8a21e4c83c137124f41aa2a86a6079
+    md-section-16: 894e1ef13294725c03168d9f805fab8c
+    md-section-17: e4ca514290d47807ca29bf363e2639e5
+    md-section-18: cbdbf52703540c2e975e7858e90dd1f5
+    md-section-19: abe59bab6da32419b929894bb2e99f98
+    md-section-20: c7c8e3f78f4ab34b30dc0c2532f17898
+    md-section-21: f8c2f53155acc08b4ced42864d396221
+    md-section-22: 8ad16307794a2555d2e67a1fee6b877b

i18n.lock

@@ -1,5 +1,37 @@
 # lingo.dev
 
+## 0.80.1
+
+### Patch Changes
+
+- [`fb450cb`](https://github.com/lingodotdev/lingo.dev/commit/fb450cb2e90dd67ec008691a03237bdeecce5807) Thanks [@maxprilutskiy](https://github.com/maxprilutskiy)! - upd banner message
+
+## 0.80.0
+
+### Minor Changes
+
+- [#614](https://github.com/lingodotdev/lingo.dev/pull/614) [`2495afd`](https://github.com/lingodotdev/lingo.dev/commit/2495afd69e23700f96e19e5bbf74e393b29c2033) Thanks [@maxprilutskiy](https://github.com/maxprilutskiy)! - add basic translators
+
+### Patch Changes
+
+- [#616](https://github.com/lingodotdev/lingo.dev/pull/616) [`516a79c`](https://github.com/lingodotdev/lingo.dev/commit/516a79c75501c5960ae944379f38591806ca43e2) Thanks [@mathio](https://github.com/mathio)! - po files --frozen flag
+
+- Updated dependencies [[`2495afd`](https://github.com/lingodotdev/lingo.dev/commit/2495afd69e23700f96e19e5bbf74e393b29c2033), [`516a79c`](https://github.com/lingodotdev/lingo.dev/commit/516a79c75501c5960ae944379f38591806ca43e2), [`2cc6114`](https://github.com/lingodotdev/lingo.dev/commit/2cc61140fccc69ab73d40c7802a2d0e018889475)]:
+  - @lingo.dev/_spec@0.27.0
+  - @lingo.dev/_sdk@0.7.31
+
+## 0.79.5
+
+### Patch Changes
+
+- [#612](https://github.com/lingodotdev/lingo.dev/pull/612) [`e541a12`](https://github.com/lingodotdev/lingo.dev/commit/e541a12436eeb4947caa077143c0b6e00b07e9b0) Thanks [@mathio](https://github.com/mathio)! - inject locale
+
+## 0.79.4
+
+### Patch Changes
+
+- [#610](https://github.com/lingodotdev/lingo.dev/pull/610) [`ad05fbf`](https://github.com/lingodotdev/lingo.dev/commit/ad05fbf11b737c17a7cf2861be23ab2bf1189b52) Thanks [@mathio](https://github.com/mathio)! - handle prettier plugins deps
+
 ## 0.79.3
 
 ### Patch Changes

packages/cli/CHANGELOG.md

@@ -1,5 +1,10 @@
 {
-  "version": 1.2,
+  "version": 1.5,
+  "provider": {
+    "id": "anthropic",
+    "model": "claude-3-7-sonnet-latest",
+    "prompt": "You're translating text from {source} to {target}."
+  },
   "locale": {
     "source": "en",
     "targets": ["es", "fr", "it", "de", "ar"]

packages/cli/i18n.json

@@ -1,6 +1,6 @@
 {
   "name": "lingo.dev",
-  "version": "0.79.3",
+  "version": "0.80.1",
   "description": "Lingo.dev CLI",
   "private": false,
   "publishConfig": {
@@ -57,13 +57,16 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
+    "@ai-sdk/anthropic": "^1.2.6",
+    "@ai-sdk/openai": "^1.3.7",
     "@datocms/cma-client-node": "^3.4.0",
     "@gitbeaker/rest": "^39.34.3",
     "@inquirer/prompts": "^7.2.3",
     "@lingo.dev/_sdk": "workspace:*",
     "@lingo.dev/_spec": "workspace:*",
     "@modelcontextprotocol/sdk": "^1.5.0",
     "@paralleldrive/cuid2": "^2.2.2",
+    "ai": "^4.3.2",
     "bitbucket": "^2.12.0",
     "chalk": "^5.4.1",
     "cors": "^2.8.5",
@@ -100,6 +103,7 @@
     "p-limit": "^6.2.0",
     "php-array-reader": "^2.1.2",
     "plist": "^3.1.0",
+    "posthog-node": "^4.11.2",
     "prettier": "^3.4.2",
     "properties-parser": "^0.6.0",
     "slugify": "^1.6.6",

packages/cli/package.json

@@ -1,5 +1,4 @@
 import { bucketTypeSchema, I18nConfig, localeCodeSchema, resolveOverriddenLocale } from "@lingo.dev/_spec";
-import { LingoDotDevEngine } from "@lingo.dev/_sdk";
 import { Command } from "interactive-commander";
 import Z from "zod";
 import _ from "lodash";
@@ -17,6 +16,9 @@ import inquirer from "inquirer";
 import externalEditor from "external-editor";
 import { cacheChunk, deleteCache, getNormalizedCache } from "../utils/cache";
 import updateGitignore from "../utils/update-gitignore";
+import createProcessor from "../processor";
+import { withExponentialBackoff } from "../utils/exp-backoff";
+import trackEvent from "../utils/observability";
 
 export default new Command()
   .command("i18n")
@@ -60,6 +62,7 @@ export default new Command()
     }
 
     let hasErrors = false;
+    let authId: string | null = null;
     try {
       ora.start("Loading configuration...");
       const i18nConfig = getConfig();
@@ -72,8 +75,14 @@ export default new Command()
 
       ora.start("Connecting to Lingo.dev Localization Engine...");
       const auth = await validateAuth(settings);
+      authId = auth.id;
       ora.succeed(`Authenticated as ${auth.email}`);
 
+      trackEvent(authId, "cmd.i18n.start", {
+        i18nConfig,
+        flags,
+      });
+
       let buckets = getBuckets(i18nConfig!);
       if (flags.bucket?.length) {
         buckets = buckets.filter((bucket: any) => flags.bucket!.includes(bucket.type));
@@ -299,11 +308,13 @@ export default new Command()
                 bucketOra.start(
                   `[${sourceLocale} -> ${targetLocale}] [${Object.keys(processableData).length} entries] (0%) AI localization in progress...`,
                 );
-                const localizationEngine = createLocalizationEngineConnection({
+                let processPayload = createProcessor(i18nConfig!.provider, {
                   apiKey: settings.auth.apiKey,
                   apiUrl: settings.auth.apiUrl,
                 });
-                const processedTargetData = await localizationEngine.process(
+                processPayload = withExponentialBackoff(processPayload, 3, 1000);
+
+                const processedTargetData = await processPayload(
                   {
                     sourceLocale,
                     sourceData,
@@ -390,11 +401,20 @@ export default new Command()
         if (flags.verbose) {
           ora.info("Cache file deleted.");
         }
+        trackEvent(auth.id, "cmd.i18n.success", {
+          i18nConfig,
+          flags,
+        });
       } else {
         ora.warn("Localization completed with errors.");
       }
     } catch (error: any) {
       ora.fail(error.message);
+
+      trackEvent(authId || "unknown", "cmd.i18n.error", {
+        flags,
+        error,
+      });
       process.exit(1);
     }
   });
@@ -435,47 +455,6 @@ async function retryWithExponentialBackoff<T>(
   throw new Error("Unreachable code");
 }
 
-function createLocalizationEngineConnection(params: { apiKey: string; apiUrl: string; maxRetries?: number }) {
-  const engine = new LingoDotDevEngine({
-    apiKey: params.apiKey,
-    apiUrl: params.apiUrl,
-  });
-
-  return {
-    process: async (
-      args: {
-        sourceLocale: string;
-        sourceData: Record<string, any>;
-        processableData: Record<string, any>;
-        targetLocale: string;
-        targetData: Record<string, any>;
-      },
-      onProgress: (
-        progress: number,
-        sourceChunk: Record<string, string>,
-        processedChunk: Record<string, string>,
-      ) => void,
-    ) => {
-      return retryWithExponentialBackoff(
-        () =>
-          engine.localizeObject(
-            args.processableData,
-            {
-              sourceLocale: args.sourceLocale,
-              targetLocale: args.targetLocale,
-              reference: {
-                [args.sourceLocale]: args.sourceData,
-                [args.targetLocale]: args.targetData,
-              },
-            },
-            onProgress,
-          ),
-        params.maxRetries ?? 3,
-      );
-    },
-  };
-}
-
 function parseFlags(options: any) {
   return Z.object({
     apiKey: Z.string().optional(),

packages/cli/src/cli/cmd/i18n.ts

@@ -31,7 +31,9 @@ ${vice(
   }),
 )}
 
-Website: https://lingo.dev
+⚡️ AI-powered open-source CLI for web & mobile localization.
+
+Star the the repo :) https://github.com/LingoDotDev/lingo.dev
 `,
   )
   .version(`v${packageJson.version}`, "-v, --version", "Show version")

packages/cli/src/cli/index.ts

@@ -94,8 +94,8 @@ export default function createBucketLoader(
         createPoLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(options.isCacheRestore, options.returnUnlocalizedKeys),
         createVariableLoader({ type: "python" }),
+        createUnlocalizableLoader(options.isCacheRestore, options.returnUnlocalizedKeys),
       );
     case "properties":
       return composeLoaders(
@@ -127,8 +127,8 @@ export default function createBucketLoader(
         createXcodeXcstringsLoader(options.defaultLocale),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(options.isCacheRestore, options.returnUnlocalizedKeys),
         createVariableLoader({ type: "ieee" }),
+        createUnlocalizableLoader(options.isCacheRestore, options.returnUnlocalizedKeys),
       );
     case "yaml":
       return composeLoaders(

packages/cli/src/cli/loaders/index.ts

@@ -20,12 +20,17 @@ export default function createInjectLocaleLoader(
       if (!injectLocaleKeys) {
         return data;
       }
+
+      // ensures locale keys are in correct position
+      const mergedData = _.merge({}, originalInput, data);
+
       injectLocaleKeys.forEach((key) => {
-        if (_.get(originalInput, key) === originalLocale) {
-          _.set(data, key, locale);
+        if (_.get(mergedData, key) === originalLocale) {
+          _.set(mergedData, key, locale);
         }
       });
-      return data;
+
+      return mergedData;
     },
   });
 }

packages/cli/src/cli/loaders/inject-locale.ts

@@ -39,20 +39,21 @@ export default function createPrettierLoader(options: PrettierLoaderOptions): IL
       };
 
       try {
+        // format with prettier
         const result = await prettier.format(data, config);
         return result;
       } catch (error) {
         if (error instanceof Error && error.message.startsWith("Cannot find package")) {
           console.log();
-          console.log("Prettier is missing some dependecies - installing all project dependencies");
+          console.log("⚠️  Prettier plugins are not installed. Formatting without plugins.");
+          console.log("⚠️  To use prettier plugins install project dependencies before running Lingo.dev.");
 
-          // prettier is missing dependencies - install all project dependencies
-          installDependencies();
+          config.plugins = [];
 
-          // clear file system structure cache to find newly installed dependencies
+          // clear file system structure cache
           await prettier.clearConfigCache();
 
-          // try to format again
+          // format again without plugins
           const result = await prettier.format(data, config);
           return result;
         } else {
@@ -71,31 +72,3 @@ async function loadPrettierConfig(filePath: string) {
     return {};
   }
 }
-
-// install all dependencies using package manager
-async function installDependencies() {
-  const packageManager = await getPackageManager();
-  console.log(`Installing dependencies using ${packageManager}`);
-  execSync(`${packageManager} install --frozen-lockfile`, { stdio: "inherit" });
-  console.log(`Dependencies installed`);
-}
-
-// determine if yarn or pnpm is used based on lockfile, otherwise use npm
-async function getPackageManager() {
-  const yarnLockfile = path.resolve(process.cwd(), "yarn.lock");
-  if (fs.existsSync(yarnLockfile)) {
-    return "yarn";
-  }
-
-  const pnpmLockfile = path.resolve(process.cwd(), "pnpm-lock.yaml");
-  if (fs.existsSync(pnpmLockfile)) {
-    return "pnpm";
-  }
-
-  const bunLockfile = path.resolve(process.cwd(), "bun.lock");
-  if (fs.existsSync(bunLockfile)) {
-    return "bun";
-  }
-
-  return "npm";
-}