@vyr/vue 0.0.1 → 0.0.2

package/package.json

@@ -1,22 +1 @@
-{
-  "name": "@vyr/vue",
-  "version": "0.0.1",
-  "description": "",
-  "main": "./src/index.ts",
-  "author": "",
-  "sideEffects": true,
-  "license": "MIT",
-  "dependencies": {
-    "@vyr/locale": "0.0.1",
-    "@vyr/engine": "0.0.1",
-    "vue": "3.5.22"
-  },
-  "files": [
-    "package.json",
-    "src/"
-  ],
-  "vyr": {
-    "type": "universal",
-    "order": 10
-  }
-}
+{"name":"@vyr/vue","version":"0.0.2","description":"","main":"./src/index.ts","author":"","sideEffects":true,"license":"MIT","dependencies":{"@vyr/locale":"0.0.2","@vyr/engine":"0.0.2","vue":"3.5.22"},"files":["package.json","src/"],"vyr":{"type":"universal","order":10}}

package/src/actor/VueActor.ts

@@ -1,5 +1,5 @@
 import { App, createApp, h, markRaw, resolveDynamicComponent, VNode, ComponentPublicInstance } from 'vue'
-import { ArrayUtils, Asset, HTMLActor, RoutineDescriptor, RoutineInterpreter, StyleDescriptor, UpdateArgs } from "@vyr/engine"
+import { ArrayUtils, Asset, HTMLActor, InteractionDescriptor, StyleDescriptor } from "@vyr/engine"
 import { TemplateDescriptor, VueDescriptor } from "../descriptor"
 
 interface VyrVueProps {
@@ -52,7 +52,7 @@ class VueActor extends HTMLActor {
             const graphics = HTMLActor.getGraphics(this)
             const parent = graphics.getParent(this.uuid)
             if (parent instanceof VueDescriptor) return null
-            const descriptor = graphics.variableProxy.get<VueDescriptor>(this.uuid, graphics, { delta: 0 })
+            const descriptor = graphics.variableProxy.get<VueDescriptor>(this.uuid, graphics)
             const vnode = this.createVNode(descriptor)
             this.raw.app = markRaw(createApp(vnode, { actor: this }))
             const plugins = VueDescriptor.getPlugins()
@@ -68,9 +68,9 @@ class VueActor extends HTMLActor {
         }
     }
 
-    update(descriptor: VueDescriptor, args: UpdateArgs) {
-        this.style = this.getWrapperStyle(descriptor, args)
-        this.props = this.getProps(descriptor, args)
+    update(descriptor: VueDescriptor) {
+        this.style = this.getWrapperStyle(descriptor)
+        this.props = this.getProps(descriptor)
     }
 
     dispose() {
@@ -91,7 +91,7 @@ class VueActor extends HTMLActor {
             },
             render() {
                 const _instance = this as VyrVueInstance
-                const children = self.getChildren(_instance, { delta: 0 })
+                const children = self.getChildren(_instance)
                 const content = _instance.actor.getContent(_instance, children, descriptor)
 
                 return self.getWrapperVNode(this as any, content, descriptor)
@@ -109,7 +109,7 @@ class VueActor extends HTMLActor {
         return vnode as unknown as VNode
     }
 
-    getChildren(instance: VyrVueInstance, args: UpdateArgs) {
+    getChildren(instance: VyrVueInstance) {
         const { actor } = instance
 
         const _default: VNode[] = []
@@ -123,7 +123,7 @@ class VueActor extends HTMLActor {
 
         for (let i = 0; i < actor.children.length; i++) {
             const attr = { key: i, actor: actor.children[i] }
-            const descriptor = graphics.variableProxy.get<VueDescriptor>(attr.actor.uuid, graphics, args)
+            const descriptor = graphics.variableProxy.get<VueDescriptor>(attr.actor.uuid, graphics)
             const component = attr.actor.createVNode(descriptor)
 
             if (descriptor instanceof TemplateDescriptor) {
@@ -162,22 +162,21 @@ class VueActor extends HTMLActor {
         return h(component, attrs, children)
     }
 
-    getProps(descriptor: VueDescriptor, args: UpdateArgs) {
+    getProps(descriptor: VueDescriptor) {
         return {}
     }
 
-    getInteractionProps(descriptor: VueDescriptor, instance: VyrVueInstance, args: UpdateArgs) {
+    getInteractionProps(descriptor: VueDescriptor, instance: VyrVueInstance) {
         const interactions: { [k: string]: any } = {}
         const graphics = HTMLActor.getGraphics(this)
         //@ts-ignore
-        const eventArgs = { ...args, trigger: descriptor, VYR_STORE: instance.VYR_STORE }
+        const otherArgs = { VYR_STORE: instance.VYR_STORE }
         for (const interaction of descriptor.interactions) {
             if (interaction.url) {
-                const routine = Asset.get<RoutineDescriptor>(interaction.url)
-                const interpreter = graphics.getInterpreter<RoutineInterpreter>(routine)
+                const current = Asset.get<InteractionDescriptor>(interaction.url)
                 const listener = (e: Event) => {
                     if (e instanceof Event) e.stopPropagation()
-                    interpreter.do(interaction.inputs, routine, eventArgs)
+                    current.execute(interaction.inputs, graphics, descriptor, otherArgs)
                 }
                 const eventKey = 'on' + interaction.type.charAt(0).toUpperCase() + interaction.type.slice(1)
                 interactions[eventKey] = listener
@@ -191,9 +190,9 @@ class VueActor extends HTMLActor {
     }
 
     getComponentAttrs(instance: VyrVueInstance, descriptor: VueDescriptor, ...args: any[]) {
-        const className = [...this.getStyleClass(descriptor, { delta: 0 })]
+        const className = [...this.getStyleClass(descriptor)]
         if (descriptor.active) className.push(StyleDescriptor.activeName)
-        const interactions = this.getInteractionProps(descriptor, instance, { delta: 0 })
+        const interactions = this.getInteractionProps(descriptor, instance)
 
         const attrs = {
             ...this.props,

package/src/descriptor/VueDescriptor.ts

@@ -1,10 +1,15 @@
 import { Plugin } from "vue";
-import { DeserializationObject, HTMLDescriptor } from "@vyr/engine";
+import { Descriptor, DeserializationObject, HTMLDescriptor, ScriptableArgs } from "@vyr/engine";
 
 const privateState = {
     plugins: [] as { content: Plugin, args?: any }[],
 }
 
+interface VueScriptableArgs<T extends Descriptor = Descriptor> extends ScriptableArgs {
+    trigger: T,
+    VYR_STORE: any
+}
+
 class VueDescriptor extends HTMLDescriptor {
     static use(content: Plugin, args?: any) {
         privateState.plugins.push({ content, args })
@@ -22,4 +27,4 @@ class VueDescriptor extends HTMLDescriptor {
 }
 HTMLDescriptor.register(VueDescriptor)
 
-export { VueDescriptor }
+export { VueScriptableArgs, VueDescriptor }

package/src/interpreter/TemplateInterpreter.ts

@@ -1,5 +1,4 @@
 import { reactive } from "vue";
-import { UpdateArgs } from "@vyr/engine";
 import { TemplateDescriptor } from "../descriptor";
 import { TemplateActor } from "../actor";
 import { VueInterpreter } from "./VueInterpreter";
@@ -7,7 +6,7 @@ import { VueInterpreter } from "./VueInterpreter";
 class TemplateInterpreter extends VueInterpreter {
     static type = TemplateDescriptor.type
 
-    protected createActor(descriptor: TemplateDescriptor, args: UpdateArgs) {
+    protected createActor(descriptor: TemplateDescriptor) {
         return reactive(new TemplateActor(descriptor.uuid)) as TemplateActor
     }
 }

package/src/interpreter/VueInterpreter.ts

@@ -1,42 +1,42 @@
 import { reactive } from 'vue'
-import { Descriptor, HTMLActor, Interpreter, PickupObject, UpdateArgs } from '@vyr/engine'
+import { Descriptor, HTMLActor, Interpreter, PickupObject } from '@vyr/engine'
 import { VueDescriptor } from '../descriptor'
 import { VueActor } from '../actor'
 
 class VueInterpreter extends Interpreter {
     static type = VueDescriptor.type
 
-    protected createActor(descriptor: VueDescriptor, args: UpdateArgs) {
+    protected createActor(descriptor: VueDescriptor) {
         return reactive(new VueActor(descriptor.uuid)) as VueActor
     }
 
-    update(descriptor: VueDescriptor, args: UpdateArgs) {
-        super.update(descriptor, args)
-        const actor = this.getActor<VueActor>(descriptor, args)
-        actor.update(descriptor, args)
+    update(descriptor: VueDescriptor) {
+        super.update(descriptor)
+        const actor = this.getActor<VueActor>(descriptor)
+        actor.update(descriptor)
     }
 
-    mount(descriptor: VueDescriptor, args: UpdateArgs, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
-        super.mount(descriptor, args, parentInterpreter, parentDescriptor)
-        const actor = this.getActor<VueActor>(descriptor, args)
-        const parentActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor, args)
+    mount(descriptor: VueDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+        super.mount(descriptor,  parentInterpreter, parentDescriptor)
+        const actor = this.getActor<VueActor>(descriptor)
+        const parentActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor)
         parentActor.add(actor)
     }
 
-    unmount(descriptor: VueDescriptor, args: UpdateArgs, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
-        const actor = this.getActor<VueActor>(descriptor, args)
-        const parentActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor, args)
+    unmount(descriptor: VueDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+        const actor = this.getActor<VueActor>(descriptor)
+        const parentActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor)
         parentActor.remove(actor)
-        super.unmount(descriptor, args, parentInterpreter, parentDescriptor)
+        super.unmount(descriptor,  parentInterpreter, parentDescriptor)
     }
 
-    free(descriptor: VueDescriptor, args: UpdateArgs) {
-        const actor = this.getActor<VueActor>(descriptor, args)
+    free(descriptor: VueDescriptor) {
+        const actor = this.getActor<VueActor>(descriptor)
         actor.dispose()
-        super.free(descriptor, args)
+        super.free(descriptor)
     }
 
-    pickup(descriptor: VueDescriptor, args: UpdateArgs, result: PickupObject[]) {
+    pickup(descriptor: VueDescriptor, result: PickupObject[]) {
         result.push({ uuid: descriptor.uuid, generatedBy: descriptor.generatedBy })
     }
 }