@vyr/engine 0.0.22 → 0.0.24

package/package.json

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

package/src/asset/Asset.ts

@@ -65,7 +65,7 @@ class Asset {
         return `/${this.virtual}:/${fileName}`
     }
 
-    static provider(url: string, provider: DescriptorProvider | ScriptableProvider) {
+    static setProvider(url: string, provider: DescriptorProvider | ScriptableProvider) {
         privateState.providerCollection.set(url, provider)
     }
 
@@ -221,9 +221,9 @@ class Asset {
 export { Asset, JsonAsset, RawAsset, DescriptorProvider, ScriptableProvider, AssetProperty, AssetPropertyCollection, privateState }
 
 const getAssetByProvider = async (url: string) => {
-    const scriptableProvider = privateState.providerCollection.get(url)
-    if (scriptableProvider === undefined) return null
-    return await scriptableProvider() as unknown as any
+    const provider = privateState.providerCollection.get(url)
+    if (provider === undefined) return null
+    return await provider() as unknown as any
 }
 
 const factoryDescriptor = async (url: string) => {

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

@@ -20,7 +20,7 @@ class ExecuteScriptable extends Scriptable {
         return {}
     }
 }
-Asset.provider(scriptable, async () => ({ default: ExecuteScriptable }))
+Asset.setProvider(scriptable, async () => ({ default: ExecuteScriptable }))
 
 const createExecuteInput = (args: any = {}) => {
     const input = {

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

@@ -16,7 +16,7 @@ class ExecuteScriptable extends Scriptable {
         }
     }
 }
-Asset.provider(scriptable, async () => ({ default: ExecuteScriptable }))
+Asset.setProvider(scriptable, async () => ({ default: ExecuteScriptable }))
 
 const createExecuteInput = (args: any = {}) => {
     const input = {

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

@@ -18,7 +18,7 @@ class ExecuteScriptable extends Scriptable {
         return json
     }
 }
-Asset.provider(scriptable, async () => ({ default: ExecuteScriptable }))
+Asset.setProvider(scriptable, async () => ({ default: ExecuteScriptable }))
 
 const createExecuteInput = (args: any = {}) => {
     const input = {

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

@@ -15,7 +15,7 @@ class ExecuteScriptable extends Scriptable {
         graphics.engine.switch(scheduler)
     }
 }
-Asset.provider(scriptable, async () => ({ default: ExecuteScriptable }))
+Asset.setProvider(scriptable, async () => ({ default: ExecuteScriptable }))
 
 const createExecuteInput = (args: any = {}) => {
     const input = {

package/src/preset/interaction/graphics/invoke.ts

@@ -17,7 +17,7 @@ const interactionProvider = async () => {
     return _currentInteraction
 }
 
-Asset.provider(url, interactionProvider)
+Asset.setProvider(url, interactionProvider)
 
 export {
     url,

package/src/preset/interaction/scheduler/switch.ts

@@ -17,7 +17,7 @@ const interactionProvider = async () => {
     return _currentInteraction
 }
 
-Asset.provider(url, interactionProvider)
+Asset.setProvider(url, interactionProvider)
 
 export {
     url,

package/src/utils/AssetProvider.ts

@@ -30,27 +30,12 @@ const DescriptorProvider = (descriptor: Descriptor, port: Port) => {
             const interaction = descriptor.interactions[i]
             if (interaction.url) {
                 interactionExecutor(interaction, `interactions[${i}]`, port)
-                if (interaction.url.startsWith(`/${Asset.virtual}:/`) === false) {
-                    port.edges.push({ key: `interactions[${i}].url`, category: Category.interaction, asset: interaction.url })
-                }
+                port.edges.push({ key: `interactions[${i}].url`, category: Category.interaction, asset: interaction.url })
             }
         }
     }
     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 })
 }
@@ -84,7 +69,6 @@ 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)