@astrosheep/keiyaku 4.6.1 → 4.6.3

package/build/src/library/contract-settings.js

@@ -13,7 +13,7 @@ function settingsScopedFailure(error) {
 /**
  * Hooks, freshness, and gate bundles are read from the captured Settings only at the operation
  * that consumes them. Bare core (omitted Settings) keeps empty hooks, false freshness, and
- * literal gate words; a broken selected namespace fails before any admission.
+ * built-in gate words; a broken selected namespace fails before any admission.
  */
 export function derivedHooks(composition) {
     if (composition.settings === undefined)
@@ -77,28 +77,28 @@ function gateValue(value, message, configured) {
 }
 function bundleGates(name, value) {
     if (value === null || typeof value !== "object" || Array.isArray(value)) {
-        throw new SettingsError(`gate bundle '${name}' must be an object`);
+        throw new SettingsError(`gate group '${name}' must be an object`);
     }
     const bundle = value;
     if (bundle.kind !== "bundle") {
-        throw new SettingsError(`gate bundle '${name}' has unsupported kind: ${String(bundle.kind)}`);
+        throw new SettingsError(`gate group '${name}' has unsupported kind: ${String(bundle.kind)}`);
     }
     for (const field of Object.keys(bundle)) {
         if (field !== "kind" && field !== "gates") {
-            throw new SettingsError(`gate bundle '${name}' has unknown field: ${field}`);
+            throw new SettingsError(`gate group '${name}' has unknown field: ${field}`);
         }
     }
     if (!Array.isArray(bundle.gates))
-        throw new SettingsError(`gate bundle '${name}'.gates must be an array`);
-    return bundle.gates.map((value) => gateValue(value, `gate bundle '${name}' contains an invalid gate word`, true));
+        throw new SettingsError(`gate group '${name}'.gates must be an array`);
+    return bundle.gates.map((value) => gateValue(value, `gate group '${name}' contains an invalid gate word`, true));
 }
-/** Bare words and configured bundles share validation, first-seen accumulation, and freezing. */
+/** Built-in words and configured bundles share validation, first-seen accumulation, and freezing. */
 export function derivedGates(composition, names) {
     const settings = composition.settings;
     const configured = settings !== undefined;
     try {
         const selected = (names ?? (configured ? ["default"] : [])).map((name, index) => gateValue(name, configured
-            ? "gate or bundle name must match ^[a-z][a-z0-9-]{0,63}$"
+            ? "gate name must match ^[a-z][a-z0-9-]{0,63}$"
             : `gates[${index}] must match ^[a-z][a-z0-9-]{0,63}$`, configured));
         // Explicit empty selection never looks up a namespace.
         if (selected.length === 0)
@@ -106,13 +106,22 @@ export function derivedGates(composition, names) {
         const view = settings?.namespace("gates");
         if (view?.kind === "failed")
             namespaceFailure(view);
+        const known = [
+            ...new Set(["reviewed", "verified", ...(view?.entries.map((entry) => entry.name).filter(gateWord) ?? [])]),
+        ];
         const expanded = new Set();
         for (const name of selected) {
             const entry = view?.entries.find((entry) => entry.name === name);
-            const gates = entry === undefined
-                ? [configured && names === undefined ? gate("reviewed") : name]
-                : bundleGates(name, entry.value);
-            for (const value of gates)
+            if (entry === undefined) {
+                // The implicit default bundle falls back to the built-in review gate.
+                const implicit = configured && names === undefined;
+                const word = implicit ? gate("reviewed") : name;
+                if (word !== "reviewed" && word !== "verified")
+                    throw new KeiyakuError("invalid-input", `Unknown gate '${word}'. Known gate names: ${known.join(", ")}`);
+                expanded.add(word);
+                continue;
+            }
+            for (const value of bundleGates(name, entry.value))
                 expanded.add(value);
         }
         return Object.freeze([...expanded]);