lingo.dev 0.114.0 → 0.114.1

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
@@ -13458,7 +13496,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.114.0",
+  version: "0.114.1",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {