@vocoder/cli 0.13.3 → 0.14.0

package/dist/{chunk-ZHRKJ2KZ.mjs → chunk-T4BLNDJ3.mjs}

@@ -43569,6 +43569,11 @@ var require_brace_expansion = __commonJS({
 });
 
 // src/utils/api.ts
+function computeStringsHash(input) {
+  const { createHash } = __require("crypto");
+  const sorted = [...input.texts].sort();
+  return createHash("sha256").update(JSON.stringify({ strings: sorted, appIndustry: input.appIndustry ?? null })).digest("hex");
+}
 function isLimitErrorResponse(value) {
   if (!value || typeof value !== "object") {
     return false;
@@ -43722,9 +43727,7 @@ var VocoderAPI = class {
   async submitTranslation(branch, entries, targetLocales, options, repoIdentity) {
     const stringEntries = this.normalizeStringEntries(entries);
     const strings = stringEntries.map((entry) => entry.text);
-    const crypto = await import("crypto");
-    const sortedStrings = [...strings].sort();
-    const stringsHash = crypto.createHash("sha256").update(JSON.stringify(sortedStrings)).digest("hex");
+    const stringsHash = computeStringsHash({ texts: strings, appIndustry: options?.appIndustry ?? null });
     return this.request(
       "/api/cli/sync",
       {
@@ -51120,34 +51123,64 @@ function buildSelectICU(props) {
   if (!hasOther) cases.push("other {other}");
   return `{value, select, ${cases.join(" ")}}`;
 }
-function extractTextContentFromNodes(children, elementIndex = { count: 0 }) {
+function extractTextContentFromNodes(children, ctx) {
   let text = "";
   for (const child of children) {
+    if (ctx.bail) return text;
     if (child.type === "JSXText") {
       text += child.value;
     } else if (child.type === "JSXExpressionContainer") {
       const expr = child.expression;
       if (expr.type === "Identifier") {
+        ctx.namedVars.add(expr.name);
         text += `{${expr.name}}`;
       } else if (expr.type === "StringLiteral") {
         text += expr.value;
+      } else if (expr.type === "NumericLiteral") {
+        text += String(expr.value);
+      } else if (expr.type === "BooleanLiteral" || expr.type === "NullLiteral") {
       } else if (expr.type === "TemplateLiteral") {
         for (let i = 0; i < expr.quasis.length; i++) {
           text += expr.quasis[i].value.raw;
           if (i < expr.expressions.length) {
             const e = expr.expressions[i];
-            text += e.type === "Identifier" ? `{${e.name}}` : "{value}";
+            if (e.type === "Identifier") {
+              ctx.namedVars.add(e.name);
+              text += `{${e.name}}`;
+            } else if (e.type === "NumericLiteral") {
+              text += String(e.value);
+            } else if (e.type === "BooleanLiteral" || e.type === "NullLiteral") {
+            } else if (e.type === "ConditionalExpression" || e.type === "LogicalExpression") {
+              ctx.bail = true;
+              return text;
+            } else {
+              const key = ctx.complexCount++;
+              ctx.complexExprs.push({ key, start: e.start, end: e.end });
+              text += `{${key}}`;
+            }
           }
         }
+      } else if (expr.type === "ConditionalExpression" || expr.type === "LogicalExpression") {
+        ctx.bail = true;
+        return text;
+      } else {
+        const key = ctx.complexCount++;
+        ctx.complexExprs.push({ key, start: expr.start, end: expr.end });
+        text += `{${key}}`;
       }
     } else if (child.type === "JSXElement") {
-      const idx = elementIndex.count++;
+      const childTagName = child.openingElement.name.type === "JSXIdentifier" ? child.openingElement.name.name : null;
+      if (childTagName && ctx.tComponentNames.has(childTagName)) {
+        ctx.bail = true;
+        return text;
+      }
+      const idx = ctx.elementCount++;
       const isSelfClosing = child.openingElement.selfClosing;
       if (isSelfClosing) {
-        text += `<c${idx}/>`;
+        text += `<${idx}/>`;
       } else {
-        const innerText = extractTextContentFromNodes(child.children, elementIndex);
-        text += `<c${idx}>${innerText}</c${idx}>`;
+        const innerText = extractTextContentFromNodes(child.children, ctx);
+        text += `<${idx}>${innerText}</${idx}>`;
       }
     }
   }
@@ -51359,7 +51392,16 @@ function _extractFromContent(filePath, content) {
           if (pluralSelectICU) {
             text = pluralSelectICU;
           } else {
-            text = extractTextContentFromNodes(path2.node.children, { count: 0 });
+            const extractCtx = {
+              elementCount: 0,
+              complexCount: 0,
+              namedVars: /* @__PURE__ */ new Set(),
+              complexExprs: [],
+              bail: false,
+              tComponentNames: new Set(vocoderImports.keys())
+            };
+            text = extractTextContentFromNodes(path2.node.children, extractCtx);
+            if (extractCtx.bail) return;
           }
         }
         if (!text || text.trim().length === 0) return;
@@ -51500,4 +51542,4 @@ export {
   loadVocoderConfig,
   StringExtractor
 };
-//# sourceMappingURL=chunk-ZHRKJ2KZ.mjs.map
+//# sourceMappingURL=chunk-T4BLNDJ3.mjs.map