hermes-parser 0.31.2 → 0.32.1

package/dist/ParserOptions.js

@@ -14,5 +14,5 @@ exports.ParserOptionsKeys = void 0;
  * 
  * @format
  */
-const ParserOptionsKeys = new Set(['allowReturnOutsideFunction', 'babel', 'flow', 'enableExperimentalComponentSyntax', 'enableExperimentalFlowMatchSyntax', 'reactRuntimeTarget', 'sourceFilename', 'sourceType', 'tokens']);
+const ParserOptionsKeys = new Set(['allowReturnOutsideFunction', 'babel', 'flow', 'enableExperimentalComponentSyntax', 'enableExperimentalFlowMatchSyntax', 'reactRuntimeTarget', 'sourceFilename', 'sourceType', 'tokens', 'transformOptions']);
 exports.ParserOptionsKeys = ParserOptionsKeys;

package/dist/ParserOptions.js.flow

@@ -8,6 +8,8 @@
  * @format
  */
 
+import type {Expression} from 'hermes-estree';
+
 export type ParserOptions = {
   allowReturnOutsideFunction?: boolean,
   babel?: boolean,
@@ -18,6 +20,11 @@ export type ParserOptions = {
   sourceFilename?: string,
   sourceType?: 'module' | 'script' | 'unambiguous',
   tokens?: boolean,
+  transformOptions?: {
+    +TransformEnumSyntax?: {
+      +getRuntime: () => Expression,
+    },
+  },
 };
 
 export const ParserOptionsKeys: $ReadOnlySet<$Keys<ParserOptions>> = new Set([
@@ -30,4 +37,5 @@ export const ParserOptionsKeys: $ReadOnlySet<$Keys<ParserOptions>> = new Set([
   'sourceFilename',
   'sourceType',
   'tokens',
+  'transformOptions',
 ]);

package/dist/babel/TransformESTreeToBabel.js

@@ -126,7 +126,7 @@ function mapNodeWithDirectives(node) {
       break;
     }
   } // Move directives from body to new directives array
-  // $FlowExpectedError[incompatible-call] We are adding properties for babel that don't exist in the ESTree types.
+  // $FlowExpectedError[incompatible-type] We are adding properties for babel that don't exist in the ESTree types.
 
 
   return nodeWith(node, {
@@ -189,7 +189,7 @@ function mapProgram(node) {
 
   return {
     type: 'File',
-    // $FlowExpectedError[prop-missing] Comments, docblock and tokens are purposely missing to match the Babel AST.
+    // $FlowExpectedError[incompatible-type] Comments, docblock and tokens are purposely missing to match the Babel AST.
     program: {
       type: 'Program',
       body: program.body,
@@ -280,7 +280,7 @@ function mapProperty(node) {
     type: 'ObjectProperty',
     computed: node.computed,
     key: node.key,
-    // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     value: node.value,
     method: node.method,
     shorthand: node.shorthand,
@@ -398,10 +398,10 @@ function mapRestElement(node) {
 function mapImportExpression(node) {
   // Babel expects ImportExpression to be structured as a regular
   // CallExpression where the callee is an Import node.
-  // $FlowExpectedError[prop-missing] optional and typeArguments are missing to match existing output.
+  // $FlowExpectedError[incompatible-type] optional and typeArguments are missing to match existing output.
   return {
     type: 'CallExpression',
-    // $FlowExpectedError[incompatible-return] This is a babel specific node
+    // $FlowExpectedError[incompatible-type] This is a babel specific node
     callee: {
       type: 'Import',
       loc: {
@@ -480,10 +480,11 @@ function mapPropertyDefinition(node) {
 function mapTypeofTypeAnnotation(node) {
   // $FlowExpectedError[cannot-write]
   delete node.typeArguments; // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[invalid-compare]
 
   if (node.argument.type !== 'GenericTypeAnnotation') {
     return nodeWith(node, {
-      // $FlowExpectedError[incompatible-call] Special override for Babel
+      // $FlowExpectedError[incompatible-type] Special override for Babel
       argument: {
         type: 'GenericTypeAnnotation',
         id: node.argument,
@@ -656,6 +657,7 @@ function transformNode(node) {
 
         // Check if we have already processed this node.
         // $FlowFixMe[incompatible-type]
+        // $FlowFixMe[invalid-compare]
         if (((_node$parent = node.parent) == null ? void 0 : _node$parent.type) === 'File') {
           return node;
         }
@@ -1093,12 +1095,12 @@ function transformProgram(program, options) {
 
   const resultNode = _SimpleTransform.SimpleTransform.transform(program, {
     transform(node) {
-      // $FlowExpectedError[incompatible-call] We override the type to support the additional Babel types
+      // $FlowExpectedError[incompatible-type] We override the type to support the additional Babel types
       return transformNode(node);
     },
 
     visitorKeys: FlowESTreeAndBabelVisitorKeys
-  }); // $FlowExpectedError[incompatible-call] We override the type to support the additional Babel types
+  }); // $FlowExpectedError[incompatible-type] We override the type to support the additional Babel types
 
 
   _SimpleTraverser.SimpleTraverser.traverse(resultNode, {
@@ -1110,6 +1112,7 @@ function transformProgram(program, options) {
 
     visitorKeys: FlowESTreeAndBabelVisitorKeys
   }); // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[invalid-compare]
 
 
   if ((resultNode == null ? void 0 : resultNode.type) === 'File') {

package/dist/babel/TransformESTreeToBabel.js.flow

@@ -374,7 +374,7 @@ function mapNodeWithDirectives<T: Program | BlockStatement>(node: T): T {
   }
 
   // Move directives from body to new directives array
-  // $FlowExpectedError[incompatible-call] We are adding properties for babel that don't exist in the ESTree types.
+  // $FlowExpectedError[incompatible-type] We are adding properties for babel that don't exist in the ESTree types.
   return nodeWith(node, {
     directives,
     body:
@@ -432,7 +432,7 @@ function mapProgram(node: Program): BabelFile {
   // Rename root node to File node and move Program node under program property
   return {
     type: 'File',
-    // $FlowExpectedError[prop-missing] Comments, docblock and tokens are purposely missing to match the Babel AST.
+    // $FlowExpectedError[incompatible-type] Comments, docblock and tokens are purposely missing to match the Babel AST.
     program: {
       type: 'Program',
       body: program.body,
@@ -532,7 +532,7 @@ function mapProperty(node: Property): BabelObjectMethod | BabelObjectProperty {
     type: 'ObjectProperty',
     computed: node.computed,
     key: node.key,
-    // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     value: (node.value: Expression),
     method: node.method,
     shorthand: node.shorthand,
@@ -666,10 +666,10 @@ function mapImportExpression(node: ImportExpression): CallExpression {
   // Babel expects ImportExpression to be structured as a regular
   // CallExpression where the callee is an Import node.
 
-  // $FlowExpectedError[prop-missing] optional and typeArguments are missing to match existing output.
+  // $FlowExpectedError[incompatible-type] optional and typeArguments are missing to match existing output.
   return {
     type: 'CallExpression',
-    // $FlowExpectedError[incompatible-return] This is a babel specific node
+    // $FlowExpectedError[incompatible-type] This is a babel specific node
     callee: {
       type: 'Import',
       loc: {
@@ -753,9 +753,10 @@ function mapTypeofTypeAnnotation(
   // $FlowExpectedError[cannot-write]
   delete node.typeArguments;
   // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[invalid-compare]
   if (node.argument.type !== 'GenericTypeAnnotation') {
     return nodeWith(node, {
-      // $FlowExpectedError[incompatible-call] Special override for Babel
+      // $FlowExpectedError[incompatible-type] Special override for Babel
       argument: {
         type: 'GenericTypeAnnotation',
         id: node.argument,
@@ -920,6 +921,7 @@ function transformNode(node: ESNodeOrBabelNode): ESNodeOrBabelNode | null {
     case 'Program': {
       // Check if we have already processed this node.
       // $FlowFixMe[incompatible-type]
+      // $FlowFixMe[invalid-compare]
       if (node.parent?.type === 'File') {
         return node;
       }
@@ -1247,13 +1249,13 @@ export function transformProgram(
 ): BabelFile {
   const resultNode = SimpleTransform.transform(program, {
     transform(node) {
-      // $FlowExpectedError[incompatible-call] We override the type to support the additional Babel types
+      // $FlowExpectedError[incompatible-type] We override the type to support the additional Babel types
       return transformNode(node);
     },
     visitorKeys: FlowESTreeAndBabelVisitorKeys,
   });
 
-  // $FlowExpectedError[incompatible-call] We override the type to support the additional Babel types
+  // $FlowExpectedError[incompatible-type] We override the type to support the additional Babel types
   SimpleTraverser.traverse(resultNode, {
     enter(node) {
       fixSourceLocation(node, options);
@@ -1263,6 +1265,7 @@ export function transformProgram(
   });
 
   // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[invalid-compare]
   if (resultNode?.type === 'File') {
     return resultNode;
   }

package/dist/estree/{StripComponentSyntax.js → TransformComponentSyntax.js}

@@ -191,7 +191,7 @@ function mapComponentParameters(params, options) {
 
   if (propsProperties.length === 0) {
     if (refParam == null) {
-      throw new Error('StripComponentSyntax: Invalid state, ref should always be set at this point if props are empty');
+      throw new Error('TransformComponentSyntax: Invalid state, ref should always be set at this point if props are empty');
     }
 
     const emptyParamsLoc = {
@@ -757,7 +757,7 @@ function transformProgram(program, options) {
           {
             const consequent = mapStatementList(node.consequent, options);
             return nodeWith(node, {
-              /* $FlowExpectedError[incompatible-call] We know `mapStatementList` will
+              /* $FlowExpectedError[incompatible-type] We know `mapStatementList` will
                  not return `ModuleDeclaration` nodes if it is not passed any */
               consequent
             });

package/dist/estree/{StripComponentSyntax.js.flow → TransformComponentSyntax.js.flow}

@@ -243,7 +243,7 @@ function mapComponentParameters(
   if (propsProperties.length === 0) {
     if (refParam == null) {
       throw new Error(
-        'StripComponentSyntax: Invalid state, ref should always be set at this point if props are empty',
+        'TransformComponentSyntax: Invalid state, ref should always be set at this point if props are empty',
       );
     }
     const emptyParamsLoc = {
@@ -836,7 +836,7 @@ export function transformProgram(
         case 'SwitchCase': {
           const consequent = mapStatementList(node.consequent, options);
           return nodeWith(node, {
-            /* $FlowExpectedError[incompatible-call] We know `mapStatementList` will
+            /* $FlowExpectedError[incompatible-type] We know `mapStatementList` will
                not return `ModuleDeclaration` nodes if it is not passed any */
             consequent,
           });

package/dist/estree/TransformEnumSyntax.js

@@ -0,0 +1,106 @@
+/**
+ * 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';
+/**
+ * Transform Flow Enum declarations (https://flow.org/en/docs/enums/).
+ */
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformProgram = transformProgram;
+
+var _hermesEstree = require("hermes-estree");
+
+var _SimpleTransform = require("../transform/SimpleTransform");
+
+var _Builders = require("../utils/Builders");
+
+function mapEnumDeclaration(node, options) {
+  var _options$transformOpt, _options$transformOpt2;
+
+  const {
+    body
+  } = node;
+  const {
+    members
+  } = body;
+  const getRuntime = (_options$transformOpt = options.transformOptions) == null ? void 0 : (_options$transformOpt2 = _options$transformOpt.TransformEnumSyntax) == null ? void 0 : _options$transformOpt2.getRuntime;
+  const enumModule = typeof getRuntime === 'function' ? getRuntime() : (0, _Builders.callExpression)((0, _Builders.ident)('require'), [(0, _Builders.stringLiteral)('flow-enums-runtime')]);
+  const mirrored = body.type === 'EnumStringBody' && (!members.length || members[0].type === 'EnumDefaultedMember');
+  const enumExpression = mirrored ? (0, _Builders.callExpression)({
+    type: 'MemberExpression',
+    object: enumModule,
+    property: (0, _Builders.ident)('Mirrored'),
+    computed: false,
+    optional: false,
+    ...(0, _Builders.etc)()
+  }, [{
+    type: 'ArrayExpression',
+    elements: members.map(member => (0, _Builders.stringLiteral)(member.id.name)),
+    trailingComma: false,
+    ...(0, _Builders.etc)()
+  }]) : (0, _Builders.callExpression)(enumModule, [{
+    type: 'ObjectExpression',
+    properties: members.map(member => ({
+      type: 'Property',
+      key: member.id,
+      value: // String enums with `EnumDefaultedMember` are handled above by
+      // calculation of `mirrored`.
+      member.type === 'EnumDefaultedMember' ? (0, _Builders.callExpression)((0, _Builders.ident)('Symbol'), [(0, _Builders.stringLiteral)(member.id.name)]) : member.init,
+      kind: 'init',
+      method: false,
+      shorthand: false,
+      computed: false,
+      ...(0, _Builders.etc)(),
+      parent: _Builders.EMPTY_PARENT
+    })),
+    ...(0, _Builders.etc)()
+  }]);
+  return (0, _Builders.variableDeclaration)('const', node.id, enumExpression);
+}
+
+function transformProgram(program, options) {
+  return _SimpleTransform.SimpleTransform.transformProgram(program, {
+    transform(node) {
+      switch (node.type) {
+        case 'EnumDeclaration':
+          {
+            return mapEnumDeclaration(node, options);
+          }
+
+        case 'ExportDefaultDeclaration':
+          {
+            const {
+              declaration
+            } = node;
+
+            if ((0, _hermesEstree.isEnumDeclaration)(declaration)) {
+              const enumDeclaration = mapEnumDeclaration(declaration, options);
+
+              const exportDefault = _SimpleTransform.SimpleTransform.nodeWith(node, {
+                declaration: (0, _Builders.ident)(declaration.id.name)
+              });
+
+              return [enumDeclaration, exportDefault];
+            } else {
+              return node;
+            }
+          }
+
+        default:
+          {
+            return node;
+          }
+      }
+    }
+
+  });
+}

package/dist/estree/TransformEnumSyntax.js.flow

@@ -0,0 +1,125 @@
+/**
+ * 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';
+
+/**
+ * Transform Flow Enum declarations (https://flow.org/en/docs/enums/).
+ */
+
+import type {ParserOptions} from '../ParserOptions';
+import type {
+  ESNode,
+  EnumDeclaration,
+  ExportDefaultDeclaration,
+  ObjectPropertyWithNonShorthandStaticName,
+  Program,
+} from 'hermes-estree';
+
+import {isEnumDeclaration} from 'hermes-estree';
+import {SimpleTransform} from '../transform/SimpleTransform';
+import {
+  EMPTY_PARENT,
+  callExpression,
+  etc,
+  ident,
+  stringLiteral,
+  variableDeclaration,
+} from '../utils/Builders';
+
+function mapEnumDeclaration(node: EnumDeclaration, options: ParserOptions) {
+  const {body} = node;
+  const {members} = body;
+  const getRuntime = options.transformOptions?.TransformEnumSyntax?.getRuntime;
+  const enumModule =
+    typeof getRuntime === 'function'
+      ? getRuntime()
+      : callExpression(ident('require'), [stringLiteral('flow-enums-runtime')]);
+  const mirrored =
+    body.type === 'EnumStringBody' &&
+    (!members.length || members[0].type === 'EnumDefaultedMember');
+  const enumExpression = mirrored
+    ? callExpression(
+        {
+          type: 'MemberExpression',
+          object: enumModule,
+          property: ident('Mirrored'),
+          computed: false,
+          optional: false,
+          ...etc(),
+        },
+        [
+          {
+            type: 'ArrayExpression',
+            elements: members.map(member => stringLiteral(member.id.name)),
+            trailingComma: false,
+            ...etc(),
+          },
+        ],
+      )
+    : callExpression(enumModule, [
+        {
+          type: 'ObjectExpression',
+          properties: members.map(
+            (member): ObjectPropertyWithNonShorthandStaticName => ({
+              type: 'Property',
+              key: member.id,
+              value:
+                // String enums with `EnumDefaultedMember` are handled above by
+                // calculation of `mirrored`.
+                member.type === 'EnumDefaultedMember'
+                  ? callExpression(ident('Symbol'), [
+                      stringLiteral(member.id.name),
+                    ])
+                  : member.init,
+              kind: 'init',
+              method: false,
+              shorthand: false,
+              computed: false,
+              ...etc(),
+              parent: EMPTY_PARENT,
+            }),
+          ),
+          ...etc(),
+        },
+      ]);
+  return variableDeclaration('const', node.id, enumExpression);
+}
+
+export function transformProgram(
+  program: Program,
+  options: ParserOptions,
+): Program {
+  return SimpleTransform.transformProgram(program, {
+    transform(node: ESNode): ESNode | $ReadOnlyArray<ESNode> {
+      switch (node.type) {
+        case 'EnumDeclaration': {
+          return mapEnumDeclaration(node, options);
+        }
+        case 'ExportDefaultDeclaration': {
+          const {declaration} = node;
+          if (isEnumDeclaration(declaration)) {
+            const enumDeclaration = mapEnumDeclaration(declaration, options);
+            const exportDefault: ExportDefaultDeclaration =
+              SimpleTransform.nodeWith(node, {
+                declaration: ident(declaration.id.name),
+              });
+            return [enumDeclaration, exportDefault];
+          } else {
+            return node;
+          }
+        }
+        default: {
+          return node;
+        }
+      }
+    },
+  });
+}

package/dist/index.js

@@ -31,7 +31,9 @@ var _ESTreeVisitorKeys = _interopRequireDefault(require("./generated/ESTreeVisit
 
 exports.FlowVisitorKeys = _ESTreeVisitorKeys.default;
 
-var StripComponentSyntax = _interopRequireWildcard(require("./estree/StripComponentSyntax"));
+var TransformComponentSyntax = _interopRequireWildcard(require("./estree/TransformComponentSyntax"));
+
+var TransformEnumSyntax = _interopRequireWildcard(require("./estree/TransformEnumSyntax"));
 
 var TransformMatchSyntax = _interopRequireWildcard(require("./estree/TransformMatchSyntax"));
 
@@ -140,13 +142,14 @@ function parse(code, opts) {
     return estreeAST;
   }
 
-  const loweredESTreeAST = [TransformMatchSyntax.transformProgram, StripComponentSyntax.transformProgram, StripFlowTypesForBabel.transformProgram].reduce((ast, transform) => transform(ast, options), estreeAST);
+  const loweredESTreeAST = [TransformEnumSyntax.transformProgram, TransformMatchSyntax.transformProgram, TransformComponentSyntax.transformProgram, StripFlowTypesForBabel.transformProgram].reduce((ast, transform) => transform(ast, options), estreeAST);
   return TransformESTreeToBabel.transformProgram(loweredESTreeAST, options);
 }
 
 const Transforms = {
+  transformEnumSyntax: TransformEnumSyntax.transformProgram,
   transformMatchSyntax: TransformMatchSyntax.transformProgram,
-  stripComponentSyntax: StripComponentSyntax.transformProgram,
+  transformComponentSyntax: TransformComponentSyntax.transformProgram,
   stripFlowTypesForBabel: StripFlowTypesForBabel.transformProgram,
   stripFlowTypes: StripFlowTypes.transformProgram
 };

package/dist/index.js.flow

@@ -17,7 +17,8 @@ import type {BabelFile} from './babel/TransformESTreeToBabel';
 import * as HermesParser from './HermesParser';
 import HermesToESTreeAdapter from './HermesToESTreeAdapter';
 import FlowVisitorKeys from './generated/ESTreeVisitorKeys';
-import * as StripComponentSyntax from './estree/StripComponentSyntax';
+import * as TransformComponentSyntax from './estree/TransformComponentSyntax';
+import * as TransformEnumSyntax from './estree/TransformEnumSyntax';
 import * as TransformMatchSyntax from './estree/TransformMatchSyntax';
 import * as StripFlowTypesForBabel from './estree/StripFlowTypesForBabel';
 import * as TransformESTreeToBabel from './babel/TransformESTreeToBabel';
@@ -92,8 +93,9 @@ export function parse(
   }
 
   const loweredESTreeAST = [
+    TransformEnumSyntax.transformProgram,
     TransformMatchSyntax.transformProgram,
-    StripComponentSyntax.transformProgram,
+    TransformComponentSyntax.transformProgram,
     StripFlowTypesForBabel.transformProgram,
   ].reduce((ast, transform) => transform(ast, options), estreeAST);
 
@@ -111,8 +113,9 @@ export * as astNodeMutationHelpers from './transform/astNodeMutationHelpers';
 export {default as mutateESTreeASTForPrettier} from './utils/mutateESTreeASTForPrettier';
 
 const Transforms = {
+  transformEnumSyntax: TransformEnumSyntax.transformProgram,
   transformMatchSyntax: TransformMatchSyntax.transformProgram,
-  stripComponentSyntax: StripComponentSyntax.transformProgram,
+  transformComponentSyntax: TransformComponentSyntax.transformProgram,
   stripFlowTypesForBabel: StripFlowTypesForBabel.transformProgram,
   stripFlowTypes: StripFlowTypes.transformProgram,
 };

package/dist/src/HermesASTAdapter.js

@@ -59,7 +59,7 @@ class HermesASTAdapter {
 
     if (resultNode.type !== 'Program') {
       throw new Error(`HermesToESTreeAdapter: Must return a Program node, instead of "${resultNode.type}". `);
-    } // $FlowExpectedError[incompatible-return] We know this is a program at this point.
+    } // $FlowExpectedError[incompatible-type] We know this is a program at this point.
 
 
     return resultNode;
@@ -130,7 +130,7 @@ class HermesASTAdapter {
   }
 
   mapEmpty(_node) {
-    // $FlowExpectedError
+    // $FlowExpectedError[incompatible-type]
     return null;
   }
 

package/dist/src/HermesParserDeserializer.js

@@ -201,7 +201,6 @@ class HermesParserDeserializer {
 
 
   addEmptyLoc() {
-    // $FlowExpectedError
     const loc = {};
     this.locMap[this.next()] = loc;
     return loc;

package/dist/src/ParserOptions.js

@@ -14,5 +14,5 @@ exports.ParserOptionsKeys = void 0;
  * 
  * @format
  */
-const ParserOptionsKeys = new Set(['allowReturnOutsideFunction', 'babel', 'flow', 'enableExperimentalComponentSyntax', 'enableExperimentalFlowMatchSyntax', 'reactRuntimeTarget', 'sourceFilename', 'sourceType', 'tokens']);
+const ParserOptionsKeys = new Set(['allowReturnOutsideFunction', 'babel', 'flow', 'enableExperimentalComponentSyntax', 'enableExperimentalFlowMatchSyntax', 'reactRuntimeTarget', 'sourceFilename', 'sourceType', 'tokens', 'transformOptions']);
 exports.ParserOptionsKeys = ParserOptionsKeys;

package/dist/src/babel/TransformESTreeToBabel.js

@@ -126,7 +126,7 @@ function mapNodeWithDirectives(node) {
       break;
     }
   } // Move directives from body to new directives array
-  // $FlowExpectedError[incompatible-call] We are adding properties for babel that don't exist in the ESTree types.
+  // $FlowExpectedError[incompatible-type] We are adding properties for babel that don't exist in the ESTree types.
 
 
   return nodeWith(node, {
@@ -189,7 +189,7 @@ function mapProgram(node) {
 
   return {
     type: 'File',
-    // $FlowExpectedError[prop-missing] Comments, docblock and tokens are purposely missing to match the Babel AST.
+    // $FlowExpectedError[incompatible-type] Comments, docblock and tokens are purposely missing to match the Babel AST.
     program: {
       type: 'Program',
       body: program.body,
@@ -280,7 +280,7 @@ function mapProperty(node) {
     type: 'ObjectProperty',
     computed: node.computed,
     key: node.key,
-    // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     value: node.value,
     method: node.method,
     shorthand: node.shorthand,
@@ -398,10 +398,10 @@ function mapRestElement(node) {
 function mapImportExpression(node) {
   // Babel expects ImportExpression to be structured as a regular
   // CallExpression where the callee is an Import node.
-  // $FlowExpectedError[prop-missing] optional and typeArguments are missing to match existing output.
+  // $FlowExpectedError[incompatible-type] optional and typeArguments are missing to match existing output.
   return {
     type: 'CallExpression',
-    // $FlowExpectedError[incompatible-return] This is a babel specific node
+    // $FlowExpectedError[incompatible-type] This is a babel specific node
     callee: {
       type: 'Import',
       loc: {
@@ -480,10 +480,11 @@ function mapPropertyDefinition(node) {
 function mapTypeofTypeAnnotation(node) {
   // $FlowExpectedError[cannot-write]
   delete node.typeArguments; // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[invalid-compare]
 
   if (node.argument.type !== 'GenericTypeAnnotation') {
     return nodeWith(node, {
-      // $FlowExpectedError[incompatible-call] Special override for Babel
+      // $FlowExpectedError[incompatible-type] Special override for Babel
       argument: {
         type: 'GenericTypeAnnotation',
         id: node.argument,
@@ -656,6 +657,7 @@ function transformNode(node) {
 
         // Check if we have already processed this node.
         // $FlowFixMe[incompatible-type]
+        // $FlowFixMe[invalid-compare]
         if (((_node$parent = node.parent) == null ? void 0 : _node$parent.type) === 'File') {
           return node;
         }
@@ -1093,12 +1095,12 @@ function transformProgram(program, options) {
 
   const resultNode = _SimpleTransform.SimpleTransform.transform(program, {
     transform(node) {
-      // $FlowExpectedError[incompatible-call] We override the type to support the additional Babel types
+      // $FlowExpectedError[incompatible-type] We override the type to support the additional Babel types
       return transformNode(node);
     },
 
     visitorKeys: FlowESTreeAndBabelVisitorKeys
-  }); // $FlowExpectedError[incompatible-call] We override the type to support the additional Babel types
+  }); // $FlowExpectedError[incompatible-type] We override the type to support the additional Babel types
 
 
   _SimpleTraverser.SimpleTraverser.traverse(resultNode, {
@@ -1110,6 +1112,7 @@ function transformProgram(program, options) {
 
     visitorKeys: FlowESTreeAndBabelVisitorKeys
   }); // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[invalid-compare]
 
 
   if ((resultNode == null ? void 0 : resultNode.type) === 'File') {

package/dist/src/estree/{StripComponentSyntax.js → TransformComponentSyntax.js}

@@ -191,7 +191,7 @@ function mapComponentParameters(params, options) {
 
   if (propsProperties.length === 0) {
     if (refParam == null) {
-      throw new Error('StripComponentSyntax: Invalid state, ref should always be set at this point if props are empty');
+      throw new Error('TransformComponentSyntax: Invalid state, ref should always be set at this point if props are empty');
     }
 
     const emptyParamsLoc = {
@@ -757,7 +757,7 @@ function transformProgram(program, options) {
           {
             const consequent = mapStatementList(node.consequent, options);
             return nodeWith(node, {
-              /* $FlowExpectedError[incompatible-call] We know `mapStatementList` will
+              /* $FlowExpectedError[incompatible-type] We know `mapStatementList` will
                  not return `ModuleDeclaration` nodes if it is not passed any */
               consequent
             });