Fix module-namespace handling of:

a) re-export of default and b) local indirect exports
chakra-core · Oct 31, 2018 · 586a1a0 · 586a1a0
1 parent ce09d0e
commit 586a1a0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/lib/Parser/Parse.cpp b/lib/Parser/Parse.cpp
@@ -2908,8 +2908,7 @@ ParseNodePtr Parser::ParseDefaultExportClause()
     }
 
     IdentPtr exportName = wellKnownPropertyPids._default;
-    IdentPtr localName = wellKnownPropertyPids._starDefaultStar;
-    AddModuleImportOrExportEntry(EnsureModuleLocalExportEntryList(), nullptr, localName, exportName, nullptr);
+    AddModuleImportOrExportEntry(EnsureModuleLocalExportEntryList(), nullptr, exportName, exportName, nullptr);
 
     return pnode;
 }
@@ -11544,7 +11543,6 @@ void Parser::InitPids()
     wellKnownPropertyPids.as = this->GetHashTbl()->PidHashNameLen(_u("as"), sizeof("as") - 1);
     wellKnownPropertyPids.from = this->GetHashTbl()->PidHashNameLen(_u("from"), sizeof("from") - 1);
     wellKnownPropertyPids._default = this->GetHashTbl()->PidHashNameLen(_u("default"), sizeof("default") - 1);
-    wellKnownPropertyPids._starDefaultStar = this->GetHashTbl()->PidHashNameLen(_u("*default*"), sizeof("*default*") - 1);
     wellKnownPropertyPids._star = this->GetHashTbl()->PidHashNameLen(_u("*"), sizeof("*") - 1);
     wellKnownPropertyPids._this = this->GetHashTbl()->PidHashNameLen(_u("*this*"), sizeof("*this*") - 1);
     wellKnownPropertyPids._newTarget = this->GetHashTbl()->PidHashNameLen(_u("*new.target*"), sizeof("*new.target*") - 1);

diff --git a/lib/Parser/Parse.h b/lib/Parser/Parse.h
@@ -483,7 +483,6 @@ class Parser
         IdentPtr as;
         IdentPtr _default;
         IdentPtr _star; // Special '*' identifier for modules
-        IdentPtr _starDefaultStar; // Special '*default*' identifier for modules
         IdentPtr _this; // Special 'this' identifier
         IdentPtr _newTarget; // Special new.target identifier
         IdentPtr _super; // Special super identifier

diff --git a/lib/Runtime/Language/ModuleNamespace.cpp b/lib/Runtime/Language/ModuleNamespace.cpp
@@ -109,12 +109,16 @@ namespace Js
                 if (moduleNameRecord->module == moduleRecord)
                 {
                     // skip local exports as they are covered in the localExportSlots.
+                    // have to check the property map to avoid filtering out aliased local re-exports
+                    // which are not covered in localExportSlots
+                    if (propertyMap->ContainsKey(scriptContext->GetThreadContext()->GetPropertyName(propertyId)))
+                    {
 #if DBG
-                    localExportCount++;
+                        localExportCount++;
 #endif
-                    return;
+                        return;
+                    }
                 }
-                Assert(moduleNameRecord->module != moduleRecord);
                 this->AddUnambiguousNonLocalExport(propertyId, moduleNameRecord);
             });
         }

diff --git a/test/es6module/module-bugfixes.js b/test/es6module/module-bugfixes.js
@@ -93,6 +93,33 @@ var tests = [
             const start = 'import "b.js"; import "a.js"; import "c.js";';
             testRunner.LoadModule(start);
         }
+    },
+    {
+        // https://github.com/Microsoft/ChakraCore/issues/5501
+        name : "Issue 5501: Indirect exports excluded from namespace object - POC 1",
+        body()
+        {
+            WScript.RegisterModuleSource("test5501Part1", `
+                export {bar as foo} from "test5501Part1";
+                export const bar = 5;
+                import * as stuff from "test5501Part1";
+                assert.areEqual(stuff.bar, stuff.foo);
+            `);
+            testRunner.LoadModule("import 'test5501Part1'");
+        }
+    },
+    {
+        name : "Issue 5501: Indirect exports excluded from namespace object - POC 2",
+        body()
+        {
+            WScript.RegisterModuleSource("test5501Part2a", "export default function () { return true; }");
+            WScript.RegisterModuleSource("test5501Part2b", "export {default as aliasName} from 'test5501Part2a'");
+
+            testRunner.LoadModule(`
+                import {aliasName} from 'test5501Part2b';
+                assert.isTrue(aliasName());
+            `);
+        }
     }
 ];