lingo.dev 0.89.6 → 0.90.1

package/build/cli.mjs

@@ -1342,42 +1342,105 @@ function createAndroidLoader() {
   return createLoader({
     async pull(locale, input2) {
       try {
+        if (!input2) {
+          return {};
+        }
         const result = {};
-        const parsed = !input2 ? { resources: {} } : await parseStringPromise(input2, { explicitArray: true });
+        const stringRegex = /<string\s+name="([^"]+)"(?:\s+translatable="([^"]+)")?[^>]*>([\s\S]*?)<\/string>/gi;
+        let stringMatch;
+        while ((stringMatch = stringRegex.exec(input2)) !== null) {
+          const name = stringMatch[1];
+          const translatable = stringMatch[2];
+          let value = stringMatch[3];
+          if (translatable === "false") {
+            continue;
+          }
+          const cdataRegex = /<!\[CDATA\[([\s\S]*?)\]\]>/g;
+          value = value.replace(cdataRegex, (match, content) => content);
+          value = value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
+          if (value.startsWith('"') && value.endsWith('"') && value.length >= 2) {
+            value = value.substring(1, value.length - 1);
+          } else {
+            value = value === "" || /^\s+$/.test(value) ? value : value.trim();
+          }
+          result[name] = value;
+        }
+        const parsed = await parseStringPromise(input2, {
+          explicitArray: true,
+          mergeAttrs: false,
+          normalize: true,
+          normalizeTags: false,
+          trim: true,
+          attrkey: "$",
+          charkey: "_"
+        });
         if (!parsed || !parsed.resources) {
-          console.warn("No resources found in the Android resource file");
           return result;
         }
-        const processResource = (resourceType) => {
-          const resources = parsed.resources[resourceType];
-          if (!resources) return;
-          resources.forEach((item) => {
-            if (item.$ && item.$.translatable === "false") return;
-            if (resourceType === "string") {
-              result[item.$.name] = item._ || "";
-            } else if (resourceType === "string-array") {
-              result[item.$.name] = (item.item || []).map((subItem) => {
-                if (typeof subItem === "string") return subItem;
-                return subItem._ || "";
-              }).filter(Boolean);
-            } else if (resourceType === "plurals") {
-              const pluralObj = {};
-              if (Array.isArray(item.item)) {
-                item.item.forEach((subItem) => {
-                  if (subItem.$ && subItem.$.quantity) {
-                    pluralObj[subItem.$.quantity] = subItem._ || "";
+        if (parsed.resources["string-array"]) {
+          parsed.resources["string-array"].forEach((arrayItem) => {
+            if (arrayItem.$ && arrayItem.$.translatable === "false") {
+              return;
+            }
+            const name = arrayItem.$.name;
+            const items = [];
+            if (arrayItem.item) {
+              arrayItem.item.forEach((item) => {
+                let itemValue = "";
+                if (typeof item === "string") {
+                  itemValue = item;
+                } else if (item._) {
+                  itemValue = item._;
+                } else if (item._ === "") {
+                  itemValue = "";
+                }
+                items.push(itemValue === "" || /^\s+$/.test(itemValue) ? itemValue : itemValue.trim());
+              });
+            }
+            result[name] = items;
+          });
+        }
+        if (parsed.resources.plurals) {
+          parsed.resources.plurals.forEach((pluralItem) => {
+            if (pluralItem.$ && pluralItem.$.translatable === "false") {
+              return;
+            }
+            const name = pluralItem.$.name;
+            const pluralObj = {};
+            if (pluralItem.item) {
+              pluralItem.item.forEach((item) => {
+                if (item.$ && item.$.quantity) {
+                  let value = "";
+                  if (item._) {
+                    value = item._;
+                  } else if (item._ === "") {
+                    value = "";
                   }
-                });
-              }
-              result[item.$.name] = pluralObj;
-            } else if (resourceType === "bool") {
-              result[item.$.name] = item._ === "true";
-            } else if (resourceType === "integer") {
-              result[item.$.name] = parseInt(item._ || "0", 10);
+                  pluralObj[item.$.quantity] = value === "" || /^\s+$/.test(value) ? value : value.trim();
+                }
+              });
             }
+            result[name] = pluralObj;
           });
-        };
-        ["string", "string-array", "plurals", "bool", "integer"].forEach(processResource);
+        }
+        if (parsed.resources.bool) {
+          parsed.resources.bool.forEach((boolItem) => {
+            if (boolItem.$ && boolItem.$.translatable === "false") {
+              return;
+            }
+            const name = boolItem.$.name;
+            result[name] = boolItem._ === "true";
+          });
+        }
+        if (parsed.resources.integer) {
+          parsed.resources.integer.forEach((intItem) => {
+            if (intItem.$ && intItem.$.translatable === "false") {
+              return;
+            }
+            const name = intItem.$.name;
+            result[name] = parseInt(intItem._ || "0", 10);
+          });
+        }
         return result;
       } catch (error) {
         console.error("Error parsing Android resource file:", error);
@@ -1388,43 +1451,69 @@ function createAndroidLoader() {
       }
     },
     async push(locale, payload) {
-      const builder = new Builder({ headless: true });
-      const xmlObj = { resources: {} };
-      const escapeSingleQuotes = (str) => {
-        return str.replace(/(?<!\\)'/g, "\\'");
-      };
-      for (const [key, value] of Object.entries(payload)) {
-        if (typeof value === "string") {
-          if (!xmlObj.resources.string) xmlObj.resources.string = [];
-          xmlObj.resources.string.push({ $: { name: key }, _: escapeSingleQuotes(value) });
-        } else if (Array.isArray(value)) {
-          if (!xmlObj.resources["string-array"]) xmlObj.resources["string-array"] = [];
-          xmlObj.resources["string-array"].push({
-            $: { name: key },
-            item: value.map((item) => ({ _: escapeSingleQuotes(item) }))
-          });
-        } else if (typeof value === "object") {
-          if (!xmlObj.resources.plurals) xmlObj.resources.plurals = [];
-          xmlObj.resources.plurals.push({
-            $: { name: key },
-            item: Object.entries(value).map(([quantity, text]) => ({
-              $: { quantity },
-              _: escapeSingleQuotes(text)
-            }))
-          });
-        } else if (typeof value === "boolean") {
-          if (!xmlObj.resources.bool) xmlObj.resources.bool = [];
-          xmlObj.resources.bool.push({ $: { name: key }, _: value.toString() });
-        } else if (typeof value === "number") {
-          if (!xmlObj.resources.integer) xmlObj.resources.integer = [];
-          xmlObj.resources.integer.push({
-            $: { name: key },
-            _: value.toString()
-          });
+      try {
+        const xmlObj = {
+          resources: {
+            string: [],
+            "string-array": [],
+            plurals: [],
+            bool: [],
+            integer: []
+          }
+        };
+        const processHtmlContent = (str) => {
+          if (typeof str !== "string") return { _: String(str) };
+          const containsHtml = /<[a-z][\s\S]*>/i.test(str);
+          const containsSpecialChars = /[<>&]/.test(str);
+          return { _: str };
+        };
+        for (const [key, value] of Object.entries(payload)) {
+          if (typeof value === "string") {
+            xmlObj.resources.string.push({
+              $: { name: key },
+              ...processHtmlContent(value)
+            });
+          } else if (Array.isArray(value)) {
+            xmlObj.resources["string-array"].push({
+              $: { name: key },
+              item: value.map((item) => processHtmlContent(item))
+            });
+          } else if (typeof value === "object") {
+            xmlObj.resources.plurals.push({
+              $: { name: key },
+              item: Object.entries(value).map(([quantity, text]) => ({
+                $: { quantity },
+                ...processHtmlContent(text)
+              }))
+            });
+          } else if (typeof value === "boolean") {
+            xmlObj.resources.bool.push({
+              $: { name: key },
+              _: value.toString()
+            });
+          } else if (typeof value === "number") {
+            xmlObj.resources.integer.push({
+              $: { name: key },
+              _: value.toString()
+            });
+          }
         }
+        const builder = new Builder({
+          headless: true,
+          renderOpts: {
+            pretty: true,
+            indent: "  ",
+            newline: "\n"
+          }
+        });
+        return builder.buildObject(xmlObj);
+      } catch (error) {
+        console.error("Error generating Android resource file:", error);
+        throw new CLIError({
+          message: "Failed to generate Android resource file",
+          docUrl: "androidResouceError"
+        });
       }
-      const result = builder.buildObject(xmlObj);
-      return result;
     }
   });
 }
@@ -3732,7 +3821,6 @@ async function trackEvent(distinctId, event, properties) {
   }
   try {
     const { PostHog } = await import("posthog-node");
-    console.log("--- ---");
     const safeProperties = properties ? JSON.parse(
       JSON.stringify(properties, (key, value) => {
         if (value instanceof Error) {
@@ -3753,7 +3841,6 @@ async function trackEvent(distinctId, event, properties) {
         flushInterval: 0
       }
     );
-    console.log("--- ---");
     await posthog.capture({
       distinctId,
       event,
@@ -3765,9 +3852,7 @@ async function trackEvent(distinctId, event, properties) {
         }
       }
     });
-    console.log("--- ---");
     await posthog.shutdown();
-    console.log("--- ---");
   } catch (error) {
     if (process.env.DEBUG) {
       console.error(error);
@@ -4881,6 +4966,22 @@ var InBranchFlow = class extends IntegrationFlow {
     }
     return true;
   }
+  async returnToOriginalBranch() {
+    const originalBranch = this.platformKit.platformConfig.baseBranchName;
+    if (originalBranch) {
+      this.ora.start(`Returning to original branch: ${originalBranch}`);
+      try {
+        execSync(`git checkout ${originalBranch}`, {
+          stdio: "inherit",
+          encoding: "utf8"
+        });
+        this.ora.succeed(`Returned to original branch: ${originalBranch}`);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+        this.ora.fail(`Failed to return to original branch: ${errorMessage}`);
+      }
+    }
+  }
 };
 
 // src/cli/cmd/ci/flows/pull-request.ts
@@ -5465,15 +5566,19 @@ var ci_default = new Command10().command("ci").description("Run Lingo.dev CI/CD
   const { isPullRequestMode } = platformKit.config;
   ora.info(`Pull request mode: ${isPullRequestMode ? "on" : "off"}`);
   const flow = isPullRequestMode ? new PullRequestFlow(ora, platformKit) : new InBranchFlow(ora, platformKit);
-  const canRun = await flow.preRun?.();
-  if (canRun === false) {
-    return;
-  }
-  const hasChanges = await flow.run();
-  if (!hasChanges) {
-    return;
+  try {
+    const canRun = await flow.preRun?.();
+    if (canRun === false) {
+      return;
+    }
+    const hasChanges = await flow.run();
+    if (!hasChanges) {
+      return;
+    }
+    await flow.postRun?.();
+  } finally {
+    await flow.returnToOriginalBranch?.();
   }
-  await flow.postRun?.();
 });
 
 // src/cli/cmd/status.ts
@@ -5896,7 +6001,7 @@ function validateParams2(i18nConfig, flags) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.89.6",
+  version: "0.90.1",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {
@@ -5955,7 +6060,7 @@ var package_default = {
   dependencies: {
     "@ai-sdk/anthropic": "^1.2.6",
     "@ai-sdk/openai": "^1.3.7",
-    "@datocms/cma-client-node": "^3.4.0",
+    "@datocms/cma-client-node": "^4.0.1",
     "@gitbeaker/rest": "^39.34.3",
     "@inquirer/prompts": "^7.4.1",
     "@lingo.dev/_sdk": "workspace:*",