bobe 0.0.36 → 0.0.38

package/dist/index.d.ts

@@ -133,7 +133,12 @@ declare enum TokenType {
     InsertionExp = 128,
     Semicolon = 256,
     /** 仅编译时可解析 */
-    StaticInsExp = 512
+    StaticInsExp = 512,
+    String = 1024,
+    Number = 2048,
+    Boolean = 4096,
+    Null = 8192,
+    Undefined = 16384
 }
 declare enum FakeType {
     If = 1,
@@ -174,7 +179,24 @@ type TerpConf = Partial<Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfte
 type CustomRenderConf = Pick<TerpConf, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>;
 type Hook = (props: HookProps) => any;
 type HookType = 'dynamic' | 'static';
-type ParseErrorCode = 'UNCLOSED_BRACE' | 'UNCLOSED_STRING' | 'UNCLOSED_STATIC_INS' | 'INCONSISTENT_INDENT' | 'INDENT_MISMATCH' | 'MISSING_ASSIGN' | 'INVALID_TAG_NAME' | 'ELSE_WITHOUT_IF' | 'EMPTY_IF_BODY' | 'EMPTY_FOR_BODY' | 'MISSING_FOR_COLLECTION' | 'MISSING_FOR_SEMICOLON' | 'MISSING_FOR_ITEM' | 'PIPE_IN_WRONG_CONTEXT';
+declare enum ParseErrorCode {
+    UNCLOSED_BRACE = 9001,
+    UNCLOSED_STRING = 9002,
+    UNCLOSED_STATIC_INS = 9003,
+    INCONSISTENT_INDENT = 9004,
+    INDENT_MISMATCH = 9005,
+    MISSING_ASSIGN = 9006,
+    INVALID_TAG_NAME = 9007,
+    INVALID_PROP_KEY = 9008,
+    ELSE_WITHOUT_IF = 9009,
+    EMPTY_IF_BODY = 9010,
+    EMPTY_FOR_BODY = 9011,
+    MISSING_FOR_COLLECTION = 9012,
+    MISSING_FOR_SEMICOLON = 9013,
+    MISSING_FOR_ITEM = 9014,
+    MISSING_PROP_ASSIGNMENT = 9015,
+    PIPE_IN_WRONG_CONTEXT = 9016
+}
 type ParseError = {
     code: ParseErrorCode;
     message: string;
@@ -310,6 +332,7 @@ declare class Tokenizer {
     private brace;
     private newLine;
     private getDentValue;
+    emptyLoc(): SourceLocation;
     private dent;
     private shorterThanBaseDentEof;
     private identifier;
@@ -344,6 +367,7 @@ type ASTNodeType = NodeType;
 interface BaseNode {
     type: ASTNodeType;
     loc?: SourceLocation;
+    hasError?: boolean;
 }
 interface Program extends BaseNode {
     type: NodeType.Program;
@@ -413,7 +437,6 @@ declare class Compiler {
     errors: ParseError[];
     constructor(tokenizer: Tokenizer, hooks?: ParseHooks);
     private addError;
-    private emptyLoc;
     /**
      * 编译程序入口，生成AST
      */
@@ -452,6 +475,10 @@ declare class Compiler {
      * 根据值类型创建属性 key 节点
      */
     parsePropertyKey(node?: PropertyKeyNode): PropertyKeyNode;
+    /**
+     * 根据值类型创建属性值节点
+     */
+    parseJsExp(node?: PropertyValue): PropertyValue;
     /**
      * 根据值类型创建属性值节点
      */
@@ -476,5 +503,5 @@ type ParseHooks = Partial<{
 declare function bobe(fragments: TemplateStringsArray, ...values: any[]): BobeUI;
 declare function customRender(option: CustomRenderConf): <T>(Ctor: typeof Store, root: any) => (ComponentNode$1 | Store)[];
 
-export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, customRender };
-export type { ASTNodeType, BaseNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, ParseError, ParseErrorCode, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };
+export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, customRender };
+export type { ASTNodeType, BaseNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };

package/dist/index.umd.js

@@ -15,8 +15,15 @@
     TokenType[TokenType["InsertionExp"] = 128] = "InsertionExp";
     TokenType[TokenType["Semicolon"] = 256] = "Semicolon";
     TokenType[TokenType["StaticInsExp"] = 512] = "StaticInsExp";
+    TokenType[TokenType["String"] = 1024] = "String";
+    TokenType[TokenType["Number"] = 2048] = "Number";
+    TokenType[TokenType["Boolean"] = 4096] = "Boolean";
+    TokenType[TokenType["Null"] = 8192] = "Null";
+    TokenType[TokenType["Undefined"] = 16384] = "Undefined";
     return TokenType;
   }({});
+  const BaseTokenType = TokenType.String | TokenType.Number | TokenType.Boolean | TokenType.Null | TokenType.Undefined;
+  const ValueTokenType = BaseTokenType | TokenType.InsertionExp | TokenType.StaticInsExp;
   let FakeType = function (FakeType) {
     FakeType[FakeType["If"] = 1] = "If";
     FakeType[FakeType["Fail"] = 2] = "Fail";
@@ -44,6 +51,25 @@
     TerpEvt["HandledComponentNode"] = "handled-component-node";
     return TerpEvt;
   })({});
+  let ParseErrorCode = function (ParseErrorCode) {
+    ParseErrorCode[ParseErrorCode["UNCLOSED_BRACE"] = 9001] = "UNCLOSED_BRACE";
+    ParseErrorCode[ParseErrorCode["UNCLOSED_STRING"] = 9002] = "UNCLOSED_STRING";
+    ParseErrorCode[ParseErrorCode["UNCLOSED_STATIC_INS"] = 9003] = "UNCLOSED_STATIC_INS";
+    ParseErrorCode[ParseErrorCode["INCONSISTENT_INDENT"] = 9004] = "INCONSISTENT_INDENT";
+    ParseErrorCode[ParseErrorCode["INDENT_MISMATCH"] = 9005] = "INDENT_MISMATCH";
+    ParseErrorCode[ParseErrorCode["MISSING_ASSIGN"] = 9006] = "MISSING_ASSIGN";
+    ParseErrorCode[ParseErrorCode["INVALID_TAG_NAME"] = 9007] = "INVALID_TAG_NAME";
+    ParseErrorCode[ParseErrorCode["INVALID_PROP_KEY"] = 9008] = "INVALID_PROP_KEY";
+    ParseErrorCode[ParseErrorCode["ELSE_WITHOUT_IF"] = 9009] = "ELSE_WITHOUT_IF";
+    ParseErrorCode[ParseErrorCode["EMPTY_IF_BODY"] = 9010] = "EMPTY_IF_BODY";
+    ParseErrorCode[ParseErrorCode["EMPTY_FOR_BODY"] = 9011] = "EMPTY_FOR_BODY";
+    ParseErrorCode[ParseErrorCode["MISSING_FOR_COLLECTION"] = 9012] = "MISSING_FOR_COLLECTION";
+    ParseErrorCode[ParseErrorCode["MISSING_FOR_SEMICOLON"] = 9013] = "MISSING_FOR_SEMICOLON";
+    ParseErrorCode[ParseErrorCode["MISSING_FOR_ITEM"] = 9014] = "MISSING_FOR_ITEM";
+    ParseErrorCode[ParseErrorCode["MISSING_PROP_ASSIGNMENT"] = 9015] = "MISSING_PROP_ASSIGNMENT";
+    ParseErrorCode[ParseErrorCode["PIPE_IN_WRONG_CONTEXT"] = 9016] = "PIPE_IN_WRONG_CONTEXT";
+    return ParseErrorCode;
+  }({});
   class ParseSyntaxError extends SyntaxError {
     constructor(code, message, loc) {
       super(message);
@@ -161,7 +187,7 @@
             const expLen = this.dentStack[i];
             if (currLen === expLen) break;
             if (currLen > expLen) {
-              throw SyntaxError(`缩进错误，缩进长度不匹配`);
+              throw new ParseSyntaxError(ParseErrorCode.INCONSISTENT_INDENT, '缩进大小不统一', this.emptyLoc());
             }
             if (this.shorterThanBaseDentEof()) {
               break;
@@ -352,7 +378,7 @@
       while (1) {
         nextC = this.code[this.i + 1];
         if (nextC === undefined) {
-          this.throwUnclosed('UNCLOSED_STATIC_INS', '未闭合的 "${...}"', startOffset, startLine, startCol);
+          this.throwUnclosed(ParseErrorCode.UNCLOSED_STATIC_INS, '未闭合的 "${...}"', startOffset, startLine, startCol);
         }
         value += nextC;
         this.next();
@@ -381,7 +407,7 @@
       while (1) {
         const char = this.code[this.i];
         if (char === undefined) {
-          this.throwUnclosed('UNCLOSED_BRACE', '未闭合的 "{"', startOffset, startLine, startCol);
+          this.throwUnclosed(ParseErrorCode.UNCLOSED_BRACE, '未闭合的 "{"', startOffset, startLine, startCol);
         }
         const nextChar = this.code[this.i + 1];
         if (inComment === 'single' && char === '\n') {
@@ -470,6 +496,18 @@
         isEmptyLine
       };
     }
+    emptyLoc() {
+      const pos = this.getCurrentPos();
+      return {
+        start: pos,
+        end: {
+          offset: pos.offset + 1,
+          line: pos.line,
+          column: pos.column + 1
+        },
+        source: ' '
+      };
+    }
     dent() {
       const _this$getDentValue2 = this.getDentValue(),
         value = _this$getDentValue2.value,
@@ -496,7 +534,7 @@
           const expLen = this.dentStack[i];
           if (currLen === expLen) break;
           if (currLen > expLen) {
-            throw SyntaxError('缩进大小不统一');
+            throw new ParseSyntaxError(ParseErrorCode.INCONSISTENT_INDENT, '缩进大小不统一', this.emptyLoc());
           }
           if (this.shorterThanBaseDentEof()) {
             return;
@@ -561,8 +599,30 @@
         this.setToken(TokenType.Dedent, '');
         return;
       }
-      let realValue = value === 'null' ? null : value === 'undefined' ? undefined : value === 'false' ? false : value === 'true' ? true : value;
-      this.setToken(TokenType.Identifier, realValue);
+      let realValue, tokenType;
+      switch (value) {
+        case 'null':
+          realValue = null;
+          tokenType = TokenType.Null;
+          break;
+        case 'undefined':
+          realValue = undefined;
+          tokenType = TokenType.Undefined;
+          break;
+        case 'false':
+          realValue = false;
+          tokenType = TokenType.Boolean;
+          break;
+        case 'true':
+          realValue = true;
+          tokenType = TokenType.Boolean;
+          break;
+        default:
+          realValue = value;
+          tokenType = TokenType.Identifier;
+          break;
+      }
+      this.setToken(tokenType, realValue);
     }
     str(char) {
       const startOffset = this.preI,
@@ -574,7 +634,7 @@
       while (1) {
         nextC = this.code[this.i + 1];
         if (nextC === undefined) {
-          this.throwUnclosed('UNCLOSED_STRING', '未闭合的字符串字面量', startOffset, startLine, startCol);
+          this.throwUnclosed(ParseErrorCode.UNCLOSED_STRING, '未闭合的字符串字面量', startOffset, startLine, startCol);
         }
         const memoCount = continuousBackslashCount;
         if (nextC === '\\') {
@@ -588,7 +648,7 @@
         }
         value += nextC;
       }
-      this.setToken(TokenType.Identifier, value);
+      this.setToken(TokenType.String, value);
     }
     number(char) {
       let value = char;
@@ -601,7 +661,7 @@
         value += nextC;
         this.next();
       }
-      this.setToken(TokenType.Identifier, Number(value));
+      this.setToken(TokenType.Number, Number(value));
     }
     eof() {
       this.setToken(TokenType.Eof, 'End Of File');
@@ -880,7 +940,7 @@
   let _initProto;
   class Compiler {
     static {
-      var _applyDecs$e = _slicedToArray(_applyDecs2311(this, [], [[NodeHook, 2, "parseProgram"], [[NodeHook, NodeLoc], 2, "parseComponentNode"], [[NodeHook, NodeLoc], 2, "parseElementNode"], [[NodeHook, NodeLoc], 2, "parseConditionalNode"], [[NodeHook, NodeLoc], 2, "parseLoopNode"], [NodeHook, 2, "parseProperty"], [[NodeHook, TokenLoc], 2, "parsePropertyKey"], [[NodeHook, TokenLoc], 2, "parsePropertyValue"], [[NodeHook, TokenLoc], 2, "parseName"]]).e, 1);
+      var _applyDecs$e = _slicedToArray(_applyDecs2311(this, [], [[NodeHook, 2, "parseProgram"], [[NodeHook, NodeLoc], 2, "parseComponentNode"], [[NodeHook, NodeLoc], 2, "parseElementNode"], [[NodeHook, NodeLoc], 2, "parseConditionalNode"], [[NodeHook, NodeLoc], 2, "parseLoopNode"], [NodeHook, 2, "parseProperty"], [[NodeHook, TokenLoc], 2, "parsePropertyKey"], [[NodeHook, TokenLoc], 2, "parseJsExp"], [[NodeHook, TokenLoc], 2, "parsePropertyValue"], [[NodeHook, TokenLoc], 2, "parseName"]]).e, 1);
       _initProto = _applyDecs$e[0];
     }
     errors = (_initProto(this), []);
@@ -888,25 +948,16 @@
       this.tokenizer = tokenizer;
       this.hooks = hooks;
     }
-    addError(code, message, loc) {
+    addError(code, message, loc, node) {
+      if (node) {
+        node.hasError = true;
+      }
       this.errors.push({
         code,
         message,
         loc
       });
     }
-    emptyLoc() {
-      const pos = this.tokenizer.getCurrentPos();
-      return {
-        start: pos,
-        end: {
-          offset: pos.offset + 1,
-          line: pos.line,
-          column: pos.column + 1
-        },
-        source: ' '
-      };
-    }
     parseProgram() {
       const body = [];
       try {
@@ -920,10 +971,8 @@
       } catch (error) {
         if (error instanceof ParseSyntaxError) {
           this.addError(error.code, error.message, error.loc);
-        } else if (error instanceof SyntaxError) {
-          const knownCodes = ['INCONSISTENT_INDENT', 'INDENT_MISMATCH'];
-          const code = knownCodes.includes(error.message) ? error.message : 'INCONSISTENT_INDENT';
-          this.addError(code, error.message, this.emptyLoc());
+        } else {
+          this.addError(error.toString(), '未知错误', this.tokenizer.emptyLoc());
         }
       }
       return {
@@ -963,7 +1012,7 @@
     templateNode(siblings) {
       const token = this.tokenizer.token;
       if (token.type & TokenType.Pipe) {
-        this.addError('PIPE_IN_WRONG_CONTEXT', '"|" 只能出现在元素属性扩展行中', token.loc ?? this.emptyLoc());
+        this.addError(ParseErrorCode.PIPE_IN_WRONG_CONTEXT, '"|" 只能出现在元素属性扩展行中', token.loc ?? this.tokenizer.emptyLoc());
         this.tokenizer.nextToken();
         return null;
       }
@@ -971,12 +1020,13 @@
         _this$tokenizer$_hook2 = _slicedToArray(_this$tokenizer$_hook, 2),
         hookType = _this$tokenizer$_hook2[0],
         value = _this$tokenizer$_hook2[1];
-      if (value === 'if' || value === 'else' || value === 'fail') {
-        if (value === 'else' || value === 'fail') {
+      const isElseOrFail = value === 'else' || value === 'fail';
+      if (value === 'if' || isElseOrFail) {
+        if (isElseOrFail) {
           const lastSibling = siblings[siblings.length - 1];
           const lastType = lastSibling?.type;
           if (lastType !== NodeType.If && lastType !== NodeType.Else && lastType !== NodeType.Fail) {
-            this.addError('ELSE_WITHOUT_IF', `"${value}" 前必须有 "if" 或 "else" 节点`, token.loc ?? this.emptyLoc());
+            this.addError(ParseErrorCode.ELSE_WITHOUT_IF, `"${value}" 前必须有 "if" 或 "else" 节点`, token.loc ?? this.tokenizer.emptyLoc());
           }
         }
         return this.parseConditionalNode();
@@ -1004,7 +1054,7 @@
     parseElementNode(node) {
       const tagToken = this.tokenizer.token;
       if (!(tagToken.type & TokenType.Identifier)) {
-        this.addError('INVALID_TAG_NAME', `无效的标签名，期望标识符但得到 "${tagToken.value}"`, tagToken.loc ?? this.emptyLoc());
+        this.addError(ParseErrorCode.INVALID_TAG_NAME, `无效的标签名，期望标识符但得到 "${tagToken.value}"`, tagToken.loc ?? this.tokenizer.emptyLoc(), node);
         while (!(this.tokenizer.token.type & TokenType.NewLine) && !this.tokenizer.isEof()) {
           this.tokenizer.nextToken();
         }
@@ -1024,7 +1074,7 @@
     parseConditionalNode(node) {
       const keyword = this.tokenizer.token.value;
       this.tokenizer.condExp();
-      const condition = this.parsePropertyValue();
+      const condition = this.parseJsExp();
       this.tokenizer.nextToken();
       this.tokenizer.nextToken();
       node.type = keyword === 'if' ? NodeType.If : keyword === 'else' ? NodeType.Else : NodeType.Fail;
@@ -1035,24 +1085,24 @@
       return node;
     }
     parseLoopNode(node) {
-      const forLoc = this.tokenizer.token.loc ?? this.emptyLoc();
+      const forLoc = this.tokenizer.token.loc ?? this.tokenizer.emptyLoc();
       this.tokenizer.nextToken();
-      const collection = this.parsePropertyValue();
+      const collection = this.parseJsExp();
       if (!collection.value && collection.value !== 0) {
-        this.addError('MISSING_FOR_COLLECTION', '"for" 缺少集合表达式', forLoc);
+        this.addError(ParseErrorCode.MISSING_FOR_COLLECTION, '"for" 缺少集合表达式', forLoc, node);
       }
       const semicolonToken = this.tokenizer.nextToken();
       if (!(semicolonToken.type & TokenType.Semicolon)) {
-        this.addError('MISSING_FOR_SEMICOLON', '"for" 语法：for <集合>; <item> [index][; key]，缺少第一个 ";"', semicolonToken.loc ?? this.emptyLoc());
+        this.addError(ParseErrorCode.MISSING_FOR_SEMICOLON, '"for" 语法：for <集合>; <item> [index][; key]，缺少第一个 ";"', semicolonToken.loc ?? this.tokenizer.emptyLoc(), node);
       }
       const itemToken = this.tokenizer.nextToken();
       const isDestruct = itemToken.type === TokenType.InsertionExp;
       if (isDestruct) {
         itemToken.value = '{' + itemToken.value + '}';
       }
-      const item = this.parsePropertyValue();
+      const item = this.parseJsExp();
       if (!item.value && item.value !== 0) {
-        this.addError('MISSING_FOR_ITEM', '"for" 缺少 item 变量名', itemToken.loc ?? this.emptyLoc());
+        this.addError(ParseErrorCode.MISSING_FOR_ITEM, '"for" 缺少 item 变量名', itemToken.loc ?? this.tokenizer.emptyLoc(), node);
       }
       let char = this.tokenizer.peekChar(),
         key,
@@ -1061,16 +1111,16 @@
         this.tokenizer.nextToken();
         if (this.tokenizer.peekChar() !== '\n') {
           this.tokenizer.jsExp();
-          key = this.parsePropertyValue();
+          key = this.parseJsExp();
         }
       } else if (char === '\n') ; else {
         this.tokenizer.nextToken();
-        index = this.parsePropertyValue();
+        index = this.parseJsExp();
         if (this.tokenizer.peekChar() === ';') {
           this.tokenizer.nextToken();
           if (this.tokenizer.peekChar() !== '\n') {
             this.tokenizer.jsExp();
-            key = this.parsePropertyValue();
+            key = this.parseJsExp();
           }
         }
       }
@@ -1104,23 +1154,41 @@
     attributeList() {
       const props = [];
       while (!(this.tokenizer.token.type & TokenType.NewLine) && !(this.tokenizer.token.type & TokenType.Pipe) && !this.tokenizer.isEof()) {
-        props.push(this.parseProperty());
+        const prop = this.parseProperty();
+        if (prop) {
+          props.push(prop);
+        }
       }
       return props;
     }
     parseProperty(node) {
       node.type = NodeType.Property;
-      node.key = this.parsePropertyKey();
-      const token = this.tokenizer.nextToken();
-      if (token.value === '=') {
-        this.tokenizer.nextToken();
-        node.value = this.parsePropertyValue();
+      if (this.tokenizer.token.type !== TokenType.Identifier) {
+        this.addError(ParseErrorCode.INVALID_PROP_KEY, `属性名 "${this.tokenizer.token.value}" 不合法`, this.tokenizer.token.loc ?? this.tokenizer.emptyLoc(), node);
         this.tokenizer.nextToken();
-      } else {
-        this.addError('MISSING_ASSIGN', `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.emptyLoc());
+        return null;
       }
+      node.key = this.parsePropertyKey();
+      const token = this.tokenizer.nextToken();
+      if (token.value !== '=') {
+        this.addError(ParseErrorCode.MISSING_ASSIGN, `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.tokenizer.emptyLoc(), node);
+        node.loc.start = node.key.loc.start;
+        node.loc.end = node.key.loc.end;
+        node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
+        return node;
+      }
+      const valueToken = this.tokenizer.nextToken();
+      if ((valueToken.type & ValueTokenType) === 0) {
+        this.addError(ParseErrorCode.MISSING_PROP_ASSIGNMENT, `属性值不合法, "${valueToken.value}" 不合法`, valueToken.loc ?? this.tokenizer.emptyLoc(), node);
+        node.loc.start = node.key.loc.start;
+        node.loc.end = node.key.loc.end;
+        node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
+        return node;
+      }
+      node.value = this.parsePropertyValue();
+      this.tokenizer.nextToken();
       node.loc.start = node.key.loc.start;
-      node.loc.end = node.value ? node.value.loc.end : node.key.loc.end;
+      node.loc.end = node.value.loc.end;
       node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
       return node;
     }
@@ -1129,7 +1197,7 @@
       node.key = this.tokenizer.token.value;
       return node;
     }
-    parsePropertyValue(node) {
+    parseJsExp(node) {
       const _this$tokenizer$_hook3 = this.tokenizer._hook({}),
         _this$tokenizer$_hook4 = _slicedToArray(_this$tokenizer$_hook3, 2),
         hookType = _this$tokenizer$_hook4[0],
@@ -1138,7 +1206,7 @@
       node.value = value;
       return node;
     }
-    parseName(node) {
+    parsePropertyValue(node) {
       const _this$tokenizer$_hook5 = this.tokenizer._hook({}),
         _this$tokenizer$_hook6 = _slicedToArray(_this$tokenizer$_hook5, 2),
         hookType = _this$tokenizer$_hook6[0],
@@ -1147,6 +1215,15 @@
       node.value = value;
       return node;
     }
+    parseName(node) {
+      const _this$tokenizer$_hook7 = this.tokenizer._hook({}),
+        _this$tokenizer$_hook8 = _slicedToArray(_this$tokenizer$_hook7, 2),
+        hookType = _this$tokenizer$_hook8[0],
+        value = _this$tokenizer$_hook8[1];
+      node.type = hookType === 'dynamic' ? NodeType.DynamicValue : NodeType.StaticValue;
+      node.value = value;
+      return node;
+    }
   }
   function NodeLoc(target, context) {
     return function (_node) {