bobe 0.0.33 → 0.0.35

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;
@@ -369,21 +369,21 @@ interface DynamicValue extends BaseNode {
 }
 interface ConditionalNode extends BaseNode {
     type: NodeType.If | NodeType.Else | NodeType.Fail;
-    condition: string;
+    condition: PropertyValue;
     consequent: TemplateNode[];
     children?: TemplateNode[];
 }
 interface LoopNode extends BaseNode {
     type: NodeType.For;
-    collection: string;
-    item: string;
-    index?: string;
-    key?: string;
+    collection: PropertyValue;
+    item: PropertyValue;
+    index?: PropertyValue;
+    key?: PropertyValue;
     children: TemplateNode[];
 }
 interface ComponentNode extends BaseNode {
     type: NodeType.Component;
-    componentName: string;
+    componentName: PropertyValue;
     props: Property[];
     children?: TemplateNode[];
 }
@@ -438,6 +438,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];
@@ -455,4 +459,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, Tokenizer, bobe, customRender };
-export type { ASTNodeType, BaseNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, Program, Property, PropertyKeyNode, PropertyValue, StaticValue, TemplateNode, TextNode };
+export type { ASTNodeType, BaseNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };

package/dist/index.umd.js

@@ -600,24 +600,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,10 +816,28 @@
     }
   }
 
+  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];
     }
     constructor(tokenizer, hooks = {}) {
@@ -906,12 +906,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();
@@ -933,8 +932,8 @@
     }
     parseConditionalNode(node) {
       const keyword = this.tokenizer.token.value;
-      const conditionToken = this.tokenizer.condExp();
-      const condition = conditionToken.value;
+      this.tokenizer.condExp();
+      const condition = this.parsePropertyValue();
       this.tokenizer.nextToken();
       this.tokenizer.nextToken();
       node.type = keyword === 'if' ? NodeType.If : keyword === 'else' ? NodeType.Else : NodeType.Fail;
@@ -945,22 +944,33 @@
       return node;
     }
     parseLoopNode(node) {
-      const collection = this.tokenizer.nextToken().value;
+      this.tokenizer.nextToken();
+      const collection = this.parsePropertyValue();
       this.tokenizer.nextToken();
       const itemToken = this.tokenizer.nextToken();
       const isDestruct = itemToken.type === TokenType.InsertionExp;
-      let item = isDestruct ? `{${itemToken.value}}` : itemToken.value;
+      if (isDestruct) {
+        itemToken.value = '{' + itemToken.value + '}';
+      }
+      const item = this.parsePropertyValue();
       let char = this.tokenizer.peekChar(),
         key,
         index;
       if (char === ';') {
         this.tokenizer.nextToken();
-        if (this.tokenizer.peekChar() !== '\n') key = this.tokenizer.jsExp().value;
+        if (this.tokenizer.peekChar() !== '\n') {
+          this.tokenizer.jsExp();
+          key = this.parsePropertyValue();
+        }
       } else if (char === '\n') ; else {
-        index = this.tokenizer.nextToken().value;
+        this.tokenizer.nextToken();
+        index = this.parsePropertyValue();
         if (this.tokenizer.peekChar() === ';') {
           this.tokenizer.nextToken();
-          if (this.tokenizer.peekChar() !== '\n') key = this.tokenizer.jsExp().value;
+          if (this.tokenizer.peekChar() !== '\n') {
+            this.tokenizer.jsExp();
+            key = this.parsePropertyValue();
+          }
         }
       }
       this.tokenizer.nextToken();
@@ -1025,6 +1035,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) {