Merge pull request #47 from esperantojs/gh-45

gh-45

dist/esperanto.js

@@ -747,7 +747,7 @@ function populateIdentifierReplacements ( bundle ) {
 
 		if ( x = mod.defaultExport ) {
 			if ( x.hasDeclaration && x.name ) {
-				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, mod.name ) ?
+				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
 					mod.name + '__' + x.name :
 					x.name;
 			} else {

esperanto.js

@@ -747,7 +747,7 @@ function populateIdentifierReplacements ( bundle ) {
 
 		if ( x = mod.defaultExport ) {
 			if ( x.hasDeclaration && x.name ) {
-				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, mod.name ) ?
+				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
 					mod.name + '__' + x.name :
 					x.name;
 			} else {

src/bundler/combine/populateIdentifierReplacements.js

@@ -18,7 +18,7 @@ export default function populateIdentifierReplacements ( bundle ) {
 
 		if ( x = mod.defaultExport ) {
 			if ( x.hasDeclaration && x.name ) {
-				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, mod.name ) ?
+				mod.identifierReplacements.default = hasOwnProp.call( conflicts, x.name ) || otherModulesDeclare( mod, x.name ) ?
 					mod.name + '__' + x.name :
 					x.name;
 			} else {

test/bundle/index.js

@@ -139,7 +139,8 @@ module.exports = function () {
 			{ dir: '27', description: 'correctly infers indentation with single-line edge case' },
 			{ dir: '28', description: 'environment GetThisBinding is always undefined' },
 			{ dir: '29', description: 'both named and default bindings can be imported from an external module', strict: true },
-			{ dir: '30', description: 'batch import from external module' }
+			{ dir: '30', description: 'batch import from external module' },
+			{ dir: '31', description: 'renames identifiers consistently' }
 		];
 
 		profiles.forEach( function ( profile ) {
@@ -156,7 +157,7 @@ module.exports = function () {
 					( t.only ? it.only : it )( t.description, function () {
 						return esperanto.bundle({
 							base: path.resolve( 'bundle/input', t.dir ),
-							entry: t.entry || 'main',
+							entry: config.entry || 'main',
 							skip: config.skip,
 							names: config.names,
 							transform: config.transform

test/bundle/input/31/exportedX.js

@@ -0,0 +1 @@
+export default function someOtherName () {}

test/bundle/input/31/main.js

@@ -0,0 +1,4 @@
+import x from './exportedX';
+import './notExportedX';
+
+x();

test/bundle/input/31/notExportedX.js

@@ -0,0 +1 @@
+function x () {}

test/bundle/output/amd/31.js

@@ -0,0 +1,11 @@
+define(function () {
+
+	'use strict';
+
+	function someOtherName () {}
+
+	function x () {}
+
+	someOtherName();
+
+});

test/bundle/output/amdDefaults/31.js

@@ -0,0 +1,11 @@
+define(function () {
+
+	'use strict';
+
+	function someOtherName () {}
+
+	function x () {}
+
+	someOtherName();
+
+});

test/bundle/output/cjs/31.js

@@ -0,0 +1,7 @@
+'use strict';
+
+function someOtherName () {}
+
+function x () {}
+
+someOtherName();

test/bundle/output/cjsDefaults/31.js

@@ -0,0 +1,7 @@
+'use strict';
+
+function someOtherName () {}
+
+function x () {}
+
+someOtherName();

test/bundle/output/umd/31.js

@@ -0,0 +1,13 @@
+(function (factory) {
+	!(typeof exports === 'object' && typeof module !== 'undefined') &&
+	typeof define === 'function' && define.amd ? define(factory) :
+	factory()
+}(function () { 'use strict';
+
+	function someOtherName () {}
+
+	function x () {}
+
+	someOtherName();
+
+}));

test/bundle/output/umdDefaults/31.js

@@ -0,0 +1,13 @@
+(function (factory) {
+	!(typeof exports === 'object' && typeof module !== 'undefined') &&
+	typeof define === 'function' && define.amd ? define(factory) :
+	factory()
+}(function () { 'use strict';
+
+	function someOtherName () {}
+
+	function x () {}
+
+	someOtherName();
+
+}));