bobe 0.0.16 → 0.0.18

package/dist/bobe.cjs.js

@@ -35,20 +35,16 @@ var NodeSort = /* @__PURE__ */ ((NodeSort2) => {
   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 = [];
   }
   /**
    * 入栈操作
@@ -59,7 +55,6 @@ class MultiTypeStack {
     const newNode = {
       value,
       types: bits,
-      prevGlobal: this.top,
       prevByType: {}
     };
     let bit;
@@ -70,15 +65,15 @@ class MultiTypeStack {
       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) {
@@ -87,8 +82,6 @@ class MultiTypeStack {
       bits &= ~bit;
       this.typeTops[bit] = poppedNode.prevByType[bit];
     }
-    this.top = poppedNode.prevGlobal;
-    this.length--;
     return [poppedNode.value, poppedNode.types];
   }
   /**
@@ -99,47 +92,50 @@ class MultiTypeStack {
     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;
-  }
-  /**
-   * 1. 全局向前遍历 (不分类)
-   * 从栈顶开始，沿着全局链条向栈底遍历
-   */
-  forEach(callback) {
-    let current = this.top;
-    while (current !== null) {
-      const shouldBreak = callback(current.value, current.types);
-      if (shouldBreak) break;
-      current = current.prevGlobal;
-    }
-  }
-  /**
-   * 2. 按类别向前遍历
-   * 仅遍历属于指定类别 cat 的节点
-   */
-  forEachByType(cat, callback) {
-    let current = this.typeTops[cat];
-    while (current) {
-      const shouldBreak = callback(current.value);
-      if (shouldBreak) break;
-      current = current.prevByType[cat];
-    }
+    return this.stack.at(-1).value;
   }
+  // /**
+  //  * 1. 全局向前遍历 (不分类)
+  //  * 从栈顶开始，沿着全局链条向栈底遍历
+  //  */
+  // forEach(callback: (value: T, types: number) => any): void {
+  //   let current = this.top;
+  //   while (current !== null) {
+  //     // 执行回调，如果返回 false 则立即停止
+  //     const shouldBreak = callback(current.value, current.types);
+  //     if (shouldBreak) break;
+  //     current = current.prevGlobal;
+  //   }
+  // }
+  // /**
+  //  * 2. 按类别向前遍历
+  //  * 仅遍历属于指定类别 cat 的节点
+  //  */
+  // forEachByType(cat: number, callback: (value: T) => any): void {
+  //   // 从该类别的当前“顶端”节点开始
+  //   let current = this.typeTops[cat];
+  //   while (current) {
+  //     const shouldBreak = callback(current.value);
+  //     if (shouldBreak) break;
+  //     // 关键点：直接跳向该节点记录的“上一个同类节点”
+  //     // 这比遍历全局栈再筛选类别要快得多 (O(m) vs O(n))
+  //     current = current.prevByType[cat];
+  //   }
+  // }
 }
 
-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;
@@ -147,7 +143,7 @@ class Interpreter {
   program(root, componentNode, before) {
     var _a, _b;
     this.rootComponent = componentNode;
-    this.tokenizer.consume();
+    this.tokenizer.nextToken();
     const stack = new MultiTypeStack();
     stack.push({ node: root, prev: null }, NodeSort.Real);
     stack.push(
@@ -170,7 +166,7 @@ class Interpreter {
       }
       const token = this.tokenizer.token;
       if (token.type & TokenType.Indent) {
-        this.tokenizer.consume();
+        this.tokenizer.nextToken();
         const isLogicNode = this.isLogicNode(ctx.current);
         stack.push(
           {
@@ -199,7 +195,7 @@ class Interpreter {
         this.handleInsert(ctx.realParent, ctx.current, ctx.prevSibling);
       }
       if (this.tokenizer.token.type & TokenType.Dedent) {
-        this.tokenizer.consume();
+        this.tokenizer.nextToken();
         const [{ node: parent, prev }, sort] = stack.pop();
         if (!parent.__logicType) {
           const prevSameType = stack.peekByType(NodeSort.Real);
@@ -288,28 +284,23 @@ class Interpreter {
       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);
     }
-    this.tokenizer.consume();
+    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;
   }
@@ -317,18 +308,6 @@ class Interpreter {
     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
@@ -354,20 +333,32 @@ class Interpreter {
       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;
+      child = aoye.deepSignal({}, aoye.getPulling(), true);
+      Object.setPrototypeOf(child, data);
+    }
+    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;
@@ -377,23 +368,16 @@ class Interpreter {
         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) {
     var _a;
     const { prevSibling } = ctx;
     const snapbackUp = this.tokenizer.snapshot();
-    const keyWord = this.tokenizer.consume();
+    const keyWord = this.tokenizer.token;
+    this.tokenizer.nextToken();
     const noSelfCond = this.tokenizer.token.type === TokenType.NewLine;
     const [hookType, value] = this.tokenizer._hook({});
     const isElse = keyWord.value === "else";
@@ -474,9 +458,9 @@ class Interpreter {
         if (val) {
           if (ifNode.isFirstRender) {
             if (!noSelfCond) {
-              this.tokenizer.consume();
+              this.tokenizer.nextToken();
             }
-            this.tokenizer.consume();
+            this.tokenizer.nextToken();
           } else {
             this.tokenizer = ifNode.owner.tokenizer;
             this.tokenizer.resume(ifNode.snapshot);
@@ -511,15 +495,15 @@ class Interpreter {
    */
   extensionLines(_node) {
     while (1) {
-      if (!(this.tokenizer.token.type & TokenType.Pipe)) {
+      if ((this.tokenizer.token.type & TokenType.Pipe) === 0) {
         return;
       }
-      this.tokenizer.consume();
+      this.tokenizer.nextToken();
       this.attributeList(_node);
-      if (!(this.tokenizer.token.type & TokenType.NewLine)) {
+      if ((this.tokenizer.token.type & TokenType.NewLine) === 0) {
         return;
       }
-      this.tokenizer.consume();
+      this.tokenizer.nextToken();
     }
   }
   /**
@@ -529,7 +513,7 @@ class Interpreter {
    */
   headerLine(_node) {
     this.attributeList(_node);
-    this.tokenizer.consume();
+    this.tokenizer.nextToken();
   }
   /**
    * 属性列表：
@@ -539,19 +523,19 @@ class Interpreter {
    *
    * <attribute> ::= <key> = <value>
    * 1. 普通节点 执行 setProps 🪝
-   * 2. 组件节点 收集映射关系，或通过 effect 直接设值
+   * 2. 组件节点 收集映射关系，或 产生 computed
    */
   attributeList(_node) {
     let key, eq;
     const data = this.getData();
-    while (!(this.tokenizer.token.type & TokenType.NewLine)) {
+    while ((this.tokenizer.token.type & TokenType.NewLine) === 0) {
       if (key == null) {
         key = this.tokenizer.token.value;
       } else if (eq == null) {
         eq = "=";
       } else {
         const [hookType, value, hookI] = this.tokenizer._hook({});
-        const rawVal = Reflect.get(data[aoye.Keys.Raw], value);
+        const rawVal = data[aoye.Keys.Raw][value];
         const isFn = typeof rawVal === "function";
         if (hookType === "dynamic") {
           const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
@@ -565,7 +549,7 @@ class Interpreter {
         key = null;
         eq = null;
       }
-      this.tokenizer.consume();
+      this.tokenizer.nextToken();
     }
   }
   config(opt) {
@@ -725,16 +709,16 @@ const _Tokenizer = class _Tokenizer {
     let skipFragment = ``;
     this.token = void 0;
     while (1) {
-      const char = this.char;
+      const char = this.code[this.i];
       if (char === "\n") {
         needIndent = true;
         skipFragment += char;
-        this.next();
+        this.i++;
         continue;
       }
       if (!needIndent) {
         skipFragment += char;
-        this.next();
+        this.i++;
         continue;
       }
       needIndent = false;
@@ -787,21 +771,6 @@ ${_Tokenizer.EofId}`;
     if (!this.token) return false;
     return this.token.type & TokenType.Identifier && this.token.value === _Tokenizer.EofId;
   }
-  get char() {
-    return this.code[this.i];
-  }
-  get prev() {
-    return this.code[this.i - 1];
-  }
-  get after() {
-    return this.code[this.i + 1];
-  }
-  next() {
-    const prev = this.code[this.i];
-    this.i++;
-    const curr = this.code[this.i];
-    return [prev, curr];
-  }
   setToken(type, value) {
     this.token = {
       type,
@@ -810,10 +779,6 @@ ${_Tokenizer.EofId}`;
     };
     this.isFirstToken = false;
   }
-  testId(value) {
-    if (typeof value !== "string") return false;
-    return _Tokenizer.IdExp.test(value);
-  }
   nextToken() {
     try {
       if (this.isEof()) {
@@ -829,7 +794,7 @@ ${_Tokenizer.EofId}`;
         if (this.needIndent) {
           this.dent();
         } else {
-          let { char } = this;
+          const char = this.code[this.i];
           switch (char) {
             case "	":
             case " ":
@@ -860,12 +825,12 @@ ${_Tokenizer.EofId}`;
                 this.number(char);
                 break;
               }
-              if (this.testId(char)) {
+              if (typeof char === "string" && bobeShared.matchIdStart(char)) {
                 this.identifier(char);
               }
               break;
           }
-          this.next();
+          this.i++;
         }
         if (this.token) {
           break;
@@ -874,6 +839,7 @@ ${_Tokenizer.EofId}`;
       return this.token;
     } catch (error) {
       console.error(error);
+      return this.token;
     } finally {
       this.handledTokens.push(this.token);
     }
@@ -885,17 +851,17 @@ ${_Tokenizer.EofId}`;
     this.setToken(TokenType.Pipe, "|");
   }
   dynamic(char) {
-    let nextC = this.after;
+    let nextC = this.code[this.i + 1];
     if (nextC !== "{") {
       return false;
     }
-    this.next();
+    this.i++;
     let value = "${";
     let innerBrace = 0;
     while (1) {
-      nextC = this.after;
+      nextC = this.code[this.i + 1];
       value += nextC;
-      this.next();
+      this.i++;
       if (nextC === "{") {
         innerBrace++;
       }
@@ -912,13 +878,14 @@ ${_Tokenizer.EofId}`;
   brace() {
     let inComment, inString, count = 0, value = "", backslashCount = 0;
     while (1) {
-      const char = this.char;
-      const nextChar = this.after;
+      const char = this.code[this.i];
+      const nextChar = this.code[this.i + 1];
       if (inComment === "single" && char === "\n") {
         inComment = null;
       } else if (inComment === "multi" && char === "*" && nextChar === "/") {
         inComment = null;
-        value += this.next()[0];
+        value += this.code[this.i];
+        this.i++;
       } else if (inString) {
         if (char === inString && backslashCount % 2 === 0) {
           inString = null;
@@ -927,10 +894,12 @@ ${_Tokenizer.EofId}`;
       } else {
         if (char === "/" && nextChar === "/") {
           inComment = "single";
-          value += this.next()[0];
+          value += this.code[this.i];
+          this.i++;
         } else if (char === "/" && nextChar === "*") {
           inComment = "multi";
-          value += this.next()[0];
+          value += this.code[this.i];
+          this.i++;
         } else if (char === "'" || char === '"' || char === "`") {
           inString = char;
         } else if (char === "{") {
@@ -943,19 +912,20 @@ ${_Tokenizer.EofId}`;
         this.setToken(TokenType.InsertionExp, value.slice(1));
         return;
       }
-      value += this.next()[0];
+      value += this.code[this.i];
+      this.i++;
     }
   }
   newLine() {
     let value = "\n";
     let nextC;
     while (1) {
-      nextC = this.after;
+      nextC = this.code[this.i + 1];
       if (nextC !== "\n") {
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     if (this.isFirstToken) {
       return;
@@ -967,7 +937,7 @@ ${_Tokenizer.EofId}`;
     let nextC;
     let isEmptyLine = false;
     while (1) {
-      const nextChar = this.char;
+      const nextChar = this.code[this.i];
       switch (nextChar) {
         case "	":
           nextC = this.Tab;
@@ -990,7 +960,7 @@ ${_Tokenizer.EofId}`;
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     return {
       value,
@@ -1013,7 +983,7 @@ ${_Tokenizer.EofId}`;
     const prevLen = this.dentStack[this.dentStack.length - 1];
     if (currLen > prevLen) {
       this.dentStack.push(currLen);
-      this.setToken(TokenType.Indent, String(currLen));
+      this.setToken(TokenType.Indent, currLen);
       return indentHasLen;
     }
     if (currLen < prevLen) {
@@ -1072,12 +1042,12 @@ ${_Tokenizer.EofId}`;
     let value = char;
     let nextC;
     while (1) {
-      nextC = this.after;
-      if (!this.testId(nextC)) {
+      nextC = this.code[this.i + 1];
+      if (typeof nextC !== "string" || !bobeShared.matchIdStart(nextC)) {
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     if (value === _Tokenizer.EofId && this.isSubToken) {
       this.setToken(TokenType.Dedent, "");
@@ -1087,35 +1057,35 @@ ${_Tokenizer.EofId}`;
     this.setToken(TokenType.Identifier, realValue);
   }
   str(char) {
-    let value = '"';
+    let value = "";
     let nextC;
     let continuousBackslashCount = 0;
     while (1) {
-      nextC = this.after;
-      value += nextC;
+      nextC = this.code[this.i + 1];
       const memoCount = continuousBackslashCount;
       if (nextC === "\\") {
         continuousBackslashCount++;
       } else {
         continuousBackslashCount = 0;
       }
-      this.next();
+      this.i++;
       if (nextC === char && memoCount % 2 === 0) {
         break;
       }
+      value += nextC;
     }
-    this.setToken(TokenType.Identifier, JSON.parse(value.slice(0, -1) + '"'));
+    this.setToken(TokenType.Identifier, value);
   }
   number(char) {
     let value = char;
     let nextC;
     while (1) {
-      nextC = this.after;
+      nextC = this.code[this.i + 1];
       if (!bobeShared.isNum(nextC)) {
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     this.setToken(TokenType.Identifier, Number(value));
   }
@@ -1135,8 +1105,6 @@ ${_Tokenizer.EofId}`;
     }
   }
 };
-/** 匹配标识符 */
-_Tokenizer.IdExp = /[\d\w\/]/;
 /** Eof 标识符的值 */
 _Tokenizer.EofId = `__EOF__${Date.now()}`;
 _Tokenizer.DedentId = `__DEDENT__${Date.now()}`;