bobe 0.0.35 → 0.0.37

package/dist/bobe.esm.js

@@ -42,6 +42,30 @@ let NodeSort = function (NodeSort) {
   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);
+    this.code = code;
+    this.loc = loc;
+  }
+}
 
 class Tokenizer {
   TabSize = 2;
@@ -80,6 +104,25 @@ class Tokenizer {
       column: this.column
     };
   }
+  unclosedLoc(startOffset, startLine, startCol) {
+    const end = this.code.length - 1;
+    return {
+      start: {
+        offset: startOffset,
+        line: startLine,
+        column: startCol
+      },
+      end: {
+        offset: end,
+        line: this.line,
+        column: this.column
+      },
+      source: this.code.slice(startOffset, end)
+    };
+  }
+  throwUnclosed(code, message, startOffset, startLine, startCol) {
+    throw new ParseSyntaxError(code, message, this.unclosedLoc(startOffset, startLine, startCol));
+  }
   resume(_snapshot) {
     this.token = undefined;
     this.needIndent = false;
@@ -133,7 +176,7 @@ class Tokenizer {
           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;
@@ -248,8 +291,7 @@ class Tokenizer {
       }
       return this.token;
     } catch (error) {
-      console.error(error);
-      return this.token;
+      throw error;
     } finally {
       this.handledTokens.push(this.token);
     }
@@ -312,6 +354,9 @@ class Tokenizer {
     this.setToken(TokenType.Pipe, '|');
   }
   staticIns() {
+    const startOffset = this.preI,
+      startLine = this.line,
+      startCol = this.preCol;
     let nextC = this.code[this.i + 1];
     if (nextC !== '{') {
       return false;
@@ -321,6 +366,9 @@ class Tokenizer {
     let innerBrace = 0;
     while (1) {
       nextC = this.code[this.i + 1];
+      if (nextC === undefined) {
+        this.throwUnclosed(ParseErrorCode.UNCLOSED_STATIC_INS, '未闭合的 "${...}"', startOffset, startLine, startCol);
+      }
       value += nextC;
       this.next();
       if (nextC === '{') {
@@ -337,6 +385,9 @@ class Tokenizer {
     return true;
   }
   brace() {
+    const startOffset = this.preI,
+      startLine = this.line,
+      startCol = this.preCol;
     let inComment,
       inString,
       count = 0,
@@ -344,6 +395,9 @@ class Tokenizer {
       backslashCount = 0;
     while (1) {
       const char = this.code[this.i];
+      if (char === undefined) {
+        this.throwUnclosed(ParseErrorCode.UNCLOSED_BRACE, '未闭合的 "{"', startOffset, startLine, startCol);
+      }
       const nextChar = this.code[this.i + 1];
       if (inComment === 'single' && char === '\n') {
         inComment = null;
@@ -431,6 +485,18 @@ class Tokenizer {
       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,
@@ -457,7 +523,7 @@ class Tokenizer {
         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;
@@ -526,11 +592,17 @@ class Tokenizer {
     this.setToken(TokenType.Identifier, realValue);
   }
   str(char) {
+    const startOffset = this.preI,
+      startLine = this.line,
+      startCol = this.preCol;
     let value = '';
     let nextC;
     let continuousBackslashCount = 0;
     while (1) {
       nextC = this.code[this.i + 1];
+      if (nextC === undefined) {
+        this.throwUnclosed(ParseErrorCode.UNCLOSED_STRING, '未闭合的字符串字面量', startOffset, startLine, startCol);
+      }
       const memoCount = continuousBackslashCount;
       if (nextC === '\\') {
         continuousBackslashCount++;
@@ -838,18 +910,33 @@ class Compiler {
     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);
     _initProto = _applyDecs$e[0];
   }
+  errors = (_initProto(this), []);
   constructor(tokenizer, hooks = {}) {
     this.tokenizer = tokenizer;
     this.hooks = hooks;
-    _initProto(this);
+  }
+  addError(code, message, loc) {
+    this.errors.push({
+      code,
+      message,
+      loc
+    });
   }
   parseProgram() {
-    this.tokenizer.nextToken();
     const body = [];
-    while (!this.tokenizer.isEof()) {
-      const node = this.templateNode();
-      if (node) {
-        body.push(node);
+    try {
+      this.tokenizer.nextToken();
+      while (!this.tokenizer.isEof()) {
+        const node = this.templateNode(body);
+        if (node) {
+          body.push(node);
+        }
+      }
+    } catch (error) {
+      if (error instanceof ParseSyntaxError) {
+        this.addError(error.code, error.message, error.loc);
+      } else {
+        this.addError(error.toString(), '未知错误', this.tokenizer.emptyLoc());
       }
     }
     return {
@@ -875,7 +962,7 @@ class Compiler {
     if (this.tokenizer.token.type & TokenType.Indent) {
       this.tokenizer.nextToken();
       while (!(this.tokenizer.token.type & TokenType.Dedent) && !this.tokenizer.isEof()) {
-        const child = this.templateNode();
+        const child = this.templateNode(children);
         if (child) {
           children.push(child);
         }
@@ -886,13 +973,26 @@ class Compiler {
     }
     return children;
   }
-  templateNode() {
-    this.tokenizer.token;
+  templateNode(siblings) {
+    const token = this.tokenizer.token;
+    if (token.type & TokenType.Pipe) {
+      this.addError(ParseErrorCode.PIPE_IN_WRONG_CONTEXT, '"|" 只能出现在元素属性扩展行中', token.loc ?? this.tokenizer.emptyLoc());
+      this.tokenizer.nextToken();
+      return null;
+    }
     const _this$tokenizer$_hook = this.tokenizer._hook({}),
       _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') {
+    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(ParseErrorCode.ELSE_WITHOUT_IF, `"${value}" 前必须有 "if" 或 "else" 节点`, token.loc ?? this.tokenizer.emptyLoc());
+        }
+      }
       return this.parseConditionalNode();
     }
     if (value === 'for') {
@@ -917,6 +1017,13 @@ class Compiler {
   }
   parseElementNode(node) {
     const tagToken = this.tokenizer.token;
+    if (!(tagToken.type & TokenType.Identifier)) {
+      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();
+      }
+      return null;
+    }
     const tagName = tagToken.value;
     this.tokenizer.nextToken();
     const props = this.headerLineAndExtensions();
@@ -942,15 +1049,25 @@ class Compiler {
     return node;
   }
   parseLoopNode(node) {
+    const forLoc = this.tokenizer.token.loc ?? this.tokenizer.emptyLoc();
     this.tokenizer.nextToken();
     const collection = this.parsePropertyValue();
-    this.tokenizer.nextToken();
+    if (!collection.value && collection.value !== 0) {
+      this.addError(ParseErrorCode.MISSING_FOR_COLLECTION, '"for" 缺少集合表达式', forLoc);
+    }
+    const semicolonToken = this.tokenizer.nextToken();
+    if (!(semicolonToken.type & TokenType.Semicolon)) {
+      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;
     if (isDestruct) {
       itemToken.value = '{' + itemToken.value + '}';
     }
     const item = this.parsePropertyValue();
+    if (!item.value && item.value !== 0) {
+      this.addError(ParseErrorCode.MISSING_FOR_ITEM, '"for" 缺少 item 变量名', itemToken.loc ?? this.tokenizer.emptyLoc());
+    }
     let char = this.tokenizer.peekChar(),
       key,
       index;
@@ -1013,6 +1130,8 @@ class Compiler {
       this.tokenizer.nextToken();
       node.value = this.parsePropertyValue();
       this.tokenizer.nextToken();
+    } else {
+      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;
@@ -2010,5 +2129,5 @@ function customRender(option) {
   };
 }
 
-export { Compiler, NodeType, Tokenizer, bobe, customRender };
+export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, customRender };
 //# sourceMappingURL=bobe.esm.js.map