bobe 0.0.38 → 0.0.40

package/dist/index.d.ts

@@ -138,7 +138,8 @@ declare enum TokenType {
     Number = 2048,
     Boolean = 4096,
     Null = 8192,
-    Undefined = 16384
+    Undefined = 16384,
+    Comment = 32768
 }
 declare enum FakeType {
     If = 1,
@@ -194,8 +195,9 @@ declare enum ParseErrorCode {
     MISSING_FOR_COLLECTION = 9012,
     MISSING_FOR_SEMICOLON = 9013,
     MISSING_FOR_ITEM = 9014,
-    MISSING_PROP_ASSIGNMENT = 9015,
-    PIPE_IN_WRONG_CONTEXT = 9016
+    MISSING_COMMENT_SECOND_SLASH = 9015,
+    MISSING_PROP_ASSIGNMENT = 9016,
+    PIPE_IN_WRONG_CONTEXT = 9017
 }
 type ParseError = {
     code: ParseErrorCode;
@@ -316,7 +318,14 @@ declare class Tokenizer {
     isEof(): boolean;
     private setToken;
     nextToken(): Token;
+    getComment(): string;
+    /**
+     * 处理处于行末尾的 comment 例如：
+     * div // 这里是注释
+     */
+    comment(): void;
     condExp(): Token;
+    isEol(i: number): boolean;
     /**
      * 解析到 for 时使用这个方法获取 for 后方的子表达式
      * 表达式通过 “;” 分割
@@ -326,6 +335,8 @@ declare class Tokenizer {
      */
     jsExp(): Token;
     peekChar(): string;
+    peekCharIsEol(): boolean;
+    charIsEol(char: string): char is "/" | "\n";
     private assignment;
     private pipe;
     private staticIns;
@@ -351,6 +362,7 @@ declare enum NodeType {
     Element = "Element",// 真实DOM节点
     Text = "Text",// 文本节点
     Interpolation = "Interpolation",// 插值节点
+    Comment = "Comment",// 注释节点
     Property = "Property",// 属性节点
     PropertyKey = "PropertyKey",// 属性节点
     StaticValue = "StaticValue",// 静态值
@@ -373,13 +385,17 @@ interface Program extends BaseNode {
     type: NodeType.Program;
     body: TemplateNode[];
 }
-type TemplateNode = ElementNode | TextNode | InterpolationNode | ConditionalNode | LoopNode | ComponentNode | FragmentNode;
+type TemplateNode = ElementNode | TextNode | InterpolationNode | ConditionalNode | LoopNode | ComponentNode | FragmentNode | CommentNode;
 interface ElementNode extends BaseNode {
     type: NodeType.Element;
     tagName: string;
     props: Property[];
     children: TemplateNode[];
 }
+interface CommentNode extends BaseNode {
+    type: NodeType.Comment;
+    value: string;
+}
 interface TextNode extends BaseNode {
     type: NodeType.Text;
     value: string;
@@ -504,4 +520,4 @@ 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, 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 };
+export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };

package/dist/index.umd.js

@@ -20,6 +20,7 @@
     TokenType[TokenType["Boolean"] = 4096] = "Boolean";
     TokenType[TokenType["Null"] = 8192] = "Null";
     TokenType[TokenType["Undefined"] = 16384] = "Undefined";
+    TokenType[TokenType["Comment"] = 32768] = "Comment";
     return TokenType;
   }({});
   const BaseTokenType = TokenType.String | TokenType.Number | TokenType.Boolean | TokenType.Null | TokenType.Undefined;
@@ -66,8 +67,9 @@
     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";
+    ParseErrorCode[ParseErrorCode["MISSING_COMMENT_SECOND_SLASH"] = 9015] = "MISSING_COMMENT_SECOND_SLASH";
+    ParseErrorCode[ParseErrorCode["MISSING_PROP_ASSIGNMENT"] = 9016] = "MISSING_PROP_ASSIGNMENT";
+    ParseErrorCode[ParseErrorCode["PIPE_IN_WRONG_CONTEXT"] = 9017] = "PIPE_IN_WRONG_CONTEXT";
     return ParseErrorCode;
   }({});
   class ParseSyntaxError extends SyntaxError {
@@ -270,6 +272,9 @@
               default:
                 if (false) ;
                 switch (char) {
+                  case '/':
+                    this.comment();
+                    break;
                   case "'":
                   case '"':
                     this.str(char);
@@ -307,6 +312,22 @@
         this.handledTokens.push(this.token);
       }
     }
+    getComment() {
+      let value = '/';
+      let nextC = this.code[this.i + 1];
+      if (nextC !== '/') {
+        throw new ParseSyntaxError(ParseErrorCode.MISSING_COMMENT_SECOND_SLASH, '注释开头必须是 //', this.emptyLoc());
+      }
+      while (this.code[this.i + 1] !== '\n') {
+        this.next();
+        value += this.code[this.i];
+      }
+      return value;
+    }
+    comment() {
+      this.getComment();
+      this.next();
+    }
     condExp() {
       let value = '';
       this.token = null;
@@ -320,14 +341,17 @@
           this.next();
         }
         value += this.code[this.i];
-        const trimmed = value.trim();
-        this.setToken(TokenType.Identifier, trimmed ? value : true);
+        const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
+        this.setToken(TokenType.Identifier, trimmed ? trimmed : true);
         return this.token;
       } finally {
         this.next();
         this.handledTokens.push(this.token);
       }
     }
+    isEol(i) {
+      return this.code[i] === '\n' || this.code[i] === '/';
+    }
     jsExp() {
       this.token = null;
       let value = '';
@@ -358,6 +382,13 @@
       }
       return this.code[i];
     }
+    peekCharIsEol() {
+      const char = this.peekChar();
+      return char === '\n' || char === '/';
+    }
+    charIsEol(char) {
+      return char === '\n' || char === '/';
+    }
     assignment() {
       this.setToken(TokenType.Assign, '=');
     }
@@ -477,6 +508,9 @@
           case '\n':
             nextC = '\n';
             break;
+          case '/':
+            nextC = '/';
+            break;
           default:
             nextC = '';
             break;
@@ -485,6 +519,12 @@
           isEmptyLine = true;
           break;
         }
+        if (nextC === '/') {
+          value += this.getComment();
+          this.next();
+          isEmptyLine = true;
+          break;
+        }
         if (!nextC) {
           break;
         }
@@ -514,6 +554,7 @@
         isEmptyLine = _this$getDentValue2.isEmptyLine;
       if (isEmptyLine) {
         this.needIndent = true;
+        this.next();
         return;
       }
       this.needIndent = false;
@@ -589,7 +630,7 @@
       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;
@@ -923,6 +964,7 @@
     NodeType["Element"] = "Element";
     NodeType["Text"] = "Text";
     NodeType["Interpolation"] = "Interpolation";
+    NodeType["Comment"] = "Comment";
     NodeType["Property"] = "Property";
     NodeType["PropertyKey"] = "PropertyKey";
     NodeType["StaticValue"] = "StaticValue";
@@ -1593,7 +1635,7 @@
         i: 0
       };
       if (keyExp) {
-        forNode.getKey = new Function('data', `let v;with(data){v=${keyExp}};return v;`);
+        forNode.getKey = new Function('data', `let v;with(data){v=${keyExp}\n};return v;`);
       }
       window['for1'] = forNode;
       const data = this.getData();