@omnimedia/omnitool 1.1.0-7 → 1.1.0-9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@omnimedia/omnitool",
-	"version": "1.1.0-7",
+	"version": "1.1.0-9",
 	"description": "open source video processing tools",
 	"license": "MIT",
 	"author": "Przemysław Gałęzki",

package/s/timeline/sugar/builders.ts

@@ -1,102 +1,102 @@
-import {O} from "./o.js"
-import {Id} from "../parts/basics.js"
-import {Item} from "../parts/item.js"
-
-export class TimelineItem {
-	public readonly id: Id
-
-	constructor(public item: Item.Any) {
-		this.id = item.id
-	}
-
-	toJSON() {
-		return {
-			...this.item
-		}
-	}
-}
-
-abstract class VisualItem extends TimelineItem {
-  abstract spatial(spatial: Spatial): TimelineItem
-}
-
-export class Stack extends VisualItem {
-  constructor(private o: O, public item: Item.Stack) {
-  	super(item)
-  }
-
-  spatial(spatial: Spatial) {
-  	this.item.spatialId = spatial.item.id
-    return this
-  }
-
-  addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
-  	const result = fn(this.o)
-  	const items = Array.isArray(result) ? result : [result]
-    this.item.childrenIds.push(...items.map(c => c.item.id))
-    return this
-  }
-}
-
-export class Spatial extends TimelineItem {
-	constructor(public item: Item.Spatial) {super(item)}
-}
-
-export class Gap extends TimelineItem {
-	constructor(public item: Item.Gap) {super(item)}
-}
-
-export class Audio extends TimelineItem {
-	constructor(public item: Item.Audio) {super(item)}
-}
-
-export class Video extends VisualItem {
-  constructor(public item: Item.Video) {
-  	super(item)
-  }
-
-  spatial(spatial: Spatial) {
-  	this.item.spatialId = spatial.item.id
-    return this
-  }
-}
-
-export class Text extends VisualItem {
-  constructor(public item: Item.Text) {
-  	super(item)
-  }
-
-  color(color: string) {
-  	this.item.color = color
-		return this
-  }
-
-  spatial(spatial: Spatial) {
-  	this.item.spatialId = spatial.item.id
-    return this
-  }
-}
-
-export class Sequence extends VisualItem {
-	constructor(private o: O, public item: Item.Sequence) {
-		super(item)
-	}
-
-  spatial(spatial: Spatial) {
-  	this.item.spatialId = spatial.item.id
-    return this
-  }
-
-  addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
-  	const result = fn(this.o)
-  	const items = Array.isArray(result) ? result : [result]
-    this.item.childrenIds.push(...items.map(c => c.item.id))
-    return this
-  }
-}
-
-export class Transition extends TimelineItem {
-	constructor(public item: Item.Transition) {
-		super(item)
-	}
-}
+// import {O} from "./o.js"
+// import {Id} from "../parts/basics.js"
+// import {Item} from "../parts/item.js"
+//
+// export class TimelineItem {
+// 	public readonly id: Id
+//
+// 	constructor(public item: Item.Any) {
+// 		this.id = item.id
+// 	}
+//
+// 	toJSON() {
+// 		return {
+// 			...this.item
+// 		}
+// 	}
+// }
+//
+// abstract class VisualItem extends TimelineItem {
+//   abstract spatial(spatial: Spatial): TimelineItem
+// }
+//
+// export class Stack extends VisualItem {
+//   constructor(private o: O, public item: Item.Stack) {
+//   	super(item)
+//   }
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+//
+//   addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
+//   	const result = fn(this.o)
+//   	const items = Array.isArray(result) ? result : [result]
+//     this.item.childrenIds.push(...items.map(c => c.item.id))
+//     return this
+//   }
+// }
+//
+// export class Spatial extends TimelineItem {
+// 	constructor(public item: Item.Spatial) {super(item)}
+// }
+//
+// export class Gap extends TimelineItem {
+// 	constructor(public item: Item.Gap) {super(item)}
+// }
+//
+// export class Audio extends TimelineItem {
+// 	constructor(public item: Item.Audio) {super(item)}
+// }
+//
+// export class Video extends VisualItem {
+//   constructor(public item: Item.Video) {
+//   	super(item)
+//   }
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+// }
+//
+// export class Text extends VisualItem {
+//   constructor(public item: Item.Text) {
+//   	super(item)
+//   }
+//
+//   color(color: string) {
+//   	this.item.color = color
+// 		return this
+//   }
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+// }
+//
+// export class Sequence extends VisualItem {
+// 	constructor(private o: O, public item: Item.Sequence) {
+// 		super(item)
+// 	}
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+//
+//   addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
+//   	const result = fn(this.o)
+//   	const items = Array.isArray(result) ? result : [result]
+//     this.item.childrenIds.push(...items.map(c => c.item.id))
+//     return this
+//   }
+// }
+//
+// export class Transition extends TimelineItem {
+// 	constructor(public item: Item.Transition) {
+// 		super(item)
+// 	}
+// }

package/s/timeline/sugar/o.ts

@@ -1,57 +1,73 @@
 
-import {MapG} from "@e280/stz"
-import {Id} from "../parts/basics.js"
 import {Media} from "../parts/media.js"
+import {Id, TimelineFile} from "../parts/basics.js"
 import {Effect, Item, Kind} from "../parts/item.js"
 import {Transform, TransformOptions, Vec2} from "../types.js"
-import {Video, Gap, Sequence, Stack, Text, TimelineItem, Spatial, Audio, Transition} from "./builders.js"
 
 export class O {
 	#nextId = 0
-	#items = new MapG<Id, TimelineItem>()
 
-	#getId() {
-		return this.#nextId++
-	}
+	constructor(public state: {project: TimelineFile}) {}
 
-	register(item: TimelineItem) {
-		if (!this.#items.has(item.id))
-			this.#items.set(item.id, item)
-		return item.id
-	}
+  require<T extends Item.Any>(id: Id): T {
+    const item = this.state.project.items.find(item => item.id === id)
+    return item as T
+  }
 
-	get items() {
-		return [...this.#items.values()]
+	#getId() {
+		return this.#nextId++
 	}
 
-	get itemsMap() {
-		return this.#items
-	}
+  #mutate(fn: (project: TimelineFile) => TimelineFile) {
+    this.state.project = fn(this.state.project)
+  }
 
-  spatial = (transform: Transform) => {
+  spatial = (transform: Transform): Item.Spatial => {
   	const item: Item.Spatial = {
   		id: this.#getId(),
   		kind: Kind.Spatial,
   		transform
   	}
-  	const spatial = new Spatial(item)
-  	this.register(spatial)
-  	return spatial
+  	return item
   }
 
-	sequence = (...items: TimelineItem[]) => new Sequence(this, {
-		id: this.#getId(),
-		kind: Kind.Sequence,
-		childrenIds: items.map((item) => this.register(item))
-	})
+	sequence = (...items: Item.Any[]): Item.Any => {
+		const item =  {
+			id: this.#getId(),
+			kind: Kind.Sequence,
+			childrenIds: items.map(item => item.id)
+		} as Item.Sequence
 
-	stack = (...items: TimelineItem[]) => new Stack(this, {
-		kind: Kind.Stack,
-		id: this.#getId(),
-		childrenIds: items.map(item => this.register(item))
-	})
+		this.#mutate(state => {
+			state.items.push(item, ...items)
+			return state
+		})
+
+		return item
+	}
+
+	stack = (...items: Item.Any[]): Item.Any => {
+		const item = {
+			kind: Kind.Stack,
+			id: this.#getId(),
+			childrenIds: items.map(item => item.id)
+		} as Item.Stack
+
+		this.#mutate(state => {
+			state.items.push(item, ...items)
+			return state
+		})
+
+		return item
+	}
+
+	video = (
+		media: Media,
+		options?: {
+			start?: number,
+			duration?: number
+		}): Item.Video => {
 
-	video = (media: Media, options?: {start?: number, duration?: number}) => {
 		if(!media.hasVideo)
 			throw new Error(`Video clip error: media "${media.datafile.filename}" has no video track.`)
 
@@ -63,10 +79,16 @@ export class O {
 			duration: options?.duration ?? media.duration
 		}
 
-		return new Video(item)
+		return item
 	}
 
-	audio = (media: Media, options?: {start?: number, duration?: number}) => {
+	audio = (
+		media: Media,
+		options?: {
+			start?: number,
+			duration?: number
+		}): Item.Audio => {
+
 		if(!media.hasAudio)
 			throw new Error(`Audio clip error: media "${media.datafile.filename}" has no audio track.`)
 
@@ -78,24 +100,24 @@ export class O {
 			duration: options?.duration ?? media.duration
 		}
 
-		return new Audio(item)
+		return item
 	}
 
-	text = (content: string) => new Text({
+	text = (content: string): Item.Text => ({
 		id: this.#getId(),
 		content,
 		kind: Kind.Text,
 		color: "#FFFFF"
 	})
 
-	gap = (duration: number) => new Gap({
+	gap = (duration: number): Item.Gap => ({
 		id: this.#getId(),
 		kind: Kind.Gap,
 		duration
 	})
 
 	transition = {
-		crossfade: (duration: number) => new Transition({
+		crossfade: (duration: number): Item.Transition => ({
 			id: this.#getId(),
 			kind: Kind.Transition,
 			effect: Effect.Crossfade,
@@ -115,5 +137,14 @@ export class O {
     const rotation = options?.rotation ?? 0
     return [position, scale, rotation]
   }
+
+  addChildren(parent: Item.Stack | Item.Sequence, ...items: Item.Any[]) {
+		this.#mutate(state => {
+			const parentItem = state.items.find(({id}) => id === parent.id) as Item.Stack
+			parentItem.childrenIds.push(...items.map(item => item.id))
+			state.items.push(...items)
+			return state
+		})
+  }
 }
 

package/s/timeline/sugar/omni.ts

@@ -1,8 +1,7 @@
 
 import {O} from "./o.js"
-import {Timeline} from "../timeline.js"
+import {Item} from "../parts/item.js"
 import {Media} from "../parts/media.js"
-import {TimelineItem} from "./builders.js"
 import {Datafile} from "../utils/datafile.js"
 import {TimelineFile} from "../parts/basics.js"
 import {Export} from "../parts/compositor/export.js"
@@ -19,11 +18,19 @@ export class Omni {
 		))) as {[K in keyof S]: Media}
 	}
 
-	timeline = (fn: (o: O) => TimelineItem): Timeline => {
-		const o = new O()
+	timeline = (fn: (o: O) => Item.Any): TimelineFile => {
+		const o = new O({
+			project: {
+				format: "timeline",
+				info: "https://omniclip.app/",
+				version: 0,
+				items: [],
+				rootId: 0
+			}
+		})
 		const root = fn(o)
-		o.register(root)
-		return new Timeline(root, o.itemsMap)
+		o.state.project.rootId = root.id
+		return o.state.project
 	}
 
 	render = async (timeline: TimelineFile, config: RenderConfig) => {

package/x/index.html

@@ -85,7 +85,7 @@ canvas {
 				<body>
 
 	<section>
-		<h1>Omnitool <small>v1.1.0-7</small></h1>
+		<h1>Omnitool <small>v1.1.0-9</small></h1>
 		<button class=fetch>fetch</button>
 		<input type="file" class="file-input">
 		<div class=results></div>

package/x/timeline/sugar/builders.d.ts

@@ -1,96 +1 @@
-import { O } from "./o.js";
-import { Id } from "../parts/basics.js";
-import { Item } from "../parts/item.js";
-export declare class TimelineItem {
-    item: Item.Any;
-    readonly id: Id;
-    constructor(item: Item.Any);
-    toJSON(): {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Spatial;
-        transform: import("../types.js").Transform;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Gap;
-        duration: number;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Sequence;
-        childrenIds: Id[];
-        spatialId?: Id;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Stack;
-        childrenIds: Id[];
-        spatialId?: Id;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Video;
-        mediaHash: import("../parts/basics.js").Hash;
-        start: number;
-        duration: number;
-        spatialId?: Id;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Audio;
-        mediaHash: import("../parts/basics.js").Hash;
-        start: number;
-        duration: number;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Text;
-        content: string;
-        spatialId?: Id;
-        color: string;
-    } | {
-        id: Id;
-        kind: import("../parts/item.js").Kind.Transition;
-        effect: import("../parts/item.js").Effect.Crossfade;
-        duration: number;
-    };
-}
-declare abstract class VisualItem extends TimelineItem {
-    abstract spatial(spatial: Spatial): TimelineItem;
-}
-export declare class Stack extends VisualItem {
-    private o;
-    item: Item.Stack;
-    constructor(o: O, item: Item.Stack);
-    spatial(spatial: Spatial): this;
-    addChildren(fn: (o: O) => TimelineItem | TimelineItem[]): this;
-}
-export declare class Spatial extends TimelineItem {
-    item: Item.Spatial;
-    constructor(item: Item.Spatial);
-}
-export declare class Gap extends TimelineItem {
-    item: Item.Gap;
-    constructor(item: Item.Gap);
-}
-export declare class Audio extends TimelineItem {
-    item: Item.Audio;
-    constructor(item: Item.Audio);
-}
-export declare class Video extends VisualItem {
-    item: Item.Video;
-    constructor(item: Item.Video);
-    spatial(spatial: Spatial): this;
-}
-export declare class Text extends VisualItem {
-    item: Item.Text;
-    constructor(item: Item.Text);
-    color(color: string): this;
-    spatial(spatial: Spatial): this;
-}
-export declare class Sequence extends VisualItem {
-    private o;
-    item: Item.Sequence;
-    constructor(o: O, item: Item.Sequence);
-    spatial(spatial: Spatial): this;
-    addChildren(fn: (o: O) => TimelineItem | TimelineItem[]): this;
-}
-export declare class Transition extends TimelineItem {
-    item: Item.Transition;
-    constructor(item: Item.Transition);
-}
 export {};

package/x/timeline/sugar/builders.js

@@ -1,108 +1,104 @@
-export class TimelineItem {
-    item;
-    id;
-    constructor(item) {
-        this.item = item;
-        this.id = item.id;
-    }
-    toJSON() {
-        return {
-            ...this.item
-        };
-    }
-}
-class VisualItem extends TimelineItem {
-}
-export class Stack extends VisualItem {
-    o;
-    item;
-    constructor(o, item) {
-        super(item);
-        this.o = o;
-        this.item = item;
-    }
-    spatial(spatial) {
-        this.item.spatialId = spatial.item.id;
-        return this;
-    }
-    addChildren(fn) {
-        const result = fn(this.o);
-        const items = Array.isArray(result) ? result : [result];
-        this.item.childrenIds.push(...items.map(c => c.item.id));
-        return this;
-    }
-}
-export class Spatial extends TimelineItem {
-    item;
-    constructor(item) {
-        super(item);
-        this.item = item;
-    }
-}
-export class Gap extends TimelineItem {
-    item;
-    constructor(item) {
-        super(item);
-        this.item = item;
-    }
-}
-export class Audio extends TimelineItem {
-    item;
-    constructor(item) {
-        super(item);
-        this.item = item;
-    }
-}
-export class Video extends VisualItem {
-    item;
-    constructor(item) {
-        super(item);
-        this.item = item;
-    }
-    spatial(spatial) {
-        this.item.spatialId = spatial.item.id;
-        return this;
-    }
-}
-export class Text extends VisualItem {
-    item;
-    constructor(item) {
-        super(item);
-        this.item = item;
-    }
-    color(color) {
-        this.item.color = color;
-        return this;
-    }
-    spatial(spatial) {
-        this.item.spatialId = spatial.item.id;
-        return this;
-    }
-}
-export class Sequence extends VisualItem {
-    o;
-    item;
-    constructor(o, item) {
-        super(item);
-        this.o = o;
-        this.item = item;
-    }
-    spatial(spatial) {
-        this.item.spatialId = spatial.item.id;
-        return this;
-    }
-    addChildren(fn) {
-        const result = fn(this.o);
-        const items = Array.isArray(result) ? result : [result];
-        this.item.childrenIds.push(...items.map(c => c.item.id));
-        return this;
-    }
-}
-export class Transition extends TimelineItem {
-    item;
-    constructor(item) {
-        super(item);
-        this.item = item;
-    }
-}
+export {};
+// import {O} from "./o.js"
+// import {Id} from "../parts/basics.js"
+// import {Item} from "../parts/item.js"
+//
+// export class TimelineItem {
+// 	public readonly id: Id
+//
+// 	constructor(public item: Item.Any) {
+// 		this.id = item.id
+// 	}
+//
+// 	toJSON() {
+// 		return {
+// 			...this.item
+// 		}
+// 	}
+// }
+//
+// abstract class VisualItem extends TimelineItem {
+//   abstract spatial(spatial: Spatial): TimelineItem
+// }
+//
+// export class Stack extends VisualItem {
+//   constructor(private o: O, public item: Item.Stack) {
+//   	super(item)
+//   }
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+//
+//   addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
+//   	const result = fn(this.o)
+//   	const items = Array.isArray(result) ? result : [result]
+//     this.item.childrenIds.push(...items.map(c => c.item.id))
+//     return this
+//   }
+// }
+//
+// export class Spatial extends TimelineItem {
+// 	constructor(public item: Item.Spatial) {super(item)}
+// }
+//
+// export class Gap extends TimelineItem {
+// 	constructor(public item: Item.Gap) {super(item)}
+// }
+//
+// export class Audio extends TimelineItem {
+// 	constructor(public item: Item.Audio) {super(item)}
+// }
+//
+// export class Video extends VisualItem {
+//   constructor(public item: Item.Video) {
+//   	super(item)
+//   }
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+// }
+//
+// export class Text extends VisualItem {
+//   constructor(public item: Item.Text) {
+//   	super(item)
+//   }
+//
+//   color(color: string) {
+//   	this.item.color = color
+// 		return this
+//   }
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+// }
+//
+// export class Sequence extends VisualItem {
+// 	constructor(private o: O, public item: Item.Sequence) {
+// 		super(item)
+// 	}
+//
+//   spatial(spatial: Spatial) {
+//   	this.item.spatialId = spatial.item.id
+//     return this
+//   }
+//
+//   addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
+//   	const result = fn(this.o)
+//   	const items = Array.isArray(result) ? result : [result]
+//     this.item.childrenIds.push(...items.map(c => c.item.id))
+//     return this
+//   }
+// }
+//
+// export class Transition extends TimelineItem {
+// 	constructor(public item: Item.Transition) {
+// 		super(item)
+// 	}
+// }
 //# sourceMappingURL=builders.js.map

package/x/timeline/sugar/builders.js.map

@@ -1 +1 @@
-{"version":3,"file":"builders.js","sourceRoot":"","sources":["../../../s/timeline/sugar/builders.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builders.js","sourceRoot":"","sources":["../../../s/timeline/sugar/builders.ts"],"names":[],"mappings":";AAAA,2BAA2B;AAC3B,wCAAwC;AACxC,wCAAwC;AACxC,EAAE;AACF,8BAA8B;AAC9B,0BAA0B;AAC1B,EAAE;AACF,wCAAwC;AACxC,sBAAsB;AACtB,KAAK;AACL,EAAE;AACF,cAAc;AACd,aAAa;AACb,kBAAkB;AAClB,MAAM;AACN,KAAK;AACL,IAAI;AACJ,EAAE;AACF,mDAAmD;AACnD,qDAAqD;AACrD,IAAI;AACJ,EAAE;AACF,0CAA0C;AAC1C,yDAAyD;AACzD,iBAAiB;AACjB,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,EAAE;AACF,+DAA+D;AAC/D,+BAA+B;AAC/B,6DAA6D;AAC7D,+DAA+D;AAC/D,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,8CAA8C;AAC9C,wDAAwD;AACxD,IAAI;AACJ,EAAE;AACF,0CAA0C;AAC1C,oDAAoD;AACpD,IAAI;AACJ,EAAE;AACF,4CAA4C;AAC5C,sDAAsD;AACtD,IAAI;AACJ,EAAE;AACF,0CAA0C;AAC1C,2CAA2C;AAC3C,iBAAiB;AACjB,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,yCAAyC;AACzC,0CAA0C;AAC1C,iBAAiB;AACjB,MAAM;AACN,EAAE;AACF,2BAA2B;AAC3B,6BAA6B;AAC7B,gBAAgB;AAChB,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,6CAA6C;AAC7C,2DAA2D;AAC3D,gBAAgB;AAChB,KAAK;AACL,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,EAAE;AACF,+DAA+D;AAC/D,+BAA+B;AAC/B,6DAA6D;AAC7D,+DAA+D;AAC/D,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,iDAAiD;AACjD,+CAA+C;AAC/C,gBAAgB;AAChB,KAAK;AACL,IAAI"}

package/x/timeline/sugar/o.d.ts

@@ -1,27 +1,32 @@
-import { MapG } from "@e280/stz";
 import { Media } from "../parts/media.js";
+import { Id, TimelineFile } from "../parts/basics.js";
+import { Item } from "../parts/item.js";
 import { Transform, TransformOptions } from "../types.js";
-import { Video, Gap, Sequence, Stack, Text, TimelineItem, Spatial, Audio, Transition } from "./builders.js";
 export declare class O {
     #private;
-    register(item: TimelineItem): number;
-    get items(): TimelineItem[];
-    get itemsMap(): MapG<number, TimelineItem>;
-    spatial: (transform: Transform) => Spatial;
-    sequence: (...items: TimelineItem[]) => Sequence;
-    stack: (...items: TimelineItem[]) => Stack;
+    state: {
+        project: TimelineFile;
+    };
+    constructor(state: {
+        project: TimelineFile;
+    });
+    require<T extends Item.Any>(id: Id): T;
+    spatial: (transform: Transform) => Item.Spatial;
+    sequence: (...items: Item.Any[]) => Item.Any;
+    stack: (...items: Item.Any[]) => Item.Any;
     video: (media: Media, options?: {
         start?: number;
         duration?: number;
-    }) => Video;
+    }) => Item.Video;
     audio: (media: Media, options?: {
         start?: number;
         duration?: number;
-    }) => Audio;
-    text: (content: string) => Text;
-    gap: (duration: number) => Gap;
+    }) => Item.Audio;
+    text: (content: string) => Item.Text;
+    gap: (duration: number) => Item.Gap;
     transition: {
-        crossfade: (duration: number) => Transition;
+        crossfade: (duration: number) => Item.Transition;
     };
     transform: (options?: TransformOptions) => Transform;
+    addChildren(parent: Item.Stack | Item.Sequence, ...items: Item.Any[]): void;
 }

package/x/timeline/sugar/o.js

@@ -1,22 +1,19 @@
-import { MapG } from "@e280/stz";
 import { Effect, Kind } from "../parts/item.js";
-import { Video, Gap, Sequence, Stack, Text, Spatial, Audio, Transition } from "./builders.js";
 export class O {
+    state;
     #nextId = 0;
-    #items = new MapG();
-    #getId() {
-        return this.#nextId++;
+    constructor(state) {
+        this.state = state;
     }
-    register(item) {
-        if (!this.#items.has(item.id))
-            this.#items.set(item.id, item);
-        return item.id;
+    require(id) {
+        const item = this.state.project.items.find(item => item.id === id);
+        return item;
     }
-    get items() {
-        return [...this.#items.values()];
+    #getId() {
+        return this.#nextId++;
     }
-    get itemsMap() {
-        return this.#items;
+    #mutate(fn) {
+        this.state.project = fn(this.state.project);
     }
     spatial = (transform) => {
         const item = {
@@ -24,20 +21,32 @@ export class O {
             kind: Kind.Spatial,
             transform
         };
-        const spatial = new Spatial(item);
-        this.register(spatial);
-        return spatial;
+        return item;
+    };
+    sequence = (...items) => {
+        const item = {
+            id: this.#getId(),
+            kind: Kind.Sequence,
+            childrenIds: items.map(item => item.id)
+        };
+        this.#mutate(state => {
+            state.items.push(item, ...items);
+            return state;
+        });
+        return item;
+    };
+    stack = (...items) => {
+        const item = {
+            kind: Kind.Stack,
+            id: this.#getId(),
+            childrenIds: items.map(item => item.id)
+        };
+        this.#mutate(state => {
+            state.items.push(item, ...items);
+            return state;
+        });
+        return item;
     };
-    sequence = (...items) => new Sequence(this, {
-        id: this.#getId(),
-        kind: Kind.Sequence,
-        childrenIds: items.map((item) => this.register(item))
-    });
-    stack = (...items) => new Stack(this, {
-        kind: Kind.Stack,
-        id: this.#getId(),
-        childrenIds: items.map(item => this.register(item))
-    });
     video = (media, options) => {
         if (!media.hasVideo)
             throw new Error(`Video clip error: media "${media.datafile.filename}" has no video track.`);
@@ -48,7 +57,7 @@ export class O {
             start: options?.start ?? 0,
             duration: options?.duration ?? media.duration
         };
-        return new Video(item);
+        return item;
     };
     audio = (media, options) => {
         if (!media.hasAudio)
@@ -60,21 +69,21 @@ export class O {
             start: options?.start ?? 0,
             duration: options?.duration ?? media.duration
         };
-        return new Audio(item);
+        return item;
     };
-    text = (content) => new Text({
+    text = (content) => ({
         id: this.#getId(),
         content,
         kind: Kind.Text,
         color: "#FFFFF"
     });
-    gap = (duration) => new Gap({
+    gap = (duration) => ({
         id: this.#getId(),
         kind: Kind.Gap,
         duration
     });
     transition = {
-        crossfade: (duration) => new Transition({
+        crossfade: (duration) => ({
             id: this.#getId(),
             kind: Kind.Transition,
             effect: Effect.Crossfade,
@@ -93,5 +102,13 @@ export class O {
         const rotation = options?.rotation ?? 0;
         return [position, scale, rotation];
     };
+    addChildren(parent, ...items) {
+        this.#mutate(state => {
+            const parentItem = state.items.find(({ id }) => id === parent.id);
+            parentItem.childrenIds.push(...items.map(item => item.id));
+            state.items.push(...items);
+            return state;
+        });
+    }
 }
 //# sourceMappingURL=o.js.map

package/x/timeline/sugar/o.js.map

@@ -1 +1 @@
-{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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"}

package/x/timeline/sugar/omni.d.ts

@@ -1,7 +1,6 @@
 import { O } from "./o.js";
-import { Timeline } from "../timeline.js";
+import { Item } from "../parts/item.js";
 import { Media } from "../parts/media.js";
-import { TimelineItem } from "./builders.js";
 import { Datafile } from "../utils/datafile.js";
 import { TimelineFile } from "../parts/basics.js";
 import { ResourcePool } from "../parts/resource-pool.js";
@@ -10,6 +9,6 @@ export declare class Omni {
     #private;
     resources: ResourcePool;
     load: <S extends Record<string, Promise<Datafile>>>(spec: S) => Promise<{ [K in keyof S]: Media; }>;
-    timeline: (fn: (o: O) => TimelineItem) => Timeline;
+    timeline: (fn: (o: O) => Item.Any) => TimelineFile;
     render: (timeline: TimelineFile, config: RenderConfig) => Promise<void>;
 }

package/x/timeline/sugar/omni.js

@@ -1,5 +1,4 @@
 import { O } from "./o.js";
-import { Timeline } from "../timeline.js";
 import { Export } from "../parts/compositor/export.js";
 import { ResourcePool } from "../parts/resource-pool.js";
 export class Omni {
@@ -9,10 +8,18 @@ export class Omni {
         return Object.fromEntries(await Promise.all(Object.entries(spec).map(async ([key, value]) => [key, await this.resources.store(await value)])));
     };
     timeline = (fn) => {
-        const o = new O();
+        const o = new O({
+            project: {
+                format: "timeline",
+                info: "https://omniclip.app/",
+                version: 0,
+                items: [],
+                rootId: 0
+            }
+        });
         const root = fn(o);
-        o.register(root);
-        return new Timeline(root, o.itemsMap);
+        o.state.project.rootId = root.id;
+        return o.state.project;
     };
     render = async (timeline, config) => {
         await this.#export.render(timeline);

package/x/timeline/sugar/omni.js.map

@@ -1 +1 @@
-{"version":3,"file":"omni.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AACxB,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAKvC,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAA;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAA;AAGtD,MAAM,OAAO,IAAI;IAChB,SAAS,GAAG,IAAI,YAAY,EAAE,CAAA;IAC9B,OAAO,GAAG,IAAI,MAAM,EAAE,CAAA;IAEtB,IAAI,GAAG,KAAK,EAA8C,IAAO,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CACnE,KAAK,EAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CACrE,CAAC,CAA4B,CAAA;IAC/B,CAAC,CAAA;IAED,QAAQ,GAAG,CAAC,EAA0B,EAAY,EAAE;QACnD,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAA;QACjB,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAChB,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC,CAAA;IAED,MAAM,GAAG,KAAK,EAAE,QAAsB,EAAE,MAAoB,EAAE,EAAE;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAA;CACD"}
+{"version":3,"file":"omni.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAKxB,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAA;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAA;AAGtD,MAAM,OAAO,IAAI;IAChB,SAAS,GAAG,IAAI,YAAY,EAAE,CAAA;IAC9B,OAAO,GAAG,IAAI,MAAM,EAAE,CAAA;IAEtB,IAAI,GAAG,KAAK,EAA8C,IAAO,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CACnE,KAAK,EAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CACrE,CAAC,CAA4B,CAAA;IAC/B,CAAC,CAAA;IAED,QAAQ,GAAG,CAAC,EAAsB,EAAgB,EAAE;QACnD,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YACf,OAAO,EAAE;gBACR,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,CAAC;aACT;SACD,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;QAChC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;IACvB,CAAC,CAAA;IAED,MAAM,GAAG,KAAK,EAAE,QAAsB,EAAE,MAAoB,EAAE,EAAE;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAA;CACD"}

package/s/timeline/timeline.ts

@@ -1,22 +0,0 @@
-import {TimelineItem} from "./sugar/builders.js"
-import {Id, TimelineFile} from "./parts/basics.js"
-
-export class Timeline {
-  constructor(public root: TimelineItem, private items: Map<Id, TimelineItem>) {}
-
-  require<T extends TimelineItem>(id: Id): T {
-    const item = this.items.get(id)
-    return item as T
-  }
-
-  toJSON(): TimelineFile {
-    return {
-			format: "timeline",
-			info: "https://omniclip.app/",
-			version: 0,
-			rootId: this.root.item.id,
-			items: Array.from(this.items.values()).map(item => item.toJSON())
-    }
-  }
-}
-

package/x/timeline/timeline.d.ts

@@ -1,9 +0,0 @@
-import { TimelineItem } from "./sugar/builders.js";
-import { Id, TimelineFile } from "./parts/basics.js";
-export declare class Timeline {
-    root: TimelineItem;
-    private items;
-    constructor(root: TimelineItem, items: Map<Id, TimelineItem>);
-    require<T extends TimelineItem>(id: Id): T;
-    toJSON(): TimelineFile;
-}

package/x/timeline/timeline.js

@@ -1,22 +0,0 @@
-export class Timeline {
-    root;
-    items;
-    constructor(root, items) {
-        this.root = root;
-        this.items = items;
-    }
-    require(id) {
-        const item = this.items.get(id);
-        return item;
-    }
-    toJSON() {
-        return {
-            format: "timeline",
-            info: "https://omniclip.app/",
-            version: 0,
-            rootId: this.root.item.id,
-            items: Array.from(this.items.values()).map(item => item.toJSON())
-        };
-    }
-}
-//# sourceMappingURL=timeline.js.map

package/x/timeline/timeline.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeline.js","sourceRoot":"","sources":["../../s/timeline/timeline.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,QAAQ;IACA;IAA4B;IAA/C,YAAmB,IAAkB,EAAU,KAA4B;QAAxD,SAAI,GAAJ,IAAI,CAAc;QAAU,UAAK,GAAL,KAAK,CAAuB;IAAG,CAAC;IAE/E,OAAO,CAAyB,EAAM;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC/B,OAAO,IAAS,CAAA;IAClB,CAAC;IAED,MAAM;QACJ,OAAO;YACR,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,uBAAuB;YAC7B,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACzB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;SAC/D,CAAA;IACH,CAAC;CACF"}