bobe 0.0.37 → 0.0.39

package/dist/bobe.cjs.js

@@ -14,8 +14,15 @@ let TokenType = function (TokenType) {
   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";
@@ -51,13 +58,15 @@ let ParseErrorCode = function (ParseErrorCode) {
   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";
+  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 {
@@ -579,7 +588,7 @@ class Tokenizer {
     let nextC;
     while (1) {
       nextC = this.code[this.i + 1];
-      if (typeof nextC !== 'string' || !bobeShared.matchIdStart2(nextC, 0)) {
+      if (typeof nextC !== 'string' || !bobeShared.matchId(nextC, 0)) {
         break;
       }
       value += nextC;
@@ -589,8 +598,30 @@ class Tokenizer {
       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,
@@ -616,7 +647,7 @@ class Tokenizer {
       }
       value += nextC;
     }
-    this.setToken(TokenType.Identifier, value);
+    this.setToken(TokenType.String, value);
   }
   number(char) {
     let value = char;
@@ -629,7 +660,7 @@ class Tokenizer {
       value += nextC;
       this.next();
     }
-    this.setToken(TokenType.Identifier, Number(value));
+    this.setToken(TokenType.Number, Number(value));
   }
   eof() {
     this.setToken(TokenType.Eof, 'End Of File');
@@ -908,7 +939,7 @@ var NodeType = function (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"], [[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), []);
@@ -916,7 +947,10 @@ class Compiler {
     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,
@@ -1019,7 +1053,7 @@ 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());
+      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();
       }
@@ -1039,7 +1073,7 @@ class Compiler {
   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;
@@ -1052,22 +1086,22 @@ class Compiler {
   parseLoopNode(node) {
     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(ParseErrorCode.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(ParseErrorCode.MISSING_FOR_SEMICOLON, '"for" 语法：for <集合>; <item> [index][; key]，缺少第一个 ";"', semicolonToken.loc ?? this.tokenizer.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(ParseErrorCode.MISSING_FOR_ITEM, '"for" 缺少 item 变量名', itemToken.loc ?? this.tokenizer.emptyLoc());
+      this.addError(ParseErrorCode.MISSING_FOR_ITEM, '"for" 缺少 item 变量名', itemToken.loc ?? this.tokenizer.emptyLoc(), node);
     }
     let char = this.tokenizer.peekChar(),
       key,
@@ -1076,16 +1110,16 @@ class Compiler {
       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();
         }
       }
     }
@@ -1119,23 +1153,41 @@ class Compiler {
   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(ParseErrorCode.MISSING_ASSIGN, `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.tokenizer.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;
   }
@@ -1144,7 +1196,7 @@ class Compiler {
     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],
@@ -1153,7 +1205,7 @@ class Compiler {
     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],
@@ -1162,6 +1214,15 @@ class Compiler {
     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) {