@vyr/service-graph 0.0.33 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service-graph",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/src/GraphDrawer.ts

@@ -1,9 +1,10 @@
-import { Generate, Listener } from '@vyr/engine'
 import { Cell, CellView, Edge, Graph, Shape } from '@antv/x6'
 import { Selection } from '@antv/x6-plugin-selection'
 import { Stencil } from '@antv/x6-plugin-stencil'
 import { History } from '@antv/x6-plugin-history'
 import { Options } from '@antv/x6/lib/graph/options'
+import { Listener } from '@vyr/engine'
+import { runtime } from '@vyr/runtime'
 import { Unit } from './common/Unit'
 import { language } from './locale'
 
@@ -191,7 +192,7 @@ class GraphDrawer extends Listener<GraphObserver> {
         this.selectEdge = ''
     }
 
-    private _delaySelect = Generate.delayExecute(() => {
+    private _delaySelect = runtime.delayExecute(() => {
         const cells = this.selection.getSelectedCells()
         this.trigger('select', cells)
     })
@@ -199,10 +200,10 @@ class GraphDrawer extends Listener<GraphObserver> {
         if (this.needTriggerChange === false) return
         this._delayChange()
     }
-    private _delayChange = Generate.delayExecute(() => {
+    private _delayChange = runtime.delayExecute(() => {
         this.trigger('change', {})
     })
-    private _resize = Generate.delayExecute(() => {
+    private _resize = runtime.delayExecute(() => {
         if (!this.container) return
         const rect = this.container.getBoundingClientRect()
         this.graph.resize(rect.width, rect.height)

package/src/GraphService.ts

@@ -1,23 +1,23 @@
 import { reactive, AsyncComponentLoader, defineAsyncComponent } from 'vue'
 import { Service } from "@vyr/service"
-import { DeserializationObject, InteractionInputCollection, ObjectUtils, InteractionDescriptor, InteractionNode, InteractionMapper } from '@vyr/engine'
+import { DeserializationObject, InteractionNodeInputCollection, ObjectUtils, Interaction, InteractionNode, InteractionMapper, InteractionExecuteNodeSchame, InteractionConditionNodeSchame } from '@vyr/engine'
 import { Unit } from './common/Unit'
-import { BranchUnit, ConditionUnit, ExecuteUnit, InteractionUnit } from './common/InteractionUnit'
+import { ConditionUnit, ExecuteUnit, InteractionUnit } from './common/InteractionUnit'
 import { GraphDrawer } from './GraphDrawer'
 
-class GraphState {
+class GraphStore {
     width = '60%'
     height = '60%'
     visible = false
     descriptor = ''
     event = ''
-    inputs: InteractionInputCollection = {}
-    interaction: DeserializationObject<InteractionDescriptor> | null = null
+    nodes: InteractionNodeInputCollection = {}
+    interaction: DeserializationObject<Interaction> | null = null
 
     reset() {
         this.descriptor = ''
         this.event = ''
-        this.inputs = {}
+        this.nodes = {}
         this.interaction = null
     }
 }
@@ -30,24 +30,21 @@ class GraphService extends Service {
             this._drawer = new GraphDrawer()
             this._drawer.stencil.load([
                 new ExecuteUnit({ drawer: this._drawer, label: 'Execute' },),
-                new BranchUnit({ drawer: this._drawer, label: 'Branch' }),
                 new ConditionUnit({ drawer: this._drawer, label: 'Condition' }),
             ], 'inspector')
         }
         return this._drawer
     }
-    readonly state = reactive(new GraphState())
-    interaction: DeserializationObject<InteractionDescriptor> | null = null
+    readonly store = reactive(new GraphStore())
+    interaction: DeserializationObject<Interaction> | null = null
 
     private _doNodes(nodes: InteractionNode[]) {
         for (const node of nodes) {
-            if (node.interaction === 'Execute') {
+            if (node.type === 'Execute') {
                 const cell = new ExecuteUnit({ ...node, drawer: this.drawer })
                 this.drawer.graph.addCell(cell)
-            } else if (node.interaction === 'Condition') {
+            } else if (node.type === 'Condition') {
                 this.drawer.graph.addCell(new ConditionUnit({ ...node, drawer: this.drawer }))
-            } else if (node.interaction === 'Branch') {
-                this.drawer.graph.addCell(new BranchUnit({ ...node, drawer: this.drawer }))
             }
         }
 
@@ -88,7 +85,7 @@ class GraphService extends Service {
         }
     }
 
-    render(interaction: DeserializationObject<InteractionDescriptor>) {
+    render(interaction: DeserializationObject<Interaction>) {
         this.interaction = interaction
 
         this.drawer.needTriggerChange = false
@@ -97,7 +94,7 @@ class GraphService extends Service {
         this.drawer.needTriggerChange = true
     }
 
-    update(curInteraction: DeserializationObject<InteractionDescriptor>) {
+    update(curInteraction: DeserializationObject<Interaction>) {
         if (this.interaction === null) return
 
         this.drawer.needTriggerChange = false
@@ -134,19 +131,20 @@ class GraphService extends Service {
     }
 
     build() {
-        const interaction = new InteractionDescriptor()
+        const interaction = new Interaction()
         const cells = this.drawer.graph.getCells()
 
         for (const cell of cells) {
             if (cell instanceof InteractionUnit) {
-                const node = {
+                const NodeSchame = cell.vMeta.type === 'Execute' ? InteractionExecuteNodeSchame : InteractionConditionNodeSchame
+                const node = NodeSchame.parse({
                     id: cell.id,
                     label: cell.vMeta.label ?? '',
-                    url: cell.vMeta.url,
-                    interaction: cell.vMeta.interaction,
+                    script: cell.vMeta.script,
+                    type: cell.vMeta.type,
                     input: cell.vMeta.input,
                     position: cell.getPosition(),
-                }
+                })
                 interaction.nodes.push(node)
             } else if (cell.isEdge()) {
                 const mapper = this.drawer.getMapper(cell)

package/src/common/InteractionUnit.ts

@@ -1,10 +1,10 @@
 import { Cell } from "@antv/x6";
-import { Descriptor } from "@vyr/engine";
+import { ConditionScriptable, Descriptor } from "@vyr/engine";
 import { Unit, UnitMeta, UnitPartial, } from "./Unit";
 
 interface InteractionUnitMeta extends UnitMeta {
-    url: string
-    interaction: string
+    type: string
+    script: string
     input: { [param: string]: any }
 }
 
@@ -19,23 +19,9 @@ class InteractionUnit extends Unit {
 
 class ExecuteUnit extends InteractionUnit {
     constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
-        super({ ...vMeta, maxInCount: Infinity, icon: 'graphfont graph-execute' })
-        this.vMeta.interaction = 'Execute'
-        this.vMeta.url = vMeta.url ?? ''
-    }
-
-    isConnection(e: Element, source: Cell) {
-        if (Unit.instanceOf(source, [ExecuteUnit, ConditionUnit]) === false) return false
-        return super.isConnection(e, source)
-    }
-}
-
-class BranchUnit extends InteractionUnit {
-
-    constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
-        super({ ...vMeta, maxOutCount: Infinity, icon: 'graphfont graph-branch' })
-        this.vMeta.interaction = 'Branch'
-        this.vMeta.url = vMeta.url ?? ''
+        super({ ...vMeta, maxInCount: Infinity, maxOutCount: Infinity, icon: 'graphfont graph-execute' })
+        this.vMeta.type = 'Execute'
+        this.vMeta.script = vMeta.script ?? ''
     }
 
     isConnection(e: Element, source: Cell) {
@@ -46,13 +32,14 @@ class BranchUnit extends InteractionUnit {
 
 class ConditionUnit extends InteractionUnit {
     constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
-        super({ input: { value: { type: 'string', value: '' } }, ...vMeta, icon: 'graphfont graph-condition' })
-        this.vMeta.interaction = 'Condition'
-        this.vMeta.url = vMeta.url ?? ''
+        super({ ...vMeta, maxInCount: Infinity, icon: 'graphfont graph-condition' })
+        this.vMeta.type = 'Condition'
+        this.vMeta.script = vMeta.script ?? 'condition'
+        this.vMeta.input = vMeta.input ?? ConditionScriptable.inputSchame.parse({})
     }
 
     isConnection(e: Element, source: Cell) {
-        if (Unit.instanceOf(source, [BranchUnit]) === false) return false
+        if (Unit.instanceOf(source, [ExecuteUnit, ConditionUnit]) === false) return false
         return super.isConnection(e, source)
     }
 }
@@ -60,6 +47,5 @@ class ConditionUnit extends InteractionUnit {
 export {
     InteractionUnit,
     ExecuteUnit,
-    BranchUnit,
     ConditionUnit,
 }