bobe 0.0.36 → 0.0.37

package/dist/index.d.ts

@@ -174,7 +174,22 @@ 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,
+    ELSE_WITHOUT_IF = 9008,
+    EMPTY_IF_BODY = 9009,
+    EMPTY_FOR_BODY = 9010,
+    MISSING_FOR_COLLECTION = 9011,
+    MISSING_FOR_SEMICOLON = 9012,
+    MISSING_FOR_ITEM = 9013,
+    PIPE_IN_WRONG_CONTEXT = 9014
+}
 type ParseError = {
     code: ParseErrorCode;
     message: string;
@@ -310,6 +325,7 @@ declare class Tokenizer {
     private brace;
     private newLine;
     private getDentValue;
+    emptyLoc(): SourceLocation;
     private dent;
     private shorterThanBaseDentEof;
     private identifier;
@@ -413,7 +429,6 @@ declare class Compiler {
     errors: ParseError[];
     constructor(tokenizer: Tokenizer, hooks?: ParseHooks);
     private addError;
-    private emptyLoc;
     /**
      * 编译程序入口，生成AST
      */
@@ -476,5 +491,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

@@ -44,6 +44,23 @@
     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["ELSE_WITHOUT_IF"] = 9008] = "ELSE_WITHOUT_IF";
+    ParseErrorCode[ParseErrorCode["EMPTY_IF_BODY"] = 9009] = "EMPTY_IF_BODY";
+    ParseErrorCode[ParseErrorCode["EMPTY_FOR_BODY"] = 9010] = "EMPTY_FOR_BODY";
+    ParseErrorCode[ParseErrorCode["MISSING_FOR_COLLECTION"] = 9011] = "MISSING_FOR_COLLECTION";
+    ParseErrorCode[ParseErrorCode["MISSING_FOR_SEMICOLON"] = 9012] = "MISSING_FOR_SEMICOLON";
+    ParseErrorCode[ParseErrorCode["MISSING_FOR_ITEM"] = 9013] = "MISSING_FOR_ITEM";
+    ParseErrorCode[ParseErrorCode["PIPE_IN_WRONG_CONTEXT"] = 9014] = "PIPE_IN_WRONG_CONTEXT";
+    return ParseErrorCode;
+  }({});
   class ParseSyntaxError extends SyntaxError {
     constructor(code, message, loc) {
       super(message);
@@ -161,7 +178,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 +369,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 +398,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 +487,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 +525,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;
@@ -574,7 +603,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 === '\\') {
@@ -895,18 +924,6 @@
         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 +937,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 +978,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 +986,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 +1020,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());
         while (!(this.tokenizer.token.type & TokenType.NewLine) && !this.tokenizer.isEof()) {
           this.tokenizer.nextToken();
         }
@@ -1035,15 +1051,15 @@
       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();
       if (!collection.value && collection.value !== 0) {
-        this.addError('MISSING_FOR_COLLECTION', '"for" 缺少集合表达式', forLoc);
+        this.addError(ParseErrorCode.MISSING_FOR_COLLECTION, '"for" 缺少集合表达式', forLoc);
       }
       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());
       }
       const itemToken = this.tokenizer.nextToken();
       const isDestruct = itemToken.type === TokenType.InsertionExp;
@@ -1052,7 +1068,7 @@
       }
       const item = this.parsePropertyValue();
       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());
       }
       let char = this.tokenizer.peekChar(),
         key,
@@ -1117,7 +1133,7 @@
         node.value = this.parsePropertyValue();
         this.tokenizer.nextToken();
       } else {
-        this.addError('MISSING_ASSIGN', `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.emptyLoc());
+        this.addError(ParseErrorCode.MISSING_ASSIGN, `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.tokenizer.emptyLoc());
       }
       node.loc.start = node.key.loc.start;
       node.loc.end = node.value ? node.value.loc.end : node.key.loc.end;