@atlaspack/transformer-typescript-types 2.14.21-typescript-5b4d3ad41.0 → 2.14.21

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaspack/transformer-typescript-types
 
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/plugin@2.14.21
+
 ## 2.14.20
 
 ### Patch Changes

package/lib/TSModuleGraph.js

@@ -78,20 +78,15 @@ class TSModuleGraph {
     }
   }
   getExport(m, e) {
-    // @ts-expect-error TS2339
     (0, _assert().default)(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;
@@ -120,7 +115,6 @@ class TSModuleGraph {
     return {
       module: m,
       name: exportName,
-      // @ts-expect-error TS2339
       imported: e.imported != null ? m.getName(e.imported) : exportName
     };
   }
@@ -142,7 +136,6 @@ class TSModuleGraph {
   }
   resolveExport(module, name) {
     for (let e of module.exports) {
-      // @ts-expect-error TS2339
       if (e.name === name) {
         return this.getExport(module, e);
       } else if (e.specifier) {
@@ -156,7 +149,6 @@ class TSModuleGraph {
   getAllExports(module = (0, _nullthrows().default)(this.mainModule), excludeDefault = false) {
     let res = [];
     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) {
@@ -226,14 +218,11 @@ class TSModuleGraph {
     // Map of imported specifiers -> map of imported names to local names
     let imports = new Map();
     for (let [m, orig] of importedSymbolsToUpdate) {
-      // @ts-expect-error TS2339
       let imp = (0, _nullthrows().default)(m.imports.get(orig));
-      // @ts-expect-error TS2345
       let imported = (0, _nullthrows().default)(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;
       }
@@ -255,8 +244,6 @@ class TSModuleGraph {
         }
         importedNames.set(imported.imported, name);
       }
-
-      // @ts-expect-error TS2339
       m.names.set(orig, name);
     }
     return exportedNames;

package/lib/TSTypesTransformer.js

@@ -98,16 +98,14 @@ var _default = exports.default = new (_plugin().Transformer)({
       incremental: false
     };
     let host = new (_tsUtils().CompilerHost)(options.inputFS, _typescript().default, logger);
-    // @ts-expect-error TS2345
+    // $FlowFixMe
     let program = _typescript().default.createProgram([asset.filePath], opts, host);
     for (let file of program.getSourceFiles()) {
       if (_path().default.normalize(file.fileName) !== asset.filePath) {
         asset.invalidateOnFileChange(host.redirectTypes.get(file.fileName) ?? file.fileName);
       }
     }
-    let mainModuleName = (0, _utils().normalizeSeparators)(_path().default
-    // @ts-expect-error TS2339
-    .relative(program.getCommonSourceDirectory(), asset.filePath).slice(0, -_path().default.extname(asset.filePath).length));
+    let mainModuleName = (0, _utils().normalizeSeparators)(_path().default.relative(program.getCommonSourceDirectory(), asset.filePath).slice(0, -_path().default.extname(asset.filePath).length));
     let moduleGraph = new _TSModuleGraph.TSModuleGraph(mainModuleName);
     let emitResult = program.emit(undefined, undefined, undefined, true, {
       afterDeclarations: [
@@ -122,7 +120,6 @@ var _default = exports.default = new (_plugin().Transformer)({
     });
     let diagnostics = _typescript().default.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
     let diagnosticIds = new Set();
-    // @ts-expect-error TS2304
     let deduplicatedDiagnostics = [];
     for (let d of diagnostics) {
       if (d.start != null && d.length != null && d.messageText != null) {
@@ -147,6 +144,8 @@ var _default = exports.default = new (_plugin().Transformer)({
         if (file.fileName) {
           filename = file.fileName;
         }
+
+        // $FlowFixMe
         if (source) {
           let lineChar = file.getLineAndCharacterOfPosition(diagnostic.start);
           let start = {
@@ -192,7 +191,6 @@ var _default = exports.default = new (_plugin().Transformer)({
     let code = (0, _nullthrows().default)(host.outputCode);
     code = code.substring(0, code.lastIndexOf('//# sourceMappingURL'));
     let map = JSON.parse((0, _nullthrows().default)(host.outputMap));
-    // @ts-expect-error TS7006
     map.sources = map.sources.map(source => _path().default.join(_path().default.dirname(asset.filePath), source));
     let sourceMap = null;
     if (map.mappings) {

package/lib/collect.js

@@ -33,7 +33,6 @@ function collect(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));
     }
     if (_typescript().default.isModuleDeclaration(node)) {
@@ -47,43 +46,28 @@ function collect(moduleGraph, context, sourceFile) {
     let currentModule = (0, _nullthrows().default)(_currentModule);
     if (_typescript().default.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);
+            currentModule.addImport(element.name.text, 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, '*');
+          currentModule.addImport(node.importClause.namedBindings.name.text, node.moduleSpecifier.text, '*');
         }
       }
       if (node.importClause.name) {
-        currentModule.addImport(node.importClause.name.text,
-        // @ts-expect-error TS2339
-        node.moduleSpecifier.text, 'default');
+        currentModule.addImport(node.importClause.name.text, node.moduleSpecifier.text, 'default');
       }
     }
     if (_typescript().default.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);
+            currentModule.addExport(element.name.text, (element.propertyName ?? element.name).text, node.moduleSpecifier.text);
           } else {
             currentModule.addExport(element.name.text, (element.propertyName ?? element.name).text);
           }
         }
       } else {
-        // @ts-expect-error TS18048
         currentModule.addWildcardExport(node.moduleSpecifier.text);
       }
     }
@@ -112,10 +96,8 @@ function collect(moduleGraph, context, sourceFile) {
     if (_typescript().default.isVariableStatement(node) && node.modifiers) {
       let isExported = node.modifiers.some(m => m.kind === _typescript().default.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);
         }
       }
@@ -134,19 +116,13 @@ function collect(moduleGraph, context, sourceFile) {
 // 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, local, factory) {
   if (!qualifier) {
-    // @ts-expect-error TS2339
     return ['*', factory.createIdentifier(local)];
   }
   if (qualifier.kind === _typescript().default.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/lib/shake.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shake = shake;
+var _TSModule = require("./TSModule");
 function _typescript() {
   const data = _interopRequireDefault(require("typescript"));
   _typescript = function () {
@@ -42,7 +43,6 @@ 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,19 +53,14 @@ 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 =
-        // @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
+        const index = ((_node$modifiers$ = node.modifiers[0]) === null || _node$modifiers$ === void 0 ? void 0 : _node$modifiers$.kind) === _typescript().default.SyntaxKind.ExportKeyword ? 1 : 0;
         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) {
@@ -85,13 +80,10 @@ function shake(moduleGraph, context, sourceFile) {
     let currentModule = (0, _nullthrows().default)(_currentModule);
     // Remove exports from flattened modules
     if (_typescript().default.isExportDeclaration(node)) {
-      if (!node.moduleSpecifier ||
-      // @ts-expect-error TS2339
-      moduleGraph.getModule(node.moduleSpecifier.text)) {
+      if (!node.moduleSpecifier || 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)) {
@@ -130,9 +122,7 @@ function shake(moduleGraph, context, sourceFile) {
       }
 
       // Remove original export modifiers
-      node.modifiers = (node.modifiers || []).filter(
-      // @ts-expect-error TS7006
-      m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DefaultKeyword);
+      node.modifiers = (node.modifiers || []).filter(m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DefaultKeyword);
 
       // Rename declarations
       let newName = currentModule.getName(name);
@@ -147,7 +137,6 @@ 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));
       }
     }
@@ -160,14 +149,10 @@ function shake(moduleGraph, context, sourceFile) {
       }
 
       // Remove original export modifiers
-      node.modifiers = (node.modifiers || []).filter(
-      // @ts-expect-error TS7006
-      m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DeclareKeyword);
+      node.modifiers = (node.modifiers || []).filter(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(
-      // @ts-expect-error TS7006
-      d => exportedNames.get(d.name.text) === currentModule);
+      let isExported = node.declarationList.declarations.every(d => exportedNames.get(d.name.text) === currentModule);
       if (isExported) {
         node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.ExportKeyword));
       } else {
@@ -178,7 +163,6 @@ 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;
       }
@@ -214,12 +198,10 @@ 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/utils.js

@@ -17,13 +17,9 @@ 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,7 +20,6 @@ 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-typescript-types",
-  "version": "2.14.21-typescript-5b4d3ad41.0",
+  "version": "2.14.21",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,18 +9,17 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "./lib/TSTypesTransformer.js",
-  "source": "./src/TSTypesTransformer.ts",
-  "types": "./lib/TSTypesTransformer.d.ts",
+  "main": "lib/TSTypesTransformer.js",
+  "source": "src/TSTypesTransformer.js",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.2-typescript-5b4d3ad41.0",
-    "@atlaspack/plugin": "2.14.21-typescript-5b4d3ad41.0",
-    "@atlaspack/ts-utils": "2.14.2-typescript-5b4d3ad41.0",
-    "@atlaspack/utils": "2.17.3-typescript-5b4d3ad41.0",
+    "@atlaspack/diagnostic": "2.14.1",
+    "@atlaspack/plugin": "2.14.21",
     "@parcel/source-map": "^2.1.1",
+    "@atlaspack/ts-utils": "2.14.1",
+    "@atlaspack/utils": "2.17.3",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {
@@ -29,9 +28,5 @@
   "peerDependencies": {
     "typescript": ">=3.0.0"
   },
-  "type": "commonjs",
-  "scripts": {
-    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
-  },
-  "gitHead": "5b4d3ad41ffa002b989ba77271bb3010a1f05b2a"
-}
+  "type": "commonjs"
+}

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

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

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

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

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

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