Fix error cases of <script type=module>

There are several different ways things can go wrong with <script type=module>. In order from earliest to latest, for a single module script, they are: - Fetching failures - Parsing failures - Invalid module specifiers - Instantiation failures - Evaluation failures This tweaks the way that these errors interact, to ensure that fetching failures are treated one way, causing the <script>'s "error" event to fire, and the other failures are uniformly treated as errors running the script, causing the global's "error" event to fire. Fixes #2567.
whatwg · Apr 28, 2017 · 2880a63 · 2880a63
1 parent b3f8779
commit 2880a63
Showing 1 changed file with 68 additions and 60 deletions.
diff --git a/source b/source
@@ -86746,24 +86746,24 @@ interface <dfn>NavigatorOnLine</dfn> {
 
    </dd>
 
-   <dt>An <dfn data-x="concept-module-script-instantiation-state">instantiation state</dfn></dt>
+   <dt>A <dfn data-x="concept-module-script-state">state</dfn></dt>
 
    <dd>
 
     <p>One of "<code data-x="">uninstantiated</code>", "<code data-x="">errored</code>", or "<code
     data-x="">instantiated</code>", used to prevent reinvocation of <span
     data-x="js-ModuleDeclarationInstantiation">ModuleDeclarationInstantiation</span> on modules that
-    failed to instantiate previously.</p>
+    failed to instantiate previously, and to ensure errors during parsing or instantiation are
+    remembered and propagated correctly.</p>
 
    </dd>
 
-   <dt>An <dfn data-x="concept-module-script-instantiation-error">instantiation error</dfn></dt>
+   <dt>An <dfn data-x="concept-module-script-error">error</dfn></dt>
 
    <dd>
 
     <p>A JavaScript value, which has meaning only if the <span
-    data-x="concept-module-script-instantiation-state">instantiation state</span> is "<code
-    data-x="">errored</code>".</p>
+    data-x="concept-module-script-state">state</span> is "<code data-x="">errored</code>".</p>
 
    </dd>
 
@@ -87230,49 +87230,41 @@ interface <dfn>NavigatorOnLine</dfn> {
    <li><p>If <var>result</var> is null, asynchronously complete this algorithm with null and abort
    these steps.</p></li>
 
+   <li><p>If <var>result</var>'s <span data-x="concept-module-script-state">state</span> is "<code
+   data-x="">instantiated</code>" or "<code data-x="">errored</code>", asynchronously complete this
+   algorithm with <var>result</var>, and abort these steps.</p></li>
+
+   <li><p>Assert: <var>result</var>'s <span data-x="concept-module-script-state">state</span> is
+   "<code data-x="">uninstantiated</code>".</p></li>
+
    <li>
-    <p>Otherwise, <var>result</var> is a <span>module script</span>. <span data-x="fetch the
-    descendants of a module script">Fetch the descendants</span> of <var>result</var> given
-    <var>destination</var> and an ancestor list obtained by appending <var>url</var> to <var>ancestor
-    list</var>. Wait for <span data-x="fetch the descendants of a module script">fetching the
-    descendants of a module script</span> to asynchronously complete with <var>descendants
-    result</var> before proceeding to the next step.</p>
+    <p><span data-x="fetch the descendants of a module script">Fetch the
+    descendants</span> of <var>result</var> given <var>destination</var> and an ancestor list
+    obtained by appending <var>url</var> to <var>ancestor list</var>. Wait for <span data-x="fetch
+    the descendants of a module script">fetching the descendants of a module script</span> to
+    asynchronously complete with <var>descendants result</var> before proceeding to the next step.</p>
 
     <p class="note">If the asynchronous completion result is null, meaning that fetching one of the
     descendants failed, we still proceed through the next set of steps. A failure will shortly occur
     during instantiation, which we then react to appropriately. The error signal is eventually
     propagated to the caller of this algorithm in the last step.</p>
    </li>
 
-   <li><p>Let <var>instantiationStatus</var> be null.</p></li>
-
-   <li><p>If <var>result</var>'s <span data-x="concept-module-script-instantiation-state">instantiation
-   state</span> is "<code data-x="">errored</code>", then set <var>instantiationStatus</var> to
-   Completion { [[Type]]: throw, [[Value]]: <var>result</var>'s <span
-   data-x="concept-module-script-instantiation-error">instantiation error</span>, [[Target]]:
-   empty }.</p></li>
+   <li><p>Let <var>record</var> be <var>result</var>'s <span
+   data-x="concept-module-script-module-record">module record</span>.</p></li>
 
    <li>
-    <p>Otherwise:</p>
-
-    <ol>
-     <li><p>Let <var>record</var> be <var>result</var>'s <span
-     data-x="concept-module-script-module-record">module record</span>.</p></li>
+    <p>Let <var>instantiationStatus</var> be <var>record</var>.<span
+    data-x="js-ModuleDeclarationInstantiation">ModuleDeclarationInstantiation</span>().</p>
 
-     <li>
-      <p>Set <var>instantiationStatus</var> to <var>record</var>.<span
-      data-x="js-ModuleDeclarationInstantiation">ModuleDeclarationInstantiation</span>().</p>
-
-      <p class="note">This step will recursively call <span
-      data-x="js-ModuleDeclarationInstantiation">ModuleDeclarationInstantiation</span> all of the
-      module's uninstantiated dependencies.</p>
-     </li>
-    </ol>
+    <p class="note">This step will recursively call <span
+    data-x="js-ModuleDeclarationInstantiation">ModuleDeclarationInstantiation</span> all of the
+    module's uninstantiated dependencies.</p>
    </li>
 
    <li>
-    <p>For each <var>script</var> in <var>result</var>'s <span>uninstantiated inclusive descendant module
-    scripts</span>, perform the following steps:</p>
+    <p>For each <var>script</var> in <var>result</var>'s <span>uninstantiated inclusive descendant
+    module scripts</span>, perform the following steps:</p>
 
     <ol>
      <li>
@@ -87285,18 +87277,16 @@ interface <dfn>NavigatorOnLine</dfn> {
        <li><p>Set <var>script</var>'s <span data-x="concept-module-script-module-record">module
        record</span> to null.</p></li>
 
-       <li><p>Set <var>script</var>'s <span
-       data-x="concept-module-script-instantiation-state">instantiation state</span> to "<code
-       data-x="">errored</code>".</p></li>
+       <li><p>Set <var>script</var>'s <span data-x="concept-module-script-state">state</span> to
+       "<code data-x="">errored</code>".</p></li>
 
-       <li><p>Set <var>script</var>'s <span
-       data-x="concept-module-script-instantiation-error">instantiation error</span> to
+       <li><p>Set <var>script</var>'s <span data-x="concept-module-script-error">error</span> to
        <var>instantiationStatus</var>.[[Value]].</p></li>
       </ol>
      </li>
 
      <li><p>Otherwise, set <var>script</var>'s <span
-     data-x="concept-module-script-instantiation-state">instantiation state</span> to "<code
+     data-x="concept-module-script-state">state</span> to "<code
      data-x="">instantiated</code>".</p></li>
     </ol>
    </li>
@@ -87314,6 +87304,9 @@ interface <dfn>NavigatorOnLine</dfn> {
   data-x="module script">module scripts</span> determined as follows:</p>
 
   <ol>
+   <li><p>If <var>script</var>'s <span data-x="concept-module-script-module-record">module
+   record</span> is null, return the empty set.</p></li>
+
    <li><p>Let <var>moduleMap</var> be <var>script</var>'s <span>settings object</span>'s
    <span data-x="concept-settings-object-module-map">module map</span>.</p></li>
 
@@ -87372,7 +87365,7 @@ interface <dfn>NavigatorOnLine</dfn> {
    </li>
 
    <li><p>Return a <span>set</span> containing all items of <var>inclusive descendants</var> whose
-   <span data-x="concept-module-script-instantiation-state">instantiation state</span> is "<code
+   <span data-x="concept-module-script-state">state</span> is "<code
    data-x="">uninstantiated</code>".</p></li>
   </ol>
 
@@ -87505,10 +87498,14 @@ interface <dfn>NavigatorOnLine</dfn> {
       <ol>
        <li><p>Let <var>error</var> be a new <code>TypeError</code> exception.</p></li>
 
-       <li><p><span>Report the exception</span> <var>error</var> for <var>module
-       script</var>.</p></li>
+       <li><p>Set <var>module script</var>'s <span data-x="concept-module-script-state">state</span>
+       to "<code data-x="">errored</code>".</p></li>
+
+       <li><p>Set <var>module script</var>'s <span data-x="concept-module-script-error">error</span>
+       to <var>error</var>.</p></li>
 
-       <li><p>Abort this algorithm, and asynchronously complete it with null.</p></li>
+       <li><p>Abort this algorithm, and asynchronously complete it with <var>module
+       script</var>.</p></li>
       </ol>
      </li>
 
@@ -87595,9 +87592,22 @@ interface <dfn>NavigatorOnLine</dfn> {
     <var>result</var>.[[HostDefined]] will be <var>script</var>.</p>
    </li>
 
-   <li><p>If <var>result</var> is a <span>List</span> of errors, <span>report the exception</span>
-   given by the first element of <var>result</var> for <var>script</var>, return null, and abort
-   these steps.</p></li>
+   <li>
+    <p>If <var>result</var> is a <span>List</span> of errors, then:</p>
+
+    <ol>
+     <li><p>Set <var>script</var>'s <span data-x="concept-module-script-state">state</span> to
+     "<code data-x="">errored</code>".</p></li>
+
+     <li><p>Set <var>script</var>'s <span data-x="concept-module-script-error">error</span> to
+     <var>errors</var>[0].</p></li>
+
+     <li><p>Return <var>script</var>.</p></li>
+    </ol>
+   </li>
+
+   <li><p>Set <var>script</var>'s <span data-x="concept-module-script-state">state</span> to "<code
+   data-x="">uninstantiated</code>".</p></li>
 
    <li><p>Set <var>script</var>'s <span data-x="concept-module-script-module-record">module
    record</span> to <var>result</var>.</p></li>
@@ -87695,14 +87705,12 @@ interface <dfn>NavigatorOnLine</dfn> {
    <li><p><span>Check if we can run script</span> with <var>settings</var>. If this returns "do
    not run" then abort these steps.</p></li>
 
-   <li><p>If <var>s</var>'s <span data-x="concept-module-script-instantiation-state">instantiation
-   state</span> is "<code data-x="">errored</code>", then <span>report the
-   exception</span> given by <var>s</var>'s <span
-   data-x="concept-module-script-instantiation-error">instantiation error</span> for <var>s</var>
-   and abort these steps.</p></li>
+   <li><p>If <var>s</var>'s <span data-x="concept-module-script-state">state</span> is "<code
+   data-x="">errored</code>", then <span>report the exception</span> given by <var>s</var>'s <span
+   data-x="concept-module-script-error">error</span> for <var>s</var> and abort these
+   steps.</p></li>
 
-   <li><p>Assert: <var>s</var>'s <span
-   data-x="concept-module-script-instantiation-state">instantiation state</span> is "<code
+   <li><p>Assert: <var>s</var>'s <span data-x="concept-module-script-state">state</span> is "<code
    data-x="">instantiated</code>" (and thus its <span
    data-x="concept-module-script-module-record">module record</span> is not null).</p></li>
 
@@ -88578,14 +88586,14 @@ import "https://example.com/foo/../module2.js";</pre>
    steps.</p></li>
 
    <li><p>If <var>resolved module script</var>'s <span
-   data-x="concept-module-script-instantiation-state">instantiation state</span> is "<code
-   data-x="">errored</code>", then throw <var>resolved module script</var>'s <span
-   data-x="concept-module-script-instantiation-error">instantiation error</span>.</p></li>
+   data-x="concept-module-script-state">state</span> is "<code data-x="">errored</code>", then throw
+   <var>resolved module script</var>'s <span
+   data-x="concept-module-script-error">error</span>.</p></li>
 
    <li><p>Assert: <var>resolved module script</var>'s <span
-   data-x="concept-module-script-instantiation-state">instantiation state</span> is "<code
-   data-x="">instantiated</code>" (and thus its <span
-   data-x="concept-module-script-module-record">module record</span> is not null).</p></li>
+   data-x="concept-module-script-state">state</span> is "<code data-x="">instantiated</code>" (and
+   thus its <span data-x="concept-module-script-module-record">module record</span> is not
+   null).</p></li>
 
    <li><p>Return <var>resolved module script</var>'s <span
    data-x="concept-module-script-module-record">module record</span>.</p></li>