Fix removal of quotes from property names

babel · Jun 13, 2017 · 79c8772 · 79c8772
1 parent 7e2b315
commit 79c8772
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 3 deletions.
diff --git a/...es/babel-plugin-transform-property-literals/__tests__/transform-property-literals-test.js b/...es/babel-plugin-transform-property-literals/__tests__/transform-property-literals-test.js
@@ -40,7 +40,13 @@ describe("transform-property-literals-plugin", () => {
         "import": null
       });
     `);
-    expect(transform(source)).toBe(source);
+    const expected = unpad(`
+      ({
+        default: null,
+        import: null
+      });
+    `);
+    expect(transform(source)).toBe(expected);
   });
 
   it("should not transform non-string properties", () => {
@@ -60,4 +66,30 @@ describe("transform-property-literals-plugin", () => {
     `);
     expect(transform(source)).toBe(source);
   });
+
+  it("should not transform invalid es5 property names", () => {
+    const source = unpad(`
+      ({
+        "\u2118": "wp",
+        "𐊧": "foo"
+      });
+    `);
+    expect(transform(source)).toBe(source);
+  });
+
+  it("should transform valid ES5 unicodes as property names", () => {
+    const source = unpad(`
+      ({
+        "ಠ_ಠ": "bar",
+        "12e34": "wut"
+      })
+    `);
+    const expected = unpad(`
+      ({
+        ಠ_ಠ: "bar",
+        12e34: "wut"
+      });
+    `);
+    expect(transform(source)).toBe(expected);
+  });
 });
diff --git a/packages/babel-plugin-transform-property-literals/package.json b/packages/babel-plugin-transform-property-literals/package.json
@@ -11,6 +11,8 @@
   "keywords": [
     "babel-plugin"
   ],
-  "dependencies": {},
+  "dependencies": {
+    "esutils": "^2.0.2"
+  },
   "devDependencies": {}
 }
diff --git a/packages/babel-plugin-transform-property-literals/src/index.js b/packages/babel-plugin-transform-property-literals/src/index.js
@@ -1,5 +1,7 @@
 "use strict";
 
+const esutils = require("esutils");
+
 module.exports = function({ types: t }) {
   return {
     name: "transform-property-literals",
@@ -18,7 +20,7 @@ module.exports = function({ types: t }) {
               node.key = t.numericLiteral(newProp);
               node.computed = false;
             }
-          } else if (t.isValidIdentifier(key.value)) {
+          } else if (isValidPropertyName(key.value)) {
             node.key = t.identifier(key.value);
             node.computed = false;
           }
@@ -27,3 +29,20 @@ module.exports = function({ types: t }) {
     }
   };
 };
+
+// This currently targets es5 now.
+// TODO:
+// Target es6 after integration with babel-preset-env
+function isValidPropertyName(name) {
+  if (typeof name !== "string") {
+    return false;
+  }
+
+  for (const char of name) {
+    if (!esutils.code.isIdentifierPartES5(char.charCodeAt(0))) {
+      return false;
+    }
+  }
+
+  return true;
+}