bobe 0.0.70 → 0.0.71

package/dist/index.d.ts

@@ -18,6 +18,7 @@ declare class Interpreter {
     constructor(tokenizer: Tokenizer);
     ctx: ProgramCtx;
     rootComponent: ComponentNode$1 | null;
+    root: any;
     program(root: any, componentNode?: ComponentNode$1, before?: any, ctxProvider?: any): ComponentNode$1;
     insertAnchor(node: any, name?: string, isBefore?: boolean): any;
     /** 处理
@@ -103,9 +104,7 @@ declare class Interpreter {
     firstChild(node: any): any;
     createAnchor(name: string, isBefore?: boolean): any;
     insertAfter(parent: any, node: any, prev: any): void;
-    defaultInsert(parent: any, node: any, prev: any): void;
-    remove(node: any, parent?: any, prev?: any): void;
-    defaultRemove(node: any, parent: any, prevSibling: any): void;
+    remove(node: any, parent?: any, prevSibling?: any): void;
     setProp(node: any, key: string, value: any, hookI?: number): any | (() => void);
     beforeIndent?: (node: any) => boolean | void;
     leaveNode?: (node: any, isDedent: boolean) => void;
@@ -145,6 +144,23 @@ declare class MultiTypeStack<T> {
     peek(): T | undefined;
 }
 
+declare function bobe<T extends Record<any, any> = any>(fragments: TemplateStringsArray, ...values: any[]): UI<T>;
+declare function customRender(option: CustomRenderConf): RenderWithMw;
+declare class MwCtx<T> {
+    terp: Interpreter;
+    ctx: Record<any, any>;
+    handlers: T[];
+    constructor(terp: Interpreter, handlers: T[], base: T);
+    i: number;
+    get next(): T | null;
+    get hasNext(): T;
+}
+declare class Mw extends Map<string, any[]> {
+    use(mw: MwHook): void;
+    wrapHooks(terp: Interpreter): void;
+    wrapHook(terp: Interpreter, key: string, base: Function): any;
+}
+
 declare enum TokenType {
     NewLine = 1,
     Indent = 2,
@@ -202,13 +218,16 @@ type HookProps = {
     /** 父节点 */
     parentNode?: any;
 };
-type TerpConf = Partial<Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib' | 'beforeIndent' | 'leaveNode' | 'leaveLogicNode' | 'beforeLogicIndent'>> & {
+type TerpConf = Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib' | 'beforeIndent' | 'leaveNode' | 'leaveLogicNode' | 'beforeLogicIndent'> & {
     noopEffect?: boolean;
 };
 type CustomRenderConf = Pick<TerpConf, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib' | 'beforeIndent' | 'leaveNode' | 'leaveLogicNode' | 'beforeLogicIndent' | 'noopEffect'> & {
     /** program() 之后、flushMicroEffectManual() 之前调用 */
     onBeforeFlush?: () => void;
 };
+type MwHook = {
+    [K in keyof CustomRenderConf]?: CustomRenderConf[K] extends (...args: infer P) => infer R ? (this: MwCtx<any>, ...args: P) => R : CustomRenderConf[K];
+};
 type Hook = (props: HookProps) => any;
 type HookType = 'dynamic' | 'static';
 declare enum ParseErrorCode {
@@ -335,6 +354,10 @@ type ComponentNode$1 = LogicNode & {
     resumeSnapshot?: ReturnType<Tokenizer['snapshot']>;
 };
 type Dep = (() => any) | string;
+type RenderWithMw = {
+    use: Mw['use'];
+    <T extends typeof Store>(Ctor: T, root: any): [ComponentNode$1, InstanceType<T>];
+};
 
 declare class Tokenizer {
     private hook;
@@ -596,9 +619,6 @@ type ParseHooks = Partial<{
     };
 }>;
 
-declare function bobe<T extends Record<any, any> = any>(fragments: TemplateStringsArray, ...values: any[]): UI<T>;
-declare function customRender(option: CustomRenderConf): <T extends typeof Store>(Ctor: T, root: any) => readonly [ComponentNode$1, InstanceType<T>];
-
 type IContext = {
     <T = any>(name: string): T;
     <T = any>(): T;
@@ -607,5 +627,5 @@ declare const context: IContext;
 
 declare const effect: (callback: (...args: ValueDiff[]) => void, depOrOpt?: Dep[] | Dep | CustomEffectOpt, opt?: CustomEffectOpt) => aoye.Effect;
 
-export { Compiler, FakeType, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
+export { Compiler, FakeType, Mw, MwCtx, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
 export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, IContext, InterpolationNode, LogicNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode, UI };

package/dist/index.umd.js

@@ -1474,6 +1474,7 @@
     rootComponent = null;
     program(root, componentNode, before, ctxProvider) {
       this.rootComponent = componentNode;
+      this.root = root;
       this.tokenizer.nextToken();
       const stack = new MultiTypeStack();
       setCtxStack(stack);
@@ -2677,9 +2678,6 @@
       };
     }
     insertAfter(parent, node, prev) {
-      return this.defaultInsert(parent, node, prev);
-    }
-    defaultInsert(parent, node, prev) {
       if (prev) {
         const next = prev.nextSibling;
         prev.nextSibling = node;
@@ -2690,10 +2688,7 @@
         node.nextSibling = next;
       }
     }
-    remove(node, parent, prev) {
-      return this.defaultRemove(node, parent, prev);
-    }
-    defaultRemove(node, parent, prevSibling) {
+    remove(node, parent, prevSibling) {
       const next = node.nextSibling;
       if (prevSibling) {
         prevSibling.nextSibling = next;
@@ -2748,11 +2743,13 @@
     return ui;
   }
   function customRender(option) {
-    return function render(Ctor, root) {
+    const mw = new Mw();
+    function render(Ctor, root) {
       const store = Ctor.new();
       const tokenizer = store.ui(false);
       const terp = new Interpreter(tokenizer);
       terp.config(option);
+      mw.wrapHooks(terp);
       const componentNode = {
         __logicType: FakeType.Component,
         realParent: root,
@@ -2760,10 +2757,64 @@
         tokenizer
       };
       terp.program(root, componentNode);
-      option.onBeforeFlush?.();
+      const onBeforeFlush = mw.wrapHook(terp, 'onBeforeFlush', option.onBeforeFlush);
+      onBeforeFlush?.();
       aoye.flushMicroEffectManual();
       return [componentNode, store];
-    };
+    }
+    render.use = mw.use.bind(mw);
+    return render;
+  }
+  class MwCtx {
+    ctx = {};
+    constructor(terp, handlers = [], base) {
+      this.terp = terp;
+      this.handlers = [...handlers, base];
+    }
+    i = 0;
+    get next() {
+      if (this.i < this.handlers.length) {
+        const handler = this.handlers[this.i];
+        this.i++;
+        return handler;
+      }
+      return null;
+    }
+    get hasNext() {
+      return this.i < this.handlers.length && this.handlers[this.i];
+    }
+  }
+  class Mw extends Map {
+    use(mw) {
+      for (const key in mw) {
+        const list = this.get(key);
+        if (list) {
+          list.push(mw[key]);
+        } else {
+          this.set(key, [mw[key]]);
+        }
+      }
+    }
+    wrapHooks(terp) {
+      this.forEach((list, key) => {
+        let base = terp[key];
+        base = base?.bind(terp);
+        function wrapped(...args) {
+          const ctx = new MwCtx(terp, list, base);
+          return ctx.next.apply(ctx, args);
+        }
+        terp[key] = wrapped;
+      });
+    }
+    wrapHook(terp, key, base) {
+      const list = this.get(key);
+      if (!list) return base?.bind(terp);
+      function wrapped(...args) {
+        const ctx = new MwCtx(terp, list, base?.bind(terp));
+        return ctx.next.apply(ctx, args);
+      }
+      return wrapped;
+    }
   }
 
   const context = name => {
@@ -2814,6 +2865,8 @@
   });
   exports.Compiler = Compiler;
   exports.FakeType = FakeType;
+  exports.Mw = Mw;
+  exports.MwCtx = MwCtx;
   exports.NodeType = NodeType;
   exports.ParseSyntaxError = ParseSyntaxError;
   exports.Tokenizer = Tokenizer;