yarramate 1.15.2 → 1.16.0

package/dist/adapter-mapping.js

@@ -1,18 +1,8 @@
-import Ajv2020Module from 'ajv/dist/2020.js';
 import { diagnosticOrder, loadSourceDocument, locateSourcePath, } from './source-document.js';
-import { lazyValidator } 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
-// `module.exports` and a bundler the unwrapped class. One shape for all of
-// them, so which modules a browser happens to reach is not a thing anyone has
-// to keep track of (#252).
-const ajv2020Module = Ajv2020Module;
-const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateSchema = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(adapterMappingSchema));
+import { validateAdapterMapping as validateSchema } from './schema-validation.js';
 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

@@ -1,5 +1,4 @@
 import { isMap, isScalar, isSeq, parseDocument, } from 'yaml';
-import Ajv2020Module from 'ajv/dist/2020.js';
 import { loadAdapterMapping } from './adapter-mapping.js';
 import { compileWorkspace, withDiagnosticSubjects, } from './compiler.js';
 import { evaluateEvidence, loadEvidence } from './evidence.js';
@@ -20,22 +19,9 @@ export const posixDirectoryOf = (path) => {
     const cut = normalised.lastIndexOf('/');
     return cut === -1 ? '' : normalised.slice(0, cut);
 };
-import operationsSchema from '../schema/yarramate-operations.schema.json' with { type: 'json'
-};
-import { lazyValidator } 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).
-const ajv2020Module = Ajv2020Module;
-const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
+import { validateOperations } from './schema-validation.js';
 // `discriminator` routes a batch entry to the single branch its `op` names, so
 // 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));
 // 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 +299,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

@@ -1,23 +1,11 @@
-import Ajv2020Import from 'ajv/dist/2020.js';
 import { LineCounter, parse, parseDocument } from 'yaml';
 import { conceptKinds, relationshipPolicies, } from './profile.js';
 import { isCoreConceptKindId, matrixEndpointAspects, permittedRelationshipKinds as tablePermittedKinds, } from './relationship-matrix.js';
 import { closestCandidate, describeSchemaViolation, } from './source-document.js';
-import documentSchema from '../schema/yarramate-document.schema.json' with { type: 'json'
-};
-import profileSchema from '../schema/yarramate-profile.schema.json' with { type: 'json'
-};
-import patternSchema from '../schema/yarramate-pattern.schema.json' with { type: 'json'
-};
 import { ATTESTATION_PREDICATE_PREFIX, attestationClaimValue } from './graph-claims.js';
 import { shippedPolicyIdentity, shippedPolicySource, } from './shipped-profile.js';
-import { lazyValidator } from './schema-validation.js';
+import { validateDocument, validateProfile, validatePattern } 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 immutableMap = (entries) => {
     const backing = new Map(entries);
     const facade = {
@@ -161,12 +149,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 +319,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 +379,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 +629,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,18 +1,8 @@
-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 coreContractSchema from '../schema/yarramate-core-contract.schema.json' with { type: 'json'
-};
-// `.default ?? module`, not a bare `.default`: NodeNext sees the raw CJS
-// `module.exports` and a bundler the unwrapped class. One shape for all of
-// them, so which modules a browser happens to reach is not a thing anyone has
-// to keep track of (#252).
-const ajv2020Module = Ajv2020Module;
-const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateCoreContract = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(coreContractSchema));
+import { validateCoreContract } from './schema-validation.js';
 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

@@ -1,19 +1,9 @@
-import Ajv2020Module from 'ajv/dist/2020.js';
 import { diagnosticOrder, loadSourceDocument, locateSourcePath, } from './source-document.js';
-import evidenceSchema from '../schema/yarramate-evidence.schema.json' with { type: 'json'
-};
-// `.default ?? module`, not a bare `.default`: NodeNext sees the raw CJS
-// `module.exports` and a bundler the unwrapped class. One shape for all of
-// them, so which modules a browser happens to reach is not a thing anyone has
-// 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 { validateEvidence as validateEvidenceSchema } from './schema-validation.js';
 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

@@ -1,17 +1,7 @@
-import Ajv2020Module from 'ajv/dist/2020.js';
 import { loadSourceDocument, locateSourcePath, } from './source-document.js';
 import { nearDuplicateIndex } from './subject-identity.js';
 import { sourceKindsPermitting, tableKnowsConceptKind, tableKnowsRelationshipKind, targetKindsPermitting, } from './relationship-matrix.js';
-import catalogueSchema from '../schema/yarramate-question-catalogue.schema.json' with { type: 'json'
-};
-// `.default ?? module`, not a bare `.default`: NodeNext sees the raw CJS
-// `module.exports` and a bundler the unwrapped class. One shape for all of
-// them, so which modules a browser happens to reach is not a thing anyone has
-// 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 { validateCatalogue } from './schema-validation.js';
 /**
  * The version of condition evaluation itself, not of the package.
  *
@@ -917,7 +907,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

@@ -1,12 +1,6 @@
-import Ajv2020Import from 'ajv/dist/2020.js';
 import { isDeclaredNonGoal } from './brief.js';
 import { loadSourceDocument } from './source-document.js';
 import { similarity } from './subject-identity.js';
-import projectionSchema from '../schema/yarramate-projection.schema.json' with { type: 'json'
-};
-const ajv2020Module = Ajv2020Import;
-const Ajv2020 = ajv2020Module.default ?? ajv2020Module;
-const validateProjection = lazyValidator(() => new Ajv2020({ allErrors: true }).compile(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 +14,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 { validateProjection } 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,42 @@
 import type { ValidateFunction } from 'ajv';
 /**
- * Defers compiling a JSON Schema until something actually validates against
- * it, then reuses the compiled validator forever.
+ * The package's JSON Schema validators, precompiled at BUILD time.
  *
- * 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.
+ * Ajv normally compiles a schema by generating source and calling
+ * `new Function`, and where that happens decided two releases:
  *
- * 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.
+ * - Cloudflare's `workerd` **permits** code generation during module
+ *   evaluation and **forbids** it at request time. 1.15.2 deferred compilation
+ *   to first use to save startup CPU, which put it inside a request, and every
+ *   request that validated anything threw `EvalError`.
+ * - 1.15.3 moved compilation back to import, where it is allowed, but that
+ *   only avoids the forbidden context. The codegen still ran, and Workers
+ *   budget startup CPU separately (400ms) and refuse a Worker that exceeds it.
+ *   An adopter's deploy came back at 439ms against that line.
  *
- * 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.
+ * Precompiling removes the question instead of answering it: there is no
+ * compile step left to put in the wrong place, and no amount of future
+ * refactoring can move one back. `schema-validators.generated.js` is committed
+ * and regenerated by `pnpm generate:validators`;
+ * `test/generated-validators.test.ts` regenerates and compares byte for byte,
+ * so a schema edited without regenerating fails there rather than shipping a
+ * validator that checks the old shape.
  *
- * `test/schema-validation-laziness.test.ts` asserts that importing the package
- * compiles NOTHING, and fails on the next module-scope validator anyone adds.
+ * Behaviour is unchanged: same `allErrors` collection, same messages, same
+ * `errors` property on each validator. `validateOperations` is emitted from an
+ * instance with `discriminator` enabled, which is compiled into it.
+ *
+ * Ajv's COMPILER is a build dependency now rather than a runtime one. Two pure
+ * helpers - a deep-equal and a UCS-2 string length - are still imported from
+ * `ajv/dist/runtime` by the generated module, which is the accurate claim.
  */
-export declare const lazyValidator: <T = unknown>(compile: () => ValidateFunction<T>) => (() => ValidateFunction<T>);
+export declare const validateDocument: ValidateFunction;
+export declare const validateProfile: ValidateFunction;
+export declare const validatePattern: ValidateFunction;
+export declare const validateWorkspace: ValidateFunction;
+export declare const validateProjection: ValidateFunction;
+export declare const validateEvidence: ValidateFunction;
+export declare const validateCoreContract: ValidateFunction;
+export declare const validateAdapterMapping: ValidateFunction;
+export declare const validateCatalogue: ValidateFunction;
+export declare const validateOperations: ValidateFunction;

package/dist/schema-validation.js

@@ -1,32 +1,43 @@
+import * as generatedOperations from './schema-validators-operations.generated.js';
+import * as generated from './schema-validators.generated.js';
 /**
- * Defers compiling a JSON Schema until something actually validates against
- * it, then reuses the compiled validator forever.
+ * The package's JSON Schema validators, precompiled at BUILD time.
  *
- * 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.
+ * Ajv normally compiles a schema by generating source and calling
+ * `new Function`, and where that happens decided two releases:
  *
- * 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.
+ * - Cloudflare's `workerd` **permits** code generation during module
+ *   evaluation and **forbids** it at request time. 1.15.2 deferred compilation
+ *   to first use to save startup CPU, which put it inside a request, and every
+ *   request that validated anything threw `EvalError`.
+ * - 1.15.3 moved compilation back to import, where it is allowed, but that
+ *   only avoids the forbidden context. The codegen still ran, and Workers
+ *   budget startup CPU separately (400ms) and refuse a Worker that exceeds it.
+ *   An adopter's deploy came back at 439ms against that line.
  *
- * 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.
+ * Precompiling removes the question instead of answering it: there is no
+ * compile step left to put in the wrong place, and no amount of future
+ * refactoring can move one back. `schema-validators.generated.js` is committed
+ * and regenerated by `pnpm generate:validators`;
+ * `test/generated-validators.test.ts` regenerates and compares byte for byte,
+ * so a schema edited without regenerating fails there rather than shipping a
+ * validator that checks the old shape.
  *
- * `test/schema-validation-laziness.test.ts` asserts that importing the package
- * compiles NOTHING, and fails on the next module-scope validator anyone adds.
+ * Behaviour is unchanged: same `allErrors` collection, same messages, same
+ * `errors` property on each validator. `validateOperations` is emitted from an
+ * instance with `discriminator` enabled, which is compiled into it.
+ *
+ * Ajv's COMPILER is a build dependency now rather than a runtime one. Two pure
+ * helpers - a deep-equal and a UCS-2 string length - are still imported from
+ * `ajv/dist/runtime` by the generated module, which is the accurate claim.
  */
-export const lazyValidator = (compile) => {
-    let compiled;
-    return () => (compiled ??= compile());
-};
+export const validateDocument = generated.validateDocument;
+export const validateProfile = generated.validateProfile;
+export const validatePattern = generated.validatePattern;
+export const validateWorkspace = generated.validateWorkspace;
+export const validateProjection = generated.validateProjection;
+export const validateEvidence = generated.validateEvidence;
+export const validateCoreContract = generated.validateCoreContract;
+export const validateAdapterMapping = generated.validateAdapterMapping;
+export const validateCatalogue = generated.validateCatalogue;
+export const validateOperations = generatedOperations.validateOperations;

package/dist/schema-validators-operations.generated.d.ts

@@ -0,0 +1,7 @@
+export declare const validateOperations: typeof validate20;
+declare function validate20(data: any, { instancePath, parentData, parentDataProperty, rootData, dynamicAnchors }?: {
+    dynamicAnchors?: {} | undefined;
+    instancePath?: string | undefined;
+    rootData?: any;
+}): boolean;
+export {};