Sanitize shortened internal export names (#2768)

rollup · Mar 24, 2019 · 9cbb73e · 9cbb73e
1 parent dec4d83
commit 9cbb73e
Show file tree

Hide file tree

Showing 18 changed files with 3,104 additions and 7 deletions.
diff --git a/src/Chunk.ts b/src/Chunk.ts
@@ -34,6 +34,7 @@ import relativeId from './utils/relativeId';
 import renderChunk from './utils/renderChunk';
 import { RenderOptions } from './utils/renderHelpers';
 import { makeUnique, renderNamePattern } from './utils/renderNamePattern';
+import { RESERVED_NAMES } from './utils/reservedNames';
 import { sanitizeFileName } from './utils/sanitizeFileName';
 import { timeEnd, timeStart } from './utils/timers';
 import { MISSING_EXPORT_SHIM_VARIABLE } from './utils/variableNames';
@@ -248,12 +249,14 @@ export default class Chunk {
 		const exportedVariables = Array.from(this.exports);
 		if (mangle) {
 			for (const variable of exportedVariables) {
-				safeExportName = toBase64(++i);
-				// skip past leading number identifiers
-				if (safeExportName.charCodeAt(0) === 49 /* '1' */) {
-					i += 9 * 64 ** (safeExportName.length - 1);
-					safeExportName = toBase64(i);
-				}
+				do {
+					safeExportName = toBase64(++i);
+					// skip past leading number identifiers
+					if (safeExportName.charCodeAt(0) === 49 /* '1' */) {
+						i += 9 * 64 ** (safeExportName.length - 1);
+						safeExportName = toBase64(i);
+					}
+				} while (RESERVED_NAMES[safeExportName]);
 				this.exportNames[safeExportName] = variable;
 			}
 		} else {

diff --git a/src/utils/reservedNames.ts b/src/utils/reservedNames.ts
@@ -4,7 +4,7 @@ export interface NameCollection {
 	[name: string]: true;
 }
 
-const RESERVED_NAMES: NameCollection = Object.assign(Object.create(null), {
+export const RESERVED_NAMES: NameCollection = Object.assign(Object.create(null), {
 	await: true,
 	break: true,
 	case: true,

diff --git a/test/chunking-form/samples/sanitize-internal-exports/_config.js b/test/chunking-form/samples/sanitize-internal-exports/_config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	description: 'make sure internal exports are sanitized',
+	options: {
+		input: ['main.js']
+	}
+};