Do not include namespace for conflicting member access

rollup · May 4, 2021 · 33c1254 · 33c1254
1 parent 3c031cf
commit 33c1254
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 136 deletions.
diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts
@@ -123,14 +123,9 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE
 		if (path.length === 0) this.disallowNamespaceReassignment();
 		if (this.variable) {
 			this.variable.deoptimizePath(path);
-		} else {
-			const propertyKey = this.getPropertyKey();
-			if (propertyKey === UnknownKey) {
-				this.object.deoptimizePath(UNKNOWN_PATH);
-			} else {
-				this.wasPathDeoptimizedWhileOptimized = true;
-				this.object.deoptimizePath([propertyKey, ...path]);
-			}
+		} else if (!this.replacement) {
+			this.wasPathDeoptimizedWhileOptimized = true;
+			this.object.deoptimizePath([this.getPropertyKey(), ...path]);
 		}
 	}
 

diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts
@@ -3,7 +3,7 @@ import { RenderOptions } from '../../utils/renderHelpers';
 import { RESERVED_NAMES } from '../../utils/reservedNames';
 import { getSystemExportStatement } from '../../utils/systemJsRendering';
 import Identifier from '../nodes/Identifier';
-import { UNKNOWN_PATH } from '../utils/PathTracker';
+import { ObjectPath, UNKNOWN_PATH } from '../utils/PathTracker';
 import Variable from './Variable';
 
 export default class NamespaceVariable extends Variable {
@@ -29,14 +29,16 @@ export default class NamespaceVariable extends Variable {
 		this.name = identifier.name;
 	}
 
-	// This is only called if "UNKNOWN_PATH" is reassigned as in all other situations, either the
-	// build fails due to an illegal namespace reassignment or MemberExpression already forwards
-	// the reassignment to the right variable. This means we lost track of this variable and thus
-	// need to reassign all exports.
-	deoptimizePath() {
+	deoptimizePath(path: ObjectPath) {
 		const memberVariables = this.getMemberVariables();
-		for (const key of Object.keys(memberVariables)) {
-			memberVariables[key].deoptimizePath(UNKNOWN_PATH);
+		const memberPath = path.length <= 1 ? UNKNOWN_PATH : path.slice(1);
+		const key = path[0];
+		if (typeof key !== 'string') {
+			for (const key of Object.keys(memberVariables)) {
+				memberVariables[key].deoptimizePath(memberPath);
+			}
+		} else {
+			memberVariables[key]?.deoptimizePath(memberPath);
 		}
 	}
 

diff --git a/...ples/mutations-in-imports/_expected/es.js → ...samples/mutations-in-imports/_expected.js b/...ples/mutations-in-imports/_expected/es.js → ...samples/mutations-in-imports/_expected.js
diff --git a/test/form/samples/mutations-in-imports/_expected/amd.js b/test/form/samples/mutations-in-imports/_expected/amd.js
diff --git a/test/form/samples/mutations-in-imports/_expected/cjs.js b/test/form/samples/mutations-in-imports/_expected/cjs.js
diff --git a/test/form/samples/mutations-in-imports/_expected/iife.js b/test/form/samples/mutations-in-imports/_expected/iife.js
diff --git a/test/form/samples/mutations-in-imports/_expected/system.js b/test/form/samples/mutations-in-imports/_expected/system.js
diff --git a/test/form/samples/mutations-in-imports/_expected/umd.js b/test/form/samples/mutations-in-imports/_expected/umd.js
diff --git a/test/form/samples/namespace-conflict/_config.js b/test/form/samples/namespace-conflict/_config.js
@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'replaces conflicting namespace properties with undefined',
+	expectedWarnings: ['NAMESPACE_CONFLICT', 'MISSING_EXPORT']
+};
diff --git a/test/form/samples/namespace-conflict/_expected.js b/test/form/samples/namespace-conflict/_expected.js
@@ -0,0 +1 @@
+console.log(undefined);
diff --git a/test/form/samples/namespace-conflict/first.js b/test/form/samples/namespace-conflict/first.js
@@ -0,0 +1 @@
+export const foo = 1;
diff --git a/test/form/samples/namespace-conflict/main.js b/test/form/samples/namespace-conflict/main.js
@@ -0,0 +1,3 @@
+import * as ns from './reexport';
+
+console.log(ns.foo);
diff --git a/test/form/samples/namespace-conflict/reexport.js b/test/form/samples/namespace-conflict/reexport.js
@@ -0,0 +1,2 @@
+export * from './first';
+export * from './second';
diff --git a/test/form/samples/namespace-conflict/second.js b/test/form/samples/namespace-conflict/second.js
@@ -0,0 +1 @@
+export const foo = 2;
diff --git a/test/function/samples/pattern-encodings/_config.js b/test/function/samples/pattern-encodings/_config.js
diff --git a/test/function/samples/pattern-encodings/main.js b/test/function/samples/pattern-encodings/main.js