invoke shaderplugin success

dist/Counter.js

@@ -12,10 +12,6 @@ var __metadata = (undefined && undefined.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 class CounterView extends doric.ViewHolder {
-    test() {
-        console.log('Invoke Success')
-    }
-
     build(root) {
         root.addChild(doric.vlayout([
             doric.text({

dist/index.js

@@ -3537,14 +3537,30 @@ return __module.exports;
 
     axios = axios && axios.hasOwnProperty('default') ? axios['default'] : axios;
 
+    class DoricPlugin {
+        constructor(context) {
+            this.context = context;
+        }
+    }
+
+    class ShaderPlugin extends DoricPlugin {
+        render(ret) {
+            console.log('render', ret);
+        }
+    }
+
     const bundles = new Map;
     const plugins = new Map;
     function acquireJSBundle(name) {
         return bundles.get(name);
     }
+    function registerPlugin(name, plugin) {
+        plugins.set(name, plugin);
+    }
     function acquirePlugin(name) {
         return plugins.get(name);
     }
+    registerPlugin('shader', ShaderPlugin);
 
     let __scriptId__ = 0;
     function getScriptId() {
@@ -3571,6 +3587,7 @@ ${content}
 },doric.jsObtainContext("${contextId}"),[undefined,doric.jsObtainContext("${contextId}"),doric.jsObtainEntry("${contextId}"),doric.__require__,{}])`;
     }
     function initDoric() {
+        injectGlobalObject("nativeEmpty", () => undefined);
         injectGlobalObject('nativeLog', (type, message) => {
             switch (type) {
                 case 'd':
@@ -3627,7 +3644,7 @@ ${content}
                     sandbox.jsCallReject(contextId, callbackId, e);
                 });
             }
-            else {
+            else if (ret !== undefined) {
                 sandbox.jsCallResolve(contextId, callbackId, ret);
             }
             return true;
@@ -3653,15 +3670,19 @@ ${content}
             createContext(this.contextId, content);
             doricContexts.set(this.contextId, this);
         }
-        get context() {
-            return sandbox.jsObtainContext(this.contextId);
-        }
         get panel() {
             var _a;
-            return (_a = this.context) === null || _a === void 0 ? void 0 : _a.entity;
+            return (_a = sandbox.jsObtainContext(this.contextId)) === null || _a === void 0 ? void 0 : _a.entity;
         }
-        getEntityMethod(method) {
-            return Reflect.get(this.panel, method, this.panel);
+        invokeEntityMethod(method, ...otherArgs) {
+            const argumentsList = [this.contextId];
+            for (let i = 0; i < arguments.length; i++) {
+                argumentsList.push(arguments[i]);
+            }
+            Reflect.apply(sandbox.jsCallEntityMethod, this.panel, argumentsList);
+        }
+        init(frame, extra) {
+            this.invokeEntityMethod("__init__", frame, extra ? JSON.stringify(extra) : undefined);
         }
     }
 
@@ -3676,7 +3697,10 @@ ${content}
         }
         load(content) {
             this.context = new DoricContext(content);
-            this.context.getEntityMethod('log')();
+            this.context.init({
+                width: 100,
+                height: 100
+            });
         }
     }
 

src/DoricContext.ts

@@ -1,4 +1,4 @@
-import { jsObtainContext } from 'doric/src/runtime/sandbox'
+import { jsObtainContext, jsCallEntityMethod } from 'doric/src/runtime/sandbox'
 import { Panel } from 'doric'
 import { DoricPlugin } from "./DoricPlugin"
 import { createContext } from "./DoricDriver"
@@ -20,16 +20,24 @@ export class DoricContext {
         createContext(this.contextId, content)
         doricContexts.set(this.contextId, this)
     }
-    get context() {
-        return jsObtainContext(this.contextId)
-    }
 
     get panel() {
-        return this.context?.entity as Panel
+        return jsObtainContext(this.contextId)?.entity as Panel
     }
 
-    getEntityMethod(method: string) {
-        return Reflect.get(this.panel, method, this.panel) as Function
+    invokeEntityMethod(method: string, ...otherArgs: any) {
+        const argumentsList: any = [this.contextId]
+        for (let i = 0; i < arguments.length; i++) {
+            argumentsList.push(arguments[i])
+        }
+        Reflect.apply(jsCallEntityMethod, this.panel, argumentsList)
+    }
+
+    init(frame: {
+        width: number,
+        height: number,
+    }, extra?: object) {
+        this.invokeEntityMethod("__init__", frame, extra ? JSON.stringify(extra) : undefined)
     }
 
 }

src/DoricDriver.ts

@@ -35,6 +35,8 @@ ${content}
 }
 
 function initDoric() {
+    injectGlobalObject("nativeEmpty", () => undefined)
+
     injectGlobalObject('nativeLog', (type: 'd' | 'w' | 'e', message: string) => {
         switch (type) {
             case 'd':
@@ -92,7 +94,7 @@ function initDoric() {
                 e => {
                     jsCallReject(contextId, callbackId, e)
                 })
-        } else {
+        } else if (ret !== undefined) {
             jsCallResolve(contextId, callbackId, ret)
         }
         return true

src/DoricElement.ts

@@ -17,6 +17,9 @@ export class DoricElement extends HTMLElement {
 
     load(content: string) {
         this.context = new DoricContext(content)
-        this.context.getEntityMethod('log')()
+        this.context.init({
+            width: 100,
+            height: 100
+        })
     }
 }

src/DoricRegistry.ts

@@ -1,4 +1,5 @@
 import { DoricPluginClass } from "./DoricPlugin"
+import { ShaderPlugin } from "./plugins/ShaderPlugin"
 
 
 const bundles: Map<string, string> = new Map
@@ -20,3 +21,5 @@ export function registerPlugin(name: string, plugin: DoricPluginClass) {
 export function acquirePlugin(name: string) {
     return plugins.get(name)
 }
+
+registerPlugin('shader', ShaderPlugin)

src/plugins/ShaderPlugin.ts

@@ -0,0 +1,7 @@
+import { DoricPlugin } from "../DoricPlugin";
+
+export class ShaderPlugin extends DoricPlugin {
+    render(ret: any) {
+        console.log('render', ret)
+    }
+}