@vyr/service-graph 0.0.1 → 0.0.3

package/package.json

@@ -1,23 +1 @@
-{
-  "name": "@vyr/service-graph",
-  "version": "0.0.1",
-  "description": "",
-  "main": "./src/index.ts",
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "vue": "3.5.22",
-    "@vyr/locale": "0.0.1",
-    "@vyr/engine": "0.0.1",
-    "@vyr/service": "0.0.1",
-    "jsondiffpatch": "^0.6.0",
-    "@antv/x6": "^2.18.1",
-    "@antv/x6-plugin-selection": "^2.2.2",
-    "@antv/x6-plugin-stencil": "^2.1.5",
-    "@antv/x6-plugin-history": "2.2.4"
-  },
-  "files": [
-    "package.json",
-    "src/"
-  ]
-}
+{"name":"@vyr/service-graph","version":"0.0.3","description":"","main":"./src/index.ts","author":"","license":"MIT","dependencies":{"vue":"3.5.22","@vyr/locale":"0.0.3","@vyr/engine":"0.0.3","@vyr/service":"0.0.3","jsondiffpatch":"^0.6.0","@antv/x6":"^2.18.1","@antv/x6-plugin-selection":"^2.2.2","@antv/x6-plugin-stencil":"^2.1.5","@antv/x6-plugin-history":"2.2.4"},"files":["package.json","src/"]}

package/src/GraphService.ts

@@ -1,8 +1,8 @@
 import { reactive, AsyncComponentLoader, defineAsyncComponent } from 'vue'
 import { Service } from "@vyr/service"
-import { DeserializationObject, InteractionInputCollection, ObjectUtils, RoutineDescriptor, RoutineMapper, RoutineNode } from '@vyr/engine'
+import { DeserializationObject, InteractionInputCollection, ObjectUtils, InteractionDescriptor, InteractionNode, InteractionMapper } from '@vyr/engine'
 import { Unit } from './common/Unit'
-import { BranchUnit, ConditionUnit, ExecuteUnit, RoutineUnit as GraphRoutineUnit } from './common/RoutineUnit'
+import { BranchUnit, ConditionUnit, ExecuteUnit, InteractionUnit } from './common/InteractionUnit'
 import { GraphDrawer } from './GraphDrawer'
 
 class GraphState {
@@ -12,13 +12,13 @@ class GraphState {
     descriptor = ''
     event = ''
     inputs: InteractionInputCollection = {}
-    routine: DeserializationObject<RoutineDescriptor> | null = null
+    interaction: DeserializationObject<InteractionDescriptor> | null = null
 
     reset() {
         this.descriptor = ''
         this.event = ''
         this.inputs = {}
-        this.routine = null
+        this.interaction = null
     }
 }
 
@@ -37,34 +37,34 @@ class GraphService extends Service {
         return this._drawer
     }
     readonly state = reactive(new GraphState())
-    routine: DeserializationObject<RoutineDescriptor> | null = null
+    interaction: DeserializationObject<InteractionDescriptor> | null = null
 
-    private _doNodes(nodes: RoutineNode[]) {
+    private _doNodes(nodes: InteractionNode[]) {
         for (const node of nodes) {
-            if (node.routine === 'Execute') {
+            if (node.interaction === 'Execute') {
                 const cell = new ExecuteUnit({ ...node, drawer: this.drawer })
                 this.drawer.graph.addCell(cell)
-            } else if (node.routine === 'Condition') {
+            } else if (node.interaction === 'Condition') {
                 this.drawer.graph.addCell(new ConditionUnit({ ...node, drawer: this.drawer }))
-            } else if (node.routine === 'Branch') {
+            } else if (node.interaction === 'Branch') {
                 this.drawer.graph.addCell(new BranchUnit({ ...node, drawer: this.drawer }))
             }
         }
 
     }
-    private _doMappers(mappers: RoutineMapper[]) {
+    private _doMappers(mappers: InteractionMapper[]) {
         for (const mapper of mappers) {
             const edge = this.drawer.getEdgeOfMapper(mapper.source, mapper.target)
             this.drawer.graph.addEdge(edge)
         }
     }
 
-    private _diff(cur: RoutineNode[], old: RoutineNode[]) {
-        const addQueue: RoutineNode[] = []
-        const removeQueue: RoutineNode[] = []
-        const updateQueue: RoutineNode[] = []
+    private _diff(cur: InteractionNode[], old: InteractionNode[]) {
+        const addQueue: InteractionNode[] = []
+        const removeQueue: InteractionNode[] = []
+        const updateQueue: InteractionNode[] = []
 
-        const temp = new Map<string, RoutineNode>()
+        const temp = new Map<string, InteractionNode>()
         for (const oldItem of old) {
             temp.set(oldItem.id, oldItem)
         }
@@ -88,17 +88,17 @@ class GraphService extends Service {
         }
     }
 
-    render(routine: DeserializationObject<RoutineDescriptor>) {
-        this.routine = routine
+    render(interaction: DeserializationObject<InteractionDescriptor>) {
+        this.interaction = interaction
 
         this.drawer.needTriggerChange = false
-        this._doNodes(routine.nodes)
-        this._doMappers(routine.mappers)
+        this._doNodes(interaction.nodes)
+        this._doMappers(interaction.mappers)
         this.drawer.needTriggerChange = true
     }
 
-    update(curRoutine: DeserializationObject<RoutineDescriptor>) {
-        if (this.routine === null) return
+    update(curInteraction: DeserializationObject<InteractionDescriptor>) {
+        if (this.interaction === null) return
 
         this.drawer.needTriggerChange = false
         this.drawer.selectEdge = ''
@@ -108,7 +108,7 @@ class GraphService extends Service {
         const edges = this.drawer.graph.getEdges()
         for (const edge of edges) this.drawer.remove(edge)
 
-        const patch = this._diff(curRoutine.nodes, this.routine.nodes)
+        const patch = this._diff(curInteraction.nodes, this.interaction.nodes)
 
         let needCleanSelection = false
         for (const remove of patch.removeQueue) {
@@ -127,37 +127,37 @@ class GraphService extends Service {
             if (cell) cell.setVMeta(update)
         }
 
-        this._doMappers(curRoutine.mappers)
+        this._doMappers(curInteraction.mappers)
         this.drawer.needTriggerChange = true
 
-        this.routine = curRoutine
+        this.interaction = curInteraction
     }
 
     build() {
-        const routine = new RoutineDescriptor()
+        const interaction = new InteractionDescriptor()
         const cells = this.drawer.graph.getCells()
 
         for (const cell of cells) {
-            if (cell instanceof GraphRoutineUnit) {
+            if (cell instanceof InteractionUnit) {
                 const node = {
                     id: cell.id,
                     label: cell.vMeta.label ?? '',
                     url: cell.vMeta.url,
-                    routine: cell.vMeta.routine,
+                    interaction: cell.vMeta.interaction,
                     input: cell.vMeta.input,
                     position: cell.getPosition(),
                 }
-                routine.nodes.push(node)
+                interaction.nodes.push(node)
             } else if (cell.isEdge()) {
                 const mapper = this.drawer.getMapper(cell)
-                if (mapper) routine.mappers.push(mapper)
+                if (mapper) interaction.mappers.push(mapper)
             }
         }
 
         const roots = this.drawer.graph.getRootNodes()
-        for (const root of roots) routine.roots.push(root.id)
+        for (const root of roots) interaction.roots.push(root.id)
 
-        return { ...routine, uuid: this.routine?.uuid }
+        return { ...interaction, uuid: this.interaction?.uuid }
     }
 
     get(id: string) {

package/src/common/{RoutineUnit.ts → InteractionUnit.ts}

@@ -2,25 +2,25 @@ import { Cell } from "@antv/x6";
 import { Descriptor } from "@vyr/engine";
 import { Unit, UnitMeta, UnitPartial, } from "./Unit";
 
-interface RoutineUnitMeta extends UnitMeta {
+interface InteractionUnitMeta extends UnitMeta {
     url: string
-    routine: string
+    interaction: string
     input: { [param: string]: any }
 }
 
-class RoutineUnit extends Unit {
-    declare vMeta: RoutineUnitMeta
+class InteractionUnit extends Unit {
+    declare vMeta: InteractionUnitMeta
 
-    constructor(vMeta: UnitPartial<RoutineUnitMeta>) {
+    constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
         super(vMeta)
         this.vMeta.input = vMeta.input ? Descriptor.deepClone(vMeta.input) : {}
     }
 }
 
-class ExecuteUnit extends RoutineUnit {
-    constructor(vMeta: UnitPartial<RoutineUnitMeta>) {
+class ExecuteUnit extends InteractionUnit {
+    constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
         super({ ...vMeta, maxInCount: Infinity, icon: 'graphfont graph-execute' })
-        this.vMeta.routine = 'Execute'
+        this.vMeta.interaction = 'Execute'
         this.vMeta.url = vMeta.url ?? ''
     }
 
@@ -30,11 +30,11 @@ class ExecuteUnit extends RoutineUnit {
     }
 }
 
-class BranchUnit extends RoutineUnit {
+class BranchUnit extends InteractionUnit {
 
-    constructor(vMeta: UnitPartial<RoutineUnitMeta>) {
+    constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
         super({ ...vMeta, maxOutCount: Infinity, icon: 'graphfont graph-branch' })
-        this.vMeta.routine = 'Branch'
+        this.vMeta.interaction = 'Branch'
         this.vMeta.url = vMeta.url ?? ''
     }
 
@@ -44,10 +44,10 @@ class BranchUnit extends RoutineUnit {
     }
 }
 
-class ConditionUnit extends RoutineUnit {
-    constructor(vMeta: UnitPartial<RoutineUnitMeta>) {
+class ConditionUnit extends InteractionUnit {
+    constructor(vMeta: UnitPartial<InteractionUnitMeta>) {
         super({ input: { value: { type: 'string', value: '' } }, ...vMeta, icon: 'graphfont graph-condition' })
-        this.vMeta.routine = 'Condition'
+        this.vMeta.interaction = 'Condition'
         this.vMeta.url = vMeta.url ?? ''
     }
 
@@ -58,7 +58,7 @@ class ConditionUnit extends RoutineUnit {
 }
 
 export {
-    RoutineUnit,
+    InteractionUnit,
     ExecuteUnit,
     BranchUnit,
     ConditionUnit,

package/src/index.ts

@@ -2,6 +2,6 @@ import './asset/font/iconfont.css'
 import './asset/less/index.less'
 export * from './locale'
 export * from './common/Unit'
-export * from './common/RoutineUnit'
+export * from './common/InteractionUnit'
 export * from './GraphDrawer'
 export * from './GraphService'