@vyr/cli 0.0.19 → 0.0.21

package/output/design/src/locale/LanguageProvider.ts

@@ -4,6 +4,7 @@ interface ZhCNLanguageProvider extends LanguageProvider {
     'input.placeholder': string
     'select.placeholder': string
     'notify.send.notMessage': string
+    'confirm.title.default': string
     'confirm.state.notFound': string
     'confirm.button.submit': string
     'confirm.button.cancel': string
@@ -21,6 +22,7 @@ const zhCnLanguageProvider: ZhCNLanguageProvider = {
     'input.placeholder': '请输入内容',
     'select.placeholder': '请选择',
     'notify.send.notMessage': '消息已被忽略，缺少提示信息！',
+    'confirm.title.default': '系统提示',
     'confirm.state.notFound': '未初始化确认框的状态',
     'confirm.button.submit': '确 认',
     'confirm.button.cancel': '取 消',

package/output/design/src/theme/index.ts

@@ -62,6 +62,8 @@ interface ThemeConfig {
   popoverBackgroundColor: string
 
   notifyZIndex: number
+
+  loadingZIndex: number
 }
 
 const transform = (source: string, split: RegExp, replace: RegExp) => {
@@ -132,6 +134,8 @@ class Theme {
     popoverBackgroundColor: 'rgba(30, 30, 30, 1)',
 
     notifyZIndex: 2000,
+
+    loadingZIndex: 10000,
   })
 
   static update(config: Partial<ThemeConfig>) {

package/output/engine/package.json

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

package/output/engine/src/asset/Asset.ts

@@ -1,7 +1,7 @@
 import { language } from "../locale"
 import { Category } from "../Category"
 import { AsyncTask } from "../AsyncTask"
-import { DatasetDescriptor, Descriptor, ServiceSchedulerDescriptor } from "../descriptor"
+import { Descriptor, ServiceSchedulerDescriptor } from "../descriptor"
 import { InteractionDescriptor, Scriptable, ScriptableArgs } from "../interaction"
 import { AssetGraph } from "./AssetGraph"
 import { Engine } from "../Engine"
@@ -239,14 +239,7 @@ Asset.register(Category.texture, factoryDescriptor)
 Asset.register(Category.prefab, factoryDescriptor)
 Asset.register(Category.interaction, factoryDescriptor)
 Asset.register(Category.scene, factoryDescriptor)
-
-const factoryDataset = async (url: string) => {
-    const asset = await factoryDescriptor(url) as DatasetDescriptor
-    // if (asset.auto) await asset.fetch()
-
-    return asset
-}
-Asset.register(Category.dataset, factoryDataset)
+Asset.register(Category.dataset, factoryDescriptor)
 
 const factoryJson = async (url: string) => {
     const res = await Asset.fetch(Asset.joinUrl(url))

package/output/engine/src/interaction/Scriptable.ts

@@ -28,6 +28,10 @@ class Scriptable<T extends ScriptableArgs<any, any, any> = ScriptableArgs> {
         this.uuid = url
     }
 
+    getInputValue(key: string, input: ScriptableInput) {
+        return input?.user?.[key]?.value ?? input.default[key].value
+    }
+
     /**脚本的准备事件，该方法在脚本被实例化后立即执行
      * 
      * 一般在该事件中进行脚本的准备工作，如从服务端获取资源或数据

package/output/engine/src/preset/execute/dataset/update.ts

@@ -9,7 +9,7 @@ const scriptable = Asset.createVirtualUrl('preset/dataset/update.ts')
 class ExecuteScriptable extends Scriptable {
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input, result } = args
-        const dataset = input?.user?.dataset.value ?? input.default.dataset.value
+        const dataset = this.getInputValue('dataset', input)
 
         const previous = result.get(input.previous)
         const datasetDescriptor = Asset.get<DatasetDescriptor>(dataset)

package/output/engine/src/preset/execute/graphics/invoke.ts

@@ -8,8 +8,8 @@ const scriptable = Asset.createVirtualUrl('preset/graphics/invoke.ts')
 class ExecuteScriptable extends Scriptable {
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input } = args
-        const interaction = input?.user?.interaction.value ?? input.default.interaction.value
-        const target = input?.user?.target.value ?? input.default.target.value
+        const interaction = this.getInputValue('interaction', input)
+        const target = this.getInputValue('target', input)
         const targetDescriptor = Descriptor.get<Descriptor>(target)
         if (interaction && targetDescriptor) {
             graphics.invoke(interaction, targetDescriptor)

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

@@ -22,9 +22,9 @@ class ExecuteScriptable extends Scriptable {
 
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input, result } = args
-        let url = input?.user?.url.value ?? input.default.url.value
-        const type: string = input?.user?.type.value ?? input.default.type.value
-        const data: string = input?.user?.data.value ?? input.default.data.value
+        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[] = []

package/output/engine/src/preset/execute/scheduler/switch.ts

@@ -7,7 +7,7 @@ import { Graphics } from "../../../graphics";
 const scriptable = Asset.createVirtualUrl('preset/scheduler/switch.ts')
 class ExecuteScriptable extends Scriptable {
     async execute(graphics: Graphics, args: ScriptableArgs) {
-        const scene = args.input?.user?.scene.value
+        const scene = this.getInputValue('scene', args.input)
         if (!scene) return
         await Asset.loadAll(scene)
         await Asset.compileDataset(scene, graphics.engine)

package/output/engine/src/utils/AssetProvider.ts

@@ -1,5 +1,5 @@
 import { InteractionDescriptor, InteractionNode, InteractionProperty } from "../interaction"
-import { Descriptor, DynamicDescriptor, PrefabInstanceDescriptor, HTMLDescriptor, StyleDescriptor } from "../descriptor"
+import { Descriptor, DynamicDescriptor, PrefabInstanceDescriptor, HTMLDescriptor, StyleDescriptor, DatasetDescriptor, DivDescriptor } from "../descriptor"
 import { AssetGraph, Port } from "../asset"
 import { Category } from "../Category"
 
@@ -37,6 +37,18 @@ const DescriptorProvider = (descriptor: Descriptor, port: Port) => {
     if (descriptor.dataset) port.edges.push({ key: 'dataset', category: Category.dataset, asset: descriptor.dataset })
 }
 
+const DatasetDescriptorProvider = (descriptor: DatasetDescriptor, port: Port) => {
+    if (descriptor.dataConfigs.length > 0) {
+        for (let i = 0; i < descriptor.dataConfigs.length; i++) {
+            const dataConfig = descriptor.dataConfigs[i]
+            if (dataConfig.url && dataConfig.url.startsWith('/') && dataConfig.url.endsWith('.json')) {
+                port.edges.push({ key: `dataConfig[${i}].url`, category: Category.json, asset: dataConfig.url })
+            }
+        }
+    }
+    if (descriptor.dataset) port.edges.push({ key: 'dataset', category: Category.dataset, asset: descriptor.dataset })
+}
+
 const StyleDescriptorProvider = (descriptor: StyleDescriptor, port: Port) => {
     if (descriptor.inherit) port.edges.push({ key: 'inherit', category: Category.style, asset: descriptor.inherit })
 }
@@ -57,6 +69,10 @@ const HTMLDescriptorProvider = (descriptor: HTMLDescriptor, port: Port) => {
     if (descriptor.style) port.edges.push({ key: 'style', category: Category.style, asset: descriptor.style })
 }
 
+const DivDescriptorProvider = (descriptor: DivDescriptor, port: Port) => {
+    if (descriptor.backroundIamge) port.edges.push({ key: 'backroundIamge', category: Category.image, asset: descriptor.backroundIamge })
+}
+
 const DynamicDescriptorProvider = (descriptor: DynamicDescriptor, port: Port) => {
     if (descriptor.url) port.edges.push({ key: 'url', category: Category.prefab, asset: descriptor.url })
 }
@@ -66,8 +82,10 @@ const PrefabInstanceDescriptorProvider = (descriptor: PrefabInstanceDescriptor,
 }
 
 AssetGraph.register(Descriptor.type, DescriptorProvider)
+AssetGraph.register(DatasetDescriptor.type, DatasetDescriptorProvider)
 AssetGraph.register(StyleDescriptor.type, StyleDescriptorProvider)
 AssetGraph.register(InteractionDescriptor.type, InteractionDescriptorProvider)
 AssetGraph.register(HTMLDescriptor.type, HTMLDescriptorProvider)
+AssetGraph.register(DivDescriptor.type, DivDescriptorProvider)
 AssetGraph.register(DynamicDescriptor.type, DynamicDescriptorProvider)
 AssetGraph.register(PrefabInstanceDescriptor.type, PrefabInstanceDescriptorProvider)

package/output/locale/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/locale",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "./build/index.js",
   "author": "",

package/output/remote/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/remote",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/remote/src/utils/screenshot.ts

@@ -7,8 +7,8 @@ const screenshot = async (html: HTMLElement, backgroundColor = '#ffffff') => {
 
     const url = await HTMLToImage.default.toPng(html, {
         bgcolor: backgroundColor,
-        width: html.clientWidth || html.scrollWidth,
-        height: html.clientHeight || html.scrollHeight,
+        width: 1920,
+        height: 1080,
         quality: 1.0,
     })
 

package/output/rollup-config-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/pack-rollup-config-plugin",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "./index.js",
   "author": "",

package/output/runtime/build/DataService.d.ts

@@ -1,5 +1,5 @@
 import { Service } from "@vyr/service";
-import { ScriptOption } from './data/global';
+import { Global, ScriptOption } from './data/global';
 import { Header } from "./data/header";
 import { Body } from './data/body';
 import { Sidebar } from './data/sidebar';
@@ -7,7 +7,7 @@ import { Inspector } from "./data/inspector";
 import { Footer } from './data/footer';
 import { Status } from './data/status';
 declare class DataService extends Service {
-    readonly scripts: ScriptOption[];
+    readonly global: Global;
     readonly header: Header;
     readonly body: Body;
     readonly sidebar: Sidebar;

package/output/runtime/build/DraggableService.d.ts

@@ -22,6 +22,7 @@ declare abstract class Draggable<D extends AdditionalData = AdditionalData, T ex
     abstract finished(dragData: DraggableData<D>, targetData: DraggableData<T>, type: DraggableEndType): void;
 }
 declare class DraggableKey {
+    example: string;
     scene: string;
     asset: string;
     inspector: string;

package/output/runtime/build/data/global.d.ts

@@ -12,4 +12,11 @@ interface ScriptOption {
     getDefaultInput(): any;
     getPropertyOptions?: () => ScriptPropertyOptionsGetters;
 }
-export { ScriptPropertyOptions, ScriptPropertyOptionsGetters, ScriptOption };
+declare class Template {
+    visible: boolean;
+}
+declare class Global {
+    readonly scripts: ScriptOption[];
+    readonly template: Template;
+}
+export { ScriptPropertyOptions, ScriptPropertyOptionsGetters, ScriptOption, Global, };

package/output/runtime/build/navigator/SidebarNavigator.d.ts

@@ -21,8 +21,7 @@ declare class Status {
 }
 /**该类会被响应式对象使用，定义方法时不要使用箭头函数（会导致在方法里修改变量时，直接修改了原始对象） */
 declare abstract class SidebarNavigator {
-    static key: string;
-    readonly key: string;
+    abstract readonly key: string;
     readonly label: string;
     readonly icon: string;
     readonly root: Descriptor;

package/output/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/runtime",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": " - Type Declarations",
   "main": "",
   "author": "",

package/output/service/package.json

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

package/output/service-asset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service-asset",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/service-asset/src/AssetMethodProvider.ts

@@ -1,5 +1,5 @@
 import { ArrayUtils, AsyncTask, Descriptor } from "@vyr/engine"
-import { DataService, runtime } from "@vyr/runtime"
+import { DataService, runtime, SidebarNavigator } from "@vyr/runtime"
 import { Message, RpcService, VirtualNode } from '@vyr/service-rpc'
 import { AssetService } from "./AssetService"
 
@@ -99,6 +99,7 @@ class AssetMethodProvider {
 
     _remove = (msg: InstanceType<typeof Message['asset']['remove']['NoticeMessage']>) => {
         const dataService = runtime.get<DataService>('data')
+        const navigator = dataService.sidebar.get<SidebarNavigator>(AssetService.key)
 
         for (const uuid of msg.params.uuids) {
             const target = Descriptor.get<Descriptor>(uuid)
@@ -107,8 +108,8 @@ class AssetMethodProvider {
             if (ancestor.parent === null) continue
             ancestor.parent.remove(target)
 
-            ArrayUtils.removeByKey(this.service.navigator.selectAll, 'uuid', target.uuid)
-            ArrayUtils.removeByKey(this.service.navigator.status.stickupItems, 'uuid', target.uuid)
+            ArrayUtils.removeByKey(navigator.selectAll, 'uuid', target.uuid)
+            ArrayUtils.removeByKey(navigator.status.stickupItems, 'uuid', target.uuid)
         }
     }
 
@@ -118,7 +119,9 @@ class AssetMethodProvider {
     }
 
     _dragdrap = (msg: InstanceType<typeof Message['asset']['dragdrap']['NoticeMessage']>) => {
-        if (msg.params.url !== this.service.navigator.url) return
+        const dataService = runtime.get<DataService>('data')
+        const navigator = dataService.sidebar.get<SidebarNavigator>(AssetService.key)
+        if (msg.params.url !== navigator.url) return
 
         const method = msg.params.next ? 'insertBefore' : msg.params.type
         const target = msg.params.next || msg.params.targetData.data.uuid

package/output/service-asset/src/AssetService.ts

@@ -1,21 +1,20 @@
 import axios from 'axios'
 import { Service } from '@vyr/service'
 import { DraggableData, DraggableEndType, } from '@vyr/declare'
-import { runtime, SidebarNavigator } from '@vyr/runtime'
+import { runtime } from '@vyr/runtime'
 import { Descriptor, DeserializationObject } from '@vyr/engine'
 import { RpcService, Message, VirtualNode } from '@vyr/service-rpc'
 import { AssetMethodProvider } from "./AssetMethodProvider"
 
 class AssetService extends Service {
+    static key = 'asset'
     private _provider = new AssetMethodProvider(this)
-    readonly navigator
     readonly root
 
-    constructor(name: string, root: VirtualNode, navigator: SidebarNavigator) {
+    constructor(name: string, root: VirtualNode) {
         super(name)
         this.name = name
         this.root = root
-        this.navigator = navigator
     }
 
     async ready() {

package/output/service-example/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@vyr/service-example",
+  "version": "0.0.21",
+  "description": "",
+  "main": "./src/index.ts",
+  "author": "",
+  "license": "MIT",
+  "dependencies": {},
+  "files": [
+    "package.json"
+  ]
+}

package/output/service-example/src/ExampleMethodProvider.ts

@@ -0,0 +1,35 @@
+import { AsyncTask } from "@vyr/engine"
+import { runtime } from "@vyr/runtime"
+import { Message, RpcService } from '@vyr/service-rpc'
+import { ExampleService } from './ExampleService'
+
+class ExampleMethodProvider {
+    readonly ready = new AsyncTask()
+    readonly service
+
+    constructor(service: ExampleService) {
+        this.service = service
+    }
+
+    listen() {
+        const rpcService = runtime.get<RpcService>('rpc')
+        rpcService.listen(Message.rpc.connection.Method, this._connection)
+        rpcService.listen(Message.rpc.disconnect.Method, this._disconnect)
+        rpcService.listen(Message.example.initialize.Method, this._initialize)
+    }
+
+    _connection = () => {
+        const rpcService = runtime.get<RpcService>('rpc')
+        rpcService.send(new Message.example.initialize.RequestMessage())
+    }
+
+    _disconnect = (msg: InstanceType<typeof Message['rpc']['disconnect']['NoticeMessage']>) => { }
+
+    _initialize = (msg: InstanceType<typeof Message['example']['initialize']['NoticeMessage']>, client: string) => {
+        this.ready.run()
+    }
+}
+
+export {
+    ExampleMethodProvider
+}

package/output/service-example/src/ExampleService.ts

@@ -0,0 +1,42 @@
+import { runtime } from '@vyr/runtime'
+import { Message, RpcService } from '@vyr/service-rpc'
+import { Service } from '@vyr/service'
+import { ExampleMethodProvider } from './ExampleMethodProvider'
+
+class ExampleService extends Service {
+    private _provider
+
+    constructor(name: string) {
+        super(name)
+        this._provider = new ExampleMethodProvider(this)
+    }
+
+    async ready() {
+        this._provider.listen()
+    }
+    async start() {
+        await this._provider.ready.done()
+    }
+
+    list(name: string) {
+        const rpcService = runtime.get<RpcService>('rpc')
+        return rpcService.send(new Message.example.list.RequestMessage(name))
+    }
+
+    create(example: InstanceType<typeof Message['example']['create']['RequestMessage']>['params']) {
+        const rpcService = runtime.get<RpcService>('rpc')
+        return rpcService.send(new Message.example.create.RequestMessage(example))
+    }
+
+    delete(example: string) {
+        const rpcService = runtime.get<RpcService>('rpc')
+        return rpcService.send(new Message.example.delete.RequestMessage(example))
+    }
+
+    apply(example: string, node: string) {
+        const rpcService = runtime.get<RpcService>('rpc')
+        return rpcService.send(new Message.example.apply.RequestMessage(example, node))
+    }
+}
+
+export { ExampleService }

package/output/service-example/src/index.ts

@@ -0,0 +1,2 @@
+export * from './locale'
+export * from './ExampleService'

package/output/service-example/src/locale/Language.ts

@@ -0,0 +1,10 @@
+import { Locale } from "@vyr/locale";
+import { zhCnLanguageProvider, ZhCNLanguageProvider } from "./LanguageProvider";
+
+Locale.register(zhCnLanguageProvider)
+
+const language = Locale.getLanguage<ZhCNLanguageProvider>(zhCnLanguageProvider.name)
+
+export {
+    language
+}

package/output/service-example/src/locale/LanguageProvider.ts

@@ -0,0 +1,15 @@
+import { LanguageProvider } from '@vyr/locale'
+
+interface ZhCNLanguageProvider extends LanguageProvider {
+
+}
+
+const zhCnLanguageProvider: ZhCNLanguageProvider = {
+    id: 'zh_CN',
+    name: '@vyr/service-example',
+}
+
+export {
+    ZhCNLanguageProvider,
+    zhCnLanguageProvider,
+}

package/output/service-example/src/locale/index.ts

@@ -0,0 +1,2 @@
+export * from './LanguageProvider'
+export * from './Language'

package/output/service-example/tsconfig.json

@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "lib": [
+      "ESNext",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "outDir": "build",
+    "strict": true,
+    "jsx": "preserve",
+    "declaration": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "useDefineForClassFields": true,
+    "sourceMap": false,
+    "baseUrl": "",
+    "types": [
+      "node"
+    ],
+    "paths": {}
+  },
+  "include": [
+    "src/**/*.ts",
+  ],
+  "exclude": []
+}

package/output/service-graph/package.json

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

package/output/service-rpc/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@vyr/service-rpc-universal",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@vyr/engine": "0.0.19"
+    "moment": "^2.30.1",
+    "@vyr/engine": "0.0.21"
   },
   "files": [
     "package.json",

package/output/service-rpc/src/Message.ts

@@ -3,6 +3,7 @@ import * as rpc from './rpc'
 import * as sidebar from './sidebar'
 import * as asset from './asset'
 import * as scene from './scene'
+import * as example from './example'
 import * as dep from './dep'
 
 /** 通信消息 */
@@ -11,6 +12,7 @@ class Message extends IMessage {
   static sidebar = sidebar
   static asset = asset
   static scene = scene
+  static example = example
   static dep = dep
 }
 

package/output/service-rpc/src/RpcService.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Descriptor, Listener } from '@vyr/engine'
+import { Serialization, Listener } from '@vyr/engine'
 import { Service } from '@vyr/service'
 import { path, tokenKey, topic, Confirm, Message } from '@vyr/service-rpc-universal'
 
@@ -55,7 +55,7 @@ class RpcService extends Service {
         this.socket = new window.io(location.href, params)
 
         this.socket.on(topic, (content: string) => {
-            const msg = Descriptor.deserialization<Message>(content)
+            const msg = Serialization.parse(content) as Message
             if (msg.message !== undefined) return config.notify(msg.message)
             this._delayTrigger(msg)
         })
@@ -106,7 +106,7 @@ class RpcService extends Service {
     trigger<T extends Message = Message>(method: string, msg: T) {
         this._listener.trigger(method, msg)
     }
-    listen<T extends Message = Message>(method: string, cb: (msg: T) => void) {
+    listen<T extends Message = Message>(method: string, cb: (msg: T, ...others: any[]) => void) {
         this._listener.listen(method, cb)
     }
     unlisten<T extends Message = Message>(method: string, cb: (msg: T) => void) {
@@ -114,8 +114,18 @@ class RpcService extends Service {
     }
 
     /**向服务端发送数据 */
-    send(msg: Message) {
-        this.socket.emit(topic, Descriptor.serialization(msg))
+    send<T extends Message | void = Message>(msg: Message) {
+        return new Promise<T>(resolve => {
+            this.socket.emit(topic, Serialization.stringify(msg), (content: string) => {
+                if (content) {
+                    const msg = Serialization.parse(content)
+                    resolve(msg as T)
+                } else {
+                    //@ts-ignore
+                    resolve()
+                }
+            })
+        })
     }
 }
 

package/output/service-rpc/src/domain/Entity.ts

@@ -0,0 +1,12 @@
+abstract class Entity {
+    static primaryKey: string
+    static dateFormat = 'YYYY-MM-DD HH:mm:ss'
+
+    abstract toVO(): Entity
+
+    abstract toDO(): Entity
+}
+
+export {
+    Entity
+}