@omnimedia/omnitool 1.1.0-77 → 1.1.0-78

package/README.md

@@ -115,14 +115,12 @@ Filter metadata for UI:
 
 ```ts
 import {
-	filterTypes,
-	filterSchemas,
-	getFilterDefaultParams
+	filters
 } from "@omnimedia/omnitool"
 
-const available = Object.entries(filterTypes)
-const schema = filterSchemas.BlurFilter
-const defaults = getFilterDefaultParams("BlurFilter")
+const available = Object.entries(filters)
+const blur = filters.blur
+const schema = blur.schema
 ```
 
 ## 🧭 Spatial Transforms

package/package.json

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

package/s/timeline/parts/filters.ts

@@ -127,7 +127,7 @@ const defineFilter = <TParams>() =>
 		schema: SchemaFromOptions<TParams> = {},
 	): FilterDefinition<TType, TParams> => ({type, schema})
 
-export const filterTypes = {
+export const filters = {
 	adjustment: defineFilter<PixiFilters.AdjustmentFilterOptions>()("AdjustmentFilter", {
 		gamma: num(0, 5, 1),
 		saturation: num(0, 5, 1),
@@ -430,7 +430,7 @@ export const filterTypes = {
 	}),
 } as const
 
-type FilterDefinitions = typeof filterTypes
+type FilterDefinitions = typeof filters
 type FilterDefinitionParams<T> =
 	T extends FilterDefinition<string, infer TParams>
 		? TParams
@@ -443,42 +443,11 @@ export type FilterOptions = {
 
 export type FilterType = FilterDefinitions[keyof FilterDefinitions]["type"]
 export type FilterParams<T extends FilterType = FilterType> = FilterOptions[T]
-export type FilterSchemas = {
-	[TName in keyof FilterDefinitions as FilterDefinitions[TName]["type"]]:
-		FilterDefinitions[TName]["schema"]
-}
-
-export const filterSchemas = Object.fromEntries(
-	Object.values(filterTypes).map(filter => [filter.type, filter.schema]),
-) as FilterSchemas
-
-const getDefaultValue =(config: FilterPropertyConfig): unknown => {
-	switch(config.type) {
-		case "number":
-		case "boolean":
-		case "color":
-		case "choice":
-			return config.default
-
-		case "object":
-			return Object.fromEntries(
-				Object.entries(config.properties).map(([key, value]) => [key, getDefaultValue(value)]),
-			)
-
-		case "array":
-			return config.items.map(getDefaultValue)
-	}
-}
-
-export const getFilterDefaultParams = <TFilter extends FilterType>(type: TFilter): FilterParams<TFilter> =>
-	Object.fromEntries(
-		Object.entries(filterSchemas[type]).map(([key, value]) => [key, getDefaultValue(value)]),
-	) as FilterParams<TFilter>
 
 export interface FilterAction<TFilter extends FilterType> {
 	<T extends FilterableItem>(item: T, params?: FilterParams<TFilter>): T
 	make(params?: FilterParams<TFilter>): Item.Filter<TFilter>
 }
 export type FilterActions = {
-	[TName in keyof typeof filterTypes]: FilterAction<(typeof filterTypes)[TName]["type"]>
+	[TName in keyof typeof filters]: FilterAction<(typeof filters)[TName]["type"]>
 }

package/s/timeline/sugar/helpers.ts

@@ -7,7 +7,7 @@ import {Media} from "../parts/media.js"
 import {TimelineFile} from "../parts/basics.js"
 import {FilterAction} from "../parts/filters.js"
 import {Crop, FilterableItem, Item} from "../parts/item.js"
-import {filterTypes, FilterParams, FilterType} from "../parts/filters.js"
+import {filters, FilterParams, FilterType} from "../parts/filters.js"
 
 export type Build<T extends Item.Any = Item.Any> = (o: O) => T
 
@@ -81,7 +81,7 @@ interface BuildFilterAction<TFilter extends FilterType> {
 }
 
 type BuildFilterActions = {
-	[TName in keyof typeof filterTypes]: BuildFilterAction<(typeof filterTypes)[TName]["type"]>
+	[TName in keyof typeof filters]: BuildFilterAction<(typeof filters)[TName]["type"]>
 }
 
 function makeFilter<TFilter extends FilterType>(
@@ -96,7 +96,7 @@ function makeFilter<TFilter extends FilterType>(
 }
 
 function makeFilters(): BuildFilterActions {
-	const names = Object.keys(filterTypes) as (keyof typeof filterTypes)[]
+	const names = Object.keys(filters) as (keyof typeof filters)[]
 	const entries = names.map(name => [
 		name,
 		makeFilter(o => o.filter[name] as FilterAction<any>)

package/s/timeline/sugar/o.ts

@@ -6,7 +6,7 @@ import {Id, TimelineFile} from "../parts/basics.js"
 import {Transform, TransformOptions, Vec2} from "../types.js"
 import {FilterAction, FilterActions} from "../parts/filters.js"
 import {Crop, Effect, FilterableItem, Item, Kind} from "../parts/item.js"
-import {filterTypes, FilterParams, FilterType} from "../parts/filters.js"
+import {filters, FilterParams, FilterType} from "../parts/filters.js"
 
 export class O {
 	constructor(public state: {timeline: TimelineFile}) {}
@@ -87,7 +87,7 @@ export class O {
 	}
 
 	#makeFilters = (): FilterActions => {
-		const entries = Object.entries(filterTypes)
+		const entries = Object.entries(filters)
 			.map(([name, filter]) => [name, this.#makeFilter(filter.type)])
 		return Object.fromEntries(entries) as FilterActions
 	}