Merge pull request #237 from PepsRyuu/fix/auto-global-name

Fix IIFE AutoNames

Author: PepsRyuu

lib/impl/NollupCodeGenerator.js

@@ -90,6 +90,14 @@ function getExportAllFrom (namespace) {
     return `for(let __k__ in ${namespace}){__k__ !== "default" && (__e__(__k__, function () { return ${namespace}[__k__] }))};`
 }
 
+/**
+ * @param {string} source 
+ * @return {string}
+ */
+function getIIFEName(source) {
+    return source.replace(/\-([\w])/g, (m) => m[1].toUpperCase()).replace(/[^a-zA-Z0-9$_]/g, '_');
+}
+
 /**
  * @param {RollupRenderedChunk} chunk 
  * @param {RollupOutputOptions} outputOptions 
@@ -112,7 +120,7 @@ function createExternalImports (chunk, outputOptions) {
         }
 
         return specifiers.map(s => {
-            let iifeName = globals[source] || name;
+            let iifeName = format === 'iife'? (globals[source] || getIIFEName(source)) : '';
 
             if (s === '*') {
                 if (format === 'es') 

test/cases/Externals.js

@@ -82,7 +82,7 @@ let EXTERNAL_MODULES = {
         'DefaultFallbackModule': {
             prop: true
         },
-        '_IIFE_Special_Characters_': {
+        'IIFESpecial__CharactersTest$__': {
             NamedExport1: 123,
             NamedExport2: 456
         },
@@ -387,15 +387,15 @@ describe('External', () => {
     describe('IIFE Name Conversion', () => {
         it ('should convert special characters to underscore', async () => {
             fs.stub('./src/main.js', () => `
-                import { NamedExport1, NamedExport2 } from "+IIFE-Special-Characters$"; 
+                import { NamedExport1, NamedExport2 } from "-iIFE-special+_Characters-Test$)("; 
                 if (NamedExport1 === 123 && NamedExport2 === 456) { 
                     self.result = true; 
                 }
             `);
 
             let bundle = await nollup({
                 input: './src/main.js',
-                external: ['+IIFE-Special-Characters$']
+                external: ['-iIFE-special+_Characters-Test$)(']
             });
 
             let { output } = await bundle.generate({ format: 'iife' });
@@ -406,18 +406,20 @@ describe('External', () => {
 
         it ('should use global object to determine variable name', async () => {
             fs.stub('./src/main.js', () => `
-                import { NamedExport1, NamedExport2 } from "+IIFE-Special-Characters$"; 
+                import { NamedExport1, NamedExport2 } from "-iIFE-special+_Characters-Test$)("; 
                 if (NamedExport1 === 123 && NamedExport2 === 456) { 
-                    self.result = true; 
+                    if (__globalModule.NamedExport1 && __globalModule.NamedExport2) {
+                        self.result = true; 
+                    }
                 }
             `);
 
             let bundle = await nollup({
                 input: './src/main.js',
-                external: ['+IIFE-Special-Characters$'],
+                external: ['-iIFE-special+_Characters-Test$)('],
                 output: {
                     globals: {
-                        '+IIFE-Special-Characters$': '__globalModule'
+                        '-iIFE-special+_Characters-Test$)(': '__globalModule'
                     }
                 }
             });