flow-api-translator 0.32.0 → 0.33.0

package/dist/TSDefToFlowDef.js

@@ -208,7 +208,7 @@ const getTransforms = (originalCode, opts) => {
       });
     }
 
-    static ClassDeclarationSuperClass(superClass, superTypeParameters) {
+    static ClassDeclarationSuperClass(superClass, superTypeArguments) {
       if (superClass == null) {
         return [];
       }
@@ -218,7 +218,7 @@ const getTransforms = (originalCode, opts) => {
       return [constructFlowNode({
         type: 'InterfaceExtends',
         id,
-        typeParameters: Transform.TSTypeParameterInstantiationOpt(superTypeParameters)
+        typeParameters: Transform.TSTypeParameterInstantiationOpt(superTypeArguments)
       })];
     }
 
@@ -1282,7 +1282,7 @@ const getTransforms = (originalCode, opts) => {
     static TSTupleType(node) {
       return constructFlowNode({
         type: 'TupleTypeAnnotation',
-        types: node.elementTypes.map(node => Transform.TSTypeAnnotation(node)),
+        elementTypes: node.elementTypes.map(node => Transform.TSTypeAnnotation(node)),
         inexact: false
       });
     }

package/dist/TSDefToFlowDef.js.flow

@@ -225,7 +225,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
 
     static ClassDeclarationSuperClass(
       superClass: ?TSESTree.LeftHandSideExpression,
-      superTypeParameters: ?TSESTree.TSTypeParameterInstantiation,
+      superTypeArguments: ?TSESTree.TSTypeParameterInstantiation,
     ): [FlowESTree.InterfaceExtends] | [] {
       if (superClass == null) {
         return [];
@@ -239,7 +239,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
           type: 'InterfaceExtends',
           id,
           typeParameters:
-            Transform.TSTypeParameterInstantiationOpt(superTypeParameters),
+            Transform.TSTypeParameterInstantiationOpt(superTypeArguments),
         }),
       ];
     }
@@ -1440,7 +1440,9 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
     ): FlowESTree.TupleTypeAnnotation {
       return constructFlowNode<FlowESTree.TupleTypeAnnotation>({
         type: 'TupleTypeAnnotation',
-        types: node.elementTypes.map(node => Transform.TSTypeAnnotation(node)),
+        elementTypes: node.elementTypes.map(node =>
+          Transform.TSTypeAnnotation(node),
+        ),
         inexact: false,
       });
     }

package/dist/flowDefToTSDef.js

@@ -1740,6 +1740,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
         switch (node.declaration.type) {
           case 'ClassDeclaration':
           case 'ComponentDeclaration':
+          case 'RecordDeclaration':
           case 'HookDeclaration':
           case 'FunctionDeclaration':
           case 'VariableDeclaration':
@@ -3415,7 +3416,11 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     ObjectTypeProperty(node) {
       var _node$variance3;
 
-      const key = node.key.type === 'Identifier' ? transform.Identifier(node.key) : transform.StringLiteral(node.key);
+      const key = node.key.type === 'Identifier' ? transform.Identifier(node.key) : node.key.literalType === 'string' ? transform.StringLiteral(node.key) : null;
+
+      if (key == null) {
+        throw unexpectedTranslationError(node, 'Unsupported key type');
+      }
 
       if (node.method === true) {
         // flow has just one node for all object properties and relies upon the method flag
@@ -3583,8 +3588,8 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     TupleTypeAnnotation(node) {
-      const allReadOnly = node.types.length > 0 && node.types.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
-      const elems = node.types.map(element => {
+      const allReadOnly = node.elementTypes.length > 0 && node.elementTypes.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
+      const elems = node.elementTypes.map(element => {
         switch (element.type) {
           case 'TupleTypeLabeledElement':
             if (!allReadOnly && element.variance != null) {

package/dist/flowDefToTSDef.js.flow

@@ -1935,6 +1935,7 @@ const getTransforms = (
         switch (node.declaration.type) {
           case 'ClassDeclaration':
           case 'ComponentDeclaration':
+          case 'RecordDeclaration':
           case 'HookDeclaration':
           case 'FunctionDeclaration':
           case 'VariableDeclaration':
@@ -3723,7 +3724,13 @@ const getTransforms = (
       const key =
         node.key.type === 'Identifier'
           ? transform.Identifier(node.key)
-          : transform.StringLiteral(node.key);
+          : node.key.literalType === 'string'
+            ? transform.StringLiteral(node.key)
+            : null;
+
+      if (key == null) {
+        throw unexpectedTranslationError(node, 'Unsupported key type');
+      }
 
       if (node.method === true) {
         // flow has just one node for all object properties and relies upon the method flag
@@ -3905,14 +3912,14 @@ const getTransforms = (
       node: FlowESTree.TupleTypeAnnotation,
     ): TSESTree.TSTupleType | TSESTree.TSTypeOperator {
       const allReadOnly =
-        node.types.length > 0 &&
-        node.types.every(
+        node.elementTypes.length > 0 &&
+        node.elementTypes.every(
           element =>
             element.type === 'TupleTypeLabeledElement' &&
             element.variance != null &&
             element.variance.kind === 'plus',
         );
-      const elems = node.types.map((element): TSESTree.TypeNode => {
+      const elems = node.elementTypes.map((element): TSESTree.TypeNode => {
         switch (element.type) {
           case 'TupleTypeLabeledElement':
             if (!allReadOnly && element.variance != null) {

package/dist/flowToFlowDef.js

@@ -746,7 +746,7 @@ function convertInterfaceDeclaration(interface_, context) {
 function convertClassDeclaration(class_, context) {
   const [resultTypeParams, typeParamsDeps] = convertTypeParameterDeclarationOrNull(class_.typeParameters, context);
   const implementsDeps = class_.implements.flatMap(impl => (0, _FlowAnalyze.analyzeTypeDependencies)(impl, context));
-  const [resultSuperClass, superClassDeps] = convertSuperClass(class_.superClass, class_.superTypeParameters, context);
+  const [resultSuperClass, superClassDeps] = convertSuperClass(class_.superClass, class_.superTypeArguments, context);
   const [resultClassBody, bodyDeps] = convertClassBody(class_.body, context);
 
   if (class_.decorators.length > 0) {
@@ -816,8 +816,8 @@ function convertExpressionToTypeofIdentifier(node, context) {
   throw (0, _ErrorUtils.translationError)(node, `Expected ${node.type} to be an Identifier or Member with Identifier property, non-Super object.`, context);
 }
 
-function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeParameters, context) {
-  const [resultTypeParams, typeParamsDeps] = convertTypeParameterInstantiationOrNull(superTypeParameters, context);
+function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeArguments, context) {
+  const [resultTypeParams, typeParamsDeps] = convertTypeParameterInstantiationOrNull(superTypeArguments, context);
   const superDeps = (0, _FlowAnalyze.analyzeTypeDependencies)(nodeForDependencies, context);
   return [_hermesTransform.t.InterfaceExtends({
     id: detachedId,
@@ -825,7 +825,7 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeParam
   }), [...typeParamsDeps, ...superDeps]];
 }
 
-function convertSuperClass(superClass, superTypeParameters, context) {
+function convertSuperClass(superClass, superTypeArguments, context) {
   if (superClass == null) {
     // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
@@ -834,12 +834,12 @@ function convertSuperClass(superClass, superTypeParameters, context) {
   switch (superClass.type) {
     case 'Identifier':
       {
-        return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(superClass), superClass, superTypeParameters, context);
+        return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(superClass), superClass, superTypeArguments, context);
       }
 
     case 'MemberExpression':
       {
-        return convertSuperClassHelper(convertExpressionToIdentifier(superClass, context), superClass, superTypeParameters, context);
+        return convertSuperClassHelper(convertExpressionToIdentifier(superClass, context), superClass, superTypeArguments, context);
       }
 
     case 'TypeCastExpression':
@@ -848,7 +848,7 @@ function convertSuperClass(superClass, superTypeParameters, context) {
         const typeAnnotation = superClass.type === 'TypeCastExpression' ? superClass.typeAnnotation.typeAnnotation : superClass.typeAnnotation;
 
         if (typeAnnotation.type === 'GenericTypeAnnotation') {
-          return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(typeAnnotation.id), typeAnnotation, superTypeParameters, context);
+          return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(typeAnnotation.id), typeAnnotation, superTypeArguments, context);
         }
 
         if (typeAnnotation.type === 'TypeofTypeAnnotation') {

package/dist/flowToFlowDef.js.flow

@@ -980,7 +980,7 @@ function convertClassDeclaration(
   );
   const [resultSuperClass, superClassDeps] = convertSuperClass(
     class_.superClass,
-    class_.superTypeParameters,
+    class_.superTypeArguments,
     context,
   );
   const [resultClassBody, bodyDeps] = convertClassBody(class_.body, context);
@@ -1059,11 +1059,11 @@ function convertExpressionToTypeofIdentifier(
 function convertSuperClassHelper(
   detachedId: DetachedNode<Identifier | QualifiedTypeIdentifier>,
   nodeForDependencies: ESNode,
-  superTypeParameters: ?TypeParameterInstantiation,
+  superTypeArguments: ?TypeParameterInstantiation,
   context: TranslationContext,
 ): TranslatedResultOrNull<InterfaceExtends> {
   const [resultTypeParams, typeParamsDeps] =
-    convertTypeParameterInstantiationOrNull(superTypeParameters, context);
+    convertTypeParameterInstantiationOrNull(superTypeArguments, context);
   const superDeps = analyzeTypeDependencies(nodeForDependencies, context);
   return [
     t.InterfaceExtends({
@@ -1076,7 +1076,7 @@ function convertSuperClassHelper(
 
 function convertSuperClass(
   superClass: ?Expression,
-  superTypeParameters: ?TypeParameterInstantiation,
+  superTypeArguments: ?TypeParameterInstantiation,
   context: TranslationContext,
 ): TranslatedResultOrNull<InterfaceExtends> {
   if (superClass == null) {
@@ -1089,7 +1089,7 @@ function convertSuperClass(
       return convertSuperClassHelper(
         asDetachedNode(superClass),
         superClass,
-        superTypeParameters,
+        superTypeArguments,
         context,
       );
     }
@@ -1097,7 +1097,7 @@ function convertSuperClass(
       return convertSuperClassHelper(
         convertExpressionToIdentifier(superClass, context),
         superClass,
-        superTypeParameters,
+        superTypeArguments,
         context,
       );
     }
@@ -1112,7 +1112,7 @@ function convertSuperClass(
         return convertSuperClassHelper(
           asDetachedNode(typeAnnotation.id),
           typeAnnotation,
-          superTypeParameters,
+          superTypeArguments,
           context,
         );
       }

package/dist/flowToJS.js

@@ -35,5 +35,5 @@ function stripAtFlow(ast, _options) {
 }
 
 function flowToJS(sourceAST, _code, _scopeManager) {
-  return [_hermesParser.Transforms.stripComponentSyntax, _hermesParser.Transforms.stripFlowTypes, stripAtFlow].reduce((ast, transform) => transform(ast, {}), sourceAST);
+  return [_hermesParser.Transforms.transformComponentSyntax, _hermesParser.Transforms.stripFlowTypes, stripAtFlow].reduce((ast, transform) => transform(ast, {}), sourceAST);
 }

package/dist/flowToJS.js.flow

@@ -37,7 +37,7 @@ export function flowToJS(
   _scopeManager: ScopeManager,
 ): Program {
   return [
-    Transforms.stripComponentSyntax,
+    Transforms.transformComponentSyntax,
     Transforms.stripFlowTypes,
     stripAtFlow,
   ].reduce((ast, transform) => transform(ast, {}), sourceAST);

package/dist/src/TSDefToFlowDef.js

@@ -208,7 +208,7 @@ const getTransforms = (originalCode, opts) => {
       });
     }
 
-    static ClassDeclarationSuperClass(superClass, superTypeParameters) {
+    static ClassDeclarationSuperClass(superClass, superTypeArguments) {
       if (superClass == null) {
         return [];
       }
@@ -218,7 +218,7 @@ const getTransforms = (originalCode, opts) => {
       return [constructFlowNode({
         type: 'InterfaceExtends',
         id,
-        typeParameters: Transform.TSTypeParameterInstantiationOpt(superTypeParameters)
+        typeParameters: Transform.TSTypeParameterInstantiationOpt(superTypeArguments)
       })];
     }
 
@@ -1282,7 +1282,7 @@ const getTransforms = (originalCode, opts) => {
     static TSTupleType(node) {
       return constructFlowNode({
         type: 'TupleTypeAnnotation',
-        types: node.elementTypes.map(node => Transform.TSTypeAnnotation(node)),
+        elementTypes: node.elementTypes.map(node => Transform.TSTypeAnnotation(node)),
         inexact: false
       });
     }

package/dist/src/flowDefToTSDef.js

@@ -1740,6 +1740,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
         switch (node.declaration.type) {
           case 'ClassDeclaration':
           case 'ComponentDeclaration':
+          case 'RecordDeclaration':
           case 'HookDeclaration':
           case 'FunctionDeclaration':
           case 'VariableDeclaration':
@@ -3415,7 +3416,11 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     ObjectTypeProperty(node) {
       var _node$variance3;
 
-      const key = node.key.type === 'Identifier' ? transform.Identifier(node.key) : transform.StringLiteral(node.key);
+      const key = node.key.type === 'Identifier' ? transform.Identifier(node.key) : node.key.literalType === 'string' ? transform.StringLiteral(node.key) : null;
+
+      if (key == null) {
+        throw unexpectedTranslationError(node, 'Unsupported key type');
+      }
 
       if (node.method === true) {
         // flow has just one node for all object properties and relies upon the method flag
@@ -3583,8 +3588,8 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     TupleTypeAnnotation(node) {
-      const allReadOnly = node.types.length > 0 && node.types.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
-      const elems = node.types.map(element => {
+      const allReadOnly = node.elementTypes.length > 0 && node.elementTypes.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
+      const elems = node.elementTypes.map(element => {
         switch (element.type) {
           case 'TupleTypeLabeledElement':
             if (!allReadOnly && element.variance != null) {

package/dist/src/flowToFlowDef.js

@@ -746,7 +746,7 @@ function convertInterfaceDeclaration(interface_, context) {
 function convertClassDeclaration(class_, context) {
   const [resultTypeParams, typeParamsDeps] = convertTypeParameterDeclarationOrNull(class_.typeParameters, context);
   const implementsDeps = class_.implements.flatMap(impl => (0, _FlowAnalyze.analyzeTypeDependencies)(impl, context));
-  const [resultSuperClass, superClassDeps] = convertSuperClass(class_.superClass, class_.superTypeParameters, context);
+  const [resultSuperClass, superClassDeps] = convertSuperClass(class_.superClass, class_.superTypeArguments, context);
   const [resultClassBody, bodyDeps] = convertClassBody(class_.body, context);
 
   if (class_.decorators.length > 0) {
@@ -816,8 +816,8 @@ function convertExpressionToTypeofIdentifier(node, context) {
   throw (0, _ErrorUtils.translationError)(node, `Expected ${node.type} to be an Identifier or Member with Identifier property, non-Super object.`, context);
 }
 
-function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeParameters, context) {
-  const [resultTypeParams, typeParamsDeps] = convertTypeParameterInstantiationOrNull(superTypeParameters, context);
+function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeArguments, context) {
+  const [resultTypeParams, typeParamsDeps] = convertTypeParameterInstantiationOrNull(superTypeArguments, context);
   const superDeps = (0, _FlowAnalyze.analyzeTypeDependencies)(nodeForDependencies, context);
   return [_hermesTransform.t.InterfaceExtends({
     id: detachedId,
@@ -825,7 +825,7 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeParam
   }), [...typeParamsDeps, ...superDeps]];
 }
 
-function convertSuperClass(superClass, superTypeParameters, context) {
+function convertSuperClass(superClass, superTypeArguments, context) {
   if (superClass == null) {
     // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
@@ -834,12 +834,12 @@ function convertSuperClass(superClass, superTypeParameters, context) {
   switch (superClass.type) {
     case 'Identifier':
       {
-        return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(superClass), superClass, superTypeParameters, context);
+        return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(superClass), superClass, superTypeArguments, context);
       }
 
     case 'MemberExpression':
       {
-        return convertSuperClassHelper(convertExpressionToIdentifier(superClass, context), superClass, superTypeParameters, context);
+        return convertSuperClassHelper(convertExpressionToIdentifier(superClass, context), superClass, superTypeArguments, context);
       }
 
     case 'TypeCastExpression':
@@ -848,7 +848,7 @@ function convertSuperClass(superClass, superTypeParameters, context) {
         const typeAnnotation = superClass.type === 'TypeCastExpression' ? superClass.typeAnnotation.typeAnnotation : superClass.typeAnnotation;
 
         if (typeAnnotation.type === 'GenericTypeAnnotation') {
-          return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(typeAnnotation.id), typeAnnotation, superTypeParameters, context);
+          return convertSuperClassHelper((0, _hermesTransform.asDetachedNode)(typeAnnotation.id), typeAnnotation, superTypeArguments, context);
         }
 
         if (typeAnnotation.type === 'TypeofTypeAnnotation') {

package/dist/src/flowToJS.js

@@ -35,5 +35,5 @@ function stripAtFlow(ast, _options) {
 }
 
 function flowToJS(sourceAST, _code, _scopeManager) {
-  return [_hermesParser.Transforms.stripComponentSyntax, _hermesParser.Transforms.stripFlowTypes, stripAtFlow].reduce((ast, transform) => transform(ast, {}), sourceAST);
+  return [_hermesParser.Transforms.transformComponentSyntax, _hermesParser.Transforms.stripFlowTypes, stripAtFlow].reduce((ast, transform) => transform(ast, {}), sourceAST);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-api-translator",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "Toolkit for creating Flow and TypeScript compatible libraries from Flow source code.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -13,10 +13,10 @@
     "@typescript-eslint/parser": "8.38.0",
     "@typescript-eslint/visitor-keys": "8.38.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-eslint": "0.32.0",
-    "hermes-estree": "0.32.0",
-    "hermes-parser": "0.32.0",
-    "hermes-transform": "0.32.0",
+    "hermes-eslint": "0.33.0",
+    "hermes-estree": "0.33.0",
+    "hermes-parser": "0.33.0",
+    "hermes-transform": "0.33.0",
     "typescript": "5.3.2"
   },
   "peerDependencies": {