framefields 2.13.1 → 2.14.0

package/dist/{program-BfiB9ttP.mjs → program-tFKCWU2j.mjs}

@@ -1,6 +1,6 @@
 import { Dn as sampleMediaSignal, Et as emojiPresentation, F as MediaTimeRemapInputSchema, It as getActiveMediaMetadata, St as createVirtualMedia, Xt as isSignal, _t as compositionFrameContext, dn as parseCssGradient, ht as assertNever, in as mixColors, l as Color, mt as assertFps, un as parseCssColor, y as Effect, zn as validateMediaTimeRemap } from "./dist-C8XSqfTx.mjs";
 import { t as ColorSchema } from "./dist-BSKAbyea.mjs";
-import { Dt as AdvancedTextAnimatorSchema, Hn as signalRegistry, Tt as AETextAnimatorSchema, Vt as KineticMarqueeConfigSchema, dn as TypewriterAnimatorSchema, in as TextPathOptionsSchema } from "./dist-DtPPPsZV.mjs";
+import { Dt as AdvancedTextAnimatorSchema, Hn as signalRegistry, Tt as AETextAnimatorSchema, Vt as KineticMarqueeConfigSchema, dn as TypewriterAnimatorSchema, in as TextPathOptionsSchema } from "./dist--Uu5bQ_6.mjs";
 import { z } from "zod";
 import { loadYoga } from "yoga-layout/load";
 
@@ -896,7 +896,8 @@ var LayerAnimation = class LayerAnimation$1 {
 			threshold: options.threshold ?? .15,
 			accumulateThreshold: options.threshold ?? .15,
 			debounceFrames: options.debounceFrames ?? 2,
-			channel: options.channel ?? "primary"
+			channel: options.channel ?? "primary",
+			...options.clock && { clock: options.clock }
 		};
 		if (inline) attachInlineSignal(source, inline);
 		this.tracks.push({
@@ -2059,7 +2060,7 @@ function evaluateTrackAtFrame(track, frame, fps = 24, context = {}) {
 			return evaluateSpringOvershoot(source, localFrame / (fps > 0 ? fps : 24), v0, v1);
 		}
 		case "signal": {
-			const sigVal = evaluateSignal(source, frame, fps, context.signals);
+			const sigVal = evaluateSignal(source, source.clock === "layer" ? localFrame : frame, fps, context.signals);
 			if (COLOR_PROPS$1.has(track.prop)) {
 				const src = source;
 				const colorA = src.colorA ?? "#ffffff";
@@ -2161,8 +2162,13 @@ function lintComposition(config, options = {}) {
 	let has3D = false;
 	const pbrNodes = [];
 	const emojiText = [];
+	const seenIds = /* @__PURE__ */ new Set();
 	const visit = (node, backdrop, atRoot) => {
 		const id = String(node.id ?? "?");
+		if (typeof node.id === "string") {
+			if (seenIds.has(node.id)) push("error", "duplicate_id", `Two layers share the id '${id}': the renderer keeps one and drops the other. Give every layer its own id (scenes reused in one composition need their own prefix).`, id);
+			seenIds.add(node.id);
+		}
 		if (options.emojiFont === false && node.kind === "text" && hasEmoji(textOf(node))) emojiText.push(id);
 		for (const prop of COLOR_PROPS) {
 			const v = node[prop];
@@ -2544,6 +2550,12 @@ const KeyframeSchema = z.object({
 	}).optional()
 }).strict();
 const SignalModeSchema = z.enum(["continuous", "accumulate"]);
+/**
+* Which clock a signal track reads: the composition's (default), as audio
+* analysis and shared signals need, or its layer's own, from the layer's
+* start frame, as keyframes do: motion authored for one scene of a sequence.
+*/
+const SignalClockSchema = z.enum(["composition", "layer"]);
 const RawTrackSourceSchema = z.discriminatedUnion("type", [
 	z.object({ type: z.literal("keyframe") }),
 	z.object({
@@ -2560,7 +2572,8 @@ const RawTrackSourceSchema = z.discriminatedUnion("type", [
 		threshold: z.number().optional(),
 		accumulateThreshold: z.number().optional(),
 		debounceFrames: z.number().int().min(0).optional(),
-		channel: z.string().optional()
+		channel: z.string().optional(),
+		clock: SignalClockSchema.optional()
 	}),
 	z.object({
 		type: z.literal("wiggle"),
@@ -2595,7 +2608,8 @@ const TrackSourceSchema = z.preprocess((val) => {
 			threshold: thresh,
 			accumulateThreshold: thresh,
 			debounceFrames: obj.debounceFrames ?? 2,
-			channel: typeof obj.channel === "string" ? obj.channel : "primary"
+			channel: typeof obj.channel === "string" ? obj.channel : "primary",
+			...obj.clock !== void 0 && { clock: obj.clock }
 		};
 	}
 	return val;
@@ -2717,6 +2731,21 @@ const LayerAnimationSchema = z.object({
 	tracks: z.array(AnimationTrackSchema).max(24),
 	frameStep: z.number().int().min(1).max(24).optional()
 }).strict().superRefine(animationInvariants);
+const ToonShadingSchema = z.object({
+	shadowColor: ColorSchema.optional(),
+	lightColor: ColorSchema.optional(),
+	threshold: z.number().min(-1).max(1).optional(),
+	softness: z.number().min(0).max(2).optional(),
+	diffuse: z.number().min(0).max(1).optional()
+}).strict();
+const GeometryOutlineOptionsSchema = z.object({
+	color: ColorSchema.optional(),
+	width: z.number().min(0).max(32).optional(),
+	referenceHeight: z.number().positive().optional(),
+	creaseAngle: z.number().min(0).max(180).optional(),
+	depthThreshold: z.number().positive().max(1).optional(),
+	opacity: z.number().min(0).max(1).optional()
+}).strict();
 const BaseNodeFields = {
 	id: z.string().min(1),
 	inputHandleId: z.string().optional(),
@@ -2778,6 +2807,8 @@ const BaseNodeFields = {
 	emissive: ColorSchema.optional(),
 	emissiveIntensity: z.number().min(0).optional(),
 	castShadow: z.boolean().optional(),
+	toon: ToonShadingSchema.optional(),
+	outline: z.boolean().optional(),
 	matte: z.object({
 		node: z.custom((v) => typeof v === "object" && v !== null),
 		mode: MatteModeSchema.optional()
@@ -3025,6 +3056,7 @@ const LightNodeSchema = z.object({
 	toneMapping: ToneMappingSchema.optional(),
 	fog: EnvironmentFogSchema.optional(),
 	floor: EnvironmentFloorSchema.optional(),
+	outlines: z.union([z.boolean(), GeometryOutlineOptionsSchema]).optional(),
 	bloom: z.union([z.boolean(), BloomConfigSchema]).optional(),
 	startFrame: z.number().int().min(0).default(0),
 	durationFrames: z.number().int().min(1).optional(),
@@ -3057,7 +3089,7 @@ const FlexNodeSchema = z.object({
 		"reverse",
 		"center-out"
 	]).default("forward"),
-	overflow: z.enum(["visible", "hidden"]).default("hidden"),
+	overflow: z.enum(["visible", "hidden"]).default("visible"),
 	background: ColorSchema.optional(),
 	borderRadius: z.number().min(0).optional(),
 	borderColor: ColorSchema.optional(),
@@ -3087,7 +3119,7 @@ const BlockNodeSchema = z.object({
 		"reverse",
 		"center-out"
 	]).default("forward"),
-	overflow: z.enum(["visible", "hidden"]).default("hidden"),
+	overflow: z.enum(["visible", "hidden"]).default("visible"),
 	background: ColorSchema.optional(),
 	borderRadius: z.number().min(0).optional(),
 	borderColor: ColorSchema.optional(),
@@ -3112,7 +3144,7 @@ const BoxNodeSchema = z.object({
 		"reverse",
 		"center-out"
 	]).default("forward"),
-	overflow: z.enum(["visible", "hidden"]).default("hidden"),
+	overflow: z.enum(["visible", "hidden"]).default("visible"),
 	borderColor: ColorSchema.optional(),
 	borderWidth: z.number().min(0).optional(),
 	strokeAlign: z.enum([
@@ -3636,6 +3668,17 @@ function applyStaggerToChildren(children, staggerFrames, direction = "forward",
 * Pure + deterministic: same doc → same tree. No width/height resolution
 * here — geometry comes from `computeLayout` at render time.
 */
+/**
+* A container holding a camera and the layers it films is a 3D scene of its
+* own: its camera, lights and environment see only its layers. It needs a
+* fixed size to render at. A container holding only a camera (and lights) is
+* a shot in a camera cut list over the shared world, and stays one.
+*/
+function isScene3D(node) {
+	if (node.kind !== "box" && node.kind !== "flex" && node.kind !== "block" || typeof node.width !== "number" || typeof node.height !== "number" || !Array.isArray(node.children)) return false;
+	const kids = node.children;
+	return kids.some((c) => c.kind === "camera") && kids.some((c) => c.kind !== "camera" && c.kind !== "light");
+}
 function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDurationMs, inheritedDurationFrames, resolveSignal) {
 	if (node.kind === "media" && node.timeRemap !== void 0) {
 		const parsed = MediaTimeRemapInputSchema.safeParse(node.timeRemap);
@@ -3706,10 +3749,34 @@ function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDu
 		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;
 		const nodeChildren = node.children;
+		const scene = isScene3D(node);
 		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, resolveSignal);
+			return nodeToVirtualMedia(c, resolveMedia, fps, scene ? delay : inheritedOffset + nodeStart + delay, compDurationMs, c.durationFrames === void 0 ? nodeDuration : void 0, resolveSignal);
 		});
+		if (scene) {
+			const durationMs$1 = (nodeDuration ?? Math.round((compDurationMs ?? 1e4) / 1e3 * fps)) / fps * 1e3;
+			media = {
+				metadata: {
+					width: node.width,
+					height: node.height,
+					fps,
+					durationMs: durationMs$1
+				},
+				operation: {
+					op: "Compositor",
+					width: node.width,
+					height: node.height,
+					fps,
+					mode: "Video",
+					dataType: "Video",
+					volume: 1,
+					...typeof node.background === "string" && { backgroundColor: node.background }
+				},
+				children
+			};
+			children = [media];
+		}
 	}
 	let dataType = "Image";
 	let limit;
@@ -3751,6 +3818,11 @@ function nodeToVirtualMedia(node, resolveMedia, fps, inheritedOffset = 0, compDu
 		operation: {
 			op: "CompositorLayer",
 			...node,
+			...isScene3D(node) && {
+				kind: "media",
+				background: void 0,
+				children: void 0
+			},
 			startFrame,
 			durationFrames: dur,
 			dataType,
@@ -3797,6 +3869,7 @@ function compositorToProgram(config, options) {
 		},
 		children: hoistMattes(config.layout).map((n) => nodeToVirtualMedia(n, resolveMedia, fps, 0, durationMs, void 0, resolveMediaSignal))
 	};
+	shareSignals(rootMedia.children ?? [], programSignals);
 	const effectsList = Array.isArray(options.effects) ? options.effects : Array.isArray(config.effects) ? config.effects : [];
 	for (const eff of effectsList) {
 		const effOp = eff && typeof eff.toOperation === "function" ? eff.toOperation() : eff;
@@ -3824,10 +3897,21 @@ function compositorToProgram(config, options) {
 	}
 	return rootMedia;
 }
-/** Recursively gather every node op from a render tree (in order). */
+/** Hands every nested scene composition the program's signals, which its tracks read. */
+function shareSignals(nodes, signals) {
+	for (const vm of nodes) {
+		if (vm?.operation?.op === "Compositor") vm.operation.signals = signals;
+		shareSignals(vm?.children ?? [], signals);
+	}
+}
+/**
+* Recursively gather every node op from a render tree (in order), stopping at
+* nested scene compositions: their layers belong to their own render.
+*/
 function collectNodeOps(nodes) {
 	const out = [];
 	const walk = (vm) => {
+		if (vm?.operation?.op === "Compositor") return;
 		if (vm?.operation?.op === "CompositorLayer") out.push(vm);
 		for (const c of vm?.children ?? []) walk(c);
 	};
@@ -3836,5 +3920,5 @@ function collectNodeOps(nodes) {
 }
 
 //#endregion
-export { ToneMappingSchema as A, evaluateKeyframes as B, Sequence as C, TextNodeSchema as D, TextAnimatorSchema as E, computeCarrierContinuity as F, mediaSignalSampler as G, hoistMattes as H, computeLayout as I, mergeAnimationTracks as K, computeLayoutSync as L, calculateSequenceTimeline as M, collectNodeOps as N, TextSpanMarkSchema as O, compositorToProgram as P, computeStaggerDelay as R, SceneTransitionTypeSchema as S, TextAnimator as T, initLayout as U, evaluateTrackAtFrame as V, lintComposition as W, MatteModeSchema as _, CarrierHandoffConfigSchema as a, Scene as b, EnvironmentFloorSchema as c, FlexNodeSchema as d, LayerAnimation as f, MaterialTypeSchema as g, LightTypeSchema as h, CameraNodeSchema as i, applyStaggerToChildren as j, TextSpanSchema as k, EnvironmentFogSchema as l, LightNodeSchema as m, BoxNodeSchema as n, ColorStopSchema as o, LayoutNodeSchema as p, sampleMediaTimeSignal as q, CameraAnimation as r, CompositorProgramSchema as s, BloomConfigSchema as t, EnvironmentPresetSchema as u, MediaNodeSchema as v, ShapeNodeSchema as w, SceneDefinitionSchema as x, Model3DNodeSchema as y, evaluateAnimationAtFrame as z };
-//# sourceMappingURL=program-BfiB9ttP.mjs.map
+export { TextSpanSchema as A, computeStaggerDelay as B, SceneTransitionTypeSchema as C, TextAnimatorSchema as D, TextAnimator as E, collectNodeOps as F, initLayout as G, evaluateKeyframes as H, compositorToProgram as I, mergeAnimationTracks as J, lintComposition as K, computeCarrierContinuity as L, ToonShadingSchema as M, applyStaggerToChildren as N, TextNodeSchema as O, calculateSequenceTimeline as P, computeLayout as R, SceneDefinitionSchema as S, ShapeNodeSchema as T, evaluateTrackAtFrame as U, evaluateAnimationAtFrame as V, hoistMattes as W, sampleMediaTimeSignal as Y, MaterialTypeSchema as _, CarrierHandoffConfigSchema as a, Model3DNodeSchema as b, EnvironmentFloorSchema as c, FlexNodeSchema as d, GeometryOutlineOptionsSchema as f, LightTypeSchema as g, LightNodeSchema as h, CameraNodeSchema as i, ToneMappingSchema as j, TextSpanMarkSchema as k, EnvironmentFogSchema as l, LayoutNodeSchema as m, BoxNodeSchema as n, ColorStopSchema as o, LayerAnimation as p, mediaSignalSampler as q, CameraAnimation as r, CompositorProgramSchema as s, BloomConfigSchema as t, EnvironmentPresetSchema as u, MatteModeSchema as v, Sequence as w, Scene as x, MediaNodeSchema as y, computeLayoutSync as z };
+//# sourceMappingURL=program-tFKCWU2j.mjs.map