@vyr/engine 0.0.33 → 0.0.34

package/src/graphics/Compilation.ts

@@ -1,27 +1,27 @@
 import { Engine } from "../Engine";
 import { Graphics, TickArgs } from "./Graphics";
 import { Asset } from "../asset";
-import { AnimationUnitDescriptor, ServiceSchedulerDescriptor } from "../descriptor";
+import { AnimationUnit, Scene } from "../descriptor";
 
-class Compilation {
+export class Compilation {
     private collection = new Map<string, Graphics>()
 
-    get(scheduler: ServiceSchedulerDescriptor) {
-        return (this.collection.get(scheduler.uuid) ?? null) as Graphics
+    get(scene: Scene) {
+        return (this.collection.get(scene.uuid) ?? null) as Graphics
     }
 
-    delete(scheduler: ServiceSchedulerDescriptor) {
-        const graphics = this.collection.get(scheduler.uuid)
+    delete(scene: Scene) {
+        const graphics = this.collection.get(scene.uuid)
         if (graphics === undefined) return
         graphics.unlisten()
-        this.collection.delete(scheduler.uuid)
+        this.collection.delete(scene.uuid)
     }
 
-    ensureExists(url: string, scheduler: ServiceSchedulerDescriptor, engine: Engine) {
-        let graphics = this.collection.get(scheduler.uuid)
+    ensureExists(url: string, scene: Scene, engine: Engine) {
+        let graphics = this.collection.get(scene.uuid)
         if (graphics === undefined) {
-            graphics = new Graphics(url, scheduler, engine)
-            this.collection.set(scheduler.uuid, graphics)
+            graphics = new Graphics(url, scene, engine)
+            this.collection.set(scene.uuid, graphics)
         }
         return graphics
     }
@@ -30,8 +30,8 @@ class Compilation {
         graphics.listen()
     }
 
-    unlisten(scheduler: ServiceSchedulerDescriptor) {
-        this.delete(scheduler)
+    unlisten(scene: Scene) {
+        this.delete(scene)
     }
 
     foreach(executor: (graphics: Graphics) => void) {
@@ -50,7 +50,7 @@ class Compilation {
             graphics.clear()
         })
 
-        engine.trigger(AnimationUnitDescriptor.type, args)
+        engine.trigger(AnimationUnit.type, args)
 
         this.foreach((graphics) => graphics.beforeRender())
 
@@ -64,11 +64,7 @@ class Compilation {
     clear() {
         const collection = this.collection.values()
         for (const graphics of collection) {
-            this.unlisten(graphics.scheduler)
+            this.unlisten(graphics.scene)
         }
     }
-}
-
-export {
-    Compilation
 }

package/src/graphics/Graphics.ts

@@ -1,30 +1,30 @@
 import { language } from '../locale'
 import { ArrayUtils } from "../ArrayUtils";
 import { Asset, Dependencide } from "../asset";
-import { DatasetDescriptor, Descriptor, HTMLDescriptor, HTMLServiceDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor } from "../descriptor";
+import { Descriptor, HTMLService, Service, Scene, Interaction } from "../descriptor";
 import { privateState } from "../interpreter/Interpreter";
-import { Interpreter, ServiceInterpreter, ServiceSchedulerInterpreter } from "../interpreter";
+import { Interpreter, ServiceInterpreter, SceneInterpreter } from "../interpreter";
 import { observer, UpdateDepsWatcherArgs, UpdateWatcherArgs, WatcherArgs } from "./Observer";
 import { Operation, Queue, Unit } from "./Unit";
 import { Actor } from '../actor/Actor';
+import { HTMLActor } from '../actor/HTMLActor';
 import { UnitCollection } from "./Collection";
 import { VariableProxy } from "./VariableProxy";
 import { Engine } from '../Engine';
-import { InteractionDescriptor } from '../interaction';
+import { isService, isHTML } from '../utils';
 
-interface TickArgs {
+export interface TickArgs {
     delta: number
 }
 
-interface PickupObject {
+export interface PickupObject {
     [k: string]: any
     uuid: string
-    generatedBy: string
 }
 
-type OverrideUpdate = (descriptor: Descriptor, interpreter: Interpreter) => void
+export type OverrideUpdate = (descriptor: Descriptor, interpreter: Interpreter) => void
 
-class Graphics {
+export class Graphics {
     static createInterpreter<T extends Interpreter = Interpreter>(descriptor: Descriptor, graphics: Graphics) {
         const Class = Interpreter.getClass(descriptor.type)
         if (Class === null) throw new Error(language.get('graphics.interpreter.notRegister', { type: descriptor.type }))
@@ -43,7 +43,7 @@ class Graphics {
     private readonly _assetCollection = new Map<string, Unit>()
     private readonly _freeCollection = new Map<string, Unit>()
     private readonly _dependencide = new Dependencide()
-    private readonly _services: ServiceDescriptor[] = []
+    private readonly _services: Service[] = []
     private readonly _freeQueue: Unit[] = []
     private _currentCamera = ''
     private _currentArgs: TickArgs = { delta: 0 }
@@ -55,12 +55,12 @@ class Graphics {
     }
     readonly unitCollection = new UnitCollection()
     readonly variableProxy = new VariableProxy()
-    readonly scheduler: ServiceSchedulerDescriptor
+    readonly scene: Scene
     readonly engine: Engine
     readonly url: string
 
-    constructor(url: string, scheduler: ServiceSchedulerDescriptor, engine: Engine) {
-        this.scheduler = scheduler
+    constructor(url: string, scene: Scene, engine: Engine) {
+        this.scene = scene
         this.engine = engine
         this.url = url
     }
@@ -83,17 +83,17 @@ class Graphics {
             }
         })
 
-        const descriptor = this.variableProxy.get<ServiceSchedulerDescriptor>(this.scheduler.uuid, this)
-        const interpreter = this.getInterpreter<ServiceSchedulerInterpreter>(descriptor)
+        const descriptor = this.variableProxy.get<Scene>(this.scene.uuid, this)
+        const interpreter = this.getInterpreter<SceneInterpreter>(descriptor)
         interpreter.install(descriptor)
     }
 
     unlisten() {
-        const descriptor = this.variableProxy.get<ServiceSchedulerDescriptor>(this.scheduler.uuid, this)
-        const interpreter = this.getInterpreter<ServiceSchedulerInterpreter>(descriptor)
+        const descriptor = this.variableProxy.get<Scene>(this.scene.uuid, this)
+        const interpreter = this.getInterpreter<SceneInterpreter>(descriptor)
         interpreter.uninstall(descriptor)
 
-        const master = this.unitCollection.get(this.scheduler.uuid)
+        const master = this.unitCollection.get(this.scene.uuid)
         const assets = [...this._assetCollection.values()]
         if (master !== undefined) assets.push(master)
 
@@ -152,7 +152,7 @@ class Graphics {
             asset.queue.iterator(operation => this.do(operation))
         }
 
-        const master = this.unitCollection.get(this.scheduler.uuid)
+        const master = this.unitCollection.get(this.scene.uuid)
         if (master === undefined) return
 
         master.queue.iterator(operation => this.do(operation))
@@ -173,7 +173,7 @@ class Graphics {
 
     clear() {
         for (const service of this._services) {
-            const descriptor = this.variableProxy.get<ServiceDescriptor>(service.uuid, this)
+            const descriptor = this.variableProxy.get<Service>(service.uuid, this)
             const interpreter = this.getInterpreter<ServiceInterpreter>(descriptor)
             interpreter.clear(descriptor)
         }
@@ -181,7 +181,7 @@ class Graphics {
 
     beforeRender() {
         for (const service of this._services) {
-            const descriptor = this.variableProxy.get<ServiceDescriptor>(service.uuid, this)
+            const descriptor = this.variableProxy.get<Service>(service.uuid, this)
             const interpreter = this.getInterpreter<ServiceInterpreter>(descriptor)
             interpreter.beforeRender(descriptor)
         }
@@ -189,7 +189,7 @@ class Graphics {
 
     render() {
         for (const service of this._services) {
-            const descriptor = this.variableProxy.get<ServiceDescriptor>(service.uuid, this)
+            const descriptor = this.variableProxy.get<Service>(service.uuid, this)
             const interpreter = this.getInterpreter<ServiceInterpreter>(descriptor)
             interpreter.render(descriptor)
         }
@@ -197,7 +197,7 @@ class Graphics {
 
     afterRender() {
         for (const service of this._services) {
-            const descriptor = this.variableProxy.get<ServiceDescriptor>(service.uuid, this)
+            const descriptor = this.variableProxy.get<Service>(service.uuid, this)
             const interpreter = this.getInterpreter<ServiceInterpreter>(descriptor)
             interpreter.afterRender(descriptor)
         }
@@ -296,8 +296,8 @@ class Graphics {
     }
 
     private updateStaticAsset() {
-        if (this.scheduler.camera !== this._currentCamera) {
-            const descriptor = Descriptor.get<Descriptor>(this.scheduler.camera)
+        if (this.scene.camera !== this._currentCamera) {
+            const descriptor = Descriptor.get<Descriptor>(this.scene.camera)
             if (descriptor === null) return
             const oldNode = this.unitCollection.get(this._currentCamera)
             if (oldNode) {
@@ -308,7 +308,7 @@ class Graphics {
             const newNode = new Unit(descriptor.uuid, '', new Queue(Asset.createVirtualUrl('graphics/camera.ts')))
             this.unitCollection.set(newNode)
             ArrayUtils.insert(this._staticAssetQueue, newNode)
-            this._currentCamera = this.scheduler.camera
+            this._currentCamera = this.scene.camera
         }
     }
 
@@ -331,7 +331,7 @@ class Graphics {
         const descriptor = this.variableProxy.get<Descriptor>(unit.uuid, this)
         const interpreter = this.getInterpreter(descriptor)
 
-        if (descriptor instanceof ServiceDescriptor) ArrayUtils.insert(this._services, descriptor)
+        if (isService(descriptor)) ArrayUtils.insert(this._services, descriptor)
 
         interpreter.mount(descriptor, parentInterpreter, parentDescriptor)
     }
@@ -343,7 +343,7 @@ class Graphics {
         const descriptor = this.variableProxy.get<Descriptor>(unit.uuid, this)
         const interpreter = this.getInterpreter(descriptor)
 
-        if (descriptor instanceof ServiceDescriptor) ArrayUtils.remove(this._services, descriptor)
+        if (isService(descriptor)) ArrayUtils.remove(this._services, descriptor)
 
         interpreter.unmount(descriptor, parentInterpreter, parentDescriptor)
     }
@@ -408,26 +408,19 @@ class Graphics {
         interpreter.pickup(target, result)
     }
     private _pickupScene(result: PickupObject[]) {
-        const master = this.unitCollection.get(this.scheduler.uuid)
+        const master = this.unitCollection.get(this.scene.uuid)
         if (master === undefined) return result
 
         const units = this.unitCollection.values()
         for (const unit of units) {
             const descriptor = Descriptor.get<Descriptor>(unit.uuid)
-            if (descriptor instanceof HTMLDescriptor) continue
+            if (isHTML(descriptor)) continue
             this._pickupItem(descriptor, result)
         }
     }
 
-    getMouseAndRect(event: MouseEvent) {
-        //@ts-ignore
-        const rect = event.target.getBoundingClientRect()
-        const mouse = { x: event.clientX - rect.left, y: event.clientY - rect.top }
-        return { mouse, rect }
-    }
-
-    traceService(target: Descriptor): ServiceDescriptor | null {
-        if (target instanceof ServiceDescriptor) return target
+    traceService(target: Descriptor): Service | null {
+        if (isService(target)) return target
 
         const parent = this.getParent(target.uuid)
         if (parent === null) return null
@@ -435,19 +428,18 @@ class Graphics {
         return this.traceService(parent)
     }
 
-    pickup(event: MouseEvent) {
+    pickup(x: number, y: number, trigger: Element) {
         const result: PickupObject[] = []
-
-        const isElement = event.target instanceof Element
-        if (isElement === false) return result
-        const uuid = event.target.getAttribute('data-vyr-uuid')
+        const uuid = trigger.getAttribute(HTMLActor.uuidKey)
         if (uuid === null) return result
 
-        const { mouse, rect } = this.getMouseAndRect(event)
+        //@ts-ignore
+        const rect = trigger.getBoundingClientRect()
+        const mouse = { x: x - rect.left, y: y - rect.top }
         const target = Descriptor.get<Descriptor>(uuid)
-        const args = { delta: 0 }
-        if (target instanceof ServiceDescriptor) {
-            if (target instanceof HTMLServiceDescriptor) {
+
+        if (isService(target)) {
+            if (target instanceof HTMLService) {
                 this._pickupItem(target, result)
             } else {
                 const interpreter = this.getInterpreter<ServiceInterpreter>(target)
@@ -466,8 +458,8 @@ class Graphics {
         if (descriptor.interactions.length === 0) return
         for (const inter of descriptor.interactions) {
             if (inter.type === interaction) {
-                const current = Asset.get<InteractionDescriptor>(inter.url)
-                if (current !== null) await current.execute(inter.inputs, this, descriptor)
+                const current = Asset.get<Interaction>(inter.url)
+                if (current !== null) await current.execute(inter.nodes, this, descriptor.uuid)
                 break
             }
         }
@@ -481,8 +473,3 @@ class Graphics {
     }
 }
 
-export {
-    PickupObject,
-    TickArgs,
-    Graphics,
-}

package/src/graphics/Observer.ts

@@ -1,23 +1,23 @@
 import { Listener } from "../Listener"
 
-interface WatcherArgs {
+export interface WatcherArgs {
     self: string
     puid: string
 }
 
-interface UpdateWatcherArgs {
+export interface UpdateWatcherArgs {
     self: string
 }
 
-interface UpdateDepsWatcherArgs {
+export interface UpdateDepsWatcherArgs {
     self: string
 }
 
-interface FreeWatcherArgs {
+export interface FreeWatcherArgs {
     self: string
 }
 
-interface Observer {
+export interface Observer {
     add(args: WatcherArgs): void
     remove(args: WatcherArgs): void
     update(args: UpdateWatcherArgs): void
@@ -25,12 +25,4 @@ interface Observer {
     free(args: FreeWatcherArgs): void
 }
 
-const observer = new Listener<Observer>()
-
-export {
-    WatcherArgs,
-    UpdateWatcherArgs,
-    UpdateDepsWatcherArgs,
-    FreeWatcherArgs,
-    observer,
-}
+export const observer = new Listener<Observer>()

package/src/graphics/Unit.ts

@@ -1,11 +1,11 @@
 import { ArrayUtils } from "../ArrayUtils"
 
-interface Operation {
+export interface Operation {
     type: number
     unit: Unit
 }
 
-class Queue {
+export class Queue {
     static readonly Add = 1
     static readonly Remove = 2
     static readonly Update = 3
@@ -50,7 +50,7 @@ class Queue {
     }
 }
 
-class Unit {
+export class Unit {
     uuid: string
     parent: string
     queue: Queue
@@ -74,10 +74,4 @@ class Unit {
                 break
         }
     }
-}
-
-export {
-    Operation,
-    Queue,
-    Unit,
 }

package/src/graphics/VariableProxy.ts

@@ -1,14 +1,14 @@
+import { VariabConfig } from "../schema";
 import { ObjectUtils } from "../ObjectUtils";
-import { Asset } from "../asset";
-import { Scriptable, ScriptableArgs } from "../interaction/Scriptable";
-import { Data, DatasetDescriptor, Descriptor, VariabConfig } from "../descriptor";
+import { Scriptable } from "../Scriptable";
+import { Data, Store, Descriptor } from "../descriptor";
 import { Graphics } from "./Graphics";
 
 interface ActorCollection { [k: string]: any }
 
-interface Variables { [k: string]: any }
+export interface Variables { [k: string]: any }
 
-class VariableProxy {
+export class VariableProxy {
     private readonly proxyCollection = new Map<Descriptor, any>()
     private readonly variablesCollection = new Map<Descriptor, Variables>()
 
@@ -26,7 +26,7 @@ class VariableProxy {
 
                 const value = Reflect.get(target, prop)
 
-                if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+                if (ObjectUtils.isObject(value) && !Array.isArray(value)) {
                     return this.createNestedProxy(value, root, fullPath)
                 }
 
@@ -38,10 +38,9 @@ class VariableProxy {
         if (config.type === 'key') {
             return ObjectUtils.getValueByKey(data, config.value)
         } else if (config.type === 'custom') {
-            const scriptable = Asset.get<Scriptable<ScriptableArgs<undefined, undefined, undefined>>>(config.value)
+            const scriptable = Scriptable.use(config.value)
             if (scriptable === null) return
-            const currentArgs = { key, config, data, input: undefined, result: undefined, trigger: descriptor }
-            return scriptable.execute(graphics, currentArgs)
+            return scriptable.execute(graphics, descriptor.uuid, { key, config, data })
         }
     }
 
@@ -56,14 +55,15 @@ class VariableProxy {
             variables = Object.create(null) as Variables
             variables.version = 0
 
-            const data = DatasetDescriptor.getData(descriptor.dataset)
+            const data = Store.getData(descriptor.store)
 
             if (data !== null) {
                 const keys = Object.keys(descriptor.variables)
                 for (const key of keys) {
                     const variable = descriptor.variables[key]
                     if (variable.enabled === false) continue
-                    const value = this.getVariableValue(descriptor, data, key, variable, graphics)
+
+                    const value = this.getVariableValue(descriptor, descriptor, key, variable, graphics)
                     if (value === undefined) continue
                     variables[key] = value
                 }
@@ -86,7 +86,3 @@ class VariableProxy {
     }
 }
 
-export {
-    Variables,
-    VariableProxy
-}

package/src/index.ts

@@ -6,22 +6,22 @@ export * from './locale'
 export * from './math'
 export * from './Color'
 export * from './Serialization'
-export { Category } from './Category'
+export { Category, Suffix } from './Category'
 export { ArrayUtils } from './ArrayUtils'
 export { ObjectUtils } from './ObjectUtils'
 export { Generate } from './Generate'
 export { Traverser } from './Traverser'
 export { Listener } from './Listener'
 export { InputSystem } from './InputSystem'
-export { destroyInstance } from './ObjectPool'
+export { ObjectPool, destroyInstance } from './ObjectPool'
 export * from './AsyncTask'
-export * from './interaction/Scriptable'
-export * from './interaction'
+export * from './schema'
 export * from './descriptor'
 export * from './interpreter'
+export * from './Scriptable'
+export * from './scripts'
 export * from './utils'
 export * from './actor'
 export * from './graphics'
 export * from './asset'
-export * from './preset'
 export * from './Engine'

package/src/interpreter/AnimationUnitInterpreter.ts

@@ -1,4 +1,4 @@
-import { AnimationUnitDescriptor, Descriptor } from '../descriptor';
+import { AnimationUnit, Descriptor } from '../descriptor';
 import { ArrayUtils } from '../ArrayUtils';
 import { Interpreter } from './Interpreter'
 import { AnimationUnitActor } from "../actor";
@@ -7,8 +7,8 @@ const privateState = {
     collection: [] as AnimationUnitActor[],
 }
 
-class AnimationUnitInterpreter extends Interpreter {
-    static type = AnimationUnitDescriptor.type
+export class AnimationUnitInterpreter extends Interpreter {
+    static type = AnimationUnit.type
     static enabled = true
     static reset(time = 0) {
         const enabled = AnimationUnitInterpreter.enabled
@@ -29,12 +29,12 @@ class AnimationUnitInterpreter extends Interpreter {
     }
 
 
-    update(descriptor: AnimationUnitDescriptor) {
+    update(descriptor: AnimationUnit) {
         super.update(descriptor)
 
         this.freeUnit()
 
-        const parentDescriptor = AnimationUnitDescriptor.get<AnimationUnitDescriptor>(this.unit.parent)
+        const parentDescriptor = AnimationUnit.get<AnimationUnit>(this.unit.parent)
         if (parentDescriptor === null) return
 
         this.animationUnit = AnimationUnitActor.parse(descriptor)
@@ -43,11 +43,9 @@ class AnimationUnitInterpreter extends Interpreter {
         this.animationUnit.listen(this.graphics)
     }
 
-    unmount(descriptor: AnimationUnitDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+    unmount(descriptor: AnimationUnit, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
         this.freeUnit()
         super.unmount(descriptor, parentInterpreter, parentDescriptor)
     }
 }
-Interpreter.register(AnimationUnitInterpreter)
-
-export { AnimationUnitInterpreter }
+Interpreter.register(AnimationUnitInterpreter)

package/src/interpreter/DivInterpreter.ts

@@ -1,22 +1,22 @@
-import { Descriptor, DivDescriptor } from "../descriptor"
+import { Descriptor, Div } from "../descriptor"
 import { Interpreter } from "./Interpreter"
 import { DivActor, HTMLActor } from "../actor"
 import { PickupObject } from "../graphics"
 
-class DivInterpreter extends Interpreter {
-    static type = DivDescriptor.type
+export class DivInterpreter extends Interpreter {
+    static type = Div.type
 
-    protected createActor(descriptor: DivDescriptor) {
+    protected createActor(descriptor: Div) {
         return new DivActor(descriptor.uuid)
     }
 
-    update(descriptor: DivDescriptor) {
+    update(descriptor: Div) {
         super.update(descriptor)
         const actor = this.getActor<DivActor>(descriptor)
         actor.update(descriptor)
     }
 
-    mount(descriptor: DivDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+    mount(descriptor: Div, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
         super.mount(descriptor, parentInterpreter, parentDescriptor)
         const actor = this.getActor<DivActor>(descriptor)
 
@@ -24,9 +24,8 @@ class DivInterpreter extends Interpreter {
         parenActor.add(actor)
     }
 
-    unmount(descriptor: DivDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+    unmount(descriptor: Div, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
         const actor = this.getActor<DivActor>(descriptor)
-        actor.clearStyleClass(actor.DOM)
         actor.cleanInteraction()
 
         const parenActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor)
@@ -35,10 +34,8 @@ class DivInterpreter extends Interpreter {
         super.unmount(descriptor, parentInterpreter, parentDescriptor)
     }
 
-    pickup(descriptor: DivDescriptor, result: PickupObject[]) {
-        result.push({ uuid: descriptor.uuid, generatedBy: descriptor.generatedBy })
+    pickup(descriptor: Div, result: PickupObject[]) {
+        result.push({ uuid: descriptor.uuid })
     }
 }
-Interpreter.register(DivInterpreter)
-
-export { DivInterpreter }
+Interpreter.register(DivInterpreter)

package/src/interpreter/FragmentInterpreter.ts

@@ -2,7 +2,7 @@ import { FragmentActor } from "../actor";
 import { Descriptor } from "../descriptor";
 import { Interpreter } from "./Interpreter";
 
-class FragmentInterpreter extends Interpreter {
+export class FragmentInterpreter extends Interpreter {
     static type = Descriptor.type
 
     protected createActor(descriptor: Descriptor) {
@@ -27,8 +27,4 @@ class FragmentInterpreter extends Interpreter {
         super.free(descriptor)
     }
 }
-Interpreter.register(FragmentInterpreter)
-
-export {
-    FragmentInterpreter
-}
+Interpreter.register(FragmentInterpreter)