vsn 0.1.73 → 0.1.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsn",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "description": "SEO Friendly Javascript/Typescript Framework",
   "keywords": [
     "framework",
@@ -13,7 +13,8 @@
   ],
   "main": "./dist/vsn.js",
   "scripts": {
-    "build": "rm -rf ./dist/ && tsc",
+    "build": "rm -rf ./dist/ && npm run-script version && tsc",
+    "version": "echo -n \"export const VERSION = '${npm_package_version}';\n\" > src/version.ts",
     "build_dev": "rm -rf ./dist/ && webpack --env BUILD=development BENCHMARK=1",
     "demo": "webpack --env BUILD=production BENCHMARK=1 && cp ./dist/vsn.min.js ./demo/vsn.js",
     "test": "karma start --single-run",

package/src/AST/ClassNode.ts

@@ -39,6 +39,7 @@ export class ClassNode extends Node implements TreeNode {
     public async prepare(scope: Scope, dom: DOM, tag: Tag = null, meta?: INodeMeta): Promise<void> {
         meta = Object.assign({}, meta) || {};
         const initial = !!meta['initial'];
+        let root: boolean = false;
         meta['ClassNodePrepare'] = initial;
 
         // Only prepare once during the initial prep, all subsequent prepares are on tag class blocks
@@ -47,6 +48,7 @@ export class ClassNode extends Node implements TreeNode {
                 ClassNode.classChildren[meta['ClassNodeSelector'] as string].push(this.selector);
                 meta['ClassNodeSelector'] = `${meta['ClassNodeSelector']} ${this.selector}`;
             } else {
+                root = true;
                 meta['ClassNodeSelector'] = this.selector;
             }
 
@@ -63,14 +65,25 @@ export class ClassNode extends Node implements TreeNode {
             await this.block.prepare(this.classScope, dom, tag, meta);
             Registry.class(this);
 
-            for (const element of Array.from(dom.querySelectorAll(this._fullSelector))) {
-                await ClassNode.addElementClass(this._fullSelector, element as HTMLElement, dom, element[Tag.TaggedVariable] || null);
+            if (root) {
+                await this.findClassElements(dom);
             }
         } else {
             await this.block.prepare(this.classScope, dom, tag, meta);
         }
     }
 
+    public async findClassElements(dom) {
+        for (const element of Array.from(dom.querySelectorAll(this._fullSelector))) {
+            await ClassNode.addElementClass(this._fullSelector, element as HTMLElement, dom, element[Tag.TaggedVariable] || null);
+        }
+        for (const childSelector of ClassNode.classChildren[this._fullSelector]) {
+            const node =  ClassNode.classes[`${this._fullSelector} ${childSelector}`];
+            if (!node) continue;
+            await node.findClassElements(dom);
+        }
+    }
+
     public async constructTag(tag: Tag, dom: DOM, hasConstructor: boolean | null = null) {
         if (hasConstructor === null)
             hasConstructor = this.classScope.has('construct');

package/src/version.ts

@@ -0,0 +1 @@
+export const VERSION = '0.1.74';

package/src/vsn.ts

@@ -8,6 +8,7 @@ import {Query} from "./Query";
 import {EventDispatcher} from "./EventDispatcher";
 import {DynamicScopeData} from "./Scope/DynamicScopeData";
 import {Controller} from "./Controller";
+import {VERSION} from "./version";
 
 export class Vision extends EventDispatcher {
     protected static _instance: Vision;
@@ -59,7 +60,7 @@ export class Vision extends EventDispatcher {
         await this._dom.buildFrom(document, true);
         const now = (new Date()).getTime();
         const setupTime = now - startTime;
-        console.info(`Took ${setupTime}ms to start up VisionJS. https://www.vsnjs.com/`, window ? `v${window['VSN_VERSION']}` : null);
+        console.info(`Took ${setupTime}ms to start up VisionJS. https://www.vsnjs.com/`, `v${VERSION}`);
     }
 
     public static get instance() {

package/test/AST/ClassNode.spec.ts

@@ -2,6 +2,7 @@ import {DOM} from "../../src/DOM";
 import {ClassNode} from "../../src/AST/ClassNode";
 import {Registry} from "../../src/Registry";
 import {TagList} from "../../src/Tag/List";
+import {Tag} from "../../src/Tag";
 
 
 describe('ClassNode', () => {
@@ -55,4 +56,29 @@ describe('ClassNode', () => {
         await dom.exec('?(.simple-construct).test()');
         expect(await dom.exec('?(.simple-construct).a')).toEqual([16, 16]);
     });
+
+    it("properly define a simple class with a parent", async () => {
+        document.body.innerHTML = `
+            <script type="text/vsn" vsn-script>
+            class .testing { 
+                func construct() {
+                    a|integer = 0;
+                }
+                
+                class .test {
+                    func construct() {
+                        ?<(.testing).a += 1;
+                    }
+                }
+            }
+            </script>
+            <div class="testing"><span class="test"></span></div>
+        `;
+        const dom = new DOM(document);
+        await dom.ready;
+        await Registry.instance.classes.get('.testing .test');
+        const t = await dom.exec('?(.testing .test)[0]');
+        await t.promise('.testing .test.construct');
+        expect(await dom.exec('?(.testing)[0].a')).toEqual(1);
+    });
 });