bobe 0.0.16 → 0.0.17

package/dist/bobe.esm.js

@@ -1,6 +1,6 @@
 import { getPulling, setPulling, Store, Keys, effect, shareSignal, $, runWithPulling } from 'aoye';
 export * from 'aoye';
-import { BaseEvent, Queue, isNum } from 'bobe-shared';
+import { BaseEvent, Queue, isNum, matchIdStart } from 'bobe-shared';
 
 var TokenType = /* @__PURE__ */ ((TokenType2) => {
   TokenType2[TokenType2["NewLine"] = 1] = "NewLine";
@@ -108,30 +108,34 @@ class MultiTypeStack {
     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];
-    }
-  }
+  // /**
+  //  * 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 BaseEvent();
@@ -146,7 +150,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(
@@ -169,7 +173,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(
           {
@@ -198,7 +202,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);
@@ -303,7 +307,7 @@ class Interpreter {
     } else {
       _node = this.createNode(value);
     }
-    this.tokenizer.consume();
+    this.tokenizer.nextToken();
     this.headerLine(_node);
     this.extensionLines(_node);
     if (_node.__logicType === FakeType.Component) {
@@ -392,7 +396,8 @@ class Interpreter {
     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";
@@ -473,9 +478,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);
@@ -510,15 +515,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();
     }
   }
   /**
@@ -528,7 +533,7 @@ class Interpreter {
    */
   headerLine(_node) {
     this.attributeList(_node);
-    this.tokenizer.consume();
+    this.tokenizer.nextToken();
   }
   /**
    * 属性列表：
@@ -538,19 +543,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[Keys.Raw], value);
+        const rawVal = data[Keys.Raw][value];
         const isFn = typeof rawVal === "function";
         if (hookType === "dynamic") {
           const valueIsMapKey = Reflect.has(data[Keys.Raw], value);
@@ -564,7 +569,7 @@ class Interpreter {
         key = null;
         eq = null;
       }
-      this.tokenizer.consume();
+      this.tokenizer.nextToken();
     }
   }
   config(opt) {
@@ -724,16 +729,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;
@@ -786,21 +791,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,
@@ -809,10 +799,6 @@ ${_Tokenizer.EofId}`;
     };
     this.isFirstToken = false;
   }
-  testId(value) {
-    if (typeof value !== "string") return false;
-    return _Tokenizer.IdExp.test(value);
-  }
   nextToken() {
     try {
       if (this.isEof()) {
@@ -828,7 +814,7 @@ ${_Tokenizer.EofId}`;
         if (this.needIndent) {
           this.dent();
         } else {
-          let { char } = this;
+          const char = this.code[this.i];
           switch (char) {
             case "	":
             case " ":
@@ -859,12 +845,12 @@ ${_Tokenizer.EofId}`;
                 this.number(char);
                 break;
               }
-              if (this.testId(char)) {
+              if (typeof char === "string" && matchIdStart(char)) {
                 this.identifier(char);
               }
               break;
           }
-          this.next();
+          this.i++;
         }
         if (this.token) {
           break;
@@ -873,6 +859,7 @@ ${_Tokenizer.EofId}`;
       return this.token;
     } catch (error) {
       console.error(error);
+      return this.token;
     } finally {
       this.handledTokens.push(this.token);
     }
@@ -884,17 +871,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++;
       }
@@ -911,13 +898,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;
@@ -926,10 +914,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 === "{") {
@@ -942,19 +932,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;
@@ -966,7 +957,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;
@@ -989,7 +980,7 @@ ${_Tokenizer.EofId}`;
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     return {
       value,
@@ -1012,7 +1003,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) {
@@ -1071,12 +1062,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" || !matchIdStart(nextC)) {
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     if (value === _Tokenizer.EofId && this.isSubToken) {
       this.setToken(TokenType.Dedent, "");
@@ -1086,35 +1077,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 (!isNum(nextC)) {
         break;
       }
       value += nextC;
-      this.next();
+      this.i++;
     }
     this.setToken(TokenType.Identifier, Number(value));
   }
@@ -1134,8 +1125,6 @@ ${_Tokenizer.EofId}`;
     }
   }
 };
-/** 匹配标识符 */
-_Tokenizer.IdExp = /[\d\w\/]/;
 /** Eof 标识符的值 */
 _Tokenizer.EofId = `__EOF__${Date.now()}`;
 _Tokenizer.DedentId = `__DEDENT__${Date.now()}`;