fix: unicode char was not extracting correctly

lingui · Apr 9, 2021 · 3653f6f · 3653f6f · vercel · Apr 9, 2021
1 parent 5aa10cd
commit 3653f6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/macro/src/macroJs.test.ts b/packages/macro/src/macroJs.test.ts
@@ -80,14 +80,14 @@ describe("js macro", () => {
       ])
     })
 
-    it("message with unicode chars is respected", () => {
+    it("message with unicode chars is interpreted by babel", () => {
       const macro = createMacro()
       const exp = parseExpression('t`Message \\u0020`')
       const tokens = macro.tokenizeTemplateLiteral(exp)
       expect(tokens).toEqual([
         {
           type: "text",
-          value: 'Message \\u0020',
+          value: 'Message  ',
         },
       ])
     })

diff --git a/packages/macro/src/macroJs.ts b/packages/macro/src/macroJs.ts
@@ -264,7 +264,8 @@ export default class MacroJs {
       R.evolve({
         quasis: R.map((text: babelTypes.TemplateElement) => {
           // Don't output tokens without text.
-          const value = text.value.raw
+          // if it's an unicode we keep the cooked value because it's the parsed value by babel (without unicode chars)
+          const value = /\\u[a-fA-F0-9]{4}/g.test(text.value.raw) ? text.value.cooked : text.value.raw
           if (value === "") return null
 
           return {

diff --git a/packages/macro/src/macroJsx.ts b/packages/macro/src/macroJsx.ts
@@ -231,7 +231,7 @@ export default class MacroJSX {
           R.evolve({
             quasis: R.map((text: babelTypes.TemplateElement) => {
               // Don"t output tokens without text.
-              const value = text.value.raw
+              const value = /\\u[a-fA-F0-9]{4}/g.test(text.value.raw) ? text.value.cooked : text.value.raw
               if (value === "") return null
 
               return this.tokenizeText(this.clearBackslashes(value))