wip

Author: nicolo-ribaudo

spec.emu

@@ -2233,9 +2233,18 @@ contributors: Nicolò Ribaudo
 
           <emu-alg>
             1. Assert: If _module_ is a Cyclic Module Record, then _module_.[[Status]] is not ~new~ or ~unlinked~.
+            1. <ins>If _importedNames_ is not ~all~, set _importedNames_ to a copy of _importedNames_ sorted by lexicographic code unit order.</ins>
             1. <ins>Let _namespace_ be ~empty~.</ins>
-            1. <ins>If _importedNames_ is ~all~, then</ins>
-              1. <ins>If _phase_ is ~defer~, set _namespace_ to _module_.[[DeferredNamespace]]. Otherwise, set _namespace_ to _module_.[[Namespace]].</ins>
+            1. <ins>For each Record _r_ of _module_.[[Namespaces]], do</ins>
+              1. <ins>If _r_.[[Phase]] is _phase_, then</ins>
+                1. <ins>If _importedNames_ is ~all~, then</ins>
+                  1. <ins>If _r_.[[ImportedNames]] is ~all~, then</ins>
+                    1. <ins>Assert: _namespace_ is ~empty~.</ins>
+                    1. <ins>Set _namespace_ to _r_.[[NamespaceObject]].</ins>
+                1. <ins>Else if _r_.[[ImportedNames]] is a List of Strings, then</ins>
+                  1. <ins>If _importedNames_ and _r_.[[ImportedNames]] have the same contents, then</ins>
+                    1. <ins>Assert: _namespace_ is ~empty~.</ins>
+                    1. <ins>Set _namespace_ to _r_.[[NamespaceObject]].</ins>
             1. If _namespace_ is ~empty~, then
               1. Let _exportedNames_ be _module_.GetExportedNames().
               1. Let _unambiguousNames_ be a new empty List.
@@ -2245,18 +2254,42 @@ contributors: Nicolò Ribaudo
                     1. Let _resolution_ be _module_.ResolveExport(_name_).
                     1. If _resolution_ is a ResolvedBinding Record, append _name_ to _unambiguousNames_.
               1. Set _namespace_ to ModuleNamespaceCreate(_module_, _unambiguousNames_, _phase_).
-              1. <ins>If _importedNames_ is ~all~, then</ins>
-                1. <ins>If _phase_ is ~defer~, then</ins>
-                  1. <ins>Assert: _module_.[[DeferredNamespace]] is ~empty~.</ins>
-                  1. <ins>Set _module_.[[DeferredNamespace]] to _namespace_.</ins>
-                1. Else,
-                  1. <ins>Assert: _module_.[[Namespace]] is ~empty~.</ins>
-                  1. <ins>Set _module_.[[Namespace]] to _namespace_.</ins>
+              1. <ins>Append the Record { [[Phase]]: _phase_, [[ImportedNames]]: _importedNames_, [[NamespaceObject]]: _namespace_ } to _module_.[[Namespaces]].</ins>
             1. Return _namespace_.
           </emu-alg>
           <emu-note>
             <p>GetModuleNamespace never throws. Instead, unresolvable names are simply excluded from the namespace at this point. They will lead to a real linking error later unless they are all ambiguous star exports that are not explicitly requested anywhere.</p>
           </emu-note>
+
+          <p>A <dfn id="modulenamespacekey-record">ModuleNamespaceKey Record</dfn> describes which namespace object of a given module has been requested. It consists of the following fields:</p>
+          <emu-table id="table-modulenamespacekey-fields" caption="ModuleNamespaceKey Record Fields">
+            <table>
+              <tr>
+                <th>
+                  Field Name
+                </th>
+                <th>
+                  Value Type
+                </th>
+              </tr>
+              <tr>
+                <td>
+                  [[Phase]]
+                </td>
+                <td>
+                  ~defer~ or ~evaluation~
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  [[ImportedNames]]
+                </td>
+                <td>
+                  ~all~ or a List of Strings
+                </td>
+              </tr>
+            </table>
+          </emu-table>
         </emu-clause>
 
         <emu-clause id="sec-source-text-module-record-module-record-methods">