Fix incorrect use of local vs import name in export entries

sebastienros · Mar 7, 2022 · d92d488 · d92d488
1 parent 1d415c5
commit d92d488
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Jint.Tests/Runtime/ModuleTests.cs b/Jint.Tests/Runtime/ModuleTests.cs
@@ -194,7 +194,6 @@ public void ShouldAllowExportMultipleImports()
         Assert.Equal("1 2", ns.Get("result").AsString());
     }
 
-    /* ECMAScript 2020 "export * as ns from"
     [Fact]
     public void ShouldAllowNamedStarExport()
     {
@@ -204,7 +203,6 @@ public void ShouldAllowNamedStarExport()
 
         Assert.Equal(5, ns.Get("ns").Get("value1").AsNumber());
     }
-    */
 
     [Fact]
     public void ShouldAllowChaining()

diff --git a/Jint/EsprimaExtensions.cs b/Jint/EsprimaExtensions.cs
@@ -315,7 +315,7 @@ internal static void GetExportEntries(this ExportDeclaration export, List<Export
                         for (var i = 0; i < specifiers.Count; i++)
                         {
                             var specifier = specifiers[i];
-                            exportEntries.Add(new(specifier.Exported.GetModuleKey(), namedDeclaration.Source?.StringValue, specifier.Local.GetModuleKey(), null));
+                            exportEntries.Add(new(specifier.Exported.GetModuleKey(), namedDeclaration.Source?.StringValue, namedDeclaration.Source != null ? specifier.Local.GetModuleKey() : null, specifier.Local.GetModuleKey()));
                         }
                     }
 

diff --git a/Jint/Runtime/Modules/BuilderModuleRecord.cs b/Jint/Runtime/Modules/BuilderModuleRecord.cs
@@ -33,7 +33,7 @@ protected override void InitializeEnvironment()
             {
                 var d = _exportBuilderDeclarations[i];
                 _environment.CreateImmutableBindingAndInitialize(d.Key, true, d.Value);
-                _localExportEntries.Add(new ExportEntry(d.Key, null, null, null));
+                _localExportEntries.Add(new ExportEntry(d.Key, null, null, d.Key));
             }
             _exportBuilderDeclarations.Clear();
         }

diff --git a/Jint/Runtime/Modules/SourceTextModuleRecord.cs b/Jint/Runtime/Modules/SourceTextModuleRecord.cs
@@ -129,7 +129,7 @@ internal override ResolvedBinding ResolveExport(string exportName, List<ExportRe
             if (exportName == e.ExportName)
             {
                 // i. Assert: module provides the direct binding for this export.
-                return new ResolvedBinding(this, e.LocalName ?? e.ExportName);
+                return new ResolvedBinding(this, e.LocalName);
             }
         }
 
@@ -147,7 +147,7 @@ internal override ResolvedBinding ResolveExport(string exportName, List<ExportRe
                 else
                 {
                     // 1. Assert: module imports a specific binding for this export.
-                    return importedModule.ResolveExport(e.ExportName, resolveSet);
+                    return importedModule.ResolveExport(e.ImportName, resolveSet);
                 }
             }
         }