@vyr/engine 0.0.33 → 0.0.34

package/src/Executor.ts

@@ -0,0 +1,109 @@
+import { Scriptable } from "./Scriptable"
+import { Interaction } from "./descriptor/Interaction"
+import { Graphics } from "./graphics/Graphics"
+import { InteractionNode, InteractionNodeInputCollection } from "./schema"
+
+type ExecuteResult = { [k: string]: any } | null
+
+export class Executor {
+    readonly collection = new Map<string, InteractionNode>()
+    readonly linkCollection = new Map<string, string[]>()
+
+    update(interaction: Interaction) {
+        this.collection.clear()
+        this.linkCollection.clear()
+
+        for (const node of interaction.nodes) {
+            this.collection.set(node.id, node)
+        }
+
+        for (const mapper of interaction.mappers) {
+            let link = this.linkCollection.get(mapper.source)
+            if (link === undefined) {
+                link = []
+                this.linkCollection.set(mapper.source, link)
+            }
+            link.push(mapper.target)
+        }
+    }
+
+    async doScript(current: string, previous: string, nodes: InteractionNodeInputCollection, interaction: Interaction, graphics: Graphics, result: Map<string, ExecuteResult>, trigger: string, otherArgs?: any) {
+        const active = this.collection.get(current)
+        if (active === undefined) return
+
+        const nodeInput = nodes[current] ?? active.input
+        const script = Scriptable.use(active.script)
+        if (script) {
+            const args = { previous, result }
+            if (otherArgs) Object.assign(args, otherArgs)
+            const safeInput = script.inputSchame.parse(nodeInput)
+            const executeResult = await script.execute(graphics, trigger, safeInput, args)
+            if (script.outputSchame !== undefined) script.outputSchame.parse(executeResult)
+            result.set(current, executeResult)
+        }
+    }
+
+    async doCondition(conditions: InteractionNode[], previous: string, nodes: InteractionNodeInputCollection, interaction: Interaction, graphics: Graphics, result: Map<string, ExecuteResult>, trigger: string, otherArgs?: any) {
+        const queue: Promise<void>[] = []
+        for (const condition of conditions) {
+            queue.push(this.doScript(condition.id, previous, nodes, interaction, graphics, result, trigger))
+        }
+
+        await Promise.all(queue)
+
+        for (const condition of conditions) {
+            const conditionResult = result.get(condition.id)
+            if (conditionResult?.success !== true) continue
+
+            const nexts = this.linkCollection.get(condition.id)
+            if (nexts === undefined) continue
+            for (const next of nexts) {
+                await this.doExecute(next, previous, nodes, interaction, graphics, result, trigger, otherArgs)
+            }
+        }
+    }
+
+    async doNext(current: string, nodes: InteractionNodeInputCollection, interaction: Interaction, graphics: Graphics, result: Map<string, ExecuteResult>, trigger: string, otherArgs?: any) {
+        const nexts = this.linkCollection.get(current)
+        if (nexts === undefined) return
+
+        const executes: InteractionNode[] = []
+        const conditions: InteractionNode[] = []
+        for (const next of nexts) {
+            const node = this.collection.get(next)
+            if (node === undefined) continue
+            if (node.type === 'Condition') {
+                conditions.push(node)
+            } else if (node.type === 'Execute') {
+                executes.push(node)
+            }
+        }
+
+        const queue: Promise<void>[] = []
+        if (conditions.length > 0) {
+            queue.push(this.doCondition(conditions, current, nodes, interaction, graphics, result, trigger))
+            await Promise.all(queue)
+        }
+
+        if (executes.length > 0) {
+            queue.length = 0
+            for (const execute of executes) {
+                queue.push(this.doExecute(execute.id, current, nodes, interaction, graphics, result, trigger))
+            }
+            await Promise.all(queue)
+        }
+    }
+
+    async doExecute(current: string, previous: string, nodes: InteractionNodeInputCollection, interaction: Interaction, graphics: Graphics, result: Map<string, ExecuteResult>, trigger: string, otherArgs?: any) {
+        await this.doScript(current, previous, nodes, interaction, graphics, result, trigger, otherArgs)
+
+        await this.doNext(current, nodes, interaction, graphics, result, trigger, otherArgs)
+    }
+
+    async execute(nodes: InteractionNodeInputCollection, interaction: Interaction, graphics: Graphics, trigger: string, otherArgs?: any) {
+        for (const root of interaction.roots) {
+            const resultCollection = new Map()
+            await this.doExecute(root, '', nodes, interaction, graphics, resultCollection, trigger, otherArgs)
+        }
+    }
+}

package/src/Generate.ts

@@ -1,40 +1,23 @@
-let id = 1;
-const _lut = ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '0a', '0b', '0c', '0d', '0e', '0f', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '1a', '1b', '1c', '1d', '1e', '1f', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '2a', '2b', '2c', '2d', '2e', '2f', '30', '31', '32', '33', '34', '35', '36', '37', '38', '39', '3a', '3b', '3c', '3d', '3e', '3f', '40', '41', '42', '43', '44', '45', '46', '47', '48', '49', '4a', '4b', '4c', '4d', '4e', '4f', '50', '51', '52', '53', '54', '55', '56', '57', '58', '59', '5a', '5b', '5c', '5d', '5e', '5f', '60', '61', '62', '63', '64', '65', '66', '67', '68', '69', '6a', '6b', '6c', '6d', '6e', '6f', '70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '7a', '7b', '7c', '7d', '7e', '7f', '80', '81', '82', '83', '84', '85', '86', '87', '88', '89', '8a', '8b', '8c', '8d', '8e', '8f', '90', '91', '92', '93', '94', '95', '96', '97', '98', '99', '9a', '9b', '9c', '9d', '9e', '9f', 'a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'aa', 'ab', 'ac', 'ad', 'ae', 'af', 'b0', 'b1', 'b2', 'b3', 'b4', 'b5', 'b6', 'b7', 'b8', 'b9', 'ba', 'bb', 'bc', 'bd', 'be', 'bf', 'c0', 'c1', 'c2', 'c3', 'c4', 'c5', 'c6', 'c7', 'c8', 'c9', 'ca', 'cb', 'cc', 'cd', 'ce', 'cf', 'd0', 'd1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7', 'd8', 'd9', 'da', 'db', 'dc', 'dd', 'de', 'df', 'e0', 'e1', 'e2', 'e3', 'e4', 'e5', 'e6', 'e7', 'e8', 'e9', 'ea', 'eb', 'ec', 'ed', 'ee', 'ef', 'f0', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'fa', 'fb', 'fc', 'fd', 'fe', 'ff'];
-
-class Generate {
-  static id() {
-    return id++
-  }
-
-  static uuid() {
-    const d0 = Math.random() * 0xffffffff | 0;
-    const d1 = Math.random() * 0xffffffff | 0;
-    const d2 = Math.random() * 0xffffffff | 0;
-    const d3 = Math.random() * 0xffffffff | 0;
-    const uuid = _lut[d0 & 0xff] + _lut[d0 >> 8 & 0xff] + _lut[d0 >> 16 & 0xff] + _lut[d0 >> 24 & 0xff] + '-' +
-      _lut[d1 & 0xff] + _lut[d1 >> 8 & 0xff] + '-' + _lut[d1 >> 16 & 0x0f | 0x40] + _lut[d1 >> 24 & 0xff] + '-' +
-      _lut[d2 & 0x3f | 0x80] + _lut[d2 >> 8 & 0xff] + '-' + _lut[d2 >> 16 & 0xff] + _lut[d2 >> 24 & 0xff] +
-      _lut[d3 & 0xff] + _lut[d3 >> 8 & 0xff] + _lut[d3 >> 16 & 0xff] + _lut[d3 >> 24 & 0xff];
-
-    return uuid.toLowerCase()
-  }
-
-  static delayExecute(cb: (...args: any[]) => any) {
-    const delaySatate = {
-      args: [] as any[],
-      execute: false
-    }
-    const execute = (...args: any[]) => {
-      delaySatate.args = args
-      if (delaySatate.execute === true) return
-      delaySatate.execute = true
-      requestAnimationFrame(() => {
-        cb(...delaySatate.args)
-        delaySatate.execute = false
-      })
-    }
-    return execute
-  }
-}
-
-export { Generate }
+let id = 1;
+const _lut = ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '0a', '0b', '0c', '0d', '0e', '0f', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '1a', '1b', '1c', '1d', '1e', '1f', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '2a', '2b', '2c', '2d', '2e', '2f', '30', '31', '32', '33', '34', '35', '36', '37', '38', '39', '3a', '3b', '3c', '3d', '3e', '3f', '40', '41', '42', '43', '44', '45', '46', '47', '48', '49', '4a', '4b', '4c', '4d', '4e', '4f', '50', '51', '52', '53', '54', '55', '56', '57', '58', '59', '5a', '5b', '5c', '5d', '5e', '5f', '60', '61', '62', '63', '64', '65', '66', '67', '68', '69', '6a', '6b', '6c', '6d', '6e', '6f', '70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '7a', '7b', '7c', '7d', '7e', '7f', '80', '81', '82', '83', '84', '85', '86', '87', '88', '89', '8a', '8b', '8c', '8d', '8e', '8f', '90', '91', '92', '93', '94', '95', '96', '97', '98', '99', '9a', '9b', '9c', '9d', '9e', '9f', 'a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'aa', 'ab', 'ac', 'ad', 'ae', 'af', 'b0', 'b1', 'b2', 'b3', 'b4', 'b5', 'b6', 'b7', 'b8', 'b9', 'ba', 'bb', 'bc', 'bd', 'be', 'bf', 'c0', 'c1', 'c2', 'c3', 'c4', 'c5', 'c6', 'c7', 'c8', 'c9', 'ca', 'cb', 'cc', 'cd', 'ce', 'cf', 'd0', 'd1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7', 'd8', 'd9', 'da', 'db', 'dc', 'dd', 'de', 'df', 'e0', 'e1', 'e2', 'e3', 'e4', 'e5', 'e6', 'e7', 'e8', 'e9', 'ea', 'eb', 'ec', 'ed', 'ee', 'ef', 'f0', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'fa', 'fb', 'fc', 'fd', 'fe', 'ff'];
+
+export class Generate {
+  static id() {
+    return id++
+  }
+
+  static uuid() {
+    const d0 = Math.random() * 0xffffffff | 0;
+    const d1 = Math.random() * 0xffffffff | 0;
+    const d2 = Math.random() * 0xffffffff | 0;
+    const d3 = Math.random() * 0xffffffff | 0;
+    const uuid = _lut[d0 & 0xff] + _lut[d0 >> 8 & 0xff] + _lut[d0 >> 16 & 0xff] + _lut[d0 >> 24 & 0xff] + '-'
+      + _lut[d1 & 0xff] + _lut[d1 >> 8 & 0xff] + '-'
+      + _lut[d1 >> 16 & 0x0f | 0x40] + _lut[d1 >> 24 & 0xff] + '-'
+      + _lut[d2 & 0x3f | 0x80] + _lut[d2 >> 8 & 0xff] + '-'
+      + _lut[d2 >> 16 & 0xff] + _lut[d2 >> 24 & 0xff]
+      + _lut[d3 & 0xff] + _lut[d3 >> 8 & 0xff] + _lut[d3 >> 16 & 0xff] + _lut[d3 >> 24 & 0xff];
+
+    return uuid.toLowerCase()
+  }
+}

package/src/InputSystem.ts

@@ -1,108 +1,106 @@
-type IEM = GlobalEventHandlersEventMap
-
-interface InputConfig {
-  /**事件只触发一次，默认`false` */
-  once: boolean
-  /**将事件的处理顺序设为事件捕获，默认`false` */
-  capture: boolean
-  /**处理函数不会调用`preventDefault`来阻止默认行为时应设为true，默认`false` */
-  passive: boolean
-  /**事件触发的对象 */
-  target: Window | Document | HTMLElement
-}
-
-const privateState = {
-  id: 1,
-  listener: {
-    default: (input: InputEvent, system: InputSystem) => {
-      return (event: Event) => {
-        input.event = event
-        if (input.enable) return
-        input.enable = true
-        system.quaua.push(input)
-      }
-    },
-    once: (input: InputEvent, system: InputSystem) => {
-      const execute = privateState.listener.default(input, system)
-      return (e: Event) => {
-        execute(e)
-        system.unlisten(input.id)
-      }
-    },
-  }
-}
-
-class InputEvent {
-  readonly id = privateState.id++
-  readonly type
-  readonly target
-  readonly callback: (e: Event) => void
-  readonly listener: (e: Event) => void
-  enable = false
-  event!: Event
-
-  constructor(type: keyof IEM, callback: (e: any) => void, system: InputSystem, config: InputConfig) {
-    this.type = type
-    this.target = config.target
-    this.callback = callback
-    this.listener = config.once ? privateState.listener.once(this, system) : privateState.listener.default(this, system)
-  }
-
-  execute() {
-    this.callback(this.event)
-    this.enable = false
-  }
-}
-
-class InputSystem {
-  private _target
-  private _registry: InputEvent[] = []
-  readonly quaua: InputEvent[] = []
-
-  constructor(target: InputConfig['target']) {
-    this._target = target
-  }
-
-  /**
-   * 监听事件输入,事件在一帧中只执行一次
-   * @param type 事件类型
-   * @param callback 事件触发时的回调
-   * @param options.once 只执行一次回调
-   * @param options.target 监听事件的绑定对象
-   * @param options.capture 事件执行的阶段，true：捕获阶段执行，false：冒泡阶段执行
-   */
-  listen<T extends keyof IEM>(type: T, callback: (event: IEM[T]) => void, options: Partial<InputConfig> = {}) {
-    const config: InputConfig = { once: false, target: this._target, passive: false, capture: false, ...options }
-
-    for (const input of this._registry) {
-      if (input.type === type && input.callback === callback && options.target === input.target) return input.id
-    }
-
-    const input = new InputEvent(type, callback, this, config)
-    this._registry.push(input)
-    input.target.addEventListener(type, input.listener, config.capture)
-
-    return input.id
-  }
-
-  /**解除事件监听 */
-  unlisten(id: number) {
-    for (let i = 0; i < this._registry.length; i++) {
-      const input = this._registry[i]
-      if (input.id === id) {
-        this._registry.splice(i, 1)
-        input.target.removeEventListener(input.type, input.listener)
-        return
-      }
-    }
-  }
-
-  /**处理输入事件 */
-  process() {
-    const quaua = [...this.quaua]
-    for (const input of quaua) input.execute()
-    this.quaua.length = 0
-  }
-}
-
-export { InputSystem }
+export type IEM = GlobalEventHandlersEventMap
+
+export interface InputConfig {
+  /**事件只触发一次，默认`false` */
+  once: boolean
+  /**将事件的处理顺序设为事件捕获，默认`false` */
+  capture: boolean
+  /**处理函数不会调用`preventDefault`来阻止默认行为时应设为true，默认`false` */
+  passive: boolean
+  /**事件触发的对象 */
+  target: Window | Document | HTMLElement
+}
+
+const privateState = {
+  id: 1,
+  listener: {
+    default: (input: InputEvent, system: InputSystem) => {
+      return (event: Event) => {
+        input.event = event
+        if (input.enable) return
+        input.enable = true
+        system.quaua.push(input)
+      }
+    },
+    once: (input: InputEvent, system: InputSystem) => {
+      const execute = privateState.listener.default(input, system)
+      return (e: Event) => {
+        execute(e)
+        system.unlisten(input.id)
+      }
+    },
+  }
+}
+
+export class InputEvent {
+  readonly id = privateState.id++
+  readonly type
+  readonly target
+  readonly callback: (e: Event) => void
+  readonly listener: (e: Event) => void
+  enable = false
+  event!: Event
+
+  constructor(type: keyof IEM, callback: (e: any) => void, system: InputSystem, config: InputConfig) {
+    this.type = type
+    this.target = config.target
+    this.callback = callback
+    this.listener = config.once ? privateState.listener.once(this, system) : privateState.listener.default(this, system)
+  }
+
+  execute() {
+    this.callback(this.event)
+    this.enable = false
+  }
+}
+
+export class InputSystem {
+  private _target
+  private _registry: InputEvent[] = []
+  readonly quaua: InputEvent[] = []
+
+  constructor(target: InputConfig['target']) {
+    this._target = target
+  }
+
+  /**
+   * 监听事件输入,事件在一帧中只执行一次
+   * @param type 事件类型
+   * @param callback 事件触发时的回调
+   * @param options.once 只执行一次回调
+   * @param options.target 监听事件的绑定对象
+   * @param options.capture 事件执行的阶段，true：捕获阶段执行，false：冒泡阶段执行
+   */
+  listen<T extends keyof IEM>(type: T, callback: (event: IEM[T]) => void, options: Partial<InputConfig> = {}) {
+    const config: InputConfig = { once: false, target: this._target, passive: false, capture: false, ...options }
+
+    for (const input of this._registry) {
+      if (input.type === type && input.callback === callback && options.target === input.target) return input.id
+    }
+
+    const input = new InputEvent(type, callback, this, config)
+    this._registry.push(input)
+    input.target.addEventListener(type, input.listener, config.capture)
+
+    return input.id
+  }
+
+  /**解除事件监听 */
+  unlisten(id: number) {
+    for (let i = 0; i < this._registry.length; i++) {
+      const input = this._registry[i]
+      if (input.id === id) {
+        this._registry.splice(i, 1)
+        input.target.removeEventListener(input.type, input.listener)
+        return
+      }
+    }
+  }
+
+  /**处理输入事件 */
+  process() {
+    const quaua = [...this.quaua]
+    for (const input of quaua) input.execute()
+    this.quaua.length = 0
+  }
+}

package/src/Listener.ts

@@ -1,59 +1,58 @@
-type DeafultCallback = (...args: any[]) => any
-type CallbackCollection<T extends {} = {}> = { [k: string]: DeafultCallback } & T
-
-interface listenOptions {
-  once?: boolean
-  insertIndex?: number
-}
-
-class Listener<T extends {} = {}> {
-  private registrys: any = {}
-
-  listen<K extends keyof T>(type: K, callback: T[K], options?: listenOptions): () => void
-  listen(type: string, callback: DeafultCallback, options?: listenOptions): () => void
-  listen<K extends keyof T>(type: K | string, callback?: T[K], options: listenOptions = {}) {
-
-    let register = this.registrys[type]
-    if (register === undefined) {
-      register = []
-      this.registrys[type] = register
-    }
-    const insertIndex = options.insertIndex === undefined ? register.length : options.insertIndex
-
-    const row = register.find((r: any) => r.callback === callback)
-    if (!row) register.splice(insertIndex, 0, { once: options.once ?? false, callback })
-    const unlisten = () => this.unlisten(type as any, callback)
-    return unlisten
-  }
-
-  unlisten<K extends keyof T>(type: K, callback: T[K]): void
-  unlisten(type: string, callback: DeafultCallback): void
-  unlisten<K extends keyof T>(type: K, callback: T[K]) {
-    let registry = this.registrys[type]
-    if (registry === undefined) return
-
-    for (let i = 0; i < registry.length; i++) {
-      if (registry[i].callback !== callback) continue
-
-      registry.splice(i, 1)
-      if (registry.length === 0) delete this.registrys[type]
-      return
-    }
-  }
-
-  trigger<K extends keyof T>(type: K, ...args: Parameters<CallbackCollection<T>[K]>): void
-  trigger(type: string, ...args: any[]): void
-  trigger<K extends keyof T>(type: K, ...args: Parameters<CallbackCollection<T>[K]>) {
-    let registry = this.registrys[type]
-    if (registry === undefined) return //console.warn(`无法触发该事件 ${type as string}`)
-
-    if (registry.length === 0) return
-
-    registry = [...this.registrys[type]]
-    for (let i = 0; i < registry.length; i++) {
-      registry[i].callback(...args as any)
-      if (registry[i].once === true) this.unlisten(type, registry[i].callback)
-    }
-  }
-}
-export { Listener }
+export type DeafultCallback = (...args: any[]) => any
+export type CallbackCollection<T extends {} = {}> = { [k: string]: DeafultCallback } & T
+
+export interface listenOptions {
+  once?: boolean
+  insertIndex?: number
+}
+
+export class Listener<T extends {} = {}> {
+  private registrys: any = {}
+
+  listen<K extends keyof T>(type: K, callback: T[K], options?: listenOptions): () => void
+  listen(type: string, callback: DeafultCallback, options?: listenOptions): () => void
+  listen<K extends keyof T>(type: K | string, callback?: T[K], options: listenOptions = {}) {
+
+    let register = this.registrys[type]
+    if (register === undefined) {
+      register = []
+      this.registrys[type] = register
+    }
+    const insertIndex = options.insertIndex === undefined ? register.length : options.insertIndex
+
+    const row = register.find((r: any) => r.callback === callback)
+    if (!row) register.splice(insertIndex, 0, { once: options.once ?? false, callback })
+    const unlisten = () => this.unlisten(type as any, callback)
+    return unlisten
+  }
+
+  unlisten<K extends keyof T>(type: K, callback: T[K]): void
+  unlisten(type: string, callback: DeafultCallback): void
+  unlisten<K extends keyof T>(type: K, callback: T[K]) {
+    let registry = this.registrys[type]
+    if (registry === undefined) return
+
+    for (let i = 0; i < registry.length; i++) {
+      if (registry[i].callback !== callback) continue
+
+      registry.splice(i, 1)
+      if (registry.length === 0) delete this.registrys[type]
+      return
+    }
+  }
+
+  trigger<K extends keyof T>(type: K, ...args: Parameters<CallbackCollection<T>[K]>): void
+  trigger(type: string, ...args: any[]): void
+  trigger<K extends keyof T>(type: K, ...args: Parameters<CallbackCollection<T>[K]>) {
+    let registry = this.registrys[type]
+    if (registry === undefined) return //console.warn(`无法触发该事件 ${type as string}`)
+
+    if (registry.length === 0) return
+
+    registry = [...this.registrys[type]]
+    for (let i = 0; i < registry.length; i++) {
+      registry[i].callback(...args as any)
+      if (registry[i].once === true) this.unlisten(type, registry[i].callback)
+    }
+  }
+}