bobe 0.0.17 → 0.0.19

package/dist/index.d.ts

@@ -96,7 +96,6 @@ declare class Interpreter {
      *  */
     declaration(ctx: ProgramCtx): any;
     getData(): any;
-    fragmentDeclaration(renderFragment: BobeUI, ctx: ProgramCtx): FragmentNode;
     /**
      * key 元素，组件的 key
      * value
@@ -106,7 +105,8 @@ declare class Interpreter {
      * mapKey 映射, 对应子组件的属性
      *  */
     onePropParsed(data: Store, node: any, key: string, value: any, valueIsMapKey: boolean, isFn: boolean, hookI?: number): void;
-    componentDeclaration(Component: typeof Store, ctx: ProgramCtx): ComponentNode;
+    oneRealPropParsed: Interpreter['onePropParsed'];
+    componentOrFragmentDeclaration(ComponentOrRender: BobeUI | typeof Store | string, ctx: ProgramCtx): ComponentNode;
     condDeclaration(ctx: ProgramCtx): IfNode;
     /**
      * <extensionLines> ::= PIPE <attributeList> NEWLINE <extensionLines>
@@ -153,10 +153,15 @@ declare class Interpreter {
     setProp(node: any, key: string, value: any, hookI?: number): void;
 }
 
+interface StackNode<T> {
+    value: T;
+    types: NodeSortBit;
+    prevByType: Partial<Record<number, StackNode<T>>>;
+}
 declare class MultiTypeStack<T> {
-    private top;
     private typeTops;
     length: number;
+    stack: StackNode<T>[];
     /**
      * 入栈操作
      * @param value 数据
@@ -224,7 +229,11 @@ type ProgramCtx = {
     before: any;
 };
 /** 返回值是用户自定义的节点 */
-type BobeUI = (isSub: boolean) => Tokenizer;
+type BobeUI = {
+    /** 在哪个 Store 声明的 */
+    boundStore: Store;
+    (isSub: boolean): Tokenizer;
+};
 type LogicNode = {
     __logicType: FakeType;
     realParent: any;

package/dist/index.umd.js

@@ -36,20 +36,16 @@
     NodeSort2[NodeSort2["TokenizerSwitcher"] = 16] = "TokenizerSwitcher";
     return NodeSort2;
   })(NodeSort || {});
-  var TerpEvt = /* @__PURE__ */ ((TerpEvt2) => {
-    TerpEvt2["AllAttrGot"] = "all-attr-got";
-    TerpEvt2["HandledComponentNode"] = "handled-component-node";
-    return TerpEvt2;
-  })(TerpEvt || {});
   const IsAnchor = /* @__PURE__ */ Symbol("is-anchor");
 
   class MultiTypeStack {
     constructor() {
       // 记录全局栈顶
-      this.top = null;
+      // private top: StackNode<T> | null = null;
       // 记录每个类别的当前最新节点（各分类的“栈顶”）
       this.typeTops = {};
       this.length = 0;
+      this.stack = [];
     }
     /**
      * 入栈操作
@@ -60,7 +56,6 @@
       const newNode = {
         value,
         types: bits,
-        prevGlobal: this.top,
         prevByType: {}
       };
       let bit;
@@ -71,15 +66,15 @@
         newNode.prevByType[bit] = this.typeTops[bit] || void 0;
         this.typeTops[bit] = newNode;
       }
-      this.top = newNode;
-      this.length++;
+      this.stack[this.length++] = newNode;
     }
     /**
      * 出栈操作
      */
     pop() {
-      if (!this.top) return void 0;
-      const poppedNode = this.top;
+      const poppedNode = this.stack[this.length - 1];
+      this.stack[--this.length] = null;
+      if (!poppedNode) return void 0;
       let { types: bits } = poppedNode;
       let bit;
       while (1) {
@@ -88,8 +83,6 @@
         bits &= ~bit;
         this.typeTops[bit] = poppedNode.prevByType[bit];
       }
-      this.top = poppedNode.prevGlobal;
-      this.length--;
       return [poppedNode.value, poppedNode.types];
     }
     /**
@@ -100,15 +93,13 @@
       return (_a = this.typeTops[cat]) == null ? void 0 : _a.value;
     }
     peekType() {
-      var _a;
-      return (_a = this.top) == null ? void 0 : _a.types;
+      return this.stack.at(-1).types;
     }
     /**
      * 获取全局栈顶
      */
     peek() {
-      var _a;
-      return (_a = this.top) == null ? void 0 : _a.value;
+      return this.stack.at(-1).value;
     }
     // /**
     //  * 1. 全局向前遍历 (不分类)
@@ -140,11 +131,12 @@
     // }
   }
 
-  const tap = new bobeShared.BaseEvent();
+  new bobeShared.BaseEvent();
   class Interpreter {
     constructor(tokenizer) {
       this.tokenizer = tokenizer;
       this.rootComponent = null;
+      this.oneRealPropParsed = this.onePropParsed.bind(this);
     }
     isLogicNode(node) {
       return node && node.__logicType & LogicalBit;
@@ -293,18 +285,13 @@
         return this.condDeclaration(ctx);
       } else if (hookType) {
         if (hookType === "static") {
-          if (typeof value === "function" && value.prototype instanceof aoye.Store) {
-            _node = this.componentDeclaration(value, ctx);
-          } else if (typeof value === "function") {
-            _node = this.fragmentDeclaration(value, ctx);
+          if (typeof value === "function") {
+            _node = this.componentOrFragmentDeclaration(value, ctx);
           } else {
             throw new SyntaxError(`declaration \u4E0D\u652F\u6301 ${value} \u7C7B\u578B\u7684\u9759\u6001\u63D2\u503C`);
           }
         } else {
-          const data = this.getData();
-          Boolean(data[aoye.Keys.Raw][value]);
-          new Function("data", `let v;with(data){v=(${value})};return v`);
-          _node = this.createNode(value);
+          _node = this.componentOrFragmentDeclaration(value, ctx);
         }
       } else {
         _node = this.createNode(value);
@@ -312,9 +299,9 @@
       this.tokenizer.nextToken();
       this.headerLine(_node);
       this.extensionLines(_node);
-      if (_node.__logicType === FakeType.Component) {
-        tap.once(TerpEvt.HandledComponentNode, (node) => _node = node);
-        tap.emit(TerpEvt.AllAttrGot);
+      if (_node.__logicType & TokenizerSwitcherBit) {
+        this.onePropParsed = this.oneRealPropParsed;
+        this.tokenizer = _node.tokenizer;
       }
       return _node;
     }
@@ -322,18 +309,6 @@
       const { node } = this.ctx.stack.peekByType(NodeSort.CtxProvider);
       return node.data || node.owner.data;
     }
-    // TODO: 指定挂载位置
-    fragmentDeclaration(renderFragment, ctx) {
-      const data = this.getData();
-      const tokenizer = renderFragment.call(data, this.opt, { data, root: "", anchor: "" });
-      const fragmentNode = {
-        __logicType: FakeType.Fragment,
-        realParent: null,
-        tokenizer,
-        data: null
-      };
-      return fragmentNode;
-    }
     /**
      * key 元素，组件的 key
      * value
@@ -359,39 +334,45 @@
         this.setProp(node, key, value, hookI);
       }
     }
-    componentDeclaration(Component, ctx) {
-      const child = Component.new();
-      const componentNode = {
-        __logicType: FakeType.Component,
+    componentOrFragmentDeclaration(ComponentOrRender, ctx) {
+      let Component, render, child;
+      const data = this.getData();
+      if (typeof ComponentOrRender === "string") {
+        ComponentOrRender = data[ComponentOrRender];
+      }
+      const isCC = ComponentOrRender.prototype instanceof aoye.Store;
+      if (isCC) {
+        Component = ComponentOrRender;
+        child = Component.new();
+      } else {
+        render = ComponentOrRender;
+        const boundStore = render.boundStore;
+        child = aoye.deepSignal({}, aoye.getPulling(), true);
+        Object.setPrototypeOf(child, boundStore);
+      }
+      const node = {
+        __logicType: isCC ? FakeType.Component : FakeType.Fragment,
         realParent: ctx.realParent,
         data: child,
-        tokenizer: null
+        tokenizer: render ? render(true) : child["ui"](true)
       };
-      const prevOnePropParsed = this.onePropParsed;
-      this.onePropParsed = (data, node, key, value, valueIsMapKey, isFn, hookI) => {
+      this.onePropParsed = (data2, _, key, value, valueIsMapKey, isFn, hookI) => {
         if (isFn) {
           child[aoye.Keys.Raw][key] = value;
         } else if (valueIsMapKey) {
-          aoye.shareSignal(data, value, child, key);
+          aoye.shareSignal(data2, value, child, key);
         } else if (typeof value === "function") {
           const meta = child[aoye.Keys.Meta];
           const cells = meta.cells;
           const computed = aoye.$(value);
           cells.set(key, computed);
+          child[aoye.Keys.Raw][key] = void 0;
         } else {
           child[aoye.Keys.Raw][key] = value;
         }
       };
-      componentNode.realAfter = this.insertAfterAnchor(ctx);
-      const { realParent, prevSibling } = ctx;
-      tap.once(TerpEvt.AllAttrGot, () => {
-        this.onePropParsed = prevOnePropParsed;
-        const subTkr = child["ui"](true);
-        componentNode.tokenizer = subTkr;
-        this.tokenizer = subTkr;
-        tap.emit(TerpEvt.HandledComponentNode, componentNode);
-      });
-      return componentNode;
+      node.realAfter = this.insertAfterAnchor(ctx);
+      return node;
     }
     // TODO: 优化代码逻辑，拆分 if elseif else
     condDeclaration(ctx) {
@@ -1140,6 +1121,7 @@ ${_Tokenizer.EofId}`;
       tokenizer.init(Array.from(fragments));
       return tokenizer;
     };
+    ui.boundStore = aoye.Store.Current;
     return ui;
   }
   function customRender(option) {