Additional live binding transforms

Author: PepsRyuu

lib/impl/NollupCodeGenerator.js

@@ -437,7 +437,8 @@ class NollupCodeGenerator {
 
                             let import_exported = exports.find(e => e.local === s.local);
                             if (!i.export && import_exported) {
-                                output += `__e__("${import_exported.exported}", function () { return ${import_exported.local} });`;
+                                let local = this.liveBindings? `__i__["${import_exported.local}"]` : import_exported.local;
+                                output += `__e__("${import_exported.exported}", function () { return ${local} });`;
                             }
 
                             return output;

lib/impl/NollupLiveBindingsResolver.js

@@ -47,8 +47,26 @@ function getScopeVariables (node) {
     }
 
     if (node.params) {
-        // Check for normal arguments, and RestElement argument
-        variables.push(...node.params.map(n => n.name? n.name : n.argument? n.argument.name : undefined));
+        variables.push(...node.params.flatMap(n => {
+            if (n.name) {
+                return n.name;
+            }
+
+            // RestElement
+            if (n.argument) {
+                return n.argument.name;
+            }
+
+            // ArrayPattern
+            if (n.elements) {
+                return n.elements.map(n => n.name);
+            }
+
+            // ObjectPattern
+            if (n.properties) {
+                return n.properties.map(n => n.value.name);
+            }
+        }));
     }
 
     let body = findChildNodes(node);

test/cases/es2cjs.js

@@ -1201,6 +1201,59 @@ describe ('Import Live Bindings (reference)', () => {
         ].join('\n'));
     });
 
+    it ('should allow shadowing by function declaration array pattern params', async () => {
+        let res = await resolve([
+            'import MyDefault, { MyVar } from "./myfile";',
+            'function MyFunction ([MyDefault]) {',
+            '    console.log(MyDefault, MyVar);',
+            '}',
+            'console.log(MyDefault);'
+        ]);
+        expect(res).to.equal([
+            '                                            ',
+            'function MyFunction ([MyDefault]) {',
+            '    console.log(MyDefault, __i__.MyVar);',
+            '}',
+            'console.log(__i__.MyDefault);'
+        ].join('\n'));
+    });
+
+    
+    it ('should allow shadowing by function declaration object pattern params', async () => {
+        let res = await resolve([
+            'import MyDefault, { MyVar } from "./myfile";',
+            'function MyFunction ({MyDefault}) {',
+            '    console.log(MyDefault, MyVar);',
+            '}',
+            'console.log(MyDefault);'
+        ]);
+        expect(res).to.equal([
+            '                                            ',
+            'function MyFunction ({MyDefault}) {',
+            '    console.log(MyDefault, __i__.MyVar);',
+            '}',
+            'console.log(__i__.MyDefault);'
+        ].join('\n'));
+    });
+
+
+    it ('should allow shadowing by function declaration array pattern params arrow function', async () => {
+        let res = await resolve([
+            'import MyDefault, { MyVar } from "./myfile";',
+            'let MyFunction = ([MyDefault]) => {',
+            '    console.log(MyDefault, MyVar);',
+            '}',
+            'console.log(MyDefault);'
+        ]);
+        expect(res).to.equal([
+            '                                            ',
+            'let MyFunction = ([MyDefault]) => {',
+            '    console.log(MyDefault, __i__.MyVar);',
+            '}',
+            'console.log(__i__.MyDefault);'
+        ].join('\n'));
+    });
+
     it ('should allow shadowing by function names', async () => {
         let res = await resolve([
             'import MyDefault from "./myfile";',

test/cases/scenarios/simple.js

@@ -372,6 +372,12 @@ describe('Nollup', function () {
         expect(entry.default).to.equal('hello world');
     });
 
+    it ('Scenario: Export Import Delayed', async function () {
+        let bundle = await createNollup('export-import-delayed');
+        let entry = await bundle.generate();
+        expect(entry.message).to.equal('hello');
+    });
+
     describe ('Live Bindings', () => {
         [true, 'reference', 'with-scope'].forEach(liveBindings => {
             it ('Scenario: Full Live Binding (' + liveBindings + ')', async function () {
@@ -456,6 +462,12 @@ describe('Nollup', function () {
                 expect(entry.message2).to.equal('world');
                 expect(entry.default).to.be.undefined;
             });
+
+            it ('Scenario: Export Import Delayed (' + liveBindings + ')', async function () {
+                let bundle = await createNollup('export-import-delayed', { liveBindings });
+                let entry = await bundle.generate();
+                expect(entry.message).to.equal('hello');
+            });
 
         })
 

test/packages/export-import-delayed/impl.js

@@ -0,0 +1 @@
+export let message = 'hello';

test/packages/export-import-delayed/index.js

@@ -0,0 +1,3 @@
+import { message } from './impl';
+
+export { message };