provide hashed file name when using this.getFileName in generateBundle (

#4747)
rollup · Dec 11, 2022 · a0d4d69 · a0d4d69
1 parent 2effc19
commit a0d4d69
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 31 deletions.
diff --git a/src/Chunk.ts b/src/Chunk.ts
@@ -163,7 +163,6 @@ export default class Chunk {
 	execIndex: number;
 	exportMode: 'none' | 'named' | 'default' = 'named';
 	facadeModule: Module | null = null;
-	id: string | null = null;
 	namespaceVariableName = '';
 	suggestedVariableName: string;
 	variableName = '';
@@ -318,6 +317,32 @@ export default class Chunk {
 		return true;
 	}
 
+	finalizeChunk(
+		code: string,
+		map: SourceMap | null,
+		hashesByPlaceholder: Map<string, string>
+	): OutputChunk {
+		const renderedChunkInfo = this.getRenderedChunkInfo();
+		const finalize = (code: string) => replacePlaceholders(code, hashesByPlaceholder);
+		const fileName = (this.fileName = finalize(renderedChunkInfo.fileName));
+		return {
+			...renderedChunkInfo,
+			code,
+			dynamicImports: renderedChunkInfo.dynamicImports.map(finalize),
+			fileName,
+			implicitlyLoadedBefore: renderedChunkInfo.implicitlyLoadedBefore.map(finalize),
+			importedBindings: Object.fromEntries(
+				Object.entries(renderedChunkInfo.importedBindings).map(([fileName, bindings]) => [
+					finalize(fileName),
+					bindings
+				])
+			),
+			imports: renderedChunkInfo.imports.map(finalize),
+			map,
+			referencedFiles: renderedChunkInfo.referencedFiles.map(finalize)
+		};
+	}
+
 	generateExports(): void {
 		this.sortedExportNames = null;
 		const remainingExports = new Set(this.exports);
@@ -449,31 +474,6 @@ export default class Chunk {
 		return facades;
 	}
 
-	generateOutputChunk(
-		code: string,
-		map: SourceMap | null,
-		hashesByPlaceholder: Map<string, string>
-	): OutputChunk {
-		const renderedChunkInfo = this.getRenderedChunkInfo();
-		const finalize = (code: string) => replacePlaceholders(code, hashesByPlaceholder);
-		return {
-			...renderedChunkInfo,
-			code,
-			dynamicImports: renderedChunkInfo.dynamicImports.map(finalize),
-			fileName: finalize(renderedChunkInfo.fileName),
-			implicitlyLoadedBefore: renderedChunkInfo.implicitlyLoadedBefore.map(finalize),
-			importedBindings: Object.fromEntries(
-				Object.entries(renderedChunkInfo.importedBindings).map(([fileName, bindings]) => [
-					finalize(fileName),
-					bindings
-				])
-			),
-			imports: renderedChunkInfo.imports.map(finalize),
-			map,
-			referencedFiles: renderedChunkInfo.referencedFiles.map(finalize)
-		};
-	}
-
 	getChunkName(): string {
 		return (this.name ??= this.outputOptions.sanitizeFileName(this.getFallbackChunkName()));
 	}
@@ -483,7 +483,7 @@ export default class Chunk {
 	}
 
 	getFileName(): string {
-		return this.preliminaryFileName?.fileName || this.getPreliminaryFileName().fileName;
+		return this.fileName || this.getPreliminaryFileName().fileName;
 	}
 
 	getImportPath(importer: string): string {

diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts
@@ -144,8 +144,7 @@ function getChunkFileName(
 		return file.fileName;
 	}
 	if (facadeChunkByModule) {
-		const chunk = facadeChunkByModule.get(file.module!)!;
-		return chunk.id || chunk.getFileName();
+		return facadeChunkByModule.get(file.module!)!.getFileName();
 	}
 	return error(errorChunkNotGeneratedForFileName(file.fileName || file.name));
 }

diff --git a/src/utils/renderChunks.ts b/src/utils/renderChunks.ts
@@ -309,15 +309,15 @@ function addChunksToBundle(
 			map.file = replacePlaceholders(map.file, hashesByPlaceholder);
 			updatedCode += emitSourceMapAndGetComment(finalFileName, map, pluginDriver, options);
 		}
-		bundle[finalFileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder);
+		bundle[finalFileName] = chunk.finalizeChunk(updatedCode, map, hashesByPlaceholder);
 	}
 	for (const { chunk, code, fileName, map } of nonHashedChunksWithPlaceholders) {
 		let updatedCode =
 			hashesByPlaceholder.size > 0 ? replacePlaceholders(code, hashesByPlaceholder) : code;
 		if (map) {
 			updatedCode += emitSourceMapAndGetComment(fileName, map, pluginDriver, options);
 		}
-		bundle[fileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder);
+		bundle[fileName] = chunk.finalizeChunk(updatedCode, map, hashesByPlaceholder);
 	}
 }
 

diff --git a/test/function/samples/emit-chunk-hash/_config.js b/test/function/samples/emit-chunk-hash/_config.js
@@ -0,0 +1,20 @@
+const assert = require('node:assert');
+let referenceId;
+
+module.exports = {
+	description: 'gives access to the hashed filed name via this.getFileName in generateBundle',
+	options: {
+		input: 'main',
+		output: {
+			chunkFileNames: '[name]-[hash].js'
+		},
+		plugins: {
+			buildStart() {
+				referenceId = this.emitFile({ type: 'chunk', id: 'emitted' });
+			},
+			generateBundle() {
+				assert.strictEqual(this.getFileName(referenceId), 'emitted-38bdd9b2.js');
+			}
+		}
+	}
+};
diff --git a/test/function/samples/emit-chunk-hash/emitted.js b/test/function/samples/emit-chunk-hash/emitted.js
@@ -0,0 +1 @@
+assert.ok(true);
diff --git a/test/function/samples/emit-chunk-hash/main.js b/test/function/samples/emit-chunk-hash/main.js
@@ -0,0 +1 @@
+assert.ok(true);