@joker.front/core 1.2.146 → 1.2.153

package/dist/bundle.es.js

@@ -432,10 +432,9 @@ function proxyData(data) {
     if (proxyDepTarget) {
         return data;
     }
-    //@ts-ignore
-    if (data[OBJECTPROXY_DATA_KEY]) {
-        //@ts-ignore
-        return data[OBJECTPROXY_DATA_KEY];
+    let readiedData = Reflect.get(data, OBJECTPROXY_DATA_KEY);
+    if (readiedData) {
+        return readiedData;
     }
     let dep = new Dep();
     //首次重置值
@@ -455,7 +454,7 @@ function proxyData(data) {
             if (key === OBJECTPROXY_DEPLEVE_ID) {
                 return undefined;
             }
-            let result = target[key];
+            let result = Reflect.get(target, key);
             if (hasProperty(target, key) === false && key !== "length") {
                 return result;
             }
@@ -469,8 +468,7 @@ function proxyData(data) {
         },
         set(target, key, value) {
             if (resetData) {
-                //@ts-ignore
-                target[key] = value;
+                Reflect.set(target, key, value);
                 return true;
             }
             if (checkEnableProxy(value)) {
@@ -478,8 +476,7 @@ function proxyData(data) {
                 value = observer(value);
             }
             let isNewProperty = hasOwnProperty(target, key) === false;
-            //@ts-ignore
-            target[key] = value;
+            Reflect.set(target, key, value);
             notifyDep(dep, key);
             //数组长度变更，属于数组change，则对该对象做change广播
             if (Array.isArray(target)) {
@@ -492,8 +489,7 @@ function proxyData(data) {
             return true;
         },
         deleteProperty(target, key) {
-            //@ts-ignore
-            delete target[key];
+            Reflect.deleteProperty(target, key);
             //操作成功 && 非数组，删除属性时，要进行广播
             if (Array.isArray(target) === false) {
                 notifyDep(dep, OBJECTPROXY_DEPLEVE_ID);
@@ -522,9 +518,12 @@ function proxyData(data) {
  */
 function getProxyDep(data) {
     //@ts-ignore
-    if (isObject(data) && data?.[OBJECTPROXY_DEPID] && data[OBJECTPROXY_DEPID] instanceof Dep) {
-        //@ts-ignore
-        return data[OBJECTPROXY_DEPID];
+    if (isObject(data)) {
+        let dep = Reflect.get(data, OBJECTPROXY_DEPID);
+        if (dep && dep instanceof Dep) {
+            //@ts-ignore
+            return dep;
+        }
     }
 }
 /**
@@ -1741,7 +1740,7 @@ class HtmlContainerWebComponent extends HTMLElement {
     }
 }
 // 注册自定义元素
-customElements.define("joker-html-container", HtmlContainerWebComponent);
+!customElements.get("joker-html-container") && customElements.define("joker-html-container", HtmlContainerWebComponent);
 
 //全局方法
 const __GLONAL_FUNTIONS__ = {};
@@ -2301,10 +2300,16 @@ class ParserRenderSection extends IParser {
              *
              * 渲染出来的子集属于组件的子集
              */
-            this.node.ob = Object.create(this.node.section.ob || this.ob);
-            this.node.section.params?.forEach((item, index) => {
-                defineObserverProperty(this.node.ob, item, this.node.params[index]);
-            });
+            if (this.node.section.params) {
+                this.node.ob = Object.create(this.node.section.ob || this.ob);
+                this.node.section.params?.forEach((item, index) => {
+                    defineObserverProperty(this.node.ob, item, this.node.params[index]);
+                });
+            }
+            else {
+                //无参数 不需要创建新的对象，避免性能开销
+                this.node.ob = this.node.section.ob || this.ob;
+            }
             //使用之前的node.parser去渲染
             (this.node.section.parser || this.ext).parserNodes(this.node.section.asts, this.node, this.node.ob);
         }
@@ -2433,7 +2438,7 @@ class ParserComponent extends IParser {
                                 //事件触发时，主动获取，不需要做数据劫持监听
                                 eventParams = this.runExpress(`[${event.functionParam}]`, this.ob);
                             }
-                            eventCallBack.call(this.ob, e, ...eventParams);
+                            eventCallBack.call(this.ext.ob, e, ...eventParams);
                         }
                     }
                 ]);
@@ -2540,7 +2545,7 @@ class ParserComponent extends IParser {
     }
     transformPropValue(val) {
         if (typeof val === "function" && !(JOKER_COMPONENT_TAG in val)) {
-            return val.bind(this.ob);
+            return val.bind(this.ext.ob);
         }
         return val;
     }
@@ -2599,7 +2604,7 @@ class ParserElement extends IParser {
                                 eventParams = this.runExpress(`[${event.functionParam}]`, this.ob);
                             }
                             if (eventCallBack) {
-                                eventCallBack.call(this.ob, e, ...eventParams);
+                                eventCallBack.call(this.ext.ob, e, ...eventParams);
                             }
                         }
                     }

package/dist/bundle.js

@@ -433,10 +433,9 @@ function proxyData(data) {
     if (proxyDepTarget) {
         return data;
     }
-    //@ts-ignore
-    if (data[OBJECTPROXY_DATA_KEY]) {
-        //@ts-ignore
-        return data[OBJECTPROXY_DATA_KEY];
+    let readiedData = Reflect.get(data, OBJECTPROXY_DATA_KEY);
+    if (readiedData) {
+        return readiedData;
     }
     let dep = new Dep();
     //首次重置值
@@ -456,7 +455,7 @@ function proxyData(data) {
             if (key === OBJECTPROXY_DEPLEVE_ID) {
                 return undefined;
             }
-            let result = target[key];
+            let result = Reflect.get(target, key);
             if (hasProperty(target, key) === false && key !== "length") {
                 return result;
             }
@@ -470,8 +469,7 @@ function proxyData(data) {
         },
         set(target, key, value) {
             if (resetData) {
-                //@ts-ignore
-                target[key] = value;
+                Reflect.set(target, key, value);
                 return true;
             }
             if (checkEnableProxy(value)) {
@@ -479,8 +477,7 @@ function proxyData(data) {
                 value = observer(value);
             }
             let isNewProperty = hasOwnProperty(target, key) === false;
-            //@ts-ignore
-            target[key] = value;
+            Reflect.set(target, key, value);
             notifyDep(dep, key);
             //数组长度变更，属于数组change，则对该对象做change广播
             if (Array.isArray(target)) {
@@ -493,8 +490,7 @@ function proxyData(data) {
             return true;
         },
         deleteProperty(target, key) {
-            //@ts-ignore
-            delete target[key];
+            Reflect.deleteProperty(target, key);
             //操作成功 && 非数组，删除属性时，要进行广播
             if (Array.isArray(target) === false) {
                 notifyDep(dep, OBJECTPROXY_DEPLEVE_ID);
@@ -523,9 +519,12 @@ function proxyData(data) {
  */
 function getProxyDep(data) {
     //@ts-ignore
-    if (isObject(data) && data?.[OBJECTPROXY_DEPID] && data[OBJECTPROXY_DEPID] instanceof Dep) {
-        //@ts-ignore
-        return data[OBJECTPROXY_DEPID];
+    if (isObject(data)) {
+        let dep = Reflect.get(data, OBJECTPROXY_DEPID);
+        if (dep && dep instanceof Dep) {
+            //@ts-ignore
+            return dep;
+        }
     }
 }
 /**
@@ -1742,7 +1741,7 @@ class HtmlContainerWebComponent extends HTMLElement {
     }
 }
 // 注册自定义元素
-customElements.define("joker-html-container", HtmlContainerWebComponent);
+!customElements.get("joker-html-container") && customElements.define("joker-html-container", HtmlContainerWebComponent);
 
 //全局方法
 const __GLONAL_FUNTIONS__ = {};
@@ -2302,10 +2301,16 @@ class ParserRenderSection extends IParser {
              *
              * 渲染出来的子集属于组件的子集
              */
-            this.node.ob = Object.create(this.node.section.ob || this.ob);
-            this.node.section.params?.forEach((item, index) => {
-                defineObserverProperty(this.node.ob, item, this.node.params[index]);
-            });
+            if (this.node.section.params) {
+                this.node.ob = Object.create(this.node.section.ob || this.ob);
+                this.node.section.params?.forEach((item, index) => {
+                    defineObserverProperty(this.node.ob, item, this.node.params[index]);
+                });
+            }
+            else {
+                //无参数 不需要创建新的对象，避免性能开销
+                this.node.ob = this.node.section.ob || this.ob;
+            }
             //使用之前的node.parser去渲染
             (this.node.section.parser || this.ext).parserNodes(this.node.section.asts, this.node, this.node.ob);
         }
@@ -2434,7 +2439,7 @@ class ParserComponent extends IParser {
                                 //事件触发时，主动获取，不需要做数据劫持监听
                                 eventParams = this.runExpress(`[${event.functionParam}]`, this.ob);
                             }
-                            eventCallBack.call(this.ob, e, ...eventParams);
+                            eventCallBack.call(this.ext.ob, e, ...eventParams);
                         }
                     }
                 ]);
@@ -2541,7 +2546,7 @@ class ParserComponent extends IParser {
     }
     transformPropValue(val) {
         if (typeof val === "function" && !(JOKER_COMPONENT_TAG in val)) {
-            return val.bind(this.ob);
+            return val.bind(this.ext.ob);
         }
         return val;
     }
@@ -2600,7 +2605,7 @@ class ParserElement extends IParser {
                                 eventParams = this.runExpress(`[${event.functionParam}]`, this.ob);
                             }
                             if (eventCallBack) {
-                                eventCallBack.call(this.ob, e, ...eventParams);
+                                eventCallBack.call(this.ext.ob, e, ...eventParams);
                             }
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@joker.front/core",
-    "version": "1.2.146",
+    "version": "1.2.153",
     "description": "",
     "main": "./dist/bundle.js",
     "module": "./dist/bundle.es.js",
@@ -20,7 +20,7 @@
     ],
     "scripts": {
         "test": "jest",
-        "test:temp": "jest test/parser/html.spec.ts",
+        "test:temp": "jest test/other/ob-source.spec.ts",
         "build": "joker_build_library --sourcemap=false",
         "release": "npm run test && npm run build && joker_release_library",
         "release:prod": "npm run test && npm run build && npm publish --access public --registry https://registry.npmjs.org/"

package/types/component.d.ts

@@ -146,7 +146,7 @@ export declare class Component<T extends DefaultKeyVal = {}> implements ICompone
      * @param param 参数
      * @param targetEvent event
      */
-    $trigger(eventName: string, param?: any, targetEvent?: VNode.Event): void;
+    $trigger(eventName: string, param?: any, targetEvent?: VNode.Event<any>): void;
     /**
      * 主动渲染（仅渲染，一般适用于模板区域的热更新使用/或动态装载等复杂场景）
      * @param newTemplate 可指定新的模板，否则按照原模板

package/types/event-bus.d.ts

@@ -5,7 +5,7 @@ export type EventCallBackItem<T> = {
 export type EventCallBackType<T> = (e: {
     stopPropagation: Function;
     callTimes: Number;
-}, params?: T) => boolean | void;
+}, params: T) => boolean | void;
 export declare class EventBus<T extends Record<string, any>> {
     private eventDatas;
     on<K extends keyof T>(eventName: K, callBack: EventCallBackType<T[K]>): void;

package/types/utils/index.d.ts

@@ -0,0 +1,2 @@
+export declare function createObject(source: Object): any;
+export declare function getObjectRootProtorype(source: any): Object;