lingo.dev 0.125.0 → 0.125.2

package/build/cli.cjs

@@ -14,7 +14,7 @@ var _ora = require('ora'); var _ora2 = _interopRequireDefault(_ora);
 
 // src/cli/utils/settings.ts
 var _os = require('os'); var _os2 = _interopRequireDefault(_os);
-var _path = require('path'); var path15 = _interopRequireWildcard(_path); var path16 = _interopRequireWildcard(_path);
+var _path = require('path'); var path15 = _interopRequireWildcard(_path); var path17 = _interopRequireWildcard(_path);
 var _zod = require('zod'); var _zod2 = _interopRequireDefault(_zod);
 var _fs = require('fs'); var fs13 = _interopRequireWildcard(_fs);
 var _ini = require('ini'); var _ini2 = _interopRequireDefault(_ini);
@@ -10998,44 +10998,41 @@ function withExponentialBackoff(fn, maxAttempts = 3, baseDelay = 1e3) {
 var _nodemachineid = require('node-machine-id'); var _nodemachineid2 = _interopRequireDefault(_nodemachineid);
 var _https = require('https'); var _https2 = _interopRequireDefault(_https);
 
-// src/cli/utils/repository-id.ts
+// src/cli/utils/org-id.ts
 var _child_process = require('child_process'); var cp = _interopRequireWildcard(_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);
-  }
-  const [org, project] = parts;
-  const hashedProject = _crypto.createHash.call(void 0, "sha256").update(project).digest("hex").slice(0, 8);
-  return `${org}/${hashedProject}`;
-}
-function getRepositoryId() {
-  const ciRepoId = getCIRepositoryId();
-  if (ciRepoId) return ciRepoId;
-  const gitRepoId = getGitRepositoryId();
-  if (gitRepoId) return gitRepoId;
+  if (parts.length < 1) {
+    return null;
+  }
+  return parts[0];
+}
+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", {
@@ -11043,13 +11040,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 (e3) {
-    cachedGitRepoId = null;
+    cachedGitOrgId = null;
     return null;
   }
 }
@@ -11067,11 +11064,12 @@ function parseGitUrl(url) {
   const httpsMatch = cleanUrl.match(/\/([^/]+\/[^/]+)$/);
   const repoPath = _optionalChain([sshMatch, 'optionalAccess', _349 => _349[1]]) || _optionalChain([httpsMatch, 'optionalAccess', _350 => _350[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/cli/utils/observability.ts
@@ -11082,20 +11080,19 @@ var POSTHOG_PATH = "/i/v0/e/";
 var REQUEST_TIMEOUT_MS = 3e3;
 var TRACKING_VERSION = "2.0";
 function determineDistinctId(email) {
+  const orgId = getOrgId();
   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-${machineIdSync()}`;
@@ -11107,7 +11104,7 @@ function determineDistinctId(email) {
   return {
     distinct_id: deviceId,
     distinct_id_source: "device",
-    project_id: null
+    org_id: null
   };
 }
 function trackEvent(email, event, properties) {
@@ -11132,7 +11129,7 @@ function trackEvent(email, event, properties) {
           $lib_version: process.env.npm_package_version || "unknown",
           tracking_version: TRACKING_VERSION,
           distinct_id_source: identityInfo.distinct_id_source,
-          project_id: identityInfo.project_id,
+          org_id: identityInfo.org_id,
           node_version: process.version,
           is_ci: !!process.env.CI,
           debug_enabled: process.env.DEBUG === "true"
@@ -11203,6 +11200,134 @@ function checkIfFileExists(filePath) {
 // src/cli/utils/delta.ts
 
 
+
+// src/cli/utils/lockfile.ts
+
+
+
+
+
+
+function createLockfileHelper() {
+  return {
+    isLockfileExists: () => {
+      const lockfilePath = _getLockfilePath();
+      return fs13.default.existsSync(lockfilePath);
+    },
+    registerSourceData: (pathPattern, sourceData) => {
+      const lockfile = _loadLockfile();
+      const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
+      const sectionChecksums = _lodash2.default.mapValues(sourceData, (value) => _objecthash.MD5.call(void 0, value));
+      lockfile.checksums[sectionKey] = sectionChecksums;
+      _saveLockfile(lockfile);
+    },
+    registerPartialSourceData: (pathPattern, partialSourceData) => {
+      const lockfile = _loadLockfile();
+      const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
+      const sectionChecksums = _lodash2.default.mapValues(
+        partialSourceData,
+        (value) => _objecthash.MD5.call(void 0, value)
+      );
+      lockfile.checksums[sectionKey] = _lodash2.default.merge(
+        {},
+        _nullishCoalesce(lockfile.checksums[sectionKey], () => ( {})),
+        sectionChecksums
+      );
+      _saveLockfile(lockfile);
+    },
+    extractUpdatedData: (pathPattern, sourceData) => {
+      const lockfile = _loadLockfile();
+      const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
+      const currentChecksums = _lodash2.default.mapValues(sourceData, (value) => _objecthash.MD5.call(void 0, value));
+      const savedChecksums = lockfile.checksums[sectionKey] || {};
+      const updatedData = _lodash2.default.pickBy(
+        sourceData,
+        (value, key) => savedChecksums[key] !== currentChecksums[key]
+      );
+      return updatedData;
+    }
+  };
+  function _loadLockfile() {
+    const lockfilePath = _getLockfilePath();
+    if (!fs13.default.existsSync(lockfilePath)) {
+      return LockfileSchema.parse({});
+    }
+    const content = fs13.default.readFileSync(lockfilePath, "utf-8");
+    const { deduplicatedContent, duplicatesRemoved } = deduplicateLockfileYaml(content);
+    if (duplicatesRemoved > 0) {
+      fs13.default.writeFileSync(lockfilePath, deduplicatedContent);
+      console.log(
+        `Removed ${duplicatesRemoved} duplicate ${duplicatesRemoved === 1 ? "entry" : "entries"} from i18n.lock`
+      );
+    }
+    const parsed = LockfileSchema.parse(_yaml2.default.parse(deduplicatedContent));
+    return parsed;
+  }
+  function _saveLockfile(lockfile) {
+    const lockfilePath = _getLockfilePath();
+    const content = _yaml2.default.stringify(lockfile);
+    fs13.default.writeFileSync(lockfilePath, content);
+  }
+  function _getLockfilePath() {
+    return path15.default.join(process.cwd(), "i18n.lock");
+  }
+}
+var LockfileSchema = _zod2.default.object({
+  version: _zod2.default.literal(1).prefault(1),
+  checksums: _zod2.default.record(
+    _zod2.default.string(),
+    // localizable files' keys
+    _zod2.default.record(
+      // checksums hashmap
+      _zod2.default.string(),
+      // key
+      _zod2.default.string()
+      // checksum of the key's value in the source locale
+    ).prefault({})
+  ).prefault({})
+});
+function deduplicateLockfileYaml(yamlContent) {
+  const doc = _yaml2.default.parseDocument(yamlContent);
+  let duplicatesRemoved = 0;
+  if (doc.contents && _yaml2.default.isMap(doc.contents)) {
+    const checksums = doc.contents.get("checksums");
+    if (checksums && _yaml2.default.isMap(checksums)) {
+      for (const pathItem of checksums.items) {
+        if (_yaml2.default.isMap(pathItem.value)) {
+          const keyPositions = /* @__PURE__ */ new Map();
+          for (let i = 0; i < pathItem.value.items.length; i++) {
+            const translationItem = pathItem.value.items[i];
+            const key = String(_yaml2.default.isScalar(translationItem.key) ? translationItem.key.value : translationItem.key);
+            if (!keyPositions.has(key)) {
+              keyPositions.set(key, []);
+            }
+            keyPositions.get(key).push(i);
+          }
+          const indicesToRemove = [];
+          for (const positions of keyPositions.values()) {
+            if (positions.length > 1) {
+              indicesToRemove.push(...positions.slice(0, -1));
+              duplicatesRemoved += positions.length - 1;
+            }
+          }
+          indicesToRemove.sort((a, b) => b - a);
+          for (const index of indicesToRemove) {
+            pathItem.value.items.splice(index, 1);
+          }
+        }
+      }
+    }
+  }
+  const cleanedData = doc.toJSON();
+  const cleanDoc = new _yaml2.default.Document(cleanedData);
+  const deduplicatedContent = cleanDoc.toString();
+  return {
+    deduplicatedContent,
+    duplicatesRemoved
+  };
+}
+
+// src/cli/utils/delta.ts
 var LockSchema = _zod2.default.object({
   version: _zod2.default.literal(1).prefault(1),
   checksums: _zod2.default.record(
@@ -11218,7 +11343,7 @@ var LockSchema = _zod2.default.object({
   ).prefault({})
 });
 function createDeltaProcessor(fileKey) {
-  const lockfilePath = path16.join(process.cwd(), "i18n.lock");
+  const lockfilePath = path17.join(process.cwd(), "i18n.lock");
   return {
     async checkIfLockExists() {
       return checkIfFileExists(lockfilePath);
@@ -11267,12 +11392,21 @@ function createDeltaProcessor(fileKey) {
     },
     async loadLock() {
       const lockfileContent = tryReadFile(lockfilePath, null);
-      const lockfileYaml = lockfileContent ? _yaml2.default.parse(lockfileContent) : null;
-      const lockfileData = lockfileYaml ? LockSchema.parse(lockfileYaml) : {
-        version: 1,
-        checksums: {}
-      };
-      return lockfileData;
+      if (!lockfileContent) {
+        return {
+          version: 1,
+          checksums: {}
+        };
+      }
+      const { deduplicatedContent, duplicatesRemoved } = deduplicateLockfileYaml(lockfileContent);
+      if (duplicatesRemoved > 0) {
+        writeFile(lockfilePath, deduplicatedContent);
+        console.log(
+          `Removed ${duplicatesRemoved} duplicate ${duplicatesRemoved === 1 ? "entry" : "entries"} from i18n.lock`
+        );
+      }
+      const parsed = LockSchema.parse(_yaml2.default.parse(deduplicatedContent));
+      return parsed;
     },
     async saveLock(lockData) {
       const lockfileYaml = _yaml2.default.stringify(lockData);
@@ -11281,12 +11415,14 @@ function createDeltaProcessor(fileKey) {
     async loadChecksums() {
       const id = md5(fileKey);
       const lockfileData = await this.loadLock();
-      return lockfileData.checksums[id] || {};
+      const checksums = lockfileData.checksums;
+      return checksums[id] || {};
     },
     async saveChecksums(checksums) {
       const id = md5(fileKey);
       const lockfileData = await this.loadLock();
-      lockfileData.checksums[id] = checksums;
+      const lockChecksums = lockfileData.checksums;
+      lockChecksums[id] = checksums;
       await this.saveLock(lockfileData);
     },
     async createChecksums(sourceData) {
@@ -11974,87 +12110,6 @@ Editing value for: ${_chalk2.default.cyan(key)}`);
 
 
 
-// src/cli/utils/lockfile.ts
-
-
-
-
-
-
-function createLockfileHelper() {
-  return {
-    isLockfileExists: () => {
-      const lockfilePath = _getLockfilePath();
-      return fs13.default.existsSync(lockfilePath);
-    },
-    registerSourceData: (pathPattern, sourceData) => {
-      const lockfile = _loadLockfile();
-      const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
-      const sectionChecksums = _lodash2.default.mapValues(sourceData, (value) => _objecthash.MD5.call(void 0, value));
-      lockfile.checksums[sectionKey] = sectionChecksums;
-      _saveLockfile(lockfile);
-    },
-    registerPartialSourceData: (pathPattern, partialSourceData) => {
-      const lockfile = _loadLockfile();
-      const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
-      const sectionChecksums = _lodash2.default.mapValues(
-        partialSourceData,
-        (value) => _objecthash.MD5.call(void 0, value)
-      );
-      lockfile.checksums[sectionKey] = _lodash2.default.merge(
-        {},
-        _nullishCoalesce(lockfile.checksums[sectionKey], () => ( {})),
-        sectionChecksums
-      );
-      _saveLockfile(lockfile);
-    },
-    extractUpdatedData: (pathPattern, sourceData) => {
-      const lockfile = _loadLockfile();
-      const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
-      const currentChecksums = _lodash2.default.mapValues(sourceData, (value) => _objecthash.MD5.call(void 0, value));
-      const savedChecksums = lockfile.checksums[sectionKey] || {};
-      const updatedData = _lodash2.default.pickBy(
-        sourceData,
-        (value, key) => savedChecksums[key] !== currentChecksums[key]
-      );
-      return updatedData;
-    }
-  };
-  function _loadLockfile() {
-    const lockfilePath = _getLockfilePath();
-    if (!fs13.default.existsSync(lockfilePath)) {
-      return LockfileSchema.parse({});
-    }
-    const content = fs13.default.readFileSync(lockfilePath, "utf-8");
-    const result = LockfileSchema.parse(_yaml2.default.parse(content));
-    return result;
-  }
-  function _saveLockfile(lockfile) {
-    const lockfilePath = _getLockfilePath();
-    const content = _yaml2.default.stringify(lockfile);
-    fs13.default.writeFileSync(lockfilePath, content);
-  }
-  function _getLockfilePath() {
-    return path15.default.join(process.cwd(), "i18n.lock");
-  }
-}
-var LockfileSchema = _zod2.default.object({
-  version: _zod2.default.literal(1).prefault(1),
-  checksums: _zod2.default.record(
-    _zod2.default.string(),
-    // localizable files' keys
-    _zod2.default.record(
-      // checksums hashmap
-      _zod2.default.string(),
-      // key
-      _zod2.default.string()
-      // checksum of the key's value in the source locale
-    ).prefault({})
-  ).prefault({})
-});
-
-// src/cli/cmd/lockfile.ts
-
 var lockfile_default = new (0, _interactivecommander.Command)().command("lockfile").description(
   "Generate or refresh i18n.lock based on the current source locale content"
 ).helpOption("-h, --help", "Show help").option(
@@ -15195,7 +15250,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.125.0",
+  version: "0.125.2",
   description: "Lingo.dev CLI",
   private: false,
   repository: {