Skip to content

armgit / hypit

Public Imported from GitHub
0

Clone any viral video with AI agents. Not just a script, the whole workflow: swap the face, the words, the B-roll, ship 100 variants in one command, and get your 100M views.

feat: lock type validator facets

kashorin4ff88c4fd2e1
diff --git a/packages/component-kit/README.md b/packages/component-kit/README.md
index 5a8cb242..022772d8 100644
--- a/packages/component-kit/README.md
+++ b/packages/component-kit/README.md
@@ -1,8 +1,10 @@
# `@svml/component-kit`
-The minimal host-neutral SDK for trusted deterministic compute components. A package may register
-Producer handlers and Type-owner validators. Producer handlers receive only the Core command,
-Producer identity and immutable typed inputs.
+The minimal host-neutral SDK for trusted deterministic compute components. A package exports
+enumerable Producer installation and Type-owner validator facets. Validator identity is data
+(`TypeRef` plus implementation digest), so package locks and Hosts can inspect it without serializing
+the handler. Producer handlers receive only the Core command, Producer identity and immutable typed
+inputs.
They receive no ArtifactStore, credentials, network client, queue or Runtime service. Work that
needs those authorities must emit an explicit Need and be implemented by a separately selected
diff --git a/packages/component-kit/src/index.ts b/packages/component-kit/src/index.ts
index 110a7226..1b1b584c 100644
--- a/packages/component-kit/src/index.ts
+++ b/packages/component-kit/src/index.ts
@@ -4,9 +4,13 @@ import type {
InvokeProducerCommand,
ProducerRef,
StoredValue,
+ TypeRef,
TypedRecord,
} from "@svml/protocol";
-import type { TypeValidatorRegistrar } from "@svml/validation";
+import type {
+ TypeValidatorHandler,
+ TypeValidatorRegistrar,
+} from "@svml/validation";
export type Awaitable<T> = T | Promise<T>;
@@ -38,9 +42,25 @@ export interface ProducerRegistrar {
): void;
}
+/** Enumerable validator identity. Package locks can bind this without serializing its handler. */
+export type TypeValidatorFacet = {
+ readonly type: TypeRef;
+ readonly implementationDigest: Digest;
+ readonly handler: TypeValidatorHandler;
+};
+
+export function registerTypeValidatorFacets(
+ registry: TypeValidatorRegistrar,
+ facets: readonly TypeValidatorFacet[],
+): void {
+ for (const facet of facets) {
+ registry.register(facet.type, facet.implementationDigest, facet.handler);
+ }
+}
+
/** Trusted deterministic implementation package; it selects no Provider or Runtime service. */
export type ComponentPackage = {
readonly name: string;
+ readonly validators?: readonly TypeValidatorFacet[];
install?(registry: ProducerRegistrar): Awaitable<void>;
- installValidators?(registry: TypeValidatorRegistrar): Awaitable<void>;
};
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index b2ddf3e3..bfa721bc 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -7,6 +7,11 @@
".": "./src/index.ts"
},
"dependencies": {
+ "@svml/component-kit": "workspace:*",
"@svml/protocol": "workspace:*"
+ },
+ "devDependencies": {
+ "@svml/core": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/contracts/src/component.ts b/packages/contracts/src/component.ts
index de8daad5..a02a0668 100644
--- a/packages/contracts/src/component.ts
+++ b/packages/contracts/src/component.ts
@@ -1,4 +1,4 @@
-import type { Digest, StoredValue, TypeRef } from "@svml/protocol";
+import type { ComponentPackage } from "@svml/component-kit";
import {
verifyMediaInspection,
@@ -9,6 +9,17 @@ import {
verifyTimelineAudio,
} from "./media-identity.js";
import {
+ assertAudioTrackIdentity,
+ assertCompositionIdentity,
+ assertVisualTrackIdentity,
+} from "./track.js";
+import type {
+ AudioTrack,
+ Composition,
+ VisualTrack,
+} from "./track.js";
+import {
+ compositionValidatorDigests,
contractTypes,
mediaValidatorDigests,
} from "./manifest.js";
@@ -21,30 +32,63 @@ function inline(value: { readonly kind: string; readonly value?: unknown }, subj
/** Semantic refinements for digest-bound public media facts. */
export const mediaContractsComponent = {
name: "@svml/media",
- installValidators(registry: {
- register(
- type: TypeRef,
- implementationDigest: Digest,
- handler: (context: { readonly value: StoredValue }) => void,
- ): void;
- }): void {
- registry.register(contractTypes.mediaInspection, mediaValidatorDigests.inspection, ({ value }) => {
- verifyMediaInspection(inline(value, "MediaInspection"));
- });
- registry.register(contractTypes.mediaStreamSelection, mediaValidatorDigests.selection, ({ value }) => {
- verifyMediaStreamSelection(inline(value, "MediaStreamSelection"));
- });
- registry.register(contractTypes.synchronizedMedia, mediaValidatorDigests.synchronized, ({ value }) => {
- verifySynchronizedMedia(inline(value, "SynchronizedMedia"));
- });
- registry.register(contractTypes.renderedVisual, mediaValidatorDigests.renderedVisual, ({ value }) => {
- verifyRenderedVisual(inline(value, "RenderedVisual"));
- });
- registry.register(contractTypes.timelineAudio, mediaValidatorDigests.timelineAudio, ({ value }) => {
- verifyTimelineAudio(inline(value, "TimelineAudio"));
- });
- registry.register(contractTypes.muxedMedia, mediaValidatorDigests.muxedMedia, ({ value }) => {
- verifyMuxedMedia(inline(value, "MuxedMedia"));
- });
- },
-};
+ validators: [
+ {
+ type: contractTypes.mediaInspection,
+ implementationDigest: mediaValidatorDigests.inspection,
+ handler: ({ value }) => verifyMediaInspection(inline(value, "MediaInspection")),
+ },
+ {
+ type: contractTypes.mediaStreamSelection,
+ implementationDigest: mediaValidatorDigests.selection,
+ handler: ({ value }) => verifyMediaStreamSelection(inline(value, "MediaStreamSelection")),
+ },
+ {
+ type: contractTypes.synchronizedMedia,
+ implementationDigest: mediaValidatorDigests.synchronized,
+ handler: ({ value }) => verifySynchronizedMedia(inline(value, "SynchronizedMedia")),
+ },
+ {
+ type: contractTypes.renderedVisual,
+ implementationDigest: mediaValidatorDigests.renderedVisual,
+ handler: ({ value }) => verifyRenderedVisual(inline(value, "RenderedVisual")),
+ },
+ {
+ type: contractTypes.timelineAudio,
+ implementationDigest: mediaValidatorDigests.timelineAudio,
+ handler: ({ value }) => verifyTimelineAudio(inline(value, "TimelineAudio")),
+ },
+ {
+ type: contractTypes.muxedMedia,
+ implementationDigest: mediaValidatorDigests.muxedMedia,
+ handler: ({ value }) => verifyMuxedMedia(inline(value, "MuxedMedia")),
+ },
+ ],
+} satisfies ComponentPackage;
+
+/** Track values are self-validated; Composition repeats validation with the exact ProgramSpace. */
+export const compositionContractsComponent = {
+ name: "@svml/composition",
+ validators: [
+ {
+ type: contractTypes.visualTrack,
+ implementationDigest: compositionValidatorDigests.visualTrack,
+ handler: ({ value }) => assertVisualTrackIdentity(inline(value, "VisualTrack") as VisualTrack),
+ },
+ {
+ type: contractTypes.audioTrack,
+ implementationDigest: compositionValidatorDigests.audioTrack,
+ handler: ({ value }) => assertAudioTrackIdentity(inline(value, "AudioTrack") as AudioTrack),
+ },
+ {
+ type: contractTypes.composition,
+ implementationDigest: compositionValidatorDigests.composition,
+ handler: ({ value }) => assertCompositionIdentity(inline(value, "Composition") as Composition),
+ },
+ ],
+} satisfies ComponentPackage;
+
+export const videoContractsComponents = [
+ mediaContractsComponent,
+ compositionContractsComponent,
+] as const;
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index 8e7c6432..7c2d9e86 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -15,7 +15,11 @@ export {
sealSpeechEvidenceAudio,
speechEvidenceSampleBoundary,
} from "./identity.js";
-export { mediaContractsComponent } from "./component.js";
+export {
+ compositionContractsComponent,
+ mediaContractsComponent,
+ videoContractsComponents,
+} from "./component.js";
export {
sealMediaInspection,
sealMediaStreamSelection,
@@ -44,6 +48,7 @@ export {
completeSemanticMapSchema,
compositionManifest,
compositionManifestDigest,
+ compositionValidatorDigests,
compositionModuleRef,
contractTypes,
mediaManifest,
diff --git a/packages/contracts/src/manifest.ts b/packages/contracts/src/manifest.ts
index 179e43ab..9071a804 100644
--- a/packages/contracts/src/manifest.ts
+++ b/packages/contracts/src/manifest.ts
@@ -697,6 +697,12 @@ export const semanticTimeManifest: ModuleManifest = {
producers: [],
};
+export const compositionValidatorDigests = {
+ visualTrack: digestOf("@svml/composition/validate-visual-track@1"),
+ audioTrack: digestOf("@svml/composition/validate-audio-track@1"),
+ composition: digestOf("@svml/composition/validate-composition@1"),
+} as const;
+
export const compositionManifest: ModuleManifest = {
format: "svml.module@0",
name: compositionModuleRef.name,
@@ -706,9 +712,42 @@ export const compositionManifest: ModuleManifest = {
{ module: programSpaceModuleRef, digest: programSpaceManifestDigest },
],
types: [
- { name: contractTypes.visualTrack.name, schema: visualTrackSchema },
- { name: contractTypes.audioTrack.name, schema: audioTrackSchema },
- { name: contractTypes.composition.name, schema: compositionSchema },
+ {
+ name: contractTypes.visualTrack.name,
+ schema: visualTrackSchema,
+ validator: {
+ abi: "svml.type-validator@1",
+ implementation: {
+ kind: "registered",
+ locator: "@svml/composition/validate-visual-track",
+ digest: compositionValidatorDigests.visualTrack,
+ },
+ },
+ },
+ {
+ name: contractTypes.audioTrack.name,
+ schema: audioTrackSchema,
+ validator: {
+ abi: "svml.type-validator@1",
+ implementation: {
+ kind: "registered",
+ locator: "@svml/composition/validate-audio-track",
+ digest: compositionValidatorDigests.audioTrack,
+ },
+ },
+ },
+ {
+ name: contractTypes.composition.name,
+ schema: compositionSchema,
+ validator: {
+ abi: "svml.type-validator@1",
+ implementation: {
+ kind: "registered",
+ locator: "@svml/composition/validate-composition",
+ digest: compositionValidatorDigests.composition,
+ },
+ },
+ },
],
capabilities: [],
surfaces: [],
diff --git a/packages/contracts/src/track.ts b/packages/contracts/src/track.ts
index daf5dd94..d9d0d22f 100644
--- a/packages/contracts/src/track.ts
+++ b/packages/contracts/src/track.ts
@@ -261,8 +261,8 @@ function assertAnimation(animation: VisualAnimation | undefined, durationFrames:
}
}
-function assertPresent(present: VisualPresent, programSpace: ProgramSpace, trackId: string): void {
- const totalFrames = programSpaceFrameCount(programSpace);
+function assertPresent(present: VisualPresent, programSpace: ProgramSpace | undefined, trackId: string): void {
+ const totalFrames = programSpace === undefined ? Number.MAX_SAFE_INTEGER : programSpaceFrameCount(programSpace);
assertNonEmpty(present.id, `${trackId} Present id`);
assertFrameSpan(present.span, totalFrames, `${trackId}.${present.id}.span`);
assertNonEmpty(present.stacking.tieBreak, `${trackId}.${present.id} stacking tieBreak`);
@@ -324,13 +324,13 @@ function assertPresent(present: VisualPresent, programSpace: ProgramSpace, track
assertCompositableSurfaceRef(element.surface, `${trackId}.${present.id}.${element.id}.surface`);
if (element.surface.timing.kind === "frames") {
const durationFrames = present.span.endFrameExclusive - present.span.startFrame;
- if (
- element.surface.timing.frameRate.numerator !== programSpace.frameRate.numerator
- || element.surface.timing.frameRate.denominator !== programSpace.frameRate.denominator
- || element.surface.timing.frameCount !== durationFrames
- ) {
+ if (element.surface.timing.frameCount !== durationFrames) {
throw new Error(`${trackId}.${present.id}.${element.id} Surface must exactly match its Present frame domain.`);
}
+ if (programSpace !== undefined && (
+ element.surface.timing.frameRate.numerator !== programSpace.frameRate.numerator
+ || element.surface.timing.frameRate.denominator !== programSpace.frameRate.denominator
+ )) throw new Error(`${trackId}.${present.id}.${element.id} Surface must exactly match its Present frame domain.`);
}
}
}
@@ -486,13 +486,16 @@ export function sealAudioTrack(value: Omit<AudioTrack, "digest">): AudioTrack {
return { ...content, digest: digestOf(content) };
}
-export function assertVisualTrackIdentity(track: VisualTrack, programSpace: ProgramSpace): void {
- assertProgramSpaceIdentity(programSpace);
+export function assertVisualTrackIdentity(track: VisualTrack, programSpace?: ProgramSpace): void {
+ if (programSpace !== undefined) assertProgramSpaceIdentity(programSpace);
if (track.contract !== "svml.visual-track@1") throw new Error("Unsupported VisualTrack contract.");
if (track.visualIr !== HYPERFRAMES_VISUAL_IR_V1) throw new Error("Unsupported VisualTrack visual IR.");
assertNonEmpty(track.id, "VisualTrack id");
assertSources(track.sources, track.id);
- if (track.programSpaceDigest !== programSpace.digest) throw new Error(`${track.id} belongs to another ProgramSpace.`);
+ if (!isDigest(track.programSpaceDigest)) throw new Error(`${track.id} has an invalid ProgramSpace digest.`);
+ if (programSpace !== undefined && track.programSpaceDigest !== programSpace.digest) {
+ throw new Error(`${track.id} belongs to another ProgramSpace.`);
+ }
const { digest: _digest, ...content } = track;
if (!isDigest(track.digest) || track.digest !== computeVisualTrackDigest(content)) {
throw new Error(`${track.id} VisualTrack digest does not match its contents.`);
@@ -505,17 +508,20 @@ export function assertVisualTrackIdentity(track: VisualTrack, programSpace: Prog
}
}
-export function assertAudioTrackIdentity(track: AudioTrack, programSpace: ProgramSpace): void {
- assertProgramSpaceIdentity(programSpace);
+export function assertAudioTrackIdentity(track: AudioTrack, programSpace?: ProgramSpace): void {
+ if (programSpace !== undefined) assertProgramSpaceIdentity(programSpace);
if (track.contract !== "svml.audio-track@1") throw new Error("Unsupported AudioTrack contract.");
assertNonEmpty(track.id, "AudioTrack id");
assertSources(track.sources, track.id);
- if (track.programSpaceDigest !== programSpace.digest) throw new Error(`${track.id} belongs to another ProgramSpace.`);
+ if (!isDigest(track.programSpaceDigest)) throw new Error(`${track.id} has an invalid ProgramSpace digest.`);
+ if (programSpace !== undefined && track.programSpaceDigest !== programSpace.digest) {
+ throw new Error(`${track.id} belongs to another ProgramSpace.`);
+ }
const { digest: _digest, ...content } = track;
if (!isDigest(track.digest) || track.digest !== computeAudioTrackDigest(content)) {
throw new Error(`${track.id} AudioTrack digest does not match its contents.`);
}
- const totalFrames = programSpaceFrameCount(programSpace);
+ const totalFrames = programSpace === undefined ? Number.MAX_SAFE_INTEGER : programSpaceFrameCount(programSpace);
const clipIds = new Set<string>();
for (const clip of track.clips) {
if (clipIds.has(clip.id)) throw new Error(`${track.id} has duplicate clip ${clip.id}.`);
diff --git a/packages/contracts/test/track.test.ts b/packages/contracts/test/track.test.ts
index 7905779f..532ecf2b 100644
--- a/packages/contracts/test/track.test.ts
+++ b/packages/contracts/test/track.test.ts
@@ -1,16 +1,22 @@
import assert from "node:assert/strict";
import test from "node:test";
-import { digestOf } from "@svml/protocol";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
+import { createResolvedClosure } from "@svml/core";
+import { canonicalize, digestOf } from "@svml/protocol";
+import { TypeValidatorRegistry, validateValue } from "@svml/validation";
import {
assertCompositionIdentity,
assertVisualTrackIdentity,
+ compositionContractsComponent,
+ contractTypes,
HYPERFRAMES_VISUAL_IR_V1,
sealAudioTrack,
sealComposition,
sealProgramSpace,
sealVisualTrack,
+ videoContractManifests,
} from "../src/index.js";
import type { MediaArtifactRef, VisualTrack } from "../src/index.js";
@@ -174,6 +180,33 @@ test("VisualTrack explicitly binds the visual IR instead of trusting the Runtime
);
});
+test("the Type owner rejects an invalid VisualTrack at the shared admission gate", async () => {
+ const { visual } = fixture();
+ const present = visual.presents[0]!;
+ const invalid = sealVisualTrack({
+ ...visual,
+ presents: [{
+ ...present,
+ elements: [
+ ...present.elements,
+ { id: "second-root", order: 2, kind: "box", style: [] },
+ ],
+ }],
+ });
+ const validators = new TypeValidatorRegistry();
+ registerTypeValidatorFacets(validators, compositionContractsComponent.validators);
+
+ await assert.rejects(
+ async () => await validateValue(
+ createResolvedClosure(videoContractManifests),
+ contractTypes.visualTrack,
+ { kind: "inline", value: canonicalize(invalid) },
+ validators,
+ ),
+ /must contain exactly one root element/u,
+ );
+});
+
test("Composition rejects a Track from another ProgramSpace even when its shape is valid", () => {
const { programSpace, visual } = fixture();
const foreign = sealProgramSpace({
diff --git a/packages/film/package.json b/packages/film/package.json
index ce216260..5a72c96e 100644
--- a/packages/film/package.json
+++ b/packages/film/package.json
@@ -14,9 +14,11 @@
"@svml/text": "workspace:*"
},
"devDependencies": {
+ "@svml/component-kit": "workspace:*",
"@svml/core": "workspace:*",
"@svml/driver-node": "workspace:*",
"@svml/hyperframes": "workspace:*",
- "@svml/text-track": "workspace:*"
+ "@svml/text-track": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/film/test/film.test.ts b/packages/film/test/film.test.ts
index b83edccd..7539252c 100644
--- a/packages/film/test/film.test.ts
+++ b/packages/film/test/film.test.ts
@@ -1,7 +1,9 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
+ compositionContractsComponent,
contractTypes,
sealAudioTrack,
sealProgramSpace,
@@ -58,12 +60,19 @@ import {
textTrackProducers,
textTrackTypes,
} from "@svml/text-track";
+import { admitRecord, TypeValidatorRegistry } from "@svml/validation";
const space = sealProgramSpace({
contract: "svml.program-space@0",
durationSec: 4,
frameRate: { numerator: 30, denominator: 1 },
});
+
+function validatorRegistry(): TypeValidatorRegistry {
+ const registry = new TypeValidatorRegistry();
+ registerTypeValidatorFacets(registry, compositionContractsComponent.validators);
+ return registry;
+}
const filmProgram = sealFilmProgram({
contract: "svml.film-program@1",
id: "main-film",
@@ -127,13 +136,13 @@ const origin = {
sourceDigest: digestOf("source:film-test"),
frontendClosureDigest: digestOf("frontend:film-test"),
};
-const records = [
+const records = await Promise.all([
sealRecord({ id: "space", type: contractTypes.programSpace, value: stored(space), conformance: "exact", origin }),
sealRecord({ id: "film-program", type: filmTypes.program, value: stored(filmProgram), conformance: "exact", origin }),
sealRecord({ id: "text-program", type: textTrackTypes.program, value: stored(textProgram), conformance: "exact", origin }),
sealRecord({ id: "background", type: contractTypes.visualTrack, value: stored(background), conformance: "exact", origin }),
sealRecord({ id: "audio", type: contractTypes.audioTrack, value: stored(audio), conformance: "exact", origin }),
-];
+].map(async (record) => await admitRecord(closure, record, validatorRegistry())));
const linked = link(closure, [sealTypedModule({ id: "author:film-test", closureDigest: closure.digest, records })]);
const textInstance = elaborateGraphFragment(linked, textTrackFragment, {
@@ -243,7 +252,7 @@ test("the Driver folds peer Tracks, then independently compiles the Composition"
needs: {},
}));
- const result = await new NodeDriver({ registry }).run(build("main.document"));
+ const result = await new NodeDriver({ registry, validators: validatorRegistry() }).run(build("main.document"));
assert.equal(result.status, "complete");
const documentRecord = result.state.records.find((record) => record.type.module.name === hyperframesTypes.document.module.name);
assert(documentRecord);
diff --git a/packages/film/test/surface.test.ts b/packages/film/test/surface.test.ts
index 38cf07bd..418a2830 100644
--- a/packages/film/test/surface.test.ts
+++ b/packages/film/test/surface.test.ts
@@ -1,7 +1,9 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
+ compositionContractsComponent,
contractTypes,
sealAudioTrack,
sealProgramSpace,
@@ -31,6 +33,7 @@ import {
createTextAuthorFrontend,
textAuthorFrontendId,
} from "@svml/text";
+import { createRecordAdmitter, TypeValidatorRegistry } from "@svml/validation";
const fixtureModule = { name: "example.film-fixture", version: "1" } as const;
const fixtureSurfaceDigest = digestOf("example.film-fixture/inputs-surface@1");
@@ -90,6 +93,12 @@ function source(id: string, text: string): AuthorSourceUnit {
return { id, name: id.split("/").at(-1) ?? id, text };
}
+function validatorRegistry(): TypeValidatorRegistry {
+ const registry = new TypeValidatorRegistry();
+ registerTypeValidatorFacets(registry, compositionContractsComponent.validators);
+ return registry;
+}
+
const validStyles = `<sheet version="1">
film.vertical {
width: 1080;
@@ -142,6 +151,7 @@ async function compileFilm(options: { readonly reverse?: boolean; readonly style
resolveSource() {
return source("/project/studio.svs", options.styles ?? validStyles);
},
+ admitRecord: createRecordAdmitter(validatorRegistry()),
});
}
diff --git a/packages/generation/package.json b/packages/generation/package.json
index acbf45e7..e7c73c1f 100644
--- a/packages/generation/package.json
+++ b/packages/generation/package.json
@@ -7,10 +7,11 @@
".": "./src/index.ts"
},
"dependencies": {
- "@svml/protocol": "workspace:*",
- "@svml/validation": "workspace:*"
+ "@svml/component-kit": "workspace:*",
+ "@svml/protocol": "workspace:*"
},
"devDependencies": {
- "@svml/driver-node": "workspace:*"
+ "@svml/driver-node": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/generation/src/component.ts b/packages/generation/src/component.ts
index 14382f04..a682a62f 100644
--- a/packages/generation/src/component.ts
+++ b/packages/generation/src/component.ts
@@ -1,4 +1,4 @@
-import type { TypeValidatorRegistrar } from "@svml/validation";
+import type { ComponentPackage } from "@svml/component-kit";
import {
verifyGeneratedImageSet,
@@ -17,12 +17,20 @@ function inline(value: { readonly kind: string; readonly value?: unknown }, subj
/** Host-side semantic refinements for the shared generated-media contracts. */
export const generationComponent = {
name: "@svml/generation",
- installValidators(registry: TypeValidatorRegistrar): void {
- registry.register(generationTypes.imageSet, generationValidatorDigests.imageSet, ({ value }) => {
- verifyGeneratedImageSet(inline(value, "GeneratedImageSet"));
- });
- registry.register(generationTypes.videoSet, generationValidatorDigests.videoSet, ({ value }) => {
- verifyGeneratedVideoSet(inline(value, "GeneratedVideoSet"));
- });
- },
-};
+ validators: [
+ {
+ type: generationTypes.imageSet,
+ implementationDigest: generationValidatorDigests.imageSet,
+ handler: ({ value }) => {
+ verifyGeneratedImageSet(inline(value, "GeneratedImageSet"));
+ },
+ },
+ {
+ type: generationTypes.videoSet,
+ implementationDigest: generationValidatorDigests.videoSet,
+ handler: ({ value }) => {
+ verifyGeneratedVideoSet(inline(value, "GeneratedVideoSet"));
+ },
+ },
+ ],
+} satisfies ComponentPackage;
diff --git a/packages/generation/test/identity.test.ts b/packages/generation/test/identity.test.ts
index 0f43ec70..a67ad118 100644
--- a/packages/generation/test/identity.test.ts
+++ b/packages/generation/test/identity.test.ts
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import { MemoryArtifactStore } from "@svml/driver-node";
import {
generationComponent,
@@ -22,6 +23,6 @@ test("generated media validators bind artifacts and result contents", async () =
verifyGeneratedImageSet(result);
assert.throws(() => verifyGeneratedImageSet({ ...result, model: "tampered" }), /result digest differs/u);
const validators = new TypeValidatorRegistry();
- generationComponent.installValidators(validators);
+ registerTypeValidatorFacets(validators, generationComponent.validators);
assert.ok(validators.resolve(generationTypes.imageSet));
});
diff --git a/packages/hyperframes-render/test/render.test.ts b/packages/hyperframes-render/test/render.test.ts
index 491f2b5a..d3325d58 100644
--- a/packages/hyperframes-render/test/render.test.ts
+++ b/packages/hyperframes-render/test/render.test.ts
@@ -1,7 +1,9 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
+ compositionContractsComponent,
contractTypes,
sealComposition,
sealMuxedMedia,
@@ -59,7 +61,11 @@ import {
mediaPipelineManifest,
mediaPipelineProducers,
} from "@svml/media-pipeline";
-import { TypeValidatorRegistry } from "@svml/validation";
+import {
+ admitRecord,
+ createRecordAdmitter,
+ TypeValidatorRegistry,
+} from "@svml/validation";
import type {
CanonicalValue,
ModuleManifest,
@@ -103,13 +109,13 @@ const origin = {
sourceDigest: digestOf("source:hyperframes-render-test"),
frontendClosureDigest: digestOf("frontend:hyperframes-render-test"),
};
-const compositionRecord = sealRecord({
+const compositionRecord = await admitRecord(closure, sealRecord({
id: "composition",
type: contractTypes.composition,
value: stored(composition),
conformance: "exact",
origin,
-});
+}), validatorRegistry());
const linked = link(closure, [sealTypedModule({
id: "author:hyperframes-render-test",
closureDigest: closure.digest,
@@ -141,7 +147,10 @@ function producerRegistry(): HostRegistry {
function validatorRegistry(): TypeValidatorRegistry {
const registry = new TypeValidatorRegistry();
- for (const component of mediaPipelineComponents) component.installValidators(registry);
+ registerTypeValidatorFacets(registry, compositionContractsComponent.validators);
+ for (const component of mediaPipelineComponents) {
+ registerTypeValidatorFacets(registry, component.validators);
+ }
return registry;
}
@@ -397,6 +406,7 @@ test("the official render Surface lowers real author source to the same BuildPla
resolveSource() {
throw new Error("the fixture has no source imports");
},
+ admitRecord: createRecordAdmitter(validatorRegistry()),
});
const target = resolveCompiledSourceExport(compiled, "final.video", contractTypes.mediaArtifact);
assert.equal(target.ref.kind, "logical-output");
diff --git a/packages/local/src/runtime.ts b/packages/local/src/runtime.ts
index 9e284975..454cbf03 100644
--- a/packages/local/src/runtime.ts
+++ b/packages/local/src/runtime.ts
@@ -1,5 +1,8 @@
import { resolve } from "node:path";
+import {
+ registerTypeValidatorFacets,
+} from "@svml/component-kit";
import {
FileArtifactStore,
fileArtifactStoreFacet,
@@ -148,7 +151,7 @@ export async function createLocalRuntime(
const providers = new ProviderRegistry();
const validators = options.validators ?? new TypeValidatorRegistry();
for (const component of options.components ?? []) {
- await component.installValidators?.(validators);
+ registerTypeValidatorFacets(validators, component.validators ?? []);
await component.install?.(hosts);
}
for (const provider of options.providers ?? []) await provider.install(providers);
diff --git a/packages/local/test/local.test.ts b/packages/local/test/local.test.ts
index 20eb4fae..14273eaf 100644
--- a/packages/local/test/local.test.ts
+++ b/packages/local/test/local.test.ts
@@ -49,12 +49,8 @@ test("project local runtime resumes durable work while component and provider pa
let starts = 0;
let resumes = 0;
let cancels = 0;
- let validatorInstalls = 0;
const components: NodeComponentPackage = {
name: "example.components",
- installValidators() {
- validatorInstalls += 1;
- },
install(registry) {
registry.registerProducer(producers.makePrompt, implementationDigests.makePrompt, ({ inputs }) => {
promptCalls += 1;
@@ -167,7 +163,6 @@ test("project local runtime resumes durable work while component and provider pa
const cancelled = await secondRuntime.cancel("cancel-video");
assert.equal(cancelled?.status, "failed");
assert.equal(cancels, 1);
- assert.equal(validatorInstalls, 2, "each fresh Runtime installs package-owned Type validators");
await secondRuntime.close();
} finally {
await rm(directory, { recursive: true, force: true });
diff --git a/packages/media-pipeline/package.json b/packages/media-pipeline/package.json
index 767932e4..7b0dacba 100644
--- a/packages/media-pipeline/package.json
+++ b/packages/media-pipeline/package.json
@@ -10,10 +10,10 @@
"@svml/component-kit": "workspace:*",
"@svml/contracts": "workspace:*",
"@svml/elaborator": "workspace:*",
- "@svml/protocol": "workspace:*",
- "@svml/validation": "workspace:*"
+ "@svml/protocol": "workspace:*"
},
"devDependencies": {
- "@svml/core": "workspace:*"
+ "@svml/core": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/media-pipeline/src/component.ts b/packages/media-pipeline/src/component.ts
index b6b4bccf..3ee436a9 100644
--- a/packages/media-pipeline/src/component.ts
+++ b/packages/media-pipeline/src/component.ts
@@ -1,3 +1,4 @@
+import type { ComponentPackage } from "@svml/component-kit";
import {
mediaContractsComponent,
assertSpeechAudioBasisIdentity,
@@ -53,6 +54,22 @@ function blob(value: StoredValue, subject: string): BlobRef {
export const mediaPipelineComponent = {
name: "@svml/media-pipeline",
+ validators: [
+ {
+ type: mediaPipelineTypes.selectionRequest,
+ implementationDigest: mediaPipelineImplementationDigests.requestValidator,
+ handler: ({ value }) => {
+ verifyMediaSelectionRequest(inline(value, "MediaSelectionRequest"));
+ },
+ },
+ {
+ type: mediaPipelineTypes.audioProgramPlan,
+ implementationDigest: mediaPipelineImplementationDigests.audioPlanValidator,
+ handler: ({ value }) => {
+ verifyAudioProgramPlan(inline(value, "AudioProgramPlan"));
+ },
+ },
+ ],
install(registry: import("@svml/component-kit").ProducerRegistrar): void {
registry.registerProducer(
mediaPipelineProducers.inspect,
@@ -204,15 +221,7 @@ export const mediaPipelineComponent = {
},
);
},
- installValidators(registry: import("@svml/validation").TypeValidatorRegistrar): void {
- registry.register(mediaPipelineTypes.selectionRequest, mediaPipelineImplementationDigests.requestValidator, ({ value }) => {
- verifyMediaSelectionRequest(inline(value, "MediaSelectionRequest"));
- });
- registry.register(mediaPipelineTypes.audioProgramPlan, mediaPipelineImplementationDigests.audioPlanValidator, ({ value }) => {
- verifyAudioProgramPlan(inline(value, "AudioProgramPlan"));
- });
- },
-};
+} satisfies ComponentPackage;
/** Convenience set: public media validators must accompany the pipeline Producers. */
export const mediaPipelineComponents = [mediaContractsComponent, mediaPipelineComponent] as const;
diff --git a/packages/media-pipeline/test/manifest.test.ts b/packages/media-pipeline/test/manifest.test.ts
index 88da2fde..31716de0 100644
--- a/packages/media-pipeline/test/manifest.test.ts
+++ b/packages/media-pipeline/test/manifest.test.ts
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
contractTypes,
videoContractManifests,
@@ -31,7 +32,9 @@ test("the media pipeline is an ordinary Fragment over public media contracts", (
test("media identities and selection requests have package-owned semantic validators", () => {
const registry = new TypeValidatorRegistry();
- for (const component of mediaPipelineComponents) component.installValidators(registry);
+ for (const component of mediaPipelineComponents) {
+ registerTypeValidatorFacets(registry, component.validators);
+ }
assert.ok(registry.resolve(contractTypes.mediaInspection));
assert.ok(registry.resolve(contractTypes.mediaStreamSelection));
assert.ok(registry.resolve(contractTypes.synchronizedMedia));
diff --git a/packages/model-kit/package.json b/packages/model-kit/package.json
index 091810f7..b959bb1a 100644
--- a/packages/model-kit/package.json
+++ b/packages/model-kit/package.json
@@ -10,7 +10,6 @@
"@svml/component-kit": "workspace:*",
"@svml/elaborator": "workspace:*",
"@svml/generation": "workspace:*",
- "@svml/protocol": "workspace:*",
- "@svml/validation": "workspace:*"
+ "@svml/protocol": "workspace:*"
}
}
diff --git a/packages/model-kit/src/index.ts b/packages/model-kit/src/index.ts
index 4635d52a..d5c4429e 100644
--- a/packages/model-kit/src/index.ts
+++ b/packages/model-kit/src/index.ts
@@ -1,4 +1,8 @@
-import type { ProducerRegistrar } from "@svml/component-kit";
+import type {
+ ComponentPackage,
+ ProducerRegistrar,
+ TypeValidatorFacet,
+} from "@svml/component-kit";
import { sealGraphFragment } from "@svml/elaborator";
import {
generationManifestDigest,
@@ -19,7 +23,6 @@ import type {
TypeRef,
ValueSchema,
} from "@svml/protocol";
-import type { TypeValidatorRegistrar } from "@svml/validation";
export type ExactModelEndpointSpec = {
readonly key: string;
@@ -48,10 +51,9 @@ export type ExactModelModule = {
readonly manifest: ModuleManifest;
readonly manifestDigest: Digest;
readonly endpoints: Readonly<Record<string, ExactModelEndpoint>>;
- readonly component: {
- readonly name: string;
+ readonly component: ComponentPackage & {
+ readonly validators: readonly TypeValidatorFacet[];
install(registry: ProducerRegistrar): void;
- installValidators(registry: TypeValidatorRegistrar): void;
};
};
@@ -176,6 +178,13 @@ export function defineExactModelModule(options: DefineExactModelModuleOptions):
endpoints,
component: {
name: options.module.name,
+ validators: endpointData.map((item) => ({
+ type: item.requestType,
+ implementationDigest: item.validatorDigest,
+ handler({ value }) {
+ item.spec.verifyRequest(inlineRequest(value, item.spec.key));
+ },
+ })),
install(registry) {
for (const item of endpointData) {
registry.registerProducer(
@@ -191,13 +200,6 @@ export function defineExactModelModule(options: DefineExactModelModuleOptions):
);
}
},
- installValidators(registry) {
- for (const item of endpointData) {
- registry.register(item.requestType, item.validatorDigest, ({ value }) => {
- item.spec.verifyRequest(inlineRequest(value, item.spec.key));
- });
- }
- },
},
};
}
diff --git a/packages/package-loader-node/README.md b/packages/package-loader-node/README.md
index 5f223fd4..0916c6d9 100644
--- a/packages/package-loader-node/README.md
+++ b/packages/package-loader-node/README.md
@@ -2,8 +2,9 @@
Trusted installed-package activation for the Node author compiler. A package lock binds the bytes
of every selected physical package and declared dependency, plus the public identities of its Module,
-Frontend and Text Surface facets. Loading verifies all artifact bytes before executing any
-activation entry.
+Frontend, Text Surface and Type Validator facets. Loading verifies all artifact bytes before
+executing any activation entry. Authored Records emitted by activated Surfaces pass the same
+Manifest-locked Type admission gate used later for provided, Producer and Provider values.
This package is deliberately not an npm client and not a Runtime loader. Source `<import>` can
select only an already activated author module; it cannot activate Providers, credentials, stores,
diff --git a/packages/package-loader-node/package.json b/packages/package-loader-node/package.json
index 7d1a0152..7f372fc6 100644
--- a/packages/package-loader-node/package.json
+++ b/packages/package-loader-node/package.json
@@ -7,9 +7,11 @@
".": "./src/index.ts"
},
"dependencies": {
+ "@svml/component-kit": "workspace:*",
"@svml/compiler-node": "workspace:*",
"@svml/elaborator": "workspace:*",
"@svml/protocol": "workspace:*",
- "@svml/text": "workspace:*"
+ "@svml/text": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/package-loader-node/src/activation.ts b/packages/package-loader-node/src/activation.ts
index 1e6c26d3..ee573ea5 100644
--- a/packages/package-loader-node/src/activation.ts
+++ b/packages/package-loader-node/src/activation.ts
@@ -1,3 +1,6 @@
+import {
+ registerTypeValidatorFacets,
+} from "@svml/component-kit";
import {
ModulePackageRegistry,
NodeCompiler,
@@ -9,6 +12,7 @@ import {
TextSurfaceRegistry,
textAuthorFrontendId,
} from "@svml/text";
+import { TypeValidatorRegistry } from "@svml/validation";
import type { NodeAuthorPackage } from "./types.js";
@@ -32,6 +36,7 @@ export function createActivatedNodeCompiler(
const modules = new ModulePackageRegistry();
const surfaces = new TextSurfaceRegistry();
const frontends = new AuthorFrontendRegistry();
+ const validators = new TypeValidatorRegistry();
for (const item of packages) {
assertPackage(item);
@@ -59,6 +64,7 @@ export function createActivatedNodeCompiler(
}
}
for (const frontend of item.frontends ?? []) frontends.register(frontend);
+ registerTypeValidatorFacets(validators, item.validators ?? []);
}
frontends.register(createTextAuthorFrontend({
@@ -73,6 +79,7 @@ export function createActivatedNodeCompiler(
return new NodeCompiler({
modules,
frontends,
+ validators,
entryFrontend: textAuthorFrontendId,
...(options.root === undefined ? {} : { root: options.root }),
});
diff --git a/packages/package-loader-node/src/lock.ts b/packages/package-loader-node/src/lock.ts
index ef77bc66..5bdfc3ba 100644
--- a/packages/package-loader-node/src/lock.ts
+++ b/packages/package-loader-node/src/lock.ts
@@ -199,6 +199,13 @@ function activationMetadata(value: NodeAuthorPackage): unknown {
`${left.module.name}@${left.module.version}#${left.surface}`
.localeCompare(`${right.module.name}@${right.module.version}#${right.surface}`),
),
+ validators: [...(value.validators ?? [])].map((item) => ({
+ type: item.type,
+ implementationDigest: item.implementationDigest,
+ })).sort((left, right) =>
+ `${left.type.module.name}@${left.type.module.version}#${left.type.name}`
+ .localeCompare(`${right.type.module.name}@${right.type.module.version}#${right.type.name}`),
+ ),
};
}
diff --git a/packages/package-loader-node/src/types.ts b/packages/package-loader-node/src/types.ts
index 72f8e916..b923fa95 100644
--- a/packages/package-loader-node/src/types.ts
+++ b/packages/package-loader-node/src/types.ts
@@ -1,5 +1,6 @@
import type { RegisteredModulePackage } from "@svml/compiler-node";
import type { AuthorFrontend } from "@svml/elaborator";
+import type { TypeValidatorFacet } from "@svml/component-kit";
import type { Digest, ModuleRef } from "@svml/protocol";
import type {
RawSurfaceHandler,
@@ -32,6 +33,7 @@ export type NodeAuthorPackage = {
readonly modules: readonly RegisteredModulePackage[];
readonly frontends?: readonly AuthorFrontend[];
readonly textSurfaces?: readonly NodeTextSurfaceFacet[];
+ readonly validators?: readonly TypeValidatorFacet[];
};
export type LockedPackageArtifact = {
diff --git a/packages/package-loader-node/test/loader.test.ts b/packages/package-loader-node/test/loader.test.ts
index a0110727..9eda9bb5 100644
--- a/packages/package-loader-node/test/loader.test.ts
+++ b/packages/package-loader-node/test/loader.test.ts
@@ -50,6 +50,7 @@ async function fixture(): Promise<{
await writeFile(activation, `
const module = { name: "example.card", version: "1" };
const digest = ${JSON.stringify(implementationDigest)};
+ const resultType = { module, name: "CardResult" };
export default {
format: "svml.node-author-package@1",
name: "example-card",
@@ -59,13 +60,24 @@ async function fixture(): Promise<{
name: module.name,
version: module.version,
dependencies: [],
- types: [],
+ types: [{
+ name: resultType.name,
+ schema: { kind: "string", minLength: 1 },
+ validator: {
+ abi: "svml.type-validator@1",
+ implementation: {
+ kind: "registered",
+ locator: "example-card/validate-card-result",
+ digest,
+ },
+ },
+ }],
capabilities: [],
surfaces: [{
name: "card",
tag: "Card",
mode: "structured",
- outputs: [],
+ outputs: [resultType],
implementation: {
kind: "trusted-frontend-surface",
locator: "example-card/card",
@@ -81,7 +93,27 @@ async function fixture(): Promise<{
surface: "card",
mode: "structured",
implementationDigest: digest,
- handler() { return { records: [], components: [], fragments: [] }; },
+ handler({ element }) {
+ return {
+ records: [{
+ id: "card-result",
+ type: resultType,
+ value: { kind: "inline", value: "accepted" },
+ range: element.range,
+ }],
+ components: [],
+ fragments: [],
+ };
+ },
+ }],
+ validators: [{
+ type: resultType,
+ implementationDigest: digest,
+ handler({ value }) {
+ if (value.kind !== "inline" || value.value !== "accepted") {
+ throw new Error("CardResult is not accepted");
+ }
+ },
}],
};
`, "utf8");
@@ -106,6 +138,8 @@ test("an installed locked package adds a Surface without an official CLI registr
assert.deepEqual(result.program.closure.modules.map((module) => module.ref), [
{ name: "example.card", version: "1" },
]);
+ assert.equal(result.module.records[0]?.value.kind, "inline");
+ assert.equal(result.module.records[0]?.validation?.validatorDigest, implementationDigest);
assert.equal(result.elaboration.graph.operations.length, 0);
});
diff --git a/packages/prelude-video/src/index.ts b/packages/prelude-video/src/index.ts
index dcfb495a..10a50f15 100644
--- a/packages/prelude-video/src/index.ts
+++ b/packages/prelude-video/src/index.ts
@@ -1,4 +1,8 @@
-import { videoContractManifests } from "@svml/contracts";
+import {
+ compositionContractsComponent,
+ mediaContractsComponent,
+ videoContractManifests,
+} from "@svml/contracts";
import {
decodeFilmSurface,
filmManifest,
@@ -12,7 +16,10 @@ import {
hyperframesRenderModuleRef,
hyperframesRenderSurfaceImplementationDigest,
} from "@svml/hyperframes-render";
-import { mediaPipelineManifest } from "@svml/media-pipeline";
+import {
+ mediaPipelineComponent,
+ mediaPipelineManifest,
+} from "@svml/media-pipeline";
import type { NodeAuthorPackage } from "@svml/package-loader-node";
import {
decodeScriptSurface,
@@ -38,6 +45,11 @@ export const svmlAuthorPackage: NodeAuthorPackage = {
},
],
frontends: [svsFrontend],
+ validators: [
+ ...mediaContractsComponent.validators,
+ ...compositionContractsComponent.validators,
+ ...mediaPipelineComponent.validators,
+ ],
textSurfaces: [
{
module: scriptModuleRef,
diff --git a/packages/provider-kie/package.json b/packages/provider-kie/package.json
index ba813804..c01108db 100644
--- a/packages/provider-kie/package.json
+++ b/packages/provider-kie/package.json
@@ -22,6 +22,7 @@
},
"devDependencies": {
"@svml/artifact-store-fs": "workspace:*",
+ "@svml/component-kit": "workspace:*",
"@svml/core": "workspace:*",
"@svml/elaborator": "workspace:*",
"@svml/local": "workspace:*",
diff --git a/packages/provider-kie/test/live-smoke.ts b/packages/provider-kie/test/live-smoke.ts
index 391c6515..4ceed42f 100644
--- a/packages/provider-kie/test/live-smoke.ts
+++ b/packages/provider-kie/test/live-smoke.ts
@@ -3,6 +3,7 @@ import { tmpdir } from "node:os";
import { join, resolve } from "node:path";
import { FileArtifactStore } from "@svml/artifact-store-fs";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
createResolvedClosure,
digestOf,
@@ -340,8 +341,8 @@ function selectCases(cases: readonly SmokeCase[]): readonly SmokeCase[] {
async function createBuild(item: SmokeCase): Promise<ReturnType<typeof start>> {
const closure = createResolvedClosure([generationManifest, item.manifest]);
const validators = new TypeValidatorRegistry();
- generationComponent.installValidators(validators);
- item.component.installValidators(validators);
+ registerTypeValidatorFacets(validators, generationComponent.validators);
+ registerTypeValidatorFacets(validators, item.component.validators);
const draft = sealRecord({
id: item.ids.request,
type: item.endpoint.requestType,
diff --git a/packages/speech-program/package.json b/packages/speech-program/package.json
index 8f8be23a..81586c59 100644
--- a/packages/speech-program/package.json
+++ b/packages/speech-program/package.json
@@ -16,10 +16,12 @@
"@svml/whisperx": "workspace:*"
},
"devDependencies": {
+ "@svml/component-kit": "workspace:*",
"@svml/core": "workspace:*",
"@svml/driver-node": "workspace:*",
"@svml/protocol": "workspace:*",
"@svml/realization": "workspace:*",
- "@svml/script": "workspace:*"
+ "@svml/script": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/speech-program/test/video-pipeline.test.ts b/packages/speech-program/test/video-pipeline.test.ts
index d8773d3f..60dc15e5 100644
--- a/packages/speech-program/test/video-pipeline.test.ts
+++ b/packages/speech-program/test/video-pipeline.test.ts
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
captionImplementationDigest,
captionProducers,
@@ -8,6 +9,7 @@ import {
} from "@svml/caption";
import type { TimedCaptionProjection } from "@svml/caption";
import {
+ compositionContractsComponent,
contractTypes,
sealProgramSpace,
sealSpeechBasis,
@@ -60,6 +62,7 @@ import {
whisperXRequestForEvidenceAudio,
} from "@svml/whisperx";
import type { WhisperXAlignmentEvidence } from "@svml/whisperx";
+import { TypeValidatorRegistry, validateValue } from "@svml/validation";
import {
createVideoBuild,
@@ -77,6 +80,12 @@ function inlineObject(value: unknown): Readonly<Record<string, unknown>> {
return value as Readonly<Record<string, unknown>>;
}
+function validatorRegistry(): TypeValidatorRegistry {
+ const registry = new TypeValidatorRegistry();
+ registerTypeValidatorFacets(registry, compositionContractsComponent.validators);
+ return registry;
+}
+
function inlineValue<T>(value: unknown): T {
return value as T;
}
@@ -288,7 +297,7 @@ test("the Speech Program pipeline resumes without repeating paid calls", async (
return { outputs: { caption: { kind: "inline", value: caption } }, needs: {} };
});
- const driver = new NodeDriver({ registry: host, providers });
+ const driver = new NodeDriver({ registry: host, providers, validators: validatorRegistry() });
const atEstimate = await driver.run(createVideoBuild());
assert.equal(atEstimate.blocked[0]?.reason, "missing-provider");
assert.match(atEstimate.blocked[0]?.subject ?? "", /OfficialSpeechDurationEstimate/u);
@@ -402,7 +411,11 @@ test("the Speech Program pipeline resumes without repeating paid calls", async (
metadata: {},
}),
);
- const rejectedEvidence = await new NodeDriver({ registry: host, providers: wrongBasisProviders }).run(
+ const rejectedEvidence = await new NodeDriver({
+ registry: host,
+ providers: wrongBasisProviders,
+ validators: validatorRegistry(),
+ }).run(
parseBuildState(serializeBuildState(atWhisperX.state)),
);
assert.equal(rejectedEvidence.status, "paused");
@@ -517,7 +530,7 @@ test("Targets prune official Fragments while shared SpeechTake generation stays
assert.equal(producerCount(bothEvidenceExports, speechAlignProducers.locate), 1);
});
-test("an Existing SpeechTake cuts generation while a visual substitute cuts the whole upstream", () => {
+test("an Existing SpeechTake cuts generation while a visual substitute cuts the whole upstream", async () => {
const fixture = createVideoFixture();
const narrativeRecord = fixture.program.records.find((record) => record.id === "narrative:root");
assert.equal(narrativeRecord?.value.kind, "inline");
@@ -588,11 +601,19 @@ test("an Existing SpeechTake cuts generation while a visual substitute cuts the
],
presents: [],
});
+ const blackValue = { kind: "inline" as const, value: black };
+ const blackValidation = await validateValue(
+ fixture.program.closure,
+ contractTypes.visualTrack,
+ blackValue,
+ validatorRegistry(),
+ );
const blackCandidate = createProvidedCandidate({
output: videoOutputs.visual,
- value: { kind: "inline", value: black },
+ value: blackValue,
fidelity: "substitute",
provenance: { method: "black-preview" },
+ ...(blackValidation === undefined ? {} : { validation: blackValidation }),
});
const blackOverlay = sealRealizationOverlay({
sourceGraph: fixture.source.id,
@@ -642,7 +663,11 @@ test("an exact Provider result cannot wash a substitute input back to exact", as
}),
);
- const result = await new NodeDriver({ registry: host, providers }).run(initial);
+ const result = await new NodeDriver({
+ registry: host,
+ providers,
+ validators: validatorRegistry(),
+ }).run(initial);
assert.equal(result.status, "paused", "the unregistered Basis assembler should pause after Seedance");
const seedanceNeed = result.state.needs.find((need) =>
sameCapability(need.capability, videoCapabilities.seedanceMini));
diff --git a/packages/speech-take/package.json b/packages/speech-take/package.json
index 2c6c61b5..2b3fef08 100644
--- a/packages/speech-take/package.json
+++ b/packages/speech-take/package.json
@@ -11,7 +11,9 @@
"@svml/protocol": "workspace:*"
},
"devDependencies": {
+ "@svml/component-kit": "workspace:*",
"@svml/core": "workspace:*",
- "@svml/driver-node": "workspace:*"
+ "@svml/driver-node": "workspace:*",
+ "@svml/validation": "workspace:*"
}
}
diff --git a/packages/speech-take/test/product.test.ts b/packages/speech-take/test/product.test.ts
index de5f0fc6..ae02a073 100644
--- a/packages/speech-take/test/product.test.ts
+++ b/packages/speech-take/test/product.test.ts
@@ -1,7 +1,10 @@
import assert from "node:assert/strict";
import test from "node:test";
+import { registerTypeValidatorFacets } from "@svml/component-kit";
import {
+ compositionContractsComponent,
+ compositionValidatorDigests,
contractTypes,
sealProgramSpace,
sealSpeechBasis,
@@ -13,9 +16,11 @@ import {
createResolvedClosure,
digestOf,
link,
+ recordDigest,
sealBuildRequest,
sealCompiledGraph,
sealRecord,
+ sealTypeValidationReceipt,
sealTypedModule,
start,
} from "@svml/core";
@@ -38,6 +43,7 @@ import {
speechTakeManifest,
speechTakeProducers,
} from "@svml/speech-take";
+import { TypeValidatorRegistry } from "@svml/validation";
const testModule = { name: "example.speech-take-product", version: "0.0.0" } as const;
const requestType = { module: testModule, name: "SpeechRequest" } satisfies TypeRef;
@@ -67,6 +73,12 @@ const testManifest: ModuleManifest = {
const closure = createResolvedClosure([...videoContractManifests, speechTakeManifest, testManifest]);
+function validatorRegistry(): TypeValidatorRegistry {
+ const registry = new TypeValidatorRegistry();
+ registerTypeValidatorFacets(registry, compositionContractsComponent.validators);
+ return registry;
+}
+
function sampleTake(label = "generated"): SpeechBasis {
const durationSec = 2;
const programSpace = sealProgramSpace({
@@ -128,6 +140,12 @@ function createGraph(program: LinkedProgram): CompiledGraph {
const operation = (id: string) => ({ kind: "operation-result" as const, operation: id });
const existingTake = sampleTake("approved");
const existingVisual = projectSpeechVisual(existingTake);
+ const existingVisualValue = { kind: "inline" as const, value: existingVisual };
+ const existingVisualValidation = sealTypeValidationReceipt({
+ type: contractTypes.visualTrack,
+ recordDigest: recordDigest(contractTypes.visualTrack, existingVisualValue),
+ validatorDigest: compositionValidatorDigests.visualTrack,
+ });
return sealCompiledGraph({
program: program.semanticDigest,
outputs: [
@@ -202,8 +220,9 @@ function createGraph(program: LinkedProgram): CompiledGraph {
kind: "value",
value: {
id: "provided:opening-visual",
- value: { kind: "inline", value: existingVisual },
+ value: existingVisualValue,
provenance: { library: "approved-clips", clip: "opening-v3" },
+ validation: existingVisualValidation,
},
},
fidelity: "substitute",
@@ -341,7 +360,7 @@ test("the Build Machine executes one shared generation for both projected output
};
},
);
- const result = await new NodeDriver({ registry }).run(
+ const result = await new NodeDriver({ registry, validators: validatorRegistry() }).run(
build({ "opening.audio": "exact", "opening.visual": "exact" }),
);
assert.equal(result.status, "complete");
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 62437931..a987f9a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -117,9 +117,19 @@ importers:
packages/contracts:
dependencies:
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/protocol':
specifier: workspace:*
version: link:../protocol
+ devDependencies:
+ '@svml/core':
+ specifier: workspace:*
+ version: link:../core
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/core:
dependencies:
@@ -201,6 +211,9 @@ importers:
specifier: workspace:*
version: link:../text
devDependencies:
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/core':
specifier: workspace:*
version: link:../core
@@ -213,6 +226,9 @@ importers:
'@svml/text-track':
specifier: workspace:*
version: link:../text-track
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/gemini-omni:
dependencies:
@@ -228,16 +244,19 @@ importers:
packages/generation:
dependencies:
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/protocol':
specifier: workspace:*
version: link:../protocol
- '@svml/validation':
- specifier: workspace:*
- version: link:../validation
devDependencies:
'@svml/driver-node':
specifier: workspace:*
version: link:../driver-node
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/gpt-image:
dependencies:
@@ -360,13 +379,13 @@ importers:
'@svml/protocol':
specifier: workspace:*
version: link:../protocol
- '@svml/validation':
- specifier: workspace:*
- version: link:../validation
devDependencies:
'@svml/core':
specifier: workspace:*
version: link:../core
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/minimax-h3:
dependencies:
@@ -394,9 +413,6 @@ importers:
'@svml/protocol':
specifier: workspace:*
version: link:../protocol
- '@svml/validation':
- specifier: workspace:*
- version: link:../validation
packages/nano-banana:
dependencies:
@@ -415,6 +431,9 @@ importers:
'@svml/compiler-node':
specifier: workspace:*
version: link:../compiler-node
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/elaborator':
specifier: workspace:*
version: link:../elaborator
@@ -424,6 +443,9 @@ importers:
'@svml/text':
specifier: workspace:*
version: link:../text
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/prelude-video:
dependencies:
@@ -525,6 +547,9 @@ importers:
'@svml/artifact-store-fs':
specifier: workspace:*
version: link:../artifact-store-fs
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/core':
specifier: workspace:*
version: link:../core
@@ -707,6 +732,9 @@ importers:
specifier: workspace:*
version: link:../whisperx
devDependencies:
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/core':
specifier: workspace:*
version: link:../core
@@ -722,6 +750,9 @@ importers:
'@svml/script':
specifier: workspace:*
version: link:../script
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/speech-take:
dependencies:
@@ -732,12 +763,18 @@ importers:
specifier: workspace:*
version: link:../protocol
devDependencies:
+ '@svml/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@svml/core':
specifier: workspace:*
version: link:../core
'@svml/driver-node':
specifier: workspace:*
version: link:../driver-node
+ '@svml/validation':
+ specifier: workspace:*
+ version: link:../validation
packages/store-sqlite:
dependencies: