@atlaspack/transformer-typescript-types 2.14.5-canary.24 → 2.14.5-canary.241

package/lib/shake.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shake = shake;
-var _TSModule = require("./TSModule");
 function _typescript() {
   const data = _interopRequireDefault(require("typescript"));
   _typescript = function () {
@@ -43,6 +42,7 @@ function shake(moduleGraph, context, sourceFile) {
   let _currentModule;
   let visit = node => {
     if (_typescript().default.isBundle(node)) {
+      // @ts-expect-error TS2345
       return factory.updateBundle(node, _typescript().default.visitNodes(node.sourceFiles, visit));
     }
 
@@ -53,14 +53,19 @@ function shake(moduleGraph, context, sourceFile) {
         var _node$modifiers$;
         // Since we are hoisting them to the top-level scope, we need to add a "declare" keyword to make them ambient.
         // we also want the declare keyword to come after the export keyword to guarantee a valid typings file.
+        // @ts-expect-error TS2540
         node.modifiers ??= [];
-        const index = ((_node$modifiers$ = node.modifiers[0]) === null || _node$modifiers$ === void 0 ? void 0 : _node$modifiers$.kind) === _typescript().default.SyntaxKind.ExportKeyword ? 1 : 0;
+        const index =
+        // @ts-expect-error TS18048
+        ((_node$modifiers$ = node.modifiers[0]) === null || _node$modifiers$ === void 0 ? void 0 : _node$modifiers$.kind) === _typescript().default.SyntaxKind.ExportKeyword ? 1 : 0;
+        // @ts-expect-error TS18048
         node.modifiers.splice(index, 0, factory.createModifier(_typescript().default.SyntaxKind.DeclareKeyword));
         return node;
       }
       moduleStack.push(_currentModule);
       let isFirstModule = !_currentModule;
       _currentModule = moduleGraph.getModule(node.name.text);
+      // @ts-expect-error TS2532
       let statements = _typescript().default.visitEachChild(node, visit, context).body.statements;
       _currentModule = moduleStack.pop();
       if (isFirstModule && !addedGeneratedImports) {
@@ -80,10 +85,13 @@ function shake(moduleGraph, context, sourceFile) {
     let currentModule = (0, _nullthrows().default)(_currentModule);
     // Remove exports from flattened modules
     if (_typescript().default.isExportDeclaration(node)) {
-      if (!node.moduleSpecifier || moduleGraph.getModule(node.moduleSpecifier.text)) {
+      if (!node.moduleSpecifier ||
+      // @ts-expect-error TS2339
+      moduleGraph.getModule(node.moduleSpecifier.text)) {
         if (!node.moduleSpecifier && node.exportClause) {
           // Filter exported elements to only external re-exports
           let exported = [];
+          // @ts-expect-error TS2339
           for (let element of node.exportClause.elements) {
             let name = (element.propertyName ?? element.name).text;
             if (exportedNames.get(name) === currentModule && !currentModule.hasBinding(name)) {
@@ -122,7 +130,9 @@ function shake(moduleGraph, context, sourceFile) {
       }
 
       // Remove original export modifiers
-      node.modifiers = (node.modifiers || []).filter(m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DefaultKeyword);
+      node.modifiers = (node.modifiers || []).filter(
+      // @ts-expect-error TS7006
+      m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DefaultKeyword);
 
       // Rename declarations
       let newName = currentModule.getName(name);
@@ -137,6 +147,7 @@ function shake(moduleGraph, context, sourceFile) {
         }
         node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.ExportKeyword));
       } else if (_typescript().default.isFunctionDeclaration(node) || _typescript().default.isClassDeclaration(node)) {
+        // @ts-expect-error TS18048
         node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.DeclareKeyword));
       }
     }
@@ -149,10 +160,14 @@ function shake(moduleGraph, context, sourceFile) {
       }
 
       // Remove original export modifiers
-      node.modifiers = (node.modifiers || []).filter(m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DeclareKeyword);
+      node.modifiers = (node.modifiers || []).filter(
+      // @ts-expect-error TS7006
+      m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DeclareKeyword);
 
       // Add export modifier if all declarations are exported.
-      let isExported = node.declarationList.declarations.every(d => exportedNames.get(d.name.text) === currentModule);
+      let isExported = node.declarationList.declarations.every(
+      // @ts-expect-error TS7006
+      d => exportedNames.get(d.name.text) === currentModule);
       if (isExported) {
         node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.ExportKeyword));
       } else {
@@ -163,6 +178,7 @@ function shake(moduleGraph, context, sourceFile) {
     }
     if (_typescript().default.isVariableDeclaration(node)) {
       // Remove unused variables
+      // @ts-expect-error TS2339
       if (!currentModule.used.has(node.name.text)) {
         return null;
       }
@@ -198,10 +214,12 @@ function shake(moduleGraph, context, sourceFile) {
   return _typescript().default.visitNode(sourceFile, visit);
 }
 function generateImports(factory, moduleGraph) {
+  // @ts-expect-error TS2304
   let importStatements = [];
   for (let [specifier, names] of moduleGraph.getAllImports()) {
     let defaultSpecifier;
     let namespaceSpecifier;
+    // @ts-expect-error TS2304
     let namedSpecifiers = [];
     for (let [name, imported] of names) {
       if (imported === 'default') {

package/lib/types/TSModule.d.ts

@@ -0,0 +1,25 @@
+export type Import = {
+    specifier: string;
+    imported: string;
+};
+export type Export = {
+    name: string;
+    imported: string;
+    specifier?: string | null | undefined;
+} | {
+    specifier: string;
+};
+export declare class TSModule {
+    imports: Map<string, Import>;
+    exports: Array<Export>;
+    bindings: Map<string, Set<any>>;
+    names: Map<string, string>;
+    used: Set<string>;
+    constructor();
+    addImport(local: string, specifier: string, imported: string): void;
+    addExport(name: string, imported: string, specifier?: string | null): void;
+    addWildcardExport(specifier: string): void;
+    addLocal(name: string, node: any): void;
+    getName(name: string): string;
+    hasBinding(name: string): boolean;
+}

package/lib/types/TSModuleGraph.d.ts

@@ -0,0 +1,33 @@
+import type { TSModule, Export } from './TSModule';
+export declare class TSModuleGraph {
+    modules: Map<string, TSModule>;
+    mainModuleName: string;
+    mainModule: TSModule | null | undefined;
+    syntheticImportCount: number;
+    constructor(mainModuleName: string);
+    addModule(name: string, module: TSModule): void;
+    getModule(name: string): TSModule | null | undefined;
+    markUsed(module: TSModule, name: string, context: any): void;
+    getExport(m: TSModule, e: Export): {
+        imported: string;
+        module: TSModule;
+        name: string;
+    } | null | undefined;
+    resolveImport(module: TSModule, local: string, imported?: string): {
+        imported: string;
+        module: TSModule;
+        name: string;
+    } | null | undefined;
+    resolveExport(module: TSModule, name: string): {
+        imported: string;
+        module: TSModule;
+        name: string;
+    } | null | undefined;
+    getAllExports(module?: TSModule, excludeDefault?: boolean): Array<{
+        imported: string;
+        module: TSModule;
+        name: string;
+    }>;
+    getAllImports(): Map<string, Map<string, string>>;
+    propagate(context: any): Map<string, TSModule>;
+}

package/lib/types/TSTypesTransformer.d.ts

@@ -0,0 +1,3 @@
+import { Transformer } from '@atlaspack/plugin';
+declare const _default: Transformer<unknown>;
+export default _default;

package/lib/types/collect.d.ts

@@ -0,0 +1,2 @@
+import type { TSModuleGraph } from './TSModuleGraph';
+export declare function collect(moduleGraph: TSModuleGraph, context: any, sourceFile: any): any;

package/lib/types/shake.d.ts

@@ -0,0 +1,2 @@
+import type { TSModuleGraph } from './TSModuleGraph';
+export declare function shake(moduleGraph: TSModuleGraph, context: any, sourceFile: any): any;

package/lib/types/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function getExportedName(node: any): string | null | undefined;
+export declare function isDeclaration(node: any): boolean;

package/lib/types/wrappers.d.ts

@@ -0,0 +1,8 @@
+import type { ExportDeclaration, Expression, Identifier, ImportClause, ImportDeclaration, ImportSpecifier, Modifier, NamedImportBindings } from 'typescript';
+type AssertClause = any;
+type NamedExportBindings = any;
+export declare const createImportClause: (factory: any, isTypeOnly: boolean, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined) => ImportClause;
+export declare const createImportDeclaration: (factory: any, modifiers: Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression, assertClause: AssertClause) => ImportDeclaration;
+export declare const createImportSpecifier: (factory: any, isTypeOnly: boolean, propertyName: Identifier | undefined, name: Identifier) => ImportSpecifier;
+export declare const updateExportDeclaration: (factory: any, node: ExportDeclaration, modifiers: Modifier[] | undefined, isTypeOnly: boolean, exportClause: NamedExportBindings | undefined, moduleSpecifier: Expression | undefined, assertClause: AssertClause | undefined) => ExportDeclaration;
+export {};

package/lib/utils.js

@@ -17,9 +17,13 @@ function getExportedName(node) {
   if (!node.modifiers) {
     return null;
   }
+
+  // @ts-expect-error TS7006
   if (!node.modifiers.some(m => m.kind === _typescript().default.SyntaxKind.ExportKeyword)) {
     return null;
   }
+
+  // @ts-expect-error TS7006
   if (node.modifiers.some(m => m.kind === _typescript().default.SyntaxKind.DefaultKeyword)) {
     return 'default';
   }

package/lib/wrappers.js

@@ -20,6 +20,7 @@ function _assert() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-unused-vars */
+
 const [majorVersion, minorVersion] = _typescript().default.versionMajorMinor.split('.').map(num => parseInt(num, 10));
 
 // Everything below was generated using https://github.com/mischnic/tsc-version-wrapper
@@ -41,7 +42,7 @@ const createImportDeclaration = exports.createImportDeclaration = (() => {
   } else if (majorVersion > 4 || majorVersion === 4 && minorVersion >= 5) {
     return (factory, modifiers, importClause, moduleSpecifier, assertClause) => factory.createImportDeclaration(undefined /* decorators */, modifiers, importClause, moduleSpecifier, assertClause);
   } else if (majorVersion > 3 || majorVersion === 3 && minorVersion >= 0) {
-    return (factory, modifiers, importClause, moduleSpecifier) => factory.createImportDeclaration(undefined /* decorators */, modifiers, importClause, moduleSpecifier);
+    return (factory, modifiers, importClause, moduleSpecifier, assertClause) => factory.createImportDeclaration(undefined /* decorators */, modifiers, importClause, moduleSpecifier);
   } else {
     (0, _assert().default)(false);
   }
@@ -61,11 +62,11 @@ const updateExportDeclaration = exports.updateExportDeclaration = (() => {
   } else if (majorVersion > 4 || majorVersion === 4 && minorVersion >= 5) {
     return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier, assertClause) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, isTypeOnly, exportClause, moduleSpecifier, assertClause);
   } else if (majorVersion > 4 || majorVersion === 4 && minorVersion >= 0) {
-    return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, isTypeOnly, exportClause, moduleSpecifier);
+    return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier, assertClause) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, isTypeOnly, exportClause, moduleSpecifier);
   } else if (majorVersion > 3 || majorVersion === 3 && minorVersion >= 8) {
-    return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, exportClause, moduleSpecifier, isTypeOnly);
+    return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier, assertClause) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, exportClause, moduleSpecifier, isTypeOnly);
   } else if (majorVersion > 3 || majorVersion === 3 && minorVersion >= 0) {
-    return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, exportClause, moduleSpecifier);
+    return (factory, node, modifiers, isTypeOnly, exportClause, moduleSpecifier, assertClause) => factory.updateExportDeclaration(node, undefined /* decorators */, modifiers, exportClause, moduleSpecifier);
   } else {
     (0, _assert().default)(false);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-typescript-types",
-  "version": "2.14.5-canary.24+9b814a847",
+  "version": "2.14.5-canary.241+816fbf634",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,16 +9,17 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/TSTypesTransformer.js",
-  "source": "src/TSTypesTransformer.js",
+  "main": "./lib/TSTypesTransformer.js",
+  "source": "./src/TSTypesTransformer.ts",
+  "types": "./lib/types/TSTypesTransformer.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.92+9b814a847",
-    "@atlaspack/plugin": "2.14.5-canary.24+9b814a847",
-    "@atlaspack/ts-utils": "2.14.1-canary.92+9b814a847",
-    "@atlaspack/utils": "2.14.5-canary.24+9b814a847",
+    "@atlaspack/diagnostic": "2.14.1-canary.309+816fbf634",
+    "@atlaspack/plugin": "2.14.5-canary.241+816fbf634",
+    "@atlaspack/ts-utils": "2.14.1-canary.309+816fbf634",
+    "@atlaspack/utils": "2.14.5-canary.241+816fbf634",
     "@parcel/source-map": "^2.1.1",
     "nullthrows": "^1.1.1"
   },
@@ -29,5 +30,8 @@
     "typescript": ">=3.0.0"
   },
   "type": "commonjs",
-  "gitHead": "9b814a847d7f5bd71f9e84eb498598ef90c7bd3a"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "816fbf634125215c3b4f2d79c0cd4a976648f1dc"
+}

package/src/{TSModule.js → TSModule.ts}

@@ -1,9 +1,16 @@
-// @flow
-
-export type Import = {|specifier: string, imported: string|};
+export type Import = {
+  specifier: string;
+  imported: string;
+};
 export type Export =
-  | {|name: string, imported: string, specifier?: ?string|}
-  | {|specifier: string|};
+  | {
+      name: string;
+      imported: string;
+      specifier?: string | null | undefined;
+    }
+  | {
+      specifier: string;
+    };
 
 export class TSModule {
   imports: Map<string, Import>;
@@ -28,7 +35,7 @@ export class TSModule {
   }
 
   // if not a reexport: imported = local, name = exported
-  addExport(name: string, imported: string, specifier: ?string) {
+  addExport(name: string, imported: string, specifier?: string | null) {
     this.exports.push({name, specifier, imported});
   }
 

package/src/{TSModuleGraph.js → TSModuleGraph.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {TSModule, Export} from './TSModule';
 
 import nullthrows from 'nullthrows';
@@ -8,7 +7,7 @@ import ts from 'typescript';
 export class TSModuleGraph {
   modules: Map<string, TSModule>;
   mainModuleName: string;
-  mainModule: ?TSModule;
+  mainModule: TSModule | null | undefined;
   syntheticImportCount: number;
 
   constructor(mainModuleName: string) {
@@ -25,7 +24,7 @@ export class TSModuleGraph {
     }
   }
 
-  getModule(name: string): ?TSModule {
+  getModule(name: string): TSModule | null | undefined {
     return this.modules.get(name);
   }
 
@@ -77,17 +76,28 @@ export class TSModuleGraph {
   getExport(
     m: TSModule,
     e: Export,
-  ): ?{|imported: string, module: TSModule, name: string|} {
+  ):
+    | {
+        imported: string;
+        module: TSModule;
+        name: string;
+      }
+    | null
+    | undefined {
+    // @ts-expect-error TS2339
     invariant(e.name != null);
+    // @ts-expect-error TS2339
     let exportName = e.name;
 
     // Re-export
+    // @ts-expect-error TS2339
     if (e.specifier && e.imported) {
       let m = this.getModule(e.specifier);
       if (!m) {
         return null;
       }
 
+      // @ts-expect-error TS2339
       let exp = this.resolveExport(m, e.imported);
       if (!exp) {
         return null;
@@ -114,6 +124,7 @@ export class TSModuleGraph {
     return {
       module: m,
       name: exportName,
+      // @ts-expect-error TS2339
       imported: e.imported != null ? m.getName(e.imported) : exportName,
     };
   }
@@ -122,7 +133,14 @@ export class TSModuleGraph {
     module: TSModule,
     local: string,
     imported?: string,
-  ): ?{|imported: string, module: TSModule, name: string|} {
+  ):
+    | {
+        imported: string;
+        module: TSModule;
+        name: string;
+      }
+    | null
+    | undefined {
     let i = module.imports.get(local);
     if (!i) {
       return null;
@@ -140,8 +158,16 @@ export class TSModuleGraph {
   resolveExport(
     module: TSModule,
     name: string,
-  ): ?{|imported: string, module: TSModule, name: string|} {
+  ):
+    | {
+        imported: string;
+        module: TSModule;
+        name: string;
+      }
+    | null
+    | undefined {
     for (let e of module.exports) {
+      // @ts-expect-error TS2339
       if (e.name === name) {
         return this.getExport(module, e);
       } else if (e.specifier) {
@@ -159,9 +185,18 @@ export class TSModuleGraph {
   getAllExports(
     module: TSModule = nullthrows(this.mainModule),
     excludeDefault: boolean = false,
-  ): Array<{|imported: string, module: TSModule, name: string|}> {
-    let res = [];
+  ): Array<{
+    imported: string;
+    module: TSModule;
+    name: string;
+  }> {
+    let res: Array<{
+      imported: string;
+      module: TSModule;
+      name: string;
+    }> = [];
     for (let e of module.exports) {
+      // @ts-expect-error TS2339
       if (e.name && (!excludeDefault || e.name !== 'default')) {
         let exp = this.getExport(module, e);
         if (exp) {
@@ -209,7 +244,7 @@ export class TSModuleGraph {
       exportedNames.set(e.name, e.module);
     }
 
-    let importedSymbolsToUpdate = [];
+    let importedSymbolsToUpdate: Array<Array<TSModule | string>> = [];
 
     // Assign unique names across all modules
     for (let m of this.modules.values()) {
@@ -240,11 +275,14 @@ export class TSModuleGraph {
     let imports = new Map();
 
     for (let [m, orig] of importedSymbolsToUpdate) {
+      // @ts-expect-error TS2339
       let imp = nullthrows(m.imports.get(orig));
+      // @ts-expect-error TS2345
       let imported = nullthrows(this.resolveImport(m, orig));
 
       // If the module is bundled, map the local name to the original exported name.
       if (this.modules.has(imp.specifier)) {
+        // @ts-expect-error TS2339
         m.names.set(orig, imported.imported);
         continue;
       }
@@ -269,6 +307,7 @@ export class TSModuleGraph {
         importedNames.set(imported.imported, name);
       }
 
+      // @ts-expect-error TS2339
       m.names.set(orig, name);
     }
 

package/src/{TSTypesTransformer.js → TSTypesTransformer.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {Transformer} from '@atlaspack/plugin';
 import path from 'path';
 import SourceMap from '@parcel/source-map';
@@ -15,7 +13,7 @@ import nullthrows from 'nullthrows';
 import {collect} from './collect';
 import {shake} from './shake';
 
-export default (new Transformer({
+export default new Transformer({
   loadConfig({config, options}) {
     return loadTSConfig(config, options);
   },
@@ -41,7 +39,7 @@ export default (new Transformer({
     };
 
     let host = new CompilerHost(options.inputFS, ts, logger);
-    // $FlowFixMe
+    // @ts-expect-error TS2345
     let program = ts.createProgram([asset.filePath], opts, host);
 
     for (let file of program.getSourceFiles()) {
@@ -54,6 +52,7 @@ export default (new Transformer({
 
     let mainModuleName = normalizeSeparators(
       path
+        // @ts-expect-error TS2339
         .relative(program.getCommonSourceDirectory(), asset.filePath)
         .slice(0, -path.extname(asset.filePath).length),
     );
@@ -62,11 +61,11 @@ export default (new Transformer({
     let emitResult = program.emit(undefined, undefined, undefined, true, {
       afterDeclarations: [
         // 1. Build module graph
-        (context) => (sourceFile) => {
+        (context: any) => (sourceFile: any) => {
           return collect(moduleGraph, context, sourceFile);
         },
         // 2. Tree shake and rename types
-        (context) => (sourceFile) => {
+        (context: any) => (sourceFile: any) => {
           return shake(moduleGraph, context, sourceFile);
         },
       ],
@@ -77,7 +76,8 @@ export default (new Transformer({
       .concat(emitResult.diagnostics);
 
     let diagnosticIds = new Set();
-    let deduplicatedDiagnostics = [];
+    // @ts-expect-error TS2304
+    let deduplicatedDiagnostics: Array<Diagnostic> = [];
     for (let d of diagnostics) {
       if (d.start != null && d.length != null && d.messageText != null) {
         let id = `${d.start}:${d.length}:${ts.flattenDiagnosticMessageText(
@@ -102,14 +102,13 @@ export default (new Transformer({
         '\n',
       );
 
-      let codeframe: ?DiagnosticCodeFrame;
+      let codeframe: DiagnosticCodeFrame | null | undefined;
       if (file != null && diagnostic.start != null) {
         let source = file.text || diagnostic.source;
         if (file.fileName) {
           filename = file.fileName;
         }
 
-        // $FlowFixMe
         if (source) {
           let lineChar = file.getLineAndCharacterOfPosition(diagnostic.start);
           let start = {
@@ -167,6 +166,7 @@ export default (new Transformer({
     code = code.substring(0, code.lastIndexOf('//# sourceMappingURL'));
 
     let map = JSON.parse(nullthrows(host.outputMap));
+    // @ts-expect-error TS7006
     map.sources = map.sources.map((source) =>
       path.join(path.dirname(asset.filePath), source),
     );
@@ -182,4 +182,4 @@ export default (new Transformer({
     asset.setMap(sourceMap);
     return [asset];
   },
-}): Transformer);
+}) as Transformer<unknown>;

package/src/{collect.js → collect.ts}

@@ -1,8 +1,7 @@
-// @flow
 import type {TSModuleGraph} from './TSModuleGraph';
 
 import nullthrows from 'nullthrows';
-import ts, {type EntityName} from 'typescript';
+import ts, {EntityName} from 'typescript';
 import {TSModule} from './TSModule';
 import {getExportedName, isDeclaration} from './utils';
 
@@ -16,10 +15,11 @@ export function collect(
 
   // When module definitions are nested inside each other (e.g with module augmentation),
   // we want to keep track of the hierarchy so we can associated nodes with the right module.
-  const moduleStack: Array<?TSModule> = [];
-  let _currentModule: ?TSModule;
+  const moduleStack: Array<TSModule | null | undefined> = [];
+  let _currentModule: TSModule | null | undefined;
   let visit = (node: any): any => {
     if (ts.isBundle(node)) {
+      // @ts-expect-error TS2345
       return factory.updateBundle(node, ts.visitNodes(node.sourceFiles, visit));
     }
 
@@ -36,17 +36,23 @@ export function collect(
     let currentModule = nullthrows(_currentModule);
     if (ts.isImportDeclaration(node) && node.importClause) {
       if (node.importClause.namedBindings) {
+        // @ts-expect-error TS2339
         if (node.importClause.namedBindings.elements) {
+          // @ts-expect-error TS2339
           for (let element of node.importClause.namedBindings.elements) {
             currentModule.addImport(
               element.name.text,
+              // @ts-expect-error TS2339
               node.moduleSpecifier.text,
               (element.propertyName ?? element.name).text,
             );
           }
+          // @ts-expect-error TS2339
         } else if (node.importClause.namedBindings.name) {
           currentModule.addImport(
+            // @ts-expect-error TS2339
             node.importClause.namedBindings.name.text,
+            // @ts-expect-error TS2339
             node.moduleSpecifier.text,
             '*',
           );
@@ -56,6 +62,7 @@ export function collect(
       if (node.importClause.name) {
         currentModule.addImport(
           node.importClause.name.text,
+          // @ts-expect-error TS2339
           node.moduleSpecifier.text,
           'default',
         );
@@ -64,11 +71,13 @@ export function collect(
 
     if (ts.isExportDeclaration(node)) {
       if (node.exportClause) {
+        // @ts-expect-error TS2339
         for (let element of node.exportClause.elements) {
           if (node.moduleSpecifier) {
             currentModule.addExport(
               element.name.text,
               (element.propertyName ?? element.name).text,
+              // @ts-expect-error TS2339
               node.moduleSpecifier.text,
             );
           } else {
@@ -79,6 +88,7 @@ export function collect(
           }
         }
       } else {
+        // @ts-expect-error TS18048
         currentModule.addWildcardExport(node.moduleSpecifier.text);
       }
     }
@@ -118,8 +128,10 @@ export function collect(
         (m) => m.kind === ts.SyntaxKind.ExportKeyword,
       );
       for (let v of node.declarationList.declarations) {
+        // @ts-expect-error TS2339
         currentModule.addLocal(v.name.text, v);
         if (isExported) {
+          // @ts-expect-error TS2339
           currentModule.addExport(v.name.text, v.name.text);
         }
       }
@@ -139,19 +151,24 @@ export function collect(
 // Traverse down an EntityName to the root identifier. Return that to use as the named import specifier,
 // and collect the remaining parts into a new QualifiedName with the local replacement at the root.
 // import('react').JSX.Element => import {JSX} from 'react'; JSX.Element
+// @ts-expect-error TS7023
 function getImportName(
-  qualifier: ?EntityName,
+  qualifier: EntityName | null | undefined,
   local: string,
   factory: typeof ts,
 ) {
   if (!qualifier) {
+    // @ts-expect-error TS2339
     return ['*', factory.createIdentifier(local)];
   }
 
   if (qualifier.kind === ts.SyntaxKind.Identifier) {
+    // @ts-expect-error TS2339
     return [qualifier.text, factory.createIdentifier(local)];
   }
 
+  // @ts-expect-error TS7022
   let [name, entity] = getImportName(qualifier.left, local, factory);
+  // @ts-expect-error TS2339
   return [name, factory.createQualifiedName(entity, qualifier.right)];
 }