Merge pull request #208 from pshrmn/rename-index

Prefer parent directory over index for module name

src/utils.js

@@ -1,7 +1,13 @@
-import { basename, extname } from 'path';
+import { basename, extname, dirname, sep } from 'path';
 import { makeLegalIdentifier } from 'rollup-pluginutils';
 
 export function getName ( id ) {
-	return makeLegalIdentifier( basename( id, extname( id ) ) );
+	const name = makeLegalIdentifier( basename( id, extname( id ) ) );
+	if (name !== 'index') {
+		return name;
+	} else {
+		const segments = dirname( id ).split( sep );
+		return makeLegalIdentifier( segments[segments.length - 1] );
+	}
 }
 

test/samples/rename-index/invalid-var/index.js

@@ -0,0 +1 @@
+module.exports = 'invalid';

test/samples/rename-index/main.js

@@ -0,0 +1,5 @@
+import invalid from './invalid-var';
+import valid from './validVar';
+import other from './other/nonIndex';
+
+console.log(invalid, valid, other);

test/samples/rename-index/other/nonIndex.js

@@ -0,0 +1 @@
+module.exports = 'not an index file';

test/samples/rename-index/validVar/index.js

@@ -0,0 +1 @@
+module.exports = 'valid';

test/test.js

@@ -407,5 +407,19 @@ describe( 'rollup-plugin-commonjs', () => {
 			const { exports } = await executeBundle( bundle );
 			assert.equal( exports, 'HELLO' );
 		});
+
+		it( 'prefers to set name using directory for index files', () => {
+			return rollup({
+				entry: 'samples/rename-index/main.js',
+				plugins: [ commonjs() ]
+			})
+			.then( async bundle => {
+				const { code } = await bundle.generate({ format: 'cjs' });
+				assert.equal( code.indexOf( 'var index' ), -1 );
+				assert.notEqual( code.indexOf( 'var invalidVar' ), -1 );
+				assert.notEqual( code.indexOf( 'var validVar' ), -1 );
+				assert.notEqual( code.indexOf( 'var nonIndex' ), -1 );
+			});
+		});
 	});
 });