@vyr/engine 0.0.1 → 0.0.2

package/package.json

@@ -1,19 +1 @@
-{
-  "name": "@vyr/engine",
-  "version": "0.0.1",
-  "description": "",
-  "main": "./src/index.ts",
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "@vyr/locale": "0.0.1",
-    "tinycolor2": "1.6.0"
-  },
-  "devDependencies": {
-    "@types/tinycolor2": "1.4.6"
-  },
-  "files": [
-    "package.json",
-    "src/"
-  ]
-}
+{"name":"@vyr/engine","version":"0.0.2","description":"","main":"./src/index.ts","author":"","license":"MIT","dependencies":{"@vyr/locale":"0.0.2","tinycolor2":"1.6.0"},"devDependencies":{"@types/tinycolor2":"1.4.6"},"files":["package.json","src/"]}

package/src/Category.ts

@@ -5,7 +5,7 @@ class Category {
   static dataset = 'dataset'
   static style = 'style'
   static font = 'font'
-  static routine = 'routine'
+  static interaction = 'interaction'
   static texture = 'texture'
   static material = 'material'
   static geometry = 'geometry'
@@ -22,7 +22,7 @@ class Category {
   static datasetSuffix = `.${this.dataset}.json`
   static styleSuffix = `.${this.style}.json`
   static fontSuffix = `.${this.font}.json`
-  static routineSuffix = `.${this.routine}.json`
+  static interactionSuffix = `.${this.interaction}.json`
   static textureSuffix = `.${this.texture}.json`
   static materialSuffix = `.${this.material}.json`
   static geometrySuffix = `.${this.geometry}.json`
@@ -39,7 +39,7 @@ class Category {
     this.prefabSuffix,
     this.datasetSuffix,
     this.styleSuffix,
-    this.routineSuffix,
+    this.interactionSuffix,
     this.textureSuffix,
     this.materialSuffix,
     this.geometrySuffix,
@@ -49,7 +49,7 @@ class Category {
     this.prefab,
     this.dataset,
     this.style,
-    this.routine,
+    this.interaction,
     this.texture,
     this.material,
     this.geometry,
@@ -68,8 +68,8 @@ class Category {
       return this.style
     } else if (suffix === this.fontSuffix) {
       return this.font
-    } else if (suffix === this.routineSuffix) {
-      return this.routine
+    } else if (suffix === this.interactionSuffix) {
+      return this.interaction
     } else if (suffix === this.textureSuffix) {
       return this.texture
     } else if (suffix === this.materialSuffix) {
@@ -109,7 +109,7 @@ class Category {
     return result
   }
 
-  /**根据后缀判断是否为描述器类资产（场景，组合，材质，纹理，几何体） */
+  /**根据后缀判断是否为描述器类资产 */
   static isDescriptor(suffix: string, type: 'suffix' | 'category' = 'suffix') {
     const tests = type === 'suffix' ? Category.descriptorSuffixs : Category.descriptorCategorys
     return tests.includes(suffix)

package/src/Engine.ts

@@ -1,22 +1,16 @@
 import { language } from './locale'
-import { Descriptor, RoutineDescriptor, ServiceSchedulerDescriptor, StyleDescriptor, UpdateArgs } from './descriptor'
+import { ServiceSchedulerDescriptor, StyleDescriptor } from './descriptor'
 import { Generate } from './Generate'
 import { InputSystem } from './InputSystem'
 import { Listener } from './Listener'
-import { Compilation, Graphics } from './graphics'
+import { Compilation, TickArgs } from './graphics'
 import { setupStyle } from './setup';
-import { Asset } from './asset'
-import { RoutineInterpreter } from './interpreter'
 
 interface EngineData { }
 
 interface EngineListener {
-  beforeRender: (args: UpdateArgs) => void
-  afterRender: (args: UpdateArgs) => void
-}
-
-interface PickupUpdateArgs extends UpdateArgs {
-  mouse: { x: number; y: number }
+  beforeRender: (args: TickArgs) => void
+  afterRender: (args: TickArgs) => void
 }
 
 class Engine extends Listener<EngineListener> {
@@ -52,6 +46,8 @@ class Engine extends Listener<EngineListener> {
 
     const args = { delta }
 
+    this.compilation.foreach(graphics => graphics.args = args)
+
     this.inputSystem.process()
 
     this.compilation.process(this, args)
@@ -86,7 +82,11 @@ class Engine extends Listener<EngineListener> {
 
     window.dispatchEvent(new Event('resize'))
 
-    this.compilation.process(this, { delta: 0 })
+    const args = { delta: 0 }
+
+    this.compilation.foreach(graphics => graphics.args = args)
+
+    this.compilation.process(this, args)
   }
 
   clear() {
@@ -98,4 +98,4 @@ class Engine extends Listener<EngineListener> {
   }
 }
 
-export { PickupUpdateArgs, Engine }
+export { Engine }

package/src/actor/AnimationUnitActor.ts

@@ -1,7 +1,7 @@
 import { Euler, Quaternion, Vector2, Vector3 } from "../math"
-import { AnimationUnitDescriptor, Descriptor, UpdateArgs } from "../descriptor"
+import { AnimationUnitDescriptor, Descriptor } from "../descriptor"
 import { AnimationUnitInterpreter } from "../interpreter"
-import { Graphics } from "../graphics"
+import { Graphics, TickArgs } from "../graphics"
 import { ObjectUtils } from '../ObjectUtils'
 import { Color } from '../Color'
 import { Actor } from "./Actor"
@@ -91,7 +91,7 @@ abstract class AnimationUnitActor extends Actor {
         }
     }
 
-    update = (args: UpdateArgs) => {
+    update = (args: TickArgs) => {
         if (AnimationUnitInterpreter.enabled === false) return
         if (this.play === false) return
         const uptime = this.uptime + args.delta

package/src/actor/DivActor.ts

@@ -1,4 +1,4 @@
-import { DivDescriptor, StyleDescriptor, UpdateArgs } from "../descriptor"
+import { DivDescriptor, StyleDescriptor } from "../descriptor"
 import { Actor } from "./Actor"
 import { HTMLActor } from "./HTMActor"
 
@@ -52,13 +52,13 @@ class DivActor extends HTMLActor {
         }
     }
 
-    update(descriptor: DivDescriptor, args: UpdateArgs) {
+    update(descriptor: DivDescriptor) {
         const wrapper = this.getWrapper()
-        const style = this.getWrapperStyle(descriptor, args)
+        const style = this.getWrapperStyle(descriptor)
         this.setHTMLStyle(wrapper, style)
-        this.setHTMLInteraction(wrapper, descriptor, args)
-        this.setHTMLStyle(this.DOM, this.getLayoutStyle(descriptor, args))
-        const styleClass = [...this.getStyleClass(descriptor, args)]
+        this.setHTMLInteraction(wrapper, descriptor)
+        this.setHTMLStyle(this.DOM, this.getLayoutStyle(descriptor))
+        const styleClass = [...this.getStyleClass(descriptor)]
         if (descriptor.active) styleClass.push(StyleDescriptor.activeName)
         this.setStyleClass(this.DOM, styleClass)
         this.DOM.style.backgroundImage = descriptor.backroundIamge ? `url(${descriptor.backroundIamge})` : ''

package/src/actor/FragmentActor.ts

@@ -15,7 +15,7 @@ class FragmentActor extends Actor {
         const graphics = Actor.getGraphics(this)
         const parent = Descriptor.get(this._parent)
         if (parent instanceof Descriptor) {
-            const parentActor = graphics.getActor(parent, { delta: 0 })
+            const parentActor = graphics.getActor(parent)
             if (parentActor !== null) {
                 for (const actor of this.collection) parentActor.remove(actor)
             }
@@ -31,7 +31,7 @@ class FragmentActor extends Actor {
         const parent = Descriptor.get<Descriptor>(this._parent)
 
         if (parent instanceof Descriptor) {
-            const parentActor = graphics.getActor(parent, { delta: 0 })
+            const parentActor = graphics.getActor(parent)
             if (parentActor !== null) parentActor.add(actor)
         }
 
@@ -44,7 +44,7 @@ class FragmentActor extends Actor {
         const graphics = Actor.getGraphics(this)
         const parent = Descriptor.get<Descriptor>(this._parent)
         if (parent instanceof Descriptor) {
-            const parentActor = graphics.getActor(parent, { delta: 0 })
+            const parentActor = graphics.getActor(parent)
             if (parentActor !== null) parentActor.remove(actor)
         }
         ArrayUtils.remove(this.collection, actor)

package/src/actor/HTMActor.ts

@@ -1,6 +1,6 @@
+import { InteractionDescriptor, InteractionProperty } from "../interaction";
 import { Asset } from "../asset"
-import { Descriptor, InteractionProperty, HTMLDescriptor, HTMLStyle, RoutineDescriptor, StyleDescriptor, UpdateArgs } from "../descriptor"
-import { RoutineInterpreter } from "../interpreter";
+import { Descriptor, HTMLDescriptor, HTMLStyle, StyleDescriptor } from "../descriptor"
 import { Graphics } from "../graphics";
 import { Actor } from "./Actor"
 import { StyleActor } from "./StyleActor"
@@ -8,6 +8,9 @@ import { StyleActor } from "./StyleActor"
 abstract class HTMLActor extends Actor {
     static className = 'vyr-html-wrapper'
     static uuidKey = 'data-vyr-uuid'
+    static isTrigger(target: any, uuid: string): target is HTMLElement {
+        return target.getAttribute(HTMLActor.uuidKey) === uuid
+    }
     readonly uuid
     readonly unlisteners: Array<() => void> = []
     className?: string[]
@@ -29,7 +32,7 @@ abstract class HTMLActor extends Actor {
         return DOM
     }
 
-    getWrapperStyle(descriptor: HTMLDescriptor, args: UpdateArgs) {
+    getWrapperStyle(descriptor: HTMLDescriptor) {
         const style: HTMLStyle = {}
         style.pointerEvents = 'auto'
         style.flexGrow = descriptor.flexGrow + ''
@@ -87,7 +90,7 @@ abstract class HTMLActor extends Actor {
         return style
     }
 
-    getLayoutStyle(descriptor: HTMLDescriptor, args: UpdateArgs) {
+    getLayoutStyle(descriptor: HTMLDescriptor) {
         const style: HTMLStyle = {}
 
         style.display = descriptor.display
@@ -106,11 +109,11 @@ abstract class HTMLActor extends Actor {
         Object.assign(DOM.style, style)
     }
 
-    getStyleClass(descriptor: HTMLDescriptor, args: UpdateArgs) {
+    getStyleClass(descriptor: HTMLDescriptor) {
         const styleDescriptor = Asset.get<StyleDescriptor>(descriptor.style)
         if (styleDescriptor === null) return []
         const graphics = Actor.getGraphics(this)
-        const styleActor = graphics.getInterpreter(styleDescriptor).getActor<StyleActor>(descriptor, args)
+        const styleActor = graphics.getInterpreter(styleDescriptor).getActor<StyleActor>(descriptor)
         return styleActor.getClassName()
     }
 
@@ -126,16 +129,16 @@ abstract class HTMLActor extends Actor {
         delete this.className
     }
 
-    bindInteraction(DOM: HTMLElement, interaction: InteractionProperty, trigger: Descriptor, graphics: Graphics, args: UpdateArgs) {
-        const routine = Asset.get<RoutineDescriptor>(interaction.url)
-        const interpreter = graphics.getInterpreter<RoutineInterpreter>(routine)
+    bindInteraction(DOM: HTMLElement, property: InteractionProperty, trigger: Descriptor, graphics: Graphics,) {
+        const interaction = Asset.get<InteractionDescriptor>(property.url)
 
-        const eventArgs = { ...args, trigger }
         const listener = (e: Event) => {
-            e.stopPropagation()
-            interpreter.do(interaction.inputs, routine, eventArgs)
+            if (HTMLActor.isTrigger(e.target, this.uuid)) {
+                e.stopPropagation()
+                interaction.execute(property.inputs, graphics, trigger)
+            }
         }
-        const eid = graphics.engine.inputSystem.listen(interaction.type as any, listener, { target: DOM })
+        const eid = graphics.engine.inputSystem.listen(property.type as any, listener, { target: DOM })
         this.unlisteners.push(() => graphics.engine.inputSystem.unlisten(eid))
     }
 
@@ -144,11 +147,11 @@ abstract class HTMLActor extends Actor {
         this.unlisteners.length = 0
     }
 
-    setHTMLInteraction(DOM: HTMLElement, trigger: Descriptor, args: UpdateArgs) {
+    setHTMLInteraction(DOM: HTMLElement, trigger: Descriptor) {
         this.cleanInteraction()
         const graphics = HTMLActor.getGraphics(this)
         for (const interaction of trigger.interactions) {
-            if (interaction.url) this.bindInteraction(DOM, interaction, trigger, graphics, args)
+            if (interaction.url) this.bindInteraction(DOM, interaction, trigger, graphics)
         }
     }
 
@@ -158,7 +161,7 @@ abstract class HTMLActor extends Actor {
 
     abstract getWrapper(): HTMLElement | null
 
-    abstract update(descriptor: HTMLDescriptor, args: UpdateArgs): void
+    abstract update(descriptor: HTMLDescriptor): void
 }
 
 export {

package/src/actor/HTMServiceActor.ts

@@ -1,4 +1,4 @@
-import { HTMLServiceDescriptor, StyleDescriptor, UpdateArgs } from "../descriptor"
+import { HTMLServiceDescriptor, StyleDescriptor } from "../descriptor"
 import { Actor } from "./Actor"
 import { HTMLActor } from "./HTMActor"
 
@@ -45,10 +45,10 @@ class HTMLServiceActor extends HTMLActor {
         }
     }
 
-    update(descriptor: HTMLServiceDescriptor, args: UpdateArgs) {
+    update(descriptor: HTMLServiceDescriptor) {
         const wrapper = this.getWrapper()
-        this.setHTMLStyle(wrapper, this.getWrapperStyle(descriptor, args))
-        const styleClass = [...this.getStyleClass(descriptor, args)]
+        this.setHTMLStyle(wrapper, this.getWrapperStyle(descriptor))
+        const styleClass = [...this.getStyleClass(descriptor)]
         if (descriptor.active) styleClass.push(StyleDescriptor.activeName)
         this.setStyleClass(this.DOM, styleClass)
     }

package/src/actor/HTMTransformControllerActor.ts

@@ -1,7 +1,7 @@
 import { Vector2 } from "../math"
 import { Asset } from "../asset"
-import { Descriptor, HTMLDescriptor, HTMLTransformControllerChangeArgs, HTMLTransformControllerDescriptor, UpdateArgs } from "../descriptor"
-import { Scriptable } from "../Scriptable"
+import { Descriptor, HTMLDescriptor, HTMLTransformControllerChangeArgs, HTMLTransformControllerDescriptor } from "../descriptor"
+import { Scriptable } from "../interaction/Scriptable"
 import { Actor } from "./Actor"
 import { HTMLActor } from "./HTMActor"
 
@@ -98,13 +98,13 @@ class HTMLTransformControllerActor extends Actor {
         circle.style.cursor = [1, 3].includes(index) ? 'nesw-resize' : 'nwse-resize'
     }
 
-    listen(descriptor: HTMLTransformControllerDescriptor, args: UpdateArgs) {
+    listen(descriptor: HTMLTransformControllerDescriptor) {
         this.reset()
         const graphics = Actor.getGraphics(this)
-        const target = graphics.variableProxy.get<Descriptor>(descriptor.target, graphics, args)
+        const target = graphics.variableProxy.get<Descriptor>(descriptor.target, graphics)
         if (target instanceof HTMLDescriptor) {
 
-            const targetActor = graphics.getActor<HTMLActor>(target, args)
+            const targetActor = graphics.getActor<HTMLActor>(target)
             if (targetActor === null) return
 
             const wrapper = targetActor.getWrapper()
@@ -128,16 +128,21 @@ class HTMLTransformControllerActor extends Actor {
         this.reset()
     }
 
-    update(descriptor: HTMLTransformControllerDescriptor, args: UpdateArgs) {
-        this.listen(descriptor, args)
+    update(descriptor: HTMLTransformControllerDescriptor) {
+        this.listen(descriptor)
     }
 
     change = (type = 'change') => {
-        const scriptable = Asset.get<Scriptable>(this.descriptor.event)
+        const scriptable = Asset.get<Scriptable<HTMLTransformControllerChangeArgs>>(this.descriptor.event)
         if (scriptable === null) return
         const graphics = Actor.getGraphics(this)
-        const _args: HTMLTransformControllerChangeArgs = { delta: 0, event: { type, target: this.descriptor.target } }
-        scriptable.execute(this.descriptor, graphics, _args)
+        const _args: HTMLTransformControllerChangeArgs = {
+            event: { type, target: this.descriptor.target },
+            trigger: this.descriptor,
+            input: undefined,
+            result: undefined,
+        }
+        scriptable.execute(graphics, _args)
     }
 
     reset() {

package/src/asset/Asset.ts

@@ -1,15 +1,15 @@
 import { language } from "../locale"
 import { Category } from "../Category"
-import { DatasetDescriptor, Descriptor } from "../descriptor"
 import { AsyncTask } from "../AsyncTask"
-import { Scriptable } from '../Scriptable'
+import { DatasetDescriptor, Descriptor } from "../descriptor"
+import { InteractionDescriptor, Scriptable, ScriptableArgs } from "../interaction"
 import { AssetGraph } from "./AssetGraph"
 
 type JsonAsset = { [k: string]: any }
 type RawAsset = HTMLImageElement | ImageBitmap | HTMLAudioElement | AudioBuffer | HTMLVideoElement | string | JsonAsset
 type StaticFactory = (url: string, forced?: boolean) => Promise<any>
 type DescriptorProvider = () => Promise<Descriptor>
-type ScriptableProvider = () => Promise<{ default: typeof Scriptable }>
+type ScriptableProvider = () => Promise<{ default: typeof Scriptable<ScriptableArgs<any, any, any>> }>
 type AssetProperty = { url: string }
 type AssetPropertyCollection<T extends AssetProperty = AssetProperty> = T[]
 
@@ -139,8 +139,8 @@ class Asset {
 
     static get<U extends keyof SnowAssets>(url: U): SnowAssets[U]
     static get<T extends SnowAssets[keyof SnowAssets] = SnowAssets[keyof SnowAssets]>(url: keyof SnowAssets): T
-    static get<T extends RawAsset | Descriptor | null = Descriptor | null>(url: string): T
-    static get<T extends RawAsset | Descriptor | null = Descriptor | null>(url: string) {
+    static get<T extends RawAsset | InteractionDescriptor | Descriptor | null = Descriptor | null>(url: string): T
+    static get<T extends RawAsset | InteractionDescriptor | Descriptor | null = Descriptor | null>(url: string) {
         return (privateState.assetCache.get(url) ?? null) as T
     }
 
@@ -208,14 +208,15 @@ Asset.register(Category.material, factoryDescriptor)
 Asset.register(Category.geometry, factoryDescriptor)
 Asset.register(Category.texture, factoryDescriptor)
 Asset.register(Category.prefab, factoryDescriptor)
-Asset.register(Category.routine, factoryDescriptor)
+Asset.register(Category.interaction, factoryDescriptor)
+Asset.register(Category.scene, factoryDescriptor)
 
 const factoryDataset = async (url: string) => {
     const asset = await factoryDescriptor(url) as DatasetDescriptor
-    if (asset.auto) await asset.fetch()
+    // if (asset.auto) await asset.fetch()
+    
     return asset
 }
-
 Asset.register(Category.dataset, factoryDataset)
 
 const factoryJson = async (url: string) => {
@@ -225,24 +226,6 @@ const factoryJson = async (url: string) => {
 }
 Asset.register(Category.json, factoryJson)
 
-const factoryScene = (url: string, forced?: boolean) => {
-    return new Promise<Descriptor>(async (resolve, reject) => {
-        const sceneUrl = Asset.joinUrl(url)
-        try {
-            const res = await Asset.fetch(sceneUrl)
-
-            const scene = await res.text()
-
-            const sceneDes = Descriptor.create(Descriptor.deserialization(scene))
-
-            resolve(sceneDes)
-        } catch (error) {
-            reject(error)
-        }
-    })
-}
-Asset.register(Category.scene, factoryScene)
-
 const factoryScript = (url: string) => {
     return new Promise(async (resolve, reject) => {
         try {

package/src/asset/AssetGraph.ts

@@ -35,10 +35,10 @@ const privateState = {
 class Dependencide {
     all: string[] = []
     descriptor: string[] = []
+    interaction: string[] = []
     prefab: string[] = []
     dataset: string[] = []
     style: string[] = []
-    routine: string[] = []
     texture: string[] = []
     material: string[] = []
     geometry: string[] = []
@@ -50,10 +50,10 @@ class Dependencide {
         this.descriptor.push(url)
     }
 
-    foreach(cb: (url: string) => void) {
+    forEachForGraphics(cb: (url: string) => void) {
+        //Graphics遍历资产时，跳过 interaction prefab
         for (const url of this.dataset) cb(url)
         for (const url of this.style) cb(url)
-        for (const url of this.routine) cb(url)
         for (const url of this.texture) cb(url)
         for (const url of this.material) cb(url)
         for (const url of this.geometry) cb(url)
@@ -65,7 +65,7 @@ class Dependencide {
         this.prefab.length = 0
         this.dataset.length = 0
         this.style.length = 0
-        this.routine.length = 0
+        this.interaction.length = 0
         this.texture.length = 0
         this.material.length = 0
         this.geometry.length = 0

package/src/descriptor/DatasetDescriptor.ts

@@ -1,3 +1,4 @@
+import { HttpType } from "../utils/constants";
 import { Asset } from "../asset";
 import { observer } from "../graphics/Observer";
 import { DeserializationObject } from "../Serialization";
@@ -7,7 +8,18 @@ interface Data {
     [k: string]: any
 }
 
-class DatasetDescriptor extends Descriptor {
+interface DataConfig {
+    mode: string
+    key: string
+}
+
+interface HttpDataConfig extends DataConfig {
+    mode: 'http',
+    url: string
+    type: HttpType
+}
+
+class DatasetDescriptor<C extends DataConfig = HttpDataConfig> extends Descriptor {
     static type = 'Dataset'
 
     static getData<T = Data>(dataset: string) {
@@ -26,36 +38,18 @@ class DatasetDescriptor extends Descriptor {
         return Array.isArray(data) ? data : [data]
     }
 
-    private _extraData: Data = {}
     private _data!: Data
+    private _extraData: Data = {}
+    readonly dataConfigs: C[]
     defaultData: Data
-    url: string
-    auto: boolean
 
     constructor(descriptor: Partial<DeserializationObject<DatasetDescriptor>> = {}) {
         super(descriptor)
+        this.dataConfigs = descriptor.dataConfigs === undefined ? [] : Descriptor.deepClone(descriptor.dataConfigs)
         this.defaultData = descriptor.defaultData === undefined ? {} : Descriptor.deepClone(descriptor.defaultData)
-        this.url = descriptor.url ?? ''
-        this.auto = descriptor.auto ?? true
         this._updateData(this.defaultData)
     }
 
-    async fetch() {
-        if (!this.url) return
-        try {
-            const res = await Asset.fetch(Asset.joinUrl(this.url))
-            const data = await res.json()
-
-            if (Object.hasOwn(data, 'data')) {
-                if (data.data !== null && typeof data.data === 'object') this.setData(data.data)
-            } else {
-                this.setData(data)
-            }
-        } catch (error) {
-            console.warn(error)
-        }
-    }
-
     private _updateData(data: Data) {
         this._data = data
     }
@@ -82,11 +76,15 @@ class DatasetDescriptor extends Descriptor {
         const { _data, _extraData, ...rest } = this;
         return rest;
     }
+
+    setNeedsUpdate() { }
 }
 
 Descriptor.register(DatasetDescriptor)
 
 export {
     Data,
+    DataConfig,
+    HttpDataConfig,
     DatasetDescriptor
 }

package/src/descriptor/Descriptor.ts

@@ -5,7 +5,7 @@ import { Generate } from '../Generate'
 import { Traverser } from '../Traverser'
 import { ObjectUtils } from '../ObjectUtils'
 import { DeserializationObject, Serialization, SerializationObject } from '../Serialization'
-import { AssetProperty, AssetPropertyCollection } from '../asset'
+import { InteractionPropertyCollection } from '../interaction'
 import { observer } from '../graphics/Observer'
 
 /**描述器祖先节点 */
@@ -30,10 +30,6 @@ interface DescriptorPrefab {
     uuid: string
 }
 
-interface UpdateArgs {
-    delta: number
-}
-
 interface VariabConfig {
     type: 'key' | 'custom'
     enabled: boolean
@@ -43,24 +39,6 @@ interface VariabConfig {
 interface DescriptorVariables {
     [k: string]: VariabConfig
 }
-interface InteractionInput {
-    [param: string]: {
-        type?: 'data' | string
-        value: any
-    }
-}
-
-interface InteractionInputCollection {
-    [id: string]: InteractionInput
-}
-
-interface InteractionProperty extends AssetProperty {
-    uuid: string
-    type: string
-    inputs: InteractionInputCollection
-}
-
-interface InteractionPropertyCollection extends AssetPropertyCollection<InteractionProperty> { }
 
 const privateState = {
     classCollection: new Map<string, typeof Descriptor>(),
@@ -402,14 +380,9 @@ listenInstance('free', (uuid: string) => {
 
 export {
     Descriptor,
-    UpdateArgs,
     DescriptorAdjacency,
     DescriptorAncestor,
     DescriptorPrefab,
     VariabConfig,
     DescriptorVariables,
-    InteractionInput,
-    InteractionInputCollection,
-    InteractionProperty,
-    InteractionPropertyCollection,
 }

package/src/descriptor/HTMLTransformControllerDescriptor.ts

@@ -1,8 +1,8 @@
 import { DeserializationObject } from "../Serialization"
 import { ControllerDescriptor } from "./ControllerDescriptor"
-import { UpdateArgs } from "./Descriptor"
+import { ScriptableArgs } from "../interaction"
 
-interface HTMLTransformControllerChangeArgs extends UpdateArgs {
+interface HTMLTransformControllerChangeArgs extends ScriptableArgs<undefined, undefined, undefined> {
     event: {
         type: string
         target: string

package/src/descriptor/index.ts

@@ -2,7 +2,6 @@ export * from './Descriptor'
 export * from './DatasetDescriptor'
 export * from './StyleDescriptor'
 export * from './PrefabDescriptor'
-export * from './RoutineDescriptor'
 export * from './PrefabInstanceDescriptor'
 export * from './DynamicDescriptor'
 export * from './HTMLDescriptor'