Merge branch 'lingodotdev:main' into fix/1733-batch-size

Author: Hellnight2005

packages/cli/CHANGELOG.md

@@ -1,5 +1,15 @@
 # lingo.dev
 
+## 0.133.8
+
+### Patch Changes
+
+- [#2062](https://github.com/lingodotdev/lingo.dev/pull/2062) [`10e6364`](https://github.com/lingodotdev/lingo.dev/commit/10e636479046da5d53d059e539497195191a99fc) Thanks [@AndreyHirsa](https://github.com/AndreyHirsa)! - Migrate PostHog tracking identity from email to database user ID
+
+- Updated dependencies [[`10e6364`](https://github.com/lingodotdev/lingo.dev/commit/10e636479046da5d53d059e539497195191a99fc)]:
+  - @lingo.dev/_sdk@0.16.2
+  - @lingo.dev/_compiler@0.12.2
+
 ## 0.133.7
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lingo.dev",
-  "version": "0.133.7",
+  "version": "0.133.8",
   "description": "Lingo.dev CLI",
   "private": false,
   "repository": {

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

@@ -34,7 +34,7 @@ import externalEditor from "external-editor";
 import updateGitignore from "../utils/update-gitignore";
 import createProcessor from "../processor";
 import { withExponentialBackoff } from "../utils/exp-backoff";
-import trackEvent from "../utils/observability";
+import trackEvent, { UserIdentity } from "../utils/observability";
 import { createDeltaProcessor } from "../utils/delta";
 
 export default new Command()
@@ -140,7 +140,7 @@ export default new Command()
     }
 
     let hasErrors = false;
-    let email: string | null = null;
+    let userIdentity: UserIdentity = null;
     const errorDetails: ErrorDetail[] = [];
     try {
       ora.start("Loading configuration...");
@@ -156,15 +156,15 @@ export default new Command()
       const isByokMode = !!i18nConfig?.provider;
 
       if (isByokMode) {
-        email = null;
+        userIdentity = null;
         ora.succeed("Using external provider (BYOK mode)");
       } else {
         const auth = await validateAuth(settings);
-        email = auth.email;
+        userIdentity = { email: auth.email, id: auth.id };
         ora.succeed(`Authenticated as ${auth.email}`);
       }
 
-      await trackEvent(email, "cmd.i18n.start", {
+      await trackEvent(userIdentity, "cmd.i18n.start", {
         i18nConfig,
         flags,
       });
@@ -591,7 +591,7 @@ export default new Command()
       console.log();
       if (!hasErrors) {
         ora.succeed("Localization completed.");
-        await trackEvent(email, "cmd.i18n.success", {
+        await trackEvent(userIdentity, "cmd.i18n.success", {
           i18nConfig: {
             sourceLocale: i18nConfig!.locale.source,
             targetLocales: i18nConfig!.locale.targets,
@@ -606,7 +606,7 @@ export default new Command()
       } else {
         ora.warn("Localization completed with errors.");
         process.exitCode = 1;
-        await trackEvent(email, "cmd.i18n.error", {
+        await trackEvent(userIdentity, "cmd.i18n.error", {
           flags,
           ...aggregateErrorAnalytics(
             errorDetails,
@@ -638,7 +638,7 @@ export default new Command()
         };
       }
 
-      await trackEvent(email, "cmd.i18n.error", {
+      await trackEvent(userIdentity, "cmd.i18n.error", {
         flags,
         errorType,
         errorName: error.name || "Error",

packages/cli/src/cli/cmd/run/_utils.ts

@@ -1,20 +1,25 @@
 import { CmdRunContext } from "./_types";
+import { UserIdentity } from "../../utils/observability";
 
 /**
- * Determines the user's email for tracking purposes.
+ * Determines the user's identity for tracking purposes.
  * Returns null if using BYOK mode or if authentication fails.
  */
-export async function determineEmail(
+export async function determineUserIdentity(
   ctx: CmdRunContext,
-): Promise<string | null> {
+): Promise<UserIdentity> {
   const isByokMode = !!ctx.config?.provider;
 
   if (isByokMode) {
     return null;
   } else {
     try {
       const authStatus = await ctx.localizer?.checkAuth();
-      return authStatus?.username || null;
+      if (!authStatus?.username || !authStatus?.userId) return null;
+      return {
+        email: authStatus.username,
+        id: authStatus.userId,
+      };
     } catch {
       return null;
     }

packages/cli/src/cli/cmd/run/index.ts

@@ -18,8 +18,8 @@ import {
   pauseIfDebug,
   renderSummary,
 } from "../../utils/ui";
-import trackEvent from "../../utils/observability";
-import { determineEmail } from "./_utils";
+import trackEvent, { UserIdentity } from "../../utils/observability";
+import { determineUserIdentity } from "./_utils";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -129,7 +129,7 @@ export default new Command()
     (val: string) => parseInt(val),
   )
   .action(async (args) => {
-    let email: string | null = null;
+    let userIdentity: UserIdentity = null;
     try {
       const ctx: CmdRunContext = {
         flags: flagsSchema.parse(args),
@@ -148,9 +148,9 @@ export default new Command()
 
       await setup(ctx);
 
-      email = await determineEmail(ctx);
+      userIdentity = await determineUserIdentity(ctx);
 
-      await trackEvent(email, "cmd.run.start", {
+      await trackEvent(userIdentity, "cmd.run.start", {
         config: ctx.config,
         flags: ctx.flags,
       });
@@ -181,16 +181,16 @@ export default new Command()
         await watch(ctx);
       }
 
-      await trackEvent(email, "cmd.run.success", {
+      await trackEvent(userIdentity, "cmd.run.success", {
         config: ctx.config,
         flags: ctx.flags,
       });
       await new Promise((resolve) => setTimeout(resolve, 50));
     } catch (error: any) {
-      await trackEvent(email, "cmd.run.error", {
+      await trackEvent(userIdentity, "cmd.run.error", {
         flags: args,
         error: error.message,
-        authenticated: !!email,
+        authenticated: !!userIdentity,
       });
       await new Promise((resolve) => setTimeout(resolve, 50));
       // Play sad sound if sound flag is enabled

packages/cli/src/cli/cmd/status.ts

@@ -18,7 +18,7 @@ import { getBuckets } from "../utils/buckets";
 import chalk from "chalk";
 import Table from "cli-table3";
 import { createDeltaProcessor } from "../utils/delta";
-import trackEvent from "../utils/observability";
+import trackEvent, { UserIdentity } from "../utils/observability";
 import { minimatch } from "minimatch";
 import { exitGracefully } from "../utils/exit-gracefully";
 
@@ -63,7 +63,7 @@ export default new Command()
   .action(async function (options) {
     const ora = Ora();
     const flags = parseFlags(options);
-    let email: string | null = null;
+    let userIdentity: UserIdentity = null;
 
     try {
       ora.start("Loading configuration...");
@@ -76,7 +76,7 @@ export default new Command()
         ora.start("Checking authentication status...");
         const auth = await tryAuthenticate(settings);
         if (auth) {
-          email = auth.email;
+          userIdentity = { email: auth.email, id: auth.id };
           ora.succeed(`Authenticated as ${auth.email}`);
         } else {
           ora.info(
@@ -92,7 +92,7 @@ export default new Command()
       ora.succeed("Localization configuration is valid");
 
       // Track event with or without authentication
-      trackEvent(email, "cmd.status.start", {
+      trackEvent(userIdentity, "cmd.status.start", {
         i18nConfig,
         flags,
       });
@@ -356,10 +356,11 @@ export default new Command()
                   )} (${completeKeys.length}/${totalKeysInFile} keys)`,
                 );
               } else {
-                const message = `[${sourceLocale} -> ${targetLocale}] ${parseFloat(completionPercent) > 50
+                const message = `[${sourceLocale} -> ${targetLocale}] ${
+                  parseFloat(completionPercent) > 50
                     ? chalk.yellow(`${completionPercent}% complete`)
                     : chalk.red(`${completionPercent}% complete`)
-                  } (${completeKeys.length}/${totalKeysInFile} keys)`;
+                } (${completeKeys.length}/${totalKeysInFile} keys)`;
 
                 bucketOra.succeed(message);
 
@@ -369,7 +370,8 @@ export default new Command()
                       `    ${chalk.red(`Missing:`)} ${missingKeys.length} keys, ~${wordsToTranslate} words`,
                     );
                     console.log(
-                      `    ${chalk.red(`Missing:`)} ${missingKeys.length
+                      `    ${chalk.red(`Missing:`)} ${
+                        missingKeys.length
                       } keys, ~${wordsToTranslate} words`,
                     );
                     console.log(
@@ -382,7 +384,8 @@ export default new Command()
                   }
                   if (updatedKeys.length > 0) {
                     console.log(
-                      `    ${chalk.yellow(`Updated:`)} ${updatedKeys.length
+                      `    ${chalk.yellow(`Updated:`)} ${
+                        updatedKeys.length
                       } keys that changed in source`,
                     );
                   }
@@ -536,7 +539,8 @@ export default new Command()
 
             console.log(chalk.bold(`\n• ${path}:`));
             console.log(
-              `  ${stats.sourceKeys
+              `  ${
+                stats.sourceKeys
               } source keys, ~${stats.wordCount.toLocaleString()} source words`,
             );
 
@@ -603,14 +607,16 @@ export default new Command()
 
       if (missingLanguages.length > 0) {
         console.log(
-          `• ${chalk.yellow(missingLanguages.join(", "))} ${missingLanguages.length === 1 ? "has" : "have"
+          `• ${chalk.yellow(missingLanguages.join(", "))} ${
+            missingLanguages.length === 1 ? "has" : "have"
           } no translations yet`,
         );
       }
 
       if (completeLanguages.length > 0) {
         console.log(
-          `• ${chalk.green(completeLanguages.join(", "))} ${completeLanguages.length === 1 ? "is" : "are"
+          `• ${chalk.green(completeLanguages.join(", "))} ${
+            completeLanguages.length === 1 ? "is" : "are"
           } completely translated`,
         );
       }
@@ -624,22 +630,22 @@ export default new Command()
       }
 
       // Track successful completion
-      trackEvent(email, "cmd.status.success", {
+      trackEvent(userIdentity, "cmd.status.success", {
         i18nConfig,
         flags,
         totalSourceKeyCount,
         languageStats,
         totalWordsToTranslate,
-        authenticated: !!email,
+        authenticated: !!userIdentity,
       });
       await new Promise((resolve) => setTimeout(resolve, 50));
       exitGracefully();
     } catch (error: any) {
       ora.fail(error.message);
-      trackEvent(email, "cmd.status.error", {
+      trackEvent(userIdentity, "cmd.status.error", {
         flags,
         error: error.message,
-        authenticated: !!email,
+        authenticated: !!userIdentity,
       });
       await new Promise((resolve) => setTimeout(resolve, 50));
       process.exit(1);

packages/cli/src/cli/localizer/_types.ts

@@ -21,6 +21,7 @@ export interface ILocalizer {
   checkAuth: () => Promise<{
     authenticated: boolean;
     username?: string;
+    userId?: string;
     error?: string;
   }>;
   validateSettings?: () => Promise<{ valid: boolean; error?: string }>;

packages/cli/src/cli/localizer/lingodotdev.ts

@@ -46,7 +46,11 @@ export default function createLingoDotDevLocalizer(
               "Invalid API key. Run `lingo.dev login` or check your LINGO_API_KEY.",
           };
         }
-        return { authenticated: true, username: response.email };
+        return {
+          authenticated: true,
+          username: response.email,
+          userId: response.id,
+        };
       } catch (error) {
         const errorMessage =
           error instanceof Error ? error.message : String(error);