flow-api-translator 0.36.0 → 0.36.1

package/dist/flowToFlowDef.js

@@ -827,7 +827,6 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeArgum
 
 function convertSuperClass(superClass, superTypeArguments, context) {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -889,7 +888,10 @@ function convertClassMember(member, context) {
 
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-type]
+          return EMPTY_TRANSLATION_RESULT;
+        }
+
+        if (context.mungeUnderscores && member.key.type === 'Identifier' && member.key.name.length >= 2 && member.key.name[0] === '_' && member.key.name[1] !== '_') {
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -924,7 +926,10 @@ function convertClassMember(member, context) {
       {
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-type]
+          return EMPTY_TRANSLATION_RESULT;
+        }
+
+        if (context.mungeUnderscores && member.key.type === 'Identifier' && member.key.name.length >= 2 && member.key.name[0] === '_' && member.key.name[1] !== '_') {
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -987,31 +992,44 @@ function convertComponentDeclaration(comp, context) {
   }), [...typeParamsDeps, ...paramsAndRestDeps, ...rendersTypeDeps]];
 }
 
+function hasNonIdentifierStringLiteralParam(params) {
+  return params.some(param => param.type === 'ComponentParameter' && (0, _hermesEstree.isStringLiteral)(param.name) && !/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(param.name.value));
+}
+
+function extractParamTypeInfo(param, context) {
+  let optional = false;
+  let local = param.local;
+
+  if (local.type === 'AssignmentPattern') {
+    local = local.left;
+    optional = true;
+  }
+
+  if (!optional && local.type === 'Identifier') {
+    optional = local.optional;
+  }
+
+  return [optional, local, convertTypeAnnotation(local.typeAnnotation, param, context)];
+}
+
 function convertComponentParameters(params, context) {
+  if (hasNonIdentifierStringLiteralParam(params)) {
+    return convertComponentParametersToPropsObject(params, context);
+  }
+
   return params.reduce(([resultParams, restParam, paramsDeps], param) => {
     switch (param.type) {
       case 'ComponentParameter':
         {
-          let optional = false;
-          let local = param.local;
-
-          if (local.type === 'AssignmentPattern') {
-            local = local.left;
-            optional = true;
-          }
-
-          if (!optional && local.type === 'Identifier') {
-            optional = local.optional;
-          }
-
-          const [typeAnnotationType, typeDeps] = convertTypeAnnotation(local.typeAnnotation, param, context);
-
-          const resultParam = _hermesTransform.t.ComponentTypeParameter({
-            name: (0, _hermesTransform.asDetachedNode)(param.name),
+          const [optional, _local, [typeAnnotationType, typeDeps]] = extractParamTypeInfo(param, context);
+          const name = (0, _hermesEstree.isStringLiteral)(param.name) && /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(param.name.value) ? _hermesTransform.t.Identifier({
+            name: param.name.value
+          }) : (0, _hermesTransform.asDetachedNode)(param.name);
+          const resultParam = inheritComments(param, _hermesTransform.t.ComponentTypeParameter({
+            name,
             typeAnnotation: typeAnnotationType,
             optional
-          });
-
+          }));
           return [[...resultParams, resultParam], restParam, [...paramsDeps, ...typeDeps]];
         }
 
@@ -1028,21 +1046,71 @@ function convertComponentParameters(params, context) {
           }
 
           const [typeAnnotationType, typeDeps] = convertTypeAnnotation(argument.typeAnnotation, argument, context);
-
-          const resultRestParam = _hermesTransform.t.ComponentTypeParameter({
+          const restName = argument.type === 'Identifier' ? argument.name : 'rest';
+          const restOptional = argument.type === 'Identifier' ? argument.optional : false;
+          const resultRestParam = inheritComments(param, _hermesTransform.t.ComponentTypeParameter({
             name: _hermesTransform.t.Identifier({
-              name: argument.type === 'Identifier' ? argument.name : 'rest'
+              name: restName
             }),
             typeAnnotation: typeAnnotationType,
-            optional: argument.type === 'Identifier' ? argument.optional : false
-          });
-
+            optional: restOptional
+          }));
           return [resultParams, resultRestParam, [...paramsDeps, ...typeDeps]];
         }
     }
   }, [[], null, []]);
 }
 
+function convertComponentParametersToPropsObject(params, context) {
+  const properties = [];
+  const allDeps = [];
+
+  for (const param of params) {
+    if (param.type === 'RestElement') {
+      const argument = param.argument;
+
+      if (argument.type !== 'AssignmentPattern' && argument.type !== 'ArrayPattern' && argument.type !== 'RestElement') {
+        const [typeAnnotationType, typeDeps] = convertTypeAnnotation(argument.typeAnnotation, argument, context);
+        allDeps.push(...typeDeps);
+        properties.push(_hermesTransform.t.ObjectTypeSpreadProperty({
+          argument: typeAnnotationType
+        }));
+      }
+
+      continue;
+    }
+
+    const [optional, _local, [typeAnnotationType, typeDeps]] = extractParamTypeInfo(param, context);
+    allDeps.push(...typeDeps);
+    properties.push(inheritComments(param, _hermesTransform.t.ObjectTypePropertySignature({
+      key: (0, _hermesTransform.asDetachedNode)(param.name),
+      value: typeAnnotationType,
+      optional,
+      static: false,
+      variance: null
+    })));
+  }
+
+  const propsType = _hermesTransform.t.ObjectTypeAnnotation({
+    inexact: false,
+    exact: false,
+    properties,
+    indexers: [],
+    callProperties: [],
+    internalSlots: []
+  });
+
+  const restParam = _hermesTransform.t.ComponentTypeParameter({
+    name: _hermesTransform.t.Identifier({
+      name: 'props'
+    }),
+    typeAnnotation: propsType,
+    optional: false
+  });
+
+  return [[], restParam, allDeps];
+}
+
 function convertHookDeclaration(hook, context) {
   var _hook$returnType;
 
@@ -1055,7 +1123,7 @@ function convertHookDeclaration(hook, context) {
   const [resultParams, restParam, paramsDeps] = convertFunctionParameters(hook.params, context);
   const [resultTypeParams, typeParamsDeps] = convertTypeParameterDeclarationOrNull(hook.typeParameters, context);
 
-  const resultFunc = _hermesTransform.t.FunctionTypeAnnotation({
+  const resultFunc = _hermesTransform.t.HookTypeAnnotation({
     params: resultParams,
     returnType: resultReturnType,
     rest: restParam,
@@ -1200,7 +1268,6 @@ function convertTypeAnnotationType(annot, container, context) {
 
 function convertTypeAnnotationTypeOrNull(annot, context) {
   if (annot == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1209,7 +1276,6 @@ function convertTypeAnnotationTypeOrNull(annot, context) {
 
 function convertTypeParameterDeclarationOrNull(decl, context) {
   if (decl == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1218,7 +1284,6 @@ function convertTypeParameterDeclarationOrNull(decl, context) {
 
 function convertTypeParameterInstantiationOrNull(inst, context) {
   if (inst == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 

package/dist/flowToFlowDef.js.flow

@@ -48,6 +48,7 @@ import type {
   ObjectExpression,
   ObjectTypeAnnotation,
   ObjectTypeProperty,
+  ObjectTypeSpreadProperty,
   OpaqueType,
   QualifiedTypeIdentifier,
   QualifiedTypeofIdentifier,
@@ -88,10 +89,12 @@ import {
   isMemberExpressionWithNonComputedProperty,
 } from 'hermes-estree';
 
-const EMPTY_TRANSLATION_RESULT = [null, []];
+const EMPTY_TRANSLATION_RESULT: TranslatedResultOrNull<empty> = [null, []];
 
 type TranslatedDeps = $ReadOnlyArray<Dep>;
-type TranslatedResultOrNull<T> = [DetachedNode<T> | null, TranslatedDeps];
+type TranslatedResultOrNull<+T> = Readonly<
+  [DetachedNode<T> | null, TranslatedDeps],
+>;
 type TranslatedResultArray<T> = [
   $ReadOnlyArray<DetachedNode<T>>,
   TranslatedDeps,
@@ -1080,7 +1083,6 @@ function convertSuperClass(
   context: TranslationContext,
 ): TranslatedResultOrNull<InterfaceExtends> {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1175,7 +1177,15 @@ function convertClassMember(
     case 'PropertyDefinition': {
       // PrivateIdentifier's are not exposed so can be stripped.
       if (member.key.type === 'PrivateIdentifier') {
-        // $FlowFixMe[incompatible-type]
+        return EMPTY_TRANSLATION_RESULT;
+      }
+      if (
+        context.mungeUnderscores &&
+        member.key.type === 'Identifier' &&
+        member.key.name.length >= 2 &&
+        member.key.name[0] === '_' &&
+        member.key.name[1] !== '_'
+      ) {
         return EMPTY_TRANSLATION_RESULT;
       }
       if (
@@ -1243,7 +1253,15 @@ function convertClassMember(
     case 'MethodDefinition': {
       // PrivateIdentifier's are not exposed so can be stripped.
       if (member.key.type === 'PrivateIdentifier') {
-        // $FlowFixMe[incompatible-type]
+        return EMPTY_TRANSLATION_RESULT;
+      }
+      if (
+        context.mungeUnderscores &&
+        member.key.type === 'Identifier' &&
+        member.key.name.length >= 2 &&
+        member.key.name[0] === '_' &&
+        member.key.name[1] !== '_'
+      ) {
         return EMPTY_TRANSLATION_RESULT;
       }
       if (
@@ -1358,36 +1376,66 @@ type TranslatedComponentParametersResults = [
   TranslatedDeps,
 ];
 
+function hasNonIdentifierStringLiteralParam(
+  params: $ReadOnlyArray<ComponentParameter | RestElement>,
+): boolean {
+  return params.some(
+    param =>
+      param.type === 'ComponentParameter' &&
+      isStringLiteral(param.name) &&
+      !/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(param.name.value),
+  );
+}
+
+function extractParamTypeInfo(
+  param: ComponentParameter,
+  context: TranslationContext,
+): [boolean, BindingName, TranslatedResult<TypeAnnotationType>] {
+  let optional = false;
+  let local = param.local;
+  if (local.type === 'AssignmentPattern') {
+    local = local.left;
+    optional = true;
+  }
+  if (!optional && local.type === 'Identifier') {
+    optional = local.optional;
+  }
+  return [
+    optional,
+    local,
+    convertTypeAnnotation(local.typeAnnotation, param, context),
+  ];
+}
+
 function convertComponentParameters(
   params: $ReadOnlyArray<ComponentParameter | RestElement>,
   context: TranslationContext,
 ): TranslatedComponentParametersResults {
+  if (hasNonIdentifierStringLiteralParam(params)) {
+    return convertComponentParametersToPropsObject(params, context);
+  }
+
   return params.reduce<TranslatedComponentParametersResults>(
     ([resultParams, restParam, paramsDeps], param) => {
       switch (param.type) {
         case 'ComponentParameter': {
-          let optional = false;
-          let local = param.local;
-          if (local.type === 'AssignmentPattern') {
-            local = local.left;
-            optional = true;
-          }
-          if (!optional && local.type === 'Identifier') {
-            optional = local.optional;
-          }
-
-          const [typeAnnotationType, typeDeps] = convertTypeAnnotation(
-            local.typeAnnotation,
+          const [optional, _local, [typeAnnotationType, typeDeps]] =
+            extractParamTypeInfo(param, context);
+
+          const name =
+            isStringLiteral(param.name) &&
+            /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(param.name.value)
+              ? t.Identifier({name: param.name.value})
+              : asDetachedNode(param.name);
+          const resultParam = inheritComments(
             param,
-            context,
+            t.ComponentTypeParameter({
+              name,
+              typeAnnotation: typeAnnotationType,
+              optional,
+            }),
           );
 
-          const resultParam = t.ComponentTypeParameter({
-            name: asDetachedNode(param.name),
-            typeAnnotation: typeAnnotationType,
-            optional,
-          });
-
           return [
             [...resultParams, resultParam],
             restParam,
@@ -1420,14 +1468,18 @@ function convertComponentParameters(
             context,
           );
 
-          const resultRestParam = t.ComponentTypeParameter({
-            name: t.Identifier({
-              name: argument.type === 'Identifier' ? argument.name : 'rest',
+          const restName =
+            argument.type === 'Identifier' ? argument.name : 'rest';
+          const restOptional =
+            argument.type === 'Identifier' ? argument.optional : false;
+          const resultRestParam = inheritComments(
+            param,
+            t.ComponentTypeParameter({
+              name: t.Identifier({name: restName}),
+              typeAnnotation: typeAnnotationType,
+              optional: restOptional,
             }),
-            typeAnnotation: typeAnnotationType,
-            optional:
-              argument.type === 'Identifier' ? argument.optional : false,
-          });
+          );
 
           return [resultParams, resultRestParam, [...paramsDeps, ...typeDeps]];
         }
@@ -1437,6 +1489,72 @@ function convertComponentParameters(
   );
 }
 
+function convertComponentParametersToPropsObject(
+  params: $ReadOnlyArray<ComponentParameter | RestElement>,
+  context: TranslationContext,
+): TranslatedComponentParametersResults {
+  const properties: Array<
+    DetachedNode<ObjectTypeProperty | ObjectTypeSpreadProperty>,
+  > = [];
+  const allDeps: Array<Dep> = [];
+
+  for (const param of params) {
+    if (param.type === 'RestElement') {
+      const argument = param.argument;
+      if (
+        argument.type !== 'AssignmentPattern' &&
+        argument.type !== 'ArrayPattern' &&
+        argument.type !== 'RestElement'
+      ) {
+        const [typeAnnotationType, typeDeps] = convertTypeAnnotation(
+          argument.typeAnnotation,
+          argument,
+          context,
+        );
+        allDeps.push(...typeDeps);
+        properties.push(
+          t.ObjectTypeSpreadProperty({argument: typeAnnotationType}),
+        );
+      }
+      continue;
+    }
+
+    const [optional, _local, [typeAnnotationType, typeDeps]] =
+      extractParamTypeInfo(param, context);
+    allDeps.push(...typeDeps);
+
+    properties.push(
+      inheritComments(
+        param,
+        t.ObjectTypePropertySignature({
+          key: asDetachedNode(param.name),
+          value: typeAnnotationType,
+          optional,
+          static: false,
+          variance: null,
+        }),
+      ),
+    );
+  }
+
+  const propsType = t.ObjectTypeAnnotation({
+    inexact: false,
+    exact: false,
+    properties,
+    indexers: [],
+    callProperties: [],
+    internalSlots: [],
+  });
+
+  const restParam = t.ComponentTypeParameter({
+    name: t.Identifier({name: 'props'}),
+    typeAnnotation: propsType,
+    optional: false,
+  });
+
+  return [[], restParam, allDeps];
+}
+
 function convertHookDeclaration(
   hook: HookDeclaration,
   context: TranslationContext,
@@ -1461,7 +1579,7 @@ function convertHookDeclaration(
   const [resultTypeParams, typeParamsDeps] =
     convertTypeParameterDeclarationOrNull(hook.typeParameters, context);
 
-  const resultFunc = t.FunctionTypeAnnotation({
+  const resultFunc = t.HookTypeAnnotation({
     params: resultParams,
     returnType: resultReturnType,
     rest: restParam,
@@ -1732,7 +1850,6 @@ function convertTypeAnnotationTypeOrNull(
   context: TranslationContext,
 ): TranslatedResultOrNull<TypeAnnotationType> {
   if (annot == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1743,7 +1860,6 @@ function convertTypeParameterDeclarationOrNull(
   context: TranslationContext,
 ): TranslatedResultOrNull<TypeParameterDeclaration> {
   if (decl == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
   return [asDetachedNode(decl), analyzeTypeDependencies(decl, context)];
@@ -1753,7 +1869,6 @@ function convertTypeParameterInstantiationOrNull(
   context: TranslationContext,
 ): TranslatedResultOrNull<TypeParameterInstantiation> {
   if (inst == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
   return [asDetachedNode(inst), analyzeTypeDependencies(inst, context)];

package/dist/index.js

@@ -37,13 +37,14 @@ var _TSDefToFlowDef = require("./TSDefToFlowDef");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function translateFlowToFlowDef(code, prettierOptions = {}) {
+async function translateFlowToFlowDef(code, prettierOptions = {}, opts) {
   const {
     ast,
     scopeManager
   } = await (0, _hermesTransform.parse)(code);
   const [flowDefAst, mutatedCode] = (0, _flowToFlowDef.default)(ast, code, scopeManager, {
-    recoverFromErrors: true
+    recoverFromErrors: true,
+    mungeUnderscores: opts == null ? void 0 : opts.mungeUnderscores
   });
   return (0, _hermesTransform.print)(flowDefAst, mutatedCode, prettierOptions);
 }

package/dist/index.js.flow

@@ -24,11 +24,13 @@ import {TSDefToFlowDef} from './TSDefToFlowDef';
 export async function translateFlowToFlowDef(
   code: string,
   prettierOptions: {...} = {},
+  opts?: {mungeUnderscores?: boolean},
 ): Promise<string> {
   const {ast, scopeManager} = await parse(code);
 
   const [flowDefAst, mutatedCode] = flowToFlowDef(ast, code, scopeManager, {
     recoverFromErrors: true,
+    mungeUnderscores: opts?.mungeUnderscores,
   });
 
   return print(flowDefAst, mutatedCode, prettierOptions);

package/dist/src/flowToFlowDef.js

@@ -827,7 +827,6 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeArgum
 
 function convertSuperClass(superClass, superTypeArguments, context) {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -889,7 +888,10 @@ function convertClassMember(member, context) {
 
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-type]
+          return EMPTY_TRANSLATION_RESULT;
+        }
+
+        if (context.mungeUnderscores && member.key.type === 'Identifier' && member.key.name.length >= 2 && member.key.name[0] === '_' && member.key.name[1] !== '_') {
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -924,7 +926,10 @@ function convertClassMember(member, context) {
       {
         // PrivateIdentifier's are not exposed so can be stripped.
         if (member.key.type === 'PrivateIdentifier') {
-          // $FlowFixMe[incompatible-type]
+          return EMPTY_TRANSLATION_RESULT;
+        }
+
+        if (context.mungeUnderscores && member.key.type === 'Identifier' && member.key.name.length >= 2 && member.key.name[0] === '_' && member.key.name[1] !== '_') {
           return EMPTY_TRANSLATION_RESULT;
         }
 
@@ -987,31 +992,44 @@ function convertComponentDeclaration(comp, context) {
   }), [...typeParamsDeps, ...paramsAndRestDeps, ...rendersTypeDeps]];
 }
 
+function hasNonIdentifierStringLiteralParam(params) {
+  return params.some(param => param.type === 'ComponentParameter' && (0, _hermesEstree.isStringLiteral)(param.name) && !/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(param.name.value));
+}
+
+function extractParamTypeInfo(param, context) {
+  let optional = false;
+  let local = param.local;
+
+  if (local.type === 'AssignmentPattern') {
+    local = local.left;
+    optional = true;
+  }
+
+  if (!optional && local.type === 'Identifier') {
+    optional = local.optional;
+  }
+
+  return [optional, local, convertTypeAnnotation(local.typeAnnotation, param, context)];
+}
+
 function convertComponentParameters(params, context) {
+  if (hasNonIdentifierStringLiteralParam(params)) {
+    return convertComponentParametersToPropsObject(params, context);
+  }
+
   return params.reduce(([resultParams, restParam, paramsDeps], param) => {
     switch (param.type) {
       case 'ComponentParameter':
         {
-          let optional = false;
-          let local = param.local;
-
-          if (local.type === 'AssignmentPattern') {
-            local = local.left;
-            optional = true;
-          }
-
-          if (!optional && local.type === 'Identifier') {
-            optional = local.optional;
-          }
-
-          const [typeAnnotationType, typeDeps] = convertTypeAnnotation(local.typeAnnotation, param, context);
-
-          const resultParam = _hermesTransform.t.ComponentTypeParameter({
-            name: (0, _hermesTransform.asDetachedNode)(param.name),
+          const [optional, _local, [typeAnnotationType, typeDeps]] = extractParamTypeInfo(param, context);
+          const name = (0, _hermesEstree.isStringLiteral)(param.name) && /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(param.name.value) ? _hermesTransform.t.Identifier({
+            name: param.name.value
+          }) : (0, _hermesTransform.asDetachedNode)(param.name);
+          const resultParam = inheritComments(param, _hermesTransform.t.ComponentTypeParameter({
+            name,
             typeAnnotation: typeAnnotationType,
             optional
-          });
-
+          }));
           return [[...resultParams, resultParam], restParam, [...paramsDeps, ...typeDeps]];
         }
 
@@ -1028,21 +1046,71 @@ function convertComponentParameters(params, context) {
           }
 
           const [typeAnnotationType, typeDeps] = convertTypeAnnotation(argument.typeAnnotation, argument, context);
-
-          const resultRestParam = _hermesTransform.t.ComponentTypeParameter({
+          const restName = argument.type === 'Identifier' ? argument.name : 'rest';
+          const restOptional = argument.type === 'Identifier' ? argument.optional : false;
+          const resultRestParam = inheritComments(param, _hermesTransform.t.ComponentTypeParameter({
             name: _hermesTransform.t.Identifier({
-              name: argument.type === 'Identifier' ? argument.name : 'rest'
+              name: restName
             }),
             typeAnnotation: typeAnnotationType,
-            optional: argument.type === 'Identifier' ? argument.optional : false
-          });
-
+            optional: restOptional
+          }));
           return [resultParams, resultRestParam, [...paramsDeps, ...typeDeps]];
         }
     }
   }, [[], null, []]);
 }
 
+function convertComponentParametersToPropsObject(params, context) {
+  const properties = [];
+  const allDeps = [];
+
+  for (const param of params) {
+    if (param.type === 'RestElement') {
+      const argument = param.argument;
+
+      if (argument.type !== 'AssignmentPattern' && argument.type !== 'ArrayPattern' && argument.type !== 'RestElement') {
+        const [typeAnnotationType, typeDeps] = convertTypeAnnotation(argument.typeAnnotation, argument, context);
+        allDeps.push(...typeDeps);
+        properties.push(_hermesTransform.t.ObjectTypeSpreadProperty({
+          argument: typeAnnotationType
+        }));
+      }
+
+      continue;
+    }
+
+    const [optional, _local, [typeAnnotationType, typeDeps]] = extractParamTypeInfo(param, context);
+    allDeps.push(...typeDeps);
+    properties.push(inheritComments(param, _hermesTransform.t.ObjectTypePropertySignature({
+      key: (0, _hermesTransform.asDetachedNode)(param.name),
+      value: typeAnnotationType,
+      optional,
+      static: false,
+      variance: null
+    })));
+  }
+
+  const propsType = _hermesTransform.t.ObjectTypeAnnotation({
+    inexact: false,
+    exact: false,
+    properties,
+    indexers: [],
+    callProperties: [],
+    internalSlots: []
+  });
+
+  const restParam = _hermesTransform.t.ComponentTypeParameter({
+    name: _hermesTransform.t.Identifier({
+      name: 'props'
+    }),
+    typeAnnotation: propsType,
+    optional: false
+  });
+
+  return [[], restParam, allDeps];
+}
+
 function convertHookDeclaration(hook, context) {
   var _hook$returnType;
 
@@ -1055,7 +1123,7 @@ function convertHookDeclaration(hook, context) {
   const [resultParams, restParam, paramsDeps] = convertFunctionParameters(hook.params, context);
   const [resultTypeParams, typeParamsDeps] = convertTypeParameterDeclarationOrNull(hook.typeParameters, context);
 
-  const resultFunc = _hermesTransform.t.FunctionTypeAnnotation({
+  const resultFunc = _hermesTransform.t.HookTypeAnnotation({
     params: resultParams,
     returnType: resultReturnType,
     rest: restParam,
@@ -1200,7 +1268,6 @@ function convertTypeAnnotationType(annot, container, context) {
 
 function convertTypeAnnotationTypeOrNull(annot, context) {
   if (annot == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1209,7 +1276,6 @@ function convertTypeAnnotationTypeOrNull(annot, context) {
 
 function convertTypeParameterDeclarationOrNull(decl, context) {
   if (decl == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1218,7 +1284,6 @@ function convertTypeParameterDeclarationOrNull(decl, context) {
 
 function convertTypeParameterInstantiationOrNull(inst, context) {
   if (inst == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 

package/dist/src/index.js

@@ -37,13 +37,14 @@ var _TSDefToFlowDef = require("./TSDefToFlowDef");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function translateFlowToFlowDef(code, prettierOptions = {}) {
+async function translateFlowToFlowDef(code, prettierOptions = {}, opts) {
   const {
     ast,
     scopeManager
   } = await (0, _hermesTransform.parse)(code);
   const [flowDefAst, mutatedCode] = (0, _flowToFlowDef.default)(ast, code, scopeManager, {
-    recoverFromErrors: true
+    recoverFromErrors: true,
+    mungeUnderscores: opts == null ? void 0 : opts.mungeUnderscores
   });
   return (0, _hermesTransform.print)(flowDefAst, mutatedCode, prettierOptions);
 }

package/dist/src/utils/TranslationUtils.js

@@ -15,7 +15,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.createTranslationContext = createTranslationContext;
 
 function createTranslationContext(code, scopeManager, {
-  recoverFromErrors
+  recoverFromErrors,
+  mungeUnderscores = true
 }) {
   const referenceMap = new Map();
   const variableMap = new Map();
@@ -37,6 +38,7 @@ function createTranslationContext(code, scopeManager, {
     referenceMap,
     variableMap,
     recoverFromErrors,
+    mungeUnderscores,
     code
   };
 }

package/dist/utils/TranslationUtils.js

@@ -15,7 +15,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.createTranslationContext = createTranslationContext;
 
 function createTranslationContext(code, scopeManager, {
-  recoverFromErrors
+  recoverFromErrors,
+  mungeUnderscores = true
 }) {
   const referenceMap = new Map();
   const variableMap = new Map();
@@ -37,6 +38,7 @@ function createTranslationContext(code, scopeManager, {
     referenceMap,
     variableMap,
     recoverFromErrors,
+    mungeUnderscores,
     code
   };
 }

package/dist/utils/TranslationUtils.js.flow

@@ -14,19 +14,23 @@ import type {Identifier, JSXIdentifier} from 'hermes-estree';
 import type {ScopeManager, Variable} from 'hermes-eslint';
 
 export type Dep = string;
-export type TranslationOptions = {recoverFromErrors: boolean};
+export type TranslationOptions = {
+  recoverFromErrors: boolean,
+  mungeUnderscores?: boolean,
+};
 export type TranslationContext = {
   scopeManager: ScopeManager,
   referenceMap: Map<Identifier | JSXIdentifier, Variable>,
   variableMap: Map<Dep, Variable>,
   recoverFromErrors: boolean,
+  mungeUnderscores: boolean,
   code: string,
 };
 
 export function createTranslationContext(
   code: string,
   scopeManager: ScopeManager,
-  {recoverFromErrors}: TranslationOptions,
+  {recoverFromErrors, mungeUnderscores = true}: TranslationOptions,
 ): TranslationContext {
   const referenceMap = new Map<Identifier | JSXIdentifier, Variable>();
   const variableMap = new Map<Dep, Variable>();
@@ -40,5 +44,12 @@ export function createTranslationContext(
       variableMap.set(variable.name, variable);
     }
   }
-  return {scopeManager, referenceMap, variableMap, recoverFromErrors, code};
+  return {
+    scopeManager,
+    referenceMap,
+    variableMap,
+    recoverFromErrors,
+    mungeUnderscores,
+    code,
+  };
 }

package/package.json

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