@telorun/kernel 0.72.0 → 0.74.0

package/src/schema-validator.ts

@@ -7,7 +7,8 @@ import { createHash } from "node:crypto";
 import * as fs from "node:fs";
 import { createRequire } from "node:module";
 import * as path from "node:path";
-import { binaryKeyword, X_TELO_BINARY } from "@telorun/analyzer";
+import { registerTeloKeywords } from "@telorun/analyzer";
+import { X_TELO_TYPE } from "@telorun/sdk";
 import { mergeFilledDefaults, withBigIntsAsNumbers } from "./bigint-schema-view.js";
 import { formatAjvErrors } from "./manifest-schemas.js";
 
@@ -25,7 +26,6 @@ import {
   EXACT_TEMPLATE_REGEX,
   isTaggedSentinel,
   ManifestRootSchema,
-  normalizeRefSlots,
 } from "@telorun/templating";
 
 const Ajv = AjvModule.default ?? AjvModule;
@@ -165,13 +165,19 @@ const NAME_KEYED_SCHEMA_KEYWORDS = new Set([
 const DATA_VALUE_KEYWORDS = new Set(["const", "default", "enum", "examples"]);
 
 /** Annotations that DO emit validation code, and so must survive the strip and stay
- *  in the cache key. `x-telo-binary` is the first: bytes have no JSON Schema type,
+ *  in the cache key. `x-telo-type` is the only one: bytes have no JSON Schema type,
  *  so the keyword is the only thing standing between a byte slot and "accepts any
  *  object". Stripping it would silently reduce the slot to an empty schema — the
  *  precise regression the annotation was introduced to close — and, because the key
  *  is meant to describe the compiled validator, a keyword that changes the validator
- *  belongs in it. */
-const VALIDATING_ANNOTATIONS = new Set([X_TELO_BINARY]);
+ *  belongs in it.
+ *
+ *  Its names need no canonicalization to be safe in a key, unlike `x-telo-ref`'s:
+ *  the vocabulary is closed and `Telo.`-qualified, so an author writes the
+ *  canonical name or none, and a named SHAPE reaches the annotation as a `$ref`
+ *  the loader already resolved. There is nothing here that the analyzer's baked
+ *  view and the runtime could spell differently. */
+const VALIDATING_ANNOTATIONS = new Set([X_TELO_TYPE]);
 
 /** Deep-clone `schema` without its `x-telo-*` annotations — applied, like
  *  {@link collapseSentinelsToSource}, before both AJV compilation and cache
@@ -193,9 +199,7 @@ const VALIDATING_ANNOTATIONS = new Set([X_TELO_BINARY]);
  *
  *  Stripping is what makes the key describe the compiled validator and nothing
  *  else, so the two views converge without either side having to agree on an
- *  annotation's spelling. `normalizeRefSlots` runs FIRST and is unaffected: it
- *  reads `x-telo-ref` to drop a legacy scalar `type` at a ref slot, which does
- *  change validation, and it has already done so by the time this runs. */
+ *  annotation's spelling. */
 function stripTeloAnnotations(value: unknown, nameKeyed = false): unknown {
   // An array's items are schema nodes (`allOf`, tuple `items`), never names.
   if (Array.isArray(value)) return value.map((item) => stripTeloAnnotations(item));
@@ -258,27 +262,12 @@ export class SchemaValidator {
       code: { source: true },
     });
     addFormats.default(this.ajv);
-    for (const kw of [
-      "x-telo-ref",
-      "x-telo-eval",
-      "x-telo-scope",
-      "x-telo-context",
-      "x-telo-context-from",
-      "x-telo-context-ref-from",
-      "x-telo-schema-from",
-      "x-telo-topology-role",
-      "x-telo-step-context",
-      "x-telo-widget",
-      "x-telo-type",
-      "x-telo-inline",
-    ]) {
-      this.ajv.addKeyword(kw);
-    }
-    // Not a no-op like the rest: bytes have no JSON Schema type, so this keyword IS
-    // the check. Defined as codegen in the analyzer so it inlines into the
-    // standalone validators compiled and cached below, rather than needing the
-    // implementation present at load.
-    this.ajv.addKeyword(binaryKeyword());
+    // One registration site for every Telo keyword: the annotations as no-ops
+    // and `x-telo-type` as the one that actually checks. `x-telo-type` is defined
+    // as codegen in the analyzer so it inlines into the standalone validators
+    // compiled and cached below, rather than needing the implementation present
+    // at load.
+    registerTeloKeywords(this.ajv);
     // Register the shared manifest root so module schemas can
     // `$ref: "telo://manifest#/$defs/ResourceRef"` without each manifest
     // bundling its own copy. Mirrors the analyzer's createAjv().
@@ -361,12 +350,7 @@ export class SchemaValidator {
           }
         : normalized;
 
-    // Drop the legacy scalar `type` an older published module may still pin on
-    // its `x-telo-ref` slots. Schema validation runs in create() before Phase 5
-    // injection, so a ref slot holds the resolved `{kind, name, alias?}` object
-    // (or an unresolved sentinel) — both objects the stale `type: "string"`
-    // would otherwise reject.
-    const injected = normalizeRefSlots(withImplicit) as typeof withImplicit;
+    const injected = withImplicit;
 
     // Canonicalize CEL/template carriers (an inline `${{ }}` left in a
     // `description`, a `!cel` tag, …) to their bare source text so AJV can