@lingo.dev/_compiler 0.9.0 → 0.10.0

package/build/index.cjs

@@ -27,7 +27,7 @@ var _unplugin = require('unplugin');
 // package.json
 var package_default = {
   name: "@lingo.dev/_compiler",
-  version: "0.9.0",
+  version: "0.10.0",
   description: "Lingo.dev Compiler",
   private: false,
   repository: {
@@ -113,44 +113,41 @@ var _dedent = require('dedent'); var _dedent2 = _interopRequireDefault(_dedent);
 // src/utils/observability.ts
 var _nodemachineid = require('node-machine-id'); var machineIdLib = _interopRequireWildcard(_nodemachineid);
 
-// src/utils/repository-id.ts
+// src/utils/org-id.ts
 var _child_process = require('child_process');
-var _crypto = require('crypto');
-var cachedGitRepoId = void 0;
-function hashProjectName(fullPath) {
+var cachedGitOrgId = void 0;
+function extractOrg(fullPath) {
   const parts = fullPath.split("/");
-  if (parts.length !== 2) {
-    return _crypto.createHash.call(void 0, "sha256").update(fullPath).digest("hex").slice(0, 8);
+  if (parts.length < 1) {
+    return null;
   }
-  const [org, project] = parts;
-  const hashedProject = _crypto.createHash.call(void 0, "sha256").update(project).digest("hex").slice(0, 8);
-  return `${org}/${hashedProject}`;
+  return parts[0];
 }
-function getRepositoryId() {
-  const ciRepoId = getCIRepositoryId();
-  if (ciRepoId) return ciRepoId;
-  const gitRepoId = getGitRepositoryId();
-  if (gitRepoId) return gitRepoId;
+function getOrgId() {
+  const ciOrgId = getCIOrgId();
+  if (ciOrgId) return ciOrgId;
+  const gitOrgId = getGitOrgId();
+  if (gitOrgId) return gitOrgId;
   return null;
 }
-function getCIRepositoryId() {
+function getCIOrgId() {
   if (process.env.GITHUB_REPOSITORY) {
-    const hashed = hashProjectName(process.env.GITHUB_REPOSITORY);
-    return `github:${hashed}`;
+    const org = extractOrg(process.env.GITHUB_REPOSITORY);
+    if (org) return `github:${org}`;
   }
   if (process.env.CI_PROJECT_PATH) {
-    const hashed = hashProjectName(process.env.CI_PROJECT_PATH);
-    return `gitlab:${hashed}`;
+    const org = extractOrg(process.env.CI_PROJECT_PATH);
+    if (org) return `gitlab:${org}`;
   }
   if (process.env.BITBUCKET_REPO_FULL_NAME) {
-    const hashed = hashProjectName(process.env.BITBUCKET_REPO_FULL_NAME);
-    return `bitbucket:${hashed}`;
+    const org = extractOrg(process.env.BITBUCKET_REPO_FULL_NAME);
+    if (org) return `bitbucket:${org}`;
   }
   return null;
 }
-function getGitRepositoryId() {
-  if (cachedGitRepoId !== void 0) {
-    return cachedGitRepoId;
+function getGitOrgId() {
+  if (cachedGitOrgId !== void 0) {
+    return cachedGitOrgId;
   }
   try {
     const remoteUrl = _child_process.execSync.call(void 0, "git config --get remote.origin.url", {
@@ -158,13 +155,13 @@ function getGitRepositoryId() {
       stdio: ["pipe", "pipe", "ignore"]
     }).trim();
     if (!remoteUrl) {
-      cachedGitRepoId = null;
+      cachedGitOrgId = null;
       return null;
     }
-    cachedGitRepoId = parseGitUrl(remoteUrl);
-    return cachedGitRepoId;
+    cachedGitOrgId = parseGitUrl(remoteUrl);
+    return cachedGitOrgId;
   } catch (e) {
-    cachedGitRepoId = null;
+    cachedGitOrgId = null;
     return null;
   }
 }
@@ -182,11 +179,12 @@ function parseGitUrl(url) {
   const httpsMatch = cleanUrl.match(/\/([^/]+\/[^/]+)$/);
   const repoPath = _optionalChain([sshMatch, 'optionalAccess', _2 => _2[1]]) || _optionalChain([httpsMatch, 'optionalAccess', _3 => _3[1]]);
   if (!repoPath) return null;
-  const hashedPath = hashProjectName(repoPath);
+  const org = extractOrg(repoPath);
+  if (!org) return null;
   if (platform) {
-    return `${platform}:${hashedPath}`;
+    return `${platform}:${org}`;
   }
-  return `git:${hashedPath}`;
+  return `git:${org}`;
 }
 
 // src/utils/observability.ts
@@ -219,7 +217,7 @@ async function trackEvent(event, properties) {
         isByokMode: _optionalChain([properties, 'optionalAccess', _4 => _4.models]) !== "lingo.dev",
         tracking_version: TRACKING_VERSION,
         distinct_id_source: identityInfo.distinct_id_source,
-        project_id: identityInfo.project_id,
+        org_id: identityInfo.org_id,
         meta: {
           version: process.env.npm_package_version,
           isCi: process.env.CI === "true"
@@ -234,21 +232,20 @@ async function trackEvent(event, properties) {
   }
 }
 async function getDistinctId() {
+  const orgId = getOrgId();
   const email = await tryGetEmail();
   if (email) {
-    const projectId = getRepositoryId();
     return {
       distinct_id: email,
       distinct_id_source: "email",
-      project_id: projectId
+      org_id: orgId
     };
   }
-  const repoId = getRepositoryId();
-  if (repoId) {
+  if (orgId) {
     return {
-      distinct_id: repoId,
-      distinct_id_source: "git_repo",
-      project_id: repoId
+      distinct_id: orgId,
+      distinct_id_source: "git_org",
+      org_id: orgId
     };
   }
   const deviceId = `device-${await machineIdLib.machineId()}`;
@@ -260,7 +257,7 @@ async function getDistinctId() {
   return {
     distinct_id: deviceId,
     distinct_id_source: "device",
-    project_id: null
+    org_id: null
   };
 }
 async function tryGetEmail() {

package/build/index.mjs

@@ -27,7 +27,7 @@ import { createUnplugin } from "unplugin";
 // package.json
 var package_default = {
   name: "@lingo.dev/_compiler",
-  version: "0.9.0",
+  version: "0.10.0",
   description: "Lingo.dev Compiler",
   private: false,
   repository: {
@@ -113,44 +113,41 @@ import dedent from "dedent";
 // src/utils/observability.ts
 import * as machineIdLib from "node-machine-id";
 
-// src/utils/repository-id.ts
+// src/utils/org-id.ts
 import { execSync } from "child_process";
-import { createHash } from "crypto";
-var cachedGitRepoId = void 0;
-function hashProjectName(fullPath) {
+var cachedGitOrgId = void 0;
+function extractOrg(fullPath) {
   const parts = fullPath.split("/");
-  if (parts.length !== 2) {
-    return createHash("sha256").update(fullPath).digest("hex").slice(0, 8);
+  if (parts.length < 1) {
+    return null;
   }
-  const [org, project] = parts;
-  const hashedProject = createHash("sha256").update(project).digest("hex").slice(0, 8);
-  return `${org}/${hashedProject}`;
+  return parts[0];
 }
-function getRepositoryId() {
-  const ciRepoId = getCIRepositoryId();
-  if (ciRepoId) return ciRepoId;
-  const gitRepoId = getGitRepositoryId();
-  if (gitRepoId) return gitRepoId;
+function getOrgId() {
+  const ciOrgId = getCIOrgId();
+  if (ciOrgId) return ciOrgId;
+  const gitOrgId = getGitOrgId();
+  if (gitOrgId) return gitOrgId;
   return null;
 }
-function getCIRepositoryId() {
+function getCIOrgId() {
   if (process.env.GITHUB_REPOSITORY) {
-    const hashed = hashProjectName(process.env.GITHUB_REPOSITORY);
-    return `github:${hashed}`;
+    const org = extractOrg(process.env.GITHUB_REPOSITORY);
+    if (org) return `github:${org}`;
   }
   if (process.env.CI_PROJECT_PATH) {
-    const hashed = hashProjectName(process.env.CI_PROJECT_PATH);
-    return `gitlab:${hashed}`;
+    const org = extractOrg(process.env.CI_PROJECT_PATH);
+    if (org) return `gitlab:${org}`;
   }
   if (process.env.BITBUCKET_REPO_FULL_NAME) {
-    const hashed = hashProjectName(process.env.BITBUCKET_REPO_FULL_NAME);
-    return `bitbucket:${hashed}`;
+    const org = extractOrg(process.env.BITBUCKET_REPO_FULL_NAME);
+    if (org) return `bitbucket:${org}`;
   }
   return null;
 }
-function getGitRepositoryId() {
-  if (cachedGitRepoId !== void 0) {
-    return cachedGitRepoId;
+function getGitOrgId() {
+  if (cachedGitOrgId !== void 0) {
+    return cachedGitOrgId;
   }
   try {
     const remoteUrl = execSync("git config --get remote.origin.url", {
@@ -158,13 +155,13 @@ function getGitRepositoryId() {
       stdio: ["pipe", "pipe", "ignore"]
     }).trim();
     if (!remoteUrl) {
-      cachedGitRepoId = null;
+      cachedGitOrgId = null;
       return null;
     }
-    cachedGitRepoId = parseGitUrl(remoteUrl);
-    return cachedGitRepoId;
+    cachedGitOrgId = parseGitUrl(remoteUrl);
+    return cachedGitOrgId;
   } catch {
-    cachedGitRepoId = null;
+    cachedGitOrgId = null;
     return null;
   }
 }
@@ -182,11 +179,12 @@ function parseGitUrl(url) {
   const httpsMatch = cleanUrl.match(/\/([^/]+\/[^/]+)$/);
   const repoPath = sshMatch?.[1] || httpsMatch?.[1];
   if (!repoPath) return null;
-  const hashedPath = hashProjectName(repoPath);
+  const org = extractOrg(repoPath);
+  if (!org) return null;
   if (platform) {
-    return `${platform}:${hashedPath}`;
+    return `${platform}:${org}`;
   }
-  return `git:${hashedPath}`;
+  return `git:${org}`;
 }
 
 // src/utils/observability.ts
@@ -219,7 +217,7 @@ async function trackEvent(event, properties) {
         isByokMode: properties?.models !== "lingo.dev",
         tracking_version: TRACKING_VERSION,
         distinct_id_source: identityInfo.distinct_id_source,
-        project_id: identityInfo.project_id,
+        org_id: identityInfo.org_id,
         meta: {
           version: process.env.npm_package_version,
           isCi: process.env.CI === "true"
@@ -234,21 +232,20 @@ async function trackEvent(event, properties) {
   }
 }
 async function getDistinctId() {
+  const orgId = getOrgId();
   const email = await tryGetEmail();
   if (email) {
-    const projectId = getRepositoryId();
     return {
       distinct_id: email,
       distinct_id_source: "email",
-      project_id: projectId
+      org_id: orgId
     };
   }
-  const repoId = getRepositoryId();
-  if (repoId) {
+  if (orgId) {
     return {
-      distinct_id: repoId,
-      distinct_id_source: "git_repo",
-      project_id: repoId
+      distinct_id: orgId,
+      distinct_id_source: "git_org",
+      org_id: orgId
     };
   }
   const deviceId = `device-${await machineIdLib.machineId()}`;
@@ -260,7 +257,7 @@ async function getDistinctId() {
   return {
     distinct_id: deviceId,
     distinct_id_source: "device",
-    project_id: null
+    org_id: null
   };
 }
 async function tryGetEmail() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingo.dev/_compiler",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Lingo.dev Compiler",
   "private": false,
   "repository": {