bobe 0.0.73 → 0.0.75

package/dist/index.d.ts

@@ -70,9 +70,11 @@ declare class Interpreter {
     private createComponentData;
     componentOrFragmentDeclaration(ComponentOrRender: UI | typeof Store | InlineFragment, ctx: ProgramCtx): ComponentNode$1;
     getFn(data: any, expression: string | number): any;
+    getBoolFn(data: any, expression: string | number): any;
     getAssignFn(data: any, expression: string | number): any;
     condDeclaration(ctx: ProgramCtx): IfNode;
     removeLogicNode(node: LogicNode): void;
+    private skipComponentTypeArguments;
     /**
      * 首行属性 + 可选的 pipe 扩展行
      * <headerLineAndExtensions> ::= <attributeList> NEWLINE (PIPE <attributeList> NEWLINE)*
@@ -178,7 +180,8 @@ declare enum TokenType {
     Boolean = 4096,
     Null = 8192,
     Undefined = 16384,
-    Comment = 32768
+    Comment = 32768,
+    TypeArguments = 65536
 }
 declare enum FakeType {
     If = 1,
@@ -209,6 +212,10 @@ type Token = {
     typeName: string;
     value: BaseType;
     loc: SourceLocation;
+    typeArguments?: {
+        raw: string;
+        loc: SourceLocation;
+    }[];
 };
 type HookProps = {
     /** 通过哪个 HookId 进入的 */
@@ -247,7 +254,8 @@ declare enum ParseErrorCode {
     MISSING_FOR_ITEM = 9014,
     MISSING_COMMENT_SECOND_SLASH = 9015,
     MISSING_PROP_ASSIGNMENT = 9016,
-    PIPE_IN_WRONG_CONTEXT = 9017
+    PIPE_IN_WRONG_CONTEXT = 9017,
+    UNCLOSED_TYPE_ARGUMENTS = 9018
 }
 type ParseError = {
     code: ParseErrorCode;
@@ -434,6 +442,7 @@ declare class Tokenizer {
      * @returns {boolean} 是否含有 key
      */
     jsExp(): Token;
+    private typeArguments;
     peekChar(): string;
     peekCharIsEol(): boolean;
     charIsEol(char: string): char is "/" | "\n";
@@ -538,9 +547,15 @@ interface LoopNode extends BaseNode {
     key?: PropertyValue;
     children: TemplateNode[];
 }
+interface TypeArgumentNode extends BaseNode {
+    type: NodeType.StaticValue;
+    raw: string;
+}
 interface ComponentNode extends BaseNode {
     type: NodeType.Component;
     componentName: PropertyValue;
+    typeArguments?: TypeArgumentNode[];
+    typeArgumentsLoc?: SourceLocation;
     props: Property[];
     children?: TemplateNode[];
 }
@@ -618,6 +633,7 @@ type ParseHooks = Partial<{
     [K in keyof ParseProps]: {
         enter?: (this: Compiler, ...args: Parameters<ParseProps[K]>) => void;
         leave?: (this: Compiler, ...args: Parameters<ParseProps[K]>) => void;
+        nameAdded?: (this: Compiler, ...args: Parameters<ParseProps[K]>) => void;
         propsAdded?: (this: Compiler, ...args: Parameters<ParseProps[K]>) => void;
     };
 }>;
@@ -631,4 +647,4 @@ declare const context: IContext;
 declare const effect: (callback: (...args: ValueDiff[]) => void, depOrOpt?: Dep[] | Dep | CustomEffectOpt, opt?: CustomEffectOpt) => aoye.Effect;
 
 export { Compiler, FakeType, Interpreter, 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 };
+export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, IContext, InterpolationNode, LogicNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode, TypeArgumentNode, UI };

package/dist/index.umd.js

@@ -21,6 +21,7 @@
     TokenType[TokenType["Null"] = 8192] = "Null";
     TokenType[TokenType["Undefined"] = 16384] = "Undefined";
     TokenType[TokenType["Comment"] = 32768] = "Comment";
+    TokenType[TokenType["TypeArguments"] = 65536] = "TypeArguments";
     return TokenType;
   }({});
   const ChildrenSugarType = TokenType.String | TokenType.InsertionExp;
@@ -76,6 +77,7 @@
     ParseErrorCode[ParseErrorCode["MISSING_COMMENT_SECOND_SLASH"] = 9015] = "MISSING_COMMENT_SECOND_SLASH";
     ParseErrorCode[ParseErrorCode["MISSING_PROP_ASSIGNMENT"] = 9016] = "MISSING_PROP_ASSIGNMENT";
     ParseErrorCode[ParseErrorCode["PIPE_IN_WRONG_CONTEXT"] = 9017] = "PIPE_IN_WRONG_CONTEXT";
+    ParseErrorCode[ParseErrorCode["UNCLOSED_TYPE_ARGUMENTS"] = 9018] = "UNCLOSED_TYPE_ARGUMENTS";
     return ParseErrorCode;
   }({});
   class ParseSyntaxError extends SyntaxError {
@@ -249,12 +251,13 @@
       if (!this.token) return false;
       return this.token.type & TokenType.Identifier && this.token.value === Tokenizer.EofId;
     }
-    setToken(type, value, dt = 1) {
+    setToken(type, value, dt = 1, extra) {
       this.token = {
         type,
         typeName: TokenType[type],
         value,
-        loc: null
+        loc: null,
+        ...extra
       };
       this.isFirstToken = false;
     }
@@ -308,6 +311,9 @@
                     const braceToken = this.brace();
                     this.setToken(TokenType.InsertionExp, braceToken);
                     break;
+                  case '<':
+                    this.typeArguments();
+                    break;
                   case '$':
                     const handled = this.staticIns();
                     if (handled) break;
@@ -396,6 +402,104 @@
       this.locEnd();
       return this.token;
     }
+    typeArguments() {
+      const startOffset = this.i;
+      const startLine = this.line;
+      const startColumn = this.column;
+      let angleDepth = 0;
+      let braceDepth = 0;
+      let bracketDepth = 0;
+      let parenDepth = 0;
+      let current = '';
+      const args = [];
+      let argStart = this.i + 1;
+      const makeLoc = (start, end) => ({
+        start: {
+          offset: start,
+          line: startLine,
+          column: startColumn + (start - startOffset)
+        },
+        end: {
+          offset: end,
+          line: startLine,
+          column: startColumn + (end - startOffset)
+        },
+        source: this.code.slice(start, end)
+      });
+      const pushArg = end => {
+        const raw = current.trim();
+        if (!raw) return;
+        const leading = current.length - current.trimStart().length;
+        const trailingEnd = current.trimEnd().length;
+        args.push({
+          raw,
+          loc: makeLoc(argStart + leading, argStart + trailingEnd)
+        });
+      };
+      while (true) {
+        const char = this.code[this.i];
+        if (char === undefined || char === '\n') {
+          throw new ParseSyntaxError(ParseErrorCode.UNCLOSED_TYPE_ARGUMENTS, '未闭合的组件泛型参数', makeLoc(startOffset, this.i));
+        }
+        if (char === '\'' || char === '"' || char === '`') {
+          const quote = char;
+          current += char;
+          this.next();
+          while (true) {
+            const inner = this.code[this.i];
+            if (inner === undefined || inner === '\n') {
+              throw new ParseSyntaxError(ParseErrorCode.UNCLOSED_TYPE_ARGUMENTS, '未闭合的组件泛型参数', makeLoc(startOffset, this.i));
+            }
+            current += inner;
+            if (inner === '\\') {
+              this.next();
+              current += this.code[this.i] ?? '';
+            } else if (inner === quote) {
+              break;
+            }
+            this.next();
+          }
+        } else if (char === '<') {
+          angleDepth++;
+          if (angleDepth > 1) current += char;
+        } else if (char === '>' && this.code[this.i - 1] !== '=') {
+          angleDepth--;
+          if (angleDepth === 0) {
+            pushArg(this.i);
+            this.setToken(TokenType.TypeArguments, this.code.slice(startOffset + 1, this.i), 1, {
+              typeArguments: args
+            });
+            return;
+          }
+          current += char;
+        } else if (char === '{') {
+          braceDepth++;
+          current += char;
+        } else if (char === '}') {
+          braceDepth = Math.max(0, braceDepth - 1);
+          current += char;
+        } else if (char === '[') {
+          bracketDepth++;
+          current += char;
+        } else if (char === ']') {
+          bracketDepth = Math.max(0, bracketDepth - 1);
+          current += char;
+        } else if (char === '(') {
+          parenDepth++;
+          current += char;
+        } else if (char === ')') {
+          parenDepth = Math.max(0, parenDepth - 1);
+          current += char;
+        } else if (char === ',' && angleDepth === 1 && braceDepth === 0 && bracketDepth === 0 && parenDepth === 0) {
+          pushArg(this.i);
+          current = '';
+          argStart = this.i + 1;
+        } else {
+          current += char;
+        }
+        this.next();
+      }
+    }
     peekChar() {
       let i = this.i;
       while (this.code[i] === ' ' || this.code[i] === '\t') {
@@ -1107,8 +1211,19 @@
     parseComponentNode(node) {
       const name = this.parseName();
       this.tokenizer.nextToken();
+      const typeArgumentsToken = this.tokenizer.token.type & TokenType.TypeArguments ? this.tokenizer.token : undefined;
+      if (typeArgumentsToken) {
+        this.tokenizer.nextToken();
+      }
       node.type = NodeType.Component;
       node.componentName = name;
+      node.typeArguments = typeArgumentsToken?.typeArguments?.map(arg => ({
+        type: NodeType.StaticValue,
+        raw: arg.raw,
+        loc: arg.loc
+      }));
+      node.typeArgumentsLoc = typeArgumentsToken?.loc;
+      this.hooks.parseComponentNode?.nameAdded?.call(this, node);
       const props = this.headerLineAndExtensions();
       node.props = props;
       this.hooks.parseComponentNode?.propsAdded?.call(this, node);
@@ -1696,6 +1811,7 @@
         _node = this.createNode(value);
       }
       this.tokenizer.nextToken();
+      this.skipComponentTypeArguments(_node);
       this.headerLineAndExtensions(_node);
       this.onePropParsed = this.oneRealPropParsed;
       if (_node.__logicType & TokenizerSwitcherBit) {
@@ -1749,6 +1865,7 @@
             }, NodeSort.CtxProvider);
           }
           this.tokenizer.nextToken();
+          this.skipComponentTypeArguments(node);
           this.headerLineAndExtensions(node);
           if (isUpdate) {
             this.ctx.stack.pop();
@@ -1778,6 +1895,7 @@
               this.handleInsert(node.realParent, textNode, node.realBefore);
             } else {
               this.tokenizer.nextToken();
+              this.skipComponentTypeArguments(node, true);
               this.headerLineAndExtensions(node);
               const _this$ctx2 = this.ctx,
                 realParent = _this$ctx2.realParent,
@@ -2383,6 +2501,11 @@
     getFn(data, expression) {
       return new Function('data', `with(data){return (${expression})}`).bind(undefined, safe(data));
     }
+    getBoolFn(data, expression) {
+      return new Function('data', `with(data){return Boolean(${expression})}`).bind(undefined, safeExclude(data, {
+        'Boolean': true
+      }));
+    }
     getAssignFn(data, expression) {
       const valueId = `value_bobe_${bobeShared.date32()}`;
       return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, safeExclude(data, {
@@ -2420,11 +2543,9 @@
       switch (keyWord.value) {
         case 'if':
           if (valueIsMapKey) {
-            aoye.runWithPulling(() => data[value], null);
-            const cells = data[aoye.Keys.Meta].cells;
-            signal = cells.get(value);
+            signal = new aoye.Computed(() => Boolean(data[value]));
           } else {
-            const fn = this.getFn(data, value);
+            const fn = this.getBoolFn(data, value);
             signal = new aoye.Computed(fn);
           }
           break;
@@ -2444,7 +2565,7 @@
               return true;
             });
           } else {
-            const fn = valueIsMapKey ? null : this.getFn(data, value);
+            const fn = valueIsMapKey ? null : this.getBoolFn(data, value);
             signal = new aoye.Computed(() => {
               let point = ifNode.preCond;
               while (point) {
@@ -2456,7 +2577,7 @@
                 }
                 point = point.preCond;
               }
-              return valueIsMapKey ? data[value] : fn();
+              return valueIsMapKey ? Boolean(data[value]) : fn();
             });
           }
           break;
@@ -2513,6 +2634,11 @@
         point = next;
       }
     }
+    skipComponentTypeArguments(node, force = false) {
+      if ((force || node.__logicType & TokenizerSwitcherBit) && this.tokenizer.token.type & TokenType.TypeArguments) {
+        this.tokenizer.nextToken();
+      }
+    }
     headerLineAndExtensions(_node) {
       const tokenizer = this.tokenizer;
       do {
@@ -2872,6 +2998,7 @@
   exports.Mw = Mw;
   exports.MwCtx = MwCtx;
   exports.NodeType = NodeType;
+  exports.ParseErrorCode = ParseErrorCode;
   exports.ParseSyntaxError = ParseSyntaxError;
   exports.Tokenizer = Tokenizer;
   exports.bobe = bobe;