@ryupold/vode 1.8.7 → 1.8.10

package/dist/vode.mjs

@@ -17,53 +17,62 @@ function app(container, state, dom, ...initialPatches) {
   const _vode = {};
   _vode.syncRenderer = globals.requestAnimationFrame;
   _vode.asyncRenderer = globals.startViewTransition;
-  _vode.qSync = null;
+  _vode.isRendering = 0;
   _vode.qAsync = null;
   _vode.stats = { lastSyncRenderTime: 0, lastAsyncRenderTime: 0, syncRenderCount: 0, asyncRenderCount: 0, liveEffectCount: 0, patchCount: 0, syncRenderPatchCount: 0, asyncRenderPatchCount: 0 };
   const patchableState = state;
   if ("patch" in state && typeof state.patch === "function" && Array.isArray(state.patch.initialPatches)) {
     initialPatches = [...state.patch.initialPatches, ...initialPatches];
   }
+  async function promisePatch(action, isAnimated) {
+    _vode.stats.liveEffectCount++;
+    try {
+      const resolvedPatch = await action;
+      patchableState.patch(resolvedPatch, isAnimated);
+    } finally {
+      _vode.stats.liveEffectCount--;
+    }
+  }
+  async function generatorPatch(action, isAnimated) {
+    const generator = action;
+    _vode.stats.liveEffectCount++;
+    try {
+      let v = await generator.next();
+      while (v.done === false) {
+        _vode.stats.liveEffectCount++;
+        try {
+          patchableState.patch(v.value, isAnimated);
+          v = await generator.next();
+        } finally {
+          _vode.stats.liveEffectCount--;
+        }
+      }
+      patchableState.patch(v.value, isAnimated);
+    } finally {
+      _vode.stats.liveEffectCount--;
+    }
+  }
   Object.defineProperty(state, "patch", {
     enumerable: false,
     configurable: true,
     writable: false,
-    value: async (action, isAsync) => {
-      if (!action || typeof action !== "function" && typeof action !== "object") return;
+    value: (action, isAnimated) => {
+      while (typeof action === "function") {
+        action = action(_vode.state);
+      }
+      if (!action || typeof action !== "object") return;
       _vode.stats.patchCount++;
       if (action?.next) {
-        const generator = action;
-        _vode.stats.liveEffectCount++;
-        try {
-          let v = await generator.next();
-          while (v.done === false) {
-            _vode.stats.liveEffectCount++;
-            try {
-              patchableState.patch(v.value, isAsync);
-              v = await generator.next();
-            } finally {
-              _vode.stats.liveEffectCount--;
-            }
-          }
-          patchableState.patch(v.value, isAsync);
-        } finally {
-          _vode.stats.liveEffectCount--;
-        }
+        generatorPatch(action, isAnimated);
       } else if (action.then) {
-        _vode.stats.liveEffectCount++;
-        try {
-          const resolvedPatch = await action;
-          patchableState.patch(resolvedPatch, isAsync);
-        } finally {
-          _vode.stats.liveEffectCount--;
-        }
+        promisePatch(action, isAnimated);
       } else if (Array.isArray(action)) {
         if (action.length > 0) {
           for (const p of action) {
             patchableState.patch(p, !document.hidden && !!_vode.asyncRenderer);
           }
         } else {
-          _vode.qSync = mergeState(_vode.qSync || {}, _vode.qAsync, false);
+          mergeState(_vode.state, _vode.qAsync, true);
           _vode.qAsync = null;
           try {
             globals.currentViewTransition?.skipTransition();
@@ -72,34 +81,34 @@ function app(container, state, dom, ...initialPatches) {
           _vode.stats.syncRenderPatchCount++;
           _vode.renderSync();
         }
-      } else if (typeof action === "function") {
-        patchableState.patch(action(_vode.state), isAsync);
       } else {
-        if (isAsync) {
+        if (isAnimated) {
           _vode.stats.asyncRenderPatchCount++;
           _vode.qAsync = mergeState(_vode.qAsync || {}, action, false);
-          await _vode.renderAsync();
+          _vode.renderAsync();
         } else {
           _vode.stats.syncRenderPatchCount++;
-          _vode.qSync = mergeState(_vode.qSync || {}, action, false);
+          mergeState(_vode.state, action, true);
           _vode.renderSync();
         }
       }
     }
   });
-  function renderDom(isAsync) {
-    const sw = Date.now();
+  function renderDom(isAnimated) {
+    const sw = performance.now();
     const vom = dom(_vode.state);
     _vode.vode = render(_vode.state, container.parentElement, 0, 0, _vode.vode, vom);
     if (container.tagName.toUpperCase() !== vom[0].toUpperCase()) {
       container = _vode.vode.node;
       container._vode = _vode;
     }
-    if (!isAsync) {
-      _vode.stats.lastSyncRenderTime = Date.now() - sw;
+    if (!isAnimated) {
+      _vode.stats.lastSyncRenderTime = performance.now() - sw;
+      const changesSinceRender = _vode.isRendering !== _vode.stats.syncRenderPatchCount;
       _vode.stats.syncRenderCount++;
-      _vode.isRendering = false;
-      if (_vode.qSync) _vode.renderSync();
+      _vode.isRendering = 0;
+      if (changesSinceRender)
+        _vode.renderSync();
     }
   }
   const sr = renderDom.bind(null, false);
@@ -109,10 +118,8 @@ function app(container, state, dom, ...initialPatches) {
     configurable: true,
     writable: false,
     value: () => {
-      if (_vode.isRendering || !_vode.qSync) return;
-      _vode.isRendering = true;
-      _vode.state = mergeState(_vode.state, _vode.qSync, true);
-      _vode.qSync = null;
+      if (_vode.isRendering) return;
+      _vode.isRendering = _vode.stats.syncRenderPatchCount;
       _vode.syncRenderer(sr);
     }
   });
@@ -125,14 +132,14 @@ function app(container, state, dom, ...initialPatches) {
       await globals.currentViewTransition?.updateCallbackDone;
       if (_vode.isAnimating || !_vode.qAsync || document.hidden) return;
       _vode.isAnimating = true;
-      const sw = Date.now();
+      const sw = performance.now();
       try {
         _vode.state = mergeState(_vode.state, _vode.qAsync, true);
         _vode.qAsync = null;
         globals.currentViewTransition = _vode.asyncRenderer(ar);
         await globals.currentViewTransition?.updateCallbackDone;
       } finally {
-        _vode.stats.lastAsyncRenderTime = Date.now() - sw;
+        _vode.stats.lastAsyncRenderTime = performance.now() - sw;
         _vode.stats.asyncRenderCount++;
         _vode.isAnimating = false;
       }
@@ -143,7 +150,8 @@ function app(container, state, dom, ...initialPatches) {
   const root = container;
   root._vode = _vode;
   const indexInParent = Array.from(container.parentElement.children).indexOf(container);
-  _vode.isRendering = true;
+  const patchCountBefore = _vode.stats.syncRenderPatchCount;
+  _vode.isRendering = _vode.stats.syncRenderPatchCount;
   _vode.vode = render(
     state,
     container.parentElement,
@@ -152,8 +160,10 @@ function app(container, state, dom, ...initialPatches) {
     hydrate(container, true),
     dom(state)
   );
-  _vode.isRendering = false;
-  if (_vode.qSync) _vode.renderSync();
+  const continueRendering = _vode.stats.syncRenderPatchCount !== patchCountBefore;
+  _vode.isRendering = 0;
+  _vode.stats.syncRenderCount++;
+  if (continueRendering) _vode.renderSync();
   for (const effect of initialPatches) {
     patchableState.patch(effect);
   }
@@ -231,11 +241,15 @@ function hydrate(element, prepareForRender) {
     return void 0;
   }
 }
-function memo(compare, componentOrProps) {
+function memo(compare, component) {
   if (!compare || !Array.isArray(compare)) throw new Error("first argument to memo() must be an array of values to compare");
-  if (typeof componentOrProps !== "function") throw new Error("second argument to memo() must be a function that returns a vode or props object");
-  componentOrProps.__memo = compare;
-  return componentOrProps;
+  if (typeof component !== "function") throw new Error("second argument to memo() must be a function that returns a child vode");
+  if (component.__memo) {
+    const comp = component;
+    component = (s) => comp(s);
+  }
+  component.__memo = compare;
+  return component;
 }
 function createState(state) {
   if (!state || typeof state !== "object") throw new Error("createState() must be called with a state object");
@@ -360,7 +374,7 @@ function render(state, parent, childIndex, indexInParent, oldVode, newVode, xmln
         for (let i = indexInParent; i < parent.childNodes.length; i++) {
           const nextSibling = parent.childNodes[i];
           if (nextSibling) {
-            nextSibling.before(text, nextSibling);
+            nextSibling.before(text);
             inserted = true;
             break;
           }
@@ -393,7 +407,7 @@ function render(state, parent, childIndex, indexInParent, oldVode, newVode, xmln
         for (let i = indexInParent; i < parent.childNodes.length; i++) {
           const nextSibling = parent.childNodes[i];
           if (nextSibling) {
-            nextSibling.before(newNode, nextSibling);
+            nextSibling.before(newNode);
             inserted = true;
             break;
           }
@@ -402,12 +416,12 @@ function render(state, parent, childIndex, indexInParent, oldVode, newVode, xmln
           parent.appendChild(newNode);
         }
       }
-      const newKids = children(newVode);
-      if (newKids) {
+      const newStart = childrenStart(newVode);
+      if (newStart > 0) {
         const childOffset = !!properties ? 2 : 1;
         let indexP = 0;
-        for (let i = 0; i < newKids.length; i++) {
-          const child2 = newKids[i];
+        for (let i = 0; i < newVode.length - newStart; i++) {
+          const child2 = newVode[i + newStart];
           const attached = render(state, newNode, i, indexP, void 0, child2, xmlns ?? null);
           newVode[i + childOffset] = attached;
           if (attached) indexP++;
@@ -421,41 +435,31 @@ function render(state, parent, childIndex, indexInParent, oldVode, newVode, xmln
     }
     if (!oldIsText && isNode && oldVode[0] === newVode[0]) {
       newVode.node = oldNode;
-      const newvode = newVode;
-      const oldvode = oldVode;
       const properties = props(newVode);
       const oldProps = props(oldVode);
-      if (properties?.xmlns !== void 0) xmlns = properties.xmlns;
-      if (newvode[1]?.__memo) {
-        const prev = newvode[1];
-        newvode[1] = remember(state, newvode[1], oldvode[1]);
-        if (prev !== newvode[1]) {
-          patchProperties(state, oldNode, oldProps, properties, xmlns);
-        }
-      } else {
-        patchProperties(state, oldNode, oldProps, properties, xmlns);
-      }
+      if (properties?.xmlns !== void 0)
+        xmlns = properties.xmlns;
+      patchProperties(state, oldNode, oldProps, properties, xmlns);
       if (!!properties?.catch && oldProps?.catch !== properties.catch) {
         newVode.node["catch"] = null;
         newVode.node.removeAttribute("catch");
       }
-      const newKids = children(newVode);
-      const oldKids = children(oldVode);
-      if (newKids) {
-        const childOffset = !!properties ? 2 : 1;
+      const newStart = childrenStart(newVode);
+      const oldStart = childrenStart(oldVode);
+      if (newStart > 0) {
         let indexP = 0;
-        for (let i = 0; i < newKids.length; i++) {
-          const child2 = newKids[i];
-          const oldChild = oldKids && oldKids[i];
+        for (let i = 0; i < newVode.length - newStart; i++) {
+          const child2 = newVode[i + newStart];
+          const oldChild = oldStart > 0 ? oldVode[i + oldStart] : void 0;
           const attached = render(state, oldNode, i, indexP, oldChild, child2, xmlns);
-          newVode[i + childOffset] = attached;
+          newVode[i + newStart] = attached;
           if (attached) indexP++;
         }
       }
-      if (oldKids) {
-        const newKidsCount = newKids ? newKids.length : 0;
-        for (let i = oldKids.length - 1; i >= newKidsCount; i--) {
-          render(state, oldNode, i, i, oldKids[i], void 0, xmlns);
+      if (oldStart > 0) {
+        const newKidsCount = newStart > 0 ? newVode.length - newStart : 0;
+        for (let i = oldVode.length - 1 - oldStart; i >= newKidsCount; i--) {
+          render(state, oldNode, i, i, oldVode[i + oldStart], void 0, xmlns);
         }
       }
       newVode._unmountCount = (properties?.onUnmount ? 1 : 0) + sumChildUnmountCounts(newVode);
@@ -512,6 +516,9 @@ function isTextVode(x) {
   return typeof x === "string" || x?.nodeType === Node.TEXT_NODE;
 }
 function remember(state, present, past) {
+  while (typeof present === "function" && !present.__memo) {
+    present = present(state);
+  }
   if (typeof present !== "function")
     return present;
   const presentMemo = present?.__memo;
@@ -526,37 +533,13 @@ function remember(state, present, past) {
     }
     if (same) return past;
   }
-  const result = present(state);
-  if (typeof result === "function" && result?.__memo) {
-    const resultMemo = result.__memo;
-    if (Array.isArray(resultMemo) && Array.isArray(pastMemo) && resultMemo.length === pastMemo.length) {
-      let same = true;
-      for (let i = 0; i < resultMemo.length; i++) {
-        if (resultMemo[i] !== pastMemo[i]) {
-          same = false;
-          break;
-        }
-      }
-      if (same) return past;
-    }
-    const innerRender = result(state);
-    if (typeof innerRender === "object") {
-      innerRender.__memo = resultMemo;
-    }
-    return innerRender;
-  }
-  const newRender = typeof result === "function" ? unwrap(result, state) : result;
-  if (typeof newRender === "object") {
-    newRender.__memo = result?.__memo || present?.__memo;
+  while (typeof present === "function") {
+    present = present(state);
   }
-  return newRender;
-}
-function unwrap(c, s) {
-  if (typeof c === "function") {
-    return unwrap(c(s), s);
-  } else {
-    return c;
+  if (typeof present === "object") {
+    present.__memo = presentMemo;
   }
+  return present;
 }
 function patchProperties(s, node, oldProps, newProps, xmlns) {
   if (!newProps && !oldProps) return;
@@ -973,10 +956,11 @@ var ProxyStateContextImpl = class _ProxyStateContextImpl {
         }
         raw[keys[i]] = value;
       } else if (keys.length === 1) {
-        if (typeof target[keys[0]] === "object" && typeof value === "object")
+        if (typeof target[keys[0]] === "object" && typeof value === "object" && value !== null) {
           Object.assign(target[keys[0]], value);
-        else
+        } else {
           target[keys[0]] = value;
+        }
       } else {
         Object.assign(target, value);
       }