Fix link to environment's id

Author: jungkees

docs/index.bs

@@ -158,6 +158,7 @@ spec: html; urlPrefix: https://html.spec.whatwg.org/multipage/
             text: active service worker; for: environment
             text: dom manipulation task source
             text: environment
+            text: id; for: environment
             text: run a classic script
             text: run a module script
             text: task queue; for: event loop
@@ -1113,7 +1114,7 @@ spec: url; urlPrefix: https://url.spec.whatwg.org/
     <section>
       <h4 id="client-id">{{Client/id}}</h4>
 
-      <p>The <dfn attribute for="Client" id="client-id-attribute"><code>id</code></dfn> attribute <em class="rfc2119" title="MUST">must</em> return its associated <a href="#dfn-service-worker-client-client">service worker client</a>'s <a>id</a>.</p>
+      <p>The <dfn attribute for="Client" id="client-id-attribute"><code>id</code></dfn> attribute <em class="rfc2119" title="MUST">must</em> return its associated <a href="#dfn-service-worker-client-client">service worker client</a>'s <a for="environment">id</a>.</p>
     </section>
 
     <section algorithm="client-postmessage">
@@ -1268,7 +1269,7 @@ spec: url; urlPrefix: https://url.spec.whatwg.org/
           <ol>
             <li>For each <a href="#dfn-service-worker-client">service worker client</a> <var>client</var> whose <a for="resource">origin</a> is the <a lt="same origin">same</a> as the associated <a href="#dfn-service-worker-global-scope-service-worker">service worker</a>'s <a for="resource">origin</a>:
               <ol>
-                <li>If <var>client</var>'s <a>id</a> is <var>id</var>, then:
+                <li>If <var>client</var>'s <a for="environment">id</a> is <var>id</var>, then:
                   <ol>
                     <li>If <var>client</var> is not a <a>secure context</a>, reject <var>promise</var> with a "{{SecurityError}}" exception and abort these steps.</li>
                     <li>If <var>client</var> is a <a href="#dfn-window-client">window client</a>, then:
@@ -3563,8 +3564,8 @@ spec: url; urlPrefix: https://url.spec.whatwg.org/
         <ol>
           <li>Create a trusted event <var>e</var> that uses the {{FetchEvent}} interface, with the event type <code><a href="#service-worker-global-scope-fetch-event">fetch</a></code>, which does not bubble.</li>
           <li>Let the <a href="#fetch-event-request-attribute">request</a> attribute of <var>e</var> be initialized to <var>r</var>.</li>
-          <li>Initialize <var>e</var>'s {{FetchEvent/clientId}} attribute to <var>client</var>'s <a>id</a>.</li>
-          <li>If <var>request</var> is a <a>non-subresource request</a> and <var>request</var>'s <a for="request">destination</a> is not "<code>report</code>", initialize <var>e</var>'s {{FetchEvent/reservedClientId}} attribute to <var>reservedClient</var>'s <a>id</a>, and to the empty string otherwise.</li>
+          <li>Initialize <var>e</var>'s {{FetchEvent/clientId}} attribute to <var>client</var>'s <a for="environment">id</a>.</li>
+          <li>If <var>request</var> is a <a>non-subresource request</a> and <var>request</var>'s <a for="request">destination</a> is not "<code>report</code>", initialize <var>e</var>'s {{FetchEvent/reservedClientId}} attribute to <var>reservedClient</var>'s <a for="environment">id</a>, and to the empty string otherwise.</li>
           <li>If <var>request</var> is a <a>navigation request</a>, initialize <var>e</var>'s {{FetchEvent/targetClientId}} attribute to <var>request</var>'s <a for="request">target client id</a>, and to the empty string otherwise.</li>
           <li>Let the <a href="#fetch-event-isreload-attribute">isReload</a> attribute of <var>e</var> be initialized to <code>true</code> if <var>request</var>'s <a for="request">client</a> is a <a href="#dfn-window-client">window client</a> and the event was dispatched with the user's intention for the page reload, and <code>false</code> otherwise.</li>
           <li><a>Dispatch</a> <var>e</var> at <var>activeWorker</var>'s <a>environment settings object</a>'s <a for="environment settings object">global object</a>.</li>

docs/index.html

@@ -2430,7 +2430,7 @@ <h4 class="heading settled" data-level="4.2.2" id="client-frametype"><span class
      </section>
      <section>
       <h4 class="heading settled" data-level="4.2.3" id="client-id"><span class="secno">4.2.3. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#client-id-attribute" id="ref-for-client-id-attribute-2">id</a></code></span><a class="self-link" href="#client-id"></a></h4>
-      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="Client" data-dfn-type="attribute" data-export="" id="client-id-attribute"><code>id</code></dfn> attribute <em class="rfc2119" title="MUST">must</em> return its associated <a href="#dfn-service-worker-client-client" id="ref-for-dfn-service-worker-client-client-3">service worker client</a>’s <a data-link-type="dfn" href="#dfn-service-worker-id" id="ref-for-dfn-service-worker-id-1">id</a>.</p>
+      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="Client" data-dfn-type="attribute" data-export="" id="client-id-attribute"><code>id</code></dfn> attribute <em class="rfc2119" title="MUST">must</em> return its associated <a href="#dfn-service-worker-client-client" id="ref-for-dfn-service-worker-client-client-3">service worker client</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#id">id</a>.</p>
      </section>
      <section class="algorithm" data-algorithm="client-postmessage">
       <h4 class="heading settled" data-level="4.2.4" id="client-postmessage"><span class="secno">4.2.4. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#client-postmessage-method" id="ref-for-client-postmessage-method-2">postMessage(message, transfer)</a></code></span><a class="self-link" href="#client-postmessage"></a></h4>
@@ -2566,7 +2566,7 @@ <h4 class="heading settled" data-level="4.3.1" id="clients-get"><span class="sec
           For each <a href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client-24">service worker client</a> <var>client</var> whose <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/browsers.html#origin-2">origin</a> is the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/browsers.html#same-origin">same</a> as the associated <a href="#dfn-service-worker-global-scope-service-worker" id="ref-for-dfn-service-worker-global-scope-service-worker-7">service worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/browsers.html#origin-2">origin</a>: 
           <ol>
            <li>
-            If <var>client</var>’s <a data-link-type="dfn" href="#dfn-service-worker-id" id="ref-for-dfn-service-worker-id-2">id</a> is <var>id</var>, then: 
+            If <var>client</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#id">id</a> is <var>id</var>, then: 
             <ol>
              <li>If <var>client</var> is not a <a data-link-type="dfn" href="https://w3c.github.io/webappsec-secure-contexts/#secure-context">secure context</a>, reject <var>promise</var> with a "<code class="idl"><a data-link-type="idl" href="https://heycam.github.io/webidl/#securityerror">SecurityError</a></code>" exception and abort these steps.
              <li>
@@ -4295,7 +4295,7 @@ <h3 class="heading settled" id="update-algorithm"><span class="content">Update</
         Else: 
         <ol>
          <li>Let <var>worker</var> be a new <a href="#dfn-service-worker" id="ref-for-dfn-service-worker-100">service worker</a>.
-         <li>Generate a unique opaque string and set <var>worker</var>’s <a href="#dfn-service-worker-id" id="ref-for-dfn-service-worker-id-3">id</a> to the value.
+         <li>Generate a unique opaque string and set <var>worker</var>’s <a href="#dfn-service-worker-id" id="ref-for-dfn-service-worker-id-1">id</a> to the value.
          <li>Set <var>worker</var>’s <a href="#dfn-script-url" id="ref-for-dfn-script-url-6">script url</a> to <var>job</var>’s <a href="#dfn-job-script-url" id="ref-for-dfn-job-script-url-12">script url</a>, <var>worker</var>’s <a href="#dfn-script-resource" id="ref-for-dfn-script-resource-7">script resource</a> to <var>script</var>, and <var>worker</var>’s <a href="#dfn-type" id="ref-for-dfn-type-2">type</a> to <var>job</var>’s <a data-link-type="dfn" href="#dfn-job-worker-type" id="ref-for-dfn-job-worker-type-5">worker type</a>.
          <li>Set <var>worker</var>’s <a href="#dfn-script-resource" id="ref-for-dfn-script-resource-8">script resource</a>’s <a href="#dfn-https-state" id="ref-for-dfn-https-state-1">HTTPS state</a> to <var>httpsState</var>.
          <li>Set <var>worker</var>’s <a href="#dfn-script-resource" id="ref-for-dfn-script-resource-9">script resource</a>’s <a href="#dfn-referrer-policy" id="ref-for-dfn-referrer-policy-1">referrer policy</a> to <var>referrerPolicy</var>.
@@ -4596,8 +4596,8 @@ <h3 class="heading settled" id="on-fetch-request-algorithm"><span class="content
         <ol>
          <li>Create a trusted event <var>e</var> that uses the <code class="idl"><a data-link-type="idl" href="#fetch-event-interface" id="ref-for-fetch-event-interface-6">FetchEvent</a></code> interface, with the event type <code><a href="#service-worker-global-scope-fetch-event" id="ref-for-service-worker-global-scope-fetch-event-7">fetch</a></code>, which does not bubble.
          <li>Let the <a href="#fetch-event-request-attribute" id="ref-for-fetch-event-request-attribute-3">request</a> attribute of <var>e</var> be initialized to <var>r</var>.
-         <li>Initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#fetch-event-clientid-attribute" id="ref-for-fetch-event-clientid-attribute-3">clientId</a></code> attribute to <var>client</var>’s <a data-link-type="dfn" href="#dfn-service-worker-id" id="ref-for-dfn-service-worker-id-4">id</a>.
-         <li>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request">non-subresource request</a> and <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination">destination</a> is not "<code>report</code>", initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#fetch-event-reservedclientid-attribute" id="ref-for-fetch-event-reservedclientid-attribute-3">reservedClientId</a></code> attribute to <var>reservedClient</var>’s <a data-link-type="dfn" href="#dfn-service-worker-id" id="ref-for-dfn-service-worker-id-5">id</a>, and to the empty string otherwise.
+         <li>Initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#fetch-event-clientid-attribute" id="ref-for-fetch-event-clientid-attribute-3">clientId</a></code> attribute to <var>client</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#id">id</a>.
+         <li>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request">non-subresource request</a> and <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination">destination</a> is not "<code>report</code>", initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#fetch-event-reservedclientid-attribute" id="ref-for-fetch-event-reservedclientid-attribute-3">reservedClientId</a></code> attribute to <var>reservedClient</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#id">id</a>, and to the empty string otherwise.
          <li>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#navigation-request">navigation request</a>, initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#fetch-event-targetClientid-attribute" id="ref-for-fetch-event-targetClientid-attribute-3">targetClientId</a></code> attribute to <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-target-client-id">target client id</a>, and to the empty string otherwise.
          <li>Let the <a href="#fetch-event-isreload-attribute" id="ref-for-fetch-event-isreload-attribute-3">isReload</a> attribute of <var>e</var> be initialized to <code>true</code> if <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-client">client</a> is a <a href="#dfn-window-client" id="ref-for-dfn-window-client-9">window client</a> and the event was dispatched with the user’s intention for the page reload, and <code>false</code> otherwise.
          <li><a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-event-dispatch">Dispatch</a> <var>e</var> at <var>activeWorker</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#environment-settings-object">environment settings object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-global">global object</a>.
@@ -5960,6 +5960,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
      <li><a href="https://html.spec.whatwg.org/multipage/semantics.html#attr-link-href">href</a>
      <li><a href="https://html.spec.whatwg.org/multipage/workers.html#concept-workerglobalscope-https-state">https state <small>(for WorkerGlobalScope)</small></a>
      <li><a href="https://html.spec.whatwg.org/multipage/webappapis.html#https-state">https state <small>(for environment settings object)</small></a>
+     <li><a href="https://html.spec.whatwg.org/multipage/webappapis.html#id">id</a>
      <li><a href="https://html.spec.whatwg.org/multipage/workers.html#import-scripts-into-worker-global-scope">import scripts into worker global scope</a>
      <li><a href="https://html.spec.whatwg.org/multipage/workers.html#dom-workerglobalscope-importscripts">importScripts(urls)</a>
      <li><a href="https://html.spec.whatwg.org/multipage/infrastructure.html#in-parallel">in parallel</a>
@@ -6502,10 +6503,7 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
   <aside class="dfn-panel" data-for="dfn-service-worker-id">
    <b><a href="#dfn-service-worker-id">#dfn-service-worker-id</a></b><b>Referenced in:</b>
    <ul>
-    <li><a href="#ref-for-dfn-service-worker-id-1">4.2.3. id</a>
-    <li><a href="#ref-for-dfn-service-worker-id-2">4.3.1. get(id)</a>
-    <li><a href="#ref-for-dfn-service-worker-id-3">Update</a>
-    <li><a href="#ref-for-dfn-service-worker-id-4">Handle Fetch</a> <a href="#ref-for-dfn-service-worker-id-5">(2)</a>
+    <li><a href="#ref-for-dfn-service-worker-id-1">Update</a>
    </ul>
   </aside>
   <aside class="dfn-panel" data-for="dfn-lifecycle-events">

docs/v1/index.bs

@@ -149,6 +149,7 @@ spec: html; urlPrefix: https://html.spec.whatwg.org/multipage/
             text: active service worker; for: environment
             text: dom manipulation task source
             text: environment
+            text: id; for: environment
             text: run a classic script
             text: run a module script
             text: task queue; for: event loop
@@ -1101,7 +1102,7 @@ spec: url; urlPrefix: https://url.spec.whatwg.org/
     <section>
       <h4 id="client-id">{{Client/id}}</h4>
 
-      <p>The <dfn attribute for="Client" id="client-id-attribute"><code>id</code></dfn> attribute <em class="rfc2119" title="MUST">must</em> return its associated <a href="#dfn-service-worker-client-client">service worker client</a>'s <a>id</a>.</p>
+      <p>The <dfn attribute for="Client" id="client-id-attribute"><code>id</code></dfn> attribute <em class="rfc2119" title="MUST">must</em> return its associated <a href="#dfn-service-worker-client-client">service worker client</a>'s <a for="environment">id</a>.</p>
     </section>
 
     <section algorithm="client-postmessage">
@@ -1256,7 +1257,7 @@ spec: url; urlPrefix: https://url.spec.whatwg.org/
           <ol>
             <li>For each <a href="#dfn-service-worker-client">service worker client</a> <var>client</var> whose <a for="resource">origin</a> is the <a lt="same origin">same</a> as the associated <a href="#dfn-service-worker-global-scope-service-worker">service worker</a>'s <a for="resource">origin</a>:
               <ol>
-                <li>If <var>client</var>'s <a>id</a> is <var>id</var>, then:
+                <li>If <var>client</var>'s <a for="environment">id</a> is <var>id</var>, then:
                   <ol>
                     <li>If <var>client</var> is not a <a>secure context</a>, reject <var>promise</var> with a "{{SecurityError}}" exception and abort these steps.</li>
                     <li>If <var>client</var> is a <a href="#dfn-window-client">window client</a>, then:
@@ -3229,8 +3230,8 @@ spec: url; urlPrefix: https://url.spec.whatwg.org/
         <ol>
           <li>Create a trusted event <var>e</var> that uses the {{FetchEvent}} interface, with the event type <code><a href="#service-worker-global-scope-fetch-event">fetch</a></code>, which does not bubble.</li>
           <li>Let the <a href="#fetch-event-request-attribute">request</a> attribute of <var>e</var> be initialized to <var>r</var>.</li>
-          <li>Initialize <var>e</var>'s {{FetchEvent/clientId}} attribute to <var>client</var>'s <a>id</a>.</li>
-          <li>If <var>request</var> is a <a>non-subresource request</a> and <var>request</var>'s <a for="request">destination</a> is not "<code>report</code>", initialize <var>e</var>'s {{FetchEvent/reservedClientId}} attribute to <var>reservedClient</var>'s <a>id</a>, and to the empty string otherwise.</li>
+          <li>Initialize <var>e</var>'s {{FetchEvent/clientId}} attribute to <var>client</var>'s <a for="environment">id</a>.</li>
+          <li>If <var>request</var> is a <a>non-subresource request</a> and <var>request</var>'s <a for="request">destination</a> is not "<code>report</code>", initialize <var>e</var>'s {{FetchEvent/reservedClientId}} attribute to <var>reservedClient</var>'s <a for="environment">id</a>, and to the empty string otherwise.</li>
           <li>If <var>request</var> is a <a>navigation request</a>, initialize <var>e</var>'s {{FetchEvent/targetClientId}} attribute to <var>request</var>'s <a>target client id</a>, and to the empty string otherwise.</li>
           <li>Let the <a href="#fetch-event-isreload-attribute">isReload</a> attribute of <var>e</var> be initialized to <code>true</code> if <var>request</var>'s <a for="request">client</a> is a <a href="#dfn-window-client">window client</a> and the event was dispatched with the user's intention for the page reload, and <code>false</code> otherwise.</li>
           <li><a>Dispatch</a> <var>e</var> at <var>activeWorker</var>'s <a>environment settings object</a>'s <a for="environment settings object">global object</a>.</li>