@joker.front/core 1.2.157 → 1.2.237

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@joker.front/core",
-    "version": "1.2.157",
+    "version": "1.2.237",
     "description": "",
     "main": "./dist/bundle.js",
     "module": "./dist/bundle.es.js",
@@ -20,10 +20,11 @@
     ],
     "scripts": {
         "test": "jest",
-        "test:temp": "jest test/other/ob-source.spec.ts",
+        "test:temp": "jest test/other/function-this.spec.ts",
         "build": "joker_build_library --sourcemap=false",
+        "build:prod": "joker_build_library --sourcemap=false --terser",
         "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/"
+        "release:prod": "npm run test && npm run build:prod && npm publish --access public --registry https://registry.npmjs.org/"
     },
     "author": "Zohar",
     "license": "MIT",
@@ -31,16 +32,17 @@
         "type": "git"
     },
     "keywords": [
-        "joker"
+        "joker",
+        "front"
     ],
     "homepage": "jokers.pub",
     "dependencies": {
         "@joker.front/ast": "^1.3.22"
     },
     "devDependencies": {
-        "@joker.front/library-cli": "^1.2.8",
+        "@joker.front/library-cli": "^1.2.13",
         "@joker.front/sfc": "^1.1.5",
-        "@joker.front/shared": "^1.5.15",
+        "@joker.front/shared": "^1.5.25",
         "@types/jest": "^27.5.2",
         "@types/node": "^20.5.7",
         "@typescript-eslint/parser": "^5.58.0",

package/types/component.d.ts

@@ -6,10 +6,12 @@ declare const PROPS_DATA_KEY: unique symbol;
 declare const PROPS_DATA_PROXY: unique symbol;
 declare const PRIVATE_WATCHERS: unique symbol;
 declare const EVENT_DATA_KEY: unique symbol;
-declare const PARSER_TEMPLATE_TARGET: unique symbol;
+declare const IS_DESTROY: unique symbol;
+export declare const PARSER_TEMPLATE_TARGET: unique symbol;
 export type TemplateType = Array<AST.Node> | ((h: typeof RENDER_HANDLER) => Array<AST.Node>);
 export declare const SCOPE_ID: unique symbol;
 export declare const JOKER_COMPONENT_TAG: unique symbol;
+declare const TRANSFORM_FUNCTION_FLAG: unique symbol;
 export type ComponentConstructor = typeof Component<any>;
 export type ImportComponentConstructor = () => Promise<{
     default: ComponentConstructor;
@@ -63,6 +65,8 @@ export declare class Component<T extends DefaultKeyVal = {}> implements ICompone
     private [PROPS_DATA_PROXY]?;
     private [PRIVATE_WATCHERS];
     private [EVENT_DATA_KEY];
+    private [IS_DESTROY];
+    private [TRANSFORM_FUNCTION_FLAG];
     /**
      * @param propData prop参数
      * @param sections 渲染部分区域
@@ -73,12 +77,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及组件节点
      */
@@ -125,9 +129,9 @@ export declare class Component<T extends DefaultKeyVal = {}> implements ICompone
      * @param express
      * @param callBack
      * @param forceCallBack 即使值相同也要强制触发callback
-     * @returns 销毁watcher
+     * @returns [wathcer值， 销毁watcher]
      */
-    $watch(express: () => any, callBack: (nv?: any, ov?: any) => void, forceCallBack?: boolean): () => void;
+    $watch(express: () => any, callBack: (nv?: any, ov?: any) => void, forceCallBack?: boolean): [any, () => void];
     /**
      * 事件注册
      * @param eventName
@@ -205,6 +209,8 @@ export declare class ComponentContainer extends Component<{
     mounted(): void;
     private propsVaule;
     created(): void;
+    initProps(): void;
+    filterProps(p: string): false | undefined;
     loadComponent(componentName?: string): Promise<void>;
     beforeDestroy(): void;
     removeCache(componentName?: string): void;

package/types/event-bus.d.ts

@@ -3,13 +3,38 @@ export type EventCallBackItem<T> = {
     once?: Boolean;
 };
 export type EventCallBackType<T> = (e: {
+    eventName: string | number | Symbol;
     stopPropagation: Function;
     callTimes: Number;
-}, params: T) => boolean | void;
+}, params: T) => boolean | void | Promise<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;
-    once<K extends keyof T>(eventName: K, callBack: EventCallBackType<T[K]>): void;
+    /**
+     * 注册事件
+     * @param eventName
+     * @param callBack
+     * @returns 事件销毁
+     */
+    on<K extends keyof T>(eventName: K | "*", callBack: EventCallBackType<T[K]>): () => void;
+    /**
+     * 注册一次性事件（指触发一次）
+     * @param eventName
+     * @param callBack
+     * @returns 事件销毁
+     */
+    once<K extends keyof T>(eventName: K, callBack: EventCallBackType<T[K]>): () => void;
+    /**
+     * 销毁事件
+     * @param eventName
+     * @param callBack
+     * @returns
+     */
     off<K extends keyof T>(eventName?: K, callBack?: EventCallBackType<T[K]>): void;
-    trigger<K extends keyof T>(eventName: K, param?: T[K]): false | undefined;
+    /**
+     * 触发事件
+     * @param eventName
+     * @param param
+     * @returns
+     */
+    trigger<K extends keyof T>(eventName: K, param?: T[K]): Promise<false | undefined>;
 }

package/types/export.d.ts

@@ -0,0 +1,11 @@
+export { AST, RENDER_HANDLER, EXPRESSHANDLERTAG, createCodeFunction, createCommand, createComment, createElement, createFuntionBody, createText, createComponent } from "@joker.front/ast";
+export * from "./component";
+export * from "./parser/vnode";
+export { ParserTemplate, NodeChangeType } from "./parser/index";
+export * from "./observer/watcher";
+export { Dep } from "./observer/dep";
+export * from "./observer/index";
+export * from "./utils/DI";
+export * from "./event-bus";
+export { registerGlobalFunction } from "./global";
+export { Render } from "./parser/render";

package/types/index.d.ts

@@ -1,10 +1,12 @@
-export { AST, RENDER_HANDLER, createCodeFunction, createCommand, createComment, createElement, createFuntionBody, createText, createComponent } from "@joker.front/ast";
+export * from "./hmr";
+export { AST, RENDER_HANDLER, EXPRESSHANDLERTAG, createCodeFunction, createCommand, createComment, createElement, createFuntionBody, createText, createComponent } from "@joker.front/ast";
 export * from "./component";
 export * from "./parser/vnode";
 export { ParserTemplate, NodeChangeType } from "./parser/index";
 export * from "./observer/watcher";
+export { Dep } from "./observer/dep";
 export * from "./observer/index";
 export * from "./utils/DI";
-export * from "./hmr";
 export * from "./event-bus";
-export { registerGlobalFunction } from "./global";
+export { registerGlobalFunction, __GLONAL_FUNTIONS__ } from "./global";
+export { Render } from "./parser/render";

package/types/observer/dep.d.ts

@@ -6,7 +6,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/observer/watcher.d.ts

@@ -8,9 +8,11 @@ export declare class Watcher<T extends object = any> {
     private ob;
     private updateCallBack;
     private forceCallBack?;
+    id: string;
     private getter;
     value: any;
     isDestroy: boolean;
+    updating: boolean;
     /**
      * 运行时的关系收集
      *

package/types/parser/command/code.d.ts

@@ -3,4 +3,5 @@ import { IParser } from "../parser";
 import { VNode } from "../vnode";
 export declare class ParserCode extends IParser<AST.PropertyOrFunctionCommand, VNode.Text | VNode.Html> {
     parser(): void;
+    changeValue(val: any): void;
 }

package/types/parser/command/for.d.ts

@@ -17,6 +17,7 @@ export declare class ParserList extends IParser<AST.ForCommand, VNode.List> {
      * @param index
      */
     private destroyOldChildrens;
+    private checkObEqual;
 }
 export declare class ParserListeItem extends IParser<AST.ForCommand, VNode.ListItem> {
     parser(): void;

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;
     /**
      * 是否允许重载
@@ -19,5 +19,4 @@ export declare class ParserComponent extends IParser<(AST.Element | AST.Componen
     private renderChildren;
     private getSections;
     protected beforeDestroy(keepalive?: boolean): void;
-    private transformPropValue;
 }

package/types/parser/index.d.ts

@@ -67,6 +67,8 @@ export declare class ParserTemplate {
      * 销毁
      */
     destroy(keepalive?: boolean): void;
+    /** 清除所有监听，用于优化嵌套组件销毁时 自定义销毁事件再次触发watcher问题 */
+    destroyWathcers(): void;
     reSetAsts(asts: AST.Node[], keepalive?: boolean): void;
     nodeTransition(node: VNode.Node | undefined, mode: "enter" | "leave", name?: string, callBack?: Function, type?: "transition" | "animation"): boolean;
 }

package/types/parser/parser.d.ts

@@ -35,6 +35,7 @@ export declare abstract class IParser<T extends AST.Node, N extends VNode.Node>
      * 销毁流程
      */
     destroy(keepalive?: boolean): void;
+    destroyWathcers(): void;
     private destroyOtherData;
     /**
      * 销毁所有子集VNode

package/types/parser/render.d.ts

@@ -1,11 +1,11 @@
 import { VNode } from "./vnode";
-import { IComponent } from "@joker.front/ast";
 type TransitionType = "transition" | "animation";
 export declare namespace Render {
     /**
      * 注入TagId
      */
     const IRENDERIOCTAGID: unique symbol;
+    let ROOT_CONTAINER: string;
     /**
      * 备注：在渲染时执行appendNode，最终执行一次mount挂载
      * 不会出现根目录append的场景，因为指令group会优先占位
@@ -72,7 +72,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等
          */
@@ -41,19 +43,20 @@ export declare namespace VNode {
          * @param breakWhenVRoot 是否过滤到当前视图根时中断
          * @returns
          */
-        closest<T extends VNode.Node = VNode.Node>(filter: (node: VNode.Node) => boolean | void, breakWhenVRoot?: boolean): T | undefined;
+        closest<T extends VNode.Node = VNode.Element & VNode.Component>(filter: (node: VNode.Node) => any | any, breakWhenVRoot?: boolean): T | undefined;
         /**
          * 返回所有匹配的子元素
          * @param filter 返回true则记录，返回false则跳过该元素的子集
          * @returns
          */
-        find(filter: (node: VNode.Node) => boolean | void, childrens?: Array<VNode.Node>, _out?: Array<VNode.Node>): Array<VNode.Node>;
+        find<T extends VNode.Node = VNode.Element & VNode.Component>(filter: (node: VNode.Node) => true | any, childrens?: Array<VNode.Node>, _out?: Array<VNode.Node>): Array<T>;
         /**
          * 是否包含
          * @param filter 返回true则记录，返回false则跳过该元素的子集
          * @returns
          */
-        contains(filter: (node: VNode.Node) => boolean | void, childrens?: Array<VNode.Node>): boolean;
+        contains(filter: (node: VNode.Node) => true | any, childrens?: Array<VNode.Node>): boolean;
+        first<T extends VNode.Node = VNode.Element & VNode.Component>(filter: (node: VNode.Node) => true | any, childrens?: Array<VNode.Node>): T | undefined;
     }
     /**
      * 根节点
@@ -76,8 +79,9 @@ export declare namespace VNode {
      */
     class Html extends Node {
         html: string;
+        notShadow?: boolean | undefined;
         static: boolean;
-        constructor(html: string, parent: Node);
+        constructor(html: string, parent: Node, notShadow?: boolean | undefined);
     }
     /**
      * 注释节点
@@ -105,7 +109,7 @@ export declare namespace VNode {
         _assistEventCache?: Array<[string, (e: any) => void]>;
         constructor(tagName: string, parent: Node);
     }
-    type Event<T = undefined> = {
+    type Event<T = undefined, N extends VNode.Node = VNode.Element | VNode.Component | VNode.Root> = {
         /**
          * 事件名称
          */
@@ -115,7 +119,7 @@ export declare namespace VNode {
          */
         event?: any;
         /** 触发事件目标元素 */
-        target?: Node;
+        target?: N;
         /** 阻止默认事件 */
         preventDefault(): void;
         /** 阻止事件传播 */
@@ -127,7 +131,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;
         /** 组件实例 */
@@ -145,7 +149,8 @@ export declare namespace VNode {
          * 当前组件第一个element vnode
          */
         get firstElement(): Element | undefined;
-        private findElement;
+        /** 获取根element 节点 */
+        get rootElements(): Element[];
     }
     /**
      * 条件节点

package/types/utils/index.d.ts

@@ -1,2 +1,2 @@
-export declare function createObject(source: Object): any;
-export declare function getObjectRootProtorype(source: any): Object;
+export declare function resolveDeepPromisesInPlace(obj: any, deep?: boolean): Promise<any> | undefined;
+export declare function isGetterProperty(obj: object, prop: string): false | (() => any) | undefined;