@ai-ecoverse/slicc-browsers 1.14.7 → 1.14.8

package/README.md

@@ -312,7 +312,7 @@ It exports:
 - `knownOrigins` and `originDefaults`: the origin names a runner can miss, and the origins `plain`, `cross`, `log` and `own` fall back to when unset;
 - `parseURL(value, base?)`: a `URL`, or `null` for anything `new URL` rejects or a non-string; every parse of a fixture log entry or a Chrome-reported URL in the runner and the fixture goes through it (`protected.mjs` keeps its own copy, since it imports nothing), so an unparseable entry never throws;
 - `owned(entries, tag)`: the fixture log entries whose raw URL contains `tag`, the row's attribution through its `n=`, `tag=` or `to=` query;
-- `summary({ guard, sha, set, results })`: `set` is the parsed `guard-vectors.json`. It returns `{ set, schemaVersion, guard, sha, variants, targets, transports, results, skipped, notRun, missing, forged, pass, line }`. `missing` lists each `{ id, target, variant, transport }` without a row, for every vector whose `scope` is `any` or the guard, every target it lists, every variant in `variants` or `results`, and every transport in `results`; `pass` needs it empty, where `line` is `GUARD-PASS <guard>@<sha> (vectors @ai-ecoverse/slicc-browsers@X.Y.Z)` or `GUARD-FAIL …`. `forged` lists each `{ id, target, variant, transport, why }` that is `not-run` on a vector that isn't `kind: "text"`, or `skip` without a reason the runner gives (`not-applicable`, `not-applicable:no-<origin>-origin` for an origin in `knownOrigins` that the row's target or vector names, directly or through `originDefaults`, the vector's own `skip.reason` on its target, or `not-supported:<capability>` for a capability the set requires, `browserSession` or `unguarded-observer`); `pass` needs it empty too, and `line` then ends in `forged <n>`.
+- `summary({ guard, sha, set, results })`: `set` is the parsed `guard-vectors.json`. It returns `{ set, schemaVersion, guard, sha, variants, targets, transports, results, skipped, notRun, missing, forged, pass, line }`. `missing` lists each `{ id, target, variant, transport }` without a row, for every vector whose `scope` is `any` or the guard, every target it lists, every variant in `variants` or `results`, and every transport in `results`; `pass` needs it empty, where `line` is `GUARD-PASS <guard>@<sha> (vectors @ai-ecoverse/slicc-browsers@X.Y.Z)` or `GUARD-FAIL …`. `forged` lists each `{ id, target, variant, transport, why }` that is `not-run` on a vector that isn't `kind: "text"`, or `skip` without a reason the runner gives (`not-applicable`, `not-applicable:no-<origin>-origin` for an origin in `knownOrigins` that the row's target, `plain`, the control's origin, the steps or a check names, directly or through `originDefaults`, where only the first branch of an `any` counts, the vector's own `skip.reason` on its target, or `not-supported:<capability>` for a capability the set requires, `browserSession` or `unguarded-observer`); `pass` needs it empty too, and `line` then ends in `forged <n>`.
 
 **`npm run validate`** checks that:
 - the file matches the schema, and ids are unique;

package/guard-driver.mjs

@@ -305,14 +305,35 @@ const capabilities = (value) =>
         )
       : [];
 
+const originNames = (value) =>
+  [...q(value ?? null).matchAll(/\{([A-Za-z][A-Za-z-]*)\}/g)]
+    .map((match) => (match[1] === 'beacon' || match[1] === 'probe' ? 'log' : match[1]))
+    .flatMap((name) => [name, originDefaults[name]]);
+
+const checkOrigins = (check) => {
+  if (!check || typeof check !== 'object') return [];
+  if (check.any) return checkOrigins(check.any[0]);
+  if (check.all || check.not) return (check.all ?? [check.not]).flatMap(checkOrigins);
+  return originNames(check);
+};
+
 function originReason(vector, row, reason) {
   const origin = /^not-applicable:no-(.+)-origin$/.exec(reason)?.[1];
   if (!knownOrigins.includes(origin)) return false;
+  const fixed = [
+    row.target,
+    '{plain}',
+    vector?.control?.origin,
+    vector?.setup,
+    vector?.trigger,
+  ].map((value) => (typeof value === 'string' && !value.startsWith('{') ? `{${value}}` : value));
   return [
-    ...q([`{${row.target}}`, '{plain}', vector ?? null]).matchAll(/\{([A-Za-z][A-Za-z-]*)\}/g),
-  ]
-    .map((match) => (match[1] === 'beacon' || match[1] === 'probe' ? 'log' : match[1]))
-    .some((name) => name === origin || originDefaults[name] === origin);
+    ...originNames(fixed),
+    ...checkOrigins(vector?.liveCheck),
+    ...Object.values(vector?.observe ?? {}).flatMap((observation) =>
+      checkOrigins(observation?.check)
+    ),
+  ].includes(origin);
 }
 
 function skipWhy(vector, row, known) {

package/guard-vectors.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "setVersion": "1.14.7",
+  "setVersion": "1.14.8",
   "sources": [
     {
       "repo": "ai-ecoverse/slicc-cli",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/slicc-browsers",
-  "version": "1.14.7",
+  "version": "1.14.8",
   "description": "SLICC's shared browser catalog, JSON schemas and discovery conformance corpus",
   "type": "module",
   "license": "Apache-2.0",