yarramate 1.15.2 → 1.15.3

package/dist/adapter-mapping.js

@@ -1,6 +1,6 @@
 import Ajv2020Module from 'ajv/dist/2020.js';
 import { diagnosticOrder, loadSourceDocument, locateSourcePath, } from './source-document.js';
-import { lazyValidator } from './schema-validation.js';
+import { compileValidator } from './schema-validation.js';
 import adapterMappingSchema from '../schema/yarramate-adapter-mapping.schema.json' with { type: 'json'
 };
 // `.default ?? module`, not a bare `.default`: NodeNext sees the raw CJS
@@ -9,10 +9,10 @@ import adapterMappingSchema from '../schema/yarramate-adapter-mapping.schema.jso
 // to keep track of (#252).
 const ajv2020Module = Ajv2020Module;
 const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateSchema = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(adapterMappingSchema));
+const validateSchema = compileValidator(adapterMappingSchema);
 const mappingLocations = new WeakMap();
 export function loadAdapterMapping(source) {
-    const loaded = loadSourceDocument(source, validateSchema(), 'Adapter mapping');
+    const loaded = loadSourceDocument(source, validateSchema, 'Adapter mapping');
     if (!loaded.ok)
         return loaded;
     const { value, yaml, lineCounter } = loaded.document;

package/dist/apply-command.js

@@ -22,7 +22,7 @@ export const posixDirectoryOf = (path) => {
 };
 import operationsSchema from '../schema/yarramate-operations.schema.json' with { type: 'json'
 };
-import { lazyValidator } from './schema-validation.js';
+import { compileValidatorWith } from './schema-validation.js';
 // `.default ?? module`, not a bare `.default`: NodeNext sees the raw CJS
 // `module.exports` and a bundler sees the unwrapped class, and this file is
 // reachable from a browser through `./apply-operations.js` (#252).
@@ -32,10 +32,7 @@ const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
 // one malformed operation reports one fault instead of ten near-misses.
 // Keeps its own Ajv instance: `discriminator` changes how a schema compiles,
 // so it cannot share one with the nine that do not set it.
-const validateOperations = lazyValidator(() => new Ajv2020({
-    allErrors: true,
-    discriminator: true,
-}).compile(operationsSchema));
+const validateOperations = compileValidatorWith({ allErrors: true, discriminator: true }, operationsSchema);
 // Scalar fields replace; list fields append; `remove` retracts (ADR 0062).
 // An answer enriches what is there and may explicitly take back what it
 // asserted — it never silently shrinks anything.
@@ -313,7 +310,7 @@ export const applyOperations = (input) => {
         ok: false,
         diagnostics,
     });
-    const loadedOperations = loadSourceDocument(operations, validateOperations(), 'Operations');
+    const loadedOperations = loadSourceDocument(operations, validateOperations, 'Operations');
     if (!loadedOperations.ok)
         return failed(loadedOperations.diagnostics);
     const operationList = loadedOperations.document.value.operations;

package/dist/compiler.js

@@ -11,13 +11,13 @@ import patternSchema from '../schema/yarramate-pattern.schema.json' with { type:
 };
 import { ATTESTATION_PREDICATE_PREFIX, attestationClaimValue } from './graph-claims.js';
 import { shippedPolicyIdentity, shippedPolicySource, } from './shipped-profile.js';
-import { lazyValidator } from './schema-validation.js';
+import { compileValidator } from './schema-validation.js';
 const coreProfile = 'yarramate/core@0.1';
 const ajv2020Module = Ajv2020Import;
 const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateDocument = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(documentSchema));
-const validateProfile = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(profileSchema));
-const validatePattern = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(patternSchema));
+const validateDocument = compileValidator(documentSchema);
+const validateProfile = compileValidator(profileSchema);
+const validatePattern = compileValidator(patternSchema);
 const immutableMap = (entries) => {
     const backing = new Map(entries);
     const facade = {
@@ -161,12 +161,12 @@ const parseWorkspaceSource = (input) => {
             fresh,
         };
     }
-    const valid = parseDiagnostics.length === 0 && validateDocument()(value);
+    const valid = parseDiagnostics.length === 0 && validateDocument(value);
     const schemaDiagnostics = parseDiagnostics.length > 0
         ? parseDiagnostics
         : valid
             ? []
-            : (validateDocument().errors ?? []).map((error) => {
+            : (validateDocument.errors ?? []).map((error) => {
                 const property = error.keyword === 'additionalProperties'
                     ? String(error.params.additionalProperty)
                     : undefined;
@@ -331,8 +331,8 @@ function compileWorkspaceResolved(parsed) {
             profileDiagnostics.push(...entry.schemaDiagnostics);
             continue;
         }
-        if (!validateProfile()(value)) {
-            for (const error of validateProfile().errors ?? []) {
+        if (!validateProfile(value)) {
+            for (const error of validateProfile.errors ?? []) {
                 const property = error.keyword === 'additionalProperties'
                     ? String(error.params.additionalProperty)
                     : undefined;
@@ -391,8 +391,8 @@ function compileWorkspaceResolved(parsed) {
             if (entry.schemaDiagnostics.length > 0) {
                 profileDiagnostics.push(...entry.schemaDiagnostics);
             }
-            else if (!validateProfile()(value)) {
-                for (const error of validateProfile().errors ?? []) {
+            else if (!validateProfile(value)) {
+                for (const error of validateProfile.errors ?? []) {
                     profileDiagnostics.push({
                         severity: 'error',
                         code: 'YM201',
@@ -641,8 +641,8 @@ function compileWorkspaceResolved(parsed) {
             patternDiagnostics.push(...entry.schemaDiagnostics);
             continue;
         }
-        if (!validatePattern()(value)) {
-            for (const error of validatePattern().errors ?? []) {
+        if (!validatePattern(value)) {
+            for (const error of validatePattern.errors ?? []) {
                 const property = error.keyword === 'additionalProperties'
                     ? String(error.params.additionalProperty)
                     : undefined;

package/dist/core-contract.js

@@ -1,7 +1,7 @@
 import Ajv2020Module from 'ajv/dist/2020.js';
 import { LineCounter, parseDocument } from 'yaml';
 import { diagnosticOrder, loadSourceDocument, locateSourcePath, } from './source-document.js';
-import { lazyValidator } from './schema-validation.js';
+import { compileValidator } from './schema-validation.js';
 import coreContractSchema from '../schema/yarramate-core-contract.schema.json' with { type: 'json'
 };
 // `.default ?? module`, not a bare `.default`: NodeNext sees the raw CJS
@@ -10,9 +10,9 @@ import coreContractSchema from '../schema/yarramate-core-contract.schema.json' w
 // to keep track of (#252).
 const ajv2020Module = Ajv2020Module;
 const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateCoreContract = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(coreContractSchema));
+const validateCoreContract = compileValidator(coreContractSchema);
 export function loadCoreContract(source) {
-    const loaded = loadSourceDocument(source, validateCoreContract(), 'Core contract');
+    const loaded = loadSourceDocument(source, validateCoreContract, 'Core contract');
     if (!loaded.ok)
         return loaded;
     const { value, yaml, lineCounter } = loaded.document;

package/dist/evidence.js

@@ -8,12 +8,12 @@ import evidenceSchema from '../schema/yarramate-evidence.schema.json' with { typ
 // to keep track of (#252).
 const ajv2020Module = Ajv2020Module;
 const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-import { lazyValidator } from './schema-validation.js';
-const validateEvidenceSchema = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(evidenceSchema));
+import { compileValidator } from './schema-validation.js';
+const validateEvidenceSchema = compileValidator(evidenceSchema);
 const evidenceLocations = new WeakMap();
 const observationTarget = (observation) => 'subject' in observation ? observation.subject : observation.claim;
 export function loadEvidence(source) {
-    const loaded = loadSourceDocument(source, validateEvidenceSchema(), 'Evidence');
+    const loaded = loadSourceDocument(source, validateEvidenceSchema, 'Evidence');
     if (!loaded.ok)
         return loaded;
     const { value, yaml, lineCounter } = loaded.document;

package/dist/interrogate-command.js

@@ -10,8 +10,8 @@ import catalogueSchema from '../schema/yarramate-question-catalogue.schema.json'
 // to keep track of (#252).
 const ajv2020Module = Ajv2020Module;
 const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-import { lazyValidator } from './schema-validation.js';
-const validateCatalogue = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(catalogueSchema));
+import { compileValidator } from './schema-validation.js';
+const validateCatalogue = compileValidator(catalogueSchema);
 /**
  * The version of condition evaluation itself, not of the package.
  *
@@ -917,7 +917,7 @@ const unauthorableOffers = (catalogue, profileContext) => {
     return found;
 };
 const loadCatalogueDocument = (catalogueSource) => {
-    const loaded = loadSourceDocument(catalogueSource, validateCatalogue(), 'Question catalogue');
+    const loaded = loadSourceDocument(catalogueSource, validateCatalogue, 'Question catalogue');
     if (!loaded.ok)
         return { ok: false, diagnostics: loaded.diagnostics };
     return {

package/dist/projection.js

@@ -6,7 +6,7 @@ import projectionSchema from '../schema/yarramate-projection.schema.json' with {
 };
 const ajv2020Module = Ajv2020Import;
 const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateProjection = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(projectionSchema));
+const validateProjection = compileValidator(projectionSchema);
 /**
  * A relationship kind a view may draw as nesting, and the default. Defined in
  * `./nesting.js`, which imports nothing, and re-exported here so a consumer
@@ -20,9 +20,9 @@ export { DEFAULT_NESTING } from './nesting.js';
  * nesting vocabulary above, and re-exported here on the same terms (ADR 0121).
  */
 export { DEFAULT_DIRECTION } from './layout-direction.js';
-import { lazyValidator } from './schema-validation.js';
+import { compileValidator } from './schema-validation.js';
 export function loadProjection(source) {
-    const loaded = loadSourceDocument(source, validateProjection(), 'Projection');
+    const loaded = loadSourceDocument(source, validateProjection, 'Projection');
     return loaded.ok
         ? { ok: true, projection: loaded.document.value }
         : loaded;

package/dist/schema-validation.d.ts

@@ -1,30 +1,12 @@
+import Ajv2020Module from 'ajv/dist/2020.js';
 import type { ValidateFunction } from 'ajv';
+declare const Ajv2020: typeof Ajv2020Module & typeof Ajv2020Module.Ajv2020;
+/** Compiles on the shared `allErrors` instance. */
+export declare const compileValidator: <T = unknown>(schema: object) => ValidateFunction<T>;
 /**
- * Defers compiling a JSON Schema until something actually validates against
- * it, then reuses the compiled validator forever.
- *
- * Ten validators used to be constructed and compiled at MODULE SCOPE, so
- * importing the package paid for every one of them whether or not a caller
- * ever validated anything. Measured on the published 1.15.1 dist: ten
- * `Ajv.compile` calls costing **123.7ms, 80% of the barrel's entire import
- * time**, and one more on the `yarramate/interrogation` subpath, which is the
- * entry we tell Workers consumers to prefer. That is not an abstract cost:
- * Cloudflare Workers budget STARTUP CPU separately from request CPU and refuse
- * a Worker that exceeds it, so an adopter's deploy was rejected outright
- * (error 10021) by work no request had asked for.
- *
- * Deferring moves that cost to first use, where the budget is seconds rather
- * than milliseconds, and a caller pays only for the schemas it actually
- * touches - a consumer that compiles a workspace no longer pays for the
- * evidence, adapter-mapping and core-contract validators it never calls.
- *
- * The accessor is a function rather than a getter so the deferral is visible
- * at every call site: `validateDocument()(value)` reads as "get the validator,
- * then use it", and `validateDocument().errors` cannot accidentally be read
- * off a validator that was never run. Ajv attaches `errors` to the validator
- * itself, so the two must come from the same object.
- *
- * `test/schema-validation-laziness.test.ts` asserts that importing the package
- * compiles NOTHING, and fails on the next module-scope validator anyone adds.
+ * For a schema needing options the shared instance does not carry. Only
+ * `apply-command` uses it: `discriminator` changes how a schema compiles, so
+ * it cannot ride on an instance that does not set it.
  */
-export declare const lazyValidator: <T = unknown>(compile: () => ValidateFunction<T>) => (() => ValidateFunction<T>);
+export declare const compileValidatorWith: <T = unknown>(options: ConstructorParameters<typeof Ajv2020>[0], schema: object) => ValidateFunction<T>;
+export {};

package/dist/schema-validation.js

@@ -1,32 +1,46 @@
+import Ajv2020Module from 'ajv/dist/2020.js';
+// The published dual-export dance every other module here does; see the
+// comment in `compiler.ts` for why (#252).
+const ajv2020Module = Ajv2020Module;
+const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
 /**
- * Defers compiling a JSON Schema until something actually validates against
- * it, then reuses the compiled validator forever.
+ * Compiles a JSON Schema AT MODULE SCOPE, on an instance shared with every
+ * other schema that wants the same options.
  *
- * Ten validators used to be constructed and compiled at MODULE SCOPE, so
- * importing the package paid for every one of them whether or not a caller
- * ever validated anything. Measured on the published 1.15.1 dist: ten
- * `Ajv.compile` calls costing **123.7ms, 80% of the barrel's entire import
- * time**, and one more on the `yarramate/interrogation` subpath, which is the
- * entry we tell Workers consumers to prefer. That is not an abstract cost:
- * Cloudflare Workers budget STARTUP CPU separately from request CPU and refuse
- * a Worker that exceeds it, so an adopter's deploy was rejected outright
- * (error 10021) by work no request had asked for.
+ * **Compilation must happen at import, and this is not a preference.** Ajv
+ * compiles a schema by generating source and calling `new Function`.
+ * Cloudflare's `workerd` permits code generation during module evaluation and
+ * FORBIDS it at request time - measured on the real runtime binary:
  *
- * Deferring moves that cost to first use, where the budget is seconds rather
- * than milliseconds, and a caller pays only for the schemas it actually
- * touches - a consumer that compiles a workspace no longer pays for the
- * evidence, adapter-mapping and core-contract validators it never calls.
+ * ```
+ * {"atStartup":"ALLOWED",
+ *  "atRequest":"EvalError: Code generation from strings disallowed for this context"}
+ * ```
  *
- * The accessor is a function rather than a getter so the deferral is visible
- * at every call site: `validateDocument()(value)` reads as "get the validator,
- * then use it", and `validateDocument().errors` cannot accidentally be read
- * off a validator that was never run. Ajv attaches `errors` to the validator
- * itself, so the two must come from the same object.
+ * 1.15.2 deferred these compiles to first use to keep startup CPU down, which
+ * moved them into the one context that cannot run them: every request that
+ * validated anything threw. The startup budget was real, but a package that
+ * cannot serve a request is not a fix for it. Deferral is therefore not an
+ * option here, and `test/schema-validation-eagerness.test.ts` asserts the
+ * opposite of what its predecessor did - that importing the package compiles
+ * every validator, so no request has to.
  *
- * `test/schema-validation-laziness.test.ts` asserts that importing the package
- * compiles NOTHING, and fails on the next module-scope validator anyone adds.
+ * The cost is paid down by SHARING one Ajv instance rather than building ten.
+ * Each instance compiles the 2020-12 meta-schema again, and that dominates:
+ * ten instances cost 81.6ms against 35.0ms for one, a 57% reduction with no
+ * change to when anything runs. Sharing is safe here because no schema
+ * registers formats and all 39 ship distinct `$id`s, so nothing collides.
+ *
+ * The real ceiling-lifter is precompiled standalone validators (Ajv's
+ * `code: { source: true }`), which remove Ajv from the runtime altogether and
+ * satisfy both constraints at once. This is the shape that is correct today.
+ */
+const sharedAjv = new Ajv2020({ allErrors: true });
+/** Compiles on the shared `allErrors` instance. */
+export const compileValidator = (schema) => sharedAjv.compile(schema);
+/**
+ * For a schema needing options the shared instance does not carry. Only
+ * `apply-command` uses it: `discriminator` changes how a schema compiles, so
+ * it cannot ride on an instance that does not set it.
  */
-export const lazyValidator = (compile) => {
-    let compiled;
-    return () => (compiled ??= compile());
-};
+export const compileValidatorWith = (options, schema) => new Ajv2020(options).compile(schema);