@tongue-core/project 0.1.0-rc.2 → 0.1.0-rc.4

package/dist/build/extract.d.ts

@@ -42,6 +42,7 @@ export declare const extractFilm: (project: LoadedProject, options?: ExtractOpti
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -61,10 +62,11 @@ export declare const extractFilm: (project: LoadedProject, options?: ExtractOpti
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: import("effect/Schema").Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -72,17 +74,13 @@ export declare const extractFilm: (project: LoadedProject, options?: ExtractOpti
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -90,12 +88,16 @@ export declare const extractFilm: (project: LoadedProject, options?: ExtractOpti
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -103,7 +105,9 @@ export declare const extractFilm: (project: LoadedProject, options?: ExtractOpti
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -202,6 +206,21 @@ export declare const extractFilm: (project: LoadedProject, options?: ExtractOpti
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];

package/dist/doc/assemble.d.ts

@@ -40,6 +40,7 @@ export declare const assembleFilm: (doc: {
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -59,10 +60,11 @@ export declare const assembleFilm: (doc: {
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: import("effect/Schema").Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -70,17 +72,13 @@ export declare const assembleFilm: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -88,12 +86,16 @@ export declare const assembleFilm: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -101,7 +103,9 @@ export declare const assembleFilm: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -200,6 +204,21 @@ export declare const assembleFilm: (doc: {
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];
@@ -236,6 +255,7 @@ export declare const sceneFilmDoc: (doc: {
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -255,10 +275,11 @@ export declare const sceneFilmDoc: (doc: {
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: import("effect/Schema").Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -266,17 +287,13 @@ export declare const sceneFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -284,12 +301,16 @@ export declare const sceneFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -297,7 +318,9 @@ export declare const sceneFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -396,6 +419,21 @@ export declare const sceneFilmDoc: (doc: {
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];
@@ -429,6 +467,7 @@ export declare const sceneFilmDoc: (doc: {
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -448,10 +487,11 @@ export declare const sceneFilmDoc: (doc: {
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: import("effect/Schema").Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -459,17 +499,13 @@ export declare const sceneFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -477,12 +513,16 @@ export declare const sceneFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -490,7 +530,9 @@ export declare const sceneFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -589,6 +631,21 @@ export declare const sceneFilmDoc: (doc: {
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];

package/dist/doc/assemble.js

@@ -7,7 +7,10 @@ import { docError } from "./issues.js";
 export function assetsOf(doc) {
     return doc.assets.map((a) => {
         switch (a.kind) {
-            case "font": return font(a.source, { name: a.name });
+            case "font": {
+                const italic = a.italic === undefined ? undefined : doc.assets.find((other) => other.kind === "font" && other.name === a.italic);
+                return font(a.source, italic ? { name: a.name, italic: italic.source } : { name: a.name });
+            }
             case "image": return image(a.source, { name: a.name, maxSize: a.maxSize });
             case "video": return video(a.source, { name: a.name, maxSize: a.maxSize });
             case "audio": return audio(a.source, { name: a.name });
@@ -64,12 +67,12 @@ function clipNode(clip, path, reader) {
     switch (clip.kind) {
         case "scene": {
             const scene = reader.scene(clip.scene, `${path}.scene`);
-            return Clip({ ...placed, scene, props: reader.read(scene.propsSchema, clip.props, `${path}.props`), opacity: clip.opacity });
+            return Clip({ ...placed, scene, props: reader.read(scene.propsSchema, clip.props, `${path}.props`), opacity: clip.opacity, blend: clip.blend ?? "normal" });
         }
         case "video":
-            return Clip({ ...placed, video: reader.asset("video", clip.asset, `${path}.asset`), in: clip.in, out: clip.out, speed: clip.speed, reverse: clip.reverse, freeze: clip.freeze, fit: clip.fit, opacity: clip.opacity });
+            return Clip({ ...placed, video: reader.asset("video", clip.asset, `${path}.asset`), in: clip.in, out: clip.out, speed: clip.speed, reverse: clip.reverse, freeze: clip.freeze, fit: clip.fit, opacity: clip.opacity, blend: clip.blend ?? "normal" });
         case "image":
-            return Clip({ ...placed, image: reader.asset("image", clip.asset, `${path}.asset`), fit: clip.fit, opacity: clip.opacity });
+            return Clip({ ...placed, image: reader.asset("image", clip.asset, `${path}.asset`), fit: clip.fit, opacity: clip.opacity, blend: clip.blend ?? "normal" });
         case "audio":
             return Clip({ ...placed, audio: reader.asset("audio", clip.asset, `${path}.asset`), in: clip.in, out: clip.out, speed: clip.speed, gain: clip.gain, fadeIn: clip.fadeIn, fadeOut: clip.fadeOut });
     }
@@ -79,6 +82,7 @@ function transitionNode(t) {
         case "fade": return Transition.Fade({ frames: t.frames, ease: t.ease });
         case "wipe": return Transition.Wipe({ frames: t.frames, ease: t.ease, direction: t.direction });
         case "push": return Transition.Push({ frames: t.frames, ease: t.ease, direction: t.direction });
+        case "dissolve": return Transition.Dissolve(t.edge === null ? { frames: t.frames, ease: t.ease, noise: t.noise, size: t.size } : { frames: t.frames, ease: t.ease, noise: t.noise, size: t.size, edge: t.edge });
         case "morph": return Transition.Morph({ frames: t.frames, ease: t.ease, others: t.others });
     }
 }

package/dist/doc/check.d.ts

@@ -34,6 +34,7 @@ export declare const decodeFilmDoc: (json: unknown) => Effect.Effect<{
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -53,10 +54,11 @@ export declare const decodeFilmDoc: (json: unknown) => Effect.Effect<{
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: Schema.Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -64,17 +66,13 @@ export declare const decodeFilmDoc: (json: unknown) => Effect.Effect<{
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -82,12 +80,16 @@ export declare const decodeFilmDoc: (json: unknown) => Effect.Effect<{
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -95,7 +97,9 @@ export declare const decodeFilmDoc: (json: unknown) => Effect.Effect<{
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -194,6 +198,21 @@ export declare const decodeFilmDoc: (json: unknown) => Effect.Effect<{
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];
@@ -229,6 +248,7 @@ export declare const parseFilmDoc: (text: string) => Effect.Effect<{
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -248,10 +268,11 @@ export declare const parseFilmDoc: (text: string) => Effect.Effect<{
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: Schema.Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -259,17 +280,13 @@ export declare const parseFilmDoc: (text: string) => Effect.Effect<{
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -277,12 +294,16 @@ export declare const parseFilmDoc: (text: string) => Effect.Effect<{
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -290,7 +311,9 @@ export declare const parseFilmDoc: (text: string) => Effect.Effect<{
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -389,6 +412,21 @@ export declare const parseFilmDoc: (text: string) => Effect.Effect<{
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];

package/dist/doc/film-doc.d.ts

@@ -49,6 +49,8 @@ export declare const AssetDoc: Schema.Union<readonly [Schema.Struct<{
     readonly kind: Schema.Literal<"font">;
     readonly name: Schema.String;
     readonly source: Schema.String;
+    /** The name of the font asset `fontStyle: "italic"` uses. */
+    readonly italic: Schema.optionalKey<Schema.String>;
 }>, Schema.Struct<{
     readonly kind: Schema.Literal<"image">;
     readonly name: Schema.String;
@@ -70,6 +72,7 @@ export declare const SceneClipDoc: Schema.Struct<{
     /** Written by the scene's props schema (see `scenes[].props`). */
     readonly props: Schema.Codec<Schema.Json, Schema.Json, never, never>;
     readonly opacity: Schema.Finite;
+    readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
     readonly id: Schema.String;
     readonly start: Schema.Finite;
     readonly duration: Schema.Finite;
@@ -90,6 +93,7 @@ export declare const VideoClipDoc: Schema.Struct<{
     readonly freeze: Schema.Boolean;
     readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
     readonly opacity: Schema.Finite;
+    readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
     readonly id: Schema.String;
     readonly start: Schema.Finite;
     readonly duration: Schema.Finite;
@@ -105,6 +109,7 @@ export declare const ImageClipDoc: Schema.Struct<{
     readonly asset: Schema.String;
     readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
     readonly opacity: Schema.Finite;
+    readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
     readonly id: Schema.String;
     readonly start: Schema.Finite;
     readonly duration: Schema.Finite;
@@ -142,6 +147,7 @@ export declare const ClipDoc: Schema.Union<readonly [Schema.Struct<{
     /** Written by the scene's props schema (see `scenes[].props`). */
     readonly props: Schema.Codec<Schema.Json, Schema.Json, never, never>;
     readonly opacity: Schema.Finite;
+    readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
     readonly id: Schema.String;
     readonly start: Schema.Finite;
     readonly duration: Schema.Finite;
@@ -160,6 +166,7 @@ export declare const ClipDoc: Schema.Union<readonly [Schema.Struct<{
     readonly freeze: Schema.Boolean;
     readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
     readonly opacity: Schema.Finite;
+    readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
     readonly id: Schema.String;
     readonly start: Schema.Finite;
     readonly duration: Schema.Finite;
@@ -173,6 +180,7 @@ export declare const ClipDoc: Schema.Union<readonly [Schema.Struct<{
     readonly asset: Schema.String;
     readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
     readonly opacity: Schema.Finite;
+    readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
     readonly id: Schema.String;
     readonly start: Schema.Finite;
     readonly duration: Schema.Finite;
@@ -216,6 +224,24 @@ export declare const FadeDoc: Schema.Struct<{
     }>>;
     readonly style: Schema.Literal<"fade">;
 }>;
+export declare const DissolveDoc: Schema.Struct<{
+    readonly noise: Schema.Literals<readonly ["cloud", "ridged"]>;
+    /** Pixels. */
+    readonly size: Schema.Finite;
+    /** The moving edge's color, when it has one. */
+    readonly edge: Schema.NullOr<Schema.String>;
+    readonly from: Schema.String;
+    readonly to: Schema.String;
+    readonly frames: Schema.Finite;
+    readonly ease: Schema.Literals<readonly ["linear", "glide", "settle", "snap", "in", "out", "swift"]>;
+    readonly start: Schema.Finite;
+    readonly end: Schema.Finite;
+    readonly origin: Schema.NullOr<Schema.Struct<{
+        readonly file: Schema.String;
+        readonly line: Schema.Int;
+    }>>;
+    readonly style: Schema.Literal<"dissolve">;
+}>;
 export declare const SlideDoc: Schema.Struct<{
     readonly direction: Schema.Literals<readonly ["left", "right", "up", "down"]>;
     readonly from: Schema.String;
@@ -370,6 +396,23 @@ export declare const TransitionDoc: Schema.Union<readonly [Schema.Struct<{
         readonly line: Schema.Int;
     }>>;
     readonly style: Schema.Literal<"morph">;
+}>, Schema.Struct<{
+    readonly noise: Schema.Literals<readonly ["cloud", "ridged"]>;
+    /** Pixels. */
+    readonly size: Schema.Finite;
+    /** The moving edge's color, when it has one. */
+    readonly edge: Schema.NullOr<Schema.String>;
+    readonly from: Schema.String;
+    readonly to: Schema.String;
+    readonly frames: Schema.Finite;
+    readonly ease: Schema.Literals<readonly ["linear", "glide", "settle", "snap", "in", "out", "swift"]>;
+    readonly start: Schema.Finite;
+    readonly end: Schema.Finite;
+    readonly origin: Schema.NullOr<Schema.Struct<{
+        readonly file: Schema.String;
+        readonly line: Schema.Int;
+    }>>;
+    readonly style: Schema.Literal<"dissolve">;
 }>]>;
 export type TransitionDoc = typeof TransitionDoc.Type;
 export type MorphDoc = typeof MorphDoc.Type;
@@ -382,6 +425,7 @@ export declare const TrackDoc: Schema.Struct<{
         /** Written by the scene's props schema (see `scenes[].props`). */
         readonly props: Schema.Codec<Schema.Json, Schema.Json, never, never>;
         readonly opacity: Schema.Finite;
+        readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
         readonly id: Schema.String;
         readonly start: Schema.Finite;
         readonly duration: Schema.Finite;
@@ -400,6 +444,7 @@ export declare const TrackDoc: Schema.Struct<{
         readonly freeze: Schema.Boolean;
         readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
         readonly opacity: Schema.Finite;
+        readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
         readonly id: Schema.String;
         readonly start: Schema.Finite;
         readonly duration: Schema.Finite;
@@ -413,6 +458,7 @@ export declare const TrackDoc: Schema.Struct<{
         readonly asset: Schema.String;
         readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
         readonly opacity: Schema.Finite;
+        readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
         readonly id: Schema.String;
         readonly start: Schema.Finite;
         readonly duration: Schema.Finite;
@@ -524,6 +570,23 @@ export declare const TrackDoc: Schema.Struct<{
             readonly line: Schema.Int;
         }>>;
         readonly style: Schema.Literal<"morph">;
+    }>, Schema.Struct<{
+        readonly noise: Schema.Literals<readonly ["cloud", "ridged"]>;
+        /** Pixels. */
+        readonly size: Schema.Finite;
+        /** The moving edge's color, when it has one. */
+        readonly edge: Schema.NullOr<Schema.String>;
+        readonly from: Schema.String;
+        readonly to: Schema.String;
+        readonly frames: Schema.Finite;
+        readonly ease: Schema.Literals<readonly ["linear", "glide", "settle", "snap", "in", "out", "swift"]>;
+        readonly start: Schema.Finite;
+        readonly end: Schema.Finite;
+        readonly origin: Schema.NullOr<Schema.Struct<{
+            readonly file: Schema.String;
+            readonly line: Schema.Int;
+        }>>;
+        readonly style: Schema.Literal<"dissolve">;
     }>]>>;
 }>;
 export type TrackDoc = typeof TrackDoc.Type;
@@ -571,6 +634,8 @@ export declare const FilmDoc: Schema.Struct<{
         readonly kind: Schema.Literal<"font">;
         readonly name: Schema.String;
         readonly source: Schema.String;
+        /** The name of the font asset `fontStyle: "italic"` uses. */
+        readonly italic: Schema.optionalKey<Schema.String>;
     }>, Schema.Struct<{
         readonly kind: Schema.Literal<"image">;
         readonly name: Schema.String;
@@ -596,6 +661,7 @@ export declare const FilmDoc: Schema.Struct<{
             /** Written by the scene's props schema (see `scenes[].props`). */
             readonly props: Schema.Codec<Schema.Json, Schema.Json, never, never>;
             readonly opacity: Schema.Finite;
+            readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
             readonly id: Schema.String;
             readonly start: Schema.Finite;
             readonly duration: Schema.Finite;
@@ -614,6 +680,7 @@ export declare const FilmDoc: Schema.Struct<{
             readonly freeze: Schema.Boolean;
             readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
             readonly opacity: Schema.Finite;
+            readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
             readonly id: Schema.String;
             readonly start: Schema.Finite;
             readonly duration: Schema.Finite;
@@ -627,6 +694,7 @@ export declare const FilmDoc: Schema.Struct<{
             readonly asset: Schema.String;
             readonly fit: Schema.Literals<readonly ["cover", "contain"]>;
             readonly opacity: Schema.Finite;
+            readonly blend: Schema.optionalKey<Schema.Literals<readonly ["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]>>;
             readonly id: Schema.String;
             readonly start: Schema.Finite;
             readonly duration: Schema.Finite;
@@ -738,6 +806,23 @@ export declare const FilmDoc: Schema.Struct<{
                 readonly line: Schema.Int;
             }>>;
             readonly style: Schema.Literal<"morph">;
+        }>, Schema.Struct<{
+            readonly noise: Schema.Literals<readonly ["cloud", "ridged"]>;
+            /** Pixels. */
+            readonly size: Schema.Finite;
+            /** The moving edge's color, when it has one. */
+            readonly edge: Schema.NullOr<Schema.String>;
+            readonly from: Schema.String;
+            readonly to: Schema.String;
+            readonly frames: Schema.Finite;
+            readonly ease: Schema.Literals<readonly ["linear", "glide", "settle", "snap", "in", "out", "swift"]>;
+            readonly start: Schema.Finite;
+            readonly end: Schema.Finite;
+            readonly origin: Schema.NullOr<Schema.Struct<{
+                readonly file: Schema.String;
+                readonly line: Schema.Int;
+            }>>;
+            readonly style: Schema.Literal<"dissolve">;
         }>]>>;
     }>>;
     /** Things that will work, but probably not as intended. */

package/dist/doc/film-doc.js

@@ -52,13 +52,21 @@ export const SceneDoc = Schema.Struct({
     /** Its props, as JSON Schema. */
     props: Schema.Json,
 });
-const FontDoc = Schema.Struct({ kind: Schema.Literal("font"), name: Name, source: Schema.String });
+const FontDoc = Schema.Struct({
+    kind: Schema.Literal("font"),
+    name: Name,
+    source: Schema.String,
+    /** The name of the font asset `fontStyle: "italic"` uses. */
+    italic: Schema.optionalKey(Name),
+});
 const ImageDoc = Schema.Struct({ kind: Schema.Literal("image"), name: Name, source: Schema.String, maxSize: Pixels });
 const VideoDoc = Schema.Struct({ kind: Schema.Literal("video"), name: Name, source: Schema.String, maxSize: Pixels });
 const AudioDoc = Schema.Struct({ kind: Schema.Literal("audio"), name: Name, source: Schema.String });
 /** A file the film loads; `source` is relative to the project. Names are unique per kind. */
 export const AssetDoc = Schema.Union([FontDoc, ImageDoc, VideoDoc, AudioDoc]);
 // ---------------------------------------------------------------- clips
+/** How a clip combines with the tracks under it; left out when it is "normal". */
+const Blend = Schema.Literals(["multiply", "screen", "overlay", "soft-light", "color-dodge", "normal"]);
 const placement = {
     id: Id,
     start: Frames,
@@ -74,6 +82,7 @@ export const SceneClipDoc = Schema.Struct({
     /** Written by the scene's props schema (see `scenes[].props`). */
     props: Schema.Json,
     opacity: Unit,
+    blend: Schema.optionalKey(Blend),
 });
 export const VideoClipDoc = Schema.Struct({
     kind: Schema.Literal("video"),
@@ -86,8 +95,9 @@ export const VideoClipDoc = Schema.Struct({
     freeze: Schema.Boolean,
     fit: Fit,
     opacity: Unit,
+    blend: Schema.optionalKey(Blend),
 });
-export const ImageClipDoc = Schema.Struct({ kind: Schema.Literal("image"), ...placement, asset: Name, fit: Fit, opacity: Unit });
+export const ImageClipDoc = Schema.Struct({ kind: Schema.Literal("image"), ...placement, asset: Name, fit: Fit, opacity: Unit, blend: Schema.optionalKey(Blend) });
 export const AudioClipDoc = Schema.Struct({
     kind: Schema.Literal("audio"),
     ...placement,
@@ -137,6 +147,15 @@ const joining = {
     origin: Origin,
 };
 export const FadeDoc = Schema.Struct({ style: Schema.Literal("fade"), ...joining });
+export const DissolveDoc = Schema.Struct({
+    style: Schema.Literal("dissolve"),
+    ...joining,
+    noise: Schema.Literals(["cloud", "ridged"]),
+    /** Pixels. */
+    size: Length,
+    /** The moving edge's color, when it has one. */
+    edge: Schema.NullOr(Schema.String),
+});
 export const SlideDoc = Schema.Struct({ style: Schema.Literals(["wipe", "push"]), ...joining, direction: Direction });
 export const MorphDoc = Schema.Struct({
     style: Schema.Literal("morph"),
@@ -146,7 +165,7 @@ export const MorphDoc = Schema.Struct({
     /** Morph keys both scenes declare (null when either declares none). */
     sharedKeys: Schema.NullOr(Schema.Array(Schema.String)),
 });
-export const TransitionDoc = Schema.Union([FadeDoc, SlideDoc, MorphDoc]);
+export const TransitionDoc = Schema.Union([FadeDoc, SlideDoc, MorphDoc, DissolveDoc]);
 // ---------------------------------------------------------------- tracks and the document
 export const TrackDoc = Schema.Struct({
     id: Id,

package/dist/doc/from-plan.d.ts

@@ -39,6 +39,7 @@ export declare const filmDocOf: (plan: FilmPlan, background: string, scenes: rea
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -58,10 +59,11 @@ export declare const filmDocOf: (plan: FilmPlan, background: string, scenes: rea
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: Schema.Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -69,17 +71,13 @@ export declare const filmDocOf: (plan: FilmPlan, background: string, scenes: rea
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -87,12 +85,16 @@ export declare const filmDocOf: (plan: FilmPlan, background: string, scenes: rea
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -100,7 +102,9 @@ export declare const filmDocOf: (plan: FilmPlan, background: string, scenes: rea
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -199,6 +203,21 @@ export declare const filmDocOf: (plan: FilmPlan, background: string, scenes: rea
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];

package/dist/doc/from-plan.js

@@ -25,18 +25,19 @@ function jsonOf(schema, value, clip, subject) {
 function clipDoc(clip, ids) {
     const placed = { id: clip.id, start: clip.start, duration: clip.duration, end: clip.end, origin: originDoc(clip.origin) };
     const s = clip.source;
+    const blended = clip.blend === "normal" ? {} : { blend: clip.blend };
     switch (s.kind) {
         case "scene": {
             const scene = s.instance.scene;
             const id = ids.get(scene);
             if (id === undefined)
                 throw new Refusal(clip.id, `Clip "${clip.id}" plays scene "${scene.name}", which isn't one of the project's scenes; move it to scenes/${scene.name}.tsx.`);
-            return { kind: "scene", ...placed, scene: id, props: jsonOf(scene.propsSchema, s.instance.props, clip.id, `Clip "${clip.id}"'s props`), opacity: clip.opacity };
+            return { kind: "scene", ...placed, scene: id, props: jsonOf(scene.propsSchema, s.instance.props, clip.id, `Clip "${clip.id}"'s props`), opacity: clip.opacity, ...blended };
         }
         case "video":
-            return { kind: "video", ...placed, asset: s.asset.name, in: s.in, out: s.out, speed: s.speed, reverse: s.reverse, freeze: s.freeze, fit: s.fit, opacity: clip.opacity };
+            return { kind: "video", ...placed, asset: s.asset.name, in: s.in, out: s.out, speed: s.speed, reverse: s.reverse, freeze: s.freeze, fit: s.fit, opacity: clip.opacity, ...blended };
         case "image":
-            return { kind: "image", ...placed, asset: s.asset.name, fit: s.fit, opacity: clip.opacity };
+            return { kind: "image", ...placed, asset: s.asset.name, fit: s.fit, opacity: clip.opacity, ...blended };
         case "audio":
             if (s.voice)
                 throw new Refusal(clip.id, `Clip "${clip.id}" plays narration, which film.json can't hold yet; render this film from film.tsx.`);
@@ -68,6 +69,7 @@ function transitionDoc(t) {
         case "fade": return { style: "fade", ...joining };
         case "wipe": return { style: "wipe", ...joining, direction: t.direction };
         case "push": return { style: "push", ...joining, direction: t.direction };
+        case "dissolve": return { style: "dissolve", ...joining, noise: t.dissolve.noise, size: t.dissolve.size, edge: t.dissolve.edge };
         case "morph":
             return { style: "morph", ...joining, others: { enter: enterDoc(t.others.enter, where, t.to), exit: exitDoc(t.others.exit, where, t.to), stagger: t.others.stagger }, sharedKeys: t.sharedKeys };
     }
@@ -87,7 +89,7 @@ function kitDoc(kit, scenes) {
 }
 const assetDoc = (a) => {
     switch (a.kind) {
-        case "font": return { kind: "font", name: a.name, source: a.source };
+        case "font": return a.italic ? { kind: "font", name: a.name, source: a.source, italic: a.italic.name } : { kind: "font", name: a.name, source: a.source };
         case "image": return { kind: "image", name: a.name, source: a.source, maxSize: a.maxSize };
         case "video": return { kind: "video", name: a.name, source: a.source, maxSize: a.maxSize };
         case "audio": return { kind: "audio", name: a.name, source: a.source };

package/dist/doc/plan-doc.d.ts

@@ -33,6 +33,7 @@ export declare const planFilmDoc: (doc: {
         readonly kind: "font";
         readonly name: string;
         readonly source: string;
+        readonly italic?: string | undefined;
     } | {
         readonly kind: "image";
         readonly name: string;
@@ -52,10 +53,11 @@ export declare const planFilmDoc: (doc: {
         readonly id: string;
         readonly kind: "audio" | "visual";
         readonly clips: readonly ({
-            readonly scene: string;
+            readonly kind: "scene";
+            readonly id: string;
             readonly props: import("effect/Schema").Json;
+            readonly scene: string;
             readonly opacity: number;
-            readonly id: string;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -63,17 +65,13 @@ export declare const planFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "scene";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
-            readonly asset: string;
             readonly in: number;
             readonly out: number;
-            readonly speed: number;
-            readonly reverse: boolean;
-            readonly freeze: boolean;
-            readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly kind: "video";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -81,12 +79,16 @@ export declare const planFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "video";
-        } | {
             readonly asset: string;
+            readonly speed: number;
+            readonly reverse: boolean;
+            readonly freeze: boolean;
             readonly fit: "cover" | "contain";
-            readonly opacity: number;
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
+        } | {
+            readonly kind: "image";
             readonly id: string;
+            readonly opacity: number;
             readonly start: number;
             readonly duration: number;
             readonly end: number;
@@ -94,7 +96,9 @@ export declare const planFilmDoc: (doc: {
                 readonly file: string;
                 readonly line: number;
             } | null;
-            readonly kind: "image";
+            readonly asset: string;
+            readonly fit: "cover" | "contain";
+            readonly blend?: "multiply" | "screen" | "overlay" | "soft-light" | "color-dodge" | "normal" | undefined;
         } | {
             readonly asset: string;
             readonly in: number;
@@ -193,6 +197,21 @@ export declare const planFilmDoc: (doc: {
                 readonly line: number;
             } | null;
             readonly style: "morph";
+        } | {
+            readonly noise: "cloud" | "ridged";
+            readonly size: number;
+            readonly edge: string | null;
+            readonly from: string;
+            readonly to: string;
+            readonly frames: number;
+            readonly ease: "linear" | "glide" | "settle" | "snap" | "in" | "out" | "swift";
+            readonly start: number;
+            readonly end: number;
+            readonly origin: {
+                readonly file: string;
+                readonly line: number;
+            } | null;
+            readonly style: "dissolve";
         })[];
     }[];
     readonly warnings: readonly string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tongue-core/project",
-  "version": "0.1.0-rc.2",
+  "version": "0.1.0-rc.4",
   "description": "Film projects: their shape, building one into film.json and a bundle per scene, film.json's schema and checks, and turning it back into a film. No Bun, Node or ffmpeg: runs in Bun, browsers and Workers.",
   "type": "module",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@tongue-core/film": "0.1.0-rc.2",
+    "@tongue-core/film": "0.1.0-rc.4",
     "sucrase": "3.35.1"
   },
   "peerDependencies": {