flow-api-translator 0.15.0 → 0.16.0

package/dist/flowToJS.js.flow

@@ -11,144 +11,24 @@
 'use strict';
 
 import type {ScopeManager} from 'hermes-eslint';
-import type {ESNode, Program} from 'hermes-estree';
+import type {Program} from 'hermes-estree';
+import type {ParserOptions} from 'hermes-parser';
 
+import {Transforms} from 'hermes-parser';
+import {astNodeMutationHelpers} from 'hermes-parser';
 import {removeAtFlowFromDocblock} from './utils/DocblockUtils';
 
-import {SimpleTransform, astNodeMutationHelpers} from 'hermes-parser';
 const {nodeWith} = astNodeMutationHelpers;
 
-function transform(node: ESNode): ESNode | null {
-  switch (node.type) {
-    case 'Program': {
-      const docblock = node.docblock;
-      if (docblock == null) {
-        return node;
-      }
-
-      return nodeWith(node, {
-        docblock: removeAtFlowFromDocblock(docblock),
-      });
-    }
-
-    case 'TypeCastExpression': {
-      return node.expression;
-    }
-
-    case 'CallExpression':
-    case 'NewExpression': {
-      if (node.typeArguments != null) {
-        return nodeWith(node, {typeArguments: null});
-      }
-      return node;
-    }
-
-    case 'ObjectPattern':
-    case 'ArrayPattern':
-    case 'Identifier': {
-      if (node.typeAnnotation != null) {
-        return nodeWith(node, {typeAnnotation: null});
-      }
-      return node;
-    }
-
-    case 'DeclareClass':
-    case 'DeclareFunction':
-    case 'DeclareInterface':
-    case 'DeclareModule':
-    case 'DeclareModuleExports':
-    case 'DeclareOpaqueType':
-    case 'DeclareTypeAlias':
-    case 'DeclareVariable':
-    case 'InterfaceDeclaration':
-    case 'OpaqueType':
-    case 'TypeAlias': {
-      return null;
-    }
-
-    case 'FunctionDeclaration':
-    case 'ArrowFunctionExpression':
-    case 'FunctionExpression': {
-      const newParams = [];
-      for (let i = 0; i < node.params.length; i++) {
-        if (
-          i === 0 &&
-          node.params[0].type === 'Identifier' &&
-          node.params[0].name === 'this'
-        ) {
-          continue;
-        }
-
-        let param = node.params[i];
-        if (param.type === 'AssignmentPattern') {
-          param = param.left;
-        }
-        if (param.optional === true) {
-          param = nodeWith(param, {optional: false});
-        }
-        newParams.push(param);
-      }
-
-      return nodeWith(node, {
-        params: newParams,
-        returnType: null,
-        typeParameters: null,
-        predicate: null,
-      });
-    }
-
-    case 'ClassDeclaration':
-    case 'ClassExpression': {
-      return nodeWith(node, {
-        typeParameters: null,
-        superTypeParameters: null,
-        implements: [],
-        decorators: [],
-      });
-    }
-
-    case 'PropertyDefinition': {
-      return nodeWith(node, {
-        typeAnnotation: null,
-        variance: null,
-        declare: false,
-        optional: false,
-      });
-    }
-
-    case 'ImportDeclaration': {
-      if (node.importKind === 'type' || node.importKind === 'typeof') {
-        return null;
-      }
-      const nonTypeSpecifiers = node.specifiers.filter(
-        s =>
-          s.type !== 'ImportSpecifier' ||
-          (s.importKind !== 'type' && s.importKind !== 'typeof'),
-      );
-      if (nonTypeSpecifiers.length === 0) {
-        return null;
-      }
-      if (nonTypeSpecifiers.length === node.specifiers.length) {
-        return node;
-      }
-
-      return nodeWith(node, {
-        specifiers: nonTypeSpecifiers,
-      });
-    }
-
-    case 'ExportAllDeclaration':
-    case 'ExportNamedDeclaration': {
-      if (node.exportKind === 'type') {
-        return null;
-      }
-      return node;
-    }
-
-    default: {
-      return node;
-    }
+function stripAtFlow(ast: Program, _options: ParserOptions): Program {
+  const docblock = ast.docblock;
+  if (docblock == null) {
+    return ast;
   }
+
+  return nodeWith(ast, {
+    docblock: removeAtFlowFromDocblock(docblock),
+  });
 }
 
 export function flowToJS(
@@ -156,11 +36,9 @@ export function flowToJS(
   _code: string,
   _scopeManager: ScopeManager,
 ): Program {
-  const result = SimpleTransform.transform(sourceAST, {
-    transform,
-  });
-  if (result == null || result.type !== 'Program') {
-    throw new Error('flowToJS: Unexpected transform result.');
-  }
-  return result;
+  return [
+    Transforms.stripComponentSyntax,
+    Transforms.stripFlowTypes,
+    stripAtFlow,
+  ].reduce((ast, transform) => transform(ast, {}), sourceAST);
 }

package/dist/utils/ts-estree-ast-types.js.flow

@@ -95,7 +95,7 @@ export interface AwaitExpression extends BaseNode {
 }
 export interface BigIntLiteral extends LiteralBase {
   +type: 'Literal';
-  +value: /*bigint |*/ null;
+  +value: bigint;
   +bigint: string;
 }
 export interface BinaryExpression extends BaseNode {
@@ -784,7 +784,7 @@ export type Literal =
 interface LiteralBase extends BaseNode {
   +type: 'Literal';
   +raw: string;
-  +value: RegExp | /*bigint |*/ boolean | number | string | null;
+  +value: RegExp | bigint | boolean | number | string | null;
 }
 export type LiteralExpression = Literal | TemplateLiteral;
 export interface LogicalExpression extends BaseNode {
@@ -1589,7 +1589,7 @@ export interface TSImportEqualsDeclaration extends BaseNode {
 export interface TSImportType extends BaseNode {
   +type: 'TSImportType';
   +isTypeOf: boolean;
-  +parameter: TypeNode;
+  +argument: TypeNode;
   +qualifier: EntityName | null;
   +typeParameters: TSTypeParameterInstantiation | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-api-translator",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Toolkit for creating Flow and TypeScript compatible libraries from Flow source code.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -12,10 +12,10 @@
     "@babel/code-frame": "^7.16.0",
     "@typescript-eslint/visitor-keys": "^5.42.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-eslint": "0.15.0",
-    "hermes-estree": "0.15.0",
-    "hermes-parser": "0.15.0",
-    "hermes-transform": "0.15.0"
+    "hermes-eslint": "0.16.0",
+    "hermes-estree": "0.16.0",
+    "hermes-parser": "0.16.0",
+    "hermes-transform": "0.16.0"
   },
   "peerDependencies": {
     "prettier": "^3.0.0 || ^2.7.1"