Sort namespace object keys (#4780)

* Sort namespace object keys * Fix existing tests * add test Co-authored-by: Lukas Taegert-Atkinson <lukastaegert@users.noreply.github.com>
rollup · Jan 2, 2023 · f00b251 · f00b251
1 parent 08b61f5
commit f00b251
Show file tree

Hide file tree

Showing 62 changed files with 153 additions and 110 deletions.
diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts
@@ -74,8 +74,11 @@ export default class NamespaceVariable extends Variable {
 		if (this.memberVariables) {
 			return this.memberVariables;
 		}
+
 		const memberVariables: { [name: string]: Variable } = Object.create(null);
-		for (const name of [...this.context.getExports(), ...this.context.getReexports()]) {
+		const sortedExports = [...this.context.getExports(), ...this.context.getReexports()].sort();
+
+		for (const name of sortedExports) {
 			if (name[0] !== '*' && name !== this.module.info.syntheticNamedExports) {
 				const exportedVariable = this.context.traceExport(name);
 				if (exportedVariable) {

diff --git a/test/chunking-form/samples/combined-namespace-reexport/_expected/amd/main1.js b/test/chunking-form/samples/combined-namespace-reexport/_expected/amd/main1.js
@@ -2,8 +2,8 @@ define(['./generated-geometry'], (function (geometry) { 'use strict';
 
 	var mod = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		volume: geometry.volume,
-		geometry: geometry.geometry
+		geometry: geometry.geometry,
+		volume: geometry.volume
 	});
 
 	console.log(mod);

diff --git a/test/chunking-form/samples/combined-namespace-reexport/_expected/cjs/main1.js b/test/chunking-form/samples/combined-namespace-reexport/_expected/cjs/main1.js
@@ -4,8 +4,8 @@ var geometry = require('./generated-geometry.js');
 
 var mod = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	volume: geometry.volume,
-	geometry: geometry.geometry
+	geometry: geometry.geometry,
+	volume: geometry.volume
 });
 
 console.log(mod);
diff --git a/test/chunking-form/samples/combined-namespace-reexport/_expected/es/main1.js b/test/chunking-form/samples/combined-namespace-reexport/_expected/es/main1.js
@@ -1,9 +1,9 @@
-import { v as volume, g as geometry } from './generated-geometry.js';
+import { g as geometry, v as volume } from './generated-geometry.js';
 
 var mod = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	volume: volume,
-	geometry: geometry
+	geometry: geometry,
+	volume: volume
 });
 
 console.log(mod);
diff --git a/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main1.js b/test/chunking-form/samples/combined-namespace-reexport/_expected/system/main1.js
@@ -1,17 +1,17 @@
 System.register(['./generated-geometry.js'], (function () {
 	'use strict';
-	var volume, geometry;
+	var geometry, volume;
 	return {
 		setters: [function (module) {
-			volume = module.v;
 			geometry = module.g;
+			volume = module.v;
 		}],
 		execute: (function () {
 
 			var mod = /*#__PURE__*/Object.freeze({
 				__proto__: null,
-				volume: volume,
-				geometry: geometry
+				geometry: geometry,
+				volume: volume
 			});
 
 			console.log(mod);

diff --git a/...-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic.js b/...-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic.js
@@ -20,8 +20,8 @@ define(['exports'], (function (exports) { 'use strict';
 
 	var dynamic1 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		DYNAMIC_1: DYNAMIC_1,
 		DEP: DEP,
+		DYNAMIC_1: DYNAMIC_1,
 		DYNAMIC_2: DYNAMIC_2,
 		DYNAMIC_3: DYNAMIC_3
 	});

diff --git a/...-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic.js b/...-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic.js
@@ -20,8 +20,8 @@ const DYNAMIC_1 = 'DYNAMIC_1';
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_1: DYNAMIC_1,
 	DEP: DEP,
+	DYNAMIC_1: DYNAMIC_1,
 	DYNAMIC_2: DYNAMIC_2,
 	DYNAMIC_3: DYNAMIC_3
 });

diff --git a/...g-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/es/generated-dynamic.js b/...g-form/samples/deprecated/manual-chunks-dynamic-facades/_expected/es/generated-dynamic.js
@@ -18,8 +18,8 @@ const DYNAMIC_1 = 'DYNAMIC_1';
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_1: DYNAMIC_1,
 	DEP: DEP,
+	DYNAMIC_1: DYNAMIC_1,
 	DYNAMIC_2: DYNAMIC_2,
 	DYNAMIC_3: DYNAMIC_3
 });

diff --git a/...rm/samples/deprecated/manual-chunks-dynamic-facades/_expected/system/generated-dynamic.js b/...rm/samples/deprecated/manual-chunks-dynamic-facades/_expected/system/generated-dynamic.js
@@ -25,8 +25,8 @@ System.register([], (function (exports) {
 
 			var dynamic1 = /*#__PURE__*/Object.freeze({
 				__proto__: null,
-				DYNAMIC_1: DYNAMIC_1,
 				DEP: DEP,
+				DYNAMIC_1: DYNAMIC_1,
 				DYNAMIC_2: DYNAMIC_2,
 				DYNAMIC_3: DYNAMIC_3
 			});

diff --git a/...samples/deprecated/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic.js b/...samples/deprecated/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic.js
@@ -15,8 +15,8 @@ define(['exports'], (function (exports) { 'use strict';
 
 	var dynamic1 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		DYNAMIC_B: DYNAMIC_A,
-		DYNAMIC_A: DYNAMIC_B
+		DYNAMIC_A: DYNAMIC_B,
+		DYNAMIC_B: DYNAMIC_A
 	});
 
 	exports.dynamic1 = dynamic1;

diff --git a/...samples/deprecated/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic.js b/...samples/deprecated/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic.js
@@ -15,8 +15,8 @@ console.log('dynamic1');
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_B: DYNAMIC_A,
-	DYNAMIC_A: DYNAMIC_B
+	DYNAMIC_A: DYNAMIC_B,
+	DYNAMIC_B: DYNAMIC_A
 });
 
 exports.dynamic1 = dynamic1;

diff --git a/.../samples/deprecated/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic.js b/.../samples/deprecated/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic.js
@@ -13,8 +13,8 @@ console.log('dynamic1');
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_B: DYNAMIC_A,
-	DYNAMIC_A: DYNAMIC_B
+	DYNAMIC_A: DYNAMIC_B,
+	DYNAMIC_B: DYNAMIC_A
 });
 
 export { dynamic1 as a, dynamic2 as d };
diff --git a/...ples/deprecated/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic.js b/...ples/deprecated/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic.js
@@ -19,8 +19,8 @@ System.register([], (function (exports) {
 
 			var dynamic1 = /*#__PURE__*/Object.freeze({
 				__proto__: null,
-				DYNAMIC_B: DYNAMIC_A,
-				DYNAMIC_A: DYNAMIC_B
+				DYNAMIC_A: DYNAMIC_B,
+				DYNAMIC_B: DYNAMIC_A
 			});
 			exports('a', dynamic1);
 

diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic.js
@@ -20,8 +20,8 @@ define(['exports'], (function (exports) { 'use strict';
 
 	var dynamic1 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		DYNAMIC_1: DYNAMIC_1,
 		DEP: DEP,
+		DYNAMIC_1: DYNAMIC_1,
 		DYNAMIC_2: DYNAMIC_2,
 		DYNAMIC_3: DYNAMIC_3
 	});

diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic.js
@@ -20,8 +20,8 @@ const DYNAMIC_1 = 'DYNAMIC_1';
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_1: DYNAMIC_1,
 	DEP: DEP,
+	DYNAMIC_1: DYNAMIC_1,
 	DYNAMIC_2: DYNAMIC_2,
 	DYNAMIC_3: DYNAMIC_3
 });

diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic.js
@@ -18,8 +18,8 @@ const DYNAMIC_1 = 'DYNAMIC_1';
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_1: DYNAMIC_1,
 	DEP: DEP,
+	DYNAMIC_1: DYNAMIC_1,
 	DYNAMIC_2: DYNAMIC_2,
 	DYNAMIC_3: DYNAMIC_3
 });

diff --git a/...chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic.js b/...chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic.js
@@ -25,8 +25,8 @@ System.register([], (function (exports) {
 
 			var dynamic1 = /*#__PURE__*/Object.freeze({
 				__proto__: null,
-				DYNAMIC_1: DYNAMIC_1,
 				DEP: DEP,
+				DYNAMIC_1: DYNAMIC_1,
 				DYNAMIC_2: DYNAMIC_2,
 				DYNAMIC_3: DYNAMIC_3
 			});

diff --git a/...nking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic.js b/...nking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic.js
@@ -15,8 +15,8 @@ define(['exports'], (function (exports) { 'use strict';
 
 	var dynamic1 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		DYNAMIC_B: DYNAMIC_A,
-		DYNAMIC_A: DYNAMIC_B
+		DYNAMIC_A: DYNAMIC_B,
+		DYNAMIC_B: DYNAMIC_A
 	});
 
 	exports.dynamic1 = dynamic1;

diff --git a/...nking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic.js b/...nking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic.js
@@ -15,8 +15,8 @@ console.log('dynamic1');
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_B: DYNAMIC_A,
-	DYNAMIC_A: DYNAMIC_B
+	DYNAMIC_A: DYNAMIC_B,
+	DYNAMIC_B: DYNAMIC_A
 });
 
 exports.dynamic1 = dynamic1;

diff --git a/...unking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic.js b/...unking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic.js
@@ -13,8 +13,8 @@ console.log('dynamic1');
 
 var dynamic1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	DYNAMIC_B: DYNAMIC_A,
-	DYNAMIC_A: DYNAMIC_B
+	DYNAMIC_A: DYNAMIC_B,
+	DYNAMIC_B: DYNAMIC_A
 });
 
 export { dynamic1 as a, dynamic2 as d };
diff --git a/...ng-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic.js b/...ng-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic.js
@@ -19,8 +19,8 @@ System.register([], (function (exports) {
 
 			var dynamic1 = /*#__PURE__*/Object.freeze({
 				__proto__: null,
-				DYNAMIC_B: DYNAMIC_A,
-				DYNAMIC_A: DYNAMIC_B
+				DYNAMIC_A: DYNAMIC_B,
+				DYNAMIC_B: DYNAMIC_A
 			});
 			exports('a', dynamic1);
 

diff --git a/...unking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js b/...unking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js
@@ -20,8 +20,8 @@ define(['exports'], (function (exports) { 'use strict';
 
 	var dep$1 = /*#__PURE__*/_mergeNamespaces({
 		__proto__: null,
-		default: dep,
-		bar: bar
+		bar: bar,
+		default: dep
 	}, [dep]);
 
 	exports.dep = dep$1;

diff --git a/...unking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js b/...unking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js
@@ -20,8 +20,8 @@ const bar = 2;
 
 var dep$1 = /*#__PURE__*/_mergeNamespaces({
 	__proto__: null,
-	default: dep,
-	bar: bar
+	bar: bar,
+	default: dep
 }, [dep]);
 
 exports.dep = dep$1;
diff --git a/...hunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js b/...hunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js
@@ -18,8 +18,8 @@ const bar = 2;
 
 var dep$1 = /*#__PURE__*/_mergeNamespaces({
 	__proto__: null,
-	default: dep,
-	bar: bar
+	bar: bar,
+	default: dep
 }, [dep]);
 
 export { dep$1 as d };
diff --git a/...ing-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js b/...ing-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js
@@ -23,8 +23,8 @@ System.register([], (function (exports) {
 
 			var dep$1 = /*#__PURE__*/_mergeNamespaces({
 				__proto__: null,
-				default: dep,
-				bar: bar
+				bar: bar,
+				default: dep
 			}, [dep]);
 			exports('d', dep$1);
 

diff --git a/...-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js b/...-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js
@@ -23,8 +23,8 @@ define(['exports'], (function (exports) { 'use strict';
 
   var ns = /*#__PURE__*/_mergeNamespaces({
     __proto__: null,
-    foo: foo,
-    default: d
+    default: d,
+    foo: foo
   }, [d]);
 
   const stuff = 12;

diff --git a/...-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js b/...-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js
@@ -23,8 +23,8 @@ const foo = 100;
 
 var ns = /*#__PURE__*/_mergeNamespaces({
   __proto__: null,
-  foo: foo,
-  default: d
+  default: d,
+  foo: foo
 }, [d]);
 
 const stuff = 12;

diff --git a/...g-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js b/...g-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js
@@ -21,8 +21,8 @@ const foo = 100;
 
 var ns = /*#__PURE__*/_mergeNamespaces({
   __proto__: null,
-  foo: foo,
-  default: d
+  default: d,
+  foo: foo
 }, [d]);
 
 const stuff = 12;

diff --git a/...rm/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js b/...rm/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js
@@ -26,8 +26,8 @@ System.register([], (function (exports) {
 
       var ns = /*#__PURE__*/_mergeNamespaces({
         __proto__: null,
-        foo: foo,
-        default: d
+        default: d,
+        foo: foo
       }, [d]);
 
       const stuff = 12;

diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js
@@ -36,8 +36,8 @@ define(['exports'], (function (exports) { 'use strict';
 		__proto__: null,
 		bar: bar,
 		default: dep,
-		synthetic: synthetic$1,
-		foo: foo
+		foo: foo,
+		synthetic: synthetic$1
 	}, [synthetic]);
 
 	exports.dep = dep$1;

diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js
@@ -36,8 +36,8 @@ var dep$1 = /*#__PURE__*/_mergeNamespaces({
 	__proto__: null,
 	bar: bar,
 	default: dep,
-	synthetic: synthetic$1,
-	foo: foo
+	foo: foo,
+	synthetic: synthetic$1
 }, [synthetic]);
 
 exports.dep = dep$1;
diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js
@@ -34,8 +34,8 @@ var dep$1 = /*#__PURE__*/_mergeNamespaces({
 	__proto__: null,
 	bar: bar,
 	default: dep,
-	synthetic: synthetic$1,
-	foo: foo
+	foo: foo,
+	synthetic: synthetic$1
 }, [synthetic]);
 
 export { dep$1 as dep };
diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js
@@ -39,8 +39,8 @@ System.register([], (function (exports) {
 				__proto__: null,
 				bar: bar,
 				default: dep,
-				synthetic: synthetic$1,
-				foo: foo
+				foo: foo,
+				synthetic: synthetic$1
 			}, [synthetic]);
 			exports('dep', dep$1);
 

diff --git a/test/form/samples/export-internal-namespace-as/_expected.js b/test/form/samples/export-internal-namespace-as/_expected.js
@@ -5,8 +5,8 @@ const bar = 'bar2';
 
 var dep2 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
-	foo: foo,
-	bar: bar
+	bar: bar,
+	foo: foo
 });
 
 console.log(foo$1);

diff --git a/test/form/samples/export-namespace-as/_expected/amd.js b/test/form/samples/export-namespace-as/_expected/amd.js
@@ -5,8 +5,8 @@ define(['exports'], (function (exports) { 'use strict';
 
 	var dep = /*#__PURE__*/Object.freeze({
 		__proto__: null,
-		foo: foo,
-		bar: bar
+		bar: bar,
+		foo: foo
 	});
 
 	exports.dep = dep;