From 6a0531a7df5653371bf2ad8dff02f31ec40a5453 Mon Sep 17 00:00:00 2001
From: Jeremy Roman <jbroman@chromium.org>
Date: Wed, 10 Jan 2024 18:06:12 -0500
Subject: [PATCH 1/4] Infer a speculation rule's source from the other keys.

---
 speculation-rules.bs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/speculation-rules.bs b/speculation-rules.bs
index 10c7aeb..47dbb06 100644
--- a/speculation-rules.bs
+++ b/speculation-rules.bs
@@ -371,8 +371,14 @@ add the following step
   To <dfn>parse a speculation rule</dfn> given a [=map=] |input|, a [=document=] |document|, and a [=URL=] |baseURL|, perform the following steps. They return a [=speculation rule=] or null.
 
   1. If |input| has any [=map/key=] other than "`source`", "`urls`", "`where`", "`requires`", "`target_hint`","`referrer_policy`", "`relative_to`", "`eagerness`", and "`expects_no_vary_search`" then return null.
-  1. If |input|["`source`"] does not [=map/exist=] or is neither the [=string=] "`list`" nor the [=string=] "`document`", then return null.
-  1. Let |source| be |input|["`source`"].
+  1. Let |source| be null.
+  1. If |input|["`source`"] exists, then:
+    1. Set |source| to |input|["`source`"].
+  1. Otherwise, if |input|["`urls`"] [=map/exists=] and |input|["`where`"] does not [=map/exist=], then:
+    1. Set |source| to "`list`".
+  1. Otherwise, if |input|["`where`"] [=map/exists=] and |input|["`urls`"] does not [=map/exist=], then:
+    1. Set |source| to "`document`".
+  1. If |source| is neither the [=string=] "`list`" nor the [=string=] "`document`", then return null.
   1. Let |urls| be an empty [=list=].
   1. Let |predicate| be null.
   1. If |source| is "`list`":

From 5372f52a9f66ef1707b6359cb65698385cc5a5cb Mon Sep 17 00:00:00 2001
From: Jeremy Roman <jbroman@chromium.org>
Date: Wed, 10 Jan 2024 18:11:52 -0500
Subject: [PATCH 2/4] don't even validate the source key -- ignore it entirely

---
 speculation-rules.bs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/speculation-rules.bs b/speculation-rules.bs
index 47dbb06..60b36b9 100644
--- a/speculation-rules.bs
+++ b/speculation-rules.bs
@@ -371,10 +371,10 @@ add the following step
   To <dfn>parse a speculation rule</dfn> given a [=map=] |input|, a [=document=] |document|, and a [=URL=] |baseURL|, perform the following steps. They return a [=speculation rule=] or null.
 
   1. If |input| has any [=map/key=] other than "`source`", "`urls`", "`where`", "`requires`", "`target_hint`","`referrer_policy`", "`relative_to`", "`eagerness`", and "`expects_no_vary_search`" then return null.
+
+      <p class="note">In a previous version of this specification, it was necessary to specify the type of source of the URLs. This is now automatically inferred from other keys, and the "`source`" key is ignored.</p>
   1. Let |source| be null.
-  1. If |input|["`source`"] exists, then:
-    1. Set |source| to |input|["`source`"].
-  1. Otherwise, if |input|["`urls`"] [=map/exists=] and |input|["`where`"] does not [=map/exist=], then:
+  1. If |input|["`urls`"] [=map/exists=] and |input|["`where`"] does not [=map/exist=], then:
     1. Set |source| to "`list`".
   1. Otherwise, if |input|["`where`"] [=map/exists=] and |input|["`urls`"] does not [=map/exist=], then:
     1. Set |source| to "`document`".

From ce64b794e67dd12d7eab6516ae5b62c403db7e2f Mon Sep 17 00:00:00 2001
From: Jeremy Roman <jbroman@chromium.org>
Date: Wed, 10 Jan 2024 21:08:23 -0500
Subject: [PATCH 3/4] Revert "don't even validate the source key -- ignore it
 entirely"

This reverts commit 5372f52a9f66ef1707b6359cb65698385cc5a5cb.
---
 speculation-rules.bs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/speculation-rules.bs b/speculation-rules.bs
index 60b36b9..47dbb06 100644
--- a/speculation-rules.bs
+++ b/speculation-rules.bs
@@ -371,10 +371,10 @@ add the following step
   To <dfn>parse a speculation rule</dfn> given a [=map=] |input|, a [=document=] |document|, and a [=URL=] |baseURL|, perform the following steps. They return a [=speculation rule=] or null.
 
   1. If |input| has any [=map/key=] other than "`source`", "`urls`", "`where`", "`requires`", "`target_hint`","`referrer_policy`", "`relative_to`", "`eagerness`", and "`expects_no_vary_search`" then return null.
-
-      <p class="note">In a previous version of this specification, it was necessary to specify the type of source of the URLs. This is now automatically inferred from other keys, and the "`source`" key is ignored.</p>
   1. Let |source| be null.
-  1. If |input|["`urls`"] [=map/exists=] and |input|["`where`"] does not [=map/exist=], then:
+  1. If |input|["`source`"] exists, then:
+    1. Set |source| to |input|["`source`"].
+  1. Otherwise, if |input|["`urls`"] [=map/exists=] and |input|["`where`"] does not [=map/exist=], then:
     1. Set |source| to "`list`".
   1. Otherwise, if |input|["`where`"] [=map/exists=] and |input|["`urls`"] does not [=map/exist=], then:
     1. Set |source| to "`document`".

From e928bb7cbf8bb5f4663f43d0b8921b94f0c04bca Mon Sep 17 00:00:00 2001
From: Jeremy Roman <jbroman@chromium.org>
Date: Wed, 10 Jan 2024 22:28:03 -0500
Subject: [PATCH 4/4] update explainer to mention implicit "source" and use it
 in examples where it works and the context is otherwise current

---
 triggers.md | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/triggers.md b/triggers.md
index 087624b..8302ed1 100644
--- a/triggers.md
+++ b/triggers.md
@@ -88,12 +88,10 @@ The following example illustrates the basic idea:
 <script type="speculationrules">
 {
   "prerender": [
-    {"source": "list",
-     "urls": ["/home", "/about"]}
+    {"urls": ["/home", "/about"]}
   ],
   "prefetch": [
-    {"source": "list",
-     "urls": ["https://en.wikipedia.org/wiki/Hamster_racing"],
+    {"urls": ["https://en.wikipedia.org/wiki/Hamster_racing"],
      "requires": ["anonymous-client-ip-when-cross-origin"]}
   ]
 }
@@ -115,11 +113,13 @@ Since these are rules for optional behavior (the UA is always free not to specul
 
 The rules are divided into a number of simple pieces that build on one another, and could be shipped largely independently, due to the conservative parsing strategy.
 
+It was previously necessary for `"source"` to be specified explicitly for each rule; it is now possible to infer it in most cases. Some browser versions may not yet support this inference.
+
 ### List rules
 
-Currently, the only type of rule specified is a _list_ rule, denoted by `"source": "list"`. A list rule has an express list of the _URLs_ to which the rule applies. The list can contain any URLs, even ones for which no link or other reference to the URL exists in the document. This is especially useful in cases where the expected navigation corresponds to a link that will be added dynamically, or to an anticipated script-initiated navigation.
+A _list_ rule is denoted by `"source": "list"`, or implicitly by the presence of a `"urls"` key. A list rule has an express list of the _URLs_ to which the rule applies. The list can contain any URLs, even ones for which no link or other reference to the URL exists in the document. This is especially useful in cases where the expected navigation corresponds to a link that will be added dynamically, or to an anticipated script-initiated navigation.
 
-These URLs will be parsed relative to the document base URL (if inline in a document) or relative to the external resource URL (if externally fetched).
+These URLs are be parsed relative to the document base URL (if inline in a document) or relative to the external resource URL (if externally fetched).
 
 ### Requirements
 
@@ -129,8 +129,7 @@ Currently the only requirement that is specified is denoted by `"anonymous-clien
 
 ```json
 {"prefetch": [
-  {"source": "list",
-   "urls": [
+  {"urls": [
     "/item?id=32480009",
     "https://support.signal.org/hc/en-us/articles/4850133017242",
     "https://discord.com/blog/how-discord-supercharges-network-disks-for-extreme-low-latency",
@@ -152,7 +151,6 @@ To help with this, `"prerender"` rules can have a `"target_hint"` field, which c
 <script type=speculationrules>
 {
   "prerender": [{
-    "source": "list",
     "target_hint": "_blank",
     "urls": ["page.html"]
   }]
@@ -168,12 +166,10 @@ Note that if a page is truly unsure whether a given URL will be prerendered into
 ```json
 {
   "prerender": [
-   {"source": "list",
-    "target_hint": "_self",
+   {"target_hint": "_self",
     "urls": ["page.html"]
    },
-   {"source": "list",
-    "target_hint": "_blank",
+   {"target_hint": "_blank",
     "urls": ["page.html"]
    }]
 }
@@ -189,8 +185,7 @@ For example:
 ```json
 {
   "prefetch": [
-    {"source": "list",
-     "urls": ["https://en.wikipedia.org/wiki/Lethe"],
+    {"urls": ["https://en.wikipedia.org/wiki/Lethe"],
      "referrer_policy": "no-referrer"
     }
   ]
@@ -206,7 +201,7 @@ Note that referrer policy matching is not done between the speculative request a
 
 ### Document rules
 
-In addition to list rules, we envision _document_ rules, denoted by `"source": "document"`. These allow the user agent to find URLs for speculation from link elements in the page. They may include criteria which restrict which of these links can be used.
+In addition to list rules, we envision _document_ rules, denoted by `"source": "document"` or implicitly by the presence of a `"where"` key. These allow the user agent to find URLs for speculation from link elements in the page. They may include criteria which restrict which of these links can be used.
 
 The URL can be compared against [URL patterns][urlpattern] (parsed relative to the same base URL as URLs in list rules).
 
@@ -238,8 +233,7 @@ An example of using these would be the following, which marks up as safe-to-prer
 ```json
 {
   "prerender": [
-    {"source": "document",
-     "where": {"and": [
+    {"where": {"and": [
        {"href_matches": "/*"},
        {"not": {"href_matches": "/logout"}},
        {"not": {"selector_matches": ".no-prerender"}}
@@ -262,7 +256,6 @@ For rule sets that are externally fetched, urls in list rules and url patterns i
 
 ```json
 {
-  "source": "list",
   "urls": ["/home", "/about"],
   "relative_to": "document"
 }
@@ -272,7 +265,6 @@ For document rules, `"relative_to"` can be paired directly with `"href_matches"`
 
 ```json
 {
-  "source": "document",
   "where": {"or": [
     {"href_matches": "/home", "relative_to": "document"},
     {"href_matches": "/about"}
@@ -298,8 +290,7 @@ The user agent takes this into consideration along with its own heuristics, so i
 ```json
 {
   "prefetch": [
-    {"source": "list",
-     "urls": [
+    {"urls": [
        "https://en.wikipedia.org/wiki/Lethe",
        "https://github.com/containers/krunvm"
      ],
@@ -307,8 +298,7 @@ The user agent takes this into consideration along with its own heuristics, so i
     }
   ],
   "prerender": [
-    {"source": "document",
-     "where": {"and": [
+    {"where": {"and": [
        {"href_matches": "/*"},
        {"not": {"href_matches": "/logout"}},
        {"not": {"selector_matches": ".no-prerender"}}
@@ -327,7 +317,6 @@ We would like preloading to make use of the improved matching enabled by the [`N
 <script type="speculationrules">
 {
   "prefetch": [{
-    "source": "list",
     "urls": ["/products"]
   }]
 }
@@ -348,7 +337,6 @@ Furthermore, for prefetches triggered by the user agent's heuristics, not knowin
 <script type="speculationrules">
 {
   "prefetch": [{
-    "source": "list",
     "urls": ["/products"],
     "eagerness": "conservative"
   }]
@@ -365,7 +353,6 @@ To solve this, we have the speculation rules syntax provide a hint for what the
 <script type="speculationrules">
 {
   "prefetch": [{
-    "source": "list",
     "urls": ["/products"],
     "expects_no_vary_search": "params=(\"id\")"
   }]