@joker.front/core 1.2.157 → 1.2.170

package/dist/bundle.es.js

@@ -313,6 +313,13 @@ function escape2Html(str) {
     });
 }
 
+let otherWindowDeps = [];
+function registerOtherWindowDep(dep) {
+    otherWindowDeps.push(dep);
+}
+function removeOtherWindowDep(dep) {
+    remove(otherWindowDeps, dep);
+}
 /**
  * 作为观察者和对象代理中间的关系桥
  * 数据变更时：Ob->dep->watcher
@@ -320,7 +327,7 @@ function escape2Html(str) {
  */
 class Dep {
     /**
-     * 关系id，尽在production模式下生效
+     * 关系id，仅在production模式下生效
      */
     id = process.env.NODE_ENV === "production" ? "" : guid();
     /**
@@ -340,6 +347,9 @@ class Dep {
      */
     depend(key) {
         Dep.target?.addDep(this, key);
+        otherWindowDeps.forEach((n) => {
+            n.target?.addDep(this, key);
+        });
     }
     /**
      * 添加观察者
@@ -404,12 +414,12 @@ function notifyGroupDeps(list) {
 /**
  * 存放劫持对象的Dep的Key
  */
-const OBJECTPROXY_DEPID = Symbol("JOKER_OBJECT_PROXY_DEP_ID");
-const OBJECTPROXY_DATA_KEY = Symbol("JOKER_OBJECT_PROXY_DATA_KEY");
+const OBJECTPROXY_DEPID = Symbol.for("__JOKER_OBJECT_PROXY_DEP_ID__");
+const OBJECTPROXY_DATA_KEY = Symbol.for("__JOKER_OBJECT_PROXY_DATA_KEY__");
 /**
  * 针对深度劫持关系时，需要给该对象做一个虚拟劫持的关系Key，方便事件传播
  */
-const OBJECTPROXY_DEPLEVE_ID = Symbol("JOKER_OBJECTPROXY_DEPLEVE_ID");
+const OBJECTPROXY_DEPLEVE_ID = Symbol.for("__JOKER_OBJECTPROXY_DEPLEVE_ID__");
 /**
  * 检测是否允许劫持代理
  * @param data
@@ -423,8 +433,9 @@ function checkEnableProxy(data) {
         //非冻结
         !Object.isFrozen(data) &&
         !(data instanceof Element) &&
-        !(data instanceof VNode.Node) &&
-        !(data instanceof ShallowObserver));
+        !(JOKER_VNODE_TAG in data) &&
+        !(JOKER_SHALLOW_OBSERVER_TAG in data) &&
+        !(JOKER_COMPONENT_TAG in data));
 }
 function proxyData(data) {
     let proxyDepTarget = getProxyDep(data);
@@ -520,7 +531,7 @@ function getProxyDep(data) {
     //@ts-ignore
     if (isObject(data)) {
         let dep = Reflect.get(data, OBJECTPROXY_DEPID);
-        if (dep && dep instanceof Dep) {
+        if (dep) {
             //@ts-ignore
             return dep;
         }
@@ -585,12 +596,14 @@ function defineObserverProperty(target, key, value) {
         }
     });
 }
+const JOKER_SHALLOW_OBSERVER_TAG = Symbol.for("JOKER_SHALLOW_OBSERVER");
 /**
  * 浅劫持监听，不污染数据源，只对根值监听，不对属性监听
  * @returns
  */
 class ShallowObserver {
     data;
+    [JOKER_SHALLOW_OBSERVER_TAG] = true;
     dep = new Dep();
     constructor(data) {
         this.data = data;
@@ -730,7 +743,7 @@ class Watcher {
         if (expOrFn === undefined) {
             this.getter = (obj) => obj;
         }
-        else if (expOrFn instanceof Function) {
+        else if (typeof expOrFn === "function") {
             this.getter = expOrFn;
         }
         else {
@@ -866,6 +879,7 @@ var IContainer;
     IContainer.get = get;
 })(IContainer || (IContainer = {}));
 
+const JOKER_VNODE_TAG = Symbol.for("JOKER_VNODE_TAG");
 /**
  * 虚拟DOM
  *
@@ -873,12 +887,13 @@ var IContainer;
  */
 var VNode;
 (function (VNode) {
-    VNode.PARSERKEY = Symbol("JOKER_PARSER_KEY");
+    VNode.PARSERKEY = Symbol.for("JOKER_PARSER_KEY");
     /**
      * VNode 基类
      */
     class Node {
         parent;
+        [JOKER_VNODE_TAG] = true;
         /**
          * 是否是静态节点，非动态节点。例如：element、text、comment等
          */
@@ -1140,7 +1155,7 @@ var Render;
     /**
      * 注入TagId
      */
-    Render.IRENDERIOCTAGID = Symbol("JOKER_IRENDERIOC_TAGID");
+    Render.IRENDERIOCTAGID = Symbol.for("JOKER_IRENDERIOC_TAGID");
     /**
      * 默认Render，采用H5-DOM模式进行输出
      */
@@ -2975,13 +2990,13 @@ function isPropsType(propOption) {
 }
 
 const LOGTAG = "组件";
-const PROPS_DATA_KEY = Symbol("JOKER_PROPS_DATA_KEY");
-const PROPS_DATA_PROXY = Symbol("JOKER_PROPS_DATA_PROXY");
-const PRIVATE_WATCHERS = Symbol("JOKER_PRIVATE_WATCHERS");
-const EVENT_DATA_KEY = Symbol("JOKER_EVENT_DATA_KEY");
-const PARSER_TEMPLATE_TARGET = Symbol("JOKER_PARSER_TEMPLATE_TARGET");
-const SCOPE_ID = Symbol("JOKER_SCOPE_ID");
-const JOKER_COMPONENT_TAG = Symbol("JOKER_COMPONENT_TAG");
+const PROPS_DATA_KEY = Symbol.for("JOKER_PROPS_DATA_KEY");
+const PROPS_DATA_PROXY = Symbol.for("JOKER_PROPS_DATA_PROXY");
+const PRIVATE_WATCHERS = Symbol.for("JOKER_PRIVATE_WATCHERS");
+const EVENT_DATA_KEY = Symbol.for("JOKER_EVENT_DATA_KEY");
+const PARSER_TEMPLATE_TARGET = Symbol.for("JOKER_PARSER_TEMPLATE_TARGET");
+const SCOPE_ID = Symbol.for("JOKER_SCOPE_ID");
+const JOKER_COMPONENT_TAG = Symbol.for("JOKER_COMPONENT_TAG");
 /**
  * Joker组件
  */
@@ -3615,4 +3630,4 @@ class EventBus {
     }
 }
 
-export { Component, ComponentContainer, EventBus, IContainer, JOKER_COMPONENT_TAG, OBJECTPROXY_DEPID, ParserTemplate, SCOPE_ID, ShallowObserver, Template, VNode, Watcher, __JOKER_HMR_RUNTIME, combinedReply, defineObserverProperty, getGlobalComponent, isObserverData, observer, registerGlobalComponent, registerGlobalFunction };
+export { Component, ComponentContainer, Dep, EventBus, IContainer, JOKER_COMPONENT_TAG, JOKER_VNODE_TAG, OBJECTPROXY_DEPID, ParserTemplate, SCOPE_ID, ShallowObserver, Template, VNode, Watcher, __JOKER_HMR_RUNTIME, combinedReply, defineObserverProperty, getGlobalComponent, isObserverData, observer, registerGlobalComponent, registerGlobalFunction, registerOtherWindowDep, removeOtherWindowDep };

package/dist/bundle.js

@@ -314,6 +314,13 @@ function escape2Html(str) {
     });
 }
 
+let otherWindowDeps = [];
+function registerOtherWindowDep(dep) {
+    otherWindowDeps.push(dep);
+}
+function removeOtherWindowDep(dep) {
+    remove(otherWindowDeps, dep);
+}
 /**
  * 作为观察者和对象代理中间的关系桥
  * 数据变更时：Ob->dep->watcher
@@ -321,7 +328,7 @@ function escape2Html(str) {
  */
 class Dep {
     /**
-     * 关系id，尽在production模式下生效
+     * 关系id，仅在production模式下生效
      */
     id = process.env.NODE_ENV === "production" ? "" : guid();
     /**
@@ -341,6 +348,9 @@ class Dep {
      */
     depend(key) {
         Dep.target?.addDep(this, key);
+        otherWindowDeps.forEach((n) => {
+            n.target?.addDep(this, key);
+        });
     }
     /**
      * 添加观察者
@@ -405,12 +415,12 @@ function notifyGroupDeps(list) {
 /**
  * 存放劫持对象的Dep的Key
  */
-const OBJECTPROXY_DEPID = Symbol("JOKER_OBJECT_PROXY_DEP_ID");
-const OBJECTPROXY_DATA_KEY = Symbol("JOKER_OBJECT_PROXY_DATA_KEY");
+const OBJECTPROXY_DEPID = Symbol.for("__JOKER_OBJECT_PROXY_DEP_ID__");
+const OBJECTPROXY_DATA_KEY = Symbol.for("__JOKER_OBJECT_PROXY_DATA_KEY__");
 /**
  * 针对深度劫持关系时，需要给该对象做一个虚拟劫持的关系Key，方便事件传播
  */
-const OBJECTPROXY_DEPLEVE_ID = Symbol("JOKER_OBJECTPROXY_DEPLEVE_ID");
+const OBJECTPROXY_DEPLEVE_ID = Symbol.for("__JOKER_OBJECTPROXY_DEPLEVE_ID__");
 /**
  * 检测是否允许劫持代理
  * @param data
@@ -424,8 +434,9 @@ function checkEnableProxy(data) {
         //非冻结
         !Object.isFrozen(data) &&
         !(data instanceof Element) &&
-        !(data instanceof exports.VNode.Node) &&
-        !(data instanceof ShallowObserver));
+        !(JOKER_VNODE_TAG in data) &&
+        !(JOKER_SHALLOW_OBSERVER_TAG in data) &&
+        !(JOKER_COMPONENT_TAG in data));
 }
 function proxyData(data) {
     let proxyDepTarget = getProxyDep(data);
@@ -521,7 +532,7 @@ function getProxyDep(data) {
     //@ts-ignore
     if (isObject(data)) {
         let dep = Reflect.get(data, OBJECTPROXY_DEPID);
-        if (dep && dep instanceof Dep) {
+        if (dep) {
             //@ts-ignore
             return dep;
         }
@@ -586,12 +597,14 @@ function defineObserverProperty(target, key, value) {
         }
     });
 }
+const JOKER_SHALLOW_OBSERVER_TAG = Symbol.for("JOKER_SHALLOW_OBSERVER");
 /**
  * 浅劫持监听，不污染数据源，只对根值监听，不对属性监听
  * @returns
  */
 class ShallowObserver {
     data;
+    [JOKER_SHALLOW_OBSERVER_TAG] = true;
     dep = new Dep();
     constructor(data) {
         this.data = data;
@@ -731,7 +744,7 @@ class Watcher {
         if (expOrFn === undefined) {
             this.getter = (obj) => obj;
         }
-        else if (expOrFn instanceof Function) {
+        else if (typeof expOrFn === "function") {
             this.getter = expOrFn;
         }
         else {
@@ -867,6 +880,7 @@ exports.IContainer = void 0;
     IContainer.get = get;
 })(exports.IContainer || (exports.IContainer = {}));
 
+const JOKER_VNODE_TAG = Symbol.for("JOKER_VNODE_TAG");
 /**
  * 虚拟DOM
  *
@@ -874,12 +888,13 @@ exports.IContainer = void 0;
  */
 exports.VNode = void 0;
 (function (VNode) {
-    VNode.PARSERKEY = Symbol("JOKER_PARSER_KEY");
+    VNode.PARSERKEY = Symbol.for("JOKER_PARSER_KEY");
     /**
      * VNode 基类
      */
     class Node {
         parent;
+        [JOKER_VNODE_TAG] = true;
         /**
          * 是否是静态节点，非动态节点。例如：element、text、comment等
          */
@@ -1141,7 +1156,7 @@ var Render;
     /**
      * 注入TagId
      */
-    Render.IRENDERIOCTAGID = Symbol("JOKER_IRENDERIOC_TAGID");
+    Render.IRENDERIOCTAGID = Symbol.for("JOKER_IRENDERIOC_TAGID");
     /**
      * 默认Render，采用H5-DOM模式进行输出
      */
@@ -2976,13 +2991,13 @@ function isPropsType(propOption) {
 }
 
 const LOGTAG = "组件";
-const PROPS_DATA_KEY = Symbol("JOKER_PROPS_DATA_KEY");
-const PROPS_DATA_PROXY = Symbol("JOKER_PROPS_DATA_PROXY");
-const PRIVATE_WATCHERS = Symbol("JOKER_PRIVATE_WATCHERS");
-const EVENT_DATA_KEY = Symbol("JOKER_EVENT_DATA_KEY");
-const PARSER_TEMPLATE_TARGET = Symbol("JOKER_PARSER_TEMPLATE_TARGET");
-const SCOPE_ID = Symbol("JOKER_SCOPE_ID");
-const JOKER_COMPONENT_TAG = Symbol("JOKER_COMPONENT_TAG");
+const PROPS_DATA_KEY = Symbol.for("JOKER_PROPS_DATA_KEY");
+const PROPS_DATA_PROXY = Symbol.for("JOKER_PROPS_DATA_PROXY");
+const PRIVATE_WATCHERS = Symbol.for("JOKER_PRIVATE_WATCHERS");
+const EVENT_DATA_KEY = Symbol.for("JOKER_EVENT_DATA_KEY");
+const PARSER_TEMPLATE_TARGET = Symbol.for("JOKER_PARSER_TEMPLATE_TARGET");
+const SCOPE_ID = Symbol.for("JOKER_SCOPE_ID");
+const JOKER_COMPONENT_TAG = Symbol.for("JOKER_COMPONENT_TAG");
 /**
  * Joker组件
  */
@@ -3654,8 +3669,10 @@ Object.defineProperty(exports, 'createText', {
 });
 exports.Component = Component;
 exports.ComponentContainer = ComponentContainer;
+exports.Dep = Dep;
 exports.EventBus = EventBus;
 exports.JOKER_COMPONENT_TAG = JOKER_COMPONENT_TAG;
+exports.JOKER_VNODE_TAG = JOKER_VNODE_TAG;
 exports.OBJECTPROXY_DEPID = OBJECTPROXY_DEPID;
 exports.ParserTemplate = ParserTemplate;
 exports.SCOPE_ID = SCOPE_ID;
@@ -3670,3 +3687,5 @@ exports.isObserverData = isObserverData;
 exports.observer = observer;
 exports.registerGlobalComponent = registerGlobalComponent;
 exports.registerGlobalFunction = registerGlobalFunction;
+exports.registerOtherWindowDep = registerOtherWindowDep;
+exports.removeOtherWindowDep = removeOtherWindowDep;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@joker.front/core",
-    "version": "1.2.157",
+    "version": "1.2.170",
     "description": "",
     "main": "./dist/bundle.js",
     "module": "./dist/bundle.es.js",
@@ -20,7 +20,7 @@
     ],
     "scripts": {
         "test": "jest",
-        "test:temp": "jest test/other/ob-source.spec.ts",
+        "test:temp": "jest test/parser/cmd.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/"
@@ -31,7 +31,8 @@
         "type": "git"
     },
     "keywords": [
-        "joker"
+        "joker",
+        "front"
     ],
     "homepage": "jokers.pub",
     "dependencies": {

package/types/component.d.ts

@@ -73,12 +73,12 @@ export declare class Component<T extends DefaultKeyVal = {}> implements ICompone
      * 主动声明接受的参数
      * @returns
      */
-    get props(): Readonly<Partial<T>>;
+    get props(): Readonly<T>;
     /**
      * 挂载
      * @param root
      */
-    $mount(root: any | VNode.Component<IComponent>): this;
+    $mount(root: any | VNode.Component): this;
     /**
      * 节点动画，仅支持 element及组件节点
      */

package/types/index.d.ts

@@ -3,6 +3,7 @@ export * from "./component";
 export * from "./parser/vnode";
 export { ParserTemplate, NodeChangeType } from "./parser/index";
 export * from "./observer/watcher";
+export { Dep, registerOtherWindowDep, removeOtherWindowDep } from "./observer/dep";
 export * from "./observer/index";
 export * from "./utils/DI";
 export * from "./hmr";

package/types/observer/dep.d.ts

@@ -1,4 +1,6 @@
 import { Watcher } from "./watcher";
+export declare function registerOtherWindowDep(dep: typeof Dep): void;
+export declare function removeOtherWindowDep(dep: typeof Dep): void;
 /**
  * 作为观察者和对象代理中间的关系桥
  * 数据变更时：Ob->dep->watcher
@@ -6,7 +8,7 @@ import { Watcher } from "./watcher";
  */
 export declare class Dep {
     /**
-     * 关系id，尽在production模式下生效
+     * 关系id，仅在production模式下生效
      */
     id: string;
     /**

package/types/observer/index.d.ts

@@ -18,12 +18,14 @@ export declare function observer<T extends Object>(data: T, clone?: boolean): T;
  * @param value
  */
 export declare function defineObserverProperty(target: any, key: string | symbol, value: any): void;
+declare const JOKER_SHALLOW_OBSERVER_TAG: unique symbol;
 /**
  * 浅劫持监听，不污染数据源，只对根值监听，不对属性监听
  * @returns
  */
 export declare class ShallowObserver<T> {
     private data;
+    [JOKER_SHALLOW_OBSERVER_TAG]: boolean;
     private dep;
     constructor(data: T);
     /**
@@ -44,3 +46,4 @@ export declare function combinedReply(func: Function): void;
  * 判断一个值是否是已被数据代理劫持
  */
 export declare function isObserverData(data: any): boolean;
+export {};

package/types/parser/component.d.ts

@@ -1,11 +1,11 @@
-import { AST, IComponent } from "@joker.front/ast";
+import { AST } from "@joker.front/ast";
 import { IParser } from "./parser";
 import { Component } from "../component";
 import { VNode } from "./vnode";
 export declare function checkIsComponent(tagName: string, ob: Component): boolean;
 export declare class ParserComponent extends IParser<(AST.Element | AST.Component) & {
-    node?: VNode.Component<IComponent>;
-}, VNode.Component<IComponent>> {
+    node?: VNode.Component;
+}, VNode.Component> {
     parser(): void;
     /**
      * 是否允许重载

package/types/parser/render.d.ts

@@ -1,5 +1,4 @@
 import { VNode } from "./vnode";
-import { IComponent } from "@joker.front/ast";
 type TransitionType = "transition" | "animation";
 export declare namespace Render {
     /**
@@ -72,7 +71,7 @@ export declare namespace Render {
         destroy(): void;
         elementToEnter(node: VNode.Element, name: string, type?: TransitionType, callBack?: Function): void;
         elementToLeave(node: VNode.Element, name: string, type?: TransitionType, callBack?: Function): void;
-        triggerEvent(node: VNode.Component<IComponent & Record<string, any>>, _eventName: string, _e: VNode.Event): void | false;
+        triggerEvent(node: VNode.Component, _eventName: string, _e: VNode.Event): void | false;
         private transitionFrame;
         private renderNode;
         private initElementEvents;

package/types/parser/vnode.d.ts

@@ -3,6 +3,7 @@ import { Component as ComponentClass } from "../component";
 import { ObType } from ".";
 import { SectionType } from "../component";
 import { IParser } from "./parser";
+export declare const JOKER_VNODE_TAG: unique symbol;
 /**
  * 虚拟DOM
  *
@@ -15,6 +16,7 @@ export declare namespace VNode {
      */
     class Node {
         parent?: Node | undefined;
+        [JOKER_VNODE_TAG]: boolean;
         /**
          * 是否是静态节点，非动态节点。例如：element、text、comment等
          */
@@ -127,7 +129,7 @@ export declare namespace VNode {
     /**
      * 组件节点
      */
-    class Component<T extends IComponent = IComponent & Record<string, any>> extends Node {
+    class Component<T extends ComponentClass = ComponentClass<any> & Record<string, any>> extends Node {
         /** 组件名（template标签名） */
         name?: string;
         /** 组件实例 */