Fully support arbitrary module namespace identifiers for all formats (#…

…5298) Support arbitrary module namespace identifiers
rollup · Dec 13, 2023 · 44889e0 · 44889e0
1 parent 7f9d85c
commit 44889e0
Show file tree

Hide file tree

Showing 412 changed files with 1,132 additions and 721 deletions.
diff --git a/src/Module.ts b/src/Module.ts
@@ -1023,7 +1023,7 @@ export default class Module {
 			if (node.exported) {
 				// export * as name from './other'
 
-				const name = node.exported.name;
+				const name = node.exported instanceof Literal ? node.exported.value : node.exported.name;
 				this.assertUniqueExportName(name, node.exported.start);
 				this.reexportDescriptions.set(name, {
 					localName: '*',

diff --git a/src/ast/nodes/ExportAllDeclaration.ts b/src/ast/nodes/ExportAllDeclaration.ts
@@ -8,7 +8,7 @@ import { NodeBase } from './shared/Node';
 
 export default class ExportAllDeclaration extends NodeBase {
 	declare attributes: ImportAttribute[];
-	declare exported: Identifier | null;
+	declare exported: Identifier | Literal<string> | null;
 	declare needsBoundaries: true;
 	declare source: Literal<string>;
 	declare type: NodeType.tExportAllDeclaration;

diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts
@@ -1,4 +1,5 @@
 import type { AstContext, default as Module } from '../../Module';
+import { stringifyObjectKeyIfNeeded } from '../../utils/identifierHelpers';
 import { getToStringTagValue, MERGE_NAMESPACES_VARIABLE } from '../../utils/interopHelpers';
 import type { RenderOptions } from '../../utils/renderHelpers';
 import { getSystemExportStatement } from '../../utils/systemJsRendering';
@@ -139,7 +140,9 @@ export default class NamespaceVariable extends Variable {
 				if (this.referencedEarly || variable.isReassigned || variable === this) {
 					return [
 						null,
-						`get ${name}${_}()${_}{${_}return ${variable.getName(getPropertyAccess)}${s}${_}}`
+						`get ${stringifyObjectKeyIfNeeded(name)}${_}()${_}{${_}return ${variable.getName(
+							getPropertyAccess
+						)}${s}${_}}`
 					];
 				}
 

diff --git a/src/finalisers/es.ts b/src/finalisers/es.ts
@@ -2,6 +2,7 @@ import type { Bundle as MagicStringBundle } from 'magic-string';
 import type { ChunkDependency, ChunkExports, ImportSpecifier, ReexportSpecifier } from '../Chunk';
 import type { NormalizedOutputOptions } from '../rollup/types';
 import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets';
+import { stringifyIdentifierIfNeeded } from '../utils/identifierHelpers';
 import { getHelpersBlock } from '../utils/interopHelpers';
 import type { FinaliserOptions } from './index';
 
@@ -68,7 +69,7 @@ function getImportBlock(
 						.map(specifier =>
 							specifier.imported === specifier.local
 								? specifier.imported
-								: `${specifier.imported} as ${specifier.local}`
+								: `${stringifyIdentifierIfNeeded(specifier.imported)} as ${specifier.local}`
 						)
 						.join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}`
 				);
@@ -100,7 +101,9 @@ function getImportBlock(
 				for (const specifier of namespaceReexports) {
 					importBlock.push(
 						`export${_}{${_}${
-							name === specifier.reexported ? name : `${name} as ${specifier.reexported}`
+							name === specifier.reexported
+								? name
+								: `${name} as ${stringifyIdentifierIfNeeded(specifier.reexported)}`
 						} };`
 					);
 				}
@@ -110,8 +113,10 @@ function getImportBlock(
 					`export${_}{${_}${namedReexports
 						.map(specifier =>
 							specifier.imported === specifier.reexported
-								? specifier.imported
-								: `${specifier.imported} as ${specifier.reexported}`
+								? stringifyIdentifierIfNeeded(specifier.imported)
+								: `${stringifyIdentifierIfNeeded(
+										specifier.imported
+								  )} as ${stringifyIdentifierIfNeeded(specifier.reexported)}`
 						)
 						.join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}`
 				);
@@ -131,7 +136,7 @@ function getExportBlock(exports: ChunkExports, { _, cnst }: GenerateCodeSnippets
 		exportDeclaration.push(
 			specifier.exported === specifier.local
 				? specifier.local
-				: `${specifier.local} as ${specifier.exported}`
+				: `${specifier.local} as ${stringifyIdentifierIfNeeded(specifier.exported)}`
 		);
 	}
 	if (exportDeclaration.length > 0) {

diff --git a/src/finalisers/shared/getExportBlock.ts b/src/finalisers/shared/getExportBlock.ts
@@ -63,7 +63,9 @@ export function getExportBlock(
 							name: null
 						});
 						exportBlock +=
-							`Object.defineProperty(exports,${_}'${specifier.reexported}',${_}{${n}` +
+							`Object.defineProperty(exports,${_}${JSON.stringify(
+								specifier.reexported
+							)},${_}{${n}` +
 							`${t}enumerable:${_}true,${n}` +
 							`${t}get:${_}${left}${importName}${right}${n}});`;
 					} else {

diff --git a/src/utils/deconflictChunk.ts b/src/utils/deconflictChunk.ts
@@ -7,6 +7,7 @@ import ExportDefaultVariable from '../ast/variables/ExportDefaultVariable';
 import type SyntheticNamedExportVariable from '../ast/variables/SyntheticNamedExportVariable';
 import type Variable from '../ast/variables/Variable';
 import type { GetInterop, InternalModuleFormat } from '../rollup/types';
+import { makeLegal } from './identifierHelpers';
 import {
 	canDefaultBeTakenFromNamespace,
 	defaultInteropHelpersByInteropType,
@@ -127,7 +128,10 @@ function deconflictImportsEsmOrSystem(
 				)
 			);
 		} else {
-			variable.setRenderNames(null, getSafeName(name, usedNames, variable.forbiddenNames));
+			variable.setRenderNames(
+				null,
+				getSafeName(makeLegal(name), usedNames, variable.forbiddenNames)
+			);
 		}
 	}
 	for (const variable of syntheticExports) {

diff --git a/src/utils/generateCodeSnippets.ts b/src/utils/generateCodeSnippets.ts
@@ -1,5 +1,6 @@
 import type { NormalizedOutputOptions } from '../rollup/types';
 import RESERVED_NAMES from './RESERVED_NAMES';
+import { stringifyObjectKeyIfNeeded, VALID_IDENTIFIER_REGEXP } from './identifierHelpers';
 
 export interface GenerateCodeSnippets {
 	_: string;
@@ -83,8 +84,8 @@ export function getGenerateCodeSnippets({
 	];
 
 	const isValidPropertyName = reservedNamesAsProps
-		? (name: string): boolean => validPropertyName.test(name)
-		: (name: string): boolean => !RESERVED_NAMES.has(name) && validPropertyName.test(name);
+		? (name: string): boolean => VALID_IDENTIFIER_REGEXP.test(name)
+		: (name: string): boolean => !RESERVED_NAMES.has(name) && VALID_IDENTIFIER_REGEXP.test(name);
 
 	return {
 		_,
@@ -112,10 +113,10 @@ export function getGenerateCodeSnippets({
 			return `{${fields
 				.map(([key, value]) => {
 					if (key === null) return `${prefix}${value}`;
-					const needsQuotes = !isValidPropertyName(key);
-					return key === value && objectShorthand && !needsQuotes
+					const keyInObject = stringifyObjectKeyIfNeeded(key);
+					return key === value && objectShorthand && key === keyInObject
 						? prefix + key
-						: `${prefix}${needsQuotes ? `'${key}'` : key}:${_}${value}`;
+						: `${prefix}${keyInObject}:${_}${value}`;
 				})
 				.join(`,`)}${
 				fields.length === 0 ? '' : lineBreakIndent ? `${n}${lineBreakIndent.base}` : _
@@ -130,5 +131,3 @@ export function getGenerateCodeSnippets({
 
 const wrapIfNeeded = (code: string, needsParens: boolean | undefined): string =>
 	needsParens ? `(${code})` : code;
-
-const validPropertyName = /^(?!\d)[\w$]+$/;
diff --git a/src/utils/identifierHelpers.ts b/src/utils/identifierHelpers.ts
@@ -23,3 +23,20 @@ export function makeLegal(value: string): string {
 
 	return value || '_';
 }
+
+export const VALID_IDENTIFIER_REGEXP = /^[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*$/u;
+export const NUMBER_REGEXP = /^\d+$/;
+
+export function stringifyObjectKeyIfNeeded(key: string) {
+	if (VALID_IDENTIFIER_REGEXP.test(key) || NUMBER_REGEXP.test(key)) {
+		return key;
+	}
+	return JSON.stringify(key);
+}
+
+export function stringifyIdentifierIfNeeded(key: string) {
+	if (VALID_IDENTIFIER_REGEXP.test(key)) {
+		return key;
+	}
+	return JSON.stringify(key);
+}
diff --git a/src/utils/systemJsRendering.ts b/src/utils/systemJsRendering.ts
@@ -12,9 +12,9 @@ export function getSystemExportStatement(
 		exportNamesByVariable.get(exportedVariables[0])!.length === 1
 	) {
 		const variable = exportedVariables[0];
-		return `exports('${exportNamesByVariable.get(variable)}',${_}${variable.getName(
-			getPropertyAccess
-		)}${modifier})`;
+		return `exports(${JSON.stringify(
+			exportNamesByVariable.get(variable)![0]
+		)},${_}${variable.getName(getPropertyAccess)}${modifier})`;
 	} else {
 		const fields: [key: string, value: string][] = [];
 		for (const variable of exportedVariables) {
@@ -26,6 +26,7 @@ export function getSystemExportStatement(
 	}
 }
 
+// This is only invoked if there is exactly one export name
 export function renderSystemExportExpression(
 	exportedVariable: Variable,
 	expressionStart: number,
@@ -35,7 +36,7 @@ export function renderSystemExportExpression(
 ): void {
 	code.prependRight(
 		expressionStart,
-		`exports('${exportNamesByVariable.get(exportedVariable)}',${_}`
+		`exports(${JSON.stringify(exportNamesByVariable.get(exportedVariable)![0])},${_}`
 	);
 	code.appendLeft(expressionEnd, ')');
 }

diff --git a/...king-form/samples/amd-id-auto-base-path-concat/_expected/system/some/where/generated-a.js b/...king-form/samples/amd-id-auto-base-path-concat/_expected/system/some/where/generated-a.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			const something = exports('something', 42);
+			const something = exports("something", 42);
 
 		})
 	};

diff --git a/...king-form/samples/amd-id-auto-base-path/_expected/system/some/where/chunks/generated-a.js b/...king-form/samples/amd-id-auto-base-path/_expected/system/some/where/chunks/generated-a.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			const something = exports('something', 42);
+			const something = exports("something", 42);
 
 		})
 	};

diff --git a/test/chunking-form/samples/amd-id-auto/_expected/system/generated-a.js b/test/chunking-form/samples/amd-id-auto/_expected/system/generated-a.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			const something = exports('something', 42);
+			const something = exports("something", 42);
 
 		})
 	};

diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js
@@ -16,7 +16,7 @@ System.register(['./generated-dep2.js'], (function (exports) {
           fn();
           fn$1();
         }
-      } exports('default', Main1);
+      } exports("default", Main1);
 
     })
   };

diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js
@@ -21,7 +21,7 @@ System.register(['./generated-dep2.js'], (function (exports) {
           fn();
           fn$2();
         }
-      } exports('default', Main2);
+      } exports("default", Main2);
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-assigment-in-dynamic/_expected/system/generated-c.js b/test/chunking-form/samples/chunk-assigment-in-dynamic/_expected/system/generated-c.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			var c = exports('c', {});
+			var c = exports("c", {});
 
 			(function (exports) {
 				exports.preFaPrint = {

diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			var x = exports('x', 42);
+			var x = exports("x", 42);
 			console.log('dep1');
 
 		})

diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			var x = exports('x', 43);
+			var x = exports("x", 43);
 			console.log('dep2');
 
 		})

diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			const x = exports('x', 0);
+			const x = exports("x", 0);
 			console.log('112');
 
 		})

diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js
@@ -11,7 +11,7 @@ System.register(['./generated-dep1.js'], (function (exports) {
         constructor () {
           fn();
         }
-      } exports('default', Main1);
+      } exports("default", Main1);
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js
@@ -11,7 +11,7 @@ System.register(['./generated-dep1.js'], (function (exports) {
         constructor () {
           fn();
         }
-      } exports('default', Main2);
+      } exports("default", Main2);
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-main1.js
@@ -7,9 +7,9 @@ System.register([], (function (exports) {
         test() {
             return ONE_CONSTANT;
         }
-      } exports('a', One);
+      } exports("a", One);
 
-      const ONE_CONSTANT = exports('O', 'oneconstant');
+      const ONE_CONSTANT = exports("O", 'oneconstant');
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js
@@ -11,7 +11,7 @@ System.register(['./generated-main1.js'], (function (exports) {
                 test() {
                     return ONE_CONSTANT;
                 }
-            } exports('ItemTwo', Two);
+            } exports("ItemTwo", Two);
 
         })
     };

diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-dep1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-dep1.js
@@ -15,17 +15,17 @@ System.register([], (function (exports) {
       function fn$1 () {
         fn$2();
         console.log(text);
-        exports('b', text$1 = 'dep1 fn after dep2');
+        exports("b", text$1 = 'dep1 fn after dep2');
       }
 
-      var text$1 = exports('b', 'dep1 fn');
+      var text$1 = exports("b", 'dep1 fn');
 
       function fn () {
         console.log(text$1);
-        exports('t', text = 'dep2 fn after dep1');
+        exports("t", text = 'dep2 fn after dep1');
       }
 
-      var text = exports('t', 'dep2 fn');
+      var text = exports("t", 'dep2 fn');
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js
@@ -13,7 +13,7 @@ System.register(['./generated-dep1.js'], (function (exports) {
           fn();
           console.log(text);
         }
-      } exports('default', Main1);
+      } exports("default", Main1);
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js
@@ -13,7 +13,7 @@ System.register(['./generated-dep1.js'], (function (exports) {
           fn();
           console.log(text);
         }
-      } exports('default', Main2);
+      } exports("default", Main2);
 
     })
   };

diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-shared.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-shared.js
@@ -3,10 +3,10 @@ System.register([], (function (exports) {
         return {
                 execute: (function () {
 
-                        var commonjsGlobal = exports('c', typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {});
+                        var commonjsGlobal = exports("c", typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {});
 
                         commonjsGlobal.data = [4, 5, 6];
-                        var shared = exports('s', commonjsGlobal.data);
+                        var shared = exports("s", commonjsGlobal.data);
 
                 })
         };

diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk.js b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			var num = exports('n', 1);
+			var num = exports("n", 1);
 
 		})
 	};

diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk2.js b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk2.js
@@ -3,7 +3,7 @@ System.register([], (function (exports) {
 	return {
 		execute: (function () {
 
-			var num = exports('n', 2);
+			var num = exports("n", 2);
 
 		})
 	};