@vyr/engine 0.0.20 → 0.0.22

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@vyr/engine",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@vyr/locale": "0.0.20",
+    "@vyr/locale": "0.0.22",
     "tinycolor2": "1.6.0"
   },
   "devDependencies": {

package/src/asset/Asset.ts

@@ -1,8 +1,9 @@
 import { language } from "../locale"
 import { Category } from "../Category"
 import { AsyncTask } from "../AsyncTask"
-import { Descriptor, ServiceSchedulerDescriptor } from "../descriptor"
+import { DatasetDescriptor, Descriptor, ServiceSchedulerDescriptor } from "../descriptor"
 import { InteractionDescriptor, Scriptable, ScriptableArgs } from "../interaction"
+import { compile } from "../utils/compile"
 import { AssetGraph } from "./AssetGraph"
 import { Engine } from "../Engine"
 
@@ -33,6 +34,7 @@ const privateState = {
 }
 
 class Asset {
+    static virtual = 'virtual'
     static get baseUrl() {
         if (privateState.baseUrl === null) {
             try {
@@ -60,7 +62,7 @@ class Asset {
     }
 
     static createVirtualUrl(fileName: string) {
-        return `/virtual:/${fileName}`
+        return `/${this.virtual}:/${fileName}`
     }
 
     static provider(url: string, provider: DescriptorProvider | ScriptableProvider) {
@@ -191,8 +193,8 @@ class Asset {
 
         const queue: Promise<void>[] = []
         for (const dataset of dependencide.dataset) {
-            const trigger = Asset.get<Descriptor>(dataset)
-            queue.push(graphics.invoke('compile', trigger))
+            const trigger = Asset.get<DatasetDescriptor>(dataset)
+            compile(trigger, graphics)
         }
 
         await Promise.all(queue)

package/src/locale/LanguageProvider.ts

@@ -17,7 +17,6 @@ interface ZhCNLanguageProvider extends LanguageProvider {
 
     '/virtual:/preset/net/http.ts': string
     '/virtual:/preset/dataset/update.ts': string
-    '/virtual:/preset/dataset/compile.ts': string
     '/virtual:/preset/scheduler/switch.ts': string
     '/virtual:/preset/graphics/invoke.ts': string
 }
@@ -41,7 +40,6 @@ const zhCnLanguageProvider: ZhCNLanguageProvider = {
 
     '/virtual:/preset/net/http.ts': '网络请求',
     '/virtual:/preset/dataset/update.ts': '更新数据集',
-    '/virtual:/preset/dataset/compile.ts': '组合数据集',
     '/virtual:/preset/scheduler/switch.ts': '切换场景',
     '/virtual:/preset/graphics/invoke.ts': '调用交互',
 }

package/src/preset/execute/dataset/index.ts

@@ -1,2 +1 @@
-export * as update from './update'
-export * as compile from './compile'
+export * as update from './update'

package/src/preset/execute/net/http.ts

@@ -1,62 +1,19 @@
 import { language } from "../../../locale";
 import { Asset } from "../../../asset";
-import { HttpType } from "../../../utils";
+import { http } from "../../../utils";
 import { Graphics } from "../../../graphics";
 import { Scriptable, InteractionNode, ScriptableArgs } from "../../../interaction";
 
 const scriptable = Asset.createVirtualUrl('preset/net/http.ts')
 class ExecuteScriptable extends Scriptable {
 
-    joinUrl(url: string, requestData: any) {
-        const urlObj = new URL(Asset.joinUrl(url));
-
-        // 直接将requestData添加到urlObj的searchParams中
-        Object.entries(requestData).forEach(([key, value]) => {
-            if (value !== null && value !== undefined) {
-                urlObj.searchParams.set(key, String(value));
-            }
-        });
-
-        return urlObj.toString()
-    }
-
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input, result } = args
         let url = this.getInputValue('url', input)
         const type = this.getInputValue('type', input)
         const data = this.getInputValue('data', input)
 
-        const requestData: { [k: string]: any } = {}
-        const keys: string[] = []
-        if (data.trim().length === 0) {
-            keys.push(...result.keys())
-        } else {
-            keys.push(...data.split(','))
-        }
-
-        for (const key of keys) {
-            const value = result.get(key)
-            Object.assign(requestData, value ?? {})
-        }
-
-        url = url.replace(/\${(\w+)}/g, (match: any, key: string) => {
-            return requestData.hasOwnProperty(key) ? requestData[key] : match;
-        })
-
-        const config = {
-            method: type,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        }
-        let res
-        if (type === HttpType.GET) {
-            res = await fetch(this.joinUrl(url, requestData), config)
-        } else {
-            res = await fetch(url, { ...config, body: JSON.stringify(requestData) })
-        }
-
-        const json = await res.json()
+        const json = await http(url, type, data, result)
 
         return json
     }

package/src/preset/interaction/index.ts

@@ -1,3 +1,2 @@
-export * as dataset from './dataset'
 export * as scheduler from './scheduler'
 export * as graphics from './graphics'

package/src/utils/AssetProvider.ts

@@ -1,6 +1,6 @@
 import { InteractionDescriptor, InteractionNode, InteractionProperty } from "../interaction"
 import { Descriptor, DynamicDescriptor, PrefabInstanceDescriptor, HTMLDescriptor, StyleDescriptor, DatasetDescriptor, DivDescriptor } from "../descriptor"
-import { AssetGraph, Port } from "../asset"
+import { Asset, AssetGraph, Port } from "../asset"
 import { Category } from "../Category"
 
 const interactionExecutor = (interaction: InteractionProperty, path: string, port: Port) => {
@@ -30,7 +30,9 @@ const DescriptorProvider = (descriptor: Descriptor, port: Port) => {
             const interaction = descriptor.interactions[i]
             if (interaction.url) {
                 interactionExecutor(interaction, `interactions[${i}]`, port)
-                port.edges.push({ key: `interactions[${i}].url`, category: Category.interaction, asset: interaction.url })
+                if (interaction.url.startsWith(`/${Asset.virtual}:/`) === false) {
+                    port.edges.push({ key: `interactions[${i}].url`, category: Category.interaction, asset: interaction.url })
+                }
             }
         }
     }

package/src/utils/compile.ts

@@ -0,0 +1,50 @@
+import { Graphics } from "../graphics/Graphics";
+import { DatasetDescriptor, HttpDataConfig } from "../descriptor/DatasetDescriptor";
+import { http } from "./http";
+
+const transformData = (data: any, config: HttpDataConfig) => {
+    return data
+}
+
+const buildData = async (config: HttpDataConfig, trigger: DatasetDescriptor, graphics: Graphics) => {
+    const data = await http(config.url, config.type, '', new Map())
+    return transformData(data, config)
+}
+
+const compile = async (descriptor: DatasetDescriptor, graphics: Graphics) => {
+    if (descriptor.dataConfigs.length > 0) {
+        const dataConfigs = descriptor.dataConfigs as unknown as HttpDataConfig[]
+
+        let mergeData: any[] | any
+        if (dataConfigs.length === 1) {
+            const config = dataConfigs[0]
+            const finalData = await buildData(config, descriptor, graphics)
+            mergeData = config.key ? { [config.key]: finalData } : finalData
+        } else {
+            const keys = new Set<string>()
+            const queue: Promise<any>[] = []
+            for (const config of dataConfigs) {
+                keys.add(config.key)
+
+                const task = buildData(config, descriptor, graphics).then(finalData => {
+                    const first = keys.values().next().value
+                    if (keys.size === 1 && (first === '' || first === undefined)) {
+                        if (!mergeData) mergeData = []
+                        mergeData.push(finalData)
+                    } else {
+                        if (!mergeData) mergeData = {}
+                        mergeData[config.key] ? Object.assign(mergeData[config.key], finalData) : mergeData[config.key] = finalData
+                    }
+                })
+                queue.push(task)
+            }
+            await Promise.all(queue)
+        }
+
+        descriptor.setData(mergeData)
+    }
+}
+
+export {
+    compile
+}

package/src/utils/http.ts

@@ -0,0 +1,56 @@
+import { ScriptableArgs } from "../interaction";
+import { Asset } from "../asset";
+import { HttpType } from "./constants";
+
+const joinUrl = (url: string, requestData: any) => {
+    const urlObj = new URL(Asset.joinUrl(url));
+
+    // 直接将requestData添加到urlObj的searchParams中
+    Object.entries(requestData).forEach(([key, value]) => {
+        if (value !== null && value !== undefined) {
+            urlObj.searchParams.set(key, String(value));
+        }
+    });
+
+    return urlObj.toString()
+}
+
+const http = async (url: string, type: string, data: string, result: ScriptableArgs['result']) => {
+    const requestData: { [k: string]: any } = {}
+    const keys: string[] = []
+    if (data.trim().length === 0) {
+        keys.push(...result.keys())
+    } else {
+        keys.push(...data.split(','))
+    }
+
+    for (const key of keys) {
+        const value = result.get(key)
+        Object.assign(requestData, value ?? {})
+    }
+
+    url = url.replace(/\${(\w+)}/g, (match: any, key: string) => {
+        return requestData.hasOwnProperty(key) ? requestData[key] : match;
+    })
+
+    const config = {
+        method: type,
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    }
+    let res
+    if (type === HttpType.GET) {
+        res = await fetch(joinUrl(url, requestData), config)
+    } else {
+        res = await fetch(url, { ...config, body: JSON.stringify(requestData) })
+    }
+
+    const json = await res.json()
+
+    return json
+}
+
+export {
+    http
+}

package/src/utils/index.ts

@@ -1,2 +1,4 @@
 export * from './constants'
+export * from './http'
+export * from './compile'
 export * from './AssetProvider'

package/src/preset/execute/dataset/compile.ts

@@ -1,99 +0,0 @@
-import { language } from "../../../locale";
-import { Asset } from "../../../asset";
-import { InteractionNode, Scriptable, ScriptableArgs } from "../../../interaction";
-import { DatasetDescriptor, Descriptor, HttpDataConfig } from "../../../descriptor";
-import { Graphics } from "../../../graphics";
-import { ExecuteScriptable as HttpScriptable } from "../net/http";
-
-const scriptable = Asset.createVirtualUrl('preset/dataset/compile.ts')
-class ExecuteScriptable extends Scriptable {
-
-    async getData(config: HttpDataConfig, http: HttpScriptable, trigger: Descriptor, graphics: Graphics) {
-        const args: ScriptableArgs = {
-            input: {
-                previous: '',
-                user: {
-                    type: { value: config.type },
-                    url: { value: config.url },
-                    data: { value: '' },
-                },
-                default: {}
-            },
-            result: new Map(),
-            trigger: trigger
-        }
-
-        const data = await http.execute(graphics, args)
-
-        return this.transformData(data, config)
-    }
-
-    transformData(data: any, config: HttpDataConfig) {
-        return data
-    }
-
-    async execute(graphics: Graphics, args: ScriptableArgs) {
-        const { trigger } = args
-
-        if (trigger instanceof DatasetDescriptor && trigger.dataConfigs.length > 0) {
-            const dataConfigs = trigger.dataConfigs as HttpDataConfig[]
-            const http = new HttpScriptable(Asset.createVirtualUrl('preset/dataset/compile/http.ts'))
-
-            let mergeData: any[] | any
-            if (dataConfigs.length === 1) {
-                const config = dataConfigs[0]
-                const finalData = await this.getData(config, http, trigger, graphics)
-                mergeData = config.key ? { [config.key]: finalData } : finalData
-            } else {
-                const keys = new Set<string>()
-                const queue: Promise<any>[] = []
-                for (const config of dataConfigs) {
-                    keys.add(config.key)
-
-                    const task = this.getData(config, http, trigger, graphics).then(finalData => {
-                        const first = keys.values().next().value
-                        if (keys.size === 1 && (first === '' || first === undefined)) {
-                            if (!mergeData) mergeData = []
-                            mergeData.push(finalData)
-                        } else {
-                            if (!mergeData) mergeData = {}
-                            mergeData[config.key] ? Object.assign(mergeData[config.key], finalData) : mergeData[config.key] = finalData
-                        }
-                    })
-                    queue.push(task)
-                }
-                await Promise.all(queue)
-            }
-
-            trigger.setData(mergeData)
-        }
-    }
-}
-Asset.provider(scriptable, async () => ({ default: ExecuteScriptable }))
-
-const createExecuteInput = (args: any = {}) => {
-    const input = {
-    }
-
-    return input
-}
-
-const createExecuteNode = (options: { id: string; position?: any; input?: any }) => {
-    const executeNode: InteractionNode = {
-        id: options.id,
-        label: language.get(scriptable as any),
-        position: { x: options?.position?.x ?? 20, y: options?.position?.y ?? 20 },
-        interaction: 'Execute',
-        url: scriptable,
-        input: createExecuteInput(options.input)
-    }
-    return executeNode
-}
-
-export {
-    scriptable,
-    createExecuteInput,
-    createExecuteNode,
-}
-
-

package/src/preset/interaction/dataset/compile.ts

@@ -1,27 +0,0 @@
-import { Asset } from "../../../asset";
-import { InteractionDescriptor } from "../../../interaction";
-import { dataset } from "../../execute"
-
-const url = Asset.createVirtualUrl('preset/dataset/compile.interaction.json')
-const nodes = {
-    compile: 'compile'
-}
-let _currentInteraction: InteractionDescriptor | null = null
-const interactionProvider = async () => {
-    if (_currentInteraction === null) {
-        _currentInteraction = new InteractionDescriptor()
-        const compileNode = dataset.compile.createExecuteNode({ id: nodes.compile })
-        _currentInteraction.addNode([compileNode])
-        _currentInteraction.roots.push(compileNode.id)
-    }
-    return _currentInteraction
-}
-
-Asset.provider(url, interactionProvider)
-
-export {
-    url,
-    nodes,
-}
-
-

package/src/preset/interaction/dataset/index.ts

@@ -1 +0,0 @@
-export * as compile from "./compile"