fix: escape

antfu · May 3, 2024 · 8a9037d · 8a9037d
1 parent 37cb05a
commit 8a9037d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/commands/to-string-literal.test.ts b/src/commands/to-string-literal.test.ts
@@ -9,7 +9,7 @@ run(
     const a = \`a\`; const b = \`b\`; const c = 'c';
     `,
     output: d`
-    const a = 'a'; const b = 'b'; const c = 'c';
+    const a = "a"; const b = "b"; const c = 'c';
     `,
     errors: ['command-removal', 'command-fix', 'command-fix'],
   },
@@ -20,7 +20,7 @@ run(
     const a = \`a\`, b = \`b\`, c = \`c\`, d = \`d\`;
     `,
     output: d`
-    const a = \`a\`, b = 'b', c = 'c', d = \`d\`;
+    const a = \`a\`, b = "b", c = "c", d = \`d\`;
     `,
     errors: ['command-removal', 'command-fix', 'command-fix'],
   },
@@ -31,7 +31,7 @@ run(
     const a = 'a', b = 'b', c = \`c\`, d = 'd', e = \`e\`, f = \`f\`;
     `,
     output: d`
-    const a = 'a', b = 'b', c = 'c', d = 'd', e = \`e\`, f = 'f';
+    const a = 'a', b = 'b', c = "c", d = 'd', e = \`e\`, f = "f";
     `,
     errors: ['command-removal', 'command-fix', 'command-fix'],
   },
@@ -42,18 +42,18 @@ run(
     const a = \`\${g}a\${a}a\${b}c\${d}e\${a}\`;
     `,
     output: d`
-    const a = g + 'a' + a + 'a' + b + 'c' + d + 'e' + a;
+    const a = g + "a" + a + "a" + b + "c" + d + "e" + a;
     `,
     errors: ['command-removal', 'command-fix'],
   },
   // escape
   {
     code: d`
     // @2sl
-    const a = \`'\\'\`
+    const a = \`"\\"\\\\"\`
     `,
     output: d`
-    const a = '\\'\\''
+    const a = "\\"\\\\\\"\\\\\\\\\\""
     `,
     errors: ['command-removal', 'command-fix'],
   },

diff --git a/src/commands/to-string-literal.ts b/src/commands/to-string-literal.ts
@@ -19,12 +19,12 @@ export const toStringLiteral: Command = {
     ctx.removeComment()
     for (const node of getNodesByIndexes(nodes, indexes)) {
       const ids = extractIdentifiers(node)
-      let raw = ctx.source.getText(node).slice(1, -1).replace(/(?<!\\)'/g, `\\'`)
+      let raw = JSON.stringify(ctx.source.getText(node).slice(1, -1)).slice(1, -1)
 
       if (ids.length)
         raw = toStringWithIds(raw, node, ids)
       else
-        raw = `'${raw}'`
+        raw = `"${raw}"`
 
       ctx.report({
         node,
@@ -56,8 +56,8 @@ function toStringWithIds(raw: string, node: Tree.TemplateLiteral, ids: Identifie
   let hasStart = false
   let hasEnd = false
   ids.forEach(({ name, range }, index) => {
-    let startStr = `' + `
-    let endStr = ` + '`
+    let startStr = `" + `
+    let endStr = ` + "`
 
     if (index === 0) {
       hasStart = range[0] - /* `${ */3 === node.range[0]