lingo.dev 0.114.0 → 0.114.2

package/build/cli.mjs

@@ -2363,7 +2363,7 @@ async function parseAndroidDocument(input2) {
 function buildPullResult(document) {
   const result = {};
   for (const resource of document.resourceNodes) {
-    if (!resource.translatable) {
+    if (!isTranslatable(resource)) {
       continue;
     }
     switch (resource.type) {
@@ -2406,6 +2406,9 @@ function buildPullResult(document) {
   }
   return result;
 }
+function isTranslatable(resource) {
+  return resource.translatable;
+}
 function buildTranslatedDocument(payload, existingDocument, sourceDocument) {
   const templateDocument = sourceDocument;
   const finalDocument = cloneDocumentStructure(templateDocument);
@@ -2434,6 +2437,9 @@ function buildTranslatedDocument(payload, existingDocument, sourceDocument) {
     if (finalMap.has(resource.name)) {
       continue;
     }
+    if (!isTranslatable(resource)) {
+      continue;
+    }
     const cloned = cloneResourceNode(resource);
     appendResourceNode(finalDocument, cloned);
     finalMap.set(cloned.name, cloned);
@@ -2550,7 +2556,7 @@ function appendResourceNode(document, resourceNode) {
   document.resourceNodes.push(resourceNode);
 }
 function setTextualNodeContent(node, value, useCdata) {
-  const escapedValue = useCdata ? value : escapeAndroidString(value);
+  const escapedValue = useCdata ? escapeApostrophesOnly(value) : escapeAndroidString(value);
   node._ = escapedValue;
   node.$$ = node.$$ ?? [];
   let textNode = node.$$.find(
@@ -2561,7 +2567,7 @@ function setTextualNodeContent(node, value, useCdata) {
     node.$$.push(textNode);
   }
   textNode["#name"] = useCdata ? "__cdata" : "__text__";
-  textNode._ = useCdata ? value : escapedValue;
+  textNode._ = escapedValue;
 }
 function buildResourceNameMap(document) {
   const map = /* @__PURE__ */ new Map();
@@ -2721,6 +2727,9 @@ function asInteger(value, name) {
 function escapeAndroidString(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/(?<!\\)'/g, "\\'");
 }
+function escapeApostrophesOnly(value) {
+  return value.replace(/(?<!\\)'/g, "\\'");
+}
 function segmentsToString(segments) {
   return segments.map((segment) => segment.value).join("");
 }
@@ -2851,13 +2860,42 @@ function createResourceNodeFromValue(name, value) {
   }
 }
 function cloneDocumentStructure(document) {
+  const translatableResources = document.resourceNodes.filter(isTranslatable);
   const resourcesClone = deepClone(document.resources);
   const lookup = buildResourceLookup(resourcesClone);
   const resourceNodes = [];
-  for (const resource of document.resourceNodes) {
+  for (const resource of translatableResources) {
     const cloned = cloneResourceNodeFromLookup(resource, lookup);
     resourceNodes.push(cloned);
   }
+  if (resourcesClone.$$ && Array.isArray(resourcesClone.$$)) {
+    const includedKeys = new Set(
+      resourceNodes.map((r) => resourceLookupKey(r.type, r.name))
+    );
+    let filtered = resourcesClone.$$.filter((child) => {
+      const elementName = child?.["#name"];
+      const name = child?.$?.name;
+      if (!isResourceElementName(elementName) || !name) {
+        return true;
+      }
+      return includedKeys.has(resourceLookupKey(elementName, name));
+    });
+    const cleaned = [];
+    let lastWasWhitespace = false;
+    for (const child of filtered) {
+      const isWhitespace = child?.["#name"] === "__text__" && (!child._ || child._.trim() === "");
+      if (isWhitespace) {
+        if (!lastWasWhitespace) {
+          cleaned.push(child);
+          lastWasWhitespace = true;
+        }
+      } else {
+        cleaned.push(child);
+        lastWasWhitespace = false;
+      }
+    }
+    resourcesClone.$$ = cleaned;
+  }
   return {
     resources: resourcesClone,
     resourceNodes
@@ -11432,6 +11470,14 @@ async function execute(input2) {
           }
           const i18nLimiter = pLimit(effectiveConcurrency);
           const ioLimiter = pLimit(1);
+          const perFileIoLimiters = /* @__PURE__ */ new Map();
+          const getFileIoLimiter = (bucketPathPattern) => {
+            const lockKey = bucketPathPattern;
+            if (!perFileIoLimiters.has(lockKey)) {
+              perFileIoLimiters.set(lockKey, pLimit(1));
+            }
+            return perFileIoLimiters.get(lockKey);
+          };
           const workersCount = effectiveConcurrency;
           const workerTasks = [];
           for (let i = 0; i < workersCount; i++) {
@@ -11445,6 +11491,7 @@ async function execute(input2) {
                 ioLimiter,
                 i18nLimiter,
                 initialChecksumsMap,
+                getFileIoLimiter,
                 onDone() {
                   task.title = createExecutionProgressMessage(ctx);
                 }
@@ -11528,12 +11575,17 @@ function createWorkerTask(args) {
         const initialChecksums = args.initialChecksumsMap.get(assignedTask.bucketPathPattern) || {};
         const taskResult = await args.i18nLimiter(async () => {
           try {
-            const sourceData = await bucketLoader.pull(
-              assignedTask.sourceLocale
+            const fileIoLimiter = args.getFileIoLimiter(
+              assignedTask.bucketPathPattern
+            );
+            const sourceData = await fileIoLimiter(
+              async () => bucketLoader.pull(assignedTask.sourceLocale)
+            );
+            const hints = await fileIoLimiter(
+              async () => bucketLoader.pullHints()
             );
-            const hints = await bucketLoader.pullHints();
-            const targetData = await bucketLoader.pull(
-              assignedTask.targetLocale
+            const targetData = await fileIoLimiter(
+              async () => bucketLoader.pull(assignedTask.targetLocale)
             );
             const delta = await deltaProcessor.calculateDelta({
               sourceData,
@@ -11548,7 +11600,7 @@ function createWorkerTask(args) {
               )
             ).fromPairs().value();
             if (!Object.keys(processableData).length) {
-              await args.ioLimiter(async () => {
+              await fileIoLimiter(async () => {
                 await bucketLoader.push(assignedTask.targetLocale, targetData);
               });
               return {
@@ -11569,7 +11621,7 @@ function createWorkerTask(args) {
                 hints: relevantHints
               },
               async (progress, _sourceChunk, processedChunk) => {
-                await args.ioLimiter(async () => {
+                await fileIoLimiter(async () => {
                   await bucketLoader.pull(assignedTask.sourceLocale);
                   const latestTargetData = await bucketLoader.pull(
                     assignedTask.targetLocale
@@ -11604,7 +11656,7 @@ function createWorkerTask(args) {
               delta,
               finalTargetData
             );
-            await args.ioLimiter(async () => {
+            await fileIoLimiter(async () => {
               await bucketLoader.pull(assignedTask.sourceLocale);
               await bucketLoader.push(
                 assignedTask.targetLocale,
@@ -13458,7 +13510,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.114.0",
+  version: "0.114.2",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {