@onmark/cli 0.3.0 → 0.4.0

package/packages/runtime/dist/src/index.d.ts

@@ -5,9 +5,9 @@ export type { BrowserPlan, BrowserVideo } from "./generated/browser-request.js";
 export { runtimeFrameAt, type RuntimeFrame } from "./clock.js";
 export { videoFrameSelection, type RuntimeVideo, type VideoFrameSelection, } from "./media.js";
 export { DecodedVideo, materializedVideoSource, type BrowserVideoElement, type DecodedVideoOptions, } from "./video.js";
-export { MAX_PRESENTATION_EFFECTS, PresentationRuntimeAdapter, type ContainerPresentation, type FrameEffect, type OverlayPresentation, type PresentationBindings, type PresentationExtensions, type RuntimeOverlay, type RuntimeNode, type RuntimeScene, type RuntimeShot, type VideoPresentation, } from "./presentation.js";
+export { MAX_PRESENTATION_EFFECTS, PresentationRuntimeAdapter, type ContainerPresentation, type FrameEffect, type OverlayPresentation, type PresentationBindings, type PresentationExtensions, type RuntimeOverlay, type RuntimeNode, type RuntimeScene, type RuntimeShot, type RuntimeTransition, type TransitionPresentation, type VideoPresentation, } from "./presentation.js";
 export { MAX_PRESENTATION_RESOURCES, PRESENTATION_RESOURCE_KINDS, type PresentationResource, type PresentationResourceKind, } from "./resource.js";
 export { BUNDLE_ASSET_DIRECTORY, PRESENTATION_TEMPORAL_CAPABILITIES, type PresentationTemporalCapability, } from "./generated/bundle-layout.js";
-export { MAX_BROWSER_OVERLAYS, MAX_BROWSER_OVERLAY_TEXT_CHARACTERS, MAX_BROWSER_VIDEOS, MAX_FAILURE_MESSAGE_CHARACTERS, MAX_PENDING_RESOURCE_CHARACTERS, MAX_PENDING_RESOURCES, } from "./generated/runtime-contract.js";
+export { BROWSER_PROTOCOL_VERSION, MAX_BROWSER_OVERLAYS, MAX_BROWSER_OVERLAY_TEXT_CHARACTERS, MAX_BROWSER_VIDEOS, MAX_BROWSER_TRANSITIONS, MAX_FAILURE_MESSAGE_CHARACTERS, MAX_PENDING_RESOURCE_CHARACTERS, MAX_PENDING_RESOURCES, } from "./generated/runtime-contract.js";
 export { RUNTIME_HOST_NAME, installRuntimeHost, type RuntimeHost, } from "./host.js";
 export { RuntimeAdapterError, RuntimeSession, type RuntimeAdapter, type RuntimeAdapterFailureKind, type RuntimePlan, } from "./session.js";

package/packages/runtime/dist/src/index.js

@@ -7,6 +7,6 @@ export { DecodedVideo, materializedVideoSource, } from "./video.js";
 export { MAX_PRESENTATION_EFFECTS, PresentationRuntimeAdapter, } from "./presentation.js";
 export { MAX_PRESENTATION_RESOURCES, PRESENTATION_RESOURCE_KINDS, } from "./resource.js";
 export { BUNDLE_ASSET_DIRECTORY, PRESENTATION_TEMPORAL_CAPABILITIES, } from "./generated/bundle-layout.js";
-export { MAX_BROWSER_OVERLAYS, MAX_BROWSER_OVERLAY_TEXT_CHARACTERS, MAX_BROWSER_VIDEOS, MAX_FAILURE_MESSAGE_CHARACTERS, MAX_PENDING_RESOURCE_CHARACTERS, MAX_PENDING_RESOURCES, } from "./generated/runtime-contract.js";
+export { BROWSER_PROTOCOL_VERSION, MAX_BROWSER_OVERLAYS, MAX_BROWSER_OVERLAY_TEXT_CHARACTERS, MAX_BROWSER_VIDEOS, MAX_BROWSER_TRANSITIONS, MAX_FAILURE_MESSAGE_CHARACTERS, MAX_PENDING_RESOURCE_CHARACTERS, MAX_PENDING_RESOURCES, } from "./generated/runtime-contract.js";
 export { RUNTIME_HOST_NAME, installRuntimeHost, } from "./host.js";
 export { RuntimeAdapterError, RuntimeSession, } from "./session.js";

package/packages/runtime/dist/src/presentation.d.ts

@@ -11,6 +11,8 @@ export type RuntimeOverlay = RuntimePlan["overlays"][number];
 export type RuntimeScene = RuntimePlan["scenes"][number];
 /** Immutable shot container projected from Timeline IR. */
 export type RuntimeShot = RuntimePlan["shots"][number];
+/** Immutable transition relationship projected from Timeline IR. */
+export type RuntimeTransition = RuntimePlan["transitions"][number];
 /** Immutable film identity projected from Timeline IR. */
 export type RuntimeNode = RuntimePlan["film"];
 /** Presentation-owned effects for one semantic container. */
@@ -32,6 +34,13 @@ export interface OverlayPresentation {
     setVisible(visible: boolean): void;
     dispose(): void;
 }
+/** Presentation-owned binding between two adjacent shot elements. */
+export interface TransitionPresentation {
+    readonly element: HTMLElement;
+    readonly incomingElement: HTMLElement;
+    readonly outgoingElement: HTMLElement;
+    dispose(): void;
+}
 /** One paused browser effect driven exclusively by the authored frame. */
 export interface FrameEffect {
     /** Applies the exact frame before the runtime reports it as staged. */
@@ -50,6 +59,7 @@ export interface PresentationBindings {
     bindFilm(plan: RuntimePlan): ContainerPresentation;
     bindScene(scene: RuntimeScene): ContainerPresentation;
     bindShot(shot: RuntimeShot): ContainerPresentation;
+    bindTransition(transition: RuntimeTransition): TransitionPresentation;
     bindVideo(placement: RuntimeVideo): VideoPresentation;
     bindOverlay(placement: RuntimeOverlay): OverlayPresentation;
     bindExtensions(plan: RuntimePlan): Promise<PresentationExtensions>;

package/packages/runtime/dist/src/presentation.js

@@ -35,8 +35,10 @@ export class PresentationRuntimeAdapter {
         let boundStructure;
         const videos = [];
         const overlays = [];
+        const transitions = [];
         try {
             boundStructure = this.#bindStructure(plan, structure);
+            this.#bindTransitions(plan, transitions);
             this.#bindVideos(plan, videos);
             this.#bindOverlays(plan, overlays);
             const extensions = await this.#bindings.bindExtensions(plan);
@@ -51,7 +53,7 @@ export class PresentationRuntimeAdapter {
             await loadVideos(videos);
         }
         catch (error) {
-            const cleanupFailure = await releasePresentation(effects, resources, structure, videos, overlays);
+            const cleanupFailure = await releasePresentation(effects, resources, structure, transitions, videos, overlays);
             // A binding attempt may mutate author-owned state that generic cleanup
             // cannot prove reusable. A fresh page owns the only valid retry.
             this.#state = { kind: "disposed" };
@@ -63,6 +65,7 @@ export class PresentationRuntimeAdapter {
             frameRate: plan.frameRate,
             resources,
             structure: boundStructure,
+            transitions,
             videos,
             overlays,
         };
@@ -122,7 +125,7 @@ export class PresentationRuntimeAdapter {
             : undefined;
         this.#state = { kind: "disposed" };
         this.#staged = undefined;
-        const failure = await releasePresentation(loaded?.effects ?? [], loaded?.resources ?? [], loaded?.structure, loaded?.videos ?? [], loaded?.overlays ?? []);
+        const failure = await releasePresentation(loaded?.effects ?? [], loaded?.resources ?? [], loaded?.structure, loaded?.transitions ?? [], loaded?.videos ?? [], loaded?.overlays ?? []);
         if (failure !== undefined) {
             throw RuntimeAdapterError.fromUnknown(failure, "presentation cleanup failed");
         }
@@ -160,6 +163,11 @@ export class PresentationRuntimeAdapter {
             presentation.setVisible(false);
         }
     }
+    #bindTransitions(plan, transitions) {
+        for (const placement of plan.transitions) {
+            transitions.push(this.#bindings.bindTransition(placement));
+        }
+    }
     #bindOverlays(plan, overlays) {
         for (const placement of plan.overlays) {
             const presentation = this.#bindings.bindOverlay(placement);
@@ -293,7 +301,7 @@ function presentationLoadFailure(error, cleanupFailure) {
     }
     return RuntimeAdapterError.fromUnknown(error, "presentation failed to load");
 }
-async function releasePresentation(effects, resources, structure, videos, overlays) {
+async function releasePresentation(effects, resources, structure, transitions, videos, overlays) {
     let failure = await releaseFrameEffects(effects);
     const resourceFailure = await releasePresentationResources(resources);
     failure ??= resourceFailure;
@@ -305,10 +313,17 @@ async function releasePresentation(effects, resources, structure, videos, overla
         const releaseFailure = releaseOverlay(overlay);
         failure ??= releaseFailure;
     }
+    for (const transition of transitions.toReversed()) {
+        const releaseFailure = releaseTransition(transition);
+        failure ??= releaseFailure;
+    }
     const structureFailure = releaseStructure(structure);
     failure ??= structureFailure;
     return failure;
 }
+function releaseTransition(transition) {
+    return releaseAll([() => transition.dispose()]);
+}
 function releaseStructure(structure) {
     if (structure === undefined) {
         return undefined;

package/packages/runtime/dist/src/session.js

@@ -2,7 +2,7 @@
 // Owns command ordering and state while a narrow adapter owns browser effects;
 // this split keeps protocol behavior deterministic and directly testable.
 import { decodeBrowserResponse } from "./generated/codec.js";
-import { MAX_FAILURE_MESSAGE_CHARACTERS, MAX_PENDING_RESOURCE_CHARACTERS, MAX_PENDING_RESOURCES, } from "./generated/runtime-contract.js";
+import { BROWSER_PROTOCOL_VERSION, MAX_FAILURE_MESSAGE_CHARACTERS, MAX_PENDING_RESOURCE_CHARACTERS, MAX_PENDING_RESOURCES, } from "./generated/runtime-contract.js";
 import { runtimeFrameAt } from "./clock.js";
 import { exactRatioIsCanonical, videoSourceMappingIsValid } from "./media.js";
 /** Expected failure reported by a browser adapter. */
@@ -157,7 +157,11 @@ export class RuntimeSession {
     }
 }
 function response(requestId, event) {
-    return decodeBrowserResponse({ version: 3, requestId, event });
+    return decodeBrowserResponse({
+        version: BROWSER_PROTOCOL_VERSION,
+        requestId,
+        event,
+    });
 }
 function invalidRequest(requestId, message) {
     return response(requestId, {
@@ -217,6 +221,7 @@ function planViolation(plan) {
     }
     if (!hasCanonicalNodeOrder(plan.scenes) ||
         !hasCanonicalNodeOrder(plan.shots) ||
+        !hasCanonicalNodeOrder(plan.transitions) ||
         !hasCanonicalNodeOrder(plan.videos) ||
         !hasCanonicalNodeOrder(plan.overlays)) {
         return "plan node collection is not in canonical order";
@@ -238,7 +243,7 @@ function planViolation(plan) {
         }
         sceneIntervals.set(scene.node.nodeId, scene.interval);
     }
-    const shotIntervals = new Map();
+    const shots = new Map();
     for (const shot of plan.shots) {
         const nodeViolation = claimNode(shot.node, nodeIds, authoredIds);
         if (nodeViolation !== undefined) {
@@ -254,21 +259,35 @@ function planViolation(plan) {
         if (!insideInterval(shot.interval, sceneInterval)) {
             return "plan shot interval falls outside its scene";
         }
-        shotIntervals.set(shot.node.nodeId, shot.interval);
+        shots.set(shot.node.nodeId, {
+            interval: shot.interval,
+            order: shots.size,
+            sceneId: shot.sceneId,
+        });
+    }
+    for (const transition of plan.transitions) {
+        const nodeViolation = claimNode(transition.node, nodeIds, authoredIds);
+        if (nodeViolation !== undefined) {
+            return nodeViolation;
+        }
+        const relationViolation = transitionRelationViolation(transition, shots, plan);
+        if (relationViolation !== undefined) {
+            return relationViolation;
+        }
     }
     for (const video of plan.videos) {
         const nodeViolation = claimNode(video.node, nodeIds, authoredIds);
         if (nodeViolation !== undefined) {
             return nodeViolation;
         }
-        const shotInterval = shotIntervals.get(video.shotId);
-        if (shotInterval === undefined) {
+        const shot = shots.get(video.shotId);
+        if (shot === undefined) {
             return "plan video names an unknown shot";
         }
         if (!insideEvaluation(video.interval, plan.evaluation)) {
             return "plan video interval falls outside evaluation";
         }
-        if (!insideInterval(video.interval, shotInterval)) {
+        if (!insideInterval(video.interval, shot.interval)) {
             return "plan video interval falls outside its shot";
         }
         if (!videoSourceMappingIsValid(video, plan.frameRate)) {
@@ -280,7 +299,7 @@ function planViolation(plan) {
         if (nodeViolation !== undefined) {
             return nodeViolation;
         }
-        const parentViolation = overlayParentViolation(overlay, shotIntervals);
+        const parentViolation = overlayParentViolation(overlay, shots);
         if (parentViolation !== undefined) {
             return parentViolation;
         }
@@ -293,6 +312,26 @@ function planViolation(plan) {
     }
     return undefined;
 }
+function transitionRelationViolation(transition, shots, plan) {
+    const outgoing = shots.get(transition.outgoingShotId);
+    const incoming = shots.get(transition.incomingShotId);
+    if (outgoing === undefined ||
+        incoming === undefined ||
+        incoming.order !== outgoing.order + 1 ||
+        outgoing.sceneId !== incoming.sceneId) {
+        return "plan transition does not connect adjacent projected shots";
+    }
+    if (!validPlacement(transition.interval, plan.timeline, plan.evaluation)) {
+        return "plan transition interval is invalid for this evaluation";
+    }
+    if (!insideInterval(transition.interval, outgoing.interval) ||
+        !insideInterval(transition.interval, incoming.interval) ||
+        transition.interval.start !== incoming.interval.start ||
+        transition.interval.end !== outgoing.interval.end) {
+        return "plan transition interval does not match its adjacent shot boundary";
+    }
+    return undefined;
+}
 function hasDenseNodeIdentity(identities) {
     for (let expected = 0; expected < identities.size; expected += 1) {
         if (!identities.has(expected)) {
@@ -311,7 +350,7 @@ function hasCanonicalNodeOrder(entries) {
     }
     return true;
 }
-function overlayParentViolation(overlay, shotIntervals) {
+function overlayParentViolation(overlay, shots) {
     if (overlay.kind === "caption") {
         return overlay.shotId === undefined || overlay.shotId === null
             ? undefined
@@ -320,11 +359,11 @@ function overlayParentViolation(overlay, shotIntervals) {
     if (overlay.shotId === undefined || overlay.shotId === null) {
         return "plan overlay names an unknown shot";
     }
-    const shotInterval = shotIntervals.get(overlay.shotId);
-    if (shotInterval === undefined) {
+    const shot = shots.get(overlay.shotId);
+    if (shot === undefined) {
         return "plan overlay names an unknown shot";
     }
-    if (!insideInterval(overlay.interval, shotInterval)) {
+    if (!insideInterval(overlay.interval, shot.interval)) {
         return "plan overlay interval falls outside its shot";
     }
     return undefined;
@@ -372,6 +411,7 @@ function snapshotPlan(plan) {
     const film = snapshotNode(plan.film);
     const scenes = Object.freeze(plan.scenes.map(snapshotScene));
     const shots = Object.freeze(plan.shots.map(snapshotShot));
+    const transitions = Object.freeze(plan.transitions.map(snapshotTransition));
     const videos = Object.freeze(plan.videos.map(snapshotVideo));
     const overlays = Object.freeze(plan.overlays.map(snapshotOverlay));
     return Object.freeze({
@@ -383,10 +423,19 @@ function snapshotPlan(plan) {
         film,
         scenes,
         shots,
+        transitions,
         videos,
         overlays,
     });
 }
+function snapshotTransition(transition) {
+    return Object.freeze({
+        incomingShotId: transition.incomingShotId,
+        interval: Object.freeze({ ...transition.interval }),
+        node: snapshotNode(transition.node),
+        outgoingShotId: transition.outgoingShotId,
+    });
+}
 function snapshotScene(scene) {
     return Object.freeze({
         node: snapshotNode(scene.node),

package/packages/runtime/dist/src/types.d.ts

@@ -2,5 +2,5 @@ export type { RuntimeFrame } from "./clock.js";
 export type { RuntimeVideo } from "./media.js";
 export type { PresentationFrameBehavior, PresentationTemporalCapability, PresentationVisualCapability, } from "./generated/bundle-layout.js";
 export type { RuntimePlan } from "./session.js";
-export type { ContainerPresentation, FrameEffect, OverlayPresentation, PresentationBindings, PresentationExtensions, RuntimeOverlay, RuntimeNode, RuntimeScene, RuntimeShot, VideoPresentation, } from "./presentation.js";
+export type { ContainerPresentation, FrameEffect, OverlayPresentation, PresentationBindings, PresentationExtensions, RuntimeOverlay, RuntimeNode, RuntimeScene, RuntimeShot, RuntimeTransition, TransitionPresentation, VideoPresentation, } from "./presentation.js";
 export type { PresentationResource, PresentationResourceKind, } from "./resource.js";