@ryupold/vode 0.12.0 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ryupold/vode",
-    "version": "0.12.0",
+    "version": "0.12.2",
     "description": "Small web framework for minimal websites",
     "author": "Michael Scherbakow (ryupold)",
     "license": "MIT",

package/src/vode.ts

@@ -85,9 +85,7 @@ export type ContainerNode<S> = HTMLElement & {
             liveEffectCount: number,
             renderPatchCount: number,
             renderCount: number,
-            renderTime: number,
-            queueLengthBeforeRender: number,
-            queueLengthAfterRender: number,
+            lastRenderTime: number,
         },
     }
 };
@@ -125,7 +123,7 @@ export function app<S extends object | unknown>(container: HTMLElement, initialS
     if (typeof dom !== "function") throw new Error("dom must be a function that returns a vode");
 
     const _vode = {} as ContainerNode<S>["_vode"];
-    _vode.stats = { renderTime: 0, renderCount: 0, queueLengthBeforeRender: 0, queueLengthAfterRender: 0, liveEffectCount: 0, patchCount: 0, renderPatchCount: 0 };
+    _vode.stats = { lastRenderTime: 0, renderCount: 0, liveEffectCount: 0, patchCount: 0, renderPatchCount: 0 };
 
     Object.defineProperty(initialState, "patch", {
         enumerable: false, configurable: true,
@@ -190,7 +188,7 @@ export function app<S extends object | unknown>(container: HTMLElement, initialS
             } finally {
                 _vode.isRendering = false;
                 _vode.stats.renderCount++;
-                _vode.stats.renderTime = Date.now() - sw;
+                _vode.stats.lastRenderTime = Date.now() - sw;
                 if (_vode.q) {
                     _vode.render();
                 }
@@ -291,10 +289,10 @@ export function mergeClass(a: ClassProp, b: ClassProp): ClassProp {
         for (const item of a as string[]) {
             aa[item] = true;
         }
-        for (const bKey of (<Record<string, any>>b).keys) {
+        for (const bKey of Object.keys(b)) {
             aa[bKey] = (<Record<string, boolean | null | undefined>>b)[bKey];
         }
-        return b;
+        return aa;
     }
 
     throw new Error(`cannot merge classes of ${a} (${typeof a}) and ${b} (${typeof b})`);

package/vode.mjs

@@ -23,7 +23,7 @@ function app(container, initialState, dom, ...initialPatches) {
   if (typeof dom !== "function")
     throw new Error("dom must be a function that returns a vode");
   const _vode = {};
-  _vode.stats = { renderTime: 0, renderCount: 0, queueLengthBeforeRender: 0, queueLengthAfterRender: 0, liveEffectCount: 0, patchCount: 0, renderPatchCount: 0 };
+  _vode.stats = { lastRenderTime: 0, renderCount: 0, liveEffectCount: 0, patchCount: 0, renderPatchCount: 0 };
   Object.defineProperty(initialState, "patch", {
     enumerable: false,
     configurable: true,
@@ -93,7 +93,7 @@ function app(container, initialState, dom, ...initialPatches) {
       } finally {
         _vode.isRendering = false;
         _vode.stats.renderCount++;
-        _vode.stats.renderTime = Date.now() - sw;
+        _vode.stats.lastRenderTime = Date.now() - sw;
         if (_vode.q) {
           _vode.render();
         }
@@ -164,10 +164,10 @@ function mergeClass(a, b) {
     for (const item of a) {
       aa[item] = true;
     }
-    for (const bKey of b.keys) {
+    for (const bKey of Object.keys(b)) {
       aa[bKey] = b[bKey];
     }
-    return b;
+    return aa;
   }
   throw new Error(`cannot merge classes of ${a} (${typeof a}) and ${b} (${typeof b})`);
 }