vsn 0.1.29 → 0.1.30

package/src/AST/ScopeMemberNode.ts

@@ -27,7 +27,12 @@ export class ScopeMemberNode extends Node implements TreeNode {
         const values = [];
 
         if (this.scope instanceof ElementQueryNode) {
-            scopes = await this.scope.evaluate(scope, dom, tag);
+            const elements = await this.scope.evaluate(scope, dom, tag);
+            if (this.scope.first) {
+                scopes.push(elements);
+            } else {
+                scopes = elements;
+            }
         } else {
             const evalScope = await this.scope.evaluate(scope, dom, tag);
             if (evalScope instanceof TagList) {

package/src/AST.ts

@@ -454,7 +454,7 @@ export class Tree {
                 node = new NumberLiteralNode(token.value);
                 tokens.splice(0, 1);
             } else if (tokens[0].type === TokenType.ELEMENT_REFERENCE) {
-                node = new ElementQueryNode(tokens[0].value);
+                node = new ElementQueryNode(tokens[0].value, true);
                 tokens.splice(0, 1);
             } else if (tokens[0].type === TokenType.ELEMENT_QUERY) {
                 node = new ElementQueryNode(tokens[0].value);

package/src/Scope/DynamicScopeData.ts

@@ -4,7 +4,6 @@ export class DynamicScopeData extends ScopeDataAbstract {
     constructor(data: IScopeData | string[]) {
         super();
         if(data instanceof Array) {
-            this.__properties__ = data;
             for (const field of data)
                 this.createProperty(field);
         } else {
@@ -14,8 +13,7 @@ export class DynamicScopeData extends ScopeDataAbstract {
 
     setData(data: IScopeData) {
         for(const field of Object.keys(data))
-            if(this.__properties__.indexOf(field) == -1) {
-                this.__properties__.push(field);
+            if(!this.hasProperty(field)) {
                 this.createProperty(field);
             }
         super.setData(data);

package/src/Scope/ScopeDataAbstract.ts

@@ -23,6 +23,7 @@ export class ScopeDataAbstract extends EventDispatcher {
         const instance = new propertyType(config.default, config),
             propDesc = Object.getOwnPropertyDescriptor(this, name);
         this['__'+name] = instance;
+        this.__properties__.push(name);
 
         // property getter
         const propertyGetter = function() {

package/src/Scope.ts

@@ -82,7 +82,6 @@ export class Scope extends EventDispatcher {
     set(key: string, value: any) {
         if (!this.data.hasProperty(key))
             this.data.createProperty(key);
-
         this.data[key] = value;
     }
 

package/src/Tag/List.ts

@@ -29,12 +29,12 @@ export class TagList extends Array<DOMObject> {
         return this.map(e => e.element);
     }
 
-    next() {
-        return this.map(e => e.element.nextElementSibling).filter(e => e != null)
+    get first(): DOMObject {
+        return this[0];
     }
 
-    prev() {
-        return this.map(e => e.element.previousElementSibling).filter(e => e != null)
+    get last(): DOMObject {
+        return this[this.length - 1];
     }
 
     removeClass(className) {

package/src/Types.ts

@@ -24,7 +24,7 @@ export class Types {
 
     @Registry.type('boolean')
     public static boolean(value: string) {
-        return [0, '0', 'false', ''].indexOf(value) === -1;
+        return [0, '0', false, 'false', ''].indexOf(value) === -1;
     }
 
     @Registry.type('date')

package/test/MessageList.spec.ts

@@ -1,4 +1,4 @@
-import MessageList from "../src/MessageList";
+import {MessageList} from "../src/MessageList";
 
 describe('MessageList', () => {
     it("should reset properly", () => {