Merge branch 'main' into docs/pt-br-readme-fix

Author: theakshaymore

demo/adonisjs/CHANGELOG.md

@@ -1,5 +1,12 @@
 # adonis
 
+## 0.0.50
+
+### Patch Changes
+
+- Updated dependencies [[`77cf56e`](https://github.com/lingodotdev/lingo.dev/commit/77cf56e57725c680d071c6f5bc310e77c8ead463)]:
+  - [email protected]
+
 ## 0.0.49
 
 ### Patch Changes

demo/adonisjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adonis",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "private": true,
   "type": "module",
   "license": "UNLICENSED",

demo/next-app/CHANGELOG.md

@@ -1,5 +1,12 @@
 # next-app
 
+## 0.2.102
+
+### Patch Changes
+
+- Updated dependencies [[`77cf56e`](https://github.com/lingodotdev/lingo.dev/commit/77cf56e57725c680d071c6f5bc310e77c8ead463)]:
+  - [email protected]
+
 ## 0.2.101
 
 ### Patch Changes

demo/next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-app",
-  "version": "0.2.101",
+  "version": "0.2.102",
   "private": true,
   "scripts": {
     "dev": "next dev",

demo/react-router-app/CHANGELOG.md

@@ -1,5 +1,12 @@
 # react-router-app
 
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [[`77cf56e`](https://github.com/lingodotdev/lingo.dev/commit/77cf56e57725c680d071c6f5bc310e77c8ead463)]:
+  - [email protected]
+
 ## 1.0.10
 
 ### Patch Changes

demo/react-router-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-app",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": true,
   "type": "module",
   "scripts": {

packages/cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # lingo.dev
 
+## 0.117.10
+
+### Patch Changes
+
+- [#1658](https://github.com/lingodotdev/lingo.dev/pull/1658) [`77cf56e`](https://github.com/lingodotdev/lingo.dev/commit/77cf56e57725c680d071c6f5bc310e77c8ead463) Thanks [@vrcprl](https://github.com/vrcprl)! - fix mjml format issue
+
 ## 0.117.9
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lingo.dev",
-  "version": "0.117.9",
+  "version": "0.117.10",
   "description": "Lingo.dev CLI",
   "private": false,
   "publishConfig": {

packages/cli/src/cli/loaders/mjml.spec.ts

@@ -697,4 +697,140 @@ describe("mjml loader", () => {
     expect(output).toMatch(/Comience con (<\/span>)?<strong>/);
     expect(output).not.toContain("Comience con<strong>");
   });
+
+  test("should handle empty input string in pull", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    const result = await loader.pull("en", "");
+
+    expect(result).toEqual({});
+  });
+
+  test("should handle whitespace-only input in pull", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    const result = await loader.pull("en", "   \n\t  ");
+
+    expect(result).toEqual({});
+  });
+
+  test("should handle empty input string in push", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    // Need to pull first to initialize state
+    await loader.pull("en", "");
+    const output = await loader.push("es", {}, "");
+
+    expect(output).toBe("");
+  });
+
+  test("should handle whitespace-only input in push", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    // Need to pull first to initialize state
+    await loader.pull("en", "   \n\t  ");
+    const output = await loader.push("es", {}, "   \n\t  ");
+
+    expect(output).toBe("   \n\t  ");
+  });
+
+  test("should not add XML declaration to output", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    const inputWithoutDeclaration = `<mjml>
+  <mj-body>
+    <mj-section>
+      <mj-column>
+        <mj-text>Hello World</mj-text>
+      </mj-column>
+    </mj-section>
+  </mj-body>
+</mjml>`;
+
+    await loader.pull("en", inputWithoutDeclaration);
+
+    const translations = {
+      "mjml/mj-body/0/mj-section/0/mj-column/0/mj-text/0": "Hola Mundo",
+    };
+
+    const output = await loader.push("es", translations, inputWithoutDeclaration);
+
+    // Should NOT start with XML declaration
+    expect(output).not.toMatch(/^<\?xml/);
+    // Should start with <mjml>
+    expect(output.trim()).toMatch(/^<mjml>/);
+    expect(output).toContain("Hola Mundo");
+  });
+
+  test("should handle input with XML declaration and not duplicate it", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    const inputWithDeclaration = `<?xml version="1.0" encoding="UTF-8"?>
+<mjml>
+  <mj-body>
+    <mj-section>
+      <mj-column>
+        <mj-text>Hello World</mj-text>
+      </mj-column>
+    </mj-section>
+  </mj-body>
+</mjml>`;
+
+    await loader.pull("en", inputWithDeclaration);
+
+    const translations = {
+      "mjml/mj-body/0/mj-section/0/mj-column/0/mj-text/0": "Hola Mundo",
+    };
+
+    const output = await loader.push("es", translations, inputWithDeclaration);
+
+    // Should not duplicate XML declaration
+    const declarationMatches = output.match(/<\?xml/g);
+    expect(declarationMatches).toBeNull(); // No XML declaration in output
+    expect(output).toContain("Hola Mundo");
+  });
+
+  test("should match structure of source file without XML declaration", async () => {
+    const loader = createMjmlLoader();
+    loader.setDefaultLocale("en");
+
+    // Source file format (en-US)
+    const sourceInput = `<mjml>
+  <mj-body>
+    <mj-section padding="26px 0px 86px 45px">
+      <mj-column>
+        <mj-image
+          src="cid:logo.png"
+          alt="GitProtect logo"
+          width="140px"
+          height="35px"
+          padding="0"
+          align="left"
+        />
+      </mj-column>
+    </mj-section>
+  </mj-body>
+</mjml>`;
+
+    await loader.pull("en", sourceInput);
+
+    const translations = {
+      "mjml/mj-body/0/mj-section/0/mj-column/0/mj-image/0#alt": "Logo de GitProtect",
+    };
+
+    const output = await loader.push("es", translations, sourceInput);
+
+    // Generated file should match source structure
+    expect(output.trim()).toMatch(/^<mjml>/);
+    expect(output).not.toMatch(/^<\?xml/);
+    expect(output).toContain("Logo de GitProtect");
+    expect(output).toContain("<mjml>");
+    expect(output).toContain("</mjml>");
+  });
 });

packages/cli/src/cli/loaders/mjml.ts

@@ -34,6 +34,11 @@ export default function createMjmlLoader(): ILoader<
     async pull(locale, input) {
       const result: Record<string, any> = {};
 
+      // Handle empty input
+      if (!input || input.trim() === "") {
+        return result;
+      }
+
       try {
         const parsed = await parseStringPromise(input, {
           explicitArray: true,
@@ -88,8 +93,13 @@ export default function createMjmlLoader(): ILoader<
     },
 
     async push(locale, data, originalInput) {
+      // Handle empty input
+      if (!originalInput || originalInput.trim() === "") {
+        return originalInput || "";
+      }
+
       try {
-        const parsed = await parseStringPromise(originalInput || "", {
+        const parsed = await parseStringPromise(originalInput, {
           explicitArray: true,
           explicitChildren: true,
           preserveChildrenOrder: true,
@@ -275,13 +285,14 @@ function convertDomToXmlNode(domNode: any): any {
 }
 
 function serializeMjml(parsed: any): string {
-  const xmlDec = '<?xml version="1.0" encoding="UTF-8"?>\n';
-
   const rootKey = Object.keys(parsed).find(key => !key.startsWith("_") && !key.startsWith("$"));
   const rootNode = rootKey ? parsed[rootKey] : parsed;
 
   const body = serializeElement(rootNode);
-  return xmlDec + body;
+
+  // Don't add XML declaration - xml2js already preserves it in the parsed object
+  // or it will be added by the consumer if needed
+  return body;
 }
 
 function serializeElement(node: any, indent: string = ""): string {