framefields 2.4.2 → 2.4.3

package/dist/{program-C2cJayA1.mjs → program-KwDdbC0-.mjs}

@@ -1,6 +1,6 @@
-import { Ht as parseCssGradient, Rt as mixColors, Vt as parseCssColor, ht as createVirtualMedia, l as Color, wt as getActiveMediaMetadata } from "./dist-ClyC_d66.mjs";
-import { t as ColorSchema } from "./dist-SB9qfAko.mjs";
-import { Mt as KineticMarqueeConfigSchema, Nn as signalRegistry, Yt as TextPathOptionsSchema, gt as AETextAnimatorSchema, nn as TypewriterAnimatorSchema, vt as AdvancedTextAnimatorSchema } from "./dist-CspOG4V1.mjs";
+import { $t as parseCssGradient, Kt as mixColors, Ot as getActiveMediaMetadata, Qt as parseCssColor, gt as createVirtualMedia, l as Color, ut as assertNever, y as Effect } from "./dist-TrtLGPvc.mjs";
+import { t as ColorSchema } from "./dist-Bo2_zeCn.mjs";
+import { Mt as KineticMarqueeConfigSchema, Nn as signalRegistry, Yt as TextPathOptionsSchema, gt as AETextAnimatorSchema, nn as TypewriterAnimatorSchema, vt as AdvancedTextAnimatorSchema } from "./dist-hmWTJPik.mjs";
 import { z } from "zod";
 import { loadYoga } from "yoga-layout/load";
 
@@ -57,7 +57,13 @@ function dirOf(node) {
 		case "flex": return node.dir ?? "row";
 		case "block": return "column";
 		case "box": return node.children && node.children.length > 0 ? "column" : null;
-		default: return null;
+		case "text":
+		case "media":
+		case "shape":
+		case "camera":
+		case "light":
+		case "model3d": return null;
+		default: return assertNever(node);
 	}
 }
 /** Container default width spec (block fills like HTML). */
@@ -164,7 +170,7 @@ function buildYogaNode(yoga, layoutNode, parentExtent, measure, parentDir) {
 		const measured = measure?.(node) ?? null;
 		if (measured) {
 			const hasRatio = node.aspectRatio !== void 0;
-			const isCaption = node.dataType === "Caption";
+			const isCaption = node.kind === "media" && node.dataType === "Caption";
 			const intrinsicRatio = measured.height > 0 ? measured.width / measured.height : 1;
 			if (node.kind === "media" && !isCaption && !hasRatio) yn.setAspectRatio(intrinsicRatio);
 			const isWAuto = wSpec === void 0 || wSpec === "auto" || wSpec === "fit";
@@ -591,12 +597,13 @@ var LayerAnimation = class LayerAnimation$1 {
 		const ease = parseEase(options.ease);
 		let track = this.tracks.find((t) => t.prop === prop && (!t.source || t.source.type === "keyframe"));
 		if (!track) {
-			track = {
+			const newTrack = {
 				id: `${prop}_fromTo_${this.tracks.length}`,
 				prop,
 				keyframes: []
 			};
-			this.tracks.push(track);
+			this.tracks.push(newTrack);
+			track = newTrack;
 		}
 		const id = track.id;
 		if (track.keyframes.length === 0 && start > 0) track.keyframes.push({
@@ -624,12 +631,13 @@ var LayerAnimation = class LayerAnimation$1 {
 	keyframe(prop, frame, value, ease) {
 		let track = this.tracks.find((t) => t.prop === prop && (!t.source || t.source.type === "keyframe"));
 		if (!track) {
-			track = {
+			const newTrack = {
 				id: `${prop}_track_${this.tracks.length}`,
 				prop,
 				keyframes: []
 			};
-			this.tracks.push(track);
+			this.tracks.push(newTrack);
+			track = newTrack;
 		}
 		const parsedEase = parseEase(ease);
 		const kf = {
@@ -1027,13 +1035,18 @@ var LayerAnimation = class LayerAnimation$1 {
 		return this;
 	}
 	static merge(...anims) {
-		return new LayerAnimation$1().merge(...anims);
+		const result = new LayerAnimation$1();
+		result.tracks = mergeAnimationTracks(anims.flatMap((o) => o.tracks));
+		return result;
 	}
 	/**
 	* Returns the validated LayerAnimation specification object.
 	*/
 	toSpec() {
-		return { tracks: this.tracks };
+		return {
+			tracks: this.tracks,
+			...this.frameStep !== void 0 && { frameStep: this.frameStep }
+		};
 	}
 	toJSON() {
 		return this.toSpec();
@@ -2143,6 +2156,21 @@ function hoistOne(owner) {
 function hoistMattes(nodes) {
 	return nodes.flatMap((n) => hoistOne(n));
 }
+/**
+* Compositor program document v2 — THE single source of truth for a
+* composition (spec: `nodes/node-compositor/SKILL.md`).
+*
+* The config IS a tree of HTML-like layout nodes (`layout`), replacing the
+* v1 flat `layers[]`. No `layers`, no `layerUpdates`, no aliases: the tree
+* is what agents write, what the editor edits, what the renderer renders.
+*
+* Design rules (hard):
+*  - strict zod, `.strict()` everywhere; unknown keys are rejected by the
+*    pre-parse scan in `validate.ts` (zod alone would silently strip them)
+*  - recursive container fields use `z.lazy`; leaf kinds are plain objects
+*  - every field that can animate is in `AnimatablePropSchema`
+*  - no backwards compatibility: v1 shapes fail fast with E-codes
+*/
 /** number px | "auto" (intrinsic) | "fit" (shrink-wrap) | "fill" (parent extent). */
 const SizeSpecSchema = z.union([
 	z.number().min(0),
@@ -2162,6 +2190,11 @@ const ShapeTypeSchema = z.enum([
 	"arrow",
 	"path"
 ]);
+const EffectSpecSchema = z.union([
+	z.instanceof(Effect),
+	z.object({ op: z.string().min(1) }).passthrough(),
+	z.custom((val) => Boolean(val && typeof val === "object" && "op" in val && typeof val.op === "string"))
+]);
 const AnimatablePropSchema = z.enum([
 	"x",
 	"y",
@@ -2531,7 +2564,7 @@ const BaseNodeFields = {
 	hidden: z.boolean().default(false),
 	opacity: z.number().min(0).max(1).default(1),
 	blendMode: z.string().optional(),
-	effects: z.array(z.unknown()).optional(),
+	effects: z.array(EffectSpecSchema).optional(),
 	rotation: z.number().default(0),
 	scale: z.number().min(0).default(1),
 	anchorX: z.number().min(0).max(1).default(.5),
@@ -2968,6 +3001,7 @@ const MediaNodeSchema = z.object({
 	...BaseNodeFields,
 	kind: z.literal("media"),
 	inputHandleId: z.string().min(1),
+	src: z.string().optional(),
 	dataType: z.string().optional(),
 	fit: z.enum([
 		"cover",
@@ -3129,7 +3163,7 @@ const CompositorProgramSchema = z.object({
 	layout: z.array(LayoutNodeSchema).default([]),
 	fonts: z.array(z.string()).optional(),
 	signals: z.record(z.string(), z.unknown()).optional(),
-	effects: z.array(z.unknown()).optional(),
+	effects: z.array(EffectSpecSchema).optional(),
 	vision: z.unknown().optional(),
 	onRequestFrame: z.custom().optional()
 }).strict();
@@ -3327,8 +3361,8 @@ function computeStaggerDelay(index, totalCount, staggerFrames, direction = "forw
 			const dist = Math.abs(index - center);
 			return Math.round(dist * staggerFrames);
 		}
-		case "forward":
-		default: return index * staggerFrames;
+		case "forward": return index * staggerFrames;
+		default: return assertNever(direction);
 	}
 }
 /**
@@ -3361,12 +3395,12 @@ function applyStaggerToChildren(children, staggerFrames, direction = "forward",
 */
 function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDurationMs, inheritedDurationFrames) {
 	let children = [];
-	const sourceRef = node.src ?? node.inputHandleId;
+	const sourceRef = node.kind === "media" ? node.src ?? node.inputHandleId : "inputHandleId" in node ? node.inputHandleId : void 0;
 	const isDirectMediaSource = (s) => typeof s === "string" && (s.startsWith("http://") || s.startsWith("https://") || s.startsWith("file://") || s.startsWith("/") || s.startsWith("./") || s.startsWith("blob:") || s.startsWith("data:") || /\.(png|jpe?g|webp|gif|svg|mp4|webm|mov|mkv|mp3|wav|ogg|m4a|srt|vtt|json|lottie)$/i.test(s));
 	let media;
 	if (node.kind === "media") {
-		if (resolveMedia) media = resolveMedia(node.inputHandleId);
-		if (!media && sourceRef && (isDirectMediaSource(sourceRef) || node.src)) media = createVirtualMedia(sourceRef, node.dataType ?? "Video");
+		if (resolveMedia && node.inputHandleId) media = resolveMedia(node.inputHandleId);
+		if (!media && sourceRef && (isDirectMediaSource(sourceRef) || Boolean(node.src))) media = createVirtualMedia(sourceRef, node.dataType ?? "Video");
 		if (!media && !resolveMedia && sourceRef && (sourceRef.includes(".") || sourceRef.includes("/"))) console.warn(`[Compositor] Media layer '${node.id ?? "?"}' source '${sourceRef}' could not be resolved.`);
 		if (media && node.crop) {
 			const cropRaw = node.crop;
@@ -3381,18 +3415,23 @@ function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDu
 				children: [media]
 			};
 		}
-		if (media && Array.isArray(node.effects)) for (const eff of node.effects) {
-			const effOp = typeof eff.toOperation === "function" ? eff.toOperation() : eff;
-			media = {
-				metadata: { ...media.metadata },
-				operation: {
-					id: node.id ? `${node.id}-${effOp.op ?? "effect"}` : void 0,
-					effect: eff,
-					...effOp,
-					dataType: media.operation.dataType
-				},
-				children: [media]
-			};
+		if (media && Array.isArray(node.effects)) {
+			let currentMedia = media;
+			for (const eff of node.effects) {
+				const effOp = eff && typeof eff.toOperation === "function" ? eff.toOperation() : eff;
+				currentMedia = {
+					metadata: { ...currentMedia.metadata },
+					operation: {
+						op: String(effOp.op ?? "effect"),
+						id: node.id ? `${node.id}-${effOp.op ?? "effect"}` : void 0,
+						effect: eff,
+						...effOp,
+						dataType: currentMedia.operation.dataType
+					},
+					children: [currentMedia]
+				};
+			}
+			media = currentMedia;
 		}
 		if (media && node.vision) {
 			const visionRaw = node.vision;
@@ -3412,12 +3451,13 @@ function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDu
 	}
 	if (node.kind === "media") children = media ? [media] : [];
 	else if ("children" in node && node.children) {
-		const staggerFrames = "staggerFrames" in node && typeof node.staggerFrames === "number" ? node.staggerFrames : 0;
-		const staggerDirection = "staggerDirection" in node && typeof node.staggerDirection === "string" ? node.staggerDirection : "forward";
+		const staggerFrames = node.kind === "flex" && typeof node.staggerFrames === "number" ? node.staggerFrames : 0;
+		const staggerDirection = node.kind === "flex" && typeof node.staggerDirection === "string" ? node.staggerDirection : "forward";
 		const nodeStart = typeof node.startFrame === "number" && Number.isFinite(node.startFrame) ? Math.round(node.startFrame) : 0;
 		const nodeDuration = typeof node.durationFrames === "number" && Number.isFinite(node.durationFrames) ? Math.round(node.durationFrames) : inheritedDurationFrames;
-		children = node.children.map((c, idx) => {
-			const delay = computeStaggerDelay(idx, node.children.length, staggerFrames, staggerDirection);
+		const nodeChildren = node.children;
+		children = nodeChildren.map((c, idx) => {
+			const delay = computeStaggerDelay(idx, nodeChildren.length, staggerFrames, staggerDirection);
 			return nodeToVirtualMedia(c, resolveMedia, fps, inheritedOffset + nodeStart + delay, compDurationMs, c.durationFrames === void 0 ? nodeDuration : void 0);
 		});
 	}
@@ -3435,7 +3475,7 @@ function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDu
 	const defaultCompDuration = inheritedDurationFrames ?? Math.round((compDurationMs ?? 1e4) / 1e3 * fps);
 	if (isContainer && children.length > 0) {
 		if (dur === void 0) {
-			const childEnds = children.map((c) => (c.operation?.startFrame ?? 0) + (c.operation?.durationFrames ?? defaultCompDuration));
+			const childEnds = children.map((c) => (c.operation.startFrame ?? 0) + (c.operation.durationFrames ?? defaultCompDuration));
 			dur = Math.max(1, Math.max(...childEnds) - startFrame);
 		}
 	} else if (isCaption && limit !== void 0 && limit > 0) dur = limit;
@@ -3490,13 +3530,13 @@ function compositorToProgram(config, options) {
 				...collectInlineSignals(config.layout),
 				...signals ?? config.signals ?? {}
 			},
-			...(config.onRequestFrame || options.onRequestFrame) && { onRequestFrame: config.onRequestFrame ?? options.onRequestFrame }
+			...config.onRequestFrame || options.onRequestFrame ? { onRequestFrame: config.onRequestFrame ?? options.onRequestFrame } : {}
 		},
 		children: hoistMattes(config.layout).map((n) => nodeToVirtualMedia(n, resolveMedia, fps, 0, durationMs))
 	};
 	const effectsList = Array.isArray(options.effects) ? options.effects : Array.isArray(config.effects) ? config.effects : [];
 	for (const eff of effectsList) {
-		const effOp = typeof eff.toOperation === "function" ? eff.toOperation() : eff;
+		const effOp = eff && typeof eff.toOperation === "function" ? eff.toOperation() : eff;
 		rootMedia = {
 			metadata: { ...rootMedia.metadata },
 			operation: {
@@ -3534,4 +3574,4 @@ function collectNodeOps(nodes) {
 
 //#endregion
 export { applyStaggerToChildren as A, evaluateTrackAtFrame as B, ShapeNodeSchema as C, TextSpanMarkSchema as D, TextNodeSchema as E, computeLayout as F, initLayout as H, computeLayoutSync as I, computeStaggerDelay as L, collectNodeOps as M, compositorToProgram as N, TextSpanSchema as O, computeCarrierContinuity as P, evaluateAnimationAtFrame as R, Sequence as S, TextAnimatorSchema as T, lintComposition as U, hoistMattes as V, mergeAnimationTracks as W, MediaNodeSchema as _, CarrierHandoffConfigSchema as a, SceneDefinitionSchema as b, EnvironmentFogSchema as c, LayerAnimation as d, LayoutNodeSchema as f, MatteModeSchema as g, MaterialTypeSchema as h, CameraNodeSchema as i, calculateSequenceTimeline as j, ToneMappingSchema as k, EnvironmentPresetSchema as l, LightTypeSchema as m, BoxNodeSchema as n, ColorStopSchema as o, LightNodeSchema as p, CameraAnimation as r, CompositorProgramSchema as s, BloomConfigSchema as t, FlexNodeSchema as u, Model3DNodeSchema as v, TextAnimator as w, SceneTransitionTypeSchema as x, Scene as y, evaluateKeyframes as z };
-//# sourceMappingURL=program-C2cJayA1.mjs.map
+//# sourceMappingURL=program-KwDdbC0-.mjs.map