more ts fixes

Author: danez

packages/react-docgen/package.json

@@ -38,6 +38,7 @@
     "@babel/core": "^7.18.9",
     "@babel/traverse": "^7.18.9",
     "@babel/types": "^7.18.9",
+    "@types/babel__core": "^7.18.0",
     "@types/babel__traverse": "^7.18.0",
     "@types/doctrine": "^0.0.5",
     "@types/resolve": "^1.20.2",

packages/react-docgen/src/babelParser.ts

@@ -3,19 +3,16 @@ import { loadPartialConfig, parseSync } from '@babel/core';
 import type { File } from '@babel/types';
 import { extname } from 'path';
 
-const TYPESCRIPT_EXTS = {
-  '.cts': true,
-  '.mts': true,
-  '.ts': true,
-  '.tsx': true,
-};
+const TYPESCRIPT_EXTS = new Set(['.cts', '.mts', '.ts', '.tsx']);
 
 function getDefaultPlugins(
   options: TransformOptions,
 ): NonNullable<ParserOptions['plugins']> {
   return [
     'jsx',
-    TYPESCRIPT_EXTS[extname(options.filename || '')] ? 'typescript' : 'flow',
+    options.filename && TYPESCRIPT_EXTS.has(extname(options.filename))
+      ? 'typescript'
+      : 'flow',
     'asyncDoExpressions',
     'decimal',
     ['decorators', { decoratorsBeforeExport: false }],
@@ -87,5 +84,5 @@ export default function babelParser(
     throw new Error('Unable to parse source code.');
   }
 
-  return ast;
+  return ast as File;
 }

packages/react-docgen/src/utils/getFlowType.ts

@@ -391,7 +391,7 @@ function handleTypeofTypeAnnotation(
   return getFlowTypeWithResolvedTypes(path.get('argument'), typeParams);
 }
 
-let visitedTypes = {};
+let visitedTypes: Record<string, TypeDescriptor | boolean> = {};
 
 function getFlowTypeWithResolvedTypes(
   path: NodePath<FlowType>,
@@ -405,13 +405,15 @@ function getFlowTypeWithResolvedTypes(
   // When we see a TypeAlias mark it as visited so that the next
   // call of this function does not run into an endless loop
   if (isTypeAlias) {
-    if (visitedTypes[parent.node.id.name] === true) {
+    const visitedType = visitedTypes[parent.node.id.name];
+
+    if (visitedType === true) {
       // if we are currently visiting this node then just return the name
       // as we are starting to endless loop
       return { name: parent.node.id.name };
-    } else if (typeof visitedTypes[parent.node.id.name] === 'object') {
+    } else if (typeof visitedType === 'object') {
       // if we already resolved the type simple return it
-      return visitedTypes[parent.node.id.name];
+      return visitedType;
     }
     // mark the type as visited
     visitedTypes[parent.node.id.name] = true;