Add @babel/helper-validator-identifier (#11289)

* refactor: replace esutils.keywords.isIdentifierNameES6 by helper-validator-identifier

* refactor: replace esutils isReservedWordES6 by isKeyword || isReservedWord

* address review comments

* chore: specify both “main” and “exports”

* build helper-validator-identifier before babel-types

Author: JLHwung

Gulpfile.js

@@ -226,9 +226,19 @@ gulp.task("build-rollup", () => buildRollup(libBundles));
 gulp.task("build-babel-standalone", () => buildRollup(standaloneBundle));
 
 gulp.task("build-babel", () => buildBabel(/* exclude */ libBundles));
-gulp.task("build-babel-types", () =>
+gulp.task("build-babel-types-deps", () =>
+  buildBabel(
+    /* exclude */ libBundles,
+    "packages/babel-helper-validator-identifier/src/**/*.js"
+  )
+);
+gulp.task("build-babel-types-self", () =>
   buildBabel(/* exclude */ libBundles, "packages/babel-types/src/**/*.js")
 );
+gulp.task(
+  "build-babel-types",
+  gulp.series("build-babel-types-deps", "build-babel-types-self")
+);
 gulp.task("build", gulp.parallel("build-rollup", "build-babel"));
 
 gulp.task("default", gulp.series("build"));

babel.config.js

@@ -115,7 +115,10 @@ module.exports = function(api) {
     ].filter(Boolean),
     overrides: [
       {
-        test: "packages/babel-parser",
+        test: [
+          "packages/babel-parser",
+          "packages/babel-helper-validator-identifier",
+        ],
         plugins: [
           "babel-plugin-transform-charcodes",
           ["@babel/transform-for-of", { assumeArray: true }],

packages/babel-helper-builder-react-jsx-experimental/package.json

@@ -11,7 +11,6 @@
   "dependencies": {
     "@babel/helper-annotate-as-pure": "^7.8.3",
     "@babel/helper-module-imports": "^7.8.3",
-    "@babel/types": "^7.8.3",
-    "esutils": "^2.0.0"
+    "@babel/types": "^7.8.3"
   }
 }

packages/babel-helper-builder-react-jsx-experimental/src/index.js

@@ -1,4 +1,3 @@
-import esutils from "esutils";
 import * as t from "@babel/types";
 import { addNamed, addNamespace, isModule } from "@babel/helper-module-imports";
 import annotateAsPure from "@babel/helper-annotate-as-pure";
@@ -472,7 +471,7 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,
     if (t.isJSXIdentifier(node)) {
       if (node.name === "this" && t.isReferenced(node, parent)) {
         return t.thisExpression();
-      } else if (esutils.keyword.isIdentifierNameES6(node.name)) {
+      } else if (t.isValidIdentifier(node.name, false)) {
         node.type = "Identifier";
       } else {
         return t.stringLiteral(node.name);
@@ -521,7 +520,7 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,
       node.name = t.stringLiteral(
         node.name.namespace.name + ":" + node.name.name.name,
       );
-    } else if (esutils.keyword.isIdentifierNameES6(node.name.name)) {
+    } else if (t.isValidIdentifier(node.name.name, false)) {
       node.name.type = "Identifier";
     } else {
       node.name = t.stringLiteral(node.name.name);

packages/babel-helper-builder-react-jsx/package.json

@@ -10,7 +10,6 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/helper-annotate-as-pure": "^7.8.3",
-    "@babel/types": "^7.8.3",
-    "esutils": "^2.0.0"
+    "@babel/types": "^7.8.3"
   }
 }

packages/babel-helper-builder-react-jsx/src/index.js

@@ -1,4 +1,3 @@
-import esutils from "esutils";
 import * as t from "@babel/types";
 import annotateAsPure from "@babel/helper-annotate-as-pure";
 
@@ -57,7 +56,7 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,
     if (t.isJSXIdentifier(node)) {
       if (node.name === "this" && t.isReferenced(node, parent)) {
         return t.thisExpression();
-      } else if (esutils.keyword.isIdentifierNameES6(node.name)) {
+      } else if (t.isValidIdentifier(node.name, false)) {
         node.type = "Identifier";
       } else {
         return t.stringLiteral(node.name);
@@ -104,7 +103,7 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,
       node.name = t.stringLiteral(
         node.name.namespace.name + ":" + node.name.name.name,
       );
-    } else if (esutils.keyword.isIdentifierNameES6(node.name.name)) {
+    } else if (t.isValidIdentifier(node.name.name, false)) {
       node.name.type = "Identifier";
     } else {
       node.name = t.stringLiteral(node.name.name);

packages/babel-helper-validator-identifier/.npmignore

@@ -0,0 +1,3 @@
+src
+test
+*.log

packages/babel-helper-validator-identifier/README.md

@@ -0,0 +1,19 @@
+# @babel/helper-validator-identifier
+
+> Validate identifier/keywords name
+
+See our website [@babel/helper-validator-identifier](https://babeljs.io/docs/en/next/babel-helper-validator-identifier.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/helper-validator-identifier
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/helper-validator-identifier --dev
+```

packages/babel-helper-validator-identifier/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@babel/helper-validator-identifier",
+  "version": "7.9.0",
+  "description": "Validate identifier/keywords name",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-validator-identifier",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "./lib/index.js",
+  "exports": "./lib/index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "charcodes": "^0.2.0",
+    "unicode-13.0.0": "^0.8.0"
+  }
+}