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.

refactor: slim component graph values

kashorin6e4e0f144e35
diff --git a/examples/talking-film-graph-check/svml.packages.lock b/examples/talking-film-graph-check/svml.packages.lock
index 52d8c41f..d68eaefb 100644
--- a/examples/talking-film-graph-check/svml.packages.lock
+++ b/examples/talking-film-graph-check/svml.packages.lock
@@ -622,7 +622,7 @@
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:ac37bb590981f2c3dcb75956c032cd955c6df515a8045e568f13930b3210c5ab"
+ "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
},
{
"name": "@narratage/fonts-open",
@@ -657,7 +657,7 @@
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:a6deee277f13deb1bb51878cecb6e3a950d4e745e88cf9183fadd744e1942eeb"
+ "digest": "sha256:261ea1bff36f1821555549d05f5fda1846bf1811c8d379b09b7dc6c69c2f38fe"
},
{
"name": "@narratage/media",
@@ -742,7 +742,7 @@
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:fc3e617ffbaeb14ab2c890b4db926cdcb5feb97fdb74c132faf51bd6dfd0be63"
+ "digest": "sha256:48652a158c8441b0c33348e3105d2c0e0618867766a5af343eba30b7d85acede"
},
{
"name": "@narratage/speech",
@@ -767,7 +767,7 @@
{
"name": "@narratage/typography-track",
"version": "0.0.0-dev",
- "digest": "sha256:c6e539978c07466395aca23a14d27029678d9d475b3b7bf1f88d78e5f6036170"
+ "digest": "sha256:1e254b0f7f4750049156cad790d4c61a28cdff7b182e682e8c4620e975ccbe96"
},
{
"name": "@narratage/visual-ir",
@@ -862,8 +862,8 @@
"name": "@narratage/film@1"
}
],
- "facetsDigest": "sha256:c2ddab447932337f193f058deb828fb2fece1b835e17e84e34e4b48c0ff546ef",
- "closureDigest": "sha256:6251c08c4a8281a52e57fb31275b0d7f33658167ac10279980254f7732767fb4"
+ "facetsDigest": "sha256:30c96d01322b5c7966548971950faaecd9c0426e747369563f1a994437059495",
+ "closureDigest": "sha256:d428335a63503cfb5133939f87b44aea62e0a5bf8d397af64024a02848dfa058"
},
{
"package": {
@@ -946,8 +946,8 @@
"name": "@narratage/media-track@1"
}
],
- "facetsDigest": "sha256:2088d359efc17c252fc566c756c4207dca6b0950337238defc41ac11742eb9da",
- "closureDigest": "sha256:8f85e069a3ef0fda083b1b9abfdfac45fdaab4a99c773c5322d3f6fa6aa21101"
+ "facetsDigest": "sha256:ca2aacbd4f78ac643a8c049ca7224da4f55e69a9e34c929eebd001d499eb3c80",
+ "closureDigest": "sha256:0ba3c52f5b024126e7eab1ea6685d20607093a7ac488ea5a70adffaad71dad69"
},
{
"package": {
@@ -1101,7 +1101,7 @@
}
],
"facetsDigest": "sha256:d8e9ae160c829ca4c939edd377146509c19ec86d667db744ed931ef8e4e18312",
- "closureDigest": "sha256:da186d4639edd7f4ab9a83360ca0bc79a61b2241601be91c1b88411e8a5df484"
+ "closureDigest": "sha256:e84535de56fbd82e3ed0dd245000076d35a913dc4d2849bbc717965a4b10e40a"
},
{
"package": {
@@ -1128,8 +1128,8 @@
"name": "@narratage/speech-spine@1"
}
],
- "facetsDigest": "sha256:a84531a51fb7da9ca950d0ac1208f4ecd76175bd1d276dd81d8fbef3690c8283",
- "closureDigest": "sha256:019e332cd4a0e4986a9f925b1d65c06bc94948b04bb280686375e756a03a80ac"
+ "facetsDigest": "sha256:4a9ac0558ecaae4cb5141da7236d36dfa3f1f526ea10217e3c0bd7785c075af1",
+ "closureDigest": "sha256:e4dac66324aa7882b276e1c11c070f1f270fab5eba6dd70839222b48e00322eb"
},
{
"package": {
@@ -1192,8 +1192,8 @@
"name": "@narratage/typography-track@1"
}
],
- "facetsDigest": "sha256:32967daaf3adef08db6ac46e71d8f6f9ec6cd118122126259bf34f665db3a817",
- "closureDigest": "sha256:9ad355ac6d13b0ba457d83f69611a3ce37d0620b5dfce93029d2c6f033b18974"
+ "facetsDigest": "sha256:6f7eb038d6c767e46227be109bce3ea844cd07a39cefc8602e97fcc410c1bc23",
+ "closureDigest": "sha256:9a65fb4a84d957de8fd8d4b7f253d417b5dd5f103c68f3d1b4cbe732cbfcc859"
},
{
"package": {
@@ -1224,5 +1224,5 @@
"closureDigest": "sha256:afd60daceb61b68f706d09a579087b19f7f1136807d54904b8fa8e90634eb029"
}
],
- "digest": "sha256:fd6fbd176eabfb8a52a1c964aa8c4b1223320100ba1e133cd0f8ee71c17cbc9c"
+ "digest": "sha256:c5c7d4d93366ac0479ebaee9feb28b7bb20afbc11f1f27a6cafddefa730947ee"
}
diff --git a/examples/talking-film-live/svml.packages.lock b/examples/talking-film-live/svml.packages.lock
index 2adc91f9..2f415ec1 100644
--- a/examples/talking-film-live/svml.packages.lock
+++ b/examples/talking-film-live/svml.packages.lock
@@ -613,7 +613,7 @@
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:ac37bb590981f2c3dcb75956c032cd955c6df515a8045e568f13930b3210c5ab"
+ "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
},
{
"name": "@narratage/fonts-open",
@@ -648,7 +648,7 @@
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:a6deee277f13deb1bb51878cecb6e3a950d4e745e88cf9183fadd744e1942eeb"
+ "digest": "sha256:261ea1bff36f1821555549d05f5fda1846bf1811c8d379b09b7dc6c69c2f38fe"
},
{
"name": "@narratage/media",
@@ -733,7 +733,7 @@
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:fc3e617ffbaeb14ab2c890b4db926cdcb5feb97fdb74c132faf51bd6dfd0be63"
+ "digest": "sha256:48652a158c8441b0c33348e3105d2c0e0618867766a5af343eba30b7d85acede"
},
{
"name": "@narratage/speech",
@@ -758,7 +758,7 @@
{
"name": "@narratage/typography-track",
"version": "0.0.0-dev",
- "digest": "sha256:c6e539978c07466395aca23a14d27029678d9d475b3b7bf1f88d78e5f6036170"
+ "digest": "sha256:1e254b0f7f4750049156cad790d4c61a28cdff7b182e682e8c4620e975ccbe96"
},
{
"name": "@narratage/visual-ir",
@@ -872,8 +872,8 @@
"name": "@narratage/film@1"
}
],
- "facetsDigest": "sha256:c2ddab447932337f193f058deb828fb2fece1b835e17e84e34e4b48c0ff546ef",
- "closureDigest": "sha256:6251c08c4a8281a52e57fb31275b0d7f33658167ac10279980254f7732767fb4"
+ "facetsDigest": "sha256:30c96d01322b5c7966548971950faaecd9c0426e747369563f1a994437059495",
+ "closureDigest": "sha256:d428335a63503cfb5133939f87b44aea62e0a5bf8d397af64024a02848dfa058"
},
{
"package": {
@@ -1097,7 +1097,7 @@
}
],
"facetsDigest": "sha256:d8e9ae160c829ca4c939edd377146509c19ec86d667db744ed931ef8e4e18312",
- "closureDigest": "sha256:da186d4639edd7f4ab9a83360ca0bc79a61b2241601be91c1b88411e8a5df484"
+ "closureDigest": "sha256:e84535de56fbd82e3ed0dd245000076d35a913dc4d2849bbc717965a4b10e40a"
},
{
"package": {
@@ -1124,8 +1124,8 @@
"name": "@narratage/speech-spine@1"
}
],
- "facetsDigest": "sha256:a84531a51fb7da9ca950d0ac1208f4ecd76175bd1d276dd81d8fbef3690c8283",
- "closureDigest": "sha256:019e332cd4a0e4986a9f925b1d65c06bc94948b04bb280686375e756a03a80ac"
+ "facetsDigest": "sha256:4a9ac0558ecaae4cb5141da7236d36dfa3f1f526ea10217e3c0bd7785c075af1",
+ "closureDigest": "sha256:e4dac66324aa7882b276e1c11c070f1f270fab5eba6dd70839222b48e00322eb"
},
{
"package": {
@@ -1174,8 +1174,8 @@
"name": "@narratage/typography-track@1"
}
],
- "facetsDigest": "sha256:32967daaf3adef08db6ac46e71d8f6f9ec6cd118122126259bf34f665db3a817",
- "closureDigest": "sha256:9ad355ac6d13b0ba457d83f69611a3ce37d0620b5dfce93029d2c6f033b18974"
+ "facetsDigest": "sha256:6f7eb038d6c767e46227be109bce3ea844cd07a39cefc8602e97fcc410c1bc23",
+ "closureDigest": "sha256:9a65fb4a84d957de8fd8d4b7f253d417b5dd5f103c68f3d1b4cbe732cbfcc859"
},
{
"package": {
@@ -1206,5 +1206,5 @@
"closureDigest": "sha256:afd60daceb61b68f706d09a579087b19f7f1136807d54904b8fa8e90634eb029"
}
],
- "digest": "sha256:8456d08845a736d6578aaf6cc7e8551f2f151fc0032ac800c85a2a64881d510d"
+ "digest": "sha256:25d5e61a759bcfb01031a54f570835194d5abe979df9b46219eccb851f7c3960"
}
diff --git a/examples/talking-head-aroll/svml.packages.lock b/examples/talking-head-aroll/svml.packages.lock
index 93cd1be9..094b67d9 100644
--- a/examples/talking-head-aroll/svml.packages.lock
+++ b/examples/talking-head-aroll/svml.packages.lock
@@ -612,7 +612,7 @@
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:ac37bb590981f2c3dcb75956c032cd955c6df515a8045e568f13930b3210c5ab"
+ "digest": "sha256:482d49f5c1abd03cb360c38a973b242bb9a49547fa31d87076e0ee53dc0f6adc"
},
{
"name": "@narratage/fonts-open",
@@ -647,7 +647,7 @@
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:a6deee277f13deb1bb51878cecb6e3a950d4e745e88cf9183fadd744e1942eeb"
+ "digest": "sha256:261ea1bff36f1821555549d05f5fda1846bf1811c8d379b09b7dc6c69c2f38fe"
},
{
"name": "@narratage/media",
@@ -732,7 +732,7 @@
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:fc3e617ffbaeb14ab2c890b4db926cdcb5feb97fdb74c132faf51bd6dfd0be63"
+ "digest": "sha256:48652a158c8441b0c33348e3105d2c0e0618867766a5af343eba30b7d85acede"
},
{
"name": "@narratage/speech",
@@ -866,8 +866,8 @@
"name": "@narratage/film@1"
}
],
- "facetsDigest": "sha256:c2ddab447932337f193f058deb828fb2fece1b835e17e84e34e4b48c0ff546ef",
- "closureDigest": "sha256:6251c08c4a8281a52e57fb31275b0d7f33658167ac10279980254f7732767fb4"
+ "facetsDigest": "sha256:30c96d01322b5c7966548971950faaecd9c0426e747369563f1a994437059495",
+ "closureDigest": "sha256:d428335a63503cfb5133939f87b44aea62e0a5bf8d397af64024a02848dfa058"
},
{
"package": {
@@ -1091,7 +1091,7 @@
}
],
"facetsDigest": "sha256:d8e9ae160c829ca4c939edd377146509c19ec86d667db744ed931ef8e4e18312",
- "closureDigest": "sha256:da186d4639edd7f4ab9a83360ca0bc79a61b2241601be91c1b88411e8a5df484"
+ "closureDigest": "sha256:e84535de56fbd82e3ed0dd245000076d35a913dc4d2849bbc717965a4b10e40a"
},
{
"package": {
@@ -1118,8 +1118,8 @@
"name": "@narratage/speech-spine@1"
}
],
- "facetsDigest": "sha256:a84531a51fb7da9ca950d0ac1208f4ecd76175bd1d276dd81d8fbef3690c8283",
- "closureDigest": "sha256:019e332cd4a0e4986a9f925b1d65c06bc94948b04bb280686375e756a03a80ac"
+ "facetsDigest": "sha256:4a9ac0558ecaae4cb5141da7236d36dfa3f1f526ea10217e3c0bd7785c075af1",
+ "closureDigest": "sha256:e4dac66324aa7882b276e1c11c070f1f270fab5eba6dd70839222b48e00322eb"
},
{
"package": {
@@ -1186,5 +1186,5 @@
"closureDigest": "sha256:afd60daceb61b68f706d09a579087b19f7f1136807d54904b8fa8e90634eb029"
}
],
- "digest": "sha256:3fa011402fe5bc81b99d660e55f40d6ecdb6d441db223b6d465312279dc64c9c"
+ "digest": "sha256:3242f5f37d123e6df6a54cc63d2bfd1d1059eb5ea0691dc51b22d613f1c312bc"
}
diff --git a/packages/audio-track/src/manifest.ts b/packages/audio-track/src/manifest.ts
index bb7ca3a2..21750922 100644
--- a/packages/audio-track/src/manifest.ts
+++ b/packages/audio-track/src/manifest.ts
@@ -53,7 +53,7 @@ const occupancy: ValueSchema = { kind: "oneOf", variants: [
object({ mode: { schema: { kind: "literal", value: "stretch" } }, minRate: { schema: { kind: "number", minimum: 0.000001, maximum: 100 } }, maxRate: { schema: { kind: "number", minimum: 0.000001, maximum: 100 } }, pitch: { schema: { kind: "literal", value: "preserve" } } }),
] };
const clipSpec = object({
- contract: { schema: { kind: "literal", value: "svml.audio-clip-spec@1" } },
+
id: { schema: string },
projection: { schema: projection },
expansion: { schema: object({ kind: { schema: { kind: "string", enum: ["one", "each"] } } }) },
@@ -71,14 +71,14 @@ const item = object({
mix: { schema: object({ gain: { schema: number }, fadeInSamples: { schema: integer }, fadeOutSamples: { schema: integer } }) },
});
export const audioTrackHeaderSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.audio-track-header@1" } }, id: { schema: string },
+ id: { schema: string },
});
export const audioClipSpecSchema: ValueSchema = clipSpec;
export const audioTrackSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.audio-track-set@1" } }, items: { schema: { kind: "array", items: item } },
+ items: { schema: { kind: "array", items: item } },
});
export const audioTrackProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.audio-track-program@1" } }, id: { schema: string },
+ id: { schema: string },
items: { schema: { kind: "array", minItems: 1, items: item } },
});
diff --git a/packages/audio-track/src/program.ts b/packages/audio-track/src/program.ts
index b7569569..14ebbe17 100644
--- a/packages/audio-track/src/program.ts
+++ b/packages/audio-track/src/program.ts
@@ -75,7 +75,6 @@ export function sealAudioTrackHeader(value: AudioTrackHeader): AudioTrackHeader
}
export function assertAudioTrackHeader(value: AudioTrackHeader): void {
- assert(value.contract === "svml.audio-track-header@1", "Unsupported AudioTrackHeader contract.");
assertIdentity(value.id, "AudioTrackHeader.id");
}
@@ -85,7 +84,6 @@ export function sealAudioClipSpec(value: AudioClipSpec): AudioClipSpec {
}
export function assertAudioClipSpec(value: AudioClipSpec): void {
- assert(value.contract === "svml.audio-clip-spec@1", "Unsupported AudioClipSpec contract.");
assertIdentity(value.id, "AudioClipSpec.id");
assert(value.expansion.kind === "one" || value.expansion.kind === "each", "AudioClipSpec expansion is invalid.");
for (const point of [value.projection.start, value.projection.end]) {
@@ -104,11 +102,11 @@ export function assertAudioClipSpec(value: AudioClipSpec): void {
}
export function createAudioTrackSet(): AudioTrackSet {
- return { contract: "svml.audio-track-set@1", items: [] };
+ return { items: [] };
}
export function assertAudioTrackSet(value: AudioTrackSet): void {
- assert(value.contract === "svml.audio-track-set@1" && Array.isArray(value.items), "AudioTrackSet is invalid.");
+ assert(Array.isArray(value.items), "AudioTrackSet is invalid.");
}
function sourceFacts(media: SynchronizedMedia): AudioItemProgram["source"] {
@@ -152,7 +150,7 @@ function realizedItems(
assert(!ids.has(item.id), `Audio Track ${header.id} already contains Item ${item.id}.`);
ids.add(item.id);
}
- return { contract: "svml.audio-track-set@1", items: [...set.items, ...additions] };
+ return { items: [...set.items, ...additions] };
}
export function appendProgramAudioItem(
@@ -200,7 +198,7 @@ export function appendMomentAudioItem(
function normalizeProgram(value: AudioTrackProgram): AudioTrackProgram {
return {
- contract: "svml.audio-track-program@1",
+
id: value.id,
items: [...value.items].map((item) => structuredClone(item)).sort((left, right) => left.id.localeCompare(right.id)),
};
@@ -216,11 +214,10 @@ export function finalizeAudioTrack(set: AudioTrackSet, header: AudioTrackHeader)
assertAudioTrackSet(set);
assertAudioTrackHeader(header);
assert(set.items.length > 0, "Audio Track requires at least one Item.");
- return sealAudioTrackProgram({ contract: "svml.audio-track-program@1", id: header.id, items: set.items });
+ return sealAudioTrackProgram({ id: header.id, items: set.items });
}
export function assertAudioTrackProgram(value: AudioTrackProgram): void {
- assert(value.contract === "svml.audio-track-program@1", "Unsupported AudioTrackProgram contract.");
assertIdentity(value.id, "AudioTrackProgram.id");
assert(value.items.length > 0, "AudioTrackProgram requires at least one Item.");
const ids = new Set<string>();
diff --git a/packages/audio-track/src/surface.ts b/packages/audio-track/src/surface.ts
index 09705647..07c91519 100644
--- a/packages/audio-track/src/surface.ts
+++ b/packages/audio-track/src/surface.ts
@@ -190,7 +190,7 @@ export const decodeAudioTrackSurface: StructuredSurfaceHandler = ({ element, res
const records: SurfaceRecordDraft[] = [{
id: headerId,
type: audioTrackTypes.header,
- value: { kind: "inline", value: sealAudioTrackHeader({ contract: "svml.audio-track-header@1", id }) },
+ value: { kind: "inline", value: sealAudioTrackHeader({ id }) },
range: element.range,
}];
const fragmentItems: Parameters<typeof createAudioTrackFragment>[0][number][] = [];
@@ -222,7 +222,7 @@ export const decodeAudioTrackSurface: StructuredSurfaceHandler = ({ element, res
const expansion = text(child, "occurrences", "one");
if (expansion !== "one" && expansion !== "each") throw new Error(`${child.name}.occurrences must be one or each.`);
const clipSpec = sealAudioClipSpec({
- contract: "svml.audio-clip-spec@1",
+
id: clipId,
projection: binding.projection,
expansion: { kind: expansion },
diff --git a/packages/audio-track/src/types.ts b/packages/audio-track/src/types.ts
index adb5e5f8..fe6c78d1 100644
--- a/packages/audio-track/src/types.ts
+++ b/packages/audio-track/src/types.ts
@@ -23,7 +23,6 @@ export type AudioItemMix = {
};
export type AudioClipSpec = {
- readonly contract: "svml.audio-clip-spec@1";
readonly id: string;
readonly projection: TemporalWindowProjection;
readonly expansion: OccurrenceExpansion;
@@ -33,7 +32,6 @@ export type AudioClipSpec = {
};
export type AudioTrackHeader = {
- readonly contract: "svml.audio-track-header@1";
readonly id: string;
};
@@ -57,12 +55,10 @@ export type AudioItemProgram = {
};
export type AudioTrackProgram = {
- readonly contract: "svml.audio-track-program@1";
readonly id: string;
readonly items: readonly AudioItemProgram[];
};
export type AudioTrackSet = {
- readonly contract: "svml.audio-track-set@1";
readonly items: readonly AudioItemProgram[];
};
diff --git a/packages/audio-track/test/audio-track.test.ts b/packages/audio-track/test/audio-track.test.ts
index 3829111b..b2858f01 100644
--- a/packages/audio-track/test/audio-track.test.ts
+++ b/packages/audio-track/test/audio-track.test.ts
@@ -45,7 +45,7 @@ const space = sealProgramSpace({
durationSec: 10,
frameRate: { numerator: 30, denominator: 1 },
});
-const header = sealAudioTrackHeader({ contract: "svml.audio-track-header@1", id: "sound" });
+const header = sealAudioTrackHeader({ id: "sound" });
const zero = { unit: "frames" as const, value: 0 };
function media(id: string, sampleFrames: number): SynchronizedMedia {
@@ -62,7 +62,7 @@ function media(id: string, sampleFrames: number): SynchronizedMedia {
function spec(overrides: Partial<AudioClipSpec> = {}): AudioClipSpec {
return sealAudioClipSpec({
- contract: "svml.audio-clip-spec@1",
+
id: "clip",
projection: {
start: { ref: "program.start" },
diff --git a/packages/comment-sticker/src/author.ts b/packages/comment-sticker/src/author.ts
index b70008f3..f6bd3629 100644
--- a/packages/comment-sticker/src/author.ts
+++ b/packages/comment-sticker/src/author.ts
@@ -85,7 +85,7 @@ export function decodeCommentStickerStyle(recipe: SvsRecipe, fonts: FontStackRef
if (unknown.length > 0) fail(recipe, `does not accept ${unknown.join(", ")}.`);
const body = typography(recipe, fonts, "body", { sizePx: 42, weight: 850, lineHeight: 1.16, color: "#111111" });
return sealCommentStickerStyle({
- contract: "svml.comment-sticker-style@1",
+
id,
stackingOrder: integer(recipe, "stack-order", 62),
card: {
diff --git a/packages/comment-sticker/src/manifest.ts b/packages/comment-sticker/src/manifest.ts
index ad455459..6768762e 100644
--- a/packages/comment-sticker/src/manifest.ts
+++ b/packages/comment-sticker/src/manifest.ts
@@ -71,7 +71,7 @@ const textStyle = object({
sizePx: { schema: positive }, weight: { schema: positiveInteger }, lineHeight: { schema: positive }, color: { schema: string },
});
const style = object({
- contract: { schema: { kind: "literal", value: "svml.comment-sticker-style@1" } },
+
id: { schema: string }, stackingOrder: { schema: integer },
card: { schema: object({
background: { schema: string }, borderColor: { schema: string }, borderWidthPx: { schema: nonNegative },
@@ -108,12 +108,12 @@ const style = object({
}) },
});
const content = object({
- contract: { schema: { kind: "literal", value: "svml.comment-sticker-content@1" } },
+
comment: { schema: string }, author: { schema: string, optional: true },
header: { schema: string, optional: true }, meta: { schema: string, optional: true },
});
const itemSpec = object({
- contract: { schema: { kind: "literal", value: "svml.comment-sticker-item-spec@1" } },
+
id: { schema: string }, projection: { schema: projection },
expansion: { schema: object({ kind: { schema: enumString(["one", "each"]) } }) },
});
@@ -125,15 +125,15 @@ const item = object({
});
export const commentStickerHeaderSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.comment-sticker-header@1" } }, id: { schema: string },
+ id: { schema: string },
});
export const commentStickerStyleSchema: ValueSchema = style;
export const commentStickerItemSpecSchema: ValueSchema = itemSpec;
export const commentStickerSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.comment-sticker-set@1" } }, items: { schema: { kind: "array", items: item } },
+ items: { schema: { kind: "array", items: item } },
});
export const commentStickerProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.comment-sticker-program@1" } }, id: { schema: string },
+ id: { schema: string },
items: { schema: { kind: "array", minItems: 1, items: item } },
});
diff --git a/packages/comment-sticker/src/program.ts b/packages/comment-sticker/src/program.ts
index c2cb3c22..99186111 100644
--- a/packages/comment-sticker/src/program.ts
+++ b/packages/comment-sticker/src/program.ts
@@ -104,7 +104,6 @@ function assertTextStyle(value: CommentStickerTextStyle, label: string): void {
}
export function assertCommentStickerStyle(value: CommentStickerStyle): void {
- assert(value.contract === "svml.comment-sticker-style@1", "Unsupported CommentStickerStyle contract.");
identity(value.id, "CommentStickerStyle.id");
assert(Number.isSafeInteger(value.stackingOrder), "CommentStickerStyle.stackingOrder must be an integer.");
color(value.card.background, "CommentStickerStyle.card.background");
@@ -155,7 +154,6 @@ export function sealCommentStickerStyle(value: CommentStickerStyle): CommentStic
}
export function assertCommentStickerContent(value: CommentStickerContent): void {
- assert(value.contract === "svml.comment-sticker-content@1", "Unsupported CommentStickerContent contract.");
assert(value.comment.trim().length > 0, "Comment Sticker comment cannot be blank.");
optionalText(value.author, "Comment Sticker author");
optionalText(value.header, "Comment Sticker header");
@@ -164,7 +162,7 @@ export function assertCommentStickerContent(value: CommentStickerContent): void
export function createCommentStickerContent(comment: Text): CommentStickerContent {
verifyText(comment);
- const value: CommentStickerContent = { contract: "svml.comment-sticker-content@1", comment: comment.value };
+ const value: CommentStickerContent = { comment: comment.value };
assertCommentStickerContent(value);
return canonicalize(value) as unknown as CommentStickerContent;
}
@@ -188,7 +186,6 @@ function assertAvatar(value: BlobRef): void {
}
export function assertCommentStickerHeader(value: CommentStickerHeader): void {
- assert(value.contract === "svml.comment-sticker-header@1", "Unsupported CommentStickerHeader contract.");
identity(value.id, "CommentStickerHeader.id");
}
@@ -198,7 +195,6 @@ export function sealCommentStickerHeader(value: CommentStickerHeader): CommentSt
}
export function assertCommentStickerItemSpec(value: CommentStickerItemSpec): void {
- assert(value.contract === "svml.comment-sticker-item-spec@1", "Unsupported CommentStickerItemSpec contract.");
identity(value.id, "CommentStickerItemSpec.id");
assert(value.expansion.kind === "one" || value.expansion.kind === "each", "CommentStickerItemSpec expansion is invalid.");
}
@@ -209,11 +205,11 @@ export function sealCommentStickerItemSpec(value: CommentStickerItemSpec): Comme
}
export function createCommentStickerSet(): CommentStickerSet {
- return { contract: "svml.comment-sticker-set@1", items: [] };
+ return { items: [] };
}
export function assertCommentStickerSet(value: CommentStickerSet): void {
- assert(value.contract === "svml.comment-sticker-set@1" && Array.isArray(value.items), "CommentStickerSet is invalid.");
+ assert(Array.isArray(value.items), "CommentStickerSet is invalid.");
}
function realized(
@@ -247,7 +243,7 @@ function realized(
assert(!ids.has(item.id), `Comment Sticker already contains Item ${item.id}.`);
ids.add(item.id);
}
- return { contract: "svml.comment-sticker-set@1", items: [...set.items, ...additions] };
+ return { items: [...set.items, ...additions] };
}
export function appendProgramCommentSticker(
@@ -297,7 +293,6 @@ export function appendMomentCommentSticker(
}
export function assertCommentStickerProgram(value: CommentStickerProgram): void {
- assert(value.contract === "svml.comment-sticker-program@1", "Unsupported CommentStickerProgram contract.");
identity(value.id, "CommentStickerProgram.id");
assert(value.items.length > 0, "CommentStickerProgram requires Items.");
const ids = new Set<string>();
@@ -324,7 +319,7 @@ export function finalizeCommentSticker(set: CommentStickerSet, header: CommentSt
assertCommentStickerSet(set);
assertCommentStickerHeader(header);
assert(set.items.length > 0, "Comment Sticker requires at least one Item.");
- return sealCommentStickerProgram({ contract: "svml.comment-sticker-program@1", id: header.id, items: set.items });
+ return sealCommentStickerProgram({ id: header.id, items: set.items });
}
function px(value: number): string {
diff --git a/packages/comment-sticker/src/surface.ts b/packages/comment-sticker/src/surface.ts
index cfad5d18..32be6567 100644
--- a/packages/comment-sticker/src/surface.ts
+++ b/packages/comment-sticker/src/surface.ts
@@ -172,7 +172,7 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
const records: SurfaceRecordDraft[] = [{
id: headerId,
type: commentStickerTypes.header,
- value: { kind: "inline", value: sealCommentStickerHeader({ contract: "svml.comment-sticker-header@1", id }) },
+ value: { kind: "inline", value: sealCommentStickerHeader({ id }) },
range: element.range,
}];
const inputs: Record<string, typeof canvas.ref> = { canvas: canvas.ref, header: { kind: "record", id: headerId }, space: space.ref };
@@ -208,7 +208,7 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
id: specId,
type: commentStickerTypes.itemSpec,
value: { kind: "inline", value: sealCommentStickerItemSpec({
- contract: "svml.comment-sticker-item-spec@1",
+
id: text(child, "id"),
projection: temporal.projection,
expansion: { kind: occurrences },
diff --git a/packages/comment-sticker/src/types.ts b/packages/comment-sticker/src/types.ts
index a8fbbfcc..8411d9ea 100644
--- a/packages/comment-sticker/src/types.ts
+++ b/packages/comment-sticker/src/types.ts
@@ -13,7 +13,6 @@ export type CommentStickerTextStyle = {
};
export type CommentStickerStyle = {
- readonly contract: "svml.comment-sticker-style@1";
readonly id: string;
readonly stackingOrder: number;
readonly card: {
@@ -75,7 +74,6 @@ export type CommentStickerStyle = {
};
export type CommentStickerContent = {
- readonly contract: "svml.comment-sticker-content@1";
readonly comment: string;
readonly author?: string;
readonly header?: string;
@@ -83,14 +81,12 @@ export type CommentStickerContent = {
};
export type CommentStickerItemSpec = {
- readonly contract: "svml.comment-sticker-item-spec@1";
readonly id: string;
readonly projection: TemporalWindowProjection;
readonly expansion: OccurrenceExpansion;
};
export type CommentStickerHeader = {
- readonly contract: "svml.comment-sticker-header@1";
readonly id: string;
};
@@ -105,12 +101,10 @@ export type CommentStickerItemProgram = {
};
export type CommentStickerSet = {
- readonly contract: "svml.comment-sticker-set@1";
readonly items: readonly CommentStickerItemProgram[];
};
export type CommentStickerProgram = {
- readonly contract: "svml.comment-sticker-program@1";
readonly id: string;
readonly items: readonly CommentStickerItemProgram[];
};
diff --git a/packages/comment-sticker/test/comment-sticker.test.ts b/packages/comment-sticker/test/comment-sticker.test.ts
index 5f00a283..f04de2cf 100644
--- a/packages/comment-sticker/test/comment-sticker.test.ts
+++ b/packages/comment-sticker/test/comment-sticker.test.ts
@@ -47,11 +47,11 @@ const frame = { xPx: 80, yPx: 140, widthPx: 920, heightPx: 360 };
const canvas = { widthPx: 1080, heightPx: 1920,
origin: "top-left" as const, xDirection: "right" as const, yDirection: "down" as const, pixelAspect: "square" as const };
const space = sealProgramSpace({ durationSec: 3, frameRate: { numerator: 30, denominator: 1 } });
-const header = sealCommentStickerHeader({ contract: "svml.comment-sticker-header@1", id: "comments" });
+const header = sealCommentStickerHeader({ id: "comments" });
function item(id: string) {
return sealCommentStickerItemSpec({
- contract: "svml.comment-sticker-item-spec@1",
+
id,
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
expansion: { kind: "one" },
diff --git a/packages/deck-track/src/author.ts b/packages/deck-track/src/author.ts
index a6961a52..d37f292c 100644
--- a/packages/deck-track/src/author.ts
+++ b/packages/deck-track/src/author.ts
@@ -154,7 +154,7 @@ export function decodeDepthStackSpec(recipe: SvsRecipe): DepthStackSpec {
tonePerDepth: { brightness: 0.88, contrast: 1, saturation: 0.78 },
};
return sealDepthStackSpec({
- contract: "svml.depth-stack-spec@1",
+
visibility: {
previous: integer(recipe, "visible-previous", 2),
next: integer(recipe, "visible-next", 1),
@@ -186,7 +186,7 @@ export function decodeDepthStackSpec(recipe: SvsRecipe): DepthStackSpec {
export function decodeDepthStackCardSpec(recipe: SvsRecipe, id: string): DepthStackCardSpec {
assertKnownKeys(recipe);
return sealDepthStackCardSpec({
- contract: "svml.depth-stack-card-spec@1",
+
id,
playback: {
future: oneOf(recipe, "playback-future", ["hold-head", "continue"] as const, "hold-head"),
diff --git a/packages/deck-track/src/manifest.ts b/packages/deck-track/src/manifest.ts
index 6bf90c10..f8981005 100644
--- a/packages/deck-track/src/manifest.ts
+++ b/packages/deck-track/src/manifest.ts
@@ -71,25 +71,25 @@ const playback = object({
});
export const depthStackSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-spec@1" } },
+
visibility: { schema: object({ previous: { schema: unsignedInteger }, next: { schema: unsignedInteger }, wrap: { schema: { kind: "boolean" } } }) },
poses: { schema: object({ current: { schema: pose }, previous: { schema: poseStep }, next: { schema: poseStep } }) },
reflow: { schema: object({ durationFrames: { schema: unsignedInteger }, easing: { schema: enumString(["linear", "ease-in", "ease-out", "ease-in-out"]) } }) },
presentation: { schema: mediaFramePresentationSchema }, motion: { schema: mediaLifecycleMotionSchema }, stackingOrder: { schema: integer },
});
export const depthStackCardSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-card-spec@1" } }, id: { schema: string }, playback: { schema: playback },
+ id: { schema: string }, playback: { schema: playback },
});
export const depthStackCardLabelSchema: ValueSchema = { kind: "oneOf", variants: [
- object({ contract: { schema: { kind: "literal", value: "svml.depth-stack-card-label@1" } }, kind: { schema: { kind: "literal", value: "none" } } }),
+ object({ kind: { schema: { kind: "literal", value: "none" } } }),
object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-card-label@1" } }, kind: { schema: { kind: "literal", value: "text" } },
+ kind: { schema: { kind: "literal", value: "text" } },
document: { schema: visualTextDocumentSchema }, typography: { schema: visualTextTypographySchema },
paints: { schema: { kind: "array", items: visualTextPaintSchema } }, flow: { schema: visualTextFlowSchema },
}),
] };
export const depthStackCardLabelStyleSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-card-label-style@1" } },
+
typography: { schema: visualTextTypographySchema }, paints: { schema: { kind: "array", items: visualTextPaintSchema } },
flow: { schema: visualTextFlowSchema },
});
@@ -99,13 +99,13 @@ const card = object({
label: { schema: depthStackCardLabelSchema }, playback: { schema: playback },
});
export const depthStackHeaderSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-header@1" } }, id: { schema: string },
+ id: { schema: string },
});
export const depthStackCardSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-card-set@1" } }, cards: { schema: { kind: "array", items: card } },
+ cards: { schema: { kind: "array", items: card } },
});
export const depthStackProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.depth-stack-program@1" } }, id: { schema: string }, span: { schema: frameSpan },
+ id: { schema: string }, span: { schema: frameSpan },
terminalFrame: { schema: positiveInteger }, frame: { schema: spatialFrameSchema }, spec: { schema: depthStackSpecSchema },
cards: { schema: { kind: "array", minItems: 1, items: card } },
});
diff --git a/packages/deck-track/src/program.ts b/packages/deck-track/src/program.ts
index 40caa058..41bfa68b 100644
--- a/packages/deck-track/src/program.ts
+++ b/packages/deck-track/src/program.ts
@@ -102,7 +102,6 @@ function assertPoseStep(value: DepthStackPoseStep, label: string): void {
}
export function assertDepthStackSpec(value: DepthStackSpec): void {
- assert(value.contract === "svml.depth-stack-spec@1", "Unsupported DepthStackSpec contract.");
for (const [name, count] of Object.entries(value.visibility)) {
if (name === "wrap") continue;
assert(Number.isSafeInteger(count) && typeof count === "number" && count >= 0 && count <= 1_000,
@@ -126,7 +125,6 @@ export function sealDepthStackSpec(value: DepthStackSpec): DepthStackSpec {
}
export function assertDepthStackCardLabel(value: DepthStackCardLabel): void {
- assert(value.contract === "svml.depth-stack-card-label@1", "Unsupported DepthStackCardLabel contract.");
if (value.kind === "none") return;
assert(value.kind === "text", "DepthStackCardLabel kind is invalid.");
assert(value.document.paragraphs.length > 0, "DepthStackCardLabel document is empty.");
@@ -144,7 +142,6 @@ export function sealDepthStackCardLabel(value: DepthStackCardLabel): DepthStackC
}
export function assertDepthStackCardLabelStyle(value: DepthStackCardLabelStyle): void {
- assert(value.contract === "svml.depth-stack-card-label-style@1", "Unsupported DepthStackCardLabelStyle contract.");
assert(value.typography.fonts.length > 0, "DepthStackCardLabelStyle requires exact fonts.");
value.typography.fonts.forEach((font, index) => assertFontArtifactRef(font, `DepthStackCardLabelStyle.fonts.${index}`));
assert(value.typography.synthesis === "none", "DepthStackCardLabelStyle cannot synthesize an exact font.");
@@ -161,7 +158,7 @@ export function bindDepthStackCardLabelText(style: DepthStackCardLabelStyle, con
verifyText(content);
assert(content.value.trim().length > 0, "DepthStack Card label Text is empty.");
return sealDepthStackCardLabel({
- contract: "svml.depth-stack-card-label@1",
+
kind: "text",
document: { paragraphs: [{ id: "label:paragraph", inlines: [{ kind: "text", id: "label:text", text: content.value }] }] },
typography: structuredClone(style.typography),
@@ -171,12 +168,11 @@ export function bindDepthStackCardLabelText(style: DepthStackCardLabelStyle, con
}
export const noDepthStackCardLabel = (): DepthStackCardLabel => ({
- contract: "svml.depth-stack-card-label@1",
+
kind: "none",
});
export function assertDepthStackCardSpec(value: DepthStackCardSpec): void {
- assert(value.contract === "svml.depth-stack-card-spec@1", "Unsupported DepthStackCardSpec contract.");
identity(value.id, "DepthStackCardSpec.id");
assert(value.playback.future === "hold-head" || value.playback.future === "continue",
"DepthStackCardSpec.playback.future is invalid.");
@@ -190,7 +186,6 @@ export function sealDepthStackCardSpec(value: DepthStackCardSpec): DepthStackCar
}
export function assertDepthStackHeader(value: DepthStackHeader): void {
- assert(value.contract === "svml.depth-stack-header@1", "Unsupported DepthStackHeader contract.");
identity(value.id, "DepthStackHeader.id");
}
@@ -200,11 +195,11 @@ export function sealDepthStackHeader(value: DepthStackHeader): DepthStackHeader
}
export function createDepthStackCardSet(): DepthStackCardSet {
- return { contract: "svml.depth-stack-card-set@1", cards: [] };
+ return { cards: [] };
}
export function assertDepthStackCardSet(value: DepthStackCardSet): void {
- assert(value.contract === "svml.depth-stack-card-set@1" && Array.isArray(value.cards),
+ assert(Array.isArray(value.cards),
"DepthStackCardSet is invalid.");
const ids = new Set<string>();
let previous = -1;
@@ -219,7 +214,7 @@ export function assertDepthStackCardSet(value: DepthStackCardSet): void {
assertMediaLayerSet(card.material);
assert(card.material.layers.length > 0, `DepthStack Card ${card.id} material is empty.`);
assertDepthStackCardLabel(card.label);
- assertDepthStackCardSpec({ contract: "svml.depth-stack-card-spec@1", id: card.id, playback: card.playback });
+ assertDepthStackCardSpec({ id: card.id, playback: card.playback });
}
}
@@ -238,7 +233,7 @@ export function appendDepthStackCard(
assert(Number.isSafeInteger(activationFrame) && activationFrame >= 0,
`DepthStack Card ${spec.id} activation is invalid.`);
const result: DepthStackCardSet = {
- contract: "svml.depth-stack-card-set@1",
+
cards: [...set.cards, {
id: spec.id,
activationFrame,
@@ -301,7 +296,7 @@ export function finalizeDepthStack(
assert(set.cards.length > 0, "DepthStack requires at least one Card.");
const first = set.cards[0]!;
const program: DepthStackProgram = {
- contract: "svml.depth-stack-program@1",
+
id: header.id,
span: { startFrame: first.activationFrame, endFrameExclusive: terminalFrame },
terminalFrame,
@@ -349,11 +344,10 @@ export function finalizeDepthStackUntilSelection(
}
export function assertDepthStackProgram(program: DepthStackProgram): void {
- assert(program.contract === "svml.depth-stack-program@1", "Unsupported DepthStackProgram contract.");
identity(program.id, "DepthStackProgram.id");
assertSpatialFrame(program.frame);
assertDepthStackSpec(program.spec);
- const set = { contract: "svml.depth-stack-card-set@1", cards: program.cards } as const;
+ const set = { cards: program.cards } as const;
assertDepthStackCardSet(set);
assert(program.cards.length > 0, "DepthStackProgram has no Cards.");
assert(Number.isSafeInteger(program.terminalFrame) && program.terminalFrame > 0,
diff --git a/packages/deck-track/src/surface.ts b/packages/deck-track/src/surface.ts
index 872753ef..a7223026 100644
--- a/packages/deck-track/src/surface.ts
+++ b/packages/deck-track/src/surface.ts
@@ -147,7 +147,7 @@ export const decodeDepthStackLabelSurface: StructuredSurfaceHandler = ({ element
if (!["start", "center", "end"].includes(block)) throw new Error(`${element.name}.block is invalid.`);
const padding = numeric(element, "padding", 20);
const style: DepthStackCardLabelStyle = sealDepthStackCardLabelStyle({
- contract: "svml.depth-stack-card-label-style@1",
+
typography: {
fonts: structuredClone(stack.faces), sizePx: numeric(element, "size", 34), weight: primary.weight, style: primary.style,
axes: [], features: [], synthesis: "none", kerning: "normal", trackingPx: 0, wordSpacingPx: 0,
@@ -216,7 +216,7 @@ export const decodeDepthStackSurface: StructuredSurfaceHandler = ({ element, res
const headerId = `${id}.header`;
const specId = `${id}.spec`;
records.push(
- { id: headerId, type: depthStackTypes.header, value: { kind: "inline", value: sealDepthStackHeader({ contract: "svml.depth-stack-header@1", id }) }, range: element.range },
+ { id: headerId, type: depthStackTypes.header, value: { kind: "inline", value: sealDepthStackHeader({ id }) }, range: element.range },
{ id: specId, type: depthStackTypes.spec, value: { kind: "inline", value: decodeDepthStackSpec(appearance) }, range: element.range },
);
const inputs: Record<string, typeof map.ref> = {
diff --git a/packages/deck-track/src/types.ts b/packages/deck-track/src/types.ts
index ed054719..1a191d61 100644
--- a/packages/deck-track/src/types.ts
+++ b/packages/deck-track/src/types.ts
@@ -57,7 +57,6 @@ export type DepthStackReflow = {
};
export type DepthStackSpec = {
- readonly contract: "svml.depth-stack-spec@1";
readonly visibility: DepthStackVisibility;
readonly poses: DepthStackPoseModel;
readonly reflow: DepthStackReflow;
@@ -72,9 +71,8 @@ export type DepthStackCardPlayback = {
};
export type DepthStackCardLabel =
- | { readonly contract: "svml.depth-stack-card-label@1"; readonly kind: "none" }
+ | { readonly kind: "none" }
| {
- readonly contract: "svml.depth-stack-card-label@1";
readonly kind: "text";
readonly document: VisualTextDocument;
readonly typography: VisualTextTypography;
@@ -83,14 +81,12 @@ export type DepthStackCardLabel =
};
export type DepthStackCardLabelStyle = {
- readonly contract: "svml.depth-stack-card-label-style@1";
readonly typography: VisualTextTypography;
readonly paints: readonly VisualTextPaintLayer[];
readonly flow: VisualTextFlow;
};
export type DepthStackCardSpec = {
- readonly contract: "svml.depth-stack-card-spec@1";
readonly id: string;
readonly playback: DepthStackCardPlayback;
};
@@ -104,17 +100,14 @@ export type DepthStackCard = {
};
export type DepthStackCardSet = {
- readonly contract: "svml.depth-stack-card-set@1";
readonly cards: readonly DepthStackCard[];
};
export type DepthStackHeader = {
- readonly contract: "svml.depth-stack-header@1";
readonly id: string;
};
export type DepthStackProgram = {
- readonly contract: "svml.depth-stack-program@1";
readonly id: string;
readonly span: FrameSpan;
readonly terminalFrame: number;
diff --git a/packages/deck-track/test/deck-track.test.ts b/packages/deck-track/test/deck-track.test.ts
index cb9373b1..03e6ac0a 100644
--- a/packages/deck-track/test/deck-track.test.ts
+++ b/packages/deck-track/test/deck-track.test.ts
@@ -85,7 +85,7 @@ const video = (name: string) => ({
function stillMaterial(name: string): MediaLayerSet {
return {
- contract: "svml.media-layer-set@1",
+
layers: [{
id: `${name}:sample`,
kind: "sample",
@@ -108,7 +108,7 @@ function stillMaterial(name: string): MediaLayerSet {
function timedMaterial(name: string, occupancy: "loop" | "hold" = "loop"): MediaLayerSet {
return {
- contract: "svml.media-layer-set@1",
+
layers: [{
id: `${name}:sample`,
kind: "sample",
@@ -134,7 +134,7 @@ function timedMaterial(name: string, occupancy: "loop" | "hold" = "loop"): Media
function baseSpec(input: Partial<DepthStackSpec> = {}): DepthStackSpec {
return sealDepthStackSpec({
- contract: "svml.depth-stack-spec@1",
+
visibility: { previous: 2, next: 1, wrap: false },
poses: {
current: {
@@ -171,7 +171,7 @@ function baseSpec(input: Partial<DepthStackSpec> = {}): DepthStackSpec {
function cardSpec(id: string, past: "hold-tail" | "continue" | "hide" = "hold-tail", future: "hold-head" | "continue" = "hold-head") {
return sealDepthStackCardSpec({
- contract: "svml.depth-stack-card-spec@1",
+
id,
playback: { future, past },
});
@@ -199,7 +199,7 @@ function program(input: {
}
return finalizeDepthStack(
set,
- sealDepthStackHeader({ contract: "svml.depth-stack-header@1", id: "proof-stack" }),
+ sealDepthStackHeader({ id: "proof-stack" }),
frame,
input.spec ?? baseSpec(),
input.terminal ?? 60,
@@ -236,7 +236,7 @@ test("explicit wrapping never aliases one Card into several relative depths", ()
test("missing, equal, reversed and terminal-crossing triggers fail in authored order", () => {
assert.throws(() => finalizeDepthStack(
- createDepthStackCardSet(), sealDepthStackHeader({ contract: "svml.depth-stack-header@1", id: "empty" }),
+ createDepthStackCardSet(), sealDepthStackHeader({ id: "empty" }),
frame, baseSpec(), 60, space,
), /at least one Card/u);
assert.throws(() => program({ triggers: [0, 20, 20] }), /strictly increasing/u);
@@ -322,7 +322,7 @@ const font: FontArtifactRef = {
function exactLabel(): DepthStackCardLabel {
return sealDepthStackCardLabel({
- contract: "svml.depth-stack-card-label@1",
+
kind: "text",
document: { paragraphs: [{ id: "p", inlines: [{ id: "t", kind: "text", text: "Proof" }] }] },
typography: {
diff --git a/packages/film/src/manifest.ts b/packages/film/src/manifest.ts
index b7209193..1aa230c5 100644
--- a/packages/film/src/manifest.ts
+++ b/packages/film/src/manifest.ts
@@ -32,13 +32,13 @@ const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema;
});
export const filmProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.film-program@1" } },
+
id: { schema: string },
clearColor: { schema: string },
});
export const filmTrackSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.film-track-set@1" } },
+
tracks: {
schema: {
kind: "array",
diff --git a/packages/film/src/program.ts b/packages/film/src/program.ts
index b06bf0b4..0544796d 100644
--- a/packages/film/src/program.ts
+++ b/packages/film/src/program.ts
@@ -23,7 +23,7 @@ function trackKey(track: Track): string {
function filmProgramContent(value: FilmProgram): FilmProgram {
return {
- contract: "svml.film-program@1",
+
id: value.id,
clearColor: value.clearColor,
};
@@ -31,7 +31,7 @@ function filmProgramContent(value: FilmProgram): FilmProgram {
function filmTrackSetContent(value: FilmTrackSet): FilmTrackSet {
return {
- contract: "svml.film-track-set@1",
+
tracks: [...value.tracks]
.map((track) => structuredClone(track))
.sort((left, right) => trackKey(left).localeCompare(trackKey(right))),
@@ -43,7 +43,6 @@ export function sealFilmProgram(value: FilmProgram): FilmProgram {
}
export function assertFilmProgramIdentity(program: FilmProgram): void {
- if (program.contract !== "svml.film-program@1") throw new Error("Unsupported FilmProgram contract.");
assertNonEmpty(program.id, "FilmProgram id");
if (!/^#[0-9a-f]{6}(?:[0-9a-f]{2})?$/iu.test(program.clearColor)) {
throw new Error("FilmProgram clear color is invalid.");
@@ -55,7 +54,6 @@ function sealFilmTrackSet(value: FilmTrackSet): FilmTrackSet {
}
export function assertFilmTrackSetIdentity(set: FilmTrackSet): void {
- if (set.contract !== "svml.film-track-set@1") throw new Error("Unsupported FilmTrackSet contract.");
const ids = new Set<string>();
for (const track of set.tracks) {
if (ids.has(track.id)) throw new Error(`FilmTrackSet contains duplicate Track id ${track.id}.`);
@@ -67,7 +65,7 @@ export function assertFilmTrackSetIdentity(set: FilmTrackSet): void {
export function createFilmTrackSet(): FilmTrackSet {
return sealFilmTrackSet({
- contract: "svml.film-track-set@1",
+
tracks: [],
});
}
@@ -81,7 +79,7 @@ function appendTrack(set: FilmTrackSet, programSpace: ProgramSpace, track: Track
throw new Error(`FilmTrackSet already contains Track id ${track.id}.`);
}
return sealFilmTrackSet({
- contract: "svml.film-track-set@1",
+
tracks: [...set.tracks, track],
});
}
diff --git a/packages/film/src/surface.ts b/packages/film/src/surface.ts
index c03161a2..93f3d118 100644
--- a/packages/film/src/surface.ts
+++ b/packages/film/src/surface.ts
@@ -112,7 +112,7 @@ export const decodeFilmSurface: StructuredSurfaceHandler = ({ element, resolveRe
const programId = `${id}.program`;
const program = sealFilmProgram({
- contract: "svml.film-program@1",
+
id,
clearColor: appearance.clearColor,
});
diff --git a/packages/film/src/types.ts b/packages/film/src/types.ts
index 850a3861..2512f01b 100644
--- a/packages/film/src/types.ts
+++ b/packages/film/src/types.ts
@@ -2,7 +2,6 @@ import type { Track } from "@narratage/composition";
/** Package-owned authoring value. A future Film Surface may produce this record. */
export type FilmProgram = {
- readonly contract: "svml.film-program@1";
readonly id: string;
readonly clearColor: string;
};
@@ -12,7 +11,6 @@ export type FilmProgram = {
* peer Tracks without adding variadic Operation ports to Core.
*/
export type FilmTrackSet = {
- readonly contract: "svml.film-track-set@1";
readonly tracks: readonly Track[];
};
diff --git a/packages/film/test/film.test.ts b/packages/film/test/film.test.ts
index 5bed1cfd..bab0a954 100644
--- a/packages/film/test/film.test.ts
+++ b/packages/film/test/film.test.ts
@@ -82,7 +82,7 @@ const canvas = sealCanvasSpace({
pixelAspect: "square",
});
const filmProgram = sealFilmProgram({
- contract: "svml.film-program@1",
+
id: "main-film",
clearColor: "#000000",
});
@@ -94,7 +94,7 @@ const titleFont: FontArtifactRef = {
style: "normal",
};
const titleStyle: TextStyle = {
- contract: "svml.text-style@1",
+
id: "title-style",
stackingOrder: 60,
typography: {
@@ -116,7 +116,7 @@ const titleStyle: TextStyle = {
path: { side: "left", orientation: "follow", startMarginPx: 0, endMarginPx: 0, align: "start", reverse: false, overflow: "visible" },
};
const textProgram = sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1",
+
id: "title-track",
items: [{
id: "title",
diff --git a/packages/film/test/surface.test.ts b/packages/film/test/surface.test.ts
index 4f099461..e2e27e3d 100644
--- a/packages/film/test/surface.test.ts
+++ b/packages/film/test/surface.test.ts
@@ -156,7 +156,7 @@ test("the official Film Surface validates SVS and lowers dynamic peer Tracks", a
const compiled = await compileFilm();
const program = compiled.program.records.find((record) => record.type.name === filmTypes.program.name);
assert.deepEqual(program?.value.kind === "inline" ? program.value.value : undefined, {
- contract: "svml.film-program@1",
+
id: "main",
clearColor: "#09090B",
});
diff --git a/packages/hyperframes/test/browser-visual.test.ts b/packages/hyperframes/test/browser-visual.test.ts
index 6f396cf2..ab9946ab 100644
--- a/packages/hyperframes/test/browser-visual.test.ts
+++ b/packages/hyperframes/test/browser-visual.test.ts
@@ -741,7 +741,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
metricEdge: "line-box" as const,
};
const baseStyle = (id: string, stackingOrder: number, paints: TextStyle["paints"]): TextStyle => sealTextStyle({
- contract: "svml.text-style@1", id, stackingOrder,
+ id, stackingOrder,
typography: {
fonts, sizePx: 42, weight: 700, style: "normal", axes: [], features: [],
synthesis: "none", kerning: "normal", trackingPx: 0, wordSpacingPx: 0,
@@ -800,7 +800,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
path: { ...plain.path, orientation: "upright", align: "center" },
});
const animated = sealTextMotion({
- contract: "svml.text-motion@1", id: "animated",
+ id: "animated",
item: { keyframes: [
{ atFrame: 0, style: [{ name: "opacity", value: 0 }, { name: "transform", value: "translateY(25px)" }] },
{ atFrame: 4, easing: "ease-out", style: [{ name: "opacity", value: 1 }, { name: "transform", value: "translateY(0px)" }] },
@@ -817,11 +817,11 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
}],
});
const pathMotion = sealTextMotion({
- contract: "svml.text-motion@1", id: "path-motion", sequences: [],
+ id: "path-motion", sequences: [],
pathMargin: { keyframes: [{ atFrame: 0, startMarginPx: 20 }, { atFrame: frames, startMarginPx: 150, easing: "ease-in-out" }] },
});
const textProgram = sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1", id: "complete-text",
+ id: "complete-text",
items: [
{
id: "point", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "point",
@@ -884,7 +884,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
area: { ...plain.area, wrap: "none" },
});
const maskTrack = renderTextMaskTrack(space, sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1", id: "mask-shape",
+ id: "mask-shape",
items: [{
id: "mask", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "mask",
geometry: { kind: "area", frame: { xPx: 520, yPx: 500, widthPx: 380, heightPx: 120 } },
@@ -892,7 +892,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
style: maskStyle, motion: stillTextMotion(),
}],
}), maskMaterial, sealTextMaskSpec({
- contract: "svml.text-mask-spec@1", id: "text-mask", mode: "alpha", materialFit: "cover",
+ id: "text-mask", mode: "alpha", materialFit: "cover",
}));
const document = compileHyperframesDocument(sealComposition({
id: "complete-text-browser",
@@ -1013,7 +1013,7 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
continuity: "isolated" | "joined",
color: string,
): TextStyle => sealTextStyle({
- contract: "svml.text-style@1", id, stackingOrder,
+ id, stackingOrder,
typography: {
fonts, sizePx: 34, weight: 700, style: "normal", axes: [], features: [],
synthesis: "none", kerning: "normal", trackingPx: 0, wordSpacingPx: 0,
@@ -1043,7 +1043,7 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
{ id: "reverse-line", unit: "line", order: "reverse", target: "grapheme", continuity: "isolated", color: "#a16207" },
] as const;
const track = renderTypographyTrack(space, sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1", id: "text-box-sequence",
+ id: "text-box-sequence",
items: cases.map((entry, index) => {
const lineUnit = entry.unit === "line";
const document = index === 1
@@ -1083,7 +1083,7 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
document,
style: style(entry.id, 10 + index, entry.target, entry.continuity, entry.color),
motion: sealTextMotion({
- contract: "svml.text-motion@1", id: `${entry.id}-motion`,
+ id: `${entry.id}-motion`,
sequences: [{
id: `${entry.id}-sequence`, unit: entry.unit,
range: { start: 0, endExclusive: lineUnit ? 2 : entry.unit === "word" ? 2 : 5 },
@@ -1186,7 +1186,7 @@ test("vertical Text paints in its authored direction and bounded shrink fails cl
paths.set(artifactDigest, `./${name}`);
}
const style = (id: string, writingMode: "horizontal-tb" | "vertical-rl", overflow: "visible" | "shrink", minimumScale?: number): TextStyle => sealTextStyle({
- contract: "svml.text-style@1", id, stackingOrder: 10,
+ id, stackingOrder: 10,
typography: {
fonts: [font], sizePx: 56, weight: 700, style: "normal", axes: [], features: [],
synthesis: "none", kerning: "normal", trackingPx: 0, wordSpacingPx: 0,
@@ -1210,7 +1210,7 @@ test("vertical Text paints in its authored direction and bounded shrink fails cl
id,
canvas: { width, height, clearColor: "#000000" },
tracks: [renderTypographyTrack(space, sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1", id,
+ id,
items: [{
id, span: { startFrame: 0, endFrameExclusive: 1 }, tieBreak: id,
geometry: { kind: "area", frame: { ...frame } },
@@ -1300,7 +1300,7 @@ test("Media two-frame sampling, alpha, local motion and handoff survive partitio
const space = sealProgramSpace({
durationSec: 1, frameRate: { numerator: 12, denominator: 1 },
});
- const header = mediaTrack.sealMediaTrackHeader({ contract: "svml.media-track-header@1", id: "browser-media" });
+ const header = mediaTrack.sealMediaTrackHeader({ id: "browser-media" });
const sampleAppearance = { opacity: 1, filter: { blurPx: 0, brightness: 1, contrast: 1, saturation: 1 } };
const contentFit = (sizing: "contain" | "cover") => ({
sizing,
@@ -1310,11 +1310,11 @@ test("Media two-frame sampling, alpha, local motion and handoff survive partitio
const extent = { widthPx: 80, heightPx: 120 };
let itemLayers = mediaTrack.createMediaLayerSet();
itemLayers = mediaTrack.appendStillMediaLayer(itemLayers, red, extent, contentFit("cover"), mediaTrack.sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "blurred-backdrop",
+ id: "blurred-backdrop",
appearance: { opacity: 1, filter: { blurPx: 6, brightness: 0.8, contrast: 1, saturation: 1 } },
}));
itemLayers = mediaTrack.appendSurfaceMediaLayer(itemLayers, alpha, contentFit("contain"), mediaTrack.sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "alpha-foreground", appearance: sampleAppearance,
+ id: "alpha-foreground", appearance: sampleAppearance,
samplingMotion: { keyframes: [
{ atProgress: 0, zoom: 0.9, offsetX: 0, offsetY: 5, rotationDeg: -2 },
{ atProgress: 1, zoom: 1.05, offsetX: 0, offsetY: -3, rotationDeg: 2, easing: "ease-in-out" },
@@ -1324,7 +1324,7 @@ test("Media two-frame sampling, alpha, local motion and handoff survive partitio
mediaTrack.createMediaTrackSet(), header, space, canvas, itemLayers,
{ xPx: 0, yPx: 0, widthPx: 80, heightPx: 120 },
mediaTrack.sealMediaItemSpec({
- contract: "svml.media-item-spec@1", id: "two-frame",
+ id: "two-frame",
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } }, expansion: { kind: "one" },
presentation: { clip: { kind: "frame" }, padding: { topPx: 0, rightPx: 0, bottomPx: 0, leftPx: 0 }, shadows: [] },
motion: {
@@ -1338,23 +1338,23 @@ test("Media two-frame sampling, alpha, local motion and handoff survive partitio
);
const stillLayers = (id: string, artifact: BlobRef) => mediaTrack.appendStillMediaLayer(
mediaTrack.createMediaLayerSet(), artifact, extent, contentFit("cover"), mediaTrack.sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id, appearance: sampleAppearance,
+ id, appearance: sampleAppearance,
}),
);
let members = mediaTrack.createMediaSequenceMemberSet();
members = mediaTrack.appendMediaSequenceMember(members, stillLayers("red-member", red),
- mediaTrack.sealMediaSequenceMemberSpec({ contract: "svml.media-sequence-member-spec@1", id: "red" }), 0);
+ mediaTrack.sealMediaSequenceMemberSpec({ id: "red" }), 0);
members = mediaTrack.appendMediaSequenceMember(members, stillLayers("green-member", green),
- mediaTrack.sealMediaSequenceMemberSpec({ contract: "svml.media-sequence-member-spec@1", id: "green" }), 6);
+ mediaTrack.sealMediaSequenceMemberSpec({ id: "green" }), 6);
set = mediaTrack.appendMediaSequence(
set, header, space, canvas, members,
{ xPx: 80, yPx: 0, widthPx: 80, heightPx: 120 },
mediaTrack.sealMediaSequenceSpec({
- contract: "svml.media-sequence-spec@1", id: "handoff",
+ id: "handoff",
presentation: { clip: { kind: "frame" }, padding: { topPx: 0, rightPx: 0, bottomPx: 0, leftPx: 0 }, shadows: [] },
motion: { sustain: [] }, stackingOrder: 20,
handoffs: [mediaTrack.sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1", id: "red-green", fromMemberId: "red", toMemberId: "green",
+ id: "red-green", fromMemberId: "red", toMemberId: "green",
operator: "crossfade", durationFrames: 4, boundaryRatio: 0.5, audio: "cut",
})],
}),
@@ -1447,7 +1447,7 @@ test("DepthStack Deck reflow, exact labels and old-system layout survive partiti
offsetPx: { x: 0, y: 0 }, constraint: "bounded" as const,
};
const label = (id: string): DepthStackCardLabel => deckTrack.sealDepthStackCardLabel({
- contract: "svml.depth-stack-card-label@1", kind: "text",
+ kind: "text",
document: { paragraphs: [{ id: `${id}-p`, inlines: [{ id: `${id}-text`, kind: "text", text: id.toUpperCase() }] }] },
typography: {
fonts: [font], sizePx: 16, weight: 700, style: "normal", axes: [], features: [], synthesis: "none",
@@ -1479,7 +1479,7 @@ test("DepthStack Deck reflow, exact labels and old-system layout survive partiti
{ widthPx: 120, heightPx: 90 },
fit,
mediaTrack.sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: `${value.id}-material`,
+ id: `${value.id}-material`,
appearance: { opacity: 1, filter: { blurPx: 0, brightness: 1, contrast: 1, saturation: 1 } },
}),
);
@@ -1488,14 +1488,14 @@ test("DepthStack Deck reflow, exact labels and old-system layout survive partiti
material,
label(value.id),
deckTrack.sealDepthStackCardSpec({
- contract: "svml.depth-stack-card-spec@1", id: value.id,
+ id: value.id,
playback: { future: "hold-head", past: "hold-tail" },
}),
index * 6,
);
}
const spec = deckTrack.sealDepthStackSpec({
- contract: "svml.depth-stack-spec@1",
+
visibility: { previous: 1, next: 1, wrap: false },
poses: {
current: {
@@ -1529,7 +1529,7 @@ test("DepthStack Deck reflow, exact labels and old-system layout survive partiti
});
const program = deckTrack.finalizeDepthStack(
cards,
- deckTrack.sealDepthStackHeader({ contract: "svml.depth-stack-header@1", id: "proof-stack" }),
+ deckTrack.sealDepthStackHeader({ id: "proof-stack" }),
{ xPx: 60, yPx: 45, widthPx: 120, heightPx: 90 },
spec,
frames,
@@ -1803,7 +1803,7 @@ test("all Spatial fit modes and equal-point alignments reach exact browser pixel
const space = sealProgramSpace({
durationSec: 1, frameRate: { numerator: 1, denominator: 1 },
});
- const header = mediaTrack.sealMediaTrackHeader({ contract: "svml.media-track-header@1", id: "spatial-browser" });
+ const header = mediaTrack.sealMediaTrackHeader({ id: "spatial-browser" });
const extent = { widthPx: 40, heightPx: 20 };
const appearance = { opacity: 1, filter: { blurPx: 0, brightness: 1, contrast: 1, saturation: 1 } };
let set = mediaTrack.createMediaTrackSet();
@@ -1823,13 +1823,13 @@ test("all Spatial fit modes and equal-point alignments reach exact browser pixel
const layers = mediaTrack.appendStillMediaLayer(
mediaTrack.createMediaLayerSet(), source, extent, fit,
mediaTrack.sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: `${id}:source`, appearance,
+ id: `${id}:source`, appearance,
}),
);
set = mediaTrack.appendProgramMediaItem(
set, header, space, canvas, layers, frame,
mediaTrack.sealMediaItemSpec({
- contract: "svml.media-item-spec@1", id,
+ id,
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
expansion: { kind: "one" },
presentation: {
@@ -1984,7 +1984,7 @@ test("every official Screen Overlay survives real sequential and parallel browse
durationSec: 1,
frameRate: { numerator: 12, denominator: 1 },
});
- const header = sealScreenOverlayHeader({ contract: "svml.screen-overlay-header@1", id: "browser-overlays" });
+ const header = sealScreenOverlayHeader({ id: "browser-overlays" });
const components: readonly ScreenOverlayComponent[] = [
{ kind: "flash", color: "#ffffff", intensity: 0.2, attackFrames: 2, holdFrames: 2, decayFrames: 4 },
{ kind: "color-wash", color: "#2030ff", opacity: 0.08 },
@@ -2001,7 +2001,7 @@ test("every official Screen Overlay survives real sequential and parallel browse
let set: ScreenOverlaySet = createScreenOverlaySet();
components.forEach((content, index) => {
set = appendProgramScreenOverlay(set, header, space, sealScreenOverlayItemSpec({
- contract: "svml.screen-overlay-item-spec@1",
+
id: `${content.kind}-${index + 1}`,
content,
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
diff --git a/packages/image-compose/src/manifest.ts b/packages/image-compose/src/manifest.ts
index dcbbe8d6..7d2b4628 100644
--- a/packages/image-compose/src/manifest.ts
+++ b/packages/image-compose/src/manifest.ts
@@ -35,11 +35,11 @@ const blob = object({
mediaType: { schema: string },
});
export const imageComposeOptionsSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.image-compose-options@1" } },
+
background: { schema: string },
});
export const imageComposeLayerSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.image-compose-layer-spec@1" } },
+
fit: { schema: { kind: "string", enum: ["contain", "cover", "stretch"] } },
interpolation: { schema: { kind: "string", enum: ["nearest", "linear", "cubic", "area", "lanczos"] } },
opacity: { schema: { kind: "number", minimum: 0, maximum: 1 } },
@@ -50,7 +50,7 @@ const layer = object({
spec: { schema: imageComposeLayerSpecSchema },
});
export const imageComposeLayerSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.image-compose-layer-set@1" } },
+
layers: { schema: { kind: "array", maxItems: 64, items: layer } },
});
const registered = (digest: ReturnType<typeof digestOf>) => ({ digest });
diff --git a/packages/image-compose/src/program.ts b/packages/image-compose/src/program.ts
index 78490693..3f3b825f 100644
--- a/packages/image-compose/src/program.ts
+++ b/packages/image-compose/src/program.ts
@@ -17,7 +17,6 @@ function color(value: string, label: string): void {
}
export function assertImageComposeOptions(value: ImageComposeOptions): void {
- assert(value.contract === "svml.image-compose-options@1", "Unsupported ImageComposeOptions contract.");
color(value.background, "ImageComposeOptions.background");
}
@@ -27,7 +26,6 @@ export function sealImageComposeOptions(value: ImageComposeOptions): ImageCompos
}
export function assertImageComposeLayerSpec(value: ImageComposeLayerSpec): void {
- assert(value.contract === "svml.image-compose-layer-spec@1", "Unsupported ImageComposeLayerSpec contract.");
assert(["contain", "cover", "stretch"].includes(value.fit), "ImageComposeLayerSpec.fit is invalid.");
assert(["nearest", "linear", "cubic", "area", "lanczos"].includes(value.interpolation),
"ImageComposeLayerSpec.interpolation is invalid.");
@@ -49,11 +47,11 @@ function assertLayer(value: ImageComposeLayer, label: string): void {
}
export function createImageComposeLayerSet(): ImageComposeLayerSet {
- return { contract: "svml.image-compose-layer-set@1", layers: [] };
+ return { layers: [] };
}
export function assertImageComposeLayerSet(value: ImageComposeLayerSet): void {
- assert(value.contract === "svml.image-compose-layer-set@1" && Array.isArray(value.layers),
+ assert(Array.isArray(value.layers),
"ImageComposeLayerSet is invalid.");
assert(value.layers.length <= 64, "ImageComposeLayerSet exceeds 64 Layers.");
value.layers.forEach((layer, index) => {
@@ -69,7 +67,7 @@ export function appendImageComposeLayer(
): ImageComposeLayerSet {
assertImageComposeLayerSet(set);
const next: ImageComposeLayerSet = {
- contract: "svml.image-compose-layer-set@1",
+
layers: [...set.layers, { source: structuredClone(source), frame: structuredClone(frame), spec: structuredClone(spec) }],
};
assertImageComposeLayerSet(next);
diff --git a/packages/image-compose/src/surface.ts b/packages/image-compose/src/surface.ts
index 17dad8a0..49aca079 100644
--- a/packages/image-compose/src/surface.ts
+++ b/packages/image-compose/src/surface.ts
@@ -44,7 +44,7 @@ export const decodeImageComposeSurface: StructuredSurfaceHandler = ({ element, r
const records = [{
id: optionsId, type: imageComposeTypes.options,
value: { kind: "inline" as const, value: sealImageComposeOptions({
- contract: "svml.image-compose-options@1", background: text(element, "background", "#00000000"),
+ background: text(element, "background", "#00000000"),
}) as unknown as CanonicalValue }, range: element.range,
}];
const inputs: Record<string, typeof canvas.ref> = { canvas: canvas.ref, options: { kind: "record", id: optionsId } };
@@ -64,7 +64,7 @@ export const decodeImageComposeSurface: StructuredSurfaceHandler = ({ element, r
records.push({
id: specId, type: imageComposeTypes.layerSpec,
value: { kind: "inline", value: sealImageComposeLayerSpec({
- contract: "svml.image-compose-layer-spec@1",
+
fit: text(child, "fit", "contain") as "contain",
interpolation: text(child, "interpolation", "lanczos") as "lanczos",
opacity: number(child, "opacity", 1),
diff --git a/packages/image-compose/src/types.ts b/packages/image-compose/src/types.ts
index 92b3c005..4f95f1fa 100644
--- a/packages/image-compose/src/types.ts
+++ b/packages/image-compose/src/types.ts
@@ -2,12 +2,10 @@ import type { BlobRef } from "@narratage/protocol";
import type { SpatialFrame } from "@narratage/spatial";
export type ImageComposeOptions = {
- readonly contract: "svml.image-compose-options@1";
readonly background: string;
};
export type ImageComposeLayerSpec = {
- readonly contract: "svml.image-compose-layer-spec@1";
readonly fit: "contain" | "cover" | "stretch";
readonly interpolation: "nearest" | "linear" | "cubic" | "area" | "lanczos";
readonly opacity: number;
@@ -20,6 +18,5 @@ export type ImageComposeLayer = {
};
export type ImageComposeLayerSet = {
- readonly contract: "svml.image-compose-layer-set@1";
readonly layers: readonly ImageComposeLayer[];
};
diff --git a/packages/image-compose/test/image-compose.test.ts b/packages/image-compose/test/image-compose.test.ts
index 592e8831..0b34216e 100644
--- a/packages/image-compose/test/image-compose.test.ts
+++ b/packages/image-compose/test/image-compose.test.ts
@@ -21,9 +21,9 @@ const canvas = sealCanvasSpace({
origin: "top-left", xDirection: "right", yDirection: "down", pixelAspect: "square",
});
const frame = sealSpatialFrame({ xPx: -10, yPx: 20, widthPx: 500, heightPx: 400 });
-const options = sealImageComposeOptions({ contract: "svml.image-compose-options@1", background: "#11223344" });
+const options = sealImageComposeOptions({ background: "#11223344" });
const spec = sealImageComposeLayerSpec({
- contract: "svml.image-compose-layer-spec@1", fit: "cover", interpolation: "lanczos", opacity: 0.75,
+ fit: "cover", interpolation: "lanczos", opacity: 0.75,
});
const source = { kind: "blob" as const, digest: digestOf("hero-image"), size: 123, mediaType: "image/png" };
diff --git a/packages/media-track/src/author.ts b/packages/media-track/src/author.ts
index 54b936f2..bfa91041 100644
--- a/packages/media-track/src/author.ts
+++ b/packages/media-track/src/author.ts
@@ -172,7 +172,7 @@ export function decodeMediaSampleSpec(
const timed = sourceKind === "timed" || (sourceKind === "surface" && hasTimedProperties);
const sourceTrim = timed ? trim(recipe) : undefined;
return sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1",
+
id,
...(timed ? { occupancy: occupancy(recipe), ...(sourceTrim === undefined ? {} : { trim: sourceTrim }) } : {}),
appearance: {
@@ -253,7 +253,7 @@ export function decodeMediaItemSpec(
): MediaItemSpec {
assertKeys(recipe, [...FIT_KEYS, ...SAMPLE_KEYS, ...FRAME_KEYS]);
return sealMediaItemSpec({
- contract: "svml.media-item-spec@1",
+
id: input.id,
projection: input.projection,
expansion: input.expansion,
@@ -268,13 +268,13 @@ export function decodeMediaFramePaint(recipe: SvsRecipe, id: string): MediaPaint
const source = optionalString(recipe, "frame-paint");
if (source === undefined || source === "transparent") return undefined;
const adapted: SvsRecipe = { ...recipe, properties: { paint: source } };
- return sealMediaPaintLayerSpec({ contract: "svml.media-paint-layer-spec@1", id, paint: paint(adapted), opacity: 1 });
+ return sealMediaPaintLayerSpec({ id, paint: paint(adapted), opacity: 1 });
}
export function decodeMediaPaintSpec(recipe: SvsRecipe, id: string): MediaPaintLayerSpec {
assertKeys(recipe, ["paint", "opacity"]);
return sealMediaPaintLayerSpec({
- contract: "svml.media-paint-layer-spec@1", id, paint: paint(recipe), opacity: number(recipe, "opacity", 1),
+ id, paint: paint(recipe), opacity: number(recipe, "opacity", 1),
});
}
@@ -288,7 +288,7 @@ export function decodeMediaHandoffSpec(
const operator = oneOf(recipe, "operator", ["cut", "crossfade", "push", "wipe", "cover", "page-turn"] as const);
const direction = optionalString(recipe, "direction");
return sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1", id, fromMemberId, toMemberId, operator,
+ id, fromMemberId, toMemberId, operator,
durationFrames: number(recipe, "duration-frames"),
boundaryRatio: number(recipe, "boundary-ratio", 0.5),
...(direction === undefined ? {} : { direction: oneOf(recipe, "direction", ["left", "right", "up", "down"] as const) }),
@@ -304,7 +304,7 @@ export function decodeMediaSequenceSpec(
): MediaSequenceSpec {
assertKeys(recipe, [...FIT_KEYS, ...SAMPLE_KEYS, ...FRAME_KEYS]);
return sealMediaSequenceSpec({
- contract: "svml.media-sequence-spec@1", id,
+ id,
presentation: decodeMediaPresentation(recipe), motion,
stackingOrder: number(recipe, "stack-order"), handoffs,
});
diff --git a/packages/media-track/src/layers.ts b/packages/media-track/src/layers.ts
index 74708360..f00ccbd1 100644
--- a/packages/media-track/src/layers.ts
+++ b/packages/media-track/src/layers.ts
@@ -139,7 +139,6 @@ export function assertMediaVisualSource(value: MediaVisualSource, label: string)
}
export function assertMediaSampleLayerSpec(value: MediaSampleLayerSpec): void {
- assert(value.contract === "svml.media-sample-layer-spec@1", "Unsupported MediaSampleLayerSpec contract.");
assertMediaIdentity(value.id, "MediaSampleLayerSpec.id");
unit(value.appearance.opacity, "MediaSampleLayerSpec.appearance.opacity");
const filter = value.appearance.filter;
@@ -159,7 +158,6 @@ export function sealMediaSampleLayerSpec(value: MediaSampleLayerSpec): MediaSamp
}
export function assertMediaPaintLayerSpec(value: MediaPaintLayerSpec): void {
- assert(value.contract === "svml.media-paint-layer-spec@1", "Unsupported MediaPaintLayerSpec contract.");
assertMediaIdentity(value.id, "MediaPaintLayerSpec.id");
assertMediaPaint(value.paint, "MediaPaintLayerSpec.paint");
unit(value.opacity, "MediaPaintLayerSpec.opacity");
@@ -171,11 +169,11 @@ export function sealMediaPaintLayerSpec(value: MediaPaintLayerSpec): MediaPaintL
}
export function createMediaLayerSet(): MediaLayerSet {
- return { contract: "svml.media-layer-set@1", layers: [] };
+ return { layers: [] };
}
export function assertMediaLayerSet(value: MediaLayerSet): void {
- assert(value.contract === "svml.media-layer-set@1" && Array.isArray(value.layers), "MediaLayerSet is invalid.");
+ assert(Array.isArray(value.layers), "MediaLayerSet is invalid.");
const ids = new Set<string>();
for (const layer of value.layers) {
assertMediaIdentity(layer.id, "Media layer id");
@@ -206,7 +204,7 @@ export function assertMediaLayerSet(value: MediaLayerSet): void {
}
}
assertMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1",
+
id: layer.id,
...(layer.trim === undefined ? {} : { trim: layer.trim }),
...(layer.occupancy === undefined ? {} : { occupancy: layer.occupancy }),
@@ -219,7 +217,7 @@ export function assertMediaLayerSet(value: MediaLayerSet): void {
function append(set: MediaLayerSet, layer: MediaLayerProgram): MediaLayerSet {
assertMediaLayerSet(set);
assert(!set.layers.some((item) => item.id === layer.id), `MediaLayerSet already contains ${layer.id}.`);
- const result = { contract: "svml.media-layer-set@1" as const, layers: [...set.layers, layer] };
+ const result = { layers: [...set.layers, layer] };
assertMediaLayerSet(result);
return canonicalize(result) as unknown as MediaLayerSet;
}
diff --git a/packages/media-track/src/manifest.ts b/packages/media-track/src/manifest.ts
index 69b408b9..6a3827cb 100644
--- a/packages/media-track/src/manifest.ts
+++ b/packages/media-track/src/manifest.ts
@@ -111,11 +111,11 @@ const samplingKeyframe = object({
});
const samplingMotion = object({ keyframes: { schema: { kind: "array", minItems: 2, items: samplingKeyframe } } });
export const mediaPaintLayerSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-paint-layer-spec@1" } },
+
id: { schema: string }, paint: { schema: paint }, opacity: { schema: unsigned },
});
export const mediaSampleLayerSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-sample-layer-spec@1" } },
+
id: { schema: string }, trim: { schema: trim, optional: true }, occupancy: { schema: occupancy, optional: true },
appearance: { schema: appearance }, samplingMotion: { schema: samplingMotion, optional: true },
});
@@ -136,7 +136,7 @@ const sampleLayer = object({
});
const layer = { kind: "oneOf", variants: [paintLayer, sampleLayer] } as const;
export const mediaLayerSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-layer-set@1" } },
+
layers: { schema: { kind: "array", items: layer } },
});
@@ -191,23 +191,23 @@ const soundTrigger: ValueSchema = { kind: "oneOf", variants: [
object({ kind: { schema: { kind: "literal", value: "handoff" } }, handoffId: { schema: string } }),
] };
export const mediaSoundSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-sound-spec@1" } },
+
id: { schema: string }, trigger: { schema: soundTrigger }, gain: { schema: unsigned },
});
const soundEvent = object({ id: { schema: string }, trigger: { schema: soundTrigger }, source: { schema: audioSource }, gain: { schema: unsigned } });
export const mediaSoundSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-sound-set@1" } },
+
sounds: { schema: { kind: "array", items: soundEvent } },
});
export const mediaItemSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-item-spec@1" } }, id: { schema: string },
+ id: { schema: string },
projection: { schema: projection }, expansion: { schema: object({ kind: { schema: { kind: "string", enum: ["one", "each"] } } }) },
presentation: { schema: mediaFramePresentationSchema }, motion: { schema: mediaLifecycleMotionSchema }, stackingOrder: { schema: integer },
sourceAudio: { schema: object({ fromLayer: { schema: string }, gain: { schema: unsigned } }), optional: true },
});
const sourceAudio = object({ fromLayer: { schema: string }, gain: { schema: unsigned } });
export const mediaSequenceMemberSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-sequence-member-spec@1" } },
+
id: { schema: string },
sourceAudio: { schema: sourceAudio, optional: true },
});
@@ -217,7 +217,7 @@ const unresolvedMember = object({
sourceAudio: { schema: sourceAudio, optional: true },
});
export const mediaSequenceMemberSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-sequence-member-set@1" } },
+
members: { schema: { kind: "array", items: unresolvedMember } },
});
const direction = { kind: "string", enum: ["left", "right", "up", "down"] } as const;
@@ -228,10 +228,10 @@ const handoffFields = {
direction: { schema: direction, optional: true }, audio: { schema: { kind: "string", enum: ["cut", "crossfade"] } },
} as const;
export const mediaHandoffSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-handoff-spec@1" } }, ...handoffFields,
+ ...handoffFields,
});
export const mediaSequenceSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-sequence-spec@1" } },
+
id: { schema: string }, presentation: { schema: mediaFramePresentationSchema },
motion: { schema: mediaLifecycleMotionSchema }, stackingOrder: { schema: integer },
handoffs: { schema: { kind: "array", minItems: 1, items: mediaHandoffSpecSchema } },
@@ -259,15 +259,15 @@ const resolvedSequence = object({
sounds: { schema: { kind: "array", items: soundEvent } },
});
export const mediaTrackSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-track-set@1" } }, items: { schema: { kind: "array", items: resolvedItem } },
+ items: { schema: { kind: "array", items: resolvedItem } },
sequences: { schema: { kind: "array", items: resolvedSequence } },
});
export const mediaTrackProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-track-program@1" } }, id: { schema: string },
+ id: { schema: string },
items: { schema: { kind: "array", items: resolvedItem } }, sequences: { schema: { kind: "array", items: resolvedSequence } },
});
export const mediaTrackHeaderSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.media-track-header@1" } }, id: { schema: string },
+ id: { schema: string },
});
const validator = (digest: ReturnType<typeof digestOf>) => ({
diff --git a/packages/media-track/src/program.ts b/packages/media-track/src/program.ts
index d9378736..723ebb70 100644
--- a/packages/media-track/src/program.ts
+++ b/packages/media-track/src/program.ts
@@ -146,7 +146,6 @@ function assertSound(value: MediaSoundSource, label: string): void {
}
export function assertMediaItemSpec(value: MediaItemSpec): void {
- assert(value.contract === "svml.media-item-spec@1", "Unsupported MediaItemSpec contract.");
assertMediaIdentity(value.id, "MediaItemSpec.id");
assertPoint(value.projection.start, "MediaItemSpec.projection.start");
assertPoint(value.projection.end, "MediaItemSpec.projection.end");
@@ -171,16 +170,15 @@ export function sealMediaTrackHeader(value: MediaTrackHeader): MediaTrackHeader
}
export function assertMediaTrackHeader(value: MediaTrackHeader): void {
- assert(value.contract === "svml.media-track-header@1", "Unsupported MediaTrackHeader contract.");
assertMediaIdentity(value.id, "MediaTrackHeader.id");
}
export function createMediaTrackSet(): MediaTrackSet {
- return { contract: "svml.media-track-set@1", items: [], sequences: [] };
+ return { items: [], sequences: [] };
}
export function assertMediaTrackSet(value: MediaTrackSet): void {
- assert(value.contract === "svml.media-track-set@1" && Array.isArray(value.items)
+ assert(Array.isArray(value.items)
&& Array.isArray(value.sequences), "MediaTrackSet is invalid.");
}
@@ -334,7 +332,7 @@ function assertItem(item: MediaItemProgram, space: ProgramSpace, label: string):
`${label}.motion contains an unresolved Canvas origin.`);
assert(Number.isSafeInteger(item.stacking.order) && item.stacking.tieBreak.length > 0, `${label}.stacking is invalid.`);
assert(item.layers.length > 0, `${label} requires layers.`);
- const layerSet: MediaLayerSet = { contract: "svml.media-layer-set@1", layers: item.layers };
+ const layerSet: MediaLayerSet = { layers: item.layers };
assertMediaLayerSet(layerSet);
for (const layer of item.layers) if (layer.kind === "sample") assertSampleLayerForSpace(layer, space, `${label}.${layer.id}`);
if (item.sourceAudio !== undefined) {
@@ -342,7 +340,7 @@ function assertItem(item: MediaItemProgram, space: ProgramSpace, label: string):
assert(selected?.kind === "sample" && selected.source.kind === "timed" && selected.source.audio !== undefined,
`${label}.sourceAudio is invalid.`);
}
- assertMediaSoundSet({ contract: "svml.media-sound-set@1", sounds: item.sounds });
+ assertMediaSoundSet({ sounds: item.sounds });
assert(!item.sounds.some((sound) => sound.trigger.kind === "handoff"), `${label} owns a Handoff sound.`);
}
@@ -447,7 +445,7 @@ function assertSequence(sequence: MediaSequenceProgram, space: ProgramSpace, lab
assert(member.visualSpan.startFrame <= member.logicalSpan.startFrame
&& member.visualSpan.endFrameExclusive >= member.logicalSpan.endFrameExclusive,
`${label}.members.${index}.visualSpan does not contain its logical phase.`);
- const layerSet: MediaLayerSet = { contract: "svml.media-layer-set@1", layers: member.layers };
+ const layerSet: MediaLayerSet = { layers: member.layers };
assertMediaLayerSet(layerSet);
for (const layer of member.layers) if (layer.kind === "sample") {
assertSampleLayerForSpace(layer, space, `${label}.members.${index}.${layer.id}`);
@@ -459,14 +457,14 @@ function assertSequence(sequence: MediaSequenceProgram, space: ProgramSpace, lab
}
}
for (const [index, handoff] of sequence.handoffs.entries()) {
- assertMediaHandoffSpec({ ...handoff, contract: "svml.media-handoff-spec@1" });
+ assertMediaHandoffSpec(handoff);
assert(handoff.fromMemberId === sequence.members[index]!.id
&& handoff.toMemberId === sequence.members[index + 1]!.id
&& handoff.span.startFrame <= sequence.members[index]!.logicalSpan.endFrameExclusive
&& handoff.span.endFrameExclusive >= sequence.members[index + 1]!.logicalSpan.startFrame,
`${label}.handoffs.${index} is disconnected.`);
}
- assertMediaSoundSet({ contract: "svml.media-sound-set@1", sounds: sequence.sounds });
+ assertMediaSoundSet({ sounds: sequence.sounds });
for (const sound of sequence.sounds) {
if (sound.trigger.kind === "handoff") {
const { handoffId } = sound.trigger;
@@ -478,7 +476,7 @@ function assertSequence(sequence: MediaSequenceProgram, space: ProgramSpace, lab
function normalizeProgram(value: MediaTrackProgram): MediaTrackProgram {
return {
- contract: "svml.media-track-program@1",
+
id: value.id,
items: [...value.items].map((item) => structuredClone(item)).sort((left, right) => left.id.localeCompare(right.id)),
sequences: [...value.sequences].map((item) => structuredClone(item)).sort((left, right) => left.id.localeCompare(right.id)),
@@ -496,7 +494,7 @@ export function finalizeMediaTrack(set: MediaTrackSet, header: MediaTrackHeader,
assertMediaTrackHeader(header);
assert(set.items.length + set.sequences.length > 0, "Media Track requires at least one Item or Sequence.");
return sealMediaTrackProgram({
- contract: "svml.media-track-program@1",
+
id: header.id,
items: set.items,
sequences: set.sequences,
@@ -504,7 +502,6 @@ export function finalizeMediaTrack(set: MediaTrackSet, header: MediaTrackHeader,
}
export function assertMediaTrackProgram(value: MediaTrackProgram): void {
- assert(value.contract === "svml.media-track-program@1", "Unsupported MediaTrackProgram contract.");
assertMediaIdentity(value.id, "MediaTrackProgram.id");
assert(Array.isArray(value.items) && Array.isArray(value.sequences)
&& value.items.length + value.sequences.length > 0, "MediaTrackProgram is empty.");
diff --git a/packages/media-track/src/sequence.ts b/packages/media-track/src/sequence.ts
index d60455e6..bfe07435 100644
--- a/packages/media-track/src/sequence.ts
+++ b/packages/media-track/src/sequence.ts
@@ -51,7 +51,6 @@ function finite(value: number, label: string): void {
}
export function assertMediaSequenceMemberSpec(value: MediaSequenceMemberSpec): void {
- assert(value.contract === "svml.media-sequence-member-spec@1", "Unsupported MediaSequenceMemberSpec contract.");
assertMediaIdentity(value.id, "MediaSequenceMemberSpec.id");
if (value.sourceAudio !== undefined) {
assertMediaIdentity(value.sourceAudio.fromLayer, "MediaSequenceMemberSpec.sourceAudio.fromLayer");
@@ -67,11 +66,11 @@ export function sealMediaSequenceMemberSpec(value: MediaSequenceMemberSpec): Med
}
export function createMediaSequenceMemberSet(): MediaSequenceMemberSet {
- return { contract: "svml.media-sequence-member-set@1", members: [] };
+ return { members: [] };
}
export function assertMediaSequenceMemberSet(value: MediaSequenceMemberSet): void {
- assert(value.contract === "svml.media-sequence-member-set@1" && Array.isArray(value.members),
+ assert(Array.isArray(value.members),
"MediaSequenceMemberSet is invalid.");
const ids = new Set<string>();
for (const member of value.members) {
@@ -80,7 +79,7 @@ export function assertMediaSequenceMemberSet(value: MediaSequenceMemberSet): voi
ids.add(member.id);
assert(Number.isSafeInteger(member.activationFrame) && member.activationFrame >= 0,
`Media Sequence member ${member.id} activation is invalid.`);
- assertMediaLayerSet({ contract: "svml.media-layer-set@1", layers: member.layers });
+ assertMediaLayerSet({ layers: member.layers });
}
}
@@ -103,7 +102,7 @@ export function appendMediaSequenceMember(
`Media Sequence member ${spec.id} source-audio layer is absent or silent.`);
}
return canonicalize({
- contract: "svml.media-sequence-member-set@1",
+
members: [...set.members, {
id: spec.id,
activationFrame,
@@ -151,7 +150,6 @@ export function appendMediaSequenceSelectionMember(
}
export function assertMediaHandoffSpec(value: MediaHandoffSpec): void {
- assert(value.contract === "svml.media-handoff-spec@1", "Unsupported MediaHandoffSpec contract.");
assertMediaIdentity(value.id, "MediaHandoffSpec.id");
assertMediaIdentity(value.fromMemberId, "MediaHandoffSpec.fromMemberId");
assertMediaIdentity(value.toMemberId, "MediaHandoffSpec.toMemberId");
@@ -178,7 +176,6 @@ export function sealMediaHandoffSpec(value: MediaHandoffSpec): MediaHandoffSpec
}
export function assertMediaSequenceSpec(value: MediaSequenceSpec): void {
- assert(value.contract === "svml.media-sequence-spec@1", "Unsupported MediaSequenceSpec contract.");
assertMediaIdentity(value.id, "MediaSequenceSpec.id");
assertMediaFramePresentation(value.presentation, "MediaSequenceSpec.presentation");
assert(Number.isSafeInteger(value.stackingOrder), "MediaSequenceSpec.stackingOrder must be an integer.");
diff --git a/packages/media-track/src/sounds.ts b/packages/media-track/src/sounds.ts
index e592c4cd..f962b71e 100644
--- a/packages/media-track/src/sounds.ts
+++ b/packages/media-track/src/sounds.ts
@@ -10,7 +10,6 @@ function assert(condition: unknown, message: string): asserts condition {
}
export function assertMediaSoundSpec(value: MediaSoundSpec): void {
- assert(value.contract === "svml.media-sound-spec@1", "Unsupported MediaSoundSpec contract.");
assertMediaIdentity(value.id, "MediaSoundSpec.id");
assert(value.trigger.kind === "enter" || value.trigger.kind === "exit" || value.trigger.kind === "handoff",
"MediaSoundSpec.trigger is invalid.");
@@ -27,15 +26,15 @@ export function sealMediaSoundSpec(value: MediaSoundSpec): MediaSoundSpec {
}
export function createMediaSoundSet(): MediaSoundSet {
- return { contract: "svml.media-sound-set@1", sounds: [] };
+ return { sounds: [] };
}
export function assertMediaSoundSet(value: MediaSoundSet): void {
- assert(value.contract === "svml.media-sound-set@1" && Array.isArray(value.sounds),
+ assert(Array.isArray(value.sounds),
"MediaSoundSet is invalid.");
const ids = new Set<string>();
for (const sound of value.sounds) {
- assertMediaSoundSpec({ contract: "svml.media-sound-spec@1", id: sound.id, trigger: sound.trigger, gain: sound.gain });
+ assertMediaSoundSpec({ id: sound.id, trigger: sound.trigger, gain: sound.gain });
assert(!ids.has(sound.id), `MediaSoundSet repeats ${sound.id}.`);
ids.add(sound.id);
assert(sound.source.artifact.kind === "blob" && sound.source.artifact.mediaType.startsWith("audio/")
@@ -56,7 +55,7 @@ export function appendMediaSound(
assert(media.audio !== undefined, `Media sound ${spec.id} requires normalized audio.`);
assert(!set.sounds.some((sound) => sound.id === spec.id), `MediaSoundSet already contains ${spec.id}.`);
const result = {
- contract: "svml.media-sound-set@1" as const,
+
sounds: [...set.sounds, {
id: spec.id,
trigger: structuredClone(spec.trigger),
diff --git a/packages/media-track/src/surface.ts b/packages/media-track/src/surface.ts
index bf0e2d06..c51a4d7f 100644
--- a/packages/media-track/src/surface.ts
+++ b/packages/media-track/src/surface.ts
@@ -711,7 +711,7 @@ function sound(
const sourceName = `${soundSuffix}-source`;
const id = optionalText(element, "id") ?? `${trackId}.${soundSuffix}`;
state.addRecord(specName, `${trackId}.${soundSuffix}.spec`, mediaTrackTypes.soundSpec,
- sealMediaSoundSpec({ contract: "svml.media-sound-spec@1", id, trigger, gain: numberValue(element, "gain", 1) }), element.range);
+ sealMediaSoundSpec({ id, trigger, gain: numberValue(element, "gain", 1) }), element.range);
state.addReference(sourceName, reference(element.attributes.source, `${element.name}.source`, mediaTypes.synchronized, resolve));
return { sourceName, specName };
}
@@ -724,7 +724,7 @@ export const decodeMediaTrackSurface: StructuredSurfaceHandler = ({ element, res
state.addReference("canvas", reference(element.attributes.canvas, `${element.name}.canvas`, spatialTypes.canvas, resolveReference));
const headerId = `${trackId}.header`;
state.addRecord("header", headerId, mediaTrackTypes.header,
- sealMediaTrackHeader({ contract: "svml.media-track-header@1", id: trackId }), element.range);
+ sealMediaTrackHeader({ id: trackId }), element.range);
const items: FragmentItem[] = [];
const sequences: FragmentSequence[] = [];
let itemIndex = 0;
@@ -834,7 +834,7 @@ export const decodeMediaTrackSurface: StructuredSurfaceHandler = ({ element, res
if (selectedAudio !== undefined) hasAudio = true;
const specName = `${unitSuffix}-spec`;
state.addRecord(specName, `${trackId}.${unitSuffix}.spec`, mediaTrackTypes.memberSpec,
- sealMediaSequenceMemberSpec({ contract: "svml.media-sequence-member-spec@1", id: memberIds[index]!,
+ sealMediaSequenceMemberSpec({ id: memberIds[index]!,
...(selectedAudio === undefined ? {} : { sourceAudio: selectedAudio }) }), member.range);
const sourceName = `${unitSuffix}-${binding === "moment" ? "moment" : "selection"}`;
state.addReference(sourceName, at);
diff --git a/packages/media-track/src/types.ts b/packages/media-track/src/types.ts
index eecf4c26..51879c90 100644
--- a/packages/media-track/src/types.ts
+++ b/packages/media-track/src/types.ts
@@ -110,14 +110,12 @@ export type MediaSampleLayerProgram = {
export type MediaLayerProgram = MediaPaintLayerProgram | MediaSampleLayerProgram;
export type MediaPaintLayerSpec = {
- readonly contract: "svml.media-paint-layer-spec@1";
readonly id: string;
readonly paint: MediaPaint;
readonly opacity: number;
};
export type MediaSampleLayerSpec = {
- readonly contract: "svml.media-sample-layer-spec@1";
readonly id: string;
readonly trim?: MediaVisualTrim;
readonly occupancy?: MediaVisualOccupancy;
@@ -126,7 +124,6 @@ export type MediaSampleLayerSpec = {
};
export type MediaLayerSet = {
- readonly contract: "svml.media-layer-set@1";
readonly layers: readonly MediaLayerProgram[];
};
@@ -200,18 +197,16 @@ export type MediaSoundTrigger =
| { readonly kind: "handoff"; readonly handoffId: string };
export type MediaSoundSpec = {
- readonly contract: "svml.media-sound-spec@1";
readonly id: string;
readonly trigger: MediaSoundTrigger;
readonly gain: number;
};
-export type MediaSoundEvent = Omit<MediaSoundSpec, "contract"> & {
+export type MediaSoundEvent = MediaSoundSpec & {
readonly source: MediaSoundSource;
};
export type MediaSoundSet = {
- readonly contract: "svml.media-sound-set@1";
readonly sounds: readonly MediaSoundEvent[];
};
@@ -221,7 +216,6 @@ export type MediaAbsoluteStacking = {
};
export type MediaItemSpec = {
- readonly contract: "svml.media-item-spec@1";
readonly id: string;
readonly projection: TemporalWindowProjection;
readonly expansion: OccurrenceExpansion;
@@ -267,13 +261,11 @@ export type MediaSequenceMemberProgram = {
};
export type MediaSequenceMemberSpec = {
- readonly contract: "svml.media-sequence-member-spec@1";
readonly id: string;
readonly sourceAudio?: MediaSourceAudioProjection;
};
export type MediaSequenceMemberSet = {
- readonly contract: "svml.media-sequence-member-set@1";
readonly members: readonly {
readonly id: string;
readonly activationFrame: number;
@@ -283,11 +275,9 @@ export type MediaSequenceMemberSet = {
};
export type MediaHandoffSpec = Omit<MediaHandoffProgram, "span"> & {
- readonly contract: "svml.media-handoff-spec@1";
};
export type MediaSequenceSpec = {
- readonly contract: "svml.media-sequence-spec@1";
readonly id: string;
readonly presentation: MediaFramePresentation;
readonly motion: MediaLifecycleMotion;
@@ -309,19 +299,16 @@ export type MediaSequenceProgram = {
};
export type MediaTrackProgram = {
- readonly contract: "svml.media-track-program@1";
readonly id: string;
readonly items: readonly MediaItemProgram[];
readonly sequences: readonly MediaSequenceProgram[];
};
export type MediaTrackHeader = {
- readonly contract: "svml.media-track-header@1";
readonly id: string;
};
export type MediaTrackSet = {
- readonly contract: "svml.media-track-set@1";
readonly items: readonly MediaItemProgram[];
readonly sequences: readonly MediaSequenceProgram[];
};
diff --git a/packages/media-track/test/media-track.test.ts b/packages/media-track/test/media-track.test.ts
index 72975e83..63b87565 100644
--- a/packages/media-track/test/media-track.test.ts
+++ b/packages/media-track/test/media-track.test.ts
@@ -76,7 +76,7 @@ const canvas = {
yDirection: "down" as const,
pixelAspect: "square" as const,
};
-const header = sealMediaTrackHeader({ contract: "svml.media-track-header@1", id: "proof" });
+const header = sealMediaTrackHeader({ id: "proof" });
const source: BlobRef = {
kind: "blob",
digest: digestOf("media-track:still"),
@@ -99,7 +99,7 @@ const appearance = {
function itemSpec(overrides: Partial<MediaItemSpec> = {}): MediaItemSpec {
return sealMediaItemSpec({
- contract: "svml.media-item-spec@1",
+
id: "product",
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
expansion: { kind: "one" },
@@ -118,7 +118,7 @@ function itemSpec(overrides: Partial<MediaItemSpec> = {}): MediaItemSpec {
function stillLayers(): MediaLayerSet {
let layers = createMediaLayerSet();
layers = appendMediaPaintLayer(layers, sealMediaPaintLayerSpec({
- contract: "svml.media-paint-layer-spec@1",
+
id: "backing",
paint: { kind: "linear-gradient", angleDeg: 90, stops: [
{ offset: 0, color: "#101010" }, { offset: 1, color: "#303030" },
@@ -126,7 +126,7 @@ function stillLayers(): MediaLayerSet {
opacity: 1,
}));
layers = appendStillMediaLayer(layers, source, extent, fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1",
+
id: "content",
appearance,
}));
@@ -153,7 +153,7 @@ function timed(id = "timed", withAudio = true): SynchronizedMedia {
function timedLayers(id: string, withAudio = true): MediaLayerSet {
return appendTimedMediaLayer(createMediaLayerSet(), timed(id, withAudio), fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1",
+
id: "video",
occupancy: { mode: "loop", align: "start" },
appearance,
@@ -167,7 +167,7 @@ function sequenceMembers(
let members = createMediaSequenceMemberSet();
for (const [index, activationFrame] of activations.entries()) {
members = appendMediaSequenceMember(members, layerFactory(index), sealMediaSequenceMemberSpec({
- contract: "svml.media-sequence-member-spec@1",
+
id: `member-${index + 1}`,
sourceAudio: { fromLayer: "video", gain: 1 - (index * 0.1) },
}), activationFrame);
@@ -177,7 +177,7 @@ function sequenceMembers(
function sequenceSpec(overrides: Partial<MediaSequenceSpec> = {}): MediaSequenceSpec {
return sealMediaSequenceSpec({
- contract: "svml.media-sequence-spec@1",
+
id: "steps",
presentation: itemSpec().presentation,
motion: {
@@ -188,11 +188,11 @@ function sequenceSpec(overrides: Partial<MediaSequenceSpec> = {}): MediaSequence
stackingOrder: 50,
handoffs: [
sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1", id: "one-two", fromMemberId: "member-1", toMemberId: "member-2",
+ id: "one-two", fromMemberId: "member-1", toMemberId: "member-2",
operator: "crossfade", durationFrames: 20, boundaryRatio: 0.5, audio: "crossfade",
}),
sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1", id: "two-three", fromMemberId: "member-2", toMemberId: "member-3",
+ id: "two-three", fromMemberId: "member-2", toMemberId: "member-3",
operator: "push", durationFrames: 20, boundaryRatio: 0.5, direction: "left", audio: "cut",
}),
],
@@ -209,7 +209,7 @@ function sequenceSounds() {
["exit-sound", { kind: "exit" as const }],
] as const) {
sounds = appendMediaSound(sounds, timed(`sfx-${id}`), sealMediaSoundSpec({
- contract: "svml.media-sound-spec@1", id, trigger, gain: 0.5,
+ id, trigger, gain: 0.5,
}));
}
return sounds;
@@ -261,12 +261,12 @@ test("an owned clip path is an explicit Media input and lowers only over the Ite
test("self-blur is two explicit samples of one Artifact and Artifact collection deduplicates bytes", () => {
let layers = createMediaLayerSet();
layers = appendStillMediaLayer(layers, source, extent, { ...fit, sizing: "cover" }, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "blurred", appearance: {
+ id: "blurred", appearance: {
opacity: 1, filter: { blurPx: 24, brightness: 0.7, contrast: 1, saturation: 0.8 },
},
}));
layers = appendStillMediaLayer(layers, source, extent, fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "foreground", appearance,
+ id: "foreground", appearance,
}));
const track = projectMediaVisualTrack(space, finalizeMediaTrack(appendProgramMediaItem(
createMediaTrackSet(), header, space, canvas, layers, frame, itemSpec(), createMediaSoundSet(),
@@ -288,7 +288,7 @@ test("self-blur is two explicit samples of one Artifact and Artifact collection
test("timed layer trim/hold, lifecycle and sampling motion remain separate wrapper channels", () => {
let layers = createMediaLayerSet();
layers = appendTimedMediaLayer(layers, timed(), fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1",
+
id: "video",
trim: { startFrame: 10, endFrameExclusive: 40 },
occupancy: { mode: "hold", align: "start" },
@@ -332,7 +332,7 @@ test("timed layer trim/hold, lifecycle and sampling motion remain separate wrapp
test("source audio and edge SFX project separately from the visual Track", () => {
let layers = createMediaLayerSet();
layers = appendTimedMediaLayer(layers, timed("audio"), fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1",
+
id: "video",
trim: { startFrame: 10, endFrameExclusive: 40 },
occupancy: { mode: "hold", align: "end" },
@@ -340,10 +340,10 @@ test("source audio and edge SFX project separately from the visual Track", () =>
}));
let sounds = createMediaSoundSet();
sounds = appendMediaSound(sounds, timed("sfx-enter"), sealMediaSoundSpec({
- contract: "svml.media-sound-spec@1", id: "enter-sound", trigger: { kind: "enter" }, gain: 0.5,
+ id: "enter-sound", trigger: { kind: "enter" }, gain: 0.5,
}));
sounds = appendMediaSound(sounds, timed("sfx-exit"), sealMediaSoundSpec({
- contract: "svml.media-sound-spec@1", id: "exit-sound", trigger: { kind: "exit" }, gain: 0.25,
+ id: "exit-sound", trigger: { kind: "exit" }, gain: 0.25,
}));
const program = finalizeMediaTrack(appendProgramMediaItem(createMediaTrackSet(), header, space, canvas, layers, frame, itemSpec({
sourceAudio: { fromLayer: "video", gain: 0.75 },
@@ -412,10 +412,10 @@ test("still and animated typed Surfaces use the same layer law without browser f
timing: { kind: "frames", frameRate: { numerator: 30, denominator: 1 }, frameCount: 30 },
};
let layers = appendSurfaceMediaLayer(createMediaLayerSet(), still, fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "still", appearance,
+ id: "still", appearance,
}));
layers = appendSurfaceMediaLayer(layers, animated, fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "animated", occupancy: { mode: "loop", align: "start" }, appearance,
+ id: "animated", occupancy: { mode: "loop", align: "start" }, appearance,
}));
const elements = projectMediaVisualTrack(space, finalizeMediaTrack(appendProgramMediaItem(
createMediaTrackSet(), header, space, canvas, layers, frame, itemSpec(), createMediaSoundSet(),
@@ -425,7 +425,7 @@ test("still and animated typed Surfaces use the same layer law without browser f
assert.equal(moving?.kind, "surface");
assert.ok(moving?.kind === "surface" && moving.sampling !== undefined);
const defaulted = appendSurfaceMediaLayer(createMediaLayerSet(), animated, fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "defaulted", appearance,
+ id: "defaulted", appearance,
}));
assert.deepEqual(defaulted.layers[0]?.kind === "sample" ? defaulted.layers[0].occupancy : undefined,
{ mode: "once", align: "start" });
@@ -587,7 +587,7 @@ test("every documented Media frame and fit remains one ordinary Item instead of
const layers = appendStillMediaLayer(createMediaLayerSet(), source,
{ widthPx: index % 3 === 0 ? 400 : index % 3 === 1 ? 1200 : 800,
heightPx: index % 3 === 0 ? 1200 : index % 3 === 1 ? 400 : 800 },
- localFit, sealMediaSampleLayerSpec({ contract: "svml.media-sample-layer-spec@1", id: `sample-${index}`, appearance }));
+ localFit, sealMediaSampleLayerSpec({ id: `sample-${index}`, appearance }));
set = appendProgramMediaItem(set, header, space, canvas, layers, frames[index % frames.length]!, itemSpec({
id: `fit-${sizing}`, stackingOrder: 100 + index,
presentation: { clip: { kind: "none" }, padding: { topPx: 0, rightPx: 0, bottomPx: 0, leftPx: 0 }, shadows: [] },
@@ -607,17 +607,17 @@ test("transparent, Paint, self-blur and alternate-source backing are only ordere
const alternate: BlobRef = { kind: "blob", digest: digestOf("media-track:alternate"), size: 2_048, mediaType: "image/webp" };
let layers = createMediaLayerSet();
layers = appendMediaPaintLayer(layers, sealMediaPaintLayerSpec({
- contract: "svml.media-paint-layer-spec@1", id: "solid", paint: { kind: "solid", color: "#101018" }, opacity: 1,
+ id: "solid", paint: { kind: "solid", color: "#101018" }, opacity: 1,
}));
layers = appendStillMediaLayer(layers, source, extent, { ...fit, sizing: "cover" }, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "self-blur", appearance: {
+ id: "self-blur", appearance: {
opacity: 1, filter: { blurPx: 32, brightness: 0.7, contrast: 1.1, saturation: 0.8 },
},
}));
layers = appendStillMediaLayer(layers, alternate, { ...extent, widthPx: 1200, heightPx: 600 }, { ...fit, sizing: "cover" },
- sealMediaSampleLayerSpec({ contract: "svml.media-sample-layer-spec@1", id: "alternate", appearance }));
+ sealMediaSampleLayerSpec({ id: "alternate", appearance }));
layers = appendStillMediaLayer(layers, source, extent, fit,
- sealMediaSampleLayerSpec({ contract: "svml.media-sample-layer-spec@1", id: "foreground", appearance }));
+ sealMediaSampleLayerSpec({ id: "foreground", appearance }));
const track = projectMediaVisualTrack(space, finalizeMediaTrack(appendProgramMediaItem(
createMediaTrackSet(), header, space, canvas, layers, frame, itemSpec(), createMediaSoundSet(),
), header, space));
@@ -631,7 +631,7 @@ test("transparent, Paint, self-blur and alternate-source backing are only ordere
const transparent = projectMediaVisualTrack(space, finalizeMediaTrack(appendProgramMediaItem(
createMediaTrackSet(), header, space, canvas,
appendStillMediaLayer(createMediaLayerSet(), source, extent, fit,
- sealMediaSampleLayerSpec({ contract: "svml.media-sample-layer-spec@1", id: "only", appearance })),
+ sealMediaSampleLayerSpec({ id: "only", appearance })),
frame, itemSpec(), createMediaSoundSet(),
), header, space));
assert.equal(transparent.presents[0]!.elements.some((element) =>
@@ -810,7 +810,7 @@ test("Sequence handoffs accept still, timed and alpha Surface members through on
width: 200, height: 300, colorSpace: "srgb", alphaMode: "straight", timing: { kind: "still" },
};
const surfaceLayers = () => appendSurfaceMediaLayer(createMediaLayerSet(), alphaSurface, fit, sealMediaSampleLayerSpec({
- contract: "svml.media-sample-layer-spec@1", id: "surface", appearance,
+ id: "surface", appearance,
}));
for (const pair of [
[stillLayers(), stillLayers()],
@@ -819,10 +819,10 @@ test("Sequence handoffs accept still, timed and alpha Surface members through on
[surfaceLayers(), stillLayers()],
] as const) {
let members = createMediaSequenceMemberSet();
- members = appendMediaSequenceMember(members, pair[0], sealMediaSequenceMemberSpec({ contract: "svml.media-sequence-member-spec@1", id: "a" }), 0);
- members = appendMediaSequenceMember(members, pair[1], sealMediaSequenceMemberSpec({ contract: "svml.media-sequence-member-spec@1", id: "b" }), 60);
+ members = appendMediaSequenceMember(members, pair[0], sealMediaSequenceMemberSpec({ id: "a" }), 0);
+ members = appendMediaSequenceMember(members, pair[1], sealMediaSequenceMemberSpec({ id: "b" }), 60);
const spec = sequenceSpec({ motion: { sustain: [] }, handoffs: [sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1", id: "a-b", fromMemberId: "a", toMemberId: "b",
+ id: "a-b", fromMemberId: "a", toMemberId: "b",
operator: "crossfade", durationFrames: 10, boundaryRatio: 0.5, audio: "cut",
})] });
const program = finalizeMediaTrack(appendMediaSequence(createMediaTrackSet(), header, space, canvas,
@@ -861,7 +861,7 @@ test("every Sequence handoff operator and boundary ratio lowers without changing
for (const boundaryRatio of [0, 0.5, 1]) {
const durationFrames = operator === "cut" ? 0 : 20;
const handoff = sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1",
+
id: `${operator}-${boundaryRatio}`,
fromMemberId: "member-1",
toMemberId: "member-2",
@@ -889,7 +889,7 @@ test("every Sequence handoff operator and boundary ratio lowers without changing
const spec = sequenceSpec({
motion: { sustain: [] },
handoffs: [sealMediaHandoffSpec({
- contract: "svml.media-handoff-spec@1",
+
id: `duration-${durationFrames}`,
fromMemberId: "member-1",
toMemberId: "member-2",
@@ -922,14 +922,14 @@ test("Sequence fails atomically on malformed order, topology, envelope and three
assert.throws(() => appendMediaSequence(
createMediaTrackSet(), header, space, canvas, sequenceMembers([0, 40, 70]), frame,
sequenceSpec({ handoffs: [
- sealMediaHandoffSpec({ contract: "svml.media-handoff-spec@1", id: "wide-one", fromMemberId: "member-1", toMemberId: "member-2", operator: "crossfade", durationFrames: 40, boundaryRatio: 0.5, audio: "cut" }),
- sealMediaHandoffSpec({ contract: "svml.media-handoff-spec@1", id: "wide-two", fromMemberId: "member-2", toMemberId: "member-3", operator: "crossfade", durationFrames: 40, boundaryRatio: 0.5, audio: "cut" }),
+ sealMediaHandoffSpec({ id: "wide-one", fromMemberId: "member-1", toMemberId: "member-2", operator: "crossfade", durationFrames: 40, boundaryRatio: 0.5, audio: "cut" }),
+ sealMediaHandoffSpec({ id: "wide-two", fromMemberId: "member-2", toMemberId: "member-3", operator: "crossfade", durationFrames: 40, boundaryRatio: 0.5, audio: "cut" }),
] }), createMediaSoundSet(), 120,
), /overlapping Handoffs/u);
assert.throws(() => appendMediaSequence(
createMediaTrackSet(), header, space, canvas, sequenceMembers([0, 20]), frame,
sequenceSpec({ handoffs: [
- sealMediaHandoffSpec({ contract: "svml.media-handoff-spec@1", id: "outside", fromMemberId: "member-1", toMemberId: "member-2", operator: "wipe", durationFrames: 60, boundaryRatio: 1, direction: "left", audio: "cut" }),
+ sealMediaHandoffSpec({ id: "outside", fromMemberId: "member-1", toMemberId: "member-2", operator: "wipe", durationFrames: 60, boundaryRatio: 1, direction: "left", audio: "cut" }),
] }), createMediaSoundSet(), 120,
), /envelope/u);
});
diff --git a/packages/screen-overlay/src/manifest.ts b/packages/screen-overlay/src/manifest.ts
index 0626e749..11f70206 100644
--- a/packages/screen-overlay/src/manifest.ts
+++ b/packages/screen-overlay/src/manifest.ts
@@ -57,7 +57,7 @@ const component: ValueSchema = { kind: "oneOf", variants: [
object({ kind: { schema: { kind: "literal", value: "tv-static" } }, amount: { schema: nonNegative }, noiseSizePx: { schema: nonNegative }, scanLineOpacity: { schema: nonNegative }, motionRatePxPerFrame: { schema: number }, seed: { schema: unsignedInteger } }),
] };
const itemSpec = object({
- contract: { schema: { kind: "literal", value: "svml.screen-overlay-item-spec@1" } }, id: { schema: string },
+ id: { schema: string },
content: { schema: component }, projection: { schema: projection },
expansion: { schema: object({ kind: { schema: { kind: "string", enum: ["one", "each"] } } }) },
stackingOrder: { schema: integer },
@@ -67,10 +67,10 @@ const item = object({
id: { schema: string }, span: { schema: frameSpan }, content: { schema: component },
stacking: { schema: object({ order: { schema: integer }, tieBreak: { schema: string } }) },
});
-export const screenOverlayHeaderSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.screen-overlay-header@1" } }, id: { schema: string } });
+export const screenOverlayHeaderSchema: ValueSchema = object({ id: { schema: string } });
export const screenOverlayItemSpecSchema: ValueSchema = itemSpec;
-export const screenOverlaySetSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.screen-overlay-set@1" } }, items: { schema: { kind: "array", items: item } } });
-export const screenOverlayProgramSchema: ValueSchema = object({ contract: { schema: { kind: "literal", value: "svml.screen-overlay-program@1" } }, id: { schema: string }, items: { schema: { kind: "array", minItems: 1, items: item } } });
+export const screenOverlaySetSchema: ValueSchema = object({ items: { schema: { kind: "array", items: item } } });
+export const screenOverlayProgramSchema: ValueSchema = object({ id: { schema: string }, items: { schema: { kind: "array", minItems: 1, items: item } } });
export const screenOverlaySurfaceImplementationDigest = digestOf("@narratage/screen-overlay/track-surface@1");
const validator = (digest: ReturnType<typeof digestOf>) => ({ implementation: { digest } });
const appendInputs = [{ name: "set", type: screenOverlayTypes.set }, { name: "header", type: screenOverlayTypes.header }, { name: "space", type: programSpaceTypes.programSpace }, { name: "spec", type: screenOverlayTypes.itemSpec }] as const;
diff --git a/packages/screen-overlay/src/program.ts b/packages/screen-overlay/src/program.ts
index 5cb2af0d..a906067c 100644
--- a/packages/screen-overlay/src/program.ts
+++ b/packages/screen-overlay/src/program.ts
@@ -104,20 +104,19 @@ export function sealScreenOverlayHeader(value: ScreenOverlayHeader): ScreenOverl
assertScreenOverlayHeader(value); return canonicalize(value) as unknown as ScreenOverlayHeader;
}
export function assertScreenOverlayHeader(value: ScreenOverlayHeader): void {
- assert(value.contract === "svml.screen-overlay-header@1", "Unsupported ScreenOverlayHeader contract."); identity(value.id, "ScreenOverlayHeader.id");
+ identity(value.id, "ScreenOverlayHeader.id");
}
export function sealScreenOverlayItemSpec(value: ScreenOverlayItemSpec): ScreenOverlayItemSpec {
assertScreenOverlayItemSpec(value); return canonicalize(value) as unknown as ScreenOverlayItemSpec;
}
export function assertScreenOverlayItemSpec(value: ScreenOverlayItemSpec): void {
- assert(value.contract === "svml.screen-overlay-item-spec@1", "Unsupported ScreenOverlayItemSpec contract.");
identity(value.id, "ScreenOverlayItemSpec.id"); assertScreenOverlayComponent(value.content);
assert(value.expansion.kind === "one" || value.expansion.kind === "each", "ScreenOverlay expansion is invalid.");
assert(Number.isSafeInteger(value.stackingOrder), "ScreenOverlay stacking order must be an integer.");
}
-export function createScreenOverlaySet(): ScreenOverlaySet { return { contract: "svml.screen-overlay-set@1", items: [] }; }
+export function createScreenOverlaySet(): ScreenOverlaySet { return { items: [] }; }
export function assertScreenOverlaySet(value: ScreenOverlaySet): void {
- assert(value.contract === "svml.screen-overlay-set@1" && Array.isArray(value.items), "ScreenOverlaySet is invalid.");
+ assert(Array.isArray(value.items), "ScreenOverlaySet is invalid.");
}
function realized(
@@ -133,7 +132,7 @@ function realized(
} satisfies ScreenOverlayItemProgram));
const ids = new Set(set.items.map((item) => item.id));
additions.forEach((item) => { assert(!ids.has(item.id), `Screen Overlay already contains Item ${item.id}.`); ids.add(item.id); });
- return { contract: "svml.screen-overlay-set@1", items: [...set.items, ...additions] };
+ return { items: [...set.items, ...additions] };
}
export function appendProgramScreenOverlay(set: ScreenOverlaySet, header: ScreenOverlayHeader, space: ProgramSpace, spec: ScreenOverlayItemSpec): ScreenOverlaySet {
assert(spec.expansion.kind === "one", `Program Overlay ${spec.id} must use one occurrence.`);
@@ -146,16 +145,15 @@ export function appendMomentScreenOverlay(set: ScreenOverlaySet, header: ScreenO
return realized(set, header, spec, projectMomentWindows({ itemId: spec.id, map, moment, space, expansion: spec.expansion, projection: spec.projection }));
}
export function sealScreenOverlayProgram(value: ScreenOverlayProgram): ScreenOverlayProgram {
- const normalized = { contract: "svml.screen-overlay-program@1" as const, id: value.id,
+ const normalized = { id: value.id,
items: [...value.items].map((item) => structuredClone(item)).sort((a, b) => a.id.localeCompare(b.id)) };
assertScreenOverlayProgram(normalized); return canonicalize(normalized) as unknown as ScreenOverlayProgram;
}
export function finalizeScreenOverlay(set: ScreenOverlaySet, header: ScreenOverlayHeader): ScreenOverlayProgram {
assertScreenOverlaySet(set); assertScreenOverlayHeader(header); assert(set.items.length > 0, "Screen Overlay requires at least one Item.");
- return sealScreenOverlayProgram({ contract: "svml.screen-overlay-program@1", id: header.id, items: set.items });
+ return sealScreenOverlayProgram({ id: header.id, items: set.items });
}
export function assertScreenOverlayProgram(value: ScreenOverlayProgram): void {
- assert(value.contract === "svml.screen-overlay-program@1", "Unsupported ScreenOverlayProgram contract.");
identity(value.id, "ScreenOverlayProgram.id"); assert(value.items.length > 0, "ScreenOverlayProgram requires Items.");
const ids = new Set<string>();
for (const item of value.items) {
diff --git a/packages/screen-overlay/src/surface.ts b/packages/screen-overlay/src/surface.ts
index 66a895d0..5224bfce 100644
--- a/packages/screen-overlay/src/surface.ts
+++ b/packages/screen-overlay/src/surface.ts
@@ -113,7 +113,7 @@ export const decodeScreenOverlaySurface: StructuredSurfaceHandler = ({ element,
const canvas = ref(element.attributes.canvas, `${element.name}.canvas`, spatialTypes.canvas, resolveReference);
const space = ref(element.attributes.space, `${element.name}.space`, programSpaceTypes.programSpace, resolveReference);
const headerId = `${id}.header`; const records: SurfaceRecordDraft[] = [{ id: headerId, type: screenOverlayTypes.header,
- value: { kind: "inline", value: sealScreenOverlayHeader({ contract: "svml.screen-overlay-header@1", id }) }, range: element.range }];
+ value: { kind: "inline", value: sealScreenOverlayHeader({ id }) }, range: element.range }];
const fragmentItems: Parameters<typeof createScreenOverlayFragment>[0][number][] = [];
const inputs: Record<string, typeof canvas.ref> = { canvas: canvas.ref, header: { kind: "record", id: headerId }, space: space.ref };
let index = 0;
@@ -123,7 +123,7 @@ export const decodeScreenOverlaySurface: StructuredSurfaceHandler = ({ element,
index += 1; const suffix = String(index).padStart(4, "0"); const decoded = content(child);
allowed(child, ["id", "z", ...TIMING, ...decoded.attributes]); const temporal = binding(child, resolveReference);
const occurrences = text(child, "occurrences", "one"); if (occurrences !== "one" && occurrences !== "each") throw new Error(`${child.name}.occurrences is invalid.`);
- const itemSpec = sealScreenOverlayItemSpec({ contract: "svml.screen-overlay-item-spec@1",
+ const itemSpec = sealScreenOverlayItemSpec({
id: optionalText(child, "id") ?? `${id}.${decoded.value.kind}.${suffix}`, content: decoded.value,
projection: temporal.projection, expansion: { kind: occurrences }, stackingOrder: integer(child, "z") });
const specId = `${id}.item.${suffix}.spec`; const specName = `item-${suffix}-spec`;
diff --git a/packages/screen-overlay/src/types.ts b/packages/screen-overlay/src/types.ts
index f0465cb4..5647ff41 100644
--- a/packages/screen-overlay/src/types.ts
+++ b/packages/screen-overlay/src/types.ts
@@ -50,21 +50,20 @@ export type ScreenOverlayComponent =
| WhipVeilOverlay | GlitchVeilOverlay | GrainOverlay | LightLeakOverlay | BokehOverlay | TvStaticOverlay;
export type ScreenOverlayItemSpec = {
- readonly contract: "svml.screen-overlay-item-spec@1";
readonly id: string;
readonly content: ScreenOverlayComponent;
readonly projection: TemporalWindowProjection;
readonly expansion: OccurrenceExpansion;
readonly stackingOrder: number;
};
-export type ScreenOverlayHeader = { readonly contract: "svml.screen-overlay-header@1"; readonly id: string };
+export type ScreenOverlayHeader = { readonly id: string };
export type ScreenOverlayItemProgram = {
readonly id: string; readonly span: FrameSpan;
readonly content: ScreenOverlayComponent;
readonly stacking: { readonly order: number; readonly tieBreak: string };
};
-export type ScreenOverlaySet = { readonly contract: "svml.screen-overlay-set@1"; readonly items: readonly ScreenOverlayItemProgram[] };
+export type ScreenOverlaySet = { readonly items: readonly ScreenOverlayItemProgram[] };
export type ScreenOverlayProgram = {
- readonly contract: "svml.screen-overlay-program@1"; readonly id: string;
+ readonly id: string;
readonly items: readonly ScreenOverlayItemProgram[];
};
diff --git a/packages/screen-overlay/test/screen-overlay.test.ts b/packages/screen-overlay/test/screen-overlay.test.ts
index b0dfd6a1..a4f7827a 100644
--- a/packages/screen-overlay/test/screen-overlay.test.ts
+++ b/packages/screen-overlay/test/screen-overlay.test.ts
@@ -43,7 +43,7 @@ const canvas = sealCanvasSpace({
const space = sealProgramSpace({
durationSec: 2, frameRate: { numerator: 30, denominator: 1 },
});
-const header = sealScreenOverlayHeader({ contract: "svml.screen-overlay-header@1", id: "screen" });
+const header = sealScreenOverlayHeader({ id: "screen" });
const components: readonly ScreenOverlayComponent[] = [
{ kind: "flash", color: "#ffffff", intensity: 0.9, attackFrames: 2, holdFrames: 3, decayFrames: 5 },
{ kind: "color-wash", color: "#2244ff", opacity: 0.2 },
@@ -60,7 +60,7 @@ const components: readonly ScreenOverlayComponent[] = [
function trackFor(content: ScreenOverlayComponent, stackingOrder = 50) {
const spec = sealScreenOverlayItemSpec({
- contract: "svml.screen-overlay-item-spec@1", id: content.kind,
+ id: content.kind,
content, projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
expansion: { kind: "one" }, stackingOrder,
});
@@ -120,7 +120,7 @@ test("the package has no lower-composite, sibling Track, backdrop-filter or hidd
assert.deepEqual(fragment.inputs.map((input) => input.name), ["canvas", "header", "space", "spec"]);
assert.equal(fragment.exports.some((output) => output.type.name === "AudioTrack"), false);
assert.throws(() => sealScreenOverlayItemSpec({
- contract: "svml.screen-overlay-item-spec@1", id: "blur",
+ id: "blur",
content: { kind: "gaussian-blur" } as unknown as ScreenOverlayComponent,
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
expansion: { kind: "one" }, stackingOrder: 1,
diff --git a/packages/speech-spine/src/manifest.ts b/packages/speech-spine/src/manifest.ts
index abf91fdc..79d44cbd 100644
--- a/packages/speech-spine/src/manifest.ts
+++ b/packages/speech-spine/src/manifest.ts
@@ -52,13 +52,13 @@ const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema;
const frameRate = object({ numerator: { schema: integer }, denominator: { schema: integer } });
export const speechSpineProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.speech-spine-program@1" } },
+
id: { schema: string },
frameRate: { schema: frameRate },
});
export const speechSpineSetSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.speech-spine-set@1" } },
+
takes: { schema: { kind: "array", items: object({
segment: { schema: narrativeExcerptSchema },
media: { schema: synchronizedMediaSchema },
@@ -71,7 +71,7 @@ export const speechSpineSetSchema: ValueSchema = object({
});
export const speechSpineVisualSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.speech-spine-visual-spec@1" } },
+
stackingOrder: { schema: { kind: "number", integer: true } },
});
diff --git a/packages/speech-spine/src/program.ts b/packages/speech-spine/src/program.ts
index c5c86ce0..3eb92906 100644
--- a/packages/speech-spine/src/program.ts
+++ b/packages/speech-spine/src/program.ts
@@ -33,7 +33,7 @@ function assert(condition: unknown, message: string): asserts condition {
function programContent(value: SpeechSpineProgram): SpeechSpineProgram {
return {
- contract: "svml.speech-spine-program@1",
+
id: value.id,
frameRate: { ...value.frameRate },
};
@@ -44,7 +44,6 @@ export function sealSpeechSpineProgram(value: SpeechSpineProgram): SpeechSpinePr
}
export function assertSpeechSpineProgram(value: SpeechSpineProgram): void {
- assert(value.contract === "svml.speech-spine-program@1", "Unsupported SpeechSpineProgram contract");
assert(value.id.trim().length > 0, "SpeechSpineProgram id must not be empty");
assert(Number.isSafeInteger(value.frameRate.numerator) && value.frameRate.numerator > 0
&& Number.isSafeInteger(value.frameRate.denominator) && value.frameRate.denominator > 0,
@@ -61,7 +60,7 @@ function verifyExcerpt(value: NarrativeExcerpt): void {
function setContent(value: SpeechSpineSet): SpeechSpineSet {
return canonicalize({
- contract: "svml.speech-spine-set@1",
+
takes: value.takes,
}) as unknown as SpeechSpineSet;
}
@@ -94,12 +93,10 @@ export function sealSpeechSpineVisualSpec(value: SpeechSpineVisualSpec): SpeechS
}
export function assertSpeechSpineVisualSpec(value: SpeechSpineVisualSpec): void {
- assert(value.contract === "svml.speech-spine-visual-spec@1", "Unsupported SpeechSpineVisualSpec contract");
assert(Number.isSafeInteger(value.stackingOrder), "SpeechSpineVisualSpec stacking order is invalid");
}
export function assertSpeechSpineSet(value: SpeechSpineSet): void {
- assert(value.contract === "svml.speech-spine-set@1", "Unsupported SpeechSpineSet contract");
const segments = new Set<string>();
for (const take of value.takes) {
verifyExcerpt(take.segment);
@@ -111,7 +108,7 @@ export function assertSpeechSpineSet(value: SpeechSpineSet): void {
export function createSpeechSpineSet(): SpeechSpineSet {
return sealSpeechSpineSet({
- contract: "svml.speech-spine-set@1",
+
takes: [],
});
}
@@ -126,7 +123,7 @@ function appendTake(
assertTake(take, program);
assert(!set.takes.some((item) => item.segment.id === take.segment.id), `Speech Spine repeats Segment ${take.segment.id}`);
return sealSpeechSpineSet({
- contract: "svml.speech-spine-set@1",
+
takes: [...set.takes, take],
});
}
diff --git a/packages/speech-spine/src/surface.ts b/packages/speech-spine/src/surface.ts
index f88eeb75..925f629f 100644
--- a/packages/speech-spine/src/surface.ts
+++ b/packages/speech-spine/src/surface.ts
@@ -199,7 +199,7 @@ export const decodeSpeechSpineSurface: StructuredSurfaceHandler = ({ element, re
const videoRequestId = `${id}.selection.video`;
const audioRequestId = `${id}.selection.audio`;
const program = sealSpeechSpineProgram({
- contract: "svml.speech-spine-program@1",
+
id,
frameRate: rate,
});
@@ -263,7 +263,7 @@ export const decodeSpeechSpineSurface: StructuredSurfaceHandler = ({ element, re
id: `${id}.${take.visual.visualSpecName}`,
type: speechSpineTypes.visualSpec,
value: { kind: "inline" as const, value: sealSpeechSpineVisualSpec({
- contract: "svml.speech-spine-visual-spec@1",
+
stackingOrder: take.visual.stackingOrder,
}) },
range: take.range,
diff --git a/packages/speech-spine/src/types.ts b/packages/speech-spine/src/types.ts
index 7c8b1ee2..bff9bb5d 100644
--- a/packages/speech-spine/src/types.ts
+++ b/packages/speech-spine/src/types.ts
@@ -4,7 +4,6 @@ import type { ContentFit, SpatialFrame } from "@narratage/spatial";
/** Author-owned policy for one ordered Speech Spine. */
export type SpeechSpineProgram = {
- readonly contract: "svml.speech-spine-program@1";
readonly id: string;
readonly frameRate: {
readonly numerator: number;
@@ -23,7 +22,6 @@ export type SpeechSpineTake = {
};
export type SpeechSpineVisualSpec = {
- readonly contract: "svml.speech-spine-visual-spec@1";
readonly stackingOrder: number;
};
@@ -32,7 +30,6 @@ export type SpeechSpineVisualSpec = {
* only fixed-port append Operations for the concrete Spine declaration.
*/
export type SpeechSpineSet = {
- readonly contract: "svml.speech-spine-set@1";
readonly takes: readonly SpeechSpineTake[];
};
diff --git a/packages/speech-spine/test/program.test.ts b/packages/speech-spine/test/program.test.ts
index 7e1f568c..ffcf370b 100644
--- a/packages/speech-spine/test/program.test.ts
+++ b/packages/speech-spine/test/program.test.ts
@@ -45,7 +45,7 @@ function synchronized(id: string, visual: boolean): SynchronizedMedia {
test("audio Takes lengthen the speech program without inventing a visual clip", () => {
const program = sealSpeechSpineProgram({
- contract: "svml.speech-spine-program@1",
+
id: "speech",
frameRate: { numerator: 30, denominator: 1 },
});
@@ -58,7 +58,7 @@ test("audio Takes lengthen the speech program without inventing a visual clip",
segment("answer", 1),
frame,
fit,
- sealSpeechSpineVisualSpec({ contract: "svml.speech-spine-visual-spec@1", stackingOrder: 30 }),
+ sealSpeechSpineVisualSpec({ stackingOrder: 30 }),
);
const audio: TimelineAudio = {
artifact: { kind: "blob", digest: digestOf("speech:mix"), size: 1, mediaType: "audio/wav" },
diff --git a/packages/typography-track/src/manifest.ts b/packages/typography-track/src/manifest.ts
index ea6707bb..aaa282d7 100644
--- a/packages/typography-track/src/manifest.ts
+++ b/packages/typography-track/src/manifest.ts
@@ -109,7 +109,7 @@ const areaFlow = (() => {
})();
export const textStyleSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-style@1" } },
+
id: { schema: string }, stackingOrder: { schema: signedInteger },
typography: { schema: visualTextTypographySchema },
paints: { schema: { kind: "array", items: visualTextPaintSchema } },
@@ -124,7 +124,7 @@ export const textStyleSchema: ValueSchema = object({
});
export const textMotionSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-motion@1" } }, id: { schema: string },
+ id: { schema: string },
item: { schema: visualAnimation, optional: true },
sequences: { schema: { kind: "array", items: visualTextSequenceSchema } },
pathMargin: { schema: object({ keyframes: { schema: { kind: "array", minItems: 2, items: object({
@@ -139,15 +139,15 @@ const geometry: ValueSchema = { kind: "oneOf", variants: [
object({ kind: { schema: { kind: "literal", value: "path" } }, path: { schema: spatialPathSchema } }),
] };
export const textPlacementSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-placement@1" } }, geometry: { schema: geometry },
+ geometry: { schema: geometry },
});
export const textItemSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-item-spec@1" } }, id: { schema: string },
+ id: { schema: string },
document: { schema: visualTextDocumentSchema },
projection: { schema: projection }, expansion: { schema: expansion },
});
export const plainTextItemSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.plain-text-item-spec@1" } }, id: { schema: string },
+ id: { schema: string },
projection: { schema: projection }, expansion: { schema: expansion },
});
const span = object({ startFrame: { schema: integer }, endFrameExclusive: { schema: positiveInteger } });
@@ -157,13 +157,13 @@ const item = object({
tieBreak: { schema: string },
});
export const typographyTrackProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.typography-track-program@1" } }, id: { schema: string },
+ id: { schema: string },
items: { schema: { kind: "array", minItems: 1, items: item } },
});
-const typographyTrackHeaderSchema = object({ contract: { schema: { kind: "literal", value: "svml.typography-track-header@1" } }, id: { schema: string } });
-const typographyTrackSetSchema = object({ contract: { schema: { kind: "literal", value: "svml.typography-track-set@1" } }, items: { schema: { kind: "array", items: item } } });
+const typographyTrackHeaderSchema = object({ id: { schema: string } });
+const typographyTrackSetSchema = object({ items: { schema: { kind: "array", items: item } } });
const textMaskSpecSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-mask-spec@1" } },
+
id: { schema: string }, mode: { schema: enumString(["alpha", "luminance"]) },
materialFit: { schema: enumString(["contain", "cover", "fill"]) },
});
diff --git a/packages/typography-track/src/program.ts b/packages/typography-track/src/program.ts
index d4cbd63f..0493eb94 100644
--- a/packages/typography-track/src/program.ts
+++ b/packages/typography-track/src/program.ts
@@ -94,7 +94,6 @@ function assertDocument(document: TextItemSpec["document"], label: string): void
}
export function assertTextStyle(style: TextStyle): void {
- if (style.contract !== "svml.text-style@1") throw new Error("Unsupported TextStyle contract.");
nonEmpty(style.id, "TextStyle id");
if (!Number.isSafeInteger(style.stackingOrder)) throw new Error("TextStyle stackingOrder must be a safe integer.");
finite(style.typography.sizePx, "TextStyle typography size");
@@ -154,7 +153,6 @@ export function sealTextStyle(value: TextStyle): TextStyle {
}
export function assertTextMotion(motion: TextMotion): void {
- if (motion.contract !== "svml.text-motion@1") throw new Error("Unsupported TextMotion contract.");
nonEmpty(motion.id, "TextMotion id");
const ids = new Set<string>();
for (const sequence of motion.sequences) {
@@ -185,13 +183,12 @@ export function sealTextMotion(value: TextMotion): TextMotion {
}
export const stillTextMotion = (id = "still"): TextMotion => sealTextMotion({
- contract: "svml.text-motion@1",
+
id,
sequences: [],
});
export function assertTextItemSpec(value: TextItemSpec): void {
- if (value.contract !== "svml.text-item-spec@1") throw new Error("Unsupported TextItemSpec contract.");
nonEmpty(value.id, "TextItemSpec id");
assertDocument(value.document, `${value.id} document`);
}
@@ -203,7 +200,6 @@ export function sealTextItemSpec(value: TextItemSpec): TextItemSpec {
}
export function assertPlainTextItemSpec(value: PlainTextItemSpec): void {
- if (value.contract !== "svml.plain-text-item-spec@1") throw new Error("Unsupported PlainTextItemSpec contract.");
nonEmpty(value.id, "PlainTextItemSpec id");
}
@@ -218,7 +214,7 @@ export function materializePlainTextItem(spec: PlainTextItemSpec, content: Text)
verifyText(content);
if (!content.value.trim()) throw new Error("Typography plain Text content must not be empty.");
return sealTextItemSpec({
- contract: "svml.text-item-spec@1",
+
id: spec.id,
document: {
paragraphs: [{
@@ -232,7 +228,6 @@ export function materializePlainTextItem(spec: PlainTextItemSpec, content: Text)
}
export function assertTypographyTrackHeader(value: TypographyTrackHeader): void {
- if (value.contract !== "svml.typography-track-header@1") throw new Error("Unsupported TypographyTrackHeader contract.");
nonEmpty(value.id, "TypographyTrackHeader id");
}
@@ -250,7 +245,6 @@ function assertGeometry(geometry: TextGeometry): void {
}
export function assertTextPlacement(value: TextPlacement): void {
- if (value.contract !== "svml.text-placement@1") throw new Error("Unsupported TextPlacement contract.");
assertGeometry(value.geometry);
}
@@ -262,21 +256,20 @@ export function sealTextPlacement(value: TextPlacement): TextPlacement {
export function bindPointTextPlacement(point: SpatialPoint): TextPlacement {
assertSpatialPoint(point);
- return sealTextPlacement({ contract: "svml.text-placement@1", geometry: { kind: "point", point } });
+ return sealTextPlacement({ geometry: { kind: "point", point } });
}
export function bindAreaTextPlacement(frame: SpatialFrame): TextPlacement {
assertSpatialFrame(frame);
- return sealTextPlacement({ contract: "svml.text-placement@1", geometry: { kind: "area", frame } });
+ return sealTextPlacement({ geometry: { kind: "area", frame } });
}
export function bindPathTextPlacement(path: SpatialPath): TextPlacement {
assertSpatialPath(path);
- return sealTextPlacement({ contract: "svml.text-placement@1", geometry: { kind: "path", path } });
+ return sealTextPlacement({ geometry: { kind: "path", path } });
}
export function assertTypographyTrackSet(value: TypographyTrackSet): void {
- if (value.contract !== "svml.typography-track-set@1") throw new Error("Unsupported TypographyTrackSet contract.");
const ids = new Set<string>();
for (const item of value.items) {
if (ids.has(item.id)) throw new Error(`TypographyTrackSet repeats ${item.id}.`);
@@ -289,7 +282,7 @@ export function assertTypographyTrackSet(value: TypographyTrackSet): void {
}
export function createTypographyTrackSet(): TypographyTrackSet {
- return { contract: "svml.typography-track-set@1", items: [] };
+ return { items: [] };
}
function occurrenceItem(
@@ -331,7 +324,7 @@ function append(
const existing = new Set(set.items.map((item) => item.id));
const additions = occurrences.map((occurrence, index) => occurrenceItem(header, spec, style, motion, geometry, occurrence, index, occurrences.length));
if (additions.some((item) => existing.has(item.id))) throw new Error(`TypographyTrackSet already contains ${spec.id}.`);
- return { contract: "svml.typography-track-set@1", items: [...set.items, ...additions] };
+ return { items: [...set.items, ...additions] };
}
export function appendProgramTextItem(
@@ -391,7 +384,7 @@ export function appendMomentTextItem(
function programContent(value: TypographyTrackProgram): TypographyTrackProgram {
return {
- contract: "svml.typography-track-program@1",
+
id: value.id,
items: [...value.items].map((item) => structuredClone(item)).sort((left, right) =>
left.span.startFrame - right.span.startFrame
@@ -407,7 +400,6 @@ export function sealTypographyTrackProgram(value: TypographyTrackProgram): Typog
export function assertTypographyTrackProgramIdentity(program: TypographyTrackProgram, space: ProgramSpace): void {
assertProgramSpaceIdentity(space);
- if (program.contract !== "svml.typography-track-program@1") throw new Error("Unsupported TypographyTrackProgram contract.");
nonEmpty(program.id, "TypographyTrackProgram id");
if (program.items.length === 0) throw new Error("TypographyTrackProgram has no Items.");
const total = programSpaceFrameCount(space);
@@ -427,7 +419,6 @@ export function assertTypographyTrackProgramIdentity(program: TypographyTrackPro
}
export function assertTextMaskSpec(spec: TextMaskSpec): void {
- if (spec.contract !== "svml.text-mask-spec@1") throw new Error("Unsupported TextMaskSpec contract.");
nonEmpty(spec.id, "TextMaskSpec id");
if (!["alpha", "luminance"].includes(spec.mode)) throw new Error("TextMaskSpec mode is invalid.");
if (!["contain", "cover", "fill"].includes(spec.materialFit)) throw new Error("TextMaskSpec materialFit is invalid.");
@@ -443,7 +434,7 @@ export function finalizeTypographyTrack(header: TypographyTrackHeader, set: Typo
assertTypographyTrackHeader(header);
assertTypographyTrackSet(set);
if (set.items.length === 0) throw new Error("TypographyTrack requires at least one Item.");
- return sealTypographyTrackProgram({ contract: "svml.typography-track-program@1", id: header.id, items: set.items });
+ return sealTypographyTrackProgram({ id: header.id, items: set.items });
}
function baseBoxStyle(geometry: TextGeometry): VisualStyleDeclaration[] {
diff --git a/packages/typography-track/src/surface.ts b/packages/typography-track/src/surface.ts
index cc8e5023..fa0da528 100644
--- a/packages/typography-track/src/surface.ts
+++ b/packages/typography-track/src/surface.ts
@@ -407,7 +407,7 @@ export const decodeTypographyStyleSurface: StructuredSurfaceHandler = ({ element
throw new Error(`${element.name} requires at least one visible glyph Fill or Stroke.`);
}
const style = sealTextStyle({
- contract: "svml.text-style@1", id,
+ id,
stackingOrder: propNumber(value, "stack-order"),
typography: {
fonts,
@@ -529,7 +529,7 @@ export const decodeTypographyMotionSurface: StructuredSurfaceHandler = ({ elemen
});
}
const motion = sealTextMotion({
- contract: "svml.text-motion@1", id,
+ id,
...(itemKeyframes.length === 0 ? {} : { item: { keyframes: itemKeyframes } }),
sequences,
...(pathKeyframes.length === 0 ? {} : { pathMargin: { keyframes: pathKeyframes } }),
@@ -753,7 +753,7 @@ export const decodeTypographyTrackSurface: StructuredSurfaceHandler = ({ element
const headerId = `${id}.__header`;
const records: SurfaceRecordDraft[] = [{
id: headerId, type: typographyTrackTypes.header,
- value: { kind: "inline", value: sealTypographyTrackHeader({ contract: "svml.typography-track-header@1", id }) }, range: element.range,
+ value: { kind: "inline", value: sealTypographyTrackHeader({ id }) }, range: element.range,
}];
const defaultMotionId = `${id}.__still-motion`;
records.push({ id: defaultMotionId, type: typographyTrackTypes.motion, value: { kind: "inline", value: stillTextMotion(defaultMotionId) }, range: element.range });
@@ -804,11 +804,11 @@ export const decodeTypographyTrackSurface: StructuredSurfaceHandler = ({ element
if (content !== undefined) empty(child);
const spec = content === undefined
? sealTextItemSpec({
- contract: "svml.text-item-spec@1", id: itemId,
+ id: itemId,
document: document(child, resolveReference), projection: binding.projection, expansion,
})
: sealPlainTextItemSpec({
- contract: "svml.plain-text-item-spec@1", id: itemId,
+ id: itemId,
projection: binding.projection, expansion,
});
records.push({
@@ -882,7 +882,7 @@ export const decodeTypographyMaskSurface: StructuredSurfaceHandler = ({ element,
const material = reference(element.attributes.material, `${element.name}.material`, mediaTypes.compositableSurface, resolveReference);
const specId = `${id}.__spec`;
const spec = sealTextMaskSpec({
- contract: "svml.text-mask-spec@1", id,
+ id,
mode: enumText(element, "mode", ["alpha", "luminance"] as const, "alpha"),
materialFit: enumText(element, "fit", ["contain", "cover", "fill"] as const, "cover"),
});
diff --git a/packages/typography-track/src/types.ts b/packages/typography-track/src/types.ts
index 17a5e404..9e07ce4b 100644
--- a/packages/typography-track/src/types.ts
+++ b/packages/typography-track/src/types.ts
@@ -19,7 +19,6 @@ export type TextPaintLayer = VisualTextPaintLayer;
export type TextAreaFlow = Omit<VisualTextFlow, "form">;
export type TextStyle = {
- readonly contract: "svml.text-style@1";
readonly id: string;
readonly stackingOrder: number;
readonly typography: TextTypography;
@@ -41,7 +40,6 @@ export type TextStyle = {
};
export type TextMotion = {
- readonly contract: "svml.text-motion@1";
readonly id: string;
readonly item?: VisualAnimation;
readonly sequences: readonly VisualTextSequenceAnimation[];
@@ -60,12 +58,10 @@ export type TextGeometry =
| { readonly kind: "path"; readonly path: SpatialPath };
export type TextPlacement = {
- readonly contract: "svml.text-placement@1";
readonly geometry: TextGeometry;
};
export type TextItemSpec = {
- readonly contract: "svml.text-item-spec@1";
readonly id: string;
readonly document: TextDocument;
readonly projection: TemporalWindowProjection;
@@ -78,7 +74,6 @@ export type TextItemSpec = {
* TextItemSpec before temporal projection.
*/
export type PlainTextItemSpec = {
- readonly contract: "svml.plain-text-item-spec@1";
readonly id: string;
readonly projection: TemporalWindowProjection;
readonly expansion: OccurrenceExpansion;
@@ -95,7 +90,6 @@ export type TextItem = {
};
export type TypographyTrackProgram = {
- readonly contract: "svml.typography-track-program@1";
readonly id: string;
readonly items: readonly TextItem[];
};
@@ -106,18 +100,15 @@ export type TypographyTrackProgram = {
* never samples another Track or the final composite.
*/
export type TextMaskSpec = {
- readonly contract: "svml.text-mask-spec@1";
readonly id: string;
readonly mode: "alpha" | "luminance";
readonly materialFit: "contain" | "cover" | "fill";
};
export type TypographyTrackHeader = {
- readonly contract: "svml.typography-track-header@1";
readonly id: string;
};
export type TypographyTrackSet = {
- readonly contract: "svml.typography-track-set@1";
readonly items: readonly TextItem[];
};
diff --git a/packages/typography-track/test/typography-track.test.ts b/packages/typography-track/test/typography-track.test.ts
index 5b7c8316..90c4db8f 100644
--- a/packages/typography-track/test/typography-track.test.ts
+++ b/packages/typography-track/test/typography-track.test.ts
@@ -79,7 +79,7 @@ const exactTestSurface: CompositableSurfaceRef = {
function textStyle(id: string, stackingOrder = 50): TextStyle {
return sealTextStyle({
- contract: "svml.text-style@1",
+
id,
stackingOrder,
typography: {
@@ -154,7 +154,7 @@ function document(text: string) {
test("persistent and timed Text Items lower to ordinary VisualTrack Presents", () => {
const style = textStyle("editorial", 55);
const program = sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1",
+
id: "editorial-text",
items: [
{
@@ -205,7 +205,7 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
test("Text Mask explicitly consumes one authored Text Program and one owned still Surface", () => {
const program = sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1", id: "mask-shape",
+ id: "mask-shape",
items: [{
id: "mask-title",
span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "mask-title",
@@ -223,7 +223,7 @@ test("Text Mask explicitly consumes one authored Text Program and one owned stil
width: 800, height: 240, colorSpace: "srgb", alphaMode: "straight", timing: { kind: "still" },
};
const track = renderTextMaskTrack(space, program, material, sealTextMaskSpec({
- contract: "svml.text-mask-spec@1", id: "masked-title", mode: "alpha", materialFit: "cover",
+ id: "masked-title", mode: "alpha", materialFit: "cover",
}));
assert.equal(track.id, "masked-title");
assert.deepEqual(track.presents[0]?.elements.map((element) => element.kind), ["mask", "text", "surface"]);
@@ -239,7 +239,7 @@ test("Text Mask explicitly consumes one authored Text Program and one owned stil
...material, artifact: { ...material.artifact, mediaType: "video/webm" },
timing: { kind: "frames", frameCount: 150, frameRate: { numerator: 30, denominator: 1 } },
}, sealTextMaskSpec({
- contract: "svml.text-mask-spec@1", id: "timed-mask", mode: "alpha", materialFit: "cover",
+ id: "timed-mask", mode: "alpha", materialFit: "cover",
})), /requires one explicit still material Surface/u);
assert.throws(() => renderTextMaskTrack(space, sealTypographyTrackProgram({
...program,
@@ -249,13 +249,13 @@ test("Text Mask explicitly consumes one authored Text Program and one owned stil
style: { ...item.style, area: { ...item.style.area, overflow: "shrink", minimumScale: 0.7 } },
})),
}), material, sealTextMaskSpec({
- contract: "svml.text-mask-spec@1", id: "advanced-mask", mode: "alpha", materialFit: "cover",
+ id: "advanced-mask", mode: "alpha", materialFit: "cover",
})), /must be materialized by an independent package/u);
});
test("TypographyTrackProgram rejects a frame span outside ProgramSpace", () => {
const program = sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1",
+
id: "invalid-text",
items: [{
id: "late",
@@ -283,9 +283,9 @@ test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and
id: "callout",
occurrences: [{ occurrence: 1, startAnchorId: "selection:start", endAnchorId: "selection:end" }],
};
- const header = sealTypographyTrackHeader({ contract: "svml.typography-track-header@1", id: "selected-text" });
+ const header = sealTypographyTrackHeader({ id: "selected-text" });
const spec = sealTextItemSpec({
- contract: "svml.text-item-spec@1",
+
id: "meaning",
document: document("MEANING"),
projection: { start: { ref: "selection.start" }, end: { ref: "selection.end" } },
@@ -532,7 +532,7 @@ test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and
] } }],
});
const motion = sealTextMotion({
- contract: "svml.text-motion@1",
+
id: "sequenced",
item: { keyframes: [
{ atFrame: 0, style: [{ name: "opacity", value: 0 }, { name: "transform", value: "translateY(20px)" }] },
@@ -558,11 +558,11 @@ test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and
],
});
const pathMotion = sealTextMotion({
- contract: "svml.text-motion@1", id: "path-motion", sequences: [],
+ id: "path-motion", sequences: [],
pathMargin: { keyframes: [{ atFrame: 0, startMarginPx: 0 }, { atFrame: 180, startMarginPx: 120, easing: "ease-in-out" }] },
});
const track = renderTypographyTrack(space, sealTypographyTrackProgram({
- contract: "svml.typography-track-program@1",
+
id: "rich-text",
items: [
{