@3sln/dodo 0.0.7 → 0.0.9

package/index.js

@@ -1,14 +1,15 @@
 import vdomFactory from './src/vdom.js';
 import htmlFactory from './src/html.js';
-import * as scheduler from './src/scheduler.js';
+import schedulerFactory from './src/scheduler.js';
 
 function dodoFactory(userSettings) {
   const vdomInstance = vdomFactory(userSettings);
   const htmlInstance = htmlFactory(vdomInstance);
+  const schedulerInstance = schedulerFactory(userSettings);
   return {
     ...vdomInstance,
     ...htmlInstance,
-    ...scheduler,
+    ...schedulerInstance,
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3sln/dodo",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "A minimal, configurable virtual DOM library.",
   "main": "index.js",
   "type": "module",

package/src/scheduler.js

@@ -1,79 +1,85 @@
-let scheduled = false;
-let frameId = 0;
-let queue = [];
+export default function factory({window} = {}) {
+  const requestAnimationFrame = window?.requestAnimationFrame ?? globalThis.requestAnimationFrame;
+  const cancelAnimationFrame = window?.cancelAnimationFrame ?? globalThis.cancelAnimationFrame;
+  let scheduled = false;
+  let frameId = 0;
+  let queue = [];
 
-const FRAME_BUDGET = 10; // ms
-const CHUNK_SIZE = 100;
+  const FRAME_BUDGET = 10; // ms
+  const CHUNK_SIZE = 100;
 
-function _runTasks(tasks) {
-  for (const f of tasks) {
-    try {
-      f();
-    } catch (err) {
-      console.error('Error in scheduled function:', err);
+  function _runTasks(tasks) {
+    for (const f of tasks) {
+      try {
+        f();
+      } catch (err) {
+        console.error('Error in scheduled function:', err);
+      }
     }
   }
-}
 
-function runQueue() {
-  const startTime = performance.now();
-  frameId = 0;
+  function runQueue() {
+    const startTime = performance.now();
+    frameId = 0;
 
-  while (queue.length > 0) {
-    const chunk = queue.splice(0, CHUNK_SIZE);
-    _runTasks(chunk);
+    while (queue.length > 0) {
+      const chunk = queue.splice(0, CHUNK_SIZE);
+      _runTasks(chunk);
 
-    if (performance.now() - startTime > FRAME_BUDGET && queue.length > 0) {
-      frameId = requestAnimationFrame(runQueue);
-      return;
+      if (performance.now() - startTime > FRAME_BUDGET && queue.length > 0) {
+        frameId = requestAnimationFrame(runQueue);
+        return;
+      }
     }
-  }
-
-  scheduled = false;
-}
 
-// Schedules a function to be executed on the next animation frame.
-export function schedule(f, {signal} = {}) {
-  if (signal?.aborted) {
-    return;
+    scheduled = false;
   }
 
-  let task = f;
-  // If a signal is provided, wrap the task to check for abortion before execution.
-  if (signal) {
-    task = () => {
-      if (!signal.aborted) {
-        f();
-      }
-    };
-  }
+  // Schedules a function to be executed on the next animation frame.
+  function schedule(f, {signal} = {}) {
+    if (signal?.aborted) {
+      return;
+    }
+
+    let task = f;
+    // If a signal is provided, wrap the task to check for abortion before execution.
+    if (signal) {
+      task = () => {
+        if (!signal.aborted) {
+          f();
+        }
+      };
+    }
 
-  queue.push(task);
+    queue.push(task);
 
-  if (!scheduled) {
-    scheduled = true;
-    frameId = requestAnimationFrame(runQueue);
+    if (!scheduled) {
+      scheduled = true;
+      frameId = requestAnimationFrame(runQueue);
+    }
   }
-}
 
-// Immediately runs all queued tasks synchronously.
-export function flush() {
-  if (frameId) {
-    cancelAnimationFrame(frameId);
+  // Immediately runs all queued tasks synchronously.
+  function flush() {
+    if (frameId) {
+      cancelAnimationFrame(frameId);
+    }
+    const toRun = queue;
+    queue = [];
+    _runTasks(toRun);
+    scheduled = false;
+    frameId = 0;
   }
-  const toRun = queue;
-  queue = [];
-  _runTasks(toRun);
-  scheduled = false;
-  frameId = 0;
-}
 
-// Clears all pending tasks.
-export function clear() {
-  if (frameId) {
-    cancelAnimationFrame(frameId);
+  // Clears all pending tasks.
+  function clear() {
+    if (frameId) {
+      cancelAnimationFrame(frameId);
+    }
+    queue = [];
+    scheduled = false;
+    frameId = 0;
   }
-  queue = [];
-  scheduled = false;
-  frameId = 0;
+
+  return {schedule, flush, clear};
 }

package/src/vdom.js

@@ -395,7 +395,8 @@ export default userSettings => {
       }
     } else {
       const oldHooks = state.vdom.hooks ?? EMPTY_MAP;
-      const hooksIterator = toIterator(mapIter(hooks));
+      const newHooks = hooks ?? EMPTY_MAP;
+      const hooksIterator = toIterator(mapIter(newHooks));
       let result;
       while (!(result = hooksIterator.next()).done) {
         const [name, listener] = result.value;
@@ -427,7 +428,7 @@ export default userSettings => {
       while (!(result = oldHooksIterator.next()).done) {
         const [name] = result.value;
         const hookName = convertHookName(name);
-        if (hookName[0] === '$' || mapGet(hooks, name) !== undefined) continue;
+        if (hookName[0] === '$' || mapGet(newHooks, name) !== undefined) continue;
         const oldListener = mapGet(oldHooks, name);
         if (typeof oldListener === 'function') {
           target.removeEventListener(hookName, oldListener);
@@ -459,10 +460,10 @@ export default userSettings => {
         break;
       }
       case ALIAS_NODE: {
-        const innerVdom = newVdom.tag.apply(undefined, newVdom.args);
+        const innerVdom = newVdom.tag.apply(target, newVdom.args);
         if (innerVdom === undefined || innerVdom === null) break;
         if (isSeq(innerVdom)) {
-          reconcileElementChildren(target, flattenSeq(innerVdom));
+          reconcileElementChildren(target, flattenSeq(innerVdom, true));
         } else {
           reconcileElementChildren(target, flattenVNodeChildren([innerVdom]));
         }
@@ -651,6 +652,7 @@ export default userSettings => {
       target.removeChild(nodeToRemove);
     }
 
+    const window = userSettings?.window ?? target.ownerDocument.defaultView;
     const moveBefore = window.Element.prototype.moveBefore;
     const insertBefore = window.Element.prototype.insertBefore;
     if (target.isConnected) {
@@ -748,7 +750,7 @@ export default userSettings => {
     }
 
     if (isSeq(vdom)) {
-      reconcileElementChildren(target, flattenSeq(vdom));
+      reconcileElementChildren(target, flattenSeq(vdom, true));
       return;
     }