fix(external): respect 'external' option provided to Rollup and don't inline typings from modules matched by it

Author: wessberg

package.json

@@ -65,6 +65,7 @@
 "eslint-config-prettier": "^6.11.0",
 "eslint-plugin-import": "^2.22.0",
 "eslint-plugin-jsdoc": "^30.0.3",
+"acorn": "^7.3.1",
 "fast-glob": "^3.2.4",
 "husky": "^4.2.5",
 "np": "5.2.1",

pnpm-lock.yaml

@@ -1,5 +1,6 @@
-export {CustomTransformerOptions, CustomTransformersFunction} from "./util/merge-transformers/custom-transformer-options";
-export {default} from "./plugin/typescript-plugin";
+export * from "./util/merge-transformers/custom-transformer-options";
+export * from "./type/declaration-stats";
+
 export {
 TypescriptPluginOptions,
 BrowserslistConfig,
@@ -8,3 +9,5 @@ export {
 TypescriptPluginBabelOptions,
 TypescriptPluginTypescriptOptions
 } from "./plugin/typescript-plugin-options";
+
+export {default} from "./plugin/typescript-plugin";

src/index.ts

@@ -157,6 +157,7 @@ export default function typescriptRollupPlugin(pluginInputOptions: Partial<Types
 fileSystem,
 typescript,
 extensions: SUPPORTED_EXTENSIONS,
+externalOption: rollupInputOptions.external,
 parsedCommandLineResult,
 transformers: mergeTransformers(...transformers)
 });
@@ -369,6 +370,7 @@ export default function typescriptRollupPlugin(pluginInputOptions: Partial<Types
 emitDeclarations({
 host,
 bundle,
+externalOption: rollupInputOptions.external,
 outputOptions,
 pluginOptions,
 pluginContext: this,

src/plugin/typescript-plugin.ts

@@ -1,7 +1,7 @@
 import {TS} from "../../type/ts";
 import {CompilerHostOptions, CustomTransformersInput} from "./compiler-host-options";
 import {ModuleResolutionHost} from "../module-resolution-host/module-resolution-host";
-import {dirname, ensureAbsolute, getExtension, isTypeScriptLib, join, nativeNormalize, normalize} from "../../util/path/path-util";
+import {dirname, ensureAbsolute, getExtension, isExternal, isTypeScriptLib, join, nativeNormalize, normalize} from "../../util/path/path-util";
 import {getNewLineCharacter} from "../../util/get-new-line-character/get-new-line-character";
 import {resolveId} from "../../util/resolve-id/resolve-id";
 import {getScriptKindFromPath} from "../../util/get-script-kind-from-path/get-script-kind-from-path";
@@ -10,7 +10,8 @@ import {mergeTransformers} from "../../util/merge-transformers/merge-transformer
 import {ensureModuleTransformer} from "../transformer/ensure-module/ensure-module-transformer";
 import {SourceFileToDependenciesMap} from "../transformer/declaration-bundler/declaration-bundler-options";
 import {ExtendedResolvedModule} from "../cache/resolve-cache/extended-resolved-module";
-import {getModuleDependencies} from "../../util/get-module-dependencies/get-module-dependencies";
+import {getModuleDependencies, ModuleDependency} from "../../util/get-module-dependencies/get-module-dependencies";
+import {pickResolvedModule} from "../../util/pick-resolved-module";
 
 export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHost {
 private previousProgram: TS.EmitAndSemanticDiagnosticsBuilderProgram | undefined;
@@ -21,6 +22,7 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 private emitOutput: TS.EmitOutput | undefined;
 private creatingProgram = false;
 private invalidateProgram = false;
+private readonly externalFiles = new Set<string>();
 
 constructor(
 protected readonly options: CompilerHostOptions,
@@ -202,7 +204,7 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 return this.options.transformers;
 }
 
-private getDependenciesForFileDeep(fileName: string, dependencies: Set<ExtendedResolvedModule> = new Set(), seenModules: Set<string> = new Set()): Set<ExtendedResolvedModule> {
+private getDependenciesForFileDeep(fileName: string, dependencies: Set<ModuleDependency> = new Set(), seenModules: Set<string> = new Set()): Set<ModuleDependency> {
 if (seenModules.has(fileName)) return dependencies;
 seenModules.add(fileName);
 const localDependencies = this.sourceFileToDependenciesMap.get(fileName);
@@ -225,7 +227,7 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 return dependencies;
 }
 
-getDependenciesForFile(fileName: string, deep = false): Set<ExtendedResolvedModule> | undefined {
+getDependenciesForFile(fileName: string, deep = false): Set<ModuleDependency> | undefined {
 if (deep) {
 return this.getDependenciesForFileDeep(fileName);
 }
@@ -236,7 +238,7 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 return this.sourceFileToDependenciesMap;
 }
 
-add(fileInput: VirtualFileInput | VirtualFile): VirtualFile {
+add(fileInput: VirtualFileInput | VirtualFile, traceDependencies = true): VirtualFile {
 const existing = this.get(fileInput.fileName);
 if (existing != null && existing.text === fileInput.text) {
 return existing;
@@ -255,12 +257,15 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 }
 
 const addedFile = super.add(fileInput);
-this.refreshDependenciesForFileName(fileInput.fileName);
+if (traceDependencies) {
+this.refreshDependenciesForFileName(fileInput.fileName);
+}
+
 return addedFile;
 }
 
 private refreshDependenciesForFileName(fileName: string, seenModules: Set<string> = new Set()): void {
-if (seenModules.has(fileName)) return;
+if (seenModules.has(fileName) || this.externalFiles.has(fileName)) return;
 seenModules.add(fileName);
 
 const dependencies = getModuleDependencies({
@@ -272,6 +277,13 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 this.sourceFileToDependenciesMap.set(fileName, dependencies);
 
 for (const resolveResult of dependencies) {
+// Don't perform a recursive descent into the files that are external
+if (isExternal(resolveResult.moduleSpecifier, fileName, this.options.externalOption)) {
+// Mark the module as external
+this.externalFiles.add(pickResolvedModule(resolveResult, true));
+continue;
+}
+
 for (const module of [resolveResult.resolvedFileName, resolveResult.resolvedAmbientFileName]) {
 if (module == null) continue;
 this.refreshDependenciesForFileName(module, seenModules);
@@ -364,7 +376,8 @@ export class CompilerHost extends ModuleResolutionHost implements TS.CompilerHos
 if (file == null) {
 const text = this.readFile(absoluteFileName);
 if (text == null) return undefined;
-file = this.add({fileName: absoluteFileName, text, fromRollup: false});
+
+file = this.add({fileName: absoluteFileName, text, fromRollup: false}, false);
 }
 
 const sourceFile = this.constructSourceFile(absoluteFileName, file.transformedText, languageVersion);

src/service/compiler-host/compiler-host.ts

@@ -1,4 +1,4 @@
-import {OutputBundle, OutputOptions, PluginContext} from "rollup";
+import {ExternalOption, OutputBundle, OutputOptions, PluginContext} from "rollup";
 import {TypescriptPluginOptions} from "../../../plugin/typescript-plugin-options";
 import {isOutputChunk} from "../../../util/is-output-chunk/is-output-chunk";
 import {getDeclarationOutDir} from "../../../util/get-declaration-out-dir/get-declaration-out-dir";
@@ -22,6 +22,7 @@ export interface EmitDeclarationsOptions {
 bundle: OutputBundle;
 host: CompilerHost;
 pluginOptions: TypescriptPluginOptions;
+externalOption: ExternalOption | undefined;
 outputOptions: OutputOptions;
 multiEntryFileNames: Set<string> | undefined;
 originalCompilerOptions: TS.CompilerOptions;
@@ -37,7 +38,14 @@ export function emitDeclarations(options: EmitDeclarationsOptions): void {
 const chunks = Object.values(options.bundle).filter(isOutputChunk).map(preNormalizeChunk);
 
 // Merge ambient dependencies into the chunks
-mergeChunksWithAmbientDependencies(chunks, options.host, options.outputOptions.format, options.outputOptions.chunkFileNames);
+mergeChunksWithAmbientDependencies({
+chunks,
+host: options.host,
+externalOption: options.externalOption,
+chunkFileNames: options.outputOptions.chunkFileNames,
+format: options.outputOptions.format
+});
+
 // Normalize the chunks
 const normalizedChunks = chunks.map(chunk => normalizeChunk(chunk, {...options, relativeOutDir}));
 

src/service/emit/declaration/emit-declarations.ts

@@ -2,11 +2,13 @@ import {FileSystem} from "../../util/file-system/file-system";
 import {TS} from "../../type/ts";
 import {SupportedExtensions} from "../../util/get-supported-extensions/get-supported-extensions";
 import {ParsedCommandLineResult} from "../../util/get-parsed-command-line/parsed-command-line-result";
+import {ExternalOption} from "rollup";
 
 export interface ModuleResolutionHostOptions {
 typescript: typeof TS;
 parsedCommandLineResult: ParsedCommandLineResult;
 extensions: SupportedExtensions;
+externalOption: ExternalOption | undefined;
 fileSystem: FileSystem;
 cwd: string;
 }

src/service/module-resolution-host/module-resolution-host-options.ts

@@ -7,11 +7,11 @@ import {CompilerHost} from "../../compiler-host/compiler-host";
 import {PathsResult} from "./util/prepare-paths/prepare-paths";
 import {SourceFileToExportedSymbolSet} from "./transformers/track-exports-transformer/track-exports-transformer-visitor-options";
 import {SourceFileToImportedSymbolSet} from "./transformers/track-imports-transformer/track-imports-transformer-visitor-options";
-import {ExtendedResolvedModule} from "../../cache/resolve-cache/extended-resolved-module";
 import {TypeReference} from "./util/get-type-reference-module-from-file-name";
 import {DeclarationStats} from "../../../type/declaration-stats";
+import {ModuleDependency} from "../../../util/get-module-dependencies/get-module-dependencies";
 
-export type SourceFileToDependenciesMap = Map<string, Set<ExtendedResolvedModule>>;
+export type SourceFileToDependenciesMap = Map<string, Set<ModuleDependency>>;
 export type ModuleSpecifierToSourceFileMap = Map<string, TS.SourceFile>;
 export type DeclarationTransformer = (options: SourceFileBundlerVisitorOptions) => TS.SourceFile;
 

src/service/transformer/declaration-bundler/declaration-bundler-options.ts

@@ -1,18 +1,18 @@
 import {TS} from "../../../../../type/ts";
-import {ExtendedResolvedModule} from "../../../../cache/resolve-cache/extended-resolved-module";
 import {CompilerHost} from "../../../../compiler-host/compiler-host";
+import {ModuleDependency} from "../../../../../util/get-module-dependencies/get-module-dependencies";
 
 export interface TrackDependenciesOptions {
 host: CompilerHost;
-typescript: typeof TS;
 sourceFile: TS.SourceFile;
 }
 
 export interface TrackDependenciesTransformerVisitorOptions<T extends TS.Node> extends TrackDependenciesOptions {
 node: T;
 shouldDeepTraverse: boolean;
+typescript: typeof TS;
 
 childContinuation<U extends TS.Node>(node: U): void;
 continuation<U extends TS.Node>(node: U): void;
-addDependency(module: ExtendedResolvedModule): void;
+addDependency(module: ModuleDependency): void;
 }

src/service/transformer/declaration-bundler/transformers/track-dependencies-transformer/track-dependencies-transformer-visitor-options.ts

@@ -1,19 +1,20 @@
 import {TS} from "../../../../../type/ts";
 import {visitNode} from "./visitor/visit-node";
 import {TrackDependenciesOptions, TrackDependenciesTransformerVisitorOptions} from "./track-dependencies-transformer-visitor-options";
-import {ExtendedResolvedModule} from "../../../../cache/resolve-cache/extended-resolved-module";
+import {ModuleDependency} from "../../../../../util/get-module-dependencies/get-module-dependencies";
 
-export function trackDependenciesTransformer(options: TrackDependenciesOptions): Set<ExtendedResolvedModule> {
-const {typescript} = options;
-const dependencies: Set<ExtendedResolvedModule> = new Set();
+export function trackDependenciesTransformer(options: TrackDependenciesOptions): Set<ModuleDependency> {
+const typescript = options.host.getTypescript();
+const dependencies: Set<ModuleDependency> = new Set();
 
 // Prepare some VisitorOptions
 const visitorOptions: Omit<TrackDependenciesTransformerVisitorOptions<TS.Node>, "node"> = {
 ...options,
+typescript,
 // Optimization: We only need to traverse nested nodes inside of the SourceFile if it contains at least one ImportTypeNode (or at least what appears to be one)
 shouldDeepTraverse: options.sourceFile.text.includes("import("),
 
-addDependency(resolvedModule: ExtendedResolvedModule): void {
+addDependency(resolvedModule: ModuleDependency): void {
 dependencies.add(resolvedModule);
 },