Correctly deshadow star imports when conflicting

src/Bundle.js

@@ -208,6 +208,15 @@ export default class Bundle {
 
 				declaration.name = getSafeName( declaration.name );
 			});
+			// special case - for `import * as Foo`, we need to make sure that Foo
+			// gets its own variable because it will eventually be rendered as
+			// `var Foo = Object.freeze(...)`
+			forOwn( module.imports, ( importee, importeeName ) => {
+				if ( importee.name === '*' ) {
+					delete module.imports[ importeeName ];
+					module.imports[ getSafeName(importeeName) ] = importee;
+				}
+			});
 		});
 
 		this.scope.deshadow( toDeshadow );

test/form/namespace-optimization-b/_expected/amd.js

@@ -1,12 +1,12 @@
 define(function () { 'use strict';
 
-	function foo () {
+	function foo$1 () {
 		console.log( 'foo' );
 	}
 
 	function a () {
-		foo();
+		foo$1();
-		foo();
+		foo$1();
 
 		var a;
 		if ( a.b ) {

test/form/namespace-optimization-b/_expected/cjs.js

@@ -1,12 +1,12 @@
 'use strict';
 
-function foo () {
+function foo$1 () {
 	console.log( 'foo' );
 }
 
 function a () {
-	foo();
+	foo$1();
-	foo();
+	foo$1();
 
 	var a;
 	if ( a.b ) {

test/form/namespace-optimization-b/_expected/es.js

@@ -1,10 +1,10 @@
-function foo () {
+function foo$1 () {
 	console.log( 'foo' );
 }
 
 function a () {
-	foo();
+	foo$1();
-	foo();
+	foo$1();
 
 	var a;
 	if ( a.b ) {

test/form/namespace-optimization-b/_expected/iife.js

@@ -1,13 +1,13 @@
 (function () {
 	'use strict';
 
-	function foo () {
+	function foo$1 () {
 		console.log( 'foo' );
 	}
 
 	function a () {
-		foo();
+		foo$1();
-		foo();
+		foo$1();
 
 		var a;
 		if ( a.b ) {

test/form/namespace-optimization-b/_expected/umd.js

@@ -4,13 +4,13 @@
 	(factory());
 }(this, (function () { 'use strict';
 
-	function foo () {
+	function foo$1 () {
 		console.log( 'foo' );
 	}
 
 	function a () {
-		foo();
+		foo$1();
-		foo();
+		foo$1();
 
 		var a;
 		if ( a.b ) {

test/function/namespacing-collisions-2/Material.js

@@ -0,0 +1,3 @@
+export function Material() {
+  return 'Material';
+}

test/function/namespacing-collisions-2/MaterialAgain.js

@@ -0,0 +1,3 @@
+export function MaterialAgain() {
+  return 'MaterialAgain';
+}

test/function/namespacing-collisions-2/Something.js

@@ -0,0 +1,6 @@
+import * as Material from './Material';
+
+export function Something() {
+	console.log(Material);
+	return 'Something';
+}

test/function/namespacing-collisions-2/SomethingAgain.js

@@ -0,0 +1,6 @@
+import * as Material from './MaterialAgain';
+
+export function SomethingAgain() {
+  console.log(Material);
+	return 'SomethingAgain';
+}

test/function/namespacing-collisions-2/_config.js

@@ -0,0 +1,8 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'correctly namespaces when using * exports, take two (#910)',
+	exports: function ( exports ) {
+		assert.deepEqual( exports, ['Material', 'MaterialAgain', 'Something', 'SomethingAgain'] );
+	}
+};

test/function/namespacing-collisions-2/main.js

@@ -0,0 +1,7 @@
+import { Something } from './Something';
+import { SomethingAgain } from './SomethingAgain';
+import { Material } from './Material';
+import { MaterialAgain } from './MaterialAgain';
+
+var result = [Material(), MaterialAgain(), Something(), SomethingAgain()]
+export default result;

test/function/namespacing-collisions/Material.js

@@ -0,0 +1,3 @@
+export function Material() {
+  return 'Material';
+}

test/function/namespacing-collisions/Something.js

@@ -0,0 +1,6 @@
+import * as Material from './Material';
+
+export function Something() {
+	console.log(Material);
+	return 'Something';
+}

test/function/namespacing-collisions/_config.js

@@ -0,0 +1,8 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 'correctly namespaces when using * exports (#910)',
+	exports: function ( exports ) {
+		assert.deepEqual( exports, [ 'Material', 'Something' ] );
+	}
+};

test/function/namespacing-collisions/main.js

@@ -0,0 +1,5 @@
+import { Something } from './Something';
+import { Material } from './Material';
+
+var result = [Material(), Something()]
+export default result;