valyrian.js 7.2.1 → 7.2.2

package/dist/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/hooks/index.ts"],"names":[],"mappings":"AAQA,oBAAY,IAAI,GAAG,GAAG,CAAC;AAEvB,MAAM,WAAW,cAAc;IAE7B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IAElC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IAE/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC;IAEhC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC;IAE/B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC;CACnC;AAED,MAAM,WAAW,UAAU;IAEzB,CAAC,cAAc,EAAE,cAAc,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;CAC3D;AAED,eAAO,MAAM,UAAU,YAiFG,CAAC;AAS3B,eAAO,MAAM,QAAQ,YA7FyB,GAAG,EAAE,KAAK,GAgHtD,CAAC;AAGH,eAAO,MAAM,SAAS,YAnHwB,GAAG,EAAE,KAAK,GAuKtD,CAAC;AAEH,eAAO,MAAM,MAAM,YAzK2B,GAAG,EAAE,KAAK,GAgLtD,CAAC;AAEH,eAAO,MAAM,WAAW,YAlLsB,GAAG,EAAE,KAAK,GAgMtD,CAAC;AAEH,eAAO,MAAM,OAAO,YAlM0B,GAAG,EAAE,KAAK,GAkNtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/hooks/index.ts"],"names":[],"mappings":"AAQA,oBAAY,IAAI,GAAG,GAAG,CAAC;AAEvB,MAAM,WAAW,cAAc;IAE7B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IAElC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IAE/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC;IAEhC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC;IAE/B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC;CACnC;AAED,MAAM,WAAW,UAAU;IAEzB,CAAC,cAAc,EAAE,cAAc,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;CAC3D;AAED,eAAO,MAAM,UAAU,YAiEG,CAAC;AAS3B,eAAO,MAAM,QAAQ,YA7EyB,GAAG,EAAE,KAAK,GAgGtD,CAAC;AAGH,eAAO,MAAM,SAAS,YAnGwB,GAAG,EAAE,KAAK,GAuJtD,CAAC;AAEH,eAAO,MAAM,MAAM,YAzJ2B,GAAG,EAAE,KAAK,GAgKtD,CAAC;AAEH,eAAO,MAAM,WAAW,YAlKsB,GAAG,EAAE,KAAK,GAgLtD,CAAC;AAEH,eAAO,MAAM,OAAO,YAlL0B,GAAG,EAAE,KAAK,GAkMtD,CAAC"}

package/dist/hooks/index.js

@@ -36,33 +36,31 @@ var createHook = function createHook2({
   returnValue
 }) {
   return (...args) => {
-    let { component, vnode, oldVnode } = import_valyrian.current;
-    if (!vnode.components) {
-      vnode.components = [];
-      (0, import_valyrian.onUnmount)(() => Reflect.deleteProperty(vnode, "components"));
-    }
-    if (vnode.components.indexOf(component) === -1) {
-      vnode.components.push(component);
-    }
-    if (!component.hooks) {
-      component.hooks = [];
-      (0, import_valyrian.onUnmount)(() => Reflect.deleteProperty(component, "hooks"));
+    let { component, vnode } = import_valyrian.current;
+    let hook = null;
+    if (vnode) {
+      if (!vnode.components) {
+        vnode.components = [];
+      }
+      if (vnode.components.indexOf(component) === -1) {
+        vnode.hook_calls = -1;
+        vnode.components.push(component);
+        if (!component.hooks) {
+          component.hooks = [];
+          (0, import_valyrian.onUnmount)(() => Reflect.deleteProperty(component, "hooks"));
+        }
+      }
+      hook = component.hooks[++vnode.hook_calls];
     }
-    let hook = void 0;
-    if (!oldVnode || !oldVnode.components || oldVnode.components[vnode.components.length - 1] !== component) {
+    if (!hook) {
       hook = onCreate(...args);
-      component.hooks.push(hook);
+      if (vnode) {
+        component.hooks.push(hook);
+      }
       if (onRemove) {
         (0, import_valyrian.onUnmount)(() => onRemove(hook));
       }
     } else {
-      if ("calls" in component === false) {
-        component.calls = -1;
-        (0, import_valyrian.onUnmount)(() => Reflect.deleteProperty(component, "calls"));
-      }
-      (0, import_valyrian.onCleanup)(() => component.calls = -1);
-      component.calls++;
-      hook = component.hooks[component.calls];
       if (onUpdateHook) {
         onUpdateHook(hook, ...args);
       }
@@ -83,18 +81,20 @@ function delayedUpdate() {
 }
 var useState = createHook({
   onCreate: (value) => {
-    let stateObj = /* @__PURE__ */ Object.create(null);
-    stateObj.value = value;
-    stateObj.toJSON = stateObj.toString = stateObj.valueOf = () => typeof stateObj.value === "function" ? stateObj.value() : stateObj.value;
-    return [
-      stateObj,
-      (value2) => {
-        if (stateObj.value !== value2) {
-          stateObj.value = value2;
-          delayedUpdate();
-        }
+    function get() {
+      return value;
+    }
+    get.value = value;
+    get.toJSON = get.valueOf = get;
+    get.toString = () => `${value}`;
+    function set(newValue) {
+      if (value !== newValue) {
+        value = newValue;
+        get.value = newValue;
+        delayedUpdate();
       }
-    ];
+    }
+    return [get, set];
   }
 });
 var useEffect = createHook({

package/dist/hooks/index.mjs

@@ -8,33 +8,31 @@ var createHook = function createHook2({
   returnValue
 }) {
   return (...args) => {
-    let { component, vnode, oldVnode } = current;
-    if (!vnode.components) {
-      vnode.components = [];
-      onUnmount(() => Reflect.deleteProperty(vnode, "components"));
-    }
-    if (vnode.components.indexOf(component) === -1) {
-      vnode.components.push(component);
-    }
-    if (!component.hooks) {
-      component.hooks = [];
-      onUnmount(() => Reflect.deleteProperty(component, "hooks"));
+    let { component, vnode } = current;
+    let hook = null;
+    if (vnode) {
+      if (!vnode.components) {
+        vnode.components = [];
+      }
+      if (vnode.components.indexOf(component) === -1) {
+        vnode.hook_calls = -1;
+        vnode.components.push(component);
+        if (!component.hooks) {
+          component.hooks = [];
+          onUnmount(() => Reflect.deleteProperty(component, "hooks"));
+        }
+      }
+      hook = component.hooks[++vnode.hook_calls];
     }
-    let hook = void 0;
-    if (!oldVnode || !oldVnode.components || oldVnode.components[vnode.components.length - 1] !== component) {
+    if (!hook) {
       hook = onCreate(...args);
-      component.hooks.push(hook);
+      if (vnode) {
+        component.hooks.push(hook);
+      }
       if (onRemove) {
         onUnmount(() => onRemove(hook));
       }
     } else {
-      if ("calls" in component === false) {
-        component.calls = -1;
-        onUnmount(() => Reflect.deleteProperty(component, "calls"));
-      }
-      onCleanup(() => component.calls = -1);
-      component.calls++;
-      hook = component.hooks[component.calls];
       if (onUpdateHook) {
         onUpdateHook(hook, ...args);
       }
@@ -55,18 +53,20 @@ function delayedUpdate() {
 }
 var useState = createHook({
   onCreate: (value) => {
-    let stateObj = /* @__PURE__ */ Object.create(null);
-    stateObj.value = value;
-    stateObj.toJSON = stateObj.toString = stateObj.valueOf = () => typeof stateObj.value === "function" ? stateObj.value() : stateObj.value;
-    return [
-      stateObj,
-      (value2) => {
-        if (stateObj.value !== value2) {
-          stateObj.value = value2;
-          delayedUpdate();
-        }
+    function get() {
+      return value;
+    }
+    get.value = value;
+    get.toJSON = get.valueOf = get;
+    get.toString = () => `${value}`;
+    function set(newValue) {
+      if (value !== newValue) {
+        value = newValue;
+        get.value = newValue;
+        delayedUpdate();
       }
-    ];
+    }
+    return [get, set];
   }
 });
 var useEffect = createHook({

package/dist/signal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/signal/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,CAAC,YAAY,KAAA,OAmGlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/signal/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,CAAC,YAAY,KAAA,OA+GlC"}

package/dist/signal/index.js

@@ -24,15 +24,22 @@ __export(signal_exports, {
 module.exports = __toCommonJS(signal_exports);
 var import_valyrian = require("valyrian.js");
 function Signal(initialValue) {
-  const context = { ...import_valyrian.current };
-  if (context.vnode) {
-    if (!context.vnode.signals) {
-      context.vnode.signals = context.oldVnode?.signals || [];
-      context.vnode.calls = -1;
-      context.vnode.subscribers = context.oldVnode?.subscribers || [];
-      context.vnode.initialChildren = [...context.vnode.children];
+  const { vnode, oldVnode, component } = { ...import_valyrian.current };
+  if (vnode) {
+    if (!vnode.components) {
+      vnode.components = [];
     }
-    let signal2 = context.vnode.signals[++context.vnode.calls];
+    if (vnode.components.indexOf(component) === -1) {
+      vnode.subscribers = oldVnode?.subscribers || [];
+      vnode.initialChildren = [...vnode.children];
+      vnode.signal_calls = -1;
+      vnode.components.push(component);
+      if (!component.signals) {
+        component.signals = [];
+        (0, import_valyrian.onUnmount)(() => Reflect.deleteProperty(component, "signals"));
+      }
+    }
+    let signal2 = component.signals[++vnode.signal_calls];
     if (signal2) {
       return signal2;
     }
@@ -56,22 +63,22 @@ function Signal(initialValue) {
     for (let i = 0, l = subscribers.length; i < l; i++) {
       subscribers[i](value);
     }
-    if (context.vnode) {
-      let newVnode = (0, import_valyrian.v)(context.vnode.tag, context.vnode.props, ...context.vnode.initialChildren);
-      newVnode.dom = context.vnode.dom;
-      newVnode.isSVG = context.vnode.isSVG;
-      context.vnode.subscribers.forEach(
+    if (vnode) {
+      let newVnode = (0, import_valyrian.v)(vnode.tag, vnode.props, ...vnode.initialChildren);
+      newVnode.dom = vnode.dom;
+      newVnode.isSVG = vnode.isSVG;
+      vnode.subscribers.forEach(
         (subscribers2) => subscribers2.length = 0
       );
-      context.vnode.subscribers = [];
-      return (0, import_valyrian.updateVnode)(newVnode, context.vnode);
+      vnode.subscribers = [];
+      return (0, import_valyrian.updateVnode)(newVnode, vnode);
     }
     return (0, import_valyrian.update)();
   };
   let signal = [get, set, subscribe];
-  if (context.vnode) {
-    context.vnode.signals.push(signal);
-    context.vnode.subscribers.push(subscribers);
+  if (vnode) {
+    component.signals.push(signal);
+    vnode.subscribers.push(subscribers);
   }
   return signal;
 }

package/dist/signal/index.mjs

@@ -1,15 +1,22 @@
 // lib/signal/index.ts
-import { current, update, updateVnode, v } from "valyrian.js";
+import { current, onUnmount, update, updateVnode, v } from "valyrian.js";
 function Signal(initialValue) {
-  const context = { ...current };
-  if (context.vnode) {
-    if (!context.vnode.signals) {
-      context.vnode.signals = context.oldVnode?.signals || [];
-      context.vnode.calls = -1;
-      context.vnode.subscribers = context.oldVnode?.subscribers || [];
-      context.vnode.initialChildren = [...context.vnode.children];
+  const { vnode, oldVnode, component } = { ...current };
+  if (vnode) {
+    if (!vnode.components) {
+      vnode.components = [];
     }
-    let signal2 = context.vnode.signals[++context.vnode.calls];
+    if (vnode.components.indexOf(component) === -1) {
+      vnode.subscribers = oldVnode?.subscribers || [];
+      vnode.initialChildren = [...vnode.children];
+      vnode.signal_calls = -1;
+      vnode.components.push(component);
+      if (!component.signals) {
+        component.signals = [];
+        onUnmount(() => Reflect.deleteProperty(component, "signals"));
+      }
+    }
+    let signal2 = component.signals[++vnode.signal_calls];
     if (signal2) {
       return signal2;
     }
@@ -33,22 +40,22 @@ function Signal(initialValue) {
     for (let i = 0, l = subscribers.length; i < l; i++) {
       subscribers[i](value);
     }
-    if (context.vnode) {
-      let newVnode = v(context.vnode.tag, context.vnode.props, ...context.vnode.initialChildren);
-      newVnode.dom = context.vnode.dom;
-      newVnode.isSVG = context.vnode.isSVG;
-      context.vnode.subscribers.forEach(
+    if (vnode) {
+      let newVnode = v(vnode.tag, vnode.props, ...vnode.initialChildren);
+      newVnode.dom = vnode.dom;
+      newVnode.isSVG = vnode.isSVG;
+      vnode.subscribers.forEach(
         (subscribers2) => subscribers2.length = 0
       );
-      context.vnode.subscribers = [];
-      return updateVnode(newVnode, context.vnode);
+      vnode.subscribers = [];
+      return updateVnode(newVnode, vnode);
     }
     return update();
   };
   let signal = [get, set, subscribe];
-  if (context.vnode) {
-    context.vnode.signals.push(signal);
-    context.vnode.subscribers.push(subscribers);
+  if (vnode) {
+    component.signals.push(signal);
+    vnode.subscribers.push(subscribers);
   }
   return signal;
 }

package/lib/hooks/index.ts

@@ -34,35 +34,37 @@ export const createHook = function createHook({
   returnValue
 }: HookDefinition): Hook {
   return (...args: any[]) => {
-    let { component, vnode, oldVnode } = current as CurrentOnPatch;
+    let { component, vnode } = current as CurrentOnPatch;
 
-    // Init the components array for the current vnode
-    if (!vnode.components) {
-      vnode.components = [];
-      onUnmount(() => Reflect.deleteProperty(vnode, "components"));
-    }
+    let hook = null;
 
-    // Add the component to the components array if it's not already there
-    if (vnode.components.indexOf(component) === -1) {
-      vnode.components.push(component);
-    }
+    if (vnode) {
+      // Init the components array for the current vnode
+      if (!vnode.components) {
+        vnode.components = [];
+      }
 
-    // Init the component hooks array
-    if (!component.hooks) {
-      component.hooks = [];
-      onUnmount(() => Reflect.deleteProperty(component, "hooks"));
-    }
+      if (vnode.components.indexOf(component) === -1) {
+        vnode.hook_calls = -1;
+        vnode.components.push(component);
+        if (!component.hooks) {
+          component.hooks = [];
+          onUnmount(() => Reflect.deleteProperty(component, "hooks"));
+        }
+      }
 
-    let hook: Hook = undefined;
+      hook = component.hooks[++vnode.hook_calls];
+    }
 
-    // if no old vnode or old vnode has no components or old vnode's last component is not the current component
-    // we are mounting the component for the first time so we create a new hook
-    if (!oldVnode || !oldVnode.components || oldVnode.components[vnode.components.length - 1] !== component) {
+    // If the hook doesn't exist, create it
+    if (!hook) {
       // create a new hook
       hook = onCreate(...args);
 
-      // add the hook to the component's hooks array
-      component.hooks.push(hook);
+      if (vnode) {
+        // Add the hook to the component
+        component.hooks.push(hook);
+      }
 
       // if we have a onRemove hook, add it to the onUnmount set
       if (onRemove) {
@@ -70,24 +72,6 @@ export const createHook = function createHook({
         onUnmount(() => onRemove(hook));
       }
     } else {
-      // old vnode has components, we are updating the component
-
-      // Set the calls property to the current component if it's not already set
-      if ("calls" in component === false) {
-        component.calls = -1;
-        onUnmount(() => Reflect.deleteProperty(component, "calls"));
-      }
-
-      // Reset the calls property to -1 on cleanup so we can detect if the component is updated again
-      onCleanup(() => (component.calls = -1));
-
-      // Increment the calls property
-      component.calls++;
-
-      // Get the current hook from the component's hooks array
-      hook = component.hooks[component.calls];
-
-      // If we have an onUpdate hook, call it
       if (onUpdateHook) {
         onUpdateHook(hook, ...args);
       }
@@ -118,22 +102,22 @@ function delayedUpdate() {
 // Use state hook
 export const useState = createHook({
   onCreate: (value) => {
-    let stateObj = Object.create(null);
-    stateObj.value = value;
-    stateObj.toJSON =
-      stateObj.toString =
-      stateObj.valueOf =
-        () => (typeof stateObj.value === "function" ? stateObj.value() : stateObj.value);
-
-    return [
-      stateObj,
-      (value: any) => {
-        if (stateObj.value !== value) {
-          stateObj.value = value;
-          delayedUpdate();
-        }
+    function get() {
+      return value;
+    }
+    get.value = value;
+    get.toJSON = get.valueOf = get;
+    get.toString = () => `${value}`;
+
+    function set(newValue) {
+      if (value !== newValue) {
+        value = newValue;
+        get.value = newValue;
+        delayedUpdate();
       }
-    ];
+    }
+
+    return [get, set];
   }
 });
 

package/lib/signal/index.ts

@@ -1,26 +1,38 @@
-import { VnodeWithDom, current, update, updateVnode, v } from "valyrian.js";
+import { VnodeWithDom, current, onUnmount, update, updateVnode, v } from "valyrian.js";
 
 export function Signal(initialValue) {
   // Create a copy of the current context object
-  const context = { ...current };
+  const { vnode, oldVnode, component } = { ...current };
 
   // Check if the context object has a vnode property
-  if (context.vnode) {
+  if (vnode) {
     // Is first call
-    if (!context.vnode.signals) {
-      // Set the signals property to the signals property of the oldVnode object, or an empty array if that doesn't exist
-      context.vnode.signals = context.oldVnode?.signals || [];
-      // Set the calls property to -1
-      context.vnode.calls = -1;
-      // Set the subscribers property to the subscribers property of the oldVnode object, or an empty array if that doesn't exist
-      context.vnode.subscribers = context.oldVnode?.subscribers || [];
+    if (!vnode.components) {
+      // Set the components property to an empty array
+      vnode.components = [];
+    }
 
+    if (vnode.components.indexOf(component) === -1) {
+      // Set the subscribers property to the subscribers property of the oldVnode object, or an empty array if that doesn't exist
+      vnode.subscribers = oldVnode?.subscribers || [];
       // Set the initialChildren property of the vnode object to a copy of the children array of the vnode object
-      context.vnode.initialChildren = [...context.vnode.children];
+      vnode.initialChildren = [...vnode.children];
+
+      // Set the calls property to -1
+      vnode.signal_calls = -1;
+      // Add the component to the components array
+      vnode.components.push(component);
+
+      if (!component.signals) {
+        // Set the signals property of the component object to an empty array
+        component.signals = [];
+        // Add a function to the cleanup stack that removes the signals property from the component object
+        onUnmount(() => Reflect.deleteProperty(component, "signals"));
+      }
     }
 
     // Assign the signal variable to the signal stored at the index of the vnode object's calls property in the vnode's signals array
-    let signal = context.vnode.signals[++context.vnode.calls];
+    let signal = component.signals[++vnode.signal_calls];
 
     // If a signal has already been assigned to the signal variable, return it
     if (signal) {
@@ -63,24 +75,24 @@ export function Signal(initialValue) {
     }
 
     // Check if the context object has a vnode property
-    if (context.vnode) {
+    if (vnode) {
       // If it does, create a new vnode object based on the original vnode, its children, and its DOM and SVG properties
-      let newVnode = v(context.vnode.tag, context.vnode.props, ...context.vnode.initialChildren) as VnodeWithDom;
-      newVnode.dom = context.vnode.dom;
-      newVnode.isSVG = context.vnode.isSVG;
+      let newVnode = v(vnode.tag, vnode.props, ...vnode.initialChildren) as VnodeWithDom;
+      newVnode.dom = vnode.dom;
+      newVnode.isSVG = vnode.isSVG;
 
       // Clear the subscribers array by setting the length property to 0
-      context.vnode.subscribers.forEach(
+      vnode.subscribers.forEach(
         (subscribers) =>
           // Setting the length property to 0 is faster than clearing the array with a loop
           (subscribers.length = 0)
       );
 
       // Clear the subscribers array by setting it to an empty array
-      context.vnode.subscribers = [];
+      vnode.subscribers = [];
 
       // Return the result of updating the original vnode with the new vnode
-      return updateVnode(newVnode, context.vnode);
+      return updateVnode(newVnode, vnode);
     }
 
     // If the context object doesn't have a vnode property, return the result of calling the update function
@@ -92,9 +104,9 @@ export function Signal(initialValue) {
 
   // If the context object has a vnode property, add the signal to the vnode's signals array
   // and add the subscribers array to the vnode's subscribers array
-  if (context.vnode) {
-    context.vnode.signals.push(signal);
-    context.vnode.subscribers.push(subscribers);
+  if (vnode) {
+    component.signals.push(signal);
+    vnode.subscribers.push(subscribers);
   }
 
   // Return the signal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valyrian.js",
-  "version": "7.2.1",
+  "version": "7.2.2",
   "description": "Lightweight steel to forge PWAs. (Minimal Frontend Framework with server side rendering and other capabilities)",
   "repository": "git@github.com:Masquerade-Circus/valyrian.js.git",
   "author": "Masquerade <christian@masquerade-circus.net>",