@babel/types - npm Package Compare versions

Comparing version 7.0.0-beta.44 to 7.0.0-beta.45

lib/asserts/generated/index.js

@@ -152,2 +152,3 @@ "use strict";
 exports.assertOptionalCallExpression = assertOptionalCallExpression;
+exports.assertClassPrivateProperty = assertClassPrivateProperty;
 exports.assertImport = assertImport;
@@ -158,2 +159,3 @@ exports.assertDecorator = assertDecorator;
 exports.assertExportNamespaceSpecifier = assertExportNamespaceSpecifier;
+exports.assertPrivateName = assertPrivateName;
 exports.assertTSParameterProperty = assertTSParameterProperty;
@@ -254,2 +256,3 @@ exports.assertTSDeclareFunction = assertTSDeclareFunction;
 exports.assertJSX = assertJSX;
+exports.assertPrivate = assertPrivate;
 exports.assertTSTypeElement = assertTSTypeElement;
@@ -1440,2 +1443,10 @@ exports.assertTSType = assertTSType;
 
+function assertClassPrivateProperty(node, opts) {
+  if (opts === void 0) {
+    opts = {};
+  }
+
+  assert("ClassPrivateProperty", node, opts);
+}
+
 function assertImport(node, opts) {
@@ -1481,2 +1492,10 @@ if (opts === void 0) {
 
+function assertPrivateName(node, opts) {
+  if (opts === void 0) {
+    opts = {};
+  }
+
+  assert("PrivateName", node, opts);
+}
+
 function assertTSParameterProperty(node, opts) {
@@ -2242,2 +2261,10 @@ if (opts === void 0) {
 
+function assertPrivate(node, opts) {
+  if (opts === void 0) {
+    opts = {};
+  }
+
+  assert("Private", node, opts);
+}
+
 function assertTSTypeElement(node, opts) {
@@ -2244,0 +2271,0 @@ if (opts === void 0) {

lib/constants/generated/index.js

@@ -6,3 +6,3 @@ "use strict";
 });
-exports.TSTYPE_TYPES = exports.TSTYPEELEMENT_TYPES = exports.JSX_TYPES = exports.FLOWPREDICATE_TYPES = exports.FLOWDECLARATION_TYPES = exports.FLOWBASEANNOTATION_TYPES = exports.FLOWTYPE_TYPES = exports.FLOW_TYPES = exports.MODULESPECIFIER_TYPES = exports.EXPORTDECLARATION_TYPES = exports.MODULEDECLARATION_TYPES = exports.CLASS_TYPES = exports.PATTERN_TYPES = exports.UNARYLIKE_TYPES = exports.PROPERTY_TYPES = exports.OBJECTMEMBER_TYPES = exports.METHOD_TYPES = exports.USERWHITESPACABLE_TYPES = exports.IMMUTABLE_TYPES = exports.LITERAL_TYPES = exports.TSENTITYNAME_TYPES = exports.LVAL_TYPES = exports.PATTERNLIKE_TYPES = exports.DECLARATION_TYPES = exports.PUREISH_TYPES = exports.FUNCTIONPARENT_TYPES = exports.FUNCTION_TYPES = exports.FORXSTATEMENT_TYPES = exports.FOR_TYPES = exports.EXPRESSIONWRAPPER_TYPES = exports.WHILE_TYPES = exports.LOOP_TYPES = exports.CONDITIONAL_TYPES = exports.COMPLETIONSTATEMENT_TYPES = exports.TERMINATORLESS_TYPES = exports.STATEMENT_TYPES = exports.BLOCK_TYPES = exports.BLOCKPARENT_TYPES = exports.SCOPABLE_TYPES = exports.BINARY_TYPES = exports.EXPRESSION_TYPES = void 0;
+exports.TSTYPE_TYPES = exports.TSTYPEELEMENT_TYPES = exports.PRIVATE_TYPES = exports.JSX_TYPES = exports.FLOWPREDICATE_TYPES = exports.FLOWDECLARATION_TYPES = exports.FLOWBASEANNOTATION_TYPES = exports.FLOWTYPE_TYPES = exports.FLOW_TYPES = exports.MODULESPECIFIER_TYPES = exports.EXPORTDECLARATION_TYPES = exports.MODULEDECLARATION_TYPES = exports.CLASS_TYPES = exports.PATTERN_TYPES = exports.UNARYLIKE_TYPES = exports.PROPERTY_TYPES = exports.OBJECTMEMBER_TYPES = exports.METHOD_TYPES = exports.USERWHITESPACABLE_TYPES = exports.IMMUTABLE_TYPES = exports.LITERAL_TYPES = exports.TSENTITYNAME_TYPES = exports.LVAL_TYPES = exports.PATTERNLIKE_TYPES = exports.DECLARATION_TYPES = exports.PUREISH_TYPES = exports.FUNCTIONPARENT_TYPES = exports.FUNCTION_TYPES = exports.FORXSTATEMENT_TYPES = exports.FOR_TYPES = exports.EXPRESSIONWRAPPER_TYPES = exports.WHILE_TYPES = exports.LOOP_TYPES = exports.CONDITIONAL_TYPES = exports.COMPLETIONSTATEMENT_TYPES = exports.TERMINATORLESS_TYPES = exports.STATEMENT_TYPES = exports.BLOCK_TYPES = exports.BLOCKPARENT_TYPES = exports.SCOPABLE_TYPES = exports.BINARY_TYPES = exports.EXPRESSION_TYPES = void 0;
 
@@ -89,2 +89,4 @@ var _definitions = require("../../definitions");
 exports.JSX_TYPES = JSX_TYPES;
+var PRIVATE_TYPES = _definitions.FLIPPED_ALIAS_KEYS["Private"];
+exports.PRIVATE_TYPES = PRIVATE_TYPES;
 var TSTYPEELEMENT_TYPES = _definitions.FLIPPED_ALIAS_KEYS["TSTypeElement"];
@@ -91,0 +93,0 @@ exports.TSTYPEELEMENT_TYPES = TSTYPEELEMENT_TYPES;

lib/definitions/core.js

@@ -421,3 +421,3 @@ "use strict";
       validate: function () {
-        var normal = (0, _utils.assertNodeType)("Identifier");
+        var normal = (0, _utils.assertNodeType)("Identifier", "PrivateName");
         var computed = (0, _utils.assertNodeType)("Expression");
@@ -424,0 +424,0 @@ return function (node, key, val) {

lib/definitions/es2015.js

@@ -64,3 +64,3 @@ "use strict";
     body: {
-      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("ClassMethod", "ClassProperty", "TSDeclareMethod", "TSIndexSignature")))
+      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("ClassMethod", "ClassProperty", "ClassPrivateProperty", "TSDeclareMethod", "TSIndexSignature")))
     }
@@ -67,0 +67,0 @@ }

lib/definitions/experimental.js

@@ -101,2 +101,16 @@ "use strict";
 });
+(0, _utils.default)("ClassPrivateProperty", {
+  visitor: ["key", "value"],
+  builder: ["key", "value"],
+  aliases: ["Property", "Private"],
+  fields: {
+    key: {
+      validate: (0, _utils.assertNodeType)("PrivateName")
+    },
+    value: {
+      validate: (0, _utils.assertNodeType)("Expression"),
+      optional: true
+    }
+  }
+});
 (0, _utils.default)("Import", {
@@ -106,6 +120,10 @@ aliases: ["Expression"]
 (0, _utils.default)("Decorator", {
-  visitor: ["expression"],
+  visitor: ["callee", "arguments"],
   fields: {
-    expression: {
+    callee: {
       validate: (0, _utils.assertNodeType)("Expression")
+    },
+    arguments: {
+      optional: true,
+      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("Expression", "SpreadElement")))
     }
@@ -140,2 +158,11 @@ }
   }
+});
+(0, _utils.default)("PrivateName", {
+  visitor: ["id"],
+  aliases: ["Private"],
+  fields: {
+    id: {
+      validate: (0, _utils.assertNodeType)("Identifier")
+    }
+  }
 });

lib/definitions/flow.js

@@ -7,2 +7,22 @@ "use strict";
 
+var defineInterfaceishType = function defineInterfaceishType(name, typeParameterType) {
+  if (typeParameterType === void 0) {
+    typeParameterType = "TypeParameterDeclaration";
+  }
+
+  (0, _utils.default)(name, {
+    builder: ["id", "typeParameters", "extends", "body"],
+    visitor: ["id", "typeParameters", "extends", "mixins", "implements", "body"],
+    aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+    fields: {
+      id: (0, _utils.validateType)("Identifier"),
+      typeParameters: (0, _utils.validateOptionalType)(typeParameterType),
+      extends: (0, _utils.validateOptional)((0, _utils.arrayOfType)("InterfaceExtends")),
+      mixins: (0, _utils.validateOptional)((0, _utils.arrayOfType)("InterfaceExtends")),
+      implements: (0, _utils.validateOptional)((0, _utils.arrayOfType)("ClassImplements")),
+      body: (0, _utils.validateType)("ObjectTypeAnnotation")
+    }
+  });
+};
+
 (0, _utils.default)("AnyTypeAnnotation", {
@@ -22,2 +42,3 @@ aliases: ["Flow", "FlowType", "FlowBaseAnnotation"]
 (0, _utils.default)("BooleanLiteralTypeAnnotation", {
+  builder: ["value"],
   aliases: ["Flow", "FlowType"],
@@ -39,13 +60,3 @@ fields: {
 });
-(0, _utils.default)("DeclareClass", {
-  visitor: ["id", "typeParameters", "extends", "body"],
-  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
-  fields: {
-    id: (0, _utils.validateType)("Identifier"),
-    typeParameters: (0, _utils.validateOptionalType)("TypeParameterInstantiation"),
-    extends: (0, _utils.validateOptional)((0, _utils.arrayOfType)("InterfaceExtends")),
-    mixins: (0, _utils.validateOptional)((0, _utils.arrayOfType)("InterfaceExtends")),
-    body: (0, _utils.validateType)("ObjectTypeAnnotation")
-  }
-});
+defineInterfaceishType("DeclareClass", "TypeParameterInstantiation");
 (0, _utils.default)("DeclareFunction", {
@@ -59,13 +70,3 @@ visitor: ["id"],
 });
-(0, _utils.default)("DeclareInterface", {
-  visitor: ["id", "typeParameters", "extends", "body"],
-  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
-  fields: {
-    id: (0, _utils.validateType)("Identifier"),
-    typeParameters: (0, _utils.validateOptionalType)("TypeParameterDeclaration"),
-    extends: (0, _utils.validateOptionalType)("InterfaceExtends"),
-    mixins: (0, _utils.validateOptional)((0, _utils.arrayOfType)("Flow")),
-    body: (0, _utils.validateType)("ObjectTypeAnnotation")
-  }
-});
+defineInterfaceishType("DeclareInterface");
 (0, _utils.default)("DeclareModule", {
@@ -179,13 +180,3 @@ builder: ["id", "body", "kind"],
 });
-(0, _utils.default)("InterfaceDeclaration", {
-  visitor: ["id", "typeParameters", "extends", "body"],
-  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
-  fields: {
-    id: (0, _utils.validateType)("Identifier"),
-    typeParameters: (0, _utils.validateOptionalType)("TypeParameterDeclaration"),
-    extends: (0, _utils.validate)((0, _utils.arrayOfType)("InterfaceExtends")),
-    mixins: (0, _utils.validate)((0, _utils.arrayOfType)("InterfaceExtends")),
-    body: (0, _utils.validateType)("ObjectTypeAnnotation")
-  }
-});
+defineInterfaceishType("InterfaceDeclaration");
 (0, _utils.default)("IntersectionTypeAnnotation", {
@@ -212,2 +203,3 @@ visitor: ["types"],
 (0, _utils.default)("NumberLiteralTypeAnnotation", {
+  builder: ["value"],
   aliases: ["Flow", "FlowType"],
@@ -292,2 +284,3 @@ fields: {
 (0, _utils.default)("StringLiteralTypeAnnotation", {
+  builder: ["value"],
   aliases: ["Flow", "FlowType"],
@@ -294,0 +287,0 @@ fields: {

lib/validators/isReferenced.js

@@ -10,72 +10,45 @@ "use strict";
   switch (parent.type) {
-    case "BindExpression":
-      return parent.object === node || parent.callee === node;
-
     case "MemberExpression":
     case "JSXMemberExpression":
-      if (parent.property === node && parent.computed) {
-        return true;
-      } else if (parent.object === node) {
-        return true;
-      } else {
-        return false;
+    case "OptionalMemberExpression":
+      if (parent.property === node) {
+        return !!parent.computed;
       }
 
-    case "MetaProperty":
-      return false;
+      return parent.object === node;
 
-    case "ObjectProperty":
-      if (parent.key === node) {
-        return parent.computed;
-      }
-
     case "VariableDeclarator":
-      return parent.id !== node;
+      return parent.init === node;
 
     case "ArrowFunctionExpression":
-    case "FunctionDeclaration":
-    case "FunctionExpression":
-      var _arr = parent.params;
+      return parent.body === node;
 
-      for (var _i = 0; _i < _arr.length; _i++) {
-        var param = _arr[_i];
-        if (param === node) return false;
-      }
-
-      return parent.id !== node;
-
     case "ExportSpecifier":
       if (parent.source) {
         return false;
-      } else {
-        return parent.local === node;
       }
 
-    case "ExportNamespaceSpecifier":
-    case "ExportDefaultSpecifier":
-      return false;
+      return parent.local === node;
 
-    case "JSXAttribute":
-      return parent.name !== node;
-
+    case "ObjectProperty":
     case "ClassProperty":
+    case "ClassPrivateProperty":
+    case "ClassMethod":
+    case "ObjectMethod":
       if (parent.key === node) {
-        return parent.computed;
-      } else {
-        return parent.value === node;
+        return !!parent.computed;
       }
 
-    case "ImportDefaultSpecifier":
-    case "ImportNamespaceSpecifier":
-    case "ImportSpecifier":
-      return false;
+      return parent.value === node;
 
     case "ClassDeclaration":
     case "ClassExpression":
-      return parent.id !== node;
+      return parent.superClass === node;
 
-    case "ClassMethod":
-    case "ObjectMethod":
-      return parent.key === node && parent.computed;
+    case "AssignmentExpression":
+      return parent.right === node;
 
+    case "AssignmentPattern":
+      return parent.right === node;
+
     case "LabeledStatement":
@@ -85,3 +58,3 @@ return false;
     case "CatchClause":
-      return parent.param !== node;
+      return false;
 
@@ -91,11 +64,24 @@ case "RestElement":
 
-    case "AssignmentExpression":
-      return parent.right === node;
+    case "FunctionDeclaration":
+    case "FunctionExpression":
+      return false;
 
-    case "AssignmentPattern":
-      return parent.right === node;
+    case "ExportNamespaceSpecifier":
+    case "ExportDefaultSpecifier":
+      return false;
 
+    case "ImportDefaultSpecifier":
+    case "ImportNamespaceSpecifier":
+    case "ImportSpecifier":
+      return false;
+
+    case "JSXAttribute":
+      return false;
+
     case "ObjectPattern":
     case "ArrayPattern":
       return false;
+
+    case "MetaProperty":
+      return false;
   }
@@ -102,0 +88,0 @@

package.json

 {
   "name": "@babel/types",
-  "version": "7.0.0-beta.44",
+  "version": "7.0.0-beta.45",
   "description": "Babel Types is a Lodash-esque utility library for AST nodes",
@@ -17,5 +17,5 @@ "author": "Sebastian McKenzie <[e-mail]>",
   "devDependencies": {
-    "@babel/generator": "7.0.0-beta.44",
-    "babylon": "7.0.0-beta.44"
+    "@babel/generator": "7.0.0-beta.45",
+    "babylon": "7.0.0-beta.45"
   }
 }

scripts/generators/generateValidators.js

 "use strict";
 const definitions = require("../../lib/definitions");
 
-function addIsHelper(type) {
+function addIsHelper(type, aliasKeys, deprecated) {
+  const targetType = JSON.stringify(type);
+  let aliasSource = "";
+  if (aliasKeys) {
+    aliasSource =
+      " || " +
+      aliasKeys.map(JSON.stringify).join(" === nodeType || ") +
+      " === nodeType";
+  }
+
   return `export function is${type}(node: Object, opts?: Object): boolean {
-    return is("${type}", node, opts) }
+    ${deprecated || ""}
+    if (!node) return false;
+
+    const nodeType = node.type;
+    if (nodeType === ${targetType}${aliasSource}) {
+      if (typeof opts === "undefined") {
+        return true;
+      } else {
+        return shallowEqual(node, opts);
+      }
+    }
+
+    return false;
+  }
   `;
@@ -16,3 +38,3 @@ }
  */
-import is from "../is";\n\n`;
+import shallowEqual from "../../utils/shallowEqual";\n\n`;
 
@@ -24,3 +46,3 @@ Object.keys(definitions.VISITOR_KEYS).forEach(type => {
   Object.keys(definitions.FLIPPED_ALIAS_KEYS).forEach(type => {
-    output += addIsHelper(type);
+    output += addIsHelper(type, definitions.FLIPPED_ALIAS_KEYS[type]);
   });
@@ -30,6 +52,4 @@
     const newType = definitions.DEPRECATED_KEYS[type];
-    output += `export function is${type}(node: Object, opts: Object): boolean {
-  console.trace("The node type ${type} has been renamed to ${newType}");
-  return is("${type}", node, opts);
-}\n`;
+    const deprecated = `console.trace("The node type ${type} has been renamed to ${newType}");`;
+    output += addIsHelper(type, null, deprecated);
   });
@@ -36,0 +56,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

664399

increased by11.39%

Lines of code

12946

increased by22.94%

Number of lines in readme file

2956

increased by1.06%

No dependency changes