Merge pull request #1541 from rollup/gh-1488

deshadow indirectly-imported namespaces

src/ast/scopes/ModuleScope.js

@@ -20,8 +20,18 @@ export default class ModuleScope extends Scope {
 		forOwn( this.module.imports, specifier => {
 			if ( specifier.module.isExternal ) return;
 
+			const addDeclaration = declaration => {
+				if ( declaration.isNamespace ) {
+					declaration.module.getExports().forEach( name => {
+						addDeclaration( declaration.module.traceExport(name) );
+					});
+				}
+
+				names.add( declaration.name );
+			};
+
 			specifier.module.getExports().forEach( name => {
-				names.add( specifier.module.traceExport(name).name );
+				addDeclaration( specifier.module.traceExport(name) );
 			});
 
 			if ( specifier.name !== '*' ) {

test/function/samples/deshadowed-namespaced-import/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: '#1488'
+};

test/function/samples/deshadowed-namespaced-import/foo.js

@@ -0,0 +1,2 @@
+import * as ns from './ns.js';
+export { ns };

test/function/samples/deshadowed-namespaced-import/main.js

@@ -0,0 +1,10 @@
+import { ns } from './foo.js';
+
+assert.equal((() => {
+	function foo() {
+		return ns.foo();
+	}
+
+	return foo();
+})(), 42);
+

test/function/samples/deshadowed-namespaced-import/ns.js

@@ -0,0 +1,3 @@
+export function foo() {
+	return 42;
+}