Android support internal class

doric-android/doric/src/main/java/pub/doric/loader/DoricJSLoaderManager.java

@@ -16,6 +16,7 @@
 package pub.doric.loader;
 
 
+import android.net.Uri;
 import android.text.TextUtils;
 
 import java.util.Collection;
@@ -56,6 +57,13 @@ public class DoricJSLoaderManager {
 
     public AsyncResult<String> loadJSBundle(String source) {
         if (!TextUtils.isEmpty(source)) {
+            if (source.startsWith("_internal_")) {
+                Uri uri = Uri.parse(source);
+                String srcContextId = uri.getQueryParameter("context");
+                String className = uri.getQueryParameter("class");
+                source = String.format("Entry('%s','%s')", srcContextId, className);
+                return new AsyncResult<>(source);
+            }
             Collection<IDoricJSLoader> jsLoaders = getJSLoaders();
             for (IDoricJSLoader jsLoader : jsLoaders) {
                 if (jsLoader.filter(source)) {

doric-demo/src/ModalDemo.ts

@@ -2,7 +2,7 @@ import { Group, Panel, text, Color, LayoutSpec, vlayout, Gravity, scroller, layo
 import { colors, label } from "./utils";
 
 @Entry
-class ModalDemo extends Panel {
+export class ModalDemo extends Panel {
     build(rootView: Group): void {
         scroller(
             vlayout(

doric-demo/src/MultiPanelDemo.ts

@@ -0,0 +1,97 @@
+import { Group, Panel, navbar, text, gravity, Color, LayoutSpec, vlayout, Gravity, hlayout, scroller, layoutConfig, image, modal, navigator, ViewHolder, Text, ViewModel, VMPanel } from "doric";
+import { title, label, colors } from "./utils";
+import { ModalDemo } from "./ModalDemo";
+
+interface CountModel {
+    count: number
+}
+class CounterView extends ViewHolder {
+    number!: Text
+    counter!: Text
+    build(root: Group) {
+        vlayout(
+            [
+                text({
+                    textSize: 40,
+                    tag: "tvNumber"
+                }),
+
+                text({
+                    text: "Click To Count 1",
+                    textSize: 20,
+                    tag: "tvCounter"
+                }),
+            ],
+            {
+                layoutConfig: layoutConfig().most(),
+                gravity: Gravity.Center,
+                space: 20,
+            }
+        ).in(root)
+        this.number = root.findViewByTag("tvNumber")!
+        this.counter = root.findViewByTag("tvCounter")!
+    }
+}
+
+class CounterVM extends ViewModel<CountModel, CounterView> {
+    onAttached(s: CountModel, vh: CounterView) {
+        vh.counter.onClick = () => {
+            this.updateState(state => {
+                state.count++
+            })
+        }
+    }
+    onBind(s: CountModel, vh: CounterView) {
+        vh.number.text = `${s.count}`
+    }
+}
+
+class MyPage extends VMPanel<CountModel, CounterView>{
+
+
+    getViewHolderClass() {
+        return CounterView
+    }
+
+    getViewModelClass() {
+        return CounterVM
+    }
+
+    getState(): CountModel {
+        return {
+            count: 0
+        }
+    }
+}
+
+@Entry(exports = [ModalDemo, MyPage])
+class MultiPanelDemo extends Panel {
+    build(rootView: Group): void {
+        scroller(
+            vlayout(
+                [
+                    title("Multi Panel"),
+                    label('isHidden').apply({
+                        width: 200,
+                        height: 50,
+                        backgroundColor: colors[0],
+                        textSize: 30,
+                        textColor: Color.WHITE,
+                        layoutConfig: layoutConfig().just(),
+                        onClick: () => {
+                            navigator(context).push(ModalDemo)
+                        }
+                    }),
+                ],
+                {
+                    layoutConfig: layoutConfig().most().configHeight(LayoutSpec.FIT),
+                    gravity: gravity().center(),
+                    space: 10,
+                }),
+            {
+                layoutConfig: layoutConfig().most(),
+                backgroundColor: Color.BLUE,
+            }
+        ).in(rootView)
+    }
+}

doric-js/bundle/doric-lib.es5.js

@@ -2963,6 +2963,9 @@ function navigator(context) {
     var moduleName = "navigator";
     return {
         push: function (source, config) {
+            if (typeof source === 'function') {
+                source = "_internal_://export?class=" + encodeURIComponent(source.name) + "&context=" + context.id;
+            }
             if (config && config.extra) {
                 config.extra = JSON.stringify(config.extra);
             }

doric-js/bundle/doric-lib.js

@@ -2295,6 +2295,9 @@ function navigator(context) {
     const moduleName = "navigator";
     return {
         push: (source, config) => {
+            if (typeof source === 'function') {
+                source = `_internal_://export?class=${encodeURIComponent(source.name)}&context=${context.id}`;
+            }
             if (config && config.extra) {
                 config.extra = JSON.stringify(config.extra);
             }

doric-js/bundle/doric-sandbox.es5.js

@@ -1280,6 +1280,7 @@ var doric = (function (exports) {
     var Context = /** @class */ (function () {
         function Context(id) {
             this.callbacks = new Map;
+            this.classes = new Map;
             this.id = id;
         }
         Context.prototype.hookBeforeNativeCall = function () {
@@ -1395,6 +1396,8 @@ var doric = (function (exports) {
     function jsObtainEntry(contextId) {
         var context = jsObtainContext(contextId);
         var exportFunc = function (constructor) {
+            var _a;
+            (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(constructor.name, constructor);
             var ret = /** @class */ (function (_super) {
                 __extends(class_1, _super);
                 function class_1() {
@@ -1404,17 +1407,42 @@ var doric = (function (exports) {
                 }
                 return class_1;
             }(constructor));
-            if (context) {
+            context === null || context === void 0 ? void 0 : context.register(new ret);
-                context.register(new ret);
-            }
             return ret;
         };
-        return function (args) {
+        return function () {
-            if (args instanceof Array) {
+            if (arguments.length === 1) {
-                return exportFunc;
+                var args = arguments[0];
+                if (args instanceof Array) {
+                    args.forEach(function (clz) {
+                        var _a;
+                        (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(clz.name, clz);
+                    });
+                    return exportFunc;
+                }
+                else {
+                    return exportFunc(args);
+                }
+            }
+            else if (arguments.length === 2) {
+                var srcContextId = arguments[0];
+                var className = arguments[1];
+                var srcContext = gContexts.get(srcContextId);
+                if (srcContext) {
+                    var clz = srcContext.classes.get(className);
+                    if (clz) {
+                        return exportFunc(clz);
+                    }
+                    else {
+                        throw new Error("Cannot find class:" + className + " in context:" + srcContextId);
+                    }
+                }
+                else {
+                    throw new Error("Cannot find context for " + srcContextId);
+                }
             }
             else {
-                return exportFunc(args);
+                throw new Error("Entry arguments error:" + arguments);
             }
         };
     }

doric-js/bundle/doric-sandbox.js

@@ -1256,6 +1256,7 @@ var doric = (function (exports) {
     class Context {
         constructor(id) {
             this.callbacks = new Map;
+            this.classes = new Map;
             this.id = id;
             return new Proxy(this, {
                 get: (target, p) => {
@@ -1396,23 +1397,50 @@ var doric = (function (exports) {
     function jsObtainEntry(contextId) {
         const context = jsObtainContext(contextId);
         const exportFunc = (constructor) => {
+            var _a;
+            (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(constructor.name, constructor);
             const ret = class extends constructor {
                 constructor() {
                     super(...arguments);
                     this.context = context;
                 }
             };
-            if (context) {
+            context === null || context === void 0 ? void 0 : context.register(new ret);
-                context.register(new ret);
-            }
             return ret;
         };
-        return (args) => {
+        return function () {
-            if (args instanceof Array) {
+            if (arguments.length === 1) {
-                return exportFunc;
+                const args = arguments[0];
+                if (args instanceof Array) {
+                    args.forEach(clz => {
+                        var _a;
+                        (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(clz.name, clz);
+                    });
+                    return exportFunc;
+                }
+                else {
+                    return exportFunc(args);
+                }
+            }
+            else if (arguments.length === 2) {
+                const srcContextId = arguments[0];
+                const className = arguments[1];
+                const srcContext = gContexts.get(srcContextId);
+                if (srcContext) {
+                    const clz = srcContext.classes.get(className);
+                    if (clz) {
+                        return exportFunc(clz);
+                    }
+                    else {
+                        throw new Error(`Cannot find class:${className} in context:${srcContextId}`);
+                    }
+                }
+                else {
+                    throw new Error(`Cannot find context for ${srcContextId}`);
+                }
             }
             else {
-                return exportFunc(args);
+                throw new Error(`Entry arguments error:${arguments}`);
             }
         };
     }

doric-js/bundle/doric-vm.js

@@ -1279,6 +1279,7 @@ function jsCallReject(contextId, callbackId, args) {
 class Context {
     constructor(id) {
         this.callbacks = new Map;
+        this.classes = new Map;
         this.id = id;
         return new Proxy(this, {
             get: (target, p) => {
@@ -1419,23 +1420,50 @@ function jsCallEntityMethod(contextId, methodName, args) {
 function jsObtainEntry(contextId) {
     const context = jsObtainContext(contextId);
     const exportFunc = (constructor) => {
+        var _a;
+        (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(constructor.name, constructor);
         const ret = class extends constructor {
             constructor() {
                 super(...arguments);
                 this.context = context;
             }
         };
-        if (context) {
+        context === null || context === void 0 ? void 0 : context.register(new ret);
-            context.register(new ret);
-        }
         return ret;
     };
-    return (args) => {
+    return function () {
-        if (args instanceof Array) {
+        if (arguments.length === 1) {
-            return exportFunc;
+            const args = arguments[0];
+            if (args instanceof Array) {
+                args.forEach(clz => {
+                    var _a;
+                    (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(clz.name, clz);
+                });
+                return exportFunc;
+            }
+            else {
+                return exportFunc(args);
+            }
+        }
+        else if (arguments.length === 2) {
+            const srcContextId = arguments[0];
+            const className = arguments[1];
+            const srcContext = gContexts.get(srcContextId);
+            if (srcContext) {
+                const clz = srcContext.classes.get(className);
+                if (clz) {
+                    return exportFunc(clz);
+                }
+                else {
+                    throw new Error(`Cannot find class:${className} in context:${srcContextId}`);
+                }
+            }
+            else {
+                throw new Error(`Cannot find context for ${srcContextId}`);
+            }
         }
         else {
-            return exportFunc(args);
+            throw new Error(`Entry arguments error:${arguments}`);
         }
     };
 }
@@ -3762,6 +3790,9 @@ function navigator(context) {
     const moduleName = "navigator";
     return {
         push: (source, config) => {
+            if (typeof source === 'function') {
+                source = `_internal_://export?class=${encodeURIComponent(source.name)}&context=${context.id}`;
+            }
             if (config && config.extra) {
                 config.extra = JSON.stringify(config.extra);
             }

doric-js/index.d.ts

@@ -840,8 +840,10 @@ declare module 'doric/lib/src/native/navbar' {
 
 declare module 'doric/lib/src/native/navigator' {
     import { BridgeContext } from "doric/lib/src/runtime/global";
+    import { ClassType } from "doric/lib/src/pattern/mvvm";
+    import { Panel } from "doric/lib/src/ui/panel";
     export function navigator(context: BridgeContext): {
-        push: (source: string, config?: {
+        push: (source: string | ClassType<Panel>, config?: {
             alias?: string | undefined;
             animated?: boolean | undefined;
             extra?: object | undefined;

doric-js/lib/src/native/navigator.d.ts

@@ -1,6 +1,8 @@
 import { BridgeContext } from "../runtime/global";
+import { ClassType } from "../pattern/mvvm";
+import { Panel } from "../ui/panel";
 export declare function navigator(context: BridgeContext): {
-    push: (source: string, config?: {
+    push: (source: string | ClassType<Panel>, config?: {
         alias?: string | undefined;
         animated?: boolean | undefined;
         extra?: object | undefined;

doric-js/lib/src/native/navigator.js

@@ -2,6 +2,9 @@ export function navigator(context) {
     const moduleName = "navigator";
     return {
         push: (source, config) => {
+            if (typeof source === 'function') {
+                source = `_internal_://export?class=${encodeURIComponent(source.name)}&context=${context.id}`;
+            }
             if (config && config.extra) {
                 config.extra = JSON.stringify(config.extra);
             }

doric-js/lib/src/runtime/sandbox.d.ts

@@ -8,6 +8,7 @@ export declare class Context {
         resolve: Function;
         reject: Function;
     }>;
+    classes: Map<string, ClassType<object>>;
     hookBeforeNativeCall(): void;
     hookAfterNativeCall(): void;
     constructor(id: string);
@@ -22,7 +23,7 @@ export declare function __require__(name: string): any;
 export declare function jsRegisterModule(name: string, moduleObject: any): void;
 export declare function jsCallEntityMethod(contextId: string, methodName: string, args?: any): any;
 declare type ClassType<T> = new (...args: any) => T;
-export declare function jsObtainEntry(contextId: string): (args: ClassType<object> | ClassType<object>[]) => ((constructor: ClassType<object>) => {
+export declare function jsObtainEntry(contextId: string): () => ((constructor: ClassType<object>) => {
     new (...args: any): {
         context: Context | undefined;
     };

doric-js/lib/src/runtime/sandbox.js

@@ -74,6 +74,7 @@ export function jsCallReject(contextId, callbackId, args) {
 export class Context {
     constructor(id) {
         this.callbacks = new Map;
+        this.classes = new Map;
         this.id = id;
         return new Proxy(this, {
             get: (target, p) => {
@@ -214,23 +215,50 @@ export function jsCallEntityMethod(contextId, methodName, args) {
 export function jsObtainEntry(contextId) {
     const context = jsObtainContext(contextId);
     const exportFunc = (constructor) => {
+        var _a;
+        (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(constructor.name, constructor);
         const ret = class extends constructor {
             constructor() {
                 super(...arguments);
                 this.context = context;
             }
         };
-        if (context) {
+        context === null || context === void 0 ? void 0 : context.register(new ret);
-            context.register(new ret);
-        }
         return ret;
     };
-    return (args) => {
+    return function () {
-        if (args instanceof Array) {
+        if (arguments.length === 1) {
-            return exportFunc;
+            const args = arguments[0];
+            if (args instanceof Array) {
+                args.forEach(clz => {
+                    var _a;
+                    (_a = context === null || context === void 0 ? void 0 : context.classes) === null || _a === void 0 ? void 0 : _a.set(clz.name, clz);
+                });
+                return exportFunc;
+            }
+            else {
+                return exportFunc(args);
+            }
+        }
+        else if (arguments.length === 2) {
+            const srcContextId = arguments[0];
+            const className = arguments[1];
+            const srcContext = gContexts.get(srcContextId);
+            if (srcContext) {
+                const clz = srcContext.classes.get(className);
+                if (clz) {
+                    return exportFunc(clz);
+                }
+                else {
+                    throw new Error(`Cannot find class:${className} in context:${srcContextId}`);
+                }
+            }
+            else {
+                throw new Error(`Cannot find context for ${srcContextId}`);
+            }
         }
         else {
-            return exportFunc(args);
+            throw new Error(`Entry arguments error:${arguments}`);
         }
     };
 }

doric-js/src/native/navigator.ts

@@ -14,16 +14,21 @@
  * limitations under the License.
  */
 import { BridgeContext } from "../runtime/global"
+import { ClassType } from "../pattern/mvvm"
+import { Panel } from "../ui/panel"
 
 export function navigator(context: BridgeContext) {
     const moduleName = "navigator"
     return {
-        push: (source: string, config?: {
+        push: (source: string | ClassType<Panel>, config?: {
             alias?: string,
             animated?: boolean,
             extra?: object,
             singlePage?: boolean,
         }) => {
+            if (typeof source === 'function') {
+                source = `_internal_://export?class=${encodeURIComponent(source.name)}&context=${context.id}`
+            }
             if (config && config.extra) {
                 (config as any).extra = JSON.stringify(config.extra)
             }

doric-js/src/runtime/sandbox.es5.ts

@@ -117,6 +117,7 @@ export class Context {
     entity: any
     id: string
     callbacks: Map<string, { resolve: Function, reject: Function }> = new Map
+    classes: Map<string, ClassType<object>> = new Map
 
     hookBeforeNativeCall() {
         if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
@@ -233,29 +234,50 @@ export function jsCallEntityMethod(contextId: string, methodName: string, args?:
         loge(`Cannot find method for context id:${contextId},method name is:${methodName}`)
     }
 }
+
 type ClassType<T> = new (...args: any) => T
 
 export function jsObtainEntry(contextId: string) {
     const context = jsObtainContext(contextId)
     const exportFunc = (constructor: ClassType<object>) => {
+        context?.classes?.set(constructor.name, constructor)
         const ret = class extends constructor {
             context = context
         }
-        if (context) {
+        context?.register(new ret)
-            context.register(new ret)
-        }
         return ret
     }
-    return (args: ClassType<object> | ClassType<object>[]) => {
+    return function () {
-        if (args instanceof Array) {
+        if (arguments.length === 1) {
-            return exportFunc
+            const args = arguments[0]
+            if (args instanceof Array) {
+                args.forEach(clz => {
+                    context?.classes?.set(clz.name, clz)
+                })
+                return exportFunc
+            } else {
+                return exportFunc(args)
+            }
+        } else if (arguments.length === 2) {
+            const srcContextId = arguments[0] as string
+            const className = arguments[1] as string
+            const srcContext = gContexts.get(srcContextId)
+            if (srcContext) {
+                const clz = srcContext.classes.get(className)
+                if (clz) {
+                    return exportFunc(clz)
+                } else {
+                    throw new Error(`Cannot find class:${className} in context:${srcContextId}`)
+                }
+            } else {
+                throw new Error(`Cannot find context for ${srcContextId}`)
+            }
         } else {
-            return exportFunc(args)
+            throw new Error(`Entry arguments error:${arguments}`)
         }
     }
 }
 
-
 const global = Function('return this')()
 let __timerId__ = 0
 

doric-js/src/runtime/sandbox.ts

@@ -30,6 +30,17 @@ import "reflect-metadata"
  * doric.jsObtainEntry(id),
  * doric.__require__,
  * ])
+ * // Direct load class
+ * Reflect.apply(
+ * function(doric,context,Entry,require){
+ *  //Script content
+ *  Entry('lastContextId','className')
+ * },doric.jsObtainContext(id),[
+ * undefined,
+ * doric.jsObtainContext(id),
+ * doric.jsObtainEntry(id),
+ * doric.__require__,
+ * ])
  * // load module in global scope
  * Reflect.apply(doric.jsRegisterModule,this,[
  *  moduleName,
@@ -117,6 +128,7 @@ export class Context {
     entity: any
     id: string
     callbacks: Map<string, { resolve: Function, reject: Function }> = new Map
+    classes: Map<string, ClassType<object>> = new Map
 
     hookBeforeNativeCall() {
         if (this.entity && Reflect.has(this.entity, 'hookBeforeNativeCall')) {
@@ -260,24 +272,46 @@ export function jsCallEntityMethod(contextId: string, methodName: string, args?:
         loge(`Cannot find method for context id:${contextId},method name is:${methodName}`)
     }
 }
+
 type ClassType<T> = new (...args: any) => T
 
 export function jsObtainEntry(contextId: string) {
     const context = jsObtainContext(contextId)
     const exportFunc = (constructor: ClassType<object>) => {
+        context?.classes?.set(constructor.name, constructor)
         const ret = class extends constructor {
             context = context
         }
-        if (context) {
+        context?.register(new ret)
-            context.register(new ret)
-        }
         return ret
     }
-    return (args: ClassType<object> | ClassType<object>[]) => {
+    return function () {
-        if (args instanceof Array) {
+        if (arguments.length === 1) {
-            return exportFunc
+            const args = arguments[0]
+            if (args instanceof Array) {
+                args.forEach(clz => {
+                    context?.classes?.set(clz.name, clz)
+                })
+                return exportFunc
+            } else {
+                return exportFunc(args)
+            }
+        } else if (arguments.length === 2) {
+            const srcContextId = arguments[0] as string
+            const className = arguments[1] as string
+            const srcContext = gContexts.get(srcContextId)
+            if (srcContext) {
+                const clz = srcContext.classes.get(className)
+                if (clz) {
+                    return exportFunc(clz)
+                } else {
+                    throw new Error(`Cannot find class:${className} in context:${srcContextId}`)
+                }
+            } else {
+                throw new Error(`Cannot find context for ${srcContextId}`)
+            }
         } else {
-            return exportFunc(args)
+            throw new Error(`Entry arguments error:${arguments}`)
         }
     }
 }