fix: respect unicode chars in t macro

lingui · Apr 8, 2021 · 9ebae95 · 9ebae95
1 parent 76553af
commit 9ebae95
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/packages/macro/src/macroJs.test.ts b/packages/macro/src/macroJs.test.ts
@@ -79,6 +79,55 @@ describe("js macro", () => {
         },
       ])
     })
+
+    it("message with unicode chars is respected", () => {
+      const macro = createMacro()
+      const exp = parseExpression('t`Message \\u0020`')
+      const tokens = macro.tokenizeTemplateLiteral(exp)
+      expect(tokens).toEqual([
+        {
+          type: "text",
+          value: 'Message \\u0020',
+        },
+      ])
+    })
+
+    it("message with double scaped literals it's stripped", () => {
+      const macro = createMacro()
+      const exp = parseExpression('t\`Passing \\`${argSet}\\` is not supported.\`')
+      const tokens = macro.tokenizeTemplateLiteral(exp)
+      expect(tokens).toEqual([
+        {
+          type: "text",
+          value: 'Passing `',
+        },
+        {
+          name: "argSet",
+          type: "arg",
+          value: {
+            end: 20,
+            loc:  {
+              end:  {
+                column: 20,
+                line: 1,
+              },
+              identifierName: "argSet",
+              start:  {
+                column: 14,
+                line: 1,
+              },
+            },
+            name: "argSet",
+            start: 14,
+            type: "Identifier",
+          },
+        },
+        {
+          type: "text",
+          value: "` is not supported.",
+        },
+      ])
+    })
   })
 
   describe("tokenizeChoiceMethod", () => {

diff --git a/packages/macro/src/macroJs.ts b/packages/macro/src/macroJs.ts
@@ -360,6 +360,9 @@ export default class MacroJs {
    * We clean '//\` ' to just '`'
    */
   clearBackslashes(value: string) {
+    // it's an unicode char so we should keep them
+    if (value.includes('\\u')) return value
+    // if not we replace the extra scaped literals
     return value.replace(removeExtraScapedLiterals, "`")
   }
 

diff --git a/packages/macro/src/macroJsx.ts b/packages/macro/src/macroJsx.ts
@@ -364,6 +364,9 @@ export default class MacroJSX {
    * We clean '//\` ' to just '`'
    * */
   clearBackslashes(value: string) {
+    // it's an unicode char so we should keep them
+    if (value.includes('\\u')) return value
+    // if not we replace the extra scaped literals
     return value.replace(removeExtraScapedLiterals, "`")
   }