bobe 0.0.34 → 0.0.36

package/dist/index.d.ts

@@ -146,11 +146,11 @@ declare enum FakeType {
 }
 type NodeSortBit = number;
 type BaseType = string | number | boolean | undefined | null;
-interface SourceLocation {
+type SourceLocation = {
     start: Position;
     end: Position;
     source: string;
-}
+};
 interface Position {
     line: number;
     column: number;
@@ -174,6 +174,18 @@ 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';
+type ParseError = {
+    code: ParseErrorCode;
+    message: string;
+    loc: SourceLocation;
+};
+/** tokenizer 抛出的带位置信息的语法错误 */
+declare class ParseSyntaxError extends SyntaxError {
+    code: ParseErrorCode;
+    loc: SourceLocation;
+    constructor(code: ParseErrorCode, message: string, loc: SourceLocation);
+}
 type ProgramCtx = {
     stack: MultiTypeStack<any>;
     prevSibling: any;
@@ -271,6 +283,9 @@ declare class Tokenizer {
     constructor(hook: Hook, useDedentAsEof: boolean);
     private next;
     getCurrentPos(): Position;
+    /** 构造从当前扫描起始位置到模板结尾的 SourceLocation，用于未闭合错误 */
+    private unclosedLoc;
+    private throwUnclosed;
     resume(_snapshot: ReturnType<Tokenizer['snapshot']>): void;
     snapshot(keys?: (keyof Tokenizer)[]): Partial<Tokenizer>;
     skip(): string;
@@ -383,7 +398,7 @@ interface LoopNode extends BaseNode {
 }
 interface ComponentNode extends BaseNode {
     type: NodeType.Component;
-    componentName: string;
+    componentName: PropertyValue;
     props: Property[];
     children?: TemplateNode[];
 }
@@ -395,7 +410,10 @@ interface FragmentNode extends BaseNode {
 declare class Compiler {
     tokenizer: Tokenizer;
     hooks: ParseHooks;
+    errors: ParseError[];
     constructor(tokenizer: Tokenizer, hooks?: ParseHooks);
+    private addError;
+    private emptyLoc;
     /**
      * 编译程序入口，生成AST
      */
@@ -438,6 +456,10 @@ declare class Compiler {
      * 根据值类型创建属性值节点
      */
     parsePropertyValue(node?: PropertyValue): PropertyValue;
+    /**
+     * 根据值类型创建名称
+     */
+    parseName(node?: PropertyValue): PropertyValue;
 }
 type PickParseProps<T> = {
     [K in keyof T as K extends `parse${string}` ? K : never]: T[K];
@@ -454,5 +476,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, Tokenizer, bobe, customRender };
-export type { ASTNodeType, BaseNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, Program, Property, PropertyKeyNode, PropertyValue, StaticValue, TemplateNode, TextNode };
+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 };

package/dist/index.umd.js

@@ -44,6 +44,13 @@
     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;
@@ -82,6 +89,25 @@
         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;
@@ -250,8 +276,7 @@
         }
         return this.token;
       } catch (error) {
-        console.error(error);
-        return this.token;
+        throw error;
       } finally {
         this.handledTokens.push(this.token);
       }
@@ -314,6 +339,9 @@
       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;
@@ -323,6 +351,9 @@
       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 === '{') {
@@ -339,6 +370,9 @@
       return true;
     }
     brace() {
+      const startOffset = this.preI,
+        startLine = this.line,
+        startCol = this.preCol;
       let inComment,
         inString,
         count = 0,
@@ -346,6 +380,9 @@
         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;
@@ -528,11 +565,17 @@
       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++;
@@ -600,24 +643,6 @@
     }
   }
 
-  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,
@@ -834,24 +859,71 @@
     }
   }
 
+  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 {
@@ -877,7 +949,7 @@
       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);
           }
@@ -888,13 +960,25 @@
       }
       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') {
@@ -906,12 +990,11 @@
       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();
@@ -920,6 +1003,13 @@
     }
     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();
@@ -945,15 +1035,25 @@
       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;
@@ -1016,6 +1116,8 @@
         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;
@@ -1036,6 +1138,15 @@
       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) {
@@ -2006,6 +2117,7 @@
 
   exports.Compiler = Compiler;
   exports.NodeType = NodeType;
+  exports.ParseSyntaxError = ParseSyntaxError;
   exports.Tokenizer = Tokenizer;
   exports.bobe = bobe;
   exports.customRender = customRender;