lingo.dev 0.117.20 → 0.117.22

package/build/cli.mjs

@@ -1596,8 +1596,10 @@ function createLoader(lDefinition) {
   const state = {
     defaultLocale: void 0,
     originalInput: void 0,
-    pullInput: void 0,
-    pullOutput: void 0,
+    // Store pullInput and pullOutput per-locale to avoid race conditions
+    // when multiple locales are processed concurrently
+    pullInputByLocale: /* @__PURE__ */ new Map(),
+    pullOutputByLocale: /* @__PURE__ */ new Map(),
     initCtx: void 0
   };
   return {
@@ -1628,7 +1630,7 @@ function createLoader(lDefinition) {
       if (locale === state.defaultLocale) {
         state.originalInput = input2 || null;
       }
-      state.pullInput = input2;
+      state.pullInputByLocale.set(locale, input2 || null);
       const result = await lDefinition.pull(
         locale,
         input2,
@@ -1636,7 +1638,7 @@ function createLoader(lDefinition) {
         state.defaultLocale,
         state.originalInput
       );
-      state.pullOutput = result;
+      state.pullOutputByLocale.set(locale, result);
       return result;
     },
     async push(locale, data) {
@@ -1646,13 +1648,15 @@ function createLoader(lDefinition) {
       if (state.originalInput === void 0) {
         throw new Error("Cannot push data without pulling first");
       }
+      const pullInput = state.pullInputByLocale.get(locale) ?? state.pullInputByLocale.get(state.defaultLocale) ?? null;
+      const pullOutput = state.pullOutputByLocale.get(locale) ?? state.pullOutputByLocale.get(state.defaultLocale) ?? null;
       const pushResult = await lDefinition.push(
         locale,
         data,
         state.originalInput,
         state.defaultLocale,
-        state.pullInput,
-        state.pullOutput
+        pullInput,
+        pullOutput
       );
       return pushResult;
     }
@@ -1710,6 +1714,7 @@ function extractCommentsFromJsonc(jsoncString) {
     return {};
   }
   const contextStack = [];
+  let arrayObjectCount = {};
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     const trimmedLine = line.trim();
@@ -1721,11 +1726,11 @@ function extractCommentsFromJsonc(jsoncString) {
         const keyMatch = line.match(/^\s*["']?([^"':,\s]+)["']?\s*:/);
         if (keyMatch) {
           const key = keyMatch[1];
-          const path19 = contextStack.map((ctx) => ctx.key).filter(Boolean);
+          const path19 = contextStack.map((ctx) => ctx.arrayIndex !== void 0 ? String(ctx.arrayIndex) : ctx.key).filter(Boolean);
           keyInfo = { key, path: path19 };
         }
       } else {
-        keyInfo = findAssociatedKey(lines, commentData.lineIndex, contextStack);
+        keyInfo = findAssociatedKey(lines, commentData.lineIndex, contextStack, arrayObjectCount);
       }
       if (keyInfo && keyInfo.key) {
         setCommentAtPath(comments, keyInfo.path, keyInfo.key, commentData.hint);
@@ -1733,7 +1738,7 @@ function extractCommentsFromJsonc(jsoncString) {
       i = commentData.endIndex;
       continue;
     }
-    updateContext(contextStack, line, result);
+    updateContext(contextStack, line, result, arrayObjectCount);
   }
   return comments;
 }
@@ -1797,34 +1802,84 @@ function extractBlockComment(lines, startIndex) {
     endIndex
   };
 }
-function findAssociatedKey(lines, commentLineIndex, contextStack) {
+function findAssociatedKey(lines, commentLineIndex, contextStack, arrayObjectCount) {
   for (let i = commentLineIndex + 1; i < lines.length; i++) {
     const line = lines[i].trim();
-    if (!line || line.startsWith("//") || line.startsWith("/*") || line === "{" || line === "}") {
+    if (!line || line.startsWith("//") || line.startsWith("/*")) {
+      continue;
+    }
+    if (line === "{" && contextStack.length > 0) {
+      const parent = contextStack[contextStack.length - 1];
+      if (parent.isArray) {
+        const depth = contextStack.length - 1;
+        const arrayIndex = arrayObjectCount[depth] || 0;
+        for (let j = i + 1; j < lines.length; j++) {
+          const innerLine = lines[j].trim();
+          if (!innerLine || innerLine.startsWith("//") || innerLine.startsWith("/*")) continue;
+          const keyMatch2 = innerLine.match(/^\s*["']?([^"':,\s]+)["']?\s*:/);
+          if (keyMatch2) {
+            const key = keyMatch2[1];
+            const path19 = contextStack.map((ctx) => ctx.arrayIndex !== void 0 ? String(ctx.arrayIndex) : ctx.key).filter(Boolean);
+            path19.push(String(arrayIndex));
+            return { key, path: path19 };
+          }
+          if (innerLine === "}") break;
+        }
+      }
+    }
+    if (line === "{" || line === "}") {
       continue;
     }
     const keyMatch = line.match(/^\s*["']?([^"':,\s]+)["']?\s*:/);
     if (keyMatch) {
       const key = keyMatch[1];
-      const path19 = contextStack.map((ctx) => ctx.key).filter(Boolean);
+      const path19 = contextStack.map((ctx) => ctx.arrayIndex !== void 0 ? String(ctx.arrayIndex) : ctx.key).filter(Boolean);
       return { key, path: path19 };
     }
   }
   return { key: null, path: [] };
 }
-function updateContext(contextStack, line, parsedJson) {
+function updateContext(contextStack, line, parsedJson, arrayObjectCount) {
+  const trimmed = line.trim();
+  const arrayMatch = line.match(/^\s*["']?([^"':,\s]+)["']?\s*:\s*\[/);
+  if (arrayMatch) {
+    const depth = contextStack.length;
+    arrayObjectCount[depth] = 0;
+    contextStack.push({ key: arrayMatch[1], isArray: true });
+    return;
+  }
   const openBraces = (line.match(/\{/g) || []).length;
   const closeBraces = (line.match(/\}/g) || []).length;
   if (openBraces > closeBraces) {
     const keyMatch = line.match(/^\s*["']?([^"':,\s]+)["']?\s*:\s*\{/);
     if (keyMatch) {
       contextStack.push({ key: keyMatch[1], isArray: false });
+    } else if (trimmed === "{" && contextStack.length > 0) {
+      const parent = contextStack[contextStack.length - 1];
+      if (parent.isArray) {
+        const depth = contextStack.length - 1;
+        const arrayIndex = arrayObjectCount[depth] || 0;
+        contextStack.push({ key: "", isArray: false, arrayIndex });
+        arrayObjectCount[depth]++;
+      }
     }
-  } else if (closeBraces > openBraces) {
+  }
+  const openBrackets = (line.match(/\[/g) || []).length;
+  const closeBrackets = (line.match(/\]/g) || []).length;
+  if (closeBraces > openBraces) {
     for (let i = 0; i < closeBraces - openBraces; i++) {
       contextStack.pop();
     }
   }
+  if (closeBrackets > openBrackets) {
+    for (let i = 0; i < closeBrackets - openBrackets; i++) {
+      const popped = contextStack.pop();
+      if (popped?.isArray) {
+        const depth = contextStack.length;
+        delete arrayObjectCount[depth];
+      }
+    }
+  }
 }
 function setCommentAtPath(comments, path19, key, hint) {
   let current = comments;
@@ -8207,7 +8262,7 @@ var path13 = {
 };
 var sep = defaultPlatform === "win32" ? path13.win32.sep : path13.posix.sep;
 minimatch.sep = sep;
-var GLOBSTAR = Symbol("globstar **");
+var GLOBSTAR = /* @__PURE__ */ Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
 var qmark2 = "[^/]";
 var star2 = qmark2 + "*?";
@@ -14714,7 +14769,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.117.20",
+  version: "0.117.22",
   description: "Lingo.dev CLI",
   private: false,
   repository: {