hermes-parser 0.29.0 → 0.30.0

package/dist/HermesToESTreeAdapter.js

@@ -95,9 +95,6 @@ class HermesToESTreeAdapter extends _HermesASTAdapter.default {
       case 'ExportAllDeclaration':
         return this.mapExportAllDeclaration(node);
 
-      case 'Property':
-        return this.mapProperty(node);
-
       case 'FunctionDeclaration':
       case 'FunctionExpression':
       case 'ArrowFunctionExpression':
@@ -233,17 +230,6 @@ class HermesToESTreeAdapter extends _HermesASTAdapter.default {
     return this.mapNodeDefault(node);
   }
 
-  mapProperty(nodeUnprocessed) {
-    const node = this.mapNodeDefault(nodeUnprocessed);
-
-    if (node.value.type === 'FunctionExpression' && (node.method || node.kind !== 'init')) {
-      node.value.loc.start = node.key.loc.end;
-      node.value.range[0] = node.key.range[1];
-    }
-
-    return node;
-  }
-
   mapComment(node) {
     if (node.type === 'CommentBlock') {
       node.type = 'Block';

package/dist/HermesToESTreeAdapter.js.flow

@@ -76,8 +76,6 @@ export default class HermesToESTreeAdapter extends HermesASTAdapter {
         return this.mapExportNamedDeclaration(node);
       case 'ExportAllDeclaration':
         return this.mapExportAllDeclaration(node);
-      case 'Property':
-        return this.mapProperty(node);
       case 'FunctionDeclaration':
       case 'FunctionExpression':
       case 'ArrowFunctionExpression':
@@ -214,20 +212,6 @@ export default class HermesToESTreeAdapter extends HermesASTAdapter {
     return this.mapNodeDefault(node);
   }
 
-  mapProperty(nodeUnprocessed: HermesNode): HermesNode {
-    const node = this.mapNodeDefault(nodeUnprocessed);
-
-    if (
-      node.value.type === 'FunctionExpression' &&
-      (node.method || node.kind !== 'init')
-    ) {
-      node.value.loc.start = node.key.loc.end;
-      node.value.range[0] = node.key.range[1];
-    }
-
-    return node;
-  }
-
   mapComment(node: HermesNode): HermesNode {
     if (node.type === 'CommentBlock') {
       node.type = 'Block';

package/dist/babel/TransformESTreeToBabel.js

@@ -1065,6 +1065,22 @@ function transformNode(node) {
         return node;
       }
 
+    case 'DeclareOpaqueType':
+    case 'OpaqueType':
+      {
+        if (node.lowerBound != null) {
+          // $FlowExpectedError[cannot-write]
+          delete node.lowerBound;
+        }
+
+        if (node.upperBound != null) {
+          // $FlowExpectedError[cannot-write]
+          delete node.upperBound;
+        }
+
+        return node;
+      }
+
     default:
       {
         return node;

package/dist/babel/TransformESTreeToBabel.js.flow

@@ -1223,6 +1223,18 @@ function transformNode(node: ESNodeOrBabelNode): ESNodeOrBabelNode | null {
       }
       return node;
     }
+    case 'DeclareOpaqueType':
+    case 'OpaqueType': {
+      if (node.lowerBound != null) {
+        // $FlowExpectedError[cannot-write]
+        delete node.lowerBound;
+      }
+      if (node.upperBound != null) {
+        // $FlowExpectedError[cannot-write]
+        delete node.upperBound;
+      }
+      return node;
+    }
     default: {
       return node;
     }

package/dist/estree/StripComponentSyntax.js.flow

@@ -311,8 +311,8 @@ function mapComponentParameterType(
     param.local.type === 'AssignmentPattern'
       ? true
       : param.local.type === 'Identifier'
-      ? param.local.optional
-      : false;
+        ? param.local.optional
+        : false;
 
   return {
     type: 'ObjectTypeProperty',

package/dist/estree/TransformMatchSyntax.js

@@ -784,12 +784,12 @@ function mapMatchExpression(node) {
     hasWildcard,
     analyses
   } = analyzeCases(cases);
-  const isSimpleArgument = calculateSimpleArgument(argument);
+  const isSimpleArgument = !hasBindings && calculateSimpleArgument(argument);
   const genRoot = !isSimpleArgument ? genIdent() : null;
   const root = genRoot == null ? argument : genRoot; // No bindings and a simple argument means we can use nested conditional
   // expressions.
 
-  if (!hasBindings && isSimpleArgument) {
+  if (isSimpleArgument) {
     const wildcardAnalaysis = hasWildcard ? analyses.pop() : null;
     const lastBody = wildcardAnalaysis != null ? wildcardAnalaysis.body : (0, _Builders.iife)([fallthroughError((0, _astNodeMutationHelpers.shallowCloneNode)(root))]);
     return analyses.reverse().reduce((acc, analysis) => {
@@ -886,11 +886,12 @@ function mapMatchStatement(node) {
     cases
   } = node;
   const {
+    hasBindings,
     hasWildcard,
     analyses
   } = analyzeCases(cases);
   const topLabel = genIdent();
-  const isSimpleArgument = calculateSimpleArgument(argument);
+  const isSimpleArgument = !hasBindings && calculateSimpleArgument(argument);
   const genRoot = !isSimpleArgument ? genIdent() : null;
   const root = genRoot == null ? argument : genRoot;
   const statements = [];

package/dist/estree/TransformMatchSyntax.js.flow

@@ -701,13 +701,13 @@ function mapMatchExpression(node: MatchExpression): Expression {
   const {argument, cases} = node;
   const {hasBindings, hasWildcard, analyses} = analyzeCases(cases);
 
-  const isSimpleArgument = calculateSimpleArgument(argument);
+  const isSimpleArgument = !hasBindings && calculateSimpleArgument(argument);
   const genRoot: Identifier | null = !isSimpleArgument ? genIdent() : null;
   const root: Expression = genRoot == null ? argument : genRoot;
 
   // No bindings and a simple argument means we can use nested conditional
   // expressions.
-  if (!hasBindings && isSimpleArgument) {
+  if (isSimpleArgument) {
     const wildcardAnalaysis = hasWildcard ? analyses.pop() : null;
     const lastBody =
       wildcardAnalaysis != null
@@ -798,10 +798,10 @@ function mapMatchExpression(node: MatchExpression): Expression {
  */
 function mapMatchStatement(node: MatchStatement): Statement {
   const {argument, cases} = node;
-  const {hasWildcard, analyses} = analyzeCases(cases);
+  const {hasBindings, hasWildcard, analyses} = analyzeCases(cases);
 
   const topLabel: Identifier = genIdent();
-  const isSimpleArgument = calculateSimpleArgument(argument);
+  const isSimpleArgument = !hasBindings && calculateSimpleArgument(argument);
   const genRoot: Identifier | null = !isSimpleArgument ? genIdent() : null;
   const root: Expression = genRoot == null ? argument : genRoot;
 

package/dist/generated/ESTreeVisitorKeys.js

@@ -66,7 +66,7 @@ module.exports = {
   DeclareModule: ['id', 'body'],
   DeclareModuleExports: ['typeAnnotation'],
   DeclareNamespace: ['id', 'body'],
-  DeclareOpaqueType: ['id', 'typeParameters', 'impltype', 'supertype'],
+  DeclareOpaqueType: ['id', 'typeParameters', 'impltype', 'lowerBound', 'upperBound', 'supertype'],
   DeclareTypeAlias: ['id', 'typeParameters', 'right'],
   DeclareVariable: ['id'],
   DoWhileStatement: ['body', 'test'],
@@ -166,7 +166,7 @@ module.exports = {
   ObjectTypeMappedTypeProperty: ['keyTparam', 'propType', 'sourceType', 'variance'],
   ObjectTypeProperty: ['key', 'value', 'variance'],
   ObjectTypeSpreadProperty: ['argument'],
-  OpaqueType: ['id', 'typeParameters', 'impltype', 'supertype'],
+  OpaqueType: ['id', 'typeParameters', 'impltype', 'lowerBound', 'upperBound', 'supertype'],
   OptionalIndexedAccessType: ['objectType', 'indexType'],
   PrivateIdentifier: [],
   Program: ['body'],

package/dist/generated/ParserVisitorKeys.js

@@ -214,6 +214,8 @@ const HERMES_AST_VISITOR_KEYS = {
     id: 'Node',
     typeParameters: 'Node',
     impltype: 'Node',
+    lowerBound: 'Node',
+    upperBound: 'Node',
     supertype: 'Node'
   },
   DeclareTypeAlias: {
@@ -586,6 +588,8 @@ const HERMES_AST_VISITOR_KEYS = {
     id: 'Node',
     typeParameters: 'Node',
     impltype: 'Node',
+    lowerBound: 'Node',
+    upperBound: 'Node',
     supertype: 'Node'
   },
   OptionalIndexedAccessType: {

package/dist/index.js.flow

@@ -66,14 +66,14 @@ function getOptions(options?: ParserOptions = {...DEFAULTS}) {
 
 declare function parse(
   code: string,
-  opts: {...ParserOptions, babel: true},
+  opts: $ReadOnly<{...ParserOptions, babel: true}>,
 ): BabelFile;
 // eslint-disable-next-line no-redeclare
 declare function parse(
   code: string,
   opts?:
-    | {...ParserOptions, babel?: false | void}
-    | {...ParserOptions, babel: false},
+    | $ReadOnly<{...ParserOptions, babel?: false | void}>
+    | $ReadOnly<{...ParserOptions, babel: false}>,
 ): ESTreeProgram;
 
 // eslint-disable-next-line no-redeclare

package/dist/src/HermesParserNodeDeserializers.js

@@ -1547,6 +1547,8 @@ function deserializeOpaqueType() {
     id: this.deserializeNode(),
     typeParameters: this.deserializeNode(),
     impltype: this.deserializeNode(),
+    lowerBound: this.deserializeNode(),
+    upperBound: this.deserializeNode(),
     supertype: this.deserializeNode()
   };
 }
@@ -1579,6 +1581,8 @@ function deserializeDeclareOpaqueType() {
     id: this.deserializeNode(),
     typeParameters: this.deserializeNode(),
     impltype: this.deserializeNode(),
+    lowerBound: this.deserializeNode(),
+    upperBound: this.deserializeNode(),
     supertype: this.deserializeNode()
   };
 }

package/dist/src/HermesToESTreeAdapter.js

@@ -95,9 +95,6 @@ class HermesToESTreeAdapter extends _HermesASTAdapter.default {
       case 'ExportAllDeclaration':
         return this.mapExportAllDeclaration(node);
 
-      case 'Property':
-        return this.mapProperty(node);
-
       case 'FunctionDeclaration':
       case 'FunctionExpression':
       case 'ArrowFunctionExpression':
@@ -233,17 +230,6 @@ class HermesToESTreeAdapter extends _HermesASTAdapter.default {
     return this.mapNodeDefault(node);
   }
 
-  mapProperty(nodeUnprocessed) {
-    const node = this.mapNodeDefault(nodeUnprocessed);
-
-    if (node.value.type === 'FunctionExpression' && (node.method || node.kind !== 'init')) {
-      node.value.loc.start = node.key.loc.end;
-      node.value.range[0] = node.key.range[1];
-    }
-
-    return node;
-  }
-
   mapComment(node) {
     if (node.type === 'CommentBlock') {
       node.type = 'Block';

package/dist/src/babel/TransformESTreeToBabel.js

@@ -1065,6 +1065,22 @@ function transformNode(node) {
         return node;
       }
 
+    case 'DeclareOpaqueType':
+    case 'OpaqueType':
+      {
+        if (node.lowerBound != null) {
+          // $FlowExpectedError[cannot-write]
+          delete node.lowerBound;
+        }
+
+        if (node.upperBound != null) {
+          // $FlowExpectedError[cannot-write]
+          delete node.upperBound;
+        }
+
+        return node;
+      }
+
     default:
       {
         return node;

package/dist/src/estree/TransformMatchSyntax.js

@@ -784,12 +784,12 @@ function mapMatchExpression(node) {
     hasWildcard,
     analyses
   } = analyzeCases(cases);
-  const isSimpleArgument = calculateSimpleArgument(argument);
+  const isSimpleArgument = !hasBindings && calculateSimpleArgument(argument);
   const genRoot = !isSimpleArgument ? genIdent() : null;
   const root = genRoot == null ? argument : genRoot; // No bindings and a simple argument means we can use nested conditional
   // expressions.
 
-  if (!hasBindings && isSimpleArgument) {
+  if (isSimpleArgument) {
     const wildcardAnalaysis = hasWildcard ? analyses.pop() : null;
     const lastBody = wildcardAnalaysis != null ? wildcardAnalaysis.body : (0, _Builders.iife)([fallthroughError((0, _astNodeMutationHelpers.shallowCloneNode)(root))]);
     return analyses.reverse().reduce((acc, analysis) => {
@@ -886,11 +886,12 @@ function mapMatchStatement(node) {
     cases
   } = node;
   const {
+    hasBindings,
     hasWildcard,
     analyses
   } = analyzeCases(cases);
   const topLabel = genIdent();
-  const isSimpleArgument = calculateSimpleArgument(argument);
+  const isSimpleArgument = !hasBindings && calculateSimpleArgument(argument);
   const genRoot = !isSimpleArgument ? genIdent() : null;
   const root = genRoot == null ? argument : genRoot;
   const statements = [];

package/dist/src/generated/ESTreeVisitorKeys.js

@@ -66,7 +66,7 @@ module.exports = {
   DeclareModule: ['id', 'body'],
   DeclareModuleExports: ['typeAnnotation'],
   DeclareNamespace: ['id', 'body'],
-  DeclareOpaqueType: ['id', 'typeParameters', 'impltype', 'supertype'],
+  DeclareOpaqueType: ['id', 'typeParameters', 'impltype', 'lowerBound', 'upperBound', 'supertype'],
   DeclareTypeAlias: ['id', 'typeParameters', 'right'],
   DeclareVariable: ['id'],
   DoWhileStatement: ['body', 'test'],
@@ -166,7 +166,7 @@ module.exports = {
   ObjectTypeMappedTypeProperty: ['keyTparam', 'propType', 'sourceType', 'variance'],
   ObjectTypeProperty: ['key', 'value', 'variance'],
   ObjectTypeSpreadProperty: ['argument'],
-  OpaqueType: ['id', 'typeParameters', 'impltype', 'supertype'],
+  OpaqueType: ['id', 'typeParameters', 'impltype', 'lowerBound', 'upperBound', 'supertype'],
   OptionalIndexedAccessType: ['objectType', 'indexType'],
   PrivateIdentifier: [],
   Program: ['body'],

package/dist/src/generated/ParserVisitorKeys.js

@@ -214,6 +214,8 @@ const HERMES_AST_VISITOR_KEYS = {
     id: 'Node',
     typeParameters: 'Node',
     impltype: 'Node',
+    lowerBound: 'Node',
+    upperBound: 'Node',
     supertype: 'Node'
   },
   DeclareTypeAlias: {
@@ -586,6 +588,8 @@ const HERMES_AST_VISITOR_KEYS = {
     id: 'Node',
     typeParameters: 'Node',
     impltype: 'Node',
+    lowerBound: 'Node',
+    upperBound: 'Node',
     supertype: 'Node'
   },
   OptionalIndexedAccessType: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-parser",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "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.29.0"
+    "hermes-estree": "0.30.0"
   },
   "devDependencies": {
     "@babel/parser": "7.7.4",