flow-api-translator 0.31.2 → 0.32.1

package/dist/TSDefToFlowDef.js

@@ -43,7 +43,7 @@ function constructFlowNode(node) {
   };
 }
 
-const makeCommentOwnLine = // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+const makeCommentOwnLine = // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
 _hermesTransform.makeCommentOwnLine;
 
 function TSDefToFlowDef(originalCode, ast, opts) {
@@ -107,7 +107,7 @@ const getTransforms = (originalCode, opts) => {
     code = makeCommentOwnLine(code, comment); // $FlowExpectedError[prop-missing]
     // $FlowExpectedError[cannot-write]
 
-    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-cast]
+    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-type]
 
     node.comments.push(comment);
   }
@@ -183,14 +183,14 @@ const getTransforms = (originalCode, opts) => {
 
           case 'TSAbstractPropertyDefinition':
           case 'PropertyDefinition':
-            // $FlowFixMe[incompatible-call] ambiguous node
+            // $FlowFixMe[incompatible-type] ambiguous node
             Transform._translateIntoObjectProp(classItem, properties, indexers);
 
             break;
 
           case 'MethodDefinition':
           case 'TSAbstractMethodDefinition':
-            // $FlowFixMe[incompatible-call] ambiguous node
+            // $FlowFixMe[incompatible-type] ambiguous node
             Transform._translateIntoObjectMethod(classItem, properties);
 
             break;
@@ -975,7 +975,7 @@ const getTransforms = (originalCode, opts) => {
           objectType: base,
           indexType: constructFlowNode({
             type: 'StringLiteralTypeAnnotation',
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             value: name,
             // $FlowFixMe[incompatible-type]
             raw: `'${name}'`

package/dist/TSDefToFlowDef.js.flow

@@ -46,7 +46,7 @@ function constructFlowNode<T: FlowESTree.BaseNode>(
 }
 
 const makeCommentOwnLine =
-  // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+  // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
   (makeCommentOwnLineOriginal: (string, mixed) => string);
 
 export function TSDefToFlowDef(
@@ -112,7 +112,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
     // $FlowExpectedError[prop-missing]
     // $FlowExpectedError[cannot-write]
     node.comments ??= [];
-    // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     (node.comments: Array<TSESTree.Comment>).push(comment);
   }
   function unsupportedAnnotation(
@@ -202,12 +202,12 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
             break;
           case 'TSAbstractPropertyDefinition':
           case 'PropertyDefinition':
-            // $FlowFixMe[incompatible-call] ambiguous node
+            // $FlowFixMe[incompatible-type] ambiguous node
             Transform._translateIntoObjectProp(classItem, properties, indexers);
             break;
           case 'MethodDefinition':
           case 'TSAbstractMethodDefinition':
-            // $FlowFixMe[incompatible-call] ambiguous node
+            // $FlowFixMe[incompatible-type] ambiguous node
             Transform._translateIntoObjectMethod(classItem, properties);
             break;
         }
@@ -1062,7 +1062,7 @@ const getTransforms = (originalCode: string, opts: TranslationOptions) => {
           objectType: base,
           indexType: constructFlowNode<FlowESTree.StringLiteralTypeAnnotation>({
             type: 'StringLiteralTypeAnnotation',
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             value: name,
             // $FlowFixMe[incompatible-type]
             raw: `'${name}'`,

package/dist/flowDefToTSDef.js

@@ -45,9 +45,9 @@ function constructFlowNode(node) {
   return node;
 }
 
-const cloneJSDocCommentsToNewNode = // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+const cloneJSDocCommentsToNewNode = // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
 _hermesTransform.cloneJSDocCommentsToNewNode;
-const makeCommentOwnLine = // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+const makeCommentOwnLine = // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
 _hermesTransform.makeCommentOwnLine;
 const VALID_REACT_IMPORTS = new Set(['React', 'react']);
 
@@ -86,8 +86,6 @@ function flowDefToTSDef(originalCode, ast, scopeManager, opts) {
     if (node.type in transform) {
       const result = transform[// $FlowExpectedError[prop-missing]
       node.type]( // $FlowExpectedError[incompatible-type]
-      // $FlowExpectedError[prop-missing]
-      // $FlowFixMe[incompatible-call]
       node);
       tsBody.push(...(Array.isArray(result) ? result : [result]));
     } else {
@@ -160,7 +158,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     code = makeCommentOwnLine(code, comment); // $FlowExpectedError[prop-missing]
     // $FlowExpectedError[cannot-write]
 
-    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-cast]
+    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-type]
 
     node.comments.push(comment);
   }

package/dist/flowDefToTSDef.js.flow

@@ -46,11 +46,11 @@ function constructFlowNode<T: FlowESTree.BaseNode>(
 }
 
 const cloneJSDocCommentsToNewNode =
-  // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+  // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
   (cloneJSDocCommentsToNewNodeOriginal: (mixed, mixed) => void);
 
 const makeCommentOwnLine =
-  // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+  // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
   (makeCommentOwnLineOriginal: (string, mixed) => string);
 
 const VALID_REACT_IMPORTS = new Set<string>(['React', 'react']);
@@ -102,8 +102,6 @@ export function flowDefToTSDef(
         node.type
       ](
         // $FlowExpectedError[incompatible-type]
-        // $FlowExpectedError[prop-missing]
-        // $FlowFixMe[incompatible-call]
         node,
       );
       tsBody.push(...(Array.isArray(result) ? result : [result]));
@@ -180,7 +178,7 @@ const getTransforms = (
     // $FlowExpectedError[prop-missing]
     // $FlowExpectedError[cannot-write]
     node.comments ??= [];
-    // $FlowExpectedError[incompatible-cast]
+    // $FlowExpectedError[incompatible-type]
     (node.comments: Array<TSESTree.Comment>).push(comment);
   }
   function unsupportedAnnotation(

package/dist/flowToFlowDef.js

@@ -49,7 +49,7 @@ function getTopLevelStatement(node, context) {
     var _currentNode$parent;
 
     if (((_currentNode$parent = currentNode.parent) == null ? void 0 : _currentNode$parent.type) === 'Program') {
-      // $FlowFixMe[incompatible-return]
+      // $FlowFixMe[incompatible-type]
       return currentNode;
     }
 
@@ -425,7 +425,7 @@ function convertObjectExpression(expr, context) {
 
             const [resultExpr, deps] = convertAFunction(prop.value, context);
             return [inheritComments(prop, _hermesTransform.t.ObjectTypeMethodSignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: (0, _hermesTransform.asDetachedNode)(prop.key),
               value: resultExpr
             })), deps];
@@ -439,7 +439,7 @@ function convertObjectExpression(expr, context) {
             const kind = prop.kind;
             const [resultExpr, deps] = convertAFunction(prop.value, context);
             return [inheritComments(prop, _hermesTransform.t.ObjectTypeAccessorSignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: (0, _hermesTransform.asDetachedNode)(prop.key),
               kind,
               value: resultExpr
@@ -448,7 +448,7 @@ function convertObjectExpression(expr, context) {
 
           const [resultExpr, deps] = convertExpressionToTypeAnnotation(prop.value, context);
           return [inheritComments(prop, _hermesTransform.t.ObjectTypePropertySignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(prop.key),
             value: resultExpr,
             optional: false,
@@ -754,7 +754,7 @@ function convertClassDeclaration(class_, context) {
   }
 
   return [_hermesTransform.t.DeclareClass({
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     id: (0, _hermesTransform.asDetachedNode)(class_.id),
     typeParameters: resultTypeParams,
     implements: class_.implements.map(impl => (0, _hermesTransform.asDetachedNode)(impl)),
@@ -827,7 +827,7 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeParam
 
 function convertSuperClass(superClass, superTypeParameters, context) {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -889,7 +889,7 @@ function convertClassMember(member, context) {
 
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-return]
+          // $FlowFixMe[incompatible-type]
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -900,7 +900,7 @@ function convertClassMember(member, context) {
         if (((_member$value = member.value) == null ? void 0 : _member$value.type) === 'ArrowFunctionExpression' && member.typeAnnotation == null) {
           const [resultTypeAnnotation, deps] = convertAFunction(member.value, context);
           return [inheritComments(member, _hermesTransform.t.ObjectTypePropertySignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(member.key),
             value: resultTypeAnnotation,
             optional: member.optional,
@@ -911,7 +911,7 @@ function convertClassMember(member, context) {
 
         const [resultTypeAnnotation, deps] = convertTypeAnnotation(member.typeAnnotation, member, context);
         return [inheritComments(member, _hermesTransform.t.ObjectTypePropertySignature({
-          // $FlowFixMe[incompatible-call]
+          // $FlowFixMe[incompatible-type]
           key: (0, _hermesTransform.asDetachedNode)(member.key),
           value: resultTypeAnnotation,
           optional: member.optional,
@@ -924,7 +924,7 @@ function convertClassMember(member, context) {
       {
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-return]
+          // $FlowFixMe[incompatible-type]
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -941,7 +941,7 @@ function convertClassMember(member, context) {
           // accessors are methods - but flow accessor signatures are properties
           const kind = member.kind;
           return [inheritComments(member, _hermesTransform.t.ObjectTypeAccessorSignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(newKey),
             value: resultValue,
             static: member.static,
@@ -950,7 +950,7 @@ function convertClassMember(member, context) {
         }
 
         return [inheritComments(member, _hermesTransform.t.ObjectTypeMethodSignature({
-          // $FlowFixMe[incompatible-call]
+          // $FlowFixMe[incompatible-type]
           key: (0, _hermesTransform.asDetachedNode)(newKey),
           value: resultValue,
           static: member.static
@@ -1138,7 +1138,7 @@ function convertFunctionParameters(params, context) {
             throw (0, _ErrorUtils.translationError)(param, `FunctionParameter: Multiple rest elements found`, context);
           }
 
-          const [resultParam, deps] = convertBindingNameToFunctionTypeParam( // $FlowFixMe[incompatible-call] I dont think these other cases are possible
+          const [resultParam, deps] = convertBindingNameToFunctionTypeParam( // $FlowFixMe[incompatible-type] I dont think these other cases are possible
           param.argument, context, index, false);
           return [resultParams, resultParam, [...paramsDeps, ...deps]];
         }
@@ -1200,7 +1200,7 @@ function convertTypeAnnotationType(annot, container, context) {
 
 function convertTypeAnnotationTypeOrNull(annot, context) {
   if (annot == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1209,7 +1209,7 @@ function convertTypeAnnotationTypeOrNull(annot, context) {
 
 function convertTypeParameterDeclarationOrNull(decl, context) {
   if (decl == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1218,7 +1218,7 @@ function convertTypeParameterDeclarationOrNull(decl, context) {
 
 function convertTypeParameterInstantiationOrNull(inst, context) {
   if (inst == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 

package/dist/flowToFlowDef.js.flow

@@ -124,7 +124,7 @@ function getTopLevelStatement(
   let currentNode: ?ESNode = node;
   while (currentNode != null) {
     if (currentNode.parent?.type === 'Program') {
-      // $FlowFixMe[incompatible-return]
+      // $FlowFixMe[incompatible-type]
       return currentNode;
     }
     currentNode = currentNode.parent;
@@ -535,7 +535,7 @@ function convertObjectExpression(
             inheritComments(
               prop,
               t.ObjectTypeMethodSignature({
-                // $FlowFixMe[incompatible-call]
+                // $FlowFixMe[incompatible-type]
                 key: asDetachedNode<
                   Identifier | NumericLiteral | StringLiteral | Expression,
                 >(prop.key),
@@ -564,7 +564,7 @@ function convertObjectExpression(
             inheritComments(
               prop,
               t.ObjectTypeAccessorSignature({
-                // $FlowFixMe[incompatible-call]
+                // $FlowFixMe[incompatible-type]
                 key: asDetachedNode<
                   Identifier | NumericLiteral | StringLiteral | Expression,
                 >(prop.key),
@@ -585,7 +585,7 @@ function convertObjectExpression(
           inheritComments(
             prop,
             t.ObjectTypePropertySignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: asDetachedNode<
                 Identifier | NumericLiteral | StringLiteral | Expression,
               >(prop.key),
@@ -994,7 +994,7 @@ function convertClassDeclaration(
   }
   return [
     t.DeclareClass({
-      // $FlowFixMe[incompatible-call]
+      // $FlowFixMe[incompatible-type]
       id: asDetachedNode<Identifier | null>(class_.id),
       typeParameters: resultTypeParams,
       implements: class_.implements.map(impl => asDetachedNode(impl)),
@@ -1080,7 +1080,7 @@ function convertSuperClass(
   context: TranslationContext,
 ): TranslatedResultOrNull<InterfaceExtends> {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1175,7 +1175,7 @@ function convertClassMember(
     case 'PropertyDefinition': {
       // PrivateIdentifier's are not exposed so can be stripped.
       if (member.key.type === 'PrivateIdentifier') {
-        // $FlowFixMe[incompatible-return]
+        // $FlowFixMe[incompatible-type]
         return EMPTY_TRANSLATION_RESULT;
       }
       if (
@@ -1203,7 +1203,7 @@ function convertClassMember(
           inheritComments(
             member,
             t.ObjectTypePropertySignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: asDetachedNode<
                 ClassPropertyNameComputed | ClassPropertyNameNonComputed,
               >(member.key),
@@ -1227,7 +1227,7 @@ function convertClassMember(
         inheritComments(
           member,
           t.ObjectTypePropertySignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: asDetachedNode<
               ClassPropertyNameComputed | ClassPropertyNameNonComputed,
             >(member.key),
@@ -1243,7 +1243,7 @@ function convertClassMember(
     case 'MethodDefinition': {
       // PrivateIdentifier's are not exposed so can be stripped.
       if (member.key.type === 'PrivateIdentifier') {
-        // $FlowFixMe[incompatible-return]
+        // $FlowFixMe[incompatible-type]
         return EMPTY_TRANSLATION_RESULT;
       }
       if (
@@ -1281,7 +1281,7 @@ function convertClassMember(
           inheritComments(
             member,
             t.ObjectTypeAccessorSignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: asDetachedNode<
                 ClassPropertyNameComputed | ClassPropertyNameNonComputed,
               >(newKey),
@@ -1298,7 +1298,7 @@ function convertClassMember(
         inheritComments(
           member,
           t.ObjectTypeMethodSignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: asDetachedNode<
               ClassPropertyNameComputed | ClassPropertyNameNonComputed,
             >(newKey),
@@ -1603,7 +1603,7 @@ function convertFunctionParameters(
             );
           }
           const [resultParam, deps] = convertBindingNameToFunctionTypeParam(
-            // $FlowFixMe[incompatible-call] I dont think these other cases are possible
+            // $FlowFixMe[incompatible-type] I dont think these other cases are possible
             param.argument,
             context,
             index,
@@ -1729,7 +1729,7 @@ function convertTypeAnnotationTypeOrNull(
   context: TranslationContext,
 ): TranslatedResultOrNull<TypeAnnotationType> {
   if (annot == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1740,7 +1740,7 @@ function convertTypeParameterDeclarationOrNull(
   context: TranslationContext,
 ): TranslatedResultOrNull<TypeParameterDeclaration> {
   if (decl == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
   return [asDetachedNode(decl), analyzeTypeDependencies(decl, context)];
@@ -1750,7 +1750,7 @@ function convertTypeParameterInstantiationOrNull(
   context: TranslationContext,
 ): TranslatedResultOrNull<TypeParameterInstantiation> {
   if (inst == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
   return [asDetachedNode(inst), analyzeTypeDependencies(inst, 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/index.js

@@ -61,7 +61,7 @@ async function translateFlowDefToTSDef(code, prettierOptions = {}) {
   const [tsAST, mutatedCode] = (0, _flowDefToTSDef.flowDefToTSDef)(code, ast, scopeManager, {
     recoverFromErrors: true
   });
-  return (0, _hermesTransform.print)( // $FlowExpectedError[incompatible-call] - this is fine as we're providing the visitor keys
+  return (0, _hermesTransform.print)( // $FlowExpectedError[incompatible-type] - this is fine as we're providing the visitor keys
   tsAST, mutatedCode, { ...prettierOptions
   }, _visitorKeys.visitorKeys);
 }

package/dist/index.js.flow

@@ -53,7 +53,7 @@ export async function translateFlowDefToTSDef(
   });
 
   return print(
-    // $FlowExpectedError[incompatible-call] - this is fine as we're providing the visitor keys
+    // $FlowExpectedError[incompatible-type] - this is fine as we're providing the visitor keys
     tsAST,
     mutatedCode,
     {

package/dist/src/TSDefToFlowDef.js

@@ -43,7 +43,7 @@ function constructFlowNode(node) {
   };
 }
 
-const makeCommentOwnLine = // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+const makeCommentOwnLine = // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
 _hermesTransform.makeCommentOwnLine;
 
 function TSDefToFlowDef(originalCode, ast, opts) {
@@ -107,7 +107,7 @@ const getTransforms = (originalCode, opts) => {
     code = makeCommentOwnLine(code, comment); // $FlowExpectedError[prop-missing]
     // $FlowExpectedError[cannot-write]
 
-    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-cast]
+    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-type]
 
     node.comments.push(comment);
   }
@@ -183,14 +183,14 @@ const getTransforms = (originalCode, opts) => {
 
           case 'TSAbstractPropertyDefinition':
           case 'PropertyDefinition':
-            // $FlowFixMe[incompatible-call] ambiguous node
+            // $FlowFixMe[incompatible-type] ambiguous node
             Transform._translateIntoObjectProp(classItem, properties, indexers);
 
             break;
 
           case 'MethodDefinition':
           case 'TSAbstractMethodDefinition':
-            // $FlowFixMe[incompatible-call] ambiguous node
+            // $FlowFixMe[incompatible-type] ambiguous node
             Transform._translateIntoObjectMethod(classItem, properties);
 
             break;
@@ -975,7 +975,7 @@ const getTransforms = (originalCode, opts) => {
           objectType: base,
           indexType: constructFlowNode({
             type: 'StringLiteralTypeAnnotation',
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             value: name,
             // $FlowFixMe[incompatible-type]
             raw: `'${name}'`

package/dist/src/flowDefToTSDef.js

@@ -45,9 +45,9 @@ function constructFlowNode(node) {
   return node;
 }
 
-const cloneJSDocCommentsToNewNode = // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+const cloneJSDocCommentsToNewNode = // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
 _hermesTransform.cloneJSDocCommentsToNewNode;
-const makeCommentOwnLine = // $FlowExpectedError[incompatible-cast] - trust me this re-type is 100% safe
+const makeCommentOwnLine = // $FlowExpectedError[incompatible-type] - trust me this re-type is 100% safe
 _hermesTransform.makeCommentOwnLine;
 const VALID_REACT_IMPORTS = new Set(['React', 'react']);
 
@@ -86,8 +86,6 @@ function flowDefToTSDef(originalCode, ast, scopeManager, opts) {
     if (node.type in transform) {
       const result = transform[// $FlowExpectedError[prop-missing]
       node.type]( // $FlowExpectedError[incompatible-type]
-      // $FlowExpectedError[prop-missing]
-      // $FlowFixMe[incompatible-call]
       node);
       tsBody.push(...(Array.isArray(result) ? result : [result]));
     } else {
@@ -160,7 +158,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     code = makeCommentOwnLine(code, comment); // $FlowExpectedError[prop-missing]
     // $FlowExpectedError[cannot-write]
 
-    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-cast]
+    (_node$comments = node.comments) != null ? _node$comments : node.comments = []; // $FlowExpectedError[incompatible-type]
 
     node.comments.push(comment);
   }

package/dist/src/flowToFlowDef.js

@@ -49,7 +49,7 @@ function getTopLevelStatement(node, context) {
     var _currentNode$parent;
 
     if (((_currentNode$parent = currentNode.parent) == null ? void 0 : _currentNode$parent.type) === 'Program') {
-      // $FlowFixMe[incompatible-return]
+      // $FlowFixMe[incompatible-type]
       return currentNode;
     }
 
@@ -425,7 +425,7 @@ function convertObjectExpression(expr, context) {
 
             const [resultExpr, deps] = convertAFunction(prop.value, context);
             return [inheritComments(prop, _hermesTransform.t.ObjectTypeMethodSignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: (0, _hermesTransform.asDetachedNode)(prop.key),
               value: resultExpr
             })), deps];
@@ -439,7 +439,7 @@ function convertObjectExpression(expr, context) {
             const kind = prop.kind;
             const [resultExpr, deps] = convertAFunction(prop.value, context);
             return [inheritComments(prop, _hermesTransform.t.ObjectTypeAccessorSignature({
-              // $FlowFixMe[incompatible-call]
+              // $FlowFixMe[incompatible-type]
               key: (0, _hermesTransform.asDetachedNode)(prop.key),
               kind,
               value: resultExpr
@@ -448,7 +448,7 @@ function convertObjectExpression(expr, context) {
 
           const [resultExpr, deps] = convertExpressionToTypeAnnotation(prop.value, context);
           return [inheritComments(prop, _hermesTransform.t.ObjectTypePropertySignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(prop.key),
             value: resultExpr,
             optional: false,
@@ -754,7 +754,7 @@ function convertClassDeclaration(class_, context) {
   }
 
   return [_hermesTransform.t.DeclareClass({
-    // $FlowFixMe[incompatible-call]
+    // $FlowFixMe[incompatible-type]
     id: (0, _hermesTransform.asDetachedNode)(class_.id),
     typeParameters: resultTypeParams,
     implements: class_.implements.map(impl => (0, _hermesTransform.asDetachedNode)(impl)),
@@ -827,7 +827,7 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeParam
 
 function convertSuperClass(superClass, superTypeParameters, context) {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -889,7 +889,7 @@ function convertClassMember(member, context) {
 
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-return]
+          // $FlowFixMe[incompatible-type]
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -900,7 +900,7 @@ function convertClassMember(member, context) {
         if (((_member$value = member.value) == null ? void 0 : _member$value.type) === 'ArrowFunctionExpression' && member.typeAnnotation == null) {
           const [resultTypeAnnotation, deps] = convertAFunction(member.value, context);
           return [inheritComments(member, _hermesTransform.t.ObjectTypePropertySignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(member.key),
             value: resultTypeAnnotation,
             optional: member.optional,
@@ -911,7 +911,7 @@ function convertClassMember(member, context) {
 
         const [resultTypeAnnotation, deps] = convertTypeAnnotation(member.typeAnnotation, member, context);
         return [inheritComments(member, _hermesTransform.t.ObjectTypePropertySignature({
-          // $FlowFixMe[incompatible-call]
+          // $FlowFixMe[incompatible-type]
           key: (0, _hermesTransform.asDetachedNode)(member.key),
           value: resultTypeAnnotation,
           optional: member.optional,
@@ -924,7 +924,7 @@ function convertClassMember(member, context) {
       {
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-return]
+          // $FlowFixMe[incompatible-type]
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -941,7 +941,7 @@ function convertClassMember(member, context) {
           // accessors are methods - but flow accessor signatures are properties
           const kind = member.kind;
           return [inheritComments(member, _hermesTransform.t.ObjectTypeAccessorSignature({
-            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(newKey),
             value: resultValue,
             static: member.static,
@@ -950,7 +950,7 @@ function convertClassMember(member, context) {
         }
 
         return [inheritComments(member, _hermesTransform.t.ObjectTypeMethodSignature({
-          // $FlowFixMe[incompatible-call]
+          // $FlowFixMe[incompatible-type]
           key: (0, _hermesTransform.asDetachedNode)(newKey),
           value: resultValue,
           static: member.static
@@ -1138,7 +1138,7 @@ function convertFunctionParameters(params, context) {
             throw (0, _ErrorUtils.translationError)(param, `FunctionParameter: Multiple rest elements found`, context);
           }
 
-          const [resultParam, deps] = convertBindingNameToFunctionTypeParam( // $FlowFixMe[incompatible-call] I dont think these other cases are possible
+          const [resultParam, deps] = convertBindingNameToFunctionTypeParam( // $FlowFixMe[incompatible-type] I dont think these other cases are possible
           param.argument, context, index, false);
           return [resultParams, resultParam, [...paramsDeps, ...deps]];
         }
@@ -1200,7 +1200,7 @@ function convertTypeAnnotationType(annot, container, context) {
 
 function convertTypeAnnotationTypeOrNull(annot, context) {
   if (annot == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1209,7 +1209,7 @@ function convertTypeAnnotationTypeOrNull(annot, context) {
 
 function convertTypeParameterDeclarationOrNull(decl, context) {
   if (decl == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1218,7 +1218,7 @@ function convertTypeParameterDeclarationOrNull(decl, context) {
 
 function convertTypeParameterInstantiationOrNull(inst, context) {
   if (inst == null) {
-    // $FlowFixMe[incompatible-return]
+    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 

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/dist/src/index.js

@@ -61,7 +61,7 @@ async function translateFlowDefToTSDef(code, prettierOptions = {}) {
   const [tsAST, mutatedCode] = (0, _flowDefToTSDef.flowDefToTSDef)(code, ast, scopeManager, {
     recoverFromErrors: true
   });
-  return (0, _hermesTransform.print)( // $FlowExpectedError[incompatible-call] - this is fine as we're providing the visitor keys
+  return (0, _hermesTransform.print)( // $FlowExpectedError[incompatible-type] - this is fine as we're providing the visitor keys
   tsAST, mutatedCode, { ...prettierOptions
   }, _visitorKeys.visitorKeys);
 }

package/dist/src/utils/FlowAnalyze.js

@@ -25,7 +25,7 @@ function analyzeFunctionReturn(func) {
   if (returnType != null) {
     return returnType;
   } // We trust Flow has validated this function to only return void
-  // $FlowFixMe[incompatible-return]
+  // $FlowFixMe[incompatible-type]
 
 
   return _hermesTransform.t.TypeAnnotation({

package/dist/utils/FlowAnalyze.js

@@ -25,7 +25,7 @@ function analyzeFunctionReturn(func) {
   if (returnType != null) {
     return returnType;
   } // We trust Flow has validated this function to only return void
-  // $FlowFixMe[incompatible-return]
+  // $FlowFixMe[incompatible-type]
 
 
   return _hermesTransform.t.TypeAnnotation({

package/dist/utils/FlowAnalyze.js.flow

@@ -23,7 +23,7 @@ export function analyzeFunctionReturn(func: AFunction): TypeAnnotation {
   }
 
   // We trust Flow has validated this function to only return void
-  // $FlowFixMe[incompatible-return]
+  // $FlowFixMe[incompatible-type]
   return t.TypeAnnotation({typeAnnotation: t.VoidTypeAnnotation()});
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-api-translator",
-  "version": "0.31.2",
+  "version": "0.32.1",
   "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.31.2",
-    "hermes-estree": "0.31.2",
-    "hermes-parser": "0.31.2",
-    "hermes-transform": "0.31.2",
+    "hermes-eslint": "0.32.1",
+    "hermes-estree": "0.32.1",
+    "hermes-parser": "0.32.1",
+    "hermes-transform": "0.32.1",
     "typescript": "5.3.2"
   },
   "peerDependencies": {