bobe 0.0.33 → 0.0.34

package/dist/bobe.cjs.js

@@ -932,8 +932,8 @@ class Compiler {
   }
   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;
@@ -944,22 +944,33 @@ class Compiler {
     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();