bobe 0.0.34 → 0.0.36

package/dist/bobe.cjs.js

@@ -43,6 +43,13 @@ let NodeSort = function (NodeSort) {
   TerpEvt["HandledComponentNode"] = "handled-component-node";
   return TerpEvt;
 })({});
+class ParseSyntaxError extends SyntaxError {
+  constructor(code, message, loc) {
+    super(message);
+    this.code = code;
+    this.loc = loc;
+  }
+}
 
 class Tokenizer {
   TabSize = 2;
@@ -81,6 +88,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;
@@ -249,8 +275,7 @@ class Tokenizer {
       }
       return this.token;
     } catch (error) {
-      console.error(error);
-      return this.token;
+      throw error;
     } finally {
       this.handledTokens.push(this.token);
     }
@@ -313,6 +338,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;
@@ -322,6 +350,9 @@ class Tokenizer {
     let innerBrace = 0;
     while (1) {
       nextC = this.code[this.i + 1];
+      if (nextC === undefined) {
+        this.throwUnclosed('UNCLOSED_STATIC_INS', '未闭合的 "${...}"', startOffset, startLine, startCol);
+      }
       value += nextC;
       this.next();
       if (nextC === '{') {
@@ -338,6 +369,9 @@ class Tokenizer {
     return true;
   }
   brace() {
+    const startOffset = this.preI,
+      startLine = this.line,
+      startCol = this.preCol;
     let inComment,
       inString,
       count = 0,
@@ -345,6 +379,9 @@ class Tokenizer {
       backslashCount = 0;
     while (1) {
       const char = this.code[this.i];
+      if (char === undefined) {
+        this.throwUnclosed('UNCLOSED_BRACE', '未闭合的 "{"', startOffset, startLine, startCol);
+      }
       const nextChar = this.code[this.i + 1];
       if (inComment === 'single' && char === '\n') {
         inComment = null;
@@ -527,11 +564,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('UNCLOSED_STRING', '未闭合的字符串字面量', startOffset, startLine, startCol);
+      }
       const memoCount = continuousBackslashCount;
       if (nextC === '\\') {
         continuousBackslashCount++;
@@ -599,24 +642,6 @@ class Tokenizer {
   }
 }
 
-var NodeType = function (NodeType) {
-  NodeType["Element"] = "Element";
-  NodeType["Text"] = "Text";
-  NodeType["Interpolation"] = "Interpolation";
-  NodeType["Property"] = "Property";
-  NodeType["PropertyKey"] = "PropertyKey";
-  NodeType["StaticValue"] = "StaticValue";
-  NodeType["DynamicValue"] = "DynamicValue";
-  NodeType["Program"] = "Program";
-  NodeType["If"] = "If";
-  NodeType["Else"] = "Else";
-  NodeType["Fail"] = "Fail";
-  NodeType["For"] = "For";
-  NodeType["Component"] = "Component";
-  NodeType["Fragment"] = "Fragment";
-  return NodeType;
-}(NodeType || {});
-
 function _applyDecs2311(e, t, n, r, o, i) {
   var a,
     c,
@@ -833,24 +858,71 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
+var NodeType = function (NodeType) {
+  NodeType["Element"] = "Element";
+  NodeType["Text"] = "Text";
+  NodeType["Interpolation"] = "Interpolation";
+  NodeType["Property"] = "Property";
+  NodeType["PropertyKey"] = "PropertyKey";
+  NodeType["StaticValue"] = "StaticValue";
+  NodeType["DynamicValue"] = "DynamicValue";
+  NodeType["Program"] = "Program";
+  NodeType["If"] = "If";
+  NodeType["Else"] = "Else";
+  NodeType["Fail"] = "Fail";
+  NodeType["For"] = "For";
+  NodeType["Component"] = "Component";
+  NodeType["Fragment"] = "Fragment";
+  return NodeType;
+}(NodeType || {});
+
 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"]]).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, "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
+    });
+  }
+  emptyLoc() {
+    const pos = this.tokenizer.getCurrentPos();
+    return {
+      start: pos,
+      end: {
+        offset: pos.offset + 1,
+        line: pos.line,
+        column: pos.column + 1
+      },
+      source: ' '
+    };
   }
   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 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());
       }
     }
     return {
@@ -876,7 +948,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);
         }
@@ -887,13 +959,25 @@ class Compiler {
     }
     return children;
   }
-  templateNode() {
-    this.tokenizer.token;
+  templateNode(siblings) {
+    const token = this.tokenizer.token;
+    if (token.type & TokenType.Pipe) {
+      this.addError('PIPE_IN_WRONG_CONTEXT', '"|" 只能出现在元素属性扩展行中', token.loc ?? this.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') {
+      if (value === 'else' || value === 'fail') {
+        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());
+        }
+      }
       return this.parseConditionalNode();
     }
     if (value === 'for') {
@@ -905,12 +989,11 @@ class Compiler {
     return this.parseElementNode();
   }
   parseComponentNode(node) {
-    const tagToken = this.tokenizer.token;
-    const tagName = tagToken.value;
+    const name = this.parseName();
     this.tokenizer.nextToken();
     const props = this.headerLineAndExtensions();
     node.type = NodeType.Component;
-    node.componentName = tagName;
+    node.componentName = name;
     node.props = props;
     this.hooks.parseComponentNode?.propsAdded?.call(this, node);
     const children = this.handleChildren();
@@ -919,6 +1002,13 @@ class Compiler {
   }
   parseElementNode(node) {
     const tagToken = this.tokenizer.token;
+    if (!(tagToken.type & TokenType.Identifier)) {
+      this.addError('INVALID_TAG_NAME', `无效的标签名，期望标识符但得到 "${tagToken.value}"`, tagToken.loc ?? this.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();
@@ -944,15 +1034,25 @@ class Compiler {
     return node;
   }
   parseLoopNode(node) {
+    const forLoc = this.tokenizer.token.loc ?? this.emptyLoc();
     this.tokenizer.nextToken();
     const collection = this.parsePropertyValue();
-    this.tokenizer.nextToken();
+    if (!collection.value && collection.value !== 0) {
+      this.addError('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());
+    }
     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('MISSING_FOR_ITEM', '"for" 缺少 item 变量名', itemToken.loc ?? this.emptyLoc());
+    }
     let char = this.tokenizer.peekChar(),
       key,
       index;
@@ -1015,6 +1115,8 @@ class Compiler {
       this.tokenizer.nextToken();
       node.value = this.parsePropertyValue();
       this.tokenizer.nextToken();
+    } else {
+      this.addError('MISSING_ASSIGN', `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.emptyLoc());
     }
     node.loc.start = node.key.loc.start;
     node.loc.end = node.value ? node.value.loc.end : node.key.loc.end;
@@ -1035,6 +1137,15 @@ class Compiler {
     node.value = value;
     return node;
   }
+  parseName(node) {
+    const _this$tokenizer$_hook5 = this.tokenizer._hook({}),
+      _this$tokenizer$_hook6 = _slicedToArray(_this$tokenizer$_hook5, 2),
+      hookType = _this$tokenizer$_hook6[0],
+      value = _this$tokenizer$_hook6[1];
+    node.type = hookType === 'dynamic' ? NodeType.DynamicValue : NodeType.StaticValue;
+    node.value = value;
+    return node;
+  }
 }
 function NodeLoc(target, context) {
   return function (_node) {
@@ -2005,6 +2116,7 @@ function customRender(option) {
 
 exports.Compiler = Compiler;
 exports.NodeType = NodeType;
+exports.ParseSyntaxError = ParseSyntaxError;
 exports.Tokenizer = Tokenizer;
 exports.bobe = bobe;
 exports.customRender = customRender;