Merge pull request #155 from PepsRyuu/SyntheticExportsCustom

Custom Synthetic Exports

Author: PepsRyuu

lib/impl/CodeGenerator.js

@@ -2,6 +2,19 @@ let path = require('path');
 let ConvertSourceMap = require('convert-source-map');
 let PluginLifecycle = require('./PluginLifecycle');
 
+function getSyntheticExports (context, filePath) {
+    let synthetic = context.syntheticNamedExports[filePath];
+    if (synthetic === true) {
+        synthetic = 'default';
+    }
+
+    return `if (module.exports.${synthetic}) {
+        for (var prop in module.exports.${synthetic}) {
+            prop !== 'default' && __e__(prop, module.exports.${synthetic}[prop]);
+        }
+    }`
+}
+
 function generateFile (context, filePath) {
     let { code, map, imports, externalImports, dynamicImports } = context.files[filePath];
 
@@ -68,13 +81,7 @@ function generateFile (context, filePath) {
             }, function (require, module, __nollup__global__) {
                 "use strict";
                 eval('${code}');
-                ${context.syntheticNamedExports[filePath]? 
-                    `if (module.exports.default) {
-                        for (var prop in module.exports.default) {
-                            prop !== 'default' && __e__(prop, module.exports.default[prop]);
-                        }
-                    }`
-                : ''}
+                ${context.syntheticNamedExports[filePath]? getSyntheticExports(context, filePath) : ''} 
             });
 
             ${imports.map(i => {

lib/impl/PluginLifecycle.js

@@ -148,7 +148,7 @@ module.exports = {
             }
 
             if (hr.syntheticNamedExports) {
-                context.syntheticNamedExports[hr.id] = true;
+                context.syntheticNamedExports[hr.id] = hr.syntheticNamedExports;
             }
 
             return hr;
@@ -163,7 +163,7 @@ module.exports = {
 
             if (typeof hr === 'object' && hr.code) {
                 if (hr.syntheticNamedExports) {
-                    context.syntheticNamedExports[filePath] = true;
+                    context.syntheticNamedExports[filePath] = hr.syntheticNamedExports;
                 }
                 return hr;
             }
@@ -197,7 +197,7 @@ module.exports = {
                 }
 
                 if (result.syntheticNamedExports) {
-                    context.syntheticNamedExports[filePath] = true;
+                    context.syntheticNamedExports[filePath] = result.syntheticNamedExports;
                 }
 
                 mapChain.push({

test/cases/api/hooks.js

@@ -517,6 +517,39 @@ describe ('API: Plugin Hooks', () => {
             fs.reset();
         });
 
+        it ('should should accept a string for syntheticNamedExports', async () => {
+            fs.stub('./src/main.js', () => 'export { hello } from "./lol";');
+            fs.stub('./src/lol.js', () => 'export var __moduleExports = { hello: "world" };')
+            let phase = 0;
+
+            let bundle = await nollup({
+                input: './src/main.js',
+                plugins: [{
+                    load (id) {
+                        if (id.indexOf('lol') > -1) {
+                            return { 
+                                code: fs.readFileSync(id, 'utf8'),
+                                syntheticNamedExports: phase === 0? false : '__moduleExports'
+                            }
+                        }
+                        
+                    }
+                }]
+            });
+
+            let output = (await bundle.generate({ format: 'iife' })).output;
+            let result = eval(output[0].code);
+            expect(result.hello).to.be.undefined;
+
+            phase = 1;
+            bundle.invalidate('./src/lol.js');
+            output = (await bundle.generate({ format: 'iife' })).output;
+            result = eval(output[0].code);
+            expect(result.hello).to.equal('world');
+
+            fs.reset();
+        });
+
         it ('should be allowed to return an AST');
     });
 
@@ -715,6 +748,40 @@ describe ('API: Plugin Hooks', () => {
             fs.reset();
         });
 
+        it ('should allow string for syntheticNamedExports', async () => {
+            fs.stub('./src/main.js', () => 'export { hello } from "./lol";');
+            fs.stub('./src/lol.js', () => 'export var __moduleExports = { hello: "world" };')
+            let phase = 0;
+
+            let bundle = await nollup({
+                input: './src/main.js',
+                plugins: [{
+                    resolveId (id) {
+                        if (id.indexOf('lol') > -1) {
+                            return { 
+                                id: path.resolve(process.cwd(), './src/lol.js'),
+                                syntheticNamedExports: phase === 0? false : '__moduleExports'
+                            }
+                        }
+                        
+                    }
+                }]
+            });
+
+            let output = (await bundle.generate({ format: 'iife' })).output;
+            let result = eval(output[0].code);
+            expect(result.hello).to.be.undefined;
+
+            phase = 1;
+            bundle.invalidate('./src/lol.js');
+            bundle.invalidate('./src/main.js');
+            output = (await bundle.generate({ format: 'iife' })).output;
+            result = eval(output[0].code);
+            expect(result.hello).to.equal('world');
+
+            fs.reset();
+        });
+
         it ('should trigger for input file', async () => {
             fs.stub('./src/main.js', () => 'console.log(123)');
 
@@ -1179,6 +1246,41 @@ describe ('API: Plugin Hooks', () => {
             fs.reset();
         });
 
+        it ('should allow strings for syntheticNamedExports', async () => {
+            fs.stub('./src/main.js', () => `
+                export { hello } from './lol'
+            `);
+            fs.stub('./src/lol.js', () => 'export var __moduleExports = { hello: "world" };')
+            let phase = 0;
+
+            let bundle = await nollup({
+                input: './src/main.js',
+                plugins: [{
+                    transform (code, id) {
+                        if (id.indexOf('lol') > -1) {
+                            return { 
+                                code,
+                                syntheticNamedExports: phase === 0? false : '__moduleExports'
+                            }
+                        }
+                        
+                    }
+                }]
+            });
+
+            let output = (await bundle.generate({ format: 'iife' })).output;
+            let result = eval(output[0].code);
+            expect(result.hello).to.be.undefined;
+
+            phase = 1;
+            bundle.invalidate('./src/lol.js');
+            output = (await bundle.generate({ format: 'iife' })).output;
+            result = eval(output[0].code);
+            expect(result.hello).to.equal('world');
+
+            fs.reset();
+        });
+
         it ('should not fail if passing null sourcemap');
 
         it ('should accept an object with code and map returned');