fix: don't break when another plugin declares an asset that only late…

…r receives a source. Fixes #162
wessberg · Jan 3, 2022 · 3ec4c86 · 3ec4c86
1 parent a2e88e5
commit 3ec4c86
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 18 deletions.
diff --git a/src/plugin/typescript-plugin.ts b/src/plugin/typescript-plugin.ts
@@ -464,6 +464,8 @@ export default function typescriptRollupPlugin(pluginInputOptions: Partial<Types
 		generateBundle(this: PluginContext, outputOptions: OutputOptions, bundle: OutputBundle): void {
 			// If debugging is active, log the outputted files
 			for (const file of Object.values(bundle)) {
+				if (!("fileName" in file)) continue;
+
 				const normalizedFileName = path.normalize(file.fileName);
 				const text = "code" in file ? file.code : file.source.toString();
 				if (shouldDebugEmit(pluginOptions.debug, normalizedFileName, text, "javascript")) {
@@ -481,7 +483,6 @@ export default function typescriptRollupPlugin(pluginInputOptions: Partial<Types
 			if (Boolean(parsedCommandLineResult.parsedCommandLine.options.incremental) || Boolean(parsedCommandLineResult.parsedCommandLine.options.composite)) {
 				emitBuildInfo({
 					host,
-					bundle,
 					outputOptions,
 					pluginOptions,
 					pluginContext: this

diff --git a/src/service/emit/tsbuildinfo/emit-build-info.ts b/src/service/emit/tsbuildinfo/emit-build-info.ts
@@ -1,4 +1,4 @@
-import {OutputBundle, OutputOptions, PluginContext} from "rollup";
+import {OutputOptions, PluginContext} from "rollup";
 import {CompilerHost} from "../../compiler-host/compiler-host";
 import {TypescriptPluginOptions} from "../../../plugin/typescript-plugin-options";
 import path from "crosspath";
@@ -9,7 +9,6 @@ import {logEmit} from "../../../util/logging/log-emit";
 
 export interface EmitBuildInfoOptions {
 	pluginContext: PluginContext;
-	bundle: OutputBundle;
 	host: CompilerHost;
 	pluginOptions: TypescriptPluginOptions;
 	outputOptions: OutputOptions;

diff --git a/src/util/is-output-chunk/is-output-chunk.ts b/src/util/is-output-chunk/is-output-chunk.ts
@@ -4,5 +4,12 @@ import {OutputChunk, OutputAsset} from "rollup";
  * Returns true if the given asset is an OutputChunk
  */
 export function isOutputChunk(thing: OutputChunk | OutputAsset): thing is OutputChunk {
-	return !("isAsset" in thing);
+	return thing.type === "chunk";
+}
+
+/**
+ * Returns true if the given asset is an OutputChunk
+ */
+ export function isOutputAssetOrOutputChunk(thing: OutputChunk | OutputAsset): thing is OutputChunk|OutputAsset {
+	return thing.type === "chunk" || thing.type === "asset";
 }
diff --git a/src/util/take-bundled-filenames/take-bundled-filenames.ts b/src/util/take-bundled-filenames/take-bundled-filenames.ts
@@ -10,7 +10,7 @@ export function takeBundledFilesNames(bundle: OutputBundle): Set<string> {
 	Object.values(bundle).forEach(value => {
 		if (isOutputChunk(value)) {
 			Object.keys(value.modules).forEach(fileName => bundledFilenames.add(path.normalize(fileName)));
-		} else {
+		} else if ("fileName" in value) {
 			bundledFilenames.add(path.normalize(value.fileName));
 		}
 	});

diff --git a/test/babel.test.ts b/test/babel.test.ts
@@ -508,7 +508,7 @@ test.serial("Will use the proper @babel/runtime/helpers/esm helpers when format
 		}
 	} = bundle;
 
-	t.deepEqual(formatCode(file.code), formatCode(`import '@babel/runtime/helpers/esm/typeof';`));
+	t.true(formatCode(file.code).includes(`@babel/runtime/helpers/esm/typeof`));
 });
 
 test.serial("Will use the proper @babel/runtime/helpers helpers when format is CJS. #1", withTypeScript, async (t, {typescript}) => {

diff --git a/test/deferred-assets.test.ts b/test/deferred-assets.test.ts
@@ -0,0 +1,46 @@
+import test from "ava";
+import {withTypeScript} from "./util/ts-macro";
+import {generateRollupBundle} from "./setup/setup-rollup";
+import {formatCode} from "./util/format-code";
+
+test.serial("Won't break when other plugins declare deferred assets. #1", withTypeScript, async (t, {typescript}) => {
+	let asset: string | undefined;
+
+	const bundle = await generateRollupBundle(
+		[
+			{
+				entry: true,
+				fileName: "index.ts",
+				text: `\
+				console.log('whatever');`
+			}
+		],
+		{
+			typescript,
+			postPlugins: [
+				{
+					name: "my-plugin",
+					buildStart() {
+						asset = this.emitFile({
+							type: "asset",
+							fileName: "test.txt"
+						});
+					},
+					generateBundle() {
+						this.setAssetSource(asset!, "whatever");
+					}
+				}
+			]
+		}
+	);
+	const {
+		declarations: [file]
+	} = bundle;
+
+	t.deepEqual(
+		formatCode(file.code),
+		formatCode(`\
+			export {};
+		`)
+	);
+});
diff --git a/test/setup/test-file.ts b/test/setup/test-file.ts
@@ -63,18 +63,20 @@ export function createBuiltInModuleTestFiles(...modules: ("fs" | "globals" | "bu
 				}
 			`
 		},
-		{
-			entry: false,
-			fileName: "node_modules/@types/node/index.d.ts",
-			text: `
-				/// <reference path="./${module}.d.ts" />
-				`
-		},
-		...modules.map(module => ({
-			entry: false,
-			fileName: `node_modules/@types/node/${module}.d.ts`,
-			text: fsWorker.readFile(path.native.join(nodeTypesDir, `${module}.d.ts`)) ?? ""
-		}))
+		...modules.flatMap(module => [
+			{
+				entry: false,
+				fileName: "node_modules/@types/node/index.d.ts",
+				text: `
+					/// <reference path="./${module}.d.ts" />
+					`
+			},
+			{
+				entry: false,
+				fileName: `node_modules/@types/node/${module}.d.ts`,
+				text: fsWorker.readFile(path.native.join(nodeTypesDir, `${module}.d.ts`)) ?? ""
+			}
+		])
 	];
 }