lingo.dev 0.113.8 → 0.114.1

package/build/cli.mjs

@@ -1908,10 +1908,11 @@ function createDenormalizeLoader(options) {
           return encodeURIComponent(String(key));
         }
       });
-      const denormalized = {
-        ...flattened,
-        ...preservedObjects
-      };
+      const denormalized = { ...flattened };
+      for (const [key, value] of Object.entries(preservedObjects)) {
+        const encodedKey = encodeURIComponent(String(key));
+        denormalized[encodedKey] = value;
+      }
       const keysMap = buildDenormalizedKeysMap(denormalized);
       return { denormalized, keysMap };
     },
@@ -2362,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) {
@@ -2405,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);
@@ -2433,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);
@@ -2549,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(
@@ -2560,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();
@@ -2720,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("");
 }
@@ -2850,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
@@ -8423,7 +8462,7 @@ function createMdxSectionsSplit2Loader() {
   });
 }
 
-// src/cli/loaders/mdx2/locked-patterns.ts
+// src/cli/loaders/locked-patterns.ts
 function extractLockedPatterns(content, patterns = []) {
   let finalContent = content;
   const lockedPlaceholders = {};
@@ -8450,7 +8489,7 @@ function extractLockedPatterns(content, patterns = []) {
     lockedPlaceholders
   };
 }
-function createMdxLockedPatternsLoader(defaultPatterns) {
+function createLockedPatternsLoader(defaultPatterns) {
   return createLoader({
     async pull(locale, input2, initCtx, originalLocale) {
       const patterns = defaultPatterns || [];
@@ -8784,18 +8823,24 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
     case "android":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createAndroidLoader(),
         createEnsureKeyOrderLoader(),
         createFlatLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "csv":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createCsvLoader(),
         createEnsureKeyOrderLoader(),
         createFlatLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -8803,14 +8848,20 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "html", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createHtmlLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "ejs":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createEjsLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -8818,6 +8869,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "json", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createJsonLoader(),
         createEnsureKeyOrderLoader(),
         createFlatLoader(),
@@ -8830,6 +8882,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
     case "json5":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createJson5Loader(),
         createEnsureKeyOrderLoader(),
         createFlatLoader(),
@@ -8842,6 +8895,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
     case "jsonc":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createJsoncLoader(),
         createEnsureKeyOrderLoader(),
         createFlatLoader(),
@@ -8855,16 +8909,22 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "markdown", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createMarkdownLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "markdoc":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createMarkdocLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -8873,7 +8933,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "mdx", bucketPathPattern),
         createMdxCodePlaceholderLoader(),
-        createMdxLockedPatternsLoader(lockedPatterns),
+        createLockedPatternsLoader(lockedPatterns),
         createMdxFrontmatterSplitLoader(),
         createMdxSectionsSplit2Loader(),
         createLocalizableMdxDocumentLoader(),
@@ -8887,9 +8947,12 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
     case "po":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createPoLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createVariableLoader({ type: "python" }),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
@@ -8897,23 +8960,32 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
     case "properties":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createPropertiesLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xcode-strings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createXcodeStringsLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xcode-stringsdict":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createXcodeStringsdictLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -8921,6 +8993,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createPlutilJsonTextLoader(),
+        createLockedPatternsLoader(lockedPatterns),
         createJsonLoader(),
         createXcodeXcstringsLoader(options.defaultLocale),
         createFlatLoader(),
@@ -8935,12 +9008,14 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createPlutilJsonTextLoader(),
+        createLockedPatternsLoader(lockedPatterns),
         createJsonLoader(),
         createXcodeXcstringsLoader(options.defaultLocale),
         createXcodeXcstringsV2Loader(options.defaultLocale),
         createFlatLoader({ shouldPreserveObject: isICUPluralObject }),
         createEnsureKeyOrderLoader(),
         createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createVariableLoader({ type: "ieee" }),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
@@ -8949,6 +9024,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "yaml", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createYamlLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
@@ -8961,10 +9037,13 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "yaml", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createYamlLoader(),
         createRootKeyLoader(true),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -8972,35 +9051,47 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "json", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createJsonLoader(),
         createEnsureKeyOrderLoader(),
         createFlutterLoader(),
         createFlatLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xliff":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createXliffLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xml":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createXmlLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "srt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createSrtLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -9010,31 +9101,42 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createSyncLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "vtt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createVttLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "php":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createPhpLoader(),
         createSyncLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "vue-json":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createVueJsonLoader(),
         createSyncLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "typescript":
@@ -9045,6 +9147,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
           "typescript",
           bucketPathPattern
         ),
+        createLockedPatternsLoader(lockedPatterns),
         createTypescriptLoader(),
         createFlatLoader(),
         createEnsureKeyOrderLoader(),
@@ -9056,7 +9159,10 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
     case "txt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createTxtLoader(),
+        createLockedKeysLoader(lockedKeys || []),
+        createIgnoredKeysLoader(ignoredKeys || []),
         createSyncLoader(),
         createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
@@ -9064,6 +9170,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createFormatterLoader(options.formatter, "json", bucketPathPattern),
+        createLockedPatternsLoader(lockedPatterns),
         createJsonLoader(),
         createJsonDictionaryLoader(),
         createEnsureKeyOrderLoader(),
@@ -9973,7 +10080,9 @@ var i18n_default = new Command14().command("i18n").description(
               returnUnlocalizedKeys: true,
               injectLocale: bucket.injectLocale
             },
-            bucket.lockedKeys
+            bucket.lockedKeys,
+            bucket.lockedPatterns,
+            bucket.ignoredKeys
           );
           bucketLoader.setDefaultLocale(sourceLocale);
           await bucketLoader.init();
@@ -10572,7 +10681,10 @@ var lockfile_default = new Command15().command("lockfile").description(
           {
             defaultLocale: sourceLocale,
             formatter: i18nConfig.formatter
-          }
+          },
+          bucket.lockedKeys,
+          bucket.lockedPatterns,
+          bucket.ignoredKeys
         );
         bucketLoader.setDefaultLocale(sourceLocale);
         const sourceData = await bucketLoader.pull(sourceLocale);
@@ -10640,7 +10752,10 @@ var cleanup_default = new Command16().command("cleanup").description(
           {
             defaultLocale: sourceLocale,
             formatter: i18nConfig.formatter
-          }
+          },
+          bucket.lockedKeys,
+          bucket.lockedPatterns,
+          bucket.ignoredKeys
         );
         bucketLoader.setDefaultLocale(sourceLocale);
         const sourceData = await bucketLoader.pull(sourceLocale);
@@ -12912,7 +13027,9 @@ var status_default = new Command20().command("status").description("Show the sta
               injectLocale: bucket.injectLocale,
               formatter: i18nConfig.formatter
             },
-            bucket.lockedKeys
+            bucket.lockedKeys,
+            bucket.lockedPatterns,
+            bucket.ignoredKeys
           );
           bucketLoader.setDefaultLocale(sourceLocale);
           await bucketLoader.init();
@@ -13379,7 +13496,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.113.8",
+  version: "0.114.1",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {