🐛 fix key includes backslash and negative value

Author: nissy-dev

src/utils.ts

@@ -4,6 +4,7 @@ import {
   isObjectExpression,
   isNullLiteral,
   isNumericLiteral,
+  isUnaryExpression,
   isStringLiteral,
   ObjectExpression,
   ObjectProperty,
@@ -60,30 +61,43 @@ const isConvertibleObjectProperty = (properties: ObjectProperty[]) => {
   return properties.every(node => !node.computed)
 }
 
-export function converter(node: object | null | undefined): unknown {
-  if (!isValidJsonValue(node)) {
-    throw new Error('Invalid value is included.')
+const createSafeStringForJsonParse = (value: string) => {
+  if (/\\/.test(value)) {
+    value = value.replace(/\\/g, '\\\\')
   }
 
-  if (isStringLiteral(node)) {
-    let { value } = node
-    if (/\\/.test(value)) {
-      value = value.replace(/\\/g, '\\\\')
-    }
+  if (/"/.test(value)) {
+    value = value.replace(/"/g, '\\"')
+  }
 
-    if (/"/.test(value)) {
-      value = value.replace(/"/g, '\\"')
+  if (/[\t\f\r\n\b]/g.test(value)) {
+    const codes = ['\f', '\r', '\n', '\t', '\b']
+    const replaceCodes = ['\\f', '\\r', '\\n', '\\t', '\\b']
+    for (let i = 0; i < codes.length; i++) {
+      value = value.replace(new RegExp(codes[i]), replaceCodes[i])
     }
+  }
 
-    if (/[\t\f\r\n\b]/g.test(value)) {
-      const codes = ['\f', '\r', '\n', '\t', '\b']
-      const replaceCodes = ['\\f', '\\r', '\\n', '\\t', '\\b']
-      for (let i = 0; i < codes.length; i++) {
-        value = value.replace(new RegExp(codes[i]), replaceCodes[i])
-      }
+  return value
+}
+
+export function converter(node: object | null | undefined): unknown {
+  // for negative number, ex) -10
+  if (isUnaryExpression(node)) {
+    const { operator, argument } = node
+    if (operator === '-' && isNumericLiteral(argument)) {
+      return -argument.value
     }
+  }
 
-    return value
+  if (!isValidJsonValue(node)) {
+    throw new Error('Invalid value is included.')
+  }
+
+  if (isStringLiteral(node)) {
+    const { value } = node
+    const safeValue = createSafeStringForJsonParse(value)
+    return safeValue
   }
 
   if (isNullLiteral(node)) {
@@ -106,7 +120,10 @@ export function converter(node: object | null | undefined): unknown {
     }
 
     return properties.reduce((acc, cur) => {
-      const key = cur.key.name || cur.key.value
+      let key = cur.key.name || cur.key.value
+      if (typeof key === 'string') {
+        key = createSafeStringForJsonParse(key)
+      }
       // see issues#10
       if (typeof key === 'number' && !Number.isSafeInteger(key)) {
         throw new Error('Invalid syntax is included.')

test/__fixtures__/object/backslash/input.js

@@ -13,6 +13,15 @@ const test12 = { foo: 'fo\\o' }
 const test13 = { foo: 'fo\\\o' }
 const test14 = { foo: 'fo\\\\o' }
 const test15 = { foo: '\\\\' }
+const test16 = { "fo\'o": "foo" }
+const test17 = { "fo\"o": "foo" }
+const test18 = { 'fo\"o': "foo" }
+const test19 = { 'fo\'o': "foo" }
+const test20 = { 'fo\no': "foo" }
+const test21 = { 'fo\r\no': "foo" }
+const test22 = { 'fo\\o': "foo" }
+const test23 = { 'fo\\\o': "foo" }
+const test24 = { 'fo\\\\o': "foo" }
 const res = [
   test1,
   test2,
@@ -28,5 +37,14 @@ const res = [
   test12,
   test13,
   test14,
-  test15
+  test15,
+  test16,
+  test17,
+  test18,
+  test19,
+  test20,
+  test21,
+  test22,
+  test23,
+  test24
 ]

test/__fixtures__/object/backslash/output.js

@@ -13,6 +13,15 @@ const test12 = JSON.parse('{"foo":"fo\\\\o"}')
 const test13 = JSON.parse('{"foo":"fo\\\\o"}')
 const test14 = JSON.parse('{"foo":"fo\\\\\\\\o"}')
 const test15 = JSON.parse('{"foo":"\\\\\\\\"}')
+const test16 = JSON.parse('{"fo\'o":"foo"}')
+const test17 = JSON.parse('{"fo\\"o":"foo"}')
+const test18 = JSON.parse('{"fo\\"o":"foo"}')
+const test19 = JSON.parse('{"fo\'o":"foo"}')
+const test20 = JSON.parse('{"fo\\no":"foo"}')
+const test21 = JSON.parse('{"fo\\r\\no":"foo"}')
+const test22 = JSON.parse('{"fo\\\\o":"foo"}')
+const test23 = JSON.parse('{"fo\\\\o":"foo"}')
+const test24 = JSON.parse('{"fo\\\\\\\\o":"foo"}')
 const res = [
   test1,
   test2,
@@ -28,5 +37,14 @@ const res = [
   test12,
   test13,
   test14,
-  test15
+  test15,
+  test16,
+  test17,
+  test18,
+  test19,
+  test20,
+  test21,
+  test22,
+  test23,
+  test24
 ]