@joker.front/core 1.2.149 → 1.2.157

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;
+        }
     }
 }
 /**
@@ -1303,6 +1302,9 @@ var Render;
                     let resolve = () => {
                         removeClassName(node, getTransitionClassName(transitionName, model, "to"));
                         removeClassName(node, getTransitionClassName(transitionName, model, "active"));
+                        //可能存在越级删除，造成动画元素过早移除，
+                        if (!node.output)
+                            return;
                         node.output.removeEventListener(`${type}end`, onEnd);
                         if (id === node.output.__TRANSITION_EVNETID__) {
                             callBack?.();
@@ -1338,6 +1340,8 @@ var Render;
             }
             else if (node instanceof VNode.Html) {
                 let conatiner = document.createElement("joker-html-container");
+                //@ts-ignore
+                conatiner.JOKER_NODE = node;
                 conatiner.root.innerHTML = node.html;
                 node.output = conatiner;
             }
@@ -1355,6 +1359,8 @@ var Render;
                 for (let attrName in node.attributes) {
                     this.setAttribute(element, attrName, node.attributes[attrName]);
                 }
+                //@ts-ignore
+                element.JOKER_NODE = node;
                 node.output = element;
                 //做穿透延迟仅对outside.click
                 if (node.events.some((n) => n[0] === "click" && n[1].modifiers?.includes("outside"))) {
@@ -2301,10 +2307,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 +2445,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 +2552,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 +2611,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);
                             }
                         }
                     }
@@ -2813,11 +2825,11 @@ class ParserTemplate {
         this.nodeWatcherEvents = {};
         this.asts.length = 0;
     }
-    reParser(asts, keepalive) {
+    reSetAsts(asts, keepalive) {
         //销毁历史产物
         this.destroy(keepalive);
         this.render = IContainer.get(Render.IRENDERIOCTAGID) ?? new Render.DomRender();
-        this.parserNodes(asts, this.root);
+        this.asts = asts;
     }
     nodeTransition(node, mode, name, callBack, type) {
         if (node && node.parent?.childrens && (node instanceof VNode.Element || node instanceof VNode.Component)) {
@@ -3287,7 +3299,7 @@ class Component {
         }
         //执行一次render，则初始化一次template
         this.template ??= [];
-        this[PARSER_TEMPLATE_TARGET]?.reParser(this.template, keepalive);
+        this[PARSER_TEMPLATE_TARGET]?.reSetAsts(this.template, keepalive);
         this[PARSER_TEMPLATE_TARGET] ??= new ParserTemplate(this.template, this, this.$root);
         this[PARSER_TEMPLATE_TARGET].parser();
         this[PARSER_TEMPLATE_TARGET].mount(this.$root);
@@ -3388,20 +3400,22 @@ class ComponentContainer extends Component {
     propsVaule;
     created() {
         let propsData = {};
-        Object.keys(this.props).forEach((p) => {
-            //过滤
-            if (typeof p !== "string")
-                return;
-            let pName = toLowerCase(p);
-            if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
-                return;
-            propsData[p] = this.props[p];
-            //单项数据同步
-            this.$watch(() => this.props[p], () => {
-                this.propsVaule[p] = this.props[p];
+        if (!this.props.props) {
+            Object.keys(this.props).forEach((p) => {
+                //过滤
+                if (typeof p !== "string")
+                    return;
+                let pName = toLowerCase(p);
+                if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
+                    return;
+                propsData[p] = this.props[p];
+                //单项数据同步
+                this.$watch(() => this.props[p], () => {
+                    this.propsVaule[p] = this.props[p];
+                });
             });
-        });
-        this.propsVaule = observer(propsData);
+            this.propsVaule = observer(propsData);
+        }
     }
     async loadComponent(componentName) {
         if (!componentName) {
@@ -3425,7 +3439,7 @@ class ComponentContainer extends Component {
             if (!(JOKER_COMPONENT_TAG in component)) {
                 component = (await component()).default;
             }
-            cacheComponent = new component(this.propsVaule, this.$sections, this.isKeepAlive);
+            cacheComponent = new component(this.props.props || this.propsVaule, this.$sections, this.isKeepAlive);
             //事件向上穿透广播
             cacheComponent.$on("*", (e) => {
                 this.$trigger(e.eventName, e.data, e);

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;
+        }
     }
 }
 /**
@@ -1304,6 +1303,9 @@ var Render;
                     let resolve = () => {
                         removeClassName(node, getTransitionClassName(transitionName, model, "to"));
                         removeClassName(node, getTransitionClassName(transitionName, model, "active"));
+                        //可能存在越级删除，造成动画元素过早移除，
+                        if (!node.output)
+                            return;
                         node.output.removeEventListener(`${type}end`, onEnd);
                         if (id === node.output.__TRANSITION_EVNETID__) {
                             callBack?.();
@@ -1339,6 +1341,8 @@ var Render;
             }
             else if (node instanceof exports.VNode.Html) {
                 let conatiner = document.createElement("joker-html-container");
+                //@ts-ignore
+                conatiner.JOKER_NODE = node;
                 conatiner.root.innerHTML = node.html;
                 node.output = conatiner;
             }
@@ -1356,6 +1360,8 @@ var Render;
                 for (let attrName in node.attributes) {
                     this.setAttribute(element, attrName, node.attributes[attrName]);
                 }
+                //@ts-ignore
+                element.JOKER_NODE = node;
                 node.output = element;
                 //做穿透延迟仅对outside.click
                 if (node.events.some((n) => n[0] === "click" && n[1].modifiers?.includes("outside"))) {
@@ -2302,10 +2308,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 +2446,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 +2553,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 +2612,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);
                             }
                         }
                     }
@@ -2814,11 +2826,11 @@ class ParserTemplate {
         this.nodeWatcherEvents = {};
         this.asts.length = 0;
     }
-    reParser(asts, keepalive) {
+    reSetAsts(asts, keepalive) {
         //销毁历史产物
         this.destroy(keepalive);
         this.render = exports.IContainer.get(Render.IRENDERIOCTAGID) ?? new Render.DomRender();
-        this.parserNodes(asts, this.root);
+        this.asts = asts;
     }
     nodeTransition(node, mode, name, callBack, type) {
         if (node && node.parent?.childrens && (node instanceof exports.VNode.Element || node instanceof exports.VNode.Component)) {
@@ -3288,7 +3300,7 @@ class Component {
         }
         //执行一次render，则初始化一次template
         this.template ??= [];
-        this[PARSER_TEMPLATE_TARGET]?.reParser(this.template, keepalive);
+        this[PARSER_TEMPLATE_TARGET]?.reSetAsts(this.template, keepalive);
         this[PARSER_TEMPLATE_TARGET] ??= new ParserTemplate(this.template, this, this.$root);
         this[PARSER_TEMPLATE_TARGET].parser();
         this[PARSER_TEMPLATE_TARGET].mount(this.$root);
@@ -3389,20 +3401,22 @@ class ComponentContainer extends Component {
     propsVaule;
     created() {
         let propsData = {};
-        Object.keys(this.props).forEach((p) => {
-            //过滤
-            if (typeof p !== "string")
-                return;
-            let pName = toLowerCase(p);
-            if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
-                return;
-            propsData[p] = this.props[p];
-            //单项数据同步
-            this.$watch(() => this.props[p], () => {
-                this.propsVaule[p] = this.props[p];
+        if (!this.props.props) {
+            Object.keys(this.props).forEach((p) => {
+                //过滤
+                if (typeof p !== "string")
+                    return;
+                let pName = toLowerCase(p);
+                if (pName === "transition-name" || pName === "name" || pName === "keep-alive" || pName === "ref")
+                    return;
+                propsData[p] = this.props[p];
+                //单项数据同步
+                this.$watch(() => this.props[p], () => {
+                    this.propsVaule[p] = this.props[p];
+                });
             });
-        });
-        this.propsVaule = observer(propsData);
+            this.propsVaule = observer(propsData);
+        }
     }
     async loadComponent(componentName) {
         if (!componentName) {
@@ -3426,7 +3440,7 @@ class ComponentContainer extends Component {
             if (!(JOKER_COMPONENT_TAG in component)) {
                 component = (await component()).default;
             }
-            cacheComponent = new component(this.propsVaule, this.$sections, this.isKeepAlive);
+            cacheComponent = new component(this.props.props || this.propsVaule, this.$sections, this.isKeepAlive);
             //事件向上穿透广播
             cacheComponent.$on("*", (e) => {
                 this.$trigger(e.eventName, e.data, e);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@joker.front/core",
-    "version": "1.2.149",
+    "version": "1.2.157",
     "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

@@ -197,6 +197,7 @@ export declare function getGlobalComponent(key: string): ComponentConstructor |
 export declare class ComponentContainer extends Component<{
     [key: string]: any;
     name: string;
+    props: object;
     "transition-name": string;
 }> {
     template: never[];

package/types/parser/index.d.ts

@@ -67,7 +67,7 @@ export declare class ParserTemplate {
      * 销毁
      */
     destroy(keepalive?: boolean): void;
-    reParser(asts: AST.Node[], keepalive?: boolean): void;
+    reSetAsts(asts: AST.Node[], keepalive?: boolean): void;
     nodeTransition(node: VNode.Node | undefined, mode: "enter" | "leave", name?: string, callBack?: Function, type?: "transition" | "animation"): boolean;
 }
 export declare function getFirstElement(node: VNode.Node): VNode.Element | undefined;

package/types/utils/index.d.ts

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