flow-api-translator 0.36.1 → 0.327.0

package/dist/TSDefToFlowDef.js.flow

@@ -10,12 +10,12 @@
 
 'use strict';
 
-import type {ObjectWithLoc} from 'hermes-estree';
+import type {ObjectWithLoc} from 'flow-estree';
 import type {TranslationOptions} from './utils/TranslationUtils';
 
-import * as FlowESTree from 'hermes-estree';
+import * as FlowESTree from 'flow-estree';
 import * as TSESTree from './utils/ts-estree-ast-types';
-import {makeCommentOwnLine as makeCommentOwnLineOriginal} from 'hermes-transform';
+import {makeCommentOwnLine as makeCommentOwnLineOriginal} from 'flow-transform';
 import {
   buildCodeFrame,
   translationError as translationErrorBase,
@@ -23,7 +23,7 @@ import {
 } from './utils/ErrorUtils';
 import {EOL} from 'os';
 
-const DUMMY_LOC: FlowESTree.SourceLocation = (null: $FlowFixMe);
+const DUMMY_LOC: FlowESTree.SourceLocation = null as $FlowFixMe;
 const DUMMY_RANGE: [number, number] = [0, 0];
 const DUMMY_PARENT: $FlowFixMe = null;
 const DUMMY_COMMON = {
@@ -32,22 +32,22 @@ const DUMMY_COMMON = {
   parent: DUMMY_PARENT,
 };
 
-type LooseOmit<O: interface {}, K: $Keys<$FlowFixMe>> = Pick<
+type LooseOmit<O extends interface {}, K extends keyof $FlowFixMe> = Pick<
   O,
-  Exclude<$Keys<O>, K>,
+  Exclude<keyof O, K>,
 >;
-function constructFlowNode<T: FlowESTree.BaseNode>(
+function constructFlowNode<T extends FlowESTree.BaseNode>(
   node: LooseOmit<NoInfer<T>, 'parent'>,
 ): T {
   return {
-    ...(node: $FlowFixMe),
+    ...(node as $FlowFixMe),
     ...DUMMY_COMMON,
   };
 }
 
 const makeCommentOwnLine =
   // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
-  (makeCommentOwnLineOriginal: (string, mixed) => string);
+  makeCommentOwnLineOriginal as (string, unknown) => string;
 
 export function TSDefToFlowDef(
   originalCode: string,
@@ -113,7 +113,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
     // $FlowExpectedError[cannot-write]
     node.comments ??= [];
     // $FlowExpectedError[incompatible-type]
-    (node.comments: Array<TSESTree.Comment>).push(comment);
+    (node.comments as Array<TSESTree.Comment>).push(comment);
   }
   function unsupportedAnnotation(
     node: ObjectWithLoc,
@@ -330,13 +330,13 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
         case 'ClassDeclaration':
           declaration = Transform.ClassDeclarationWithName(
             // possibly missing id
-            (node.declaration: $FlowFixMe),
+            node.declaration as $FlowFixMe,
           );
           break;
         case 'FunctionDeclaration':
           declaration = Transform.FunctionDeclarationWithName(
             // possibly missing id
-            (node.declaration: $FlowFixMe),
+            node.declaration as $FlowFixMe,
           );
           break;
         case 'TSDeclareFunction':
@@ -369,7 +369,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
       | FlowESTree.ExportNamedDeclaration
       | FlowESTree.DeclareExportDeclarationNamedWithDeclaration
       | FlowESTree.DeclareExportDeclarationNamedWithSpecifiers
-      | $ReadOnlyArray<
+      | ReadonlyArray<
           | FlowESTree.DeclareExportDeclarationNamedWithDeclaration
           | FlowESTree.TypeAlias
           | FlowESTree.DeclareNamespace
@@ -379,7 +379,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
       if (node.declaration == null) {
         const source: FlowESTree.StringLiteral =
           node.source == null
-            ? (null: $FlowFixMe)
+            ? (null as $FlowFixMe)
             : constructFlowNode<FlowESTree.StringLiteral>({
                 type: 'Literal',
                 literalType: 'string',
@@ -410,7 +410,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
               type: 'DeclareExportDeclaration',
               declaration: Transform.ClassDeclarationWithName(
                 // possibly missing id
-                (node.declaration: $FlowFixMe),
+                node.declaration as $FlowFixMe,
               ),
               default: false,
               source: null,
@@ -423,7 +423,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
               type: 'DeclareExportDeclaration',
               declaration: Transform.FunctionDeclarationWithName(
                 // possibly missing id
-                (node.declaration: $FlowFixMe),
+                node.declaration as $FlowFixMe,
               ),
               default: false,
               source: null,
@@ -546,6 +546,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
           },
           optional: false,
         },
+        implicitDeclare: false,
         predicate: null,
       });
     }
@@ -660,7 +661,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
           type: 'Literal',
           literalType: 'regexp',
           value: node.value,
-          regex: (null: $FlowFixMe),
+          regex: null as $FlowFixMe,
           raw: node.raw,
         });
       } else if (node.value == null) {
@@ -715,7 +716,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
         case 'regexp':
           return unsupportedAnnotation(node, 'regexp literal type');
         default:
-          (literal: empty);
+          literal as empty;
           throw 'unreachable';
       }
     }
@@ -725,7 +726,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
     ):
       | FlowESTree.Statement
       | FlowESTree.ModuleDeclaration
-      | $ReadOnlyArray<FlowESTree.Statement | FlowESTree.ModuleDeclaration> {
+      | ReadonlyArray<FlowESTree.Statement | FlowESTree.ModuleDeclaration> {
       switch (node.type) {
         case 'BlockStatement':
           return Transform.BlockStatement(node);
@@ -789,8 +790,8 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
 
     static Statement(
       node: TSESTree.Statement,
-    ): FlowESTree.Statement | $ReadOnlyArray<FlowESTree.Statement> {
-      return (Transform.AllStatement(node): $FlowFixMe);
+    ): FlowESTree.Statement | ReadonlyArray<FlowESTree.Statement> {
+      return Transform.AllStatement(node) as $FlowFixMe;
     }
 
     static TSAnyType(): FlowESTree.AnyTypeAnnotation {
@@ -873,6 +874,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
           },
           optional: false,
         },
+        implicitDeclare: false,
         predicate: null,
       });
     }
@@ -935,7 +937,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
     }
 
     static _partitionAndTranslateTSFunctionParams(
-      tsParams: $ReadOnlyArray<TSESTree.Parameter>,
+      tsParams: ReadonlyArray<TSESTree.Parameter>,
     ): {
       thisParam: FlowESTree.FunctionTypeParam | null,
       restParam: FlowESTree.FunctionTypeParam | null,
@@ -1027,6 +1029,19 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
     static TSImportType(
       node: TSESTree.TSImportType,
     ): FlowESTree.TypeAnnotationType {
+      const source =
+        node.argument ??
+        (node.source == null
+          ? null
+          : ({
+              type: 'TSLiteralType',
+              loc: node.source.loc,
+              literal: node.source,
+            } as TSESTree.TSLiteralType));
+      if (source == null) {
+        return unsupportedAnnotation(node, 'import types without a source');
+      }
+
       let base: FlowESTree.TypeAnnotationType =
         constructFlowNode<FlowESTree.GenericTypeAnnotation>({
           type: 'GenericTypeAnnotation',
@@ -1039,15 +1054,15 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
           typeParameters:
             constructFlowNode<FlowESTree.TypeParameterInstantiation>({
               type: 'TypeParameterInstantiation',
-              params: [Transform.TSTypeAnnotation(node.argument)],
+              params: [Transform.TSTypeAnnotation(source)],
             }),
         });
+      if (node.typeArguments != null) {
+        return unsupportedAnnotation(node, 'import types with type arguments');
+      }
       if (node.qualifier == null) {
         return base;
       }
-      if (node.typeParameters != null) {
-        return unsupportedAnnotation(node, 'import types with type parameters');
-      }
       let qualifier = Transform.EntityNameToTypeIdentifier(node.qualifier);
       const namesRev: Array<string> = [];
       while (qualifier.type !== 'Identifier') {
@@ -1243,8 +1258,8 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
       node: TSESTree.TSMappedType,
     ): FlowESTree.ObjectTypeAnnotation {
       const keyTparam = Transform.TSTypeParameter(node.typeParameter);
-      const sourceType: FlowESTree.TypeAnnotationType = (keyTparam.bound
-        ?.typeAnnotation: $FlowFixMe);
+      const sourceType: FlowESTree.TypeAnnotationType = keyTparam.bound
+        ?.typeAnnotation as $FlowFixMe;
       // $FlowFixMe[cannot-write]
       keyTparam.bound = null;
       const prop = constructFlowNode<FlowESTree.ObjectTypeMappedTypeProperty>({
@@ -1303,7 +1318,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
       if (node.id.type === 'Literal') {
         return constructFlowNode<FlowESTree.DeclareModule>({
           type: 'DeclareModule',
-          id: (Transform.Literal(node.id): $FlowFixMe),
+          id: Transform.Literal(node.id) as $FlowFixMe,
           body,
         });
       }
@@ -1312,8 +1327,11 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
       }
       return constructFlowNode<FlowESTree.DeclareNamespace>({
         type: 'DeclareNamespace',
+        global: false,
         id: Transform.Identifier(node.id),
         body,
+        implicitDeclare: false,
+        keyword: 'namespace',
       });
     }
 
@@ -1712,7 +1730,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
                   ? (constructFlowNode<FlowESTree.PrivateIdentifier>({
                       type: 'PrivateIdentifier',
                       name: key.name,
-                    }): $FlowFixMe)
+                    }) as $FlowFixMe)
                   : constructFlowNode<FlowESTree.StringLiteral>({
                       type: 'Literal',
                       literalType: 'string',
@@ -1767,7 +1785,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
             ? (constructFlowNode<FlowESTree.PrivateIdentifier>({
                 type: 'PrivateIdentifier',
                 name: originalKey.name,
-              }): $FlowFixMe)
+              }) as $FlowFixMe)
             : constructFlowNode<FlowESTree.StringLiteral>({
                 type: 'Literal',
                 literalType: 'string',
@@ -1960,12 +1978,22 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
 
     static TSTypeQuery(
       node: TSESTree.TSTypeQuery,
-    ): FlowESTree.TypeofTypeAnnotation {
+    ): FlowESTree.TypeAnnotationType {
+      if (node.exprName.type === 'TSImportType') {
+        if (node.typeArguments != null) {
+          return unsupportedAnnotation(
+            node,
+            'type query imports with type arguments',
+          );
+        }
+        return Transform.TSImportType(node.exprName);
+      }
+
       return constructFlowNode<FlowESTree.TypeofTypeAnnotation>({
         type: 'TypeofTypeAnnotation',
         argument: Transform.EntityNameToTypeofIdentifier(node.exprName),
         typeArguments:
-          Transform.TSTypeParameterInstantiationOpt(node.typeParameters) ??
+          Transform.TSTypeParameterInstantiationOpt(node.typeArguments) ??
           undefined,
       });
     }
@@ -2005,7 +2033,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
 
     static VariableDeclaration(
       node: TSESTree.VariableDeclaration,
-    ): $ReadOnlyArray<FlowESTree.DeclareVariable> {
+    ): ReadonlyArray<FlowESTree.DeclareVariable> {
       return node.declarations.map(decl => {
         if (decl.id.type !== 'Identifier') {
           throw translationError(
@@ -2025,8 +2053,15 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
         }
         return constructFlowNode<FlowESTree.DeclareVariable>({
           type: 'DeclareVariable',
-          id,
+          declarations: [
+            constructFlowNode<FlowESTree.VariableDeclarator>({
+              type: 'VariableDeclarator',
+              id,
+              init: null,
+            }),
+          ],
           kind: node.kind,
+          implicitDeclare: false,
         });
       });
     }