@ryupold/vode 0.12.1 → 0.12.3

package/package.json

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

package/src/vode.ts

@@ -104,7 +104,7 @@ export function createPatch<S extends object | unknown>(p: DeepPartial<S> | Effe
  * - identity: `vode(["div", ["span", "bar"]])` => `["div", ["span", "bar"]]` --*rendered*-> `<div><span>bar</span></div>`
  */
 export function vode<S extends object | unknown>(tag: Tag | Vode<S>, props?: Props<S> | ChildVode<S>, ...children: ChildVode<S>[]): Vode<S> {
-    if(!tag) throw new Error("tag must be a string or vode");
+    if (!tag) throw new Error("tag must be a string or vode");
     if (Array.isArray(tag)) return tag;
     else if (props) return [tag, props as Props<S>, ...children];
     else return [tag, ...children];
@@ -289,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})`);
@@ -564,31 +564,34 @@ function unwrap<S>(c: Component<S> | ChildVode<S>, s: S): ChildVode<S> {
 
 function patchProperties<S>(patch: Dispatch<S>, node: ChildNode, oldProps?: Props<S>, newProps?: Props<S>, isSvg?: boolean) {
     if (!newProps && !oldProps) return;
-    if (!oldProps) {         // set new props
-        for (const key in newProps) {
-            const newValue = newProps[key as keyof Props<S>] as PropertyValue<S>;
-            newProps[key as keyof Props<S>] = patchProperty(patch, <Element>node, key, undefined, newValue, isSvg);
-        }
-    } else if (newProps) {   // clear old props and set new in one loop
-        const combinedKeys = new Set([...Object.keys(oldProps), ...Object.keys(newProps)]);
-        for (const key of combinedKeys) {
+
+    // match existing properties
+    if (oldProps) {
+        for (const key in oldProps) {
             const oldValue = oldProps[key as keyof Props<S>] as PropertyValue<S>;
-            const newValue = newProps[key as keyof Props<S>] as PropertyValue<S>;
-            if (key[0] === "o" && key[1] === "n") {
-                const oldEvent = (<any>node)["__" + key];
-                if ((oldEvent && oldEvent !== newValue) || (!oldEvent && oldValue !== newValue)) {
-                    newProps[key as keyof Props<S>] = patchProperty(patch, <Element>node, key, oldValue, newValue, isSvg);
-                }
-                (<any>node)["__" + key] = newValue;
+            const newValue = newProps?.[key as keyof Props<S>] as PropertyValue<S>;
+
+            if (oldValue !== newValue) {
+                if (newProps) newProps[key as keyof Props<S>] = patchProperty(patch, node, key, oldValue, newValue, isSvg);
+                else patchProperty(patch, node, key, oldValue, undefined, isSvg);
             }
-            else if (oldValue !== newValue) {
-                newProps[key as keyof Props<S>] = patchProperty(patch, <Element>node, key, oldValue, newValue, isSvg);
+        }
+    }
+
+    //new properties that weren't in oldProps
+    if (newProps && oldProps) {
+        for (const key in newProps) {
+            if (!(key in oldProps)) {
+                const newValue = newProps[key as keyof Props<S>] as PropertyValue<S>;
+                newProps[key as keyof Props<S>] = patchProperty(patch, <Element>node, key, undefined, newValue, isSvg);
             }
         }
-    } else {                 //delete all old props, cause there are no new props
-        for (const key in oldProps) {
-            const oldValue = oldProps[key as keyof Props<S>] as PropertyValue<S>;
-            oldProps[key as keyof Props<S>] = patchProperty(patch, <Element>node, key, oldValue, undefined, isSvg);
+    }
+    // only new props
+    else if (newProps) {
+        for (const key in newProps) {
+            const newValue = newProps[key as keyof Props<S>] as PropertyValue<S>;
+            newProps[key as keyof Props<S>] = patchProperty(patch, <Element>node, key, undefined, newValue, isSvg);
         }
     }
 }

package/vode.mjs

@@ -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})`);
 }
@@ -390,30 +390,29 @@ function unwrap(c, s) {
 function patchProperties(patch, node, oldProps, newProps, isSvg) {
   if (!newProps && !oldProps)
     return;
-  if (!oldProps) {
-    for (const key in newProps) {
-      const newValue = newProps[key];
-      newProps[key] = patchProperty(patch, node, key, undefined, newValue, isSvg);
-    }
-  } else if (newProps) {
-    const combinedKeys = new Set([...Object.keys(oldProps), ...Object.keys(newProps)]);
-    for (const key of combinedKeys) {
+  if (oldProps) {
+    for (const key in oldProps) {
       const oldValue = oldProps[key];
-      const newValue = newProps[key];
-      if (key[0] === "o" && key[1] === "n") {
-        const oldEvent = node["__" + key];
-        if (oldEvent && oldEvent !== newValue || !oldEvent && oldValue !== newValue) {
+      const newValue = newProps?.[key];
+      if (oldValue !== newValue) {
+        if (newProps)
           newProps[key] = patchProperty(patch, node, key, oldValue, newValue, isSvg);
-        }
-        node["__" + key] = newValue;
-      } else if (oldValue !== newValue) {
-        newProps[key] = patchProperty(patch, node, key, oldValue, newValue, isSvg);
+        else
+          patchProperty(patch, node, key, oldValue, undefined, isSvg);
       }
     }
-  } else {
-    for (const key in oldProps) {
-      const oldValue = oldProps[key];
-      oldProps[key] = patchProperty(patch, node, key, oldValue, undefined, isSvg);
+  }
+  if (newProps && oldProps) {
+    for (const key in newProps) {
+      if (!(key in oldProps)) {
+        const newValue = newProps[key];
+        newProps[key] = patchProperty(patch, node, key, undefined, newValue, isSvg);
+      }
+    }
+  } else if (newProps) {
+    for (const key in newProps) {
+      const newValue = newProps[key];
+      newProps[key] = patchProperty(patch, node, key, undefined, newValue, isSvg);
     }
   }
 }