flow-api-translator 0.36.0 → 0.37.0

package/dist/src/flowImportTo.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {

package/dist/src/flowToFlowDef.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -49,7 +40,6 @@ function getTopLevelStatement(node, context) {
     var _currentNode$parent;
 
     if (((_currentNode$parent = currentNode.parent) == null ? void 0 : _currentNode$parent.type) === 'Program') {
-      // $FlowFixMe[incompatible-type]
       return currentNode;
     }
 
@@ -60,20 +50,10 @@ function getTopLevelStatement(node, context) {
 }
 
 function transferProgramStatementProperties(stmt, orgStmt) {
-  // $FlowExpectedError[prop-missing]
-  // $FlowExpectedError[incompatible-use]
-  stmt.comments = orgStmt.comments; // $FlowExpectedError[incompatible-use]
-
-  stmt.range = orgStmt.range; // $FlowExpectedError[incompatible-use]
-
+  stmt.comments = orgStmt.comments;
+  stmt.range = orgStmt.range;
   stmt.loc = orgStmt.loc;
 }
-/**
- * Consume an arbitrary Flow AST and convert it into a type definition file.
- *
- * To do this all runtime logic will be stripped and only types that describe the module boundary will remain.
- */
-
 
 function flowToFlowDef(ast, code, scopeManager, opts) {
   var _ast$interpreter$valu, _ast$interpreter;
@@ -123,8 +103,7 @@ function flowToFlowDef(ast, code, scopeManager, opts) {
   function updateProcessedStatement(stmt) {
     processedStatements.add(stmt);
     pendingStatements.delete(stmt);
-  } // Process all export statements
-
+  }
 
   for (const stmt of ast.body) {
     const resultExport = convertExport(stmt, context);
@@ -203,14 +182,11 @@ function convertExport(stmt, context) {
         if (expr.type === 'AssignmentExpression' && expr.left.type === 'MemberExpression') {
           const member = expr.left;
 
-          if ( // exports.A = 1;
-          member.object.type === 'Identifier' && member.object.name === 'exports' || // module.exports.A = 1;
-          member.object.type === 'MemberExpression' && member.object.object.type === 'Identifier' && member.object.object.name === 'module' && member.object.property.type === 'Identifier' && member.object.property.name === 'exports') {
+          if (member.object.type === 'Identifier' && member.object.name === 'exports' || member.object.type === 'MemberExpression' && member.object.object.type === 'Identifier' && member.object.object.name === 'module' && member.object.property.type === 'Identifier' && member.object.property.name === 'exports') {
             throw (0, _ErrorUtils.translationError)(stmt, `convertExport: Named CommonJS exports not supported. Use either \`module.exports = {...}\` or ES6 exports.`, context);
           }
 
-          if ( // exports.A = 1;
-          member.object.type === 'Identifier' && member.object.name === 'module' && member.property.type === 'Identifier' && member.property.name === 'exports') {
+          if (member.object.type === 'Identifier' && member.object.name === 'module' && member.property.type === 'Identifier' && member.property.name === 'exports') {
             const [typeAnnotation, deps] = convertExpressionToTypeAnnotation(expr.right, context);
             return [_hermesTransform.t.DeclareModuleExports({
               typeAnnotation: _hermesTransform.t.TypeAnnotation({
@@ -225,14 +201,12 @@ function convertExport(stmt, context) {
 
     default:
       {
-        // Skip non exported functions
         return null;
       }
   }
 }
 
 function stripUnusedDefs(detachedStmt, usedDeps, context) {
-  // $FlowExpectedError[incompatible-type]
   const stmt = detachedStmt;
 
   switch (stmt.type) {
@@ -315,6 +289,12 @@ function convertStatement(stmt, context) {
 
     case 'VariableDeclaration':
       {
+        const requireImport = convertRequireToImport(stmt);
+
+        if (requireImport != null) {
+          return requireImport;
+        }
+
         const [result, deps] = convertVariableDeclaration(stmt, context);
         return [result, deps];
       }
@@ -396,7 +376,6 @@ function convertExpressionToTypeAnnotation(expr, context) {
 }
 
 function inheritComments(fromNode, toNode) {
-  // $FlowFixMe[unclear-type]
   toNode.comments = fromNode.comments;
   return toNode;
 }
@@ -425,7 +404,6 @@ function convertObjectExpression(expr, context) {
 
             const [resultExpr, deps] = convertAFunction(prop.value, context);
             return [inheritComments(prop, _hermesTransform.t.ObjectTypeMethodSignature({
-              // $FlowFixMe[incompatible-type]
               key: (0, _hermesTransform.asDetachedNode)(prop.key),
               value: resultExpr
             })), deps];
@@ -439,7 +417,6 @@ function convertObjectExpression(expr, context) {
             const kind = prop.kind;
             const [resultExpr, deps] = convertAFunction(prop.value, context);
             return [inheritComments(prop, _hermesTransform.t.ObjectTypeAccessorSignature({
-              // $FlowFixMe[incompatible-type]
               key: (0, _hermesTransform.asDetachedNode)(prop.key),
               kind,
               value: resultExpr
@@ -448,7 +425,6 @@ function convertObjectExpression(expr, context) {
 
           const [resultExpr, deps] = convertExpressionToTypeAnnotation(prop.value, context);
           return [inheritComments(prop, _hermesTransform.t.ObjectTypePropertySignature({
-            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(prop.key),
             value: resultExpr,
             optional: false,
@@ -726,6 +702,76 @@ function convertVariableDeclaration(stmt, context) {
   }), annotDeps];
 }
 
+function convertRequireToImport(stmt) {
+  if (stmt.declarations.length !== 1) {
+    return null;
+  }
+
+  const decl = stmt.declarations[0];
+  const init = decl.init;
+
+  if (init == null || init.type !== 'CallExpression' || init.callee.type !== 'Identifier' || init.callee.name !== 'require' || init.arguments.length !== 1) {
+    return null;
+  }
+
+  const sourceArg = init.arguments[0];
+
+  if (!(0, _hermesEstree.isStringLiteral)(sourceArg)) {
+    return null;
+  }
+
+  const id = decl.id;
+
+  if (id.type === 'Identifier') {
+    return [_hermesTransform.t.ImportDeclaration({
+      importKind: 'value',
+      source: (0, _hermesTransform.asDetachedNode)(sourceArg),
+      specifiers: [_hermesTransform.t.ImportDefaultSpecifier({
+        local: _hermesTransform.t.Identifier({
+          name: id.name
+        })
+      })],
+      attributes: []
+    }), []];
+  }
+
+  if (id.type === 'ObjectPattern') {
+    const specifiers = [];
+
+    for (const prop of id.properties) {
+      if (prop.type === 'RestElement') {
+        return null;
+      }
+
+      const key = prop.key;
+      const value = prop.value;
+
+      if (key.type !== 'Identifier' || value.type !== 'Identifier') {
+        return null;
+      }
+
+      specifiers.push(_hermesTransform.t.ImportSpecifier({
+        imported: _hermesTransform.t.Identifier({
+          name: key.name
+        }),
+        local: _hermesTransform.t.Identifier({
+          name: value.name
+        }),
+        importKind: null
+      }));
+    }
+
+    return [_hermesTransform.t.ImportDeclaration({
+      importKind: 'value',
+      source: (0, _hermesTransform.asDetachedNode)(sourceArg),
+      specifiers,
+      attributes: []
+    }), []];
+  }
+
+  return null;
+}
+
 function convertImportDeclaration(stmt, context) {
   if (stmt.attributes.length > 0) {
     throw (0, _ErrorUtils.translationError)(stmt, 'ImportDeclaration: attributes not supported', context);
@@ -754,7 +800,6 @@ function convertClassDeclaration(class_, context) {
   }
 
   return [_hermesTransform.t.DeclareClass({
-    // $FlowFixMe[incompatible-type]
     id: (0, _hermesTransform.asDetachedNode)(class_.id),
     typeParameters: resultTypeParams,
     implements: class_.implements.map(impl => (0, _hermesTransform.asDetachedNode)(impl)),
@@ -827,7 +872,6 @@ function convertSuperClassHelper(detachedId, nodeForDependencies, superTypeArgum
 
 function convertSuperClass(superClass, superTypeArguments, context) {
   if (superClass == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -887,9 +931,11 @@ function convertClassMember(member, context) {
       {
         var _member$value;
 
-        // 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;
         }
 
@@ -900,7 +946,6 @@ 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-type]
             key: (0, _hermesTransform.asDetachedNode)(member.key),
             value: resultTypeAnnotation,
             optional: member.optional,
@@ -911,7 +956,6 @@ function convertClassMember(member, context) {
 
         const [resultTypeAnnotation, deps] = convertTypeAnnotation(member.typeAnnotation, member, context);
         return [inheritComments(member, _hermesTransform.t.ObjectTypePropertySignature({
-          // $FlowFixMe[incompatible-type]
           key: (0, _hermesTransform.asDetachedNode)(member.key),
           value: resultTypeAnnotation,
           optional: member.optional,
@@ -922,9 +966,11 @@ function convertClassMember(member, context) {
 
     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;
         }
 
@@ -938,10 +984,8 @@ function convertClassMember(member, context) {
         }) : member.key;
 
         if (member.kind === 'get' || member.kind === 'set') {
-          // accessors are methods - but flow accessor signatures are properties
           const kind = member.kind;
           return [inheritComments(member, _hermesTransform.t.ObjectTypeAccessorSignature({
-            // $FlowFixMe[incompatible-type]
             key: (0, _hermesTransform.asDetachedNode)(newKey),
             value: resultValue,
             static: member.static,
@@ -950,7 +994,6 @@ function convertClassMember(member, context) {
         }
 
         return [inheritComments(member, _hermesTransform.t.ObjectTypeMethodSignature({
-          // $FlowFixMe[incompatible-type]
           key: (0, _hermesTransform.asDetachedNode)(newKey),
           value: resultValue,
           static: member.static
@@ -987,31 +1030,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,34 +1084,83 @@ 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;
 
   const id = hook.id;
-  const returnType = (_hook$returnType = hook.returnType) != null ? _hook$returnType : // $FlowFixMe[incompatible-type]
-  _hermesTransform.t.TypeAnnotation({
+  const returnType = (_hook$returnType = hook.returnType) != null ? _hook$returnType : _hermesTransform.t.TypeAnnotation({
     typeAnnotation: _hermesTransform.t.VoidTypeAnnotation()
   });
   const [resultReturnType, returnDeps] = convertTypeAnnotation(returnType, 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,
@@ -1138,8 +1243,7 @@ function convertFunctionParameters(params, context) {
             throw (0, _ErrorUtils.translationError)(param, `FunctionParameter: Multiple rest elements found`, context);
           }
 
-          const [resultParam, deps] = convertBindingNameToFunctionTypeParam( // $FlowFixMe[incompatible-type] I dont think these other cases are possible
-          param.argument, context, index, false);
+          const [resultParam, deps] = convertBindingNameToFunctionTypeParam(param.argument, context, index, false);
           return [resultParams, resultParam, [...paramsDeps, ...deps]];
         }
     }
@@ -1200,7 +1304,6 @@ function convertTypeAnnotationType(annot, container, context) {
 
 function convertTypeAnnotationTypeOrNull(annot, context) {
   if (annot == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1209,7 +1312,6 @@ function convertTypeAnnotationTypeOrNull(annot, context) {
 
 function convertTypeParameterDeclarationOrNull(decl, context) {
   if (decl == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 
@@ -1218,7 +1320,6 @@ function convertTypeParameterDeclarationOrNull(decl, context) {
 
 function convertTypeParameterInstantiationOrNull(inst, context) {
   if (inst == null) {
-    // $FlowFixMe[incompatible-type]
     return EMPTY_TRANSLATION_RESULT;
   }
 

package/dist/src/flowToJS.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {

package/dist/src/index.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -37,13 +28,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);
 }
@@ -61,8 +53,7 @@ async function translateFlowDefToTSDef(code, prettierOptions = {}) {
   const [tsAST, mutatedCode] = (0, _flowDefToTSDef.flowDefToTSDef)(code, ast, scopeManager, {
     recoverFromErrors: true
   });
-  return (0, _hermesTransform.print)( // $FlowExpectedError[incompatible-type] - this is fine as we're providing the visitor keys
-  tsAST, mutatedCode, { ...prettierOptions
+  return (0, _hermesTransform.print)(tsAST, mutatedCode, { ...prettierOptions
   }, _visitorKeys.visitorKeys);
 }
 
@@ -74,18 +65,6 @@ async function translateFlowToJS(code, prettierOptions = {}) {
   const jsAST = (0, _flowToJS.flowToJS)(ast, code, scopeManager);
   return (0, _hermesTransform.print)(jsAST, code, prettierOptions);
 }
-/**
- * This translator is very experimental and unstable.
- *
- * It is not written with productionizing it in mind, but instead used to evaluate how close Flow
- * is to TypeScript.
- *
- * If you are going to use it anyways, you agree that you are calling a potentially broken function
- * without any guarantee.
- *
- * @deprecated
- */
-
 
 async function unstable_translateTSDefToFlowDef(code, prettierOptions = {}) {
   const ast = (0, _parser.parse)(code, {

package/dist/src/utils/DocblockUtils.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -21,7 +12,6 @@ function removeAtFlowFromDocblock(docblock) {
   }
 
   return {
-    // $FlowExpectedError[cannot-spread-interface]
     comment: { ...docblock.comment,
       value: docblock.comment.value.replace(FLOW_DIRECTIVE, '')
     },

package/dist/src/utils/ErrorUtils.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -37,18 +28,7 @@ function flowFixMeOrError(container, message, context) {
 class TranslationErrorBase extends Error {
   constructor(node, message, context) {
     const framedMessage = buildCodeFrame(node, message, context.code);
-    super( // jest error snapshots will use a hard-coded string representation if
-    // `instanceof Error` which makes the code frame look awful and hard to verify:
-    //
-    // [TranslationError: > 12 | code
-    //       | ^^^^ error]
-    //
-    // this just adds a newline in jest tests so that it all lines up nicely
-    //
-    // [TranslationError:
-    // > 12 | code
-    //      | ^^^^ error]
-    process.env.JEST_WORKER_ID == null ? framedMessage : `\n${framedMessage}`);
+    super(process.env.JEST_WORKER_ID == null ? framedMessage : `\n${framedMessage}`);
     this.name = 'TranslationError';
   }
 
@@ -83,7 +63,6 @@ function unexpectedTranslationError(node, message, context) {
 }
 
 function buildCodeFrame(node, message, code, highlightCode = process.env.NODE_ENV !== 'test') {
-  // babel uses 1-indexed columns
   const locForBabel = {
     start: {
       line: node.loc.start.line,

package/dist/src/utils/FlowAnalyze.js

@@ -1,12 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -24,9 +15,7 @@ function analyzeFunctionReturn(func) {
 
   if (returnType != null) {
     return returnType;
-  } // We trust Flow has validated this function to only return void
-  // $FlowFixMe[incompatible-type]
-
+  }
 
   return _hermesTransform.t.TypeAnnotation({
     typeAnnotation: _hermesTransform.t.VoidTypeAnnotation()
@@ -43,6 +32,8 @@ function analyzeTypeDependencies(rootNode, context) {
 
         if (variable != null) {
           deps.push(variable.name);
+        } else if (context.variableMap.has(node.name)) {
+          deps.push(node.name);
         }
       }
     },