@atlaspack/transformer-typescript-types 2.14.5-canary.33 → 2.14.5-canary.331

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

@@ -1,8 +1,6 @@
-// @flow strict-local
-
 import {Transformer} from '@atlaspack/plugin';
 import path from 'path';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import type {DiagnosticCodeFrame} from '@atlaspack/diagnostic';
 import type {CompilerOptions} from 'typescript';
 
@@ -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)];
 }

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

@@ -1,4 +1,3 @@
-// @flow
 import {TSModule} from './TSModule';
 import type {TSModuleGraph} from './TSModuleGraph';
 
@@ -30,13 +29,14 @@ export function shake(
 
   // 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> = [];
+  const moduleStack: Array<TSModule | null | undefined> = [];
 
   let addedGeneratedImports = false;
 
-  let _currentModule: ?TSModule;
+  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));
     }
 
@@ -46,9 +46,12 @@ export function shake(
       if (moduleStack.length >= 1) {
         // 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 =
+          // @ts-expect-error TS18048
           node.modifiers[0]?.kind === ts.SyntaxKind.ExportKeyword ? 1 : 0;
+        // @ts-expect-error TS18048
         node.modifiers.splice(
           index,
           0,
@@ -60,6 +63,7 @@ export function shake(
       moduleStack.push(_currentModule);
       let isFirstModule = !_currentModule;
       _currentModule = moduleGraph.getModule(node.name.text);
+      // @ts-expect-error TS2532
       let statements = ts.visitEachChild(node, visit, context).body.statements;
       _currentModule = moduleStack.pop();
 
@@ -85,11 +89,13 @@ export function shake(
     if (ts.isExportDeclaration(node)) {
       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 = [];
+          let exported: Array<any> = [];
+          // @ts-expect-error TS2339
           for (let element of node.exportClause.elements) {
             let name = (element.propertyName ?? element.name).text;
             if (
@@ -135,6 +141,7 @@ export function shake(
 
       // Remove original export modifiers
       node.modifiers = (node.modifiers || []).filter(
+        // @ts-expect-error TS7006
         (m) =>
           m.kind !== ts.SyntaxKind.ExportKeyword &&
           m.kind !== ts.SyntaxKind.DefaultKeyword,
@@ -161,6 +168,7 @@ export function shake(
         ts.isFunctionDeclaration(node) ||
         ts.isClassDeclaration(node)
       ) {
+        // @ts-expect-error TS18048
         node.modifiers.unshift(
           factory.createModifier(ts.SyntaxKind.DeclareKeyword),
         );
@@ -177,6 +185,7 @@ export function shake(
 
       // Remove original export modifiers
       node.modifiers = (node.modifiers || []).filter(
+        // @ts-expect-error TS7006
         (m) =>
           m.kind !== ts.SyntaxKind.ExportKeyword &&
           m.kind !== ts.SyntaxKind.DeclareKeyword,
@@ -184,6 +193,7 @@ export function shake(
 
       // Add export modifier if all declarations are exported.
       let isExported = node.declarationList.declarations.every(
+        // @ts-expect-error TS7006
         (d) => exportedNames.get(d.name.text) === currentModule,
       );
       if (isExported) {
@@ -202,6 +212,7 @@ export function shake(
 
     if (ts.isVariableDeclaration(node)) {
       // Remove unused variables
+      // @ts-expect-error TS2339
       if (!currentModule.used.has(node.name.text)) {
         return null;
       }
@@ -250,11 +261,13 @@ export function shake(
 }
 
 function generateImports(factory: any, moduleGraph: TSModuleGraph) {
-  let importStatements = [];
+  // @ts-expect-error TS2304
+  let importStatements: Array<ImportDeclaration | any> = [];
   for (let [specifier, names] of moduleGraph.getAllImports()) {
     let defaultSpecifier;
     let namespaceSpecifier;
-    let namedSpecifiers = [];
+    // @ts-expect-error TS2304
+    let namedSpecifiers: Array<ImportSpecifier | any> = [];
     for (let [name, imported] of names) {
       if (imported === 'default') {
         defaultSpecifier = factory.createIdentifier(name);

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

@@ -1,15 +1,16 @@
-// @flow
 import ts from 'typescript';
 
-export function getExportedName(node: any): ?string {
+export function getExportedName(node: any): string | null | undefined {
   if (!node.modifiers) {
     return null;
   }
 
+  // @ts-expect-error TS7006
   if (!node.modifiers.some((m) => m.kind === ts.SyntaxKind.ExportKeyword)) {
     return null;
   }
 
+  // @ts-expect-error TS7006
   if (node.modifiers.some((m) => m.kind === ts.SyntaxKind.DefaultKeyword)) {
     return 'default';
   }

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

@@ -1,4 +1,3 @@
-// @flow
 /* eslint-disable no-unused-vars */
 import type {
   ExportDeclaration,
@@ -26,18 +25,30 @@ const [majorVersion, minorVersion] = ts.versionMajorMinor
 export const createImportClause: (
   factory: any,
   isTypeOnly: boolean,
-  name: Identifier | void,
-  namedBindings: NamedImportBindings | void,
+  name: Identifier | undefined,
+  namedBindings: NamedImportBindings | undefined,
 ) => ImportClause = (() => {
   if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 0)) {
-    return (factory, isTypeOnly, name, namedBindings) =>
-      factory.createImportClause(isTypeOnly, name, namedBindings);
+    return (
+      factory: any,
+      isTypeOnly: boolean,
+      name: undefined | Identifier,
+      namedBindings: undefined | NamedImportBindings,
+    ) => factory.createImportClause(isTypeOnly, name, namedBindings);
   } else if (majorVersion > 3 || (majorVersion === 3 && minorVersion >= 8)) {
-    return (factory, isTypeOnly, name, namedBindings) =>
-      factory.createImportClause(name, namedBindings, isTypeOnly);
+    return (
+      factory: any,
+      isTypeOnly: boolean,
+      name: undefined | Identifier,
+      namedBindings: undefined | NamedImportBindings,
+    ) => factory.createImportClause(name, namedBindings, isTypeOnly);
   } else if (majorVersion > 3 || (majorVersion === 3 && minorVersion >= 0)) {
-    return (factory, isTypeOnly, name, namedBindings) =>
-      factory.createImportClause(name, namedBindings);
+    return (
+      factory: any,
+      isTypeOnly: boolean,
+      name: undefined | Identifier,
+      namedBindings: undefined | NamedImportBindings,
+    ) => factory.createImportClause(name, namedBindings);
   } else {
     invariant(false);
   }
@@ -45,13 +56,19 @@ export const createImportClause: (
 
 export const createImportDeclaration: (
   factory: any,
-  modifiers: Modifier[] | void,
-  importClause: ImportClause | void,
+  modifiers: Modifier[] | undefined,
+  importClause: ImportClause | undefined,
   moduleSpecifier: Expression,
   assertClause: AssertClause,
 ) => ImportDeclaration = (() => {
   if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 8)) {
-    return (factory, modifiers, importClause, moduleSpecifier, assertClause) =>
+    return (
+      factory: any,
+      modifiers: undefined | Array<Modifier>,
+      importClause: undefined | ImportClause,
+      moduleSpecifier: Expression,
+      assertClause: AssertClause,
+    ) =>
       factory.createImportDeclaration(
         modifiers,
         importClause,
@@ -59,7 +76,13 @@ export const createImportDeclaration: (
         assertClause,
       );
   } else if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 5)) {
-    return (factory, modifiers, importClause, moduleSpecifier, assertClause) =>
+    return (
+      factory: any,
+      modifiers: undefined | Array<Modifier>,
+      importClause: undefined | ImportClause,
+      moduleSpecifier: Expression,
+      assertClause: AssertClause,
+    ) =>
       factory.createImportDeclaration(
         undefined /* decorators */,
         modifiers,
@@ -68,7 +91,13 @@ export const createImportDeclaration: (
         assertClause,
       );
   } else if (majorVersion > 3 || (majorVersion === 3 && minorVersion >= 0)) {
-    return (factory, modifiers, importClause, moduleSpecifier, assertClause) =>
+    return (
+      factory: any,
+      modifiers: undefined | Array<Modifier>,
+      importClause: undefined | ImportClause,
+      moduleSpecifier: Expression,
+      assertClause: AssertClause,
+    ) =>
       factory.createImportDeclaration(
         undefined /* decorators */,
         modifiers,
@@ -83,15 +112,23 @@ export const createImportDeclaration: (
 export const createImportSpecifier: (
   factory: any,
   isTypeOnly: boolean,
-  propertyName: Identifier | void,
+  propertyName: Identifier | undefined,
   name: Identifier,
 ) => ImportSpecifier = (() => {
   if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 5)) {
-    return (factory, isTypeOnly, propertyName, name) =>
-      factory.createImportSpecifier(isTypeOnly, propertyName, name);
+    return (
+      factory: any,
+      isTypeOnly: boolean,
+      propertyName: undefined | Identifier,
+      name: Identifier,
+    ) => factory.createImportSpecifier(isTypeOnly, propertyName, name);
   } else if (majorVersion > 3 || (majorVersion === 3 && minorVersion >= 0)) {
-    return (factory, isTypeOnly, propertyName, name) =>
-      factory.createImportSpecifier(propertyName, name);
+    return (
+      factory: any,
+      isTypeOnly: boolean,
+      propertyName: undefined | Identifier,
+      name: Identifier,
+    ) => factory.createImportSpecifier(propertyName, name);
   } else {
     invariant(false);
   }
@@ -100,21 +137,21 @@ export const createImportSpecifier: (
 export const updateExportDeclaration: (
   factory: any,
   node: ExportDeclaration,
-  modifiers: Modifier[] | void,
+  modifiers: Modifier[] | undefined,
   isTypeOnly: boolean,
-  exportClause: NamedExportBindings | void,
-  moduleSpecifier: Expression | void,
-  assertClause: AssertClause | void,
+  exportClause: NamedExportBindings | undefined,
+  moduleSpecifier: Expression | undefined,
+  assertClause: AssertClause | undefined,
 ) => ExportDeclaration = (() => {
   if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 8)) {
     return (
-      factory,
-      node,
-      modifiers,
-      isTypeOnly,
-      exportClause,
-      moduleSpecifier,
-      assertClause,
+      factory: any,
+      node: ExportDeclaration,
+      modifiers: undefined | Array<Modifier>,
+      isTypeOnly: boolean,
+      exportClause: undefined | NamedExportBindings,
+      moduleSpecifier: undefined | Expression,
+      assertClause: undefined | AssertClause,
     ) =>
       factory.updateExportDeclaration(
         node,
@@ -126,13 +163,13 @@ export const updateExportDeclaration: (
       );
   } else if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 5)) {
     return (
-      factory,
-      node,
-      modifiers,
-      isTypeOnly,
-      exportClause,
-      moduleSpecifier,
-      assertClause,
+      factory: any,
+      node: ExportDeclaration,
+      modifiers: undefined | Array<Modifier>,
+      isTypeOnly: boolean,
+      exportClause: undefined | NamedExportBindings,
+      moduleSpecifier: undefined | Expression,
+      assertClause: undefined | AssertClause,
     ) =>
       factory.updateExportDeclaration(
         node,
@@ -145,13 +182,13 @@ export const updateExportDeclaration: (
       );
   } else if (majorVersion > 4 || (majorVersion === 4 && minorVersion >= 0)) {
     return (
-      factory,
-      node,
-      modifiers,
-      isTypeOnly,
-      exportClause,
-      moduleSpecifier,
-      assertClause,
+      factory: any,
+      node: ExportDeclaration,
+      modifiers: undefined | Array<Modifier>,
+      isTypeOnly: boolean,
+      exportClause: undefined | NamedExportBindings,
+      moduleSpecifier: undefined | Expression,
+      assertClause: undefined | AssertClause,
     ) =>
       factory.updateExportDeclaration(
         node,
@@ -163,13 +200,13 @@ export const updateExportDeclaration: (
       );
   } else if (majorVersion > 3 || (majorVersion === 3 && minorVersion >= 8)) {
     return (
-      factory,
-      node,
-      modifiers,
-      isTypeOnly,
-      exportClause,
-      moduleSpecifier,
-      assertClause,
+      factory: any,
+      node: ExportDeclaration,
+      modifiers: undefined | Array<Modifier>,
+      isTypeOnly: boolean,
+      exportClause: undefined | NamedExportBindings,
+      moduleSpecifier: undefined | Expression,
+      assertClause: undefined | AssertClause,
     ) =>
       factory.updateExportDeclaration(
         node,
@@ -181,13 +218,13 @@ export const updateExportDeclaration: (
       );
   } else if (majorVersion > 3 || (majorVersion === 3 && minorVersion >= 0)) {
     return (
-      factory,
-      node,
-      modifiers,
-      isTypeOnly,
-      exportClause,
-      moduleSpecifier,
-      assertClause,
+      factory: any,
+      node: ExportDeclaration,
+      modifiers: undefined | Array<Modifier>,
+      isTypeOnly: boolean,
+      exportClause: undefined | NamedExportBindings,
+      moduleSpecifier: undefined | Expression,
+      assertClause: undefined | AssertClause,
     ) =>
       factory.updateExportDeclaration(
         node,

package/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    },
+    {
+      "path": "../../utils/ts-utils/tsconfig.json"
+    },
+    {
+      "path": "../../core/source-map/tsconfig.json"
+    }
+  ]
+}