@lingo.dev/_sdk 0.17.2 → 0.17.3

package/build/index.cjs

@@ -29,20 +29,16 @@ function trackEvent(apiKey, apiUrl, event, properties) {
   if (process.env.DO_NOT_TRACK === "1") {
     return;
   }
-  resolveIdentityAndCapture(apiKey, apiUrl, event, properties).catch(
-    (error) => {
-      if (process.env.DEBUG === "true") {
-        console.error("[Tracking] Error:", error);
-      }
+  resolveIdentityAndCapture(apiKey, apiUrl, event, properties).catch((error) => {
+    if (process.env.DEBUG === "true") {
+      console.error("[Tracking] Error:", error);
     }
-  );
+  });
 }
 async function resolveIdentityAndCapture(apiKey, apiUrl, event, properties) {
-  const { identity, email } = await getDistinctId(apiKey, apiUrl);
+  const { identity, email, organizationId } = await getDistinctId(apiKey, apiUrl);
   if (process.env.DEBUG === "true") {
-    console.log(
-      `[Tracking] Event: ${event}, ID: ${identity.distinct_id}, Source: ${identity.distinct_id_source}`
-    );
+    console.log(`[Tracking] Event: ${event}, ID: ${identity.distinct_id}, Source: ${identity.distinct_id_source}`);
   }
   const { PostHog } = await Promise.resolve().then(() => _interopRequireWildcard(require("posthog-node")));
   const posthog = new PostHog(POSTHOG_API_KEY, {
@@ -54,6 +50,7 @@ async function resolveIdentityAndCapture(apiKey, apiUrl, event, properties) {
     await posthog.capture({
       distinctId: identity.distinct_id,
       event,
+      ...organizationId ? { groups: { organization: organizationId } } : {},
       properties: {
         ...properties,
         $set: { ..._optionalChain([properties, 'optionalAccess', _ => _.$set]) || {}, ...email ? { email } : {} },
@@ -62,12 +59,6 @@ async function resolveIdentityAndCapture(apiKey, apiUrl, event, properties) {
         distinct_id_source: identity.distinct_id_source
       }
     });
-    if (email) {
-      await posthog.alias({
-        distinctId: identity.distinct_id,
-        alias: email
-      });
-    }
   } finally {
     await posthog.shutdown();
   }
@@ -76,8 +67,8 @@ async function getDistinctId(apiKey, apiUrl) {
   const cached = identityCache.get(apiKey);
   if (cached) return cached;
   try {
-    const res = await fetch(`${apiUrl}/users/me`, {
-      method: "GET",
+    const res = await fetch(`${apiUrl}/whoami`, {
+      method: "POST",
       headers: {
         "X-API-Key": apiKey,
         "Content-Type": "application/json"
@@ -85,14 +76,27 @@ async function getDistinctId(apiKey, apiUrl) {
     });
     if (res.ok) {
       const payload = await res.json();
-      if (_optionalChain([payload, 'optionalAccess', _2 => _2.id])) {
-        const result = {
-          identity: {
-            distinct_id: payload.id,
-            distinct_id_source: "database_id"
-          },
-          email: payload.email || void 0
+      const organizationId = typeof _optionalChain([payload, 'optionalAccess', _2 => _2.organizationId]) === "string" ? payload.organizationId : void 0;
+      let result;
+      if (typeof _optionalChain([payload, 'optionalAccess', _3 => _3.userId]) === "string") {
+        result = {
+          identity: { distinct_id: payload.userId, distinct_id_source: "database_id" },
+          email: payload.email || void 0,
+          organizationId
+        };
+      } else if (typeof _optionalChain([payload, 'optionalAccess', _4 => _4.keyId]) === "string") {
+        result = {
+          identity: { distinct_id: payload.keyId, distinct_id_source: "api_key_id" },
+          organizationId
+        };
+      } else if (_optionalChain([payload, 'optionalAccess', _5 => _5.id])) {
+        result = {
+          identity: { distinct_id: payload.id, distinct_id_source: "database_id" },
+          email: payload.email || void 0,
+          organizationId
         };
+      }
+      if (result) {
         identityCache.set(apiKey, result);
         return result;
       }
@@ -157,7 +161,7 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
       if (parsed && typeof parsed.message === "string") {
         return parsed.message;
       }
-      if (_optionalChain([parsed, 'optionalAccess', _3 => _3._tag]) === "NotFoundError") {
+      if (_optionalChain([parsed, 'optionalAccess', _6 => _6._tag]) === "NotFoundError") {
         return `${parsed.entityType} not found: ${parsed.id}`;
       }
       return text;
@@ -183,7 +187,7 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
    */
   static sleep(ms, signal) {
     return new Promise((resolve, reject) => {
-      if (_optionalChain([signal, 'optionalAccess', _4 => _4.aborted])) {
+      if (_optionalChain([signal, 'optionalAccess', _7 => _7.aborted])) {
         reject(new Error("Operation was aborted"));
         return;
       }
@@ -192,10 +196,10 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
         reject(new Error("Operation was aborted"));
       };
       const timer = setTimeout(() => {
-        _optionalChain([signal, 'optionalAccess', _5 => _5.removeEventListener, 'call', _6 => _6("abort", onAbort)]);
+        _optionalChain([signal, 'optionalAccess', _8 => _8.removeEventListener, 'call', _9 => _9("abort", onAbort)]);
         resolve();
       }, ms);
-      _optionalChain([signal, 'optionalAccess', _7 => _7.addEventListener, 'call', _8 => _8("abort", onAbort, { once: true })]);
+      _optionalChain([signal, 'optionalAccess', _10 => _10.addEventListener, 'call', _11 => _11("abort", onAbort, { once: true })]);
     });
   }
   /**
@@ -221,20 +225,20 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
   async fetchWithRetry(url, init, signal) {
     const { maxRetries } = this.config;
     for (let attempt = 0; attempt <= maxRetries; attempt++) {
-      if (_optionalChain([signal, 'optionalAccess', _9 => _9.aborted])) {
+      if (_optionalChain([signal, 'optionalAccess', _12 => _12.aborted])) {
         throw new Error("Operation was aborted");
       }
       try {
         const res = await fetch(url, init);
         const isServerError = res.status >= 500 && res.status < 600;
         if (isServerError && attempt < maxRetries) {
-          await _optionalChain([res, 'access', _10 => _10.body, 'optionalAccess', _11 => _11.cancel, 'call', _12 => _12()]);
+          await _optionalChain([res, 'access', _13 => _13.body, 'optionalAccess', _14 => _14.cancel, 'call', _15 => _15()]);
           await _LingoDotDevEngine.sleep(this.backoffDelay(attempt), signal);
           continue;
         }
         return res;
       } catch (error) {
-        if (_optionalChain([signal, 'optionalAccess', _13 => _13.aborted])) {
+        if (_optionalChain([signal, 'optionalAccess', _16 => _16.aborted])) {
           throw error;
         }
         if (attempt < maxRetries) {
@@ -663,7 +667,7 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
             break;
           }
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _14 => _14.textContent, 'optionalAccess', _15 => _15.trim, 'call', _16 => _16()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _17 => _17.textContent, 'optionalAccess', _18 => _18.trim, 'call', _19 => _19()])
           );
           const index = siblings.indexOf(current);
           if (index !== -1) {
@@ -683,7 +687,7 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
           parent = parent.parentElement;
         }
         if (node.nodeType === 3) {
-          const text = _optionalChain([node, 'access', _17 => _17.textContent, 'optionalAccess', _18 => _18.trim, 'call', _19 => _19()]) || "";
+          const text = _optionalChain([node, 'access', _20 => _20.textContent, 'optionalAccess', _21 => _21.trim, 'call', _22 => _22()]) || "";
           if (text) {
             extractedContent[getPath(node)] = text;
           }
@@ -698,15 +702,15 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
             }
           });
           Array.from(element.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _20 => _20.textContent, 'optionalAccess', _21 => _21.trim, 'call', _22 => _22()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _23 => _23.textContent, 'optionalAccess', _24 => _24.trim, 'call', _25 => _25()])
           ).forEach(processNode);
         }
       };
       Array.from(document.head.childNodes).filter(
-        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _23 => _23.textContent, 'optionalAccess', _24 => _24.trim, 'call', _25 => _25()])
+        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _26 => _26.textContent, 'optionalAccess', _27 => _27.trim, 'call', _28 => _28()])
       ).forEach(processNode);
       Array.from(document.body.childNodes).filter(
-        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _26 => _26.textContent, 'optionalAccess', _27 => _27.trim, 'call', _28 => _28()])
+        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _29 => _29.textContent, 'optionalAccess', _30 => _30.trim, 'call', _31 => _31()])
       ).forEach(processNode);
       const localizedContent = await this._localizeRaw(
         extractedContent,
@@ -722,10 +726,10 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
         let current = parent;
         for (const index of indices) {
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _29 => _29.textContent, 'optionalAccess', _30 => _30.trim, 'call', _31 => _31()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _32 => _32.textContent, 'optionalAccess', _33 => _33.trim, 'call', _34 => _34()])
           );
           current = siblings[parseInt(index)] || null;
-          if (_optionalChain([current, 'optionalAccess', _32 => _32.nodeType]) === 1) {
+          if (_optionalChain([current, 'optionalAccess', _35 => _35.nodeType]) === 1) {
             parent = current;
           }
         }
@@ -835,7 +839,7 @@ var LingoDotDevEngine = (_class = class _LingoDotDevEngine {
     });
     if (res.ok) {
       const payload = await res.json();
-      if (!_optionalChain([payload, 'optionalAccess', _33 => _33.email])) {
+      if (!_optionalChain([payload, 'optionalAccess', _36 => _36.email])) {
         return null;
       }
       return {

package/build/index.mjs

@@ -29,20 +29,16 @@ function trackEvent(apiKey, apiUrl, event, properties) {
   if (process.env.DO_NOT_TRACK === "1") {
     return;
   }
-  resolveIdentityAndCapture(apiKey, apiUrl, event, properties).catch(
-    (error) => {
-      if (process.env.DEBUG === "true") {
-        console.error("[Tracking] Error:", error);
-      }
+  resolveIdentityAndCapture(apiKey, apiUrl, event, properties).catch((error) => {
+    if (process.env.DEBUG === "true") {
+      console.error("[Tracking] Error:", error);
     }
-  );
+  });
 }
 async function resolveIdentityAndCapture(apiKey, apiUrl, event, properties) {
-  const { identity, email } = await getDistinctId(apiKey, apiUrl);
+  const { identity, email, organizationId } = await getDistinctId(apiKey, apiUrl);
   if (process.env.DEBUG === "true") {
-    console.log(
-      `[Tracking] Event: ${event}, ID: ${identity.distinct_id}, Source: ${identity.distinct_id_source}`
-    );
+    console.log(`[Tracking] Event: ${event}, ID: ${identity.distinct_id}, Source: ${identity.distinct_id_source}`);
   }
   const { PostHog } = await import("posthog-node");
   const posthog = new PostHog(POSTHOG_API_KEY, {
@@ -54,6 +50,7 @@ async function resolveIdentityAndCapture(apiKey, apiUrl, event, properties) {
     await posthog.capture({
       distinctId: identity.distinct_id,
       event,
+      ...organizationId ? { groups: { organization: organizationId } } : {},
       properties: {
         ...properties,
         $set: { ...properties?.$set || {}, ...email ? { email } : {} },
@@ -62,12 +59,6 @@ async function resolveIdentityAndCapture(apiKey, apiUrl, event, properties) {
         distinct_id_source: identity.distinct_id_source
       }
     });
-    if (email) {
-      await posthog.alias({
-        distinctId: identity.distinct_id,
-        alias: email
-      });
-    }
   } finally {
     await posthog.shutdown();
   }
@@ -76,8 +67,8 @@ async function getDistinctId(apiKey, apiUrl) {
   const cached = identityCache.get(apiKey);
   if (cached) return cached;
   try {
-    const res = await fetch(`${apiUrl}/users/me`, {
-      method: "GET",
+    const res = await fetch(`${apiUrl}/whoami`, {
+      method: "POST",
       headers: {
         "X-API-Key": apiKey,
         "Content-Type": "application/json"
@@ -85,14 +76,27 @@ async function getDistinctId(apiKey, apiUrl) {
     });
     if (res.ok) {
       const payload = await res.json();
-      if (payload?.id) {
-        const result = {
-          identity: {
-            distinct_id: payload.id,
-            distinct_id_source: "database_id"
-          },
-          email: payload.email || void 0
+      const organizationId = typeof payload?.organizationId === "string" ? payload.organizationId : void 0;
+      let result;
+      if (typeof payload?.userId === "string") {
+        result = {
+          identity: { distinct_id: payload.userId, distinct_id_source: "database_id" },
+          email: payload.email || void 0,
+          organizationId
+        };
+      } else if (typeof payload?.keyId === "string") {
+        result = {
+          identity: { distinct_id: payload.keyId, distinct_id_source: "api_key_id" },
+          organizationId
         };
+      } else if (payload?.id) {
+        result = {
+          identity: { distinct_id: payload.id, distinct_id_source: "database_id" },
+          email: payload.email || void 0,
+          organizationId
+        };
+      }
+      if (result) {
         identityCache.set(apiKey, result);
         return result;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingo.dev/_sdk",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": "Lingo.dev JS SDK",
   "private": false,
   "repository": {