hermes-parser 0.16.0 → 0.17.1

package/dist/babel/TransformESTreeToBabel.js

@@ -20,6 +20,8 @@ var _SimpleTraverser = require("../traverse/SimpleTraverser");
 
 var _ESTreeVisitorKeys = _interopRequireDefault(require("../generated/ESTreeVisitorKeys"));
 
+var _createSyntaxError = require("../utils/createSyntaxError");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Rely on the mapper to fix up parent relationships.
@@ -55,16 +57,6 @@ const FlowESTreeAndBabelVisitorKeys = { ..._ESTreeVisitorKeys.default,
 function nodeWith(node, overrideProps) {
   return _SimpleTransform.SimpleTransform.nodeWith(node, overrideProps, FlowESTreeAndBabelVisitorKeys);
 }
-
-function createSyntaxError(node, err) {
-  const syntaxError = new SyntaxError(err); // $FlowExpectedError[prop-missing]
-
-  syntaxError.loc = {
-    line: node.loc.start.line,
-    column: node.loc.start.column
-  };
-  return syntaxError;
-}
 /**
  * Babel node types
  *
@@ -250,7 +242,7 @@ function mapProperty(node) {
 
   if (node.method || node.kind !== 'init') {
     if (value.type !== 'FunctionExpression') {
-      throw createSyntaxError(node, `Invalid method property, the value must be a "FunctionExpression" or "ArrowFunctionExpression. Instead got "${value.type}".`);
+      throw (0, _createSyntaxError.createSyntaxError)(node, `Invalid method property, the value must be a "FunctionExpression" or "ArrowFunctionExpression. Instead got "${value.type}".`);
     } // Properties under the FunctionExpression value that should be moved
     // to the ObjectMethod node itself.
 
@@ -749,6 +741,23 @@ function transformNode(node) {
         return node;
       }
 
+    case 'AsExpression':
+      {
+        const {
+          typeAnnotation
+        } = node; // $FlowExpectedError[cannot-write]
+
+        node.type = 'TypeCastExpression'; // $FlowExpectedError[cannot-write]
+
+        node.typeAnnotation = {
+          type: 'TypeAnnotation',
+          typeAnnotation,
+          loc: typeAnnotation.loc,
+          range: typeAnnotation.range
+        };
+        return node;
+      }
+
     /**
      * Babel has a different format for Literals
      */

package/dist/babel/TransformESTreeToBabel.js.flow

@@ -49,6 +49,7 @@ import type {VisitorKeys} from '../generated/ESTreeVisitorKeys';
 import {SimpleTransform} from '../transform/SimpleTransform';
 import {SimpleTraverser} from '../traverse/SimpleTraverser';
 import FlowVisitorKeys from '../generated/ESTreeVisitorKeys';
+import {createSyntaxError} from '../utils/createSyntaxError';
 
 // Rely on the mapper to fix up parent relationships.
 const EMPTY_PARENT: $FlowFixMe = null;
@@ -96,17 +97,6 @@ function nodeWith<T: ESNode>(node: T, overrideProps: Partial<T>): T {
   );
 }
 
-function createSyntaxError(node: ESNode, err: string): SyntaxError {
-  const syntaxError = new SyntaxError(err);
-  // $FlowExpectedError[prop-missing]
-  syntaxError.loc = {
-    line: node.loc.start.line,
-    column: node.loc.start.column,
-  };
-
-  return syntaxError;
-}
-
 /**
  * Babel node types
  *
@@ -982,6 +972,19 @@ function transformNode(node: ESNodeOrBabelNode): ESNodeOrBabelNode | null {
       node.range = [node.range[0] + 1, node.range[1] - 1];
       return node;
     }
+    case 'AsExpression': {
+      const {typeAnnotation} = node;
+      // $FlowExpectedError[cannot-write]
+      node.type = 'TypeCastExpression';
+      // $FlowExpectedError[cannot-write]
+      node.typeAnnotation = {
+        type: 'TypeAnnotation',
+        typeAnnotation,
+        loc: typeAnnotation.loc,
+        range: typeAnnotation.range,
+      };
+      return node;
+    }
 
     /**
      * Babel has a different format for Literals

package/dist/estree/StripComponentSyntax.js

@@ -28,20 +28,12 @@ var _astNodeMutationHelpers = require("../transform/astNodeMutationHelpers");
 
 var _SimpleTraverser = require("../traverse/SimpleTraverser");
 
+var _createSyntaxError = require("../utils/createSyntaxError");
+
 const nodeWith = _SimpleTransform.SimpleTransform.nodeWith; // Rely on the mapper to fix up parent relationships.
 
 const EMPTY_PARENT = null;
 
-function createSyntaxError(node, err) {
-  const syntaxError = new SyntaxError(err); // $FlowExpectedError[prop-missing]
-
-  syntaxError.loc = {
-    line: node.loc.start.line,
-    column: node.loc.start.column
-  };
-  return syntaxError;
-}
-
 function createDefaultPosition() {
   return {
     line: 1,
@@ -82,7 +74,7 @@ function getComponentParameterName(paramName) {
       return paramName.value;
 
     default:
-      throw createSyntaxError(paramName, `Unknown Component parameter name type of "${paramName.type}"`);
+      throw (0, _createSyntaxError.createSyntaxError)(paramName, `Unknown Component parameter name type of "${paramName.type}"`);
   }
 }
 
@@ -203,16 +195,7 @@ function mapComponentParameters(params) {
   let ref = null;
 
   if (refParam != null) {
-    const refType = refParam.local;
-    ref = {
-      type: 'Identifier',
-      name: 'ref',
-      optional: false,
-      typeAnnotation: refType.type === 'AssignmentPattern' ? refType.left.typeAnnotation : refType.typeAnnotation,
-      loc: refParam.loc,
-      range: refParam.range,
-      parent: EMPTY_PARENT
-    };
+    ref = refParam.local;
   }
 
   return {
@@ -236,10 +219,6 @@ function mapComponentParameter(param) {
 
     case 'ComponentParameter':
       {
-        if (getComponentParameterName(param.name) === 'ref') {
-          throw createSyntaxError(param, 'Component parameters named "ref" are currently not supported');
-        }
-
         let value;
 
         if (param.local.type === 'AssignmentPattern') {
@@ -289,7 +268,7 @@ function mapComponentParameter(param) {
 
     default:
       {
-        throw createSyntaxError(param, `Unknown Component parameter type of "${param.type}"`);
+        throw (0, _createSyntaxError.createSyntaxError)(param, `Unknown Component parameter type of "${param.type}"`);
       }
   }
 }
@@ -360,48 +339,43 @@ function createForwardRefWrapper(originalComponent) {
 }
 
 function mapComponentDeclaration(node) {
-  let rendersType = node.rendersType;
-
-  if (rendersType == null) {
-    // Create empty loc for return type annotation nodes
-    const createRendersTypeLoc = () => ({
-      loc: {
-        start: node.body.loc.end,
-        end: node.body.loc.end
-      },
-      range: [node.body.range[1], node.body.range[1]],
-      parent: EMPTY_PARENT
-    });
+  // Create empty loc for return type annotation nodes
+  const createRendersTypeLoc = () => ({
+    loc: {
+      start: node.body.loc.end,
+      end: node.body.loc.end
+    },
+    range: [node.body.range[1], node.body.range[1]],
+    parent: EMPTY_PARENT
+  });
 
-    rendersType = {
-      type: 'TypeAnnotation',
-      typeAnnotation: {
-        type: 'GenericTypeAnnotation',
+  const returnType = {
+    type: 'TypeAnnotation',
+    typeAnnotation: {
+      type: 'GenericTypeAnnotation',
+      id: {
+        type: 'QualifiedTypeIdentifier',
+        qualification: {
+          type: 'Identifier',
+          name: 'React',
+          optional: false,
+          typeAnnotation: null,
+          ...createRendersTypeLoc()
+        },
         id: {
-          type: 'QualifiedTypeIdentifier',
-          qualification: {
-            type: 'Identifier',
-            name: 'React',
-            optional: false,
-            typeAnnotation: null,
-            ...createRendersTypeLoc()
-          },
-          id: {
-            type: 'Identifier',
-            name: 'Node',
-            optional: false,
-            typeAnnotation: null,
-            ...createRendersTypeLoc()
-          },
+          type: 'Identifier',
+          name: 'Node',
+          optional: false,
+          typeAnnotation: null,
           ...createRendersTypeLoc()
         },
-        typeParameters: null,
         ...createRendersTypeLoc()
       },
+      typeParameters: null,
       ...createRendersTypeLoc()
-    };
-  }
-
+    },
+    ...createRendersTypeLoc()
+  };
   const {
     props,
     ref
@@ -418,7 +392,7 @@ function mapComponentDeclaration(node) {
     __componentDeclaration: true,
     typeParameters: node.typeParameters,
     params: props == null ? [] : ref == null ? [props] : [props, ref],
-    returnType: rendersType,
+    returnType,
     body: node.body,
     async: false,
     generator: false,
@@ -609,7 +583,7 @@ function transformProgram(program, _options) {
           {
             var _node$parent;
 
-            throw createSyntaxError(node, `Components must be defined at the top level of a module or within a ` + `BlockStatement, instead got parent of "${(_node$parent = node.parent) == null ? void 0 : _node$parent.type}".`);
+            throw (0, _createSyntaxError.createSyntaxError)(node, `Components must be defined at the top level of a module or within a ` + `BlockStatement, instead got parent of "${(_node$parent = node.parent) == null ? void 0 : _node$parent.type}".`);
           }
 
         default:

package/dist/estree/StripComponentSyntax.js.flow

@@ -38,28 +38,20 @@ import type {
   VariableDeclaration,
   ModuleDeclaration,
   Statement,
+  AssignmentPattern,
+  BindingName,
 } from 'hermes-estree';
 
 import {SimpleTransform} from '../transform/SimpleTransform';
 import {shallowCloneNode} from '../transform/astNodeMutationHelpers';
 import {SimpleTraverser} from '../traverse/SimpleTraverser';
+import {createSyntaxError} from '../utils/createSyntaxError';
 
 const nodeWith = SimpleTransform.nodeWith;
 
 // Rely on the mapper to fix up parent relationships.
 const EMPTY_PARENT: $FlowFixMe = null;
 
-function createSyntaxError(node: ESNode, err: string): SyntaxError {
-  const syntaxError = new SyntaxError(err);
-  // $FlowExpectedError[prop-missing]
-  syntaxError.loc = {
-    line: node.loc.start.line,
-    column: node.loc.start.column,
-  };
-
-  return syntaxError;
-}
-
 function createDefaultPosition(): Position {
   return {
     line: 1,
@@ -158,7 +150,7 @@ function mapComponentParameters(
   params: $ReadOnlyArray<ComponentParameter | RestElement>,
 ): $ReadOnly<{
   props: ?(ObjectPattern | Identifier),
-  ref: ?Identifier,
+  ref: ?(BindingName | AssignmentPattern),
 }> {
   if (params.length === 0) {
     return {props: null, ref: null};
@@ -247,19 +239,7 @@ function mapComponentParameters(
 
   let ref = null;
   if (refParam != null) {
-    const refType = refParam.local;
-    ref = {
-      type: 'Identifier',
-      name: 'ref',
-      optional: false,
-      typeAnnotation:
-        refType.type === 'AssignmentPattern'
-          ? refType.left.typeAnnotation
-          : refType.typeAnnotation,
-      loc: refParam.loc,
-      range: refParam.range,
-      parent: EMPTY_PARENT,
-    };
+    ref = refParam.local;
   }
 
   return {
@@ -280,13 +260,6 @@ function mapComponentParameter(
       return a;
     }
     case 'ComponentParameter': {
-      if (getComponentParameterName(param.name) === 'ref') {
-        throw createSyntaxError(
-          param,
-          'Component parameters named "ref" are currently not supported',
-        );
-      }
-
       let value;
       if (param.local.type === 'AssignmentPattern') {
         value = nodeWith(param.local, {
@@ -424,46 +397,42 @@ function mapComponentDeclaration(node: ComponentDeclaration): {
   comp: FunctionDeclaration,
   forwardRefDetails: ?ForwardRefDetails,
 } {
-  let rendersType = node.rendersType;
-  if (rendersType == null) {
-    // Create empty loc for return type annotation nodes
-    const createRendersTypeLoc = () => ({
-      loc: {
-        start: node.body.loc.end,
-        end: node.body.loc.end,
-      },
-      range: [node.body.range[1], node.body.range[1]],
-      parent: EMPTY_PARENT,
-    });
-
-    rendersType = {
-      type: 'TypeAnnotation',
-      typeAnnotation: {
-        type: 'GenericTypeAnnotation',
+  // Create empty loc for return type annotation nodes
+  const createRendersTypeLoc = () => ({
+    loc: {
+      start: node.body.loc.end,
+      end: node.body.loc.end,
+    },
+    range: [node.body.range[1], node.body.range[1]],
+    parent: EMPTY_PARENT,
+  });
+  const returnType: TypeAnnotation = {
+    type: 'TypeAnnotation',
+    typeAnnotation: {
+      type: 'GenericTypeAnnotation',
+      id: {
+        type: 'QualifiedTypeIdentifier',
+        qualification: {
+          type: 'Identifier',
+          name: 'React',
+          optional: false,
+          typeAnnotation: null,
+          ...createRendersTypeLoc(),
+        },
         id: {
-          type: 'QualifiedTypeIdentifier',
-          qualification: {
-            type: 'Identifier',
-            name: 'React',
-            optional: false,
-            typeAnnotation: null,
-            ...createRendersTypeLoc(),
-          },
-          id: {
-            type: 'Identifier',
-            name: 'Node',
-            optional: false,
-            typeAnnotation: null,
-            ...createRendersTypeLoc(),
-          },
+          type: 'Identifier',
+          name: 'Node',
+          optional: false,
+          typeAnnotation: null,
           ...createRendersTypeLoc(),
         },
-        typeParameters: null,
         ...createRendersTypeLoc(),
       },
+      typeParameters: null,
       ...createRendersTypeLoc(),
-    };
-  }
+    },
+    ...createRendersTypeLoc(),
+  };
 
   const {props, ref} = mapComponentParameters(node.params);
 
@@ -482,7 +451,7 @@ function mapComponentDeclaration(node: ComponentDeclaration): {
     __componentDeclaration: true,
     typeParameters: node.typeParameters,
     params: props == null ? [] : ref == null ? [props] : [props, ref],
-    returnType: rendersType,
+    returnType,
     body: node.body,
     async: false,
     generator: false,

package/dist/estree/StripFlowTypes.js

@@ -30,6 +30,7 @@ function transformProgram(program, _options) {
   return _SimpleTransform.SimpleTransform.transformProgram(program, {
     transform(node) {
       switch (node.type) {
+        case 'AsExpression':
         case 'TypeCastExpression':
           {
             return node.expression;

package/dist/estree/StripFlowTypes.js.flow

@@ -32,6 +32,7 @@ export function transformProgram(
   return SimpleTransform.transformProgram(program, {
     transform(node: ESNode) {
       switch (node.type) {
+        case 'AsExpression':
         case 'TypeCastExpression': {
           return node.expression;
         }

package/dist/estree/StripFlowTypesForBabel.js

@@ -24,6 +24,8 @@ exports.transformProgram = transformProgram;
 
 var _SimpleTransform = require("../transform/SimpleTransform");
 
+var _createSyntaxError = require("../utils/createSyntaxError");
+
 const nodeWith = _SimpleTransform.SimpleTransform.nodeWith; // Rely on the mapper to fix up parent relationships.
 
 const EMPTY_PARENT = null;
@@ -126,6 +128,22 @@ function transformProgram(program, _options) {
             return createSimpleGenericTypeAnnotation('bigint', node);
           }
 
+        case 'ObjectTypeAnnotation':
+          {
+            const shouldStrip = node.properties.some(prop => prop.type === 'ObjectTypeMappedTypeProperty');
+
+            if (shouldStrip) {
+              return createAnyTypeAnnotation(node);
+            }
+
+            return node;
+          }
+
+        case 'ObjectTypeMappedTypeProperty':
+          {
+            throw (0, _createSyntaxError.createSyntaxError)(node, `Invalid AST structure, ObjectTypeMappedTypeProperty found outside of an ObjectTypeAnnotation`);
+          }
+
         case 'IndexedAccessType':
         case 'OptionalIndexedAccessType':
         case 'KeyofTypeAnnotation':
@@ -133,7 +151,6 @@ function transformProgram(program, _options) {
         case 'InferTypeAnnotation':
         case 'TupleTypeLabeledElement':
         case 'TupleTypeSpreadElement':
-        case 'ObjectTypeMappedTypeProperty':
         case 'ComponentTypeAnnotation':
         case 'TypeOperator':
         case 'TypePredicate':

package/dist/estree/StripFlowTypesForBabel.js.flow

@@ -32,6 +32,7 @@ import type {
 } from 'hermes-estree';
 
 import {SimpleTransform} from '../transform/SimpleTransform';
+import {createSyntaxError} from '../utils/createSyntaxError';
 
 const nodeWith = SimpleTransform.nodeWith;
 
@@ -140,6 +141,22 @@ export function transformProgram(
           // Convert to simple generic type annotation
           return createSimpleGenericTypeAnnotation('bigint', node);
         }
+        case 'ObjectTypeAnnotation': {
+          const shouldStrip = node.properties.some(
+            prop => prop.type === 'ObjectTypeMappedTypeProperty',
+          );
+          if (shouldStrip) {
+            return createAnyTypeAnnotation(node);
+          }
+
+          return node;
+        }
+        case 'ObjectTypeMappedTypeProperty': {
+          throw createSyntaxError(
+            node,
+            `Invalid AST structure, ObjectTypeMappedTypeProperty found outside of an ObjectTypeAnnotation`,
+          );
+        }
         case 'IndexedAccessType':
         case 'OptionalIndexedAccessType':
         case 'KeyofTypeAnnotation':
@@ -147,7 +164,6 @@ export function transformProgram(
         case 'InferTypeAnnotation':
         case 'TupleTypeLabeledElement':
         case 'TupleTypeSpreadElement':
-        case 'ObjectTypeMappedTypeProperty':
         case 'ComponentTypeAnnotation':
         case 'TypeOperator':
         case 'TypePredicate': {

package/dist/generated/ESTreeVisitorKeys.js

@@ -27,6 +27,7 @@ module.exports = {
   ArrayPattern: ['elements', 'typeAnnotation'],
   ArrayTypeAnnotation: ['elementType'],
   ArrowFunctionExpression: ['id', 'params', 'body', 'typeParameters', 'returnType', 'predicate'],
+  AsExpression: ['expression', 'typeAnnotation'],
   AssignmentExpression: ['left', 'right'],
   AssignmentPattern: ['left', 'right'],
   AwaitExpression: ['argument'],

package/dist/generated/ParserVisitorKeys.js

@@ -49,6 +49,10 @@ const HERMES_AST_VISITOR_KEYS = {
     returnType: 'Node',
     predicate: 'Node'
   },
+  AsExpression: {
+    expression: 'Node',
+    typeAnnotation: 'Node'
+  },
   AssignmentExpression: {
     left: 'Node',
     right: 'Node'

package/dist/utils/createSyntaxError.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * 
+ * @format
+ */
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSyntaxError = createSyntaxError;
+
+function createSyntaxError(node, err) {
+  const syntaxError = new SyntaxError(err); // $FlowExpectedError[prop-missing]
+
+  syntaxError.loc = {
+    line: node.loc.start.line,
+    column: node.loc.start.column
+  };
+  return syntaxError;
+}

package/dist/utils/createSyntaxError.js.flow

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {ESNode} from 'hermes-estree';
+
+export function createSyntaxError(node: ESNode, err: string): SyntaxError {
+  const syntaxError = new SyntaxError(err);
+  // $FlowExpectedError[prop-missing]
+  syntaxError.loc = {
+    line: node.loc.start.line,
+    column: node.loc.start.column,
+  };
+
+  return syntaxError;
+}

package/dist/utils/mutateESTreeASTForPrettier.js

@@ -17,7 +17,17 @@ exports.default = mutate;
 var _SimpleTransform = require("../transform/SimpleTransform");
 
 // https://github.com/prettier/prettier/blob/d962466a828f8ef51435e3e8840178d90b7ec6cd/src/language-js/parse/postprocess/index.js#L161-L182
-function transformChainExpression(node) {
+function transformChainExpression(node, comments) {
+  if (comments != null) {
+    var _node$comments;
+
+    // $FlowExpectedError[prop-missing]
+    const joinedComments = comments.concat((_node$comments = node.comments) != null ? _node$comments : []); // $FlowExpectedError[prop-missing]
+    // $FlowFixMe[cannot-write]
+
+    node.comments = joinedComments;
+  }
+
   switch (node.type) {
     case 'CallExpression':
       // $FlowExpectedError[cannot-spread-interface]
@@ -56,7 +66,8 @@ function mutate(rootNode, visitorKeys) {
 
 
       if (node.type === 'ChainExpression') {
-        return transformChainExpression(node.expression);
+        // $FlowFixMe[prop-missing]
+        return transformChainExpression(node.expression, node == null ? void 0 : node.comments);
       } // Prettier currently relies on comparing the `node` vs `node.value` start positions to know if an
       // `ObjectTypeProperty` is a method or not (instead of using the `node.method` boolean). To correctly print
       // the node when its not a method we need the start position to be different from the `node.value`s start

package/dist/utils/mutateESTreeASTForPrettier.js.flow

@@ -10,12 +10,22 @@
 
 'use strict';
 
-import type {ESNode, Program} from 'hermes-estree';
+import type {ESNode, Program, Comment} from 'hermes-estree';
 import type {VisitorKeysType} from '../traverse/getVisitorKeys';
 import {SimpleTransform} from '../transform/SimpleTransform';
 
 // https://github.com/prettier/prettier/blob/d962466a828f8ef51435e3e8840178d90b7ec6cd/src/language-js/parse/postprocess/index.js#L161-L182
-function transformChainExpression(node: ESNode): ESNode {
+function transformChainExpression(
+  node: ESNode,
+  comments: ?$ReadOnlyArray<Comment>,
+): ESNode {
+  if (comments != null) {
+    // $FlowExpectedError[prop-missing]
+    const joinedComments = comments.concat(node.comments ?? []);
+    // $FlowExpectedError[prop-missing]
+    // $FlowFixMe[cannot-write]
+    node.comments = joinedComments;
+  }
   switch (node.type) {
     case 'CallExpression':
       // $FlowExpectedError[cannot-spread-interface]
@@ -59,7 +69,8 @@ export default function mutate(
       // so we have to apply their transform to our AST so it can actually format it.
       // Note: Only needed for prettier V2, this is supported in V3
       if (node.type === 'ChainExpression') {
-        return transformChainExpression(node.expression);
+        // $FlowFixMe[prop-missing]
+        return transformChainExpression(node.expression, node?.comments);
       }
 
       // Prettier currently relies on comparing the `node` vs `node.value` start positions to know if an

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-parser",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "A JavaScript parser built from the Hermes engine",
   "main": "dist/index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "url": "git@github.com:facebook/hermes.git"
   },
   "dependencies": {
-    "hermes-estree": "0.16.0"
+    "hermes-estree": "0.17.1"
   },
   "devDependencies": {
     "@babel/parser": "7.7.4",