@esportsplus/template 0.15.13 → 0.15.15

package/build/attributes.js

@@ -1,6 +1,6 @@
 import { effect } from '@esportsplus/reactivity';
 import { isArray, isFunction, isObject, isString } from '@esportsplus/utilities';
-import { onCleanup } from './slot.js';
+import { ondisconnect } from './slot.js';
 import { className, raf, removeAttribute, setAttribute } from './utilities.js';
 import event from './event.js';
 let attributes = {}, delimiters = {
@@ -33,7 +33,7 @@ function set(element, value, name, wait = false) {
         }
         else {
             let id = ('e' + store(element)[key]++);
-            onCleanup(element, effect(() => {
+            ondisconnect(element, effect(() => {
                 let v = value(element);
                 if (isArray(v)) {
                     let last = v.length - 1;

package/build/event.js

@@ -1,6 +1,6 @@
 import { root } from '@esportsplus/reactivity';
 import { defineProperty } from '@esportsplus/utilities';
-import { onCleanup } from './slot.js';
+import { ondisconnect } from './slot.js';
 import { addEventListener, parentElement } from './utilities.js';
 let capture = new Set(['onblur', 'onfocus', 'onscroll']), controllers = new Map(), keys = {}, passive = new Set([
     'onmousedown', 'onmouseenter', 'onmouseleave', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onmousewheel',
@@ -26,7 +26,7 @@ export default (element, event, listener) => {
         return;
     }
     else if (event === 'ondisconnect') {
-        onCleanup(element, () => listener(element));
+        ondisconnect(element, () => listener(element));
         return;
     }
     else if (event === 'onrender') {
@@ -44,7 +44,7 @@ export default (element, event, listener) => {
     }
     if (controller) {
         controller.listeners++;
-        onCleanup(element, () => {
+        ondisconnect(element, () => {
             if (--controller.listeners) {
                 return;
             }

package/build/slot.d.ts

@@ -15,7 +15,7 @@ declare class Slot {
     splice(start: number, stop?: number, ...groups: Elements[]): Elements[];
     unshift(...groups: Elements[]): number;
 }
-declare const onCleanup: (element: Element, fn: VoidFunction) => void;
+declare const ondisconnect: (element: Element, fn: VoidFunction) => void;
 declare const _default: (marker: Element, value: unknown) => Slot;
 export default _default;
-export { onCleanup, Slot };
+export { ondisconnect, Slot };

package/build/slot.js

@@ -2,8 +2,9 @@ import { effect, root } from '@esportsplus/reactivity';
 import { isArray, isFunction, isInstanceOf, isObject } from '@esportsplus/utilities';
 import { RENDERABLE, RENDERABLE_REACTIVE, SLOT_CLEANUP } from './constants.js';
 import { hydrate } from './html/index.js';
-import { firstChild, nextSibling, nodeValue, raf, text } from './utilities.js';
-let cleanup = [], scheduled = false;
+import { firstChild, microtask, nextSibling, nodeValue, raf, text } from './utilities.js';
+import queue from '@esportsplus/queue';
+let cleanup = queue(1024), scheduled = false;
 function after(anchor, groups) {
     for (let i = 0, n = groups.length; i < n; i++) {
         let group = groups[i];
@@ -20,7 +21,7 @@ function remove(...groups) {
         for (let j = 0, o = group.length; j < o; j++) {
             let item = group[j];
             if (item[SLOT_CLEANUP]) {
-                cleanup.push(...item[SLOT_CLEANUP]);
+                cleanup.add(item[SLOT_CLEANUP]);
             }
             item.remove();
         }
@@ -81,26 +82,29 @@ function schedule() {
         return;
     }
     scheduled = true;
-    raf.add(() => {
-        try {
-            let fn;
-            while (fn = cleanup.pop()) {
-                fn();
+    microtask.add(task);
+}
+function task() {
+    let fns;
+    while (fns = cleanup.next()) {
+        for (let i = 0, n = fns.length; i < n; i++) {
+            try {
+                fns[i]();
             }
+            catch { }
         }
-        catch (e) { }
-        scheduled = false;
-        if (cleanup.length) {
-            schedule();
-        }
-    });
+    }
+    scheduled = false;
+    if (cleanup.length) {
+        schedule();
+    }
 }
 class Slot {
     marker;
     nodes;
     text = null;
     constructor(marker) {
-        onCleanup(marker, () => this.clear());
+        ondisconnect(marker, () => this.clear());
         this.marker = marker;
         this.nodes = [];
     }
@@ -137,7 +141,7 @@ class Slot {
     }
     render(input) {
         if (isFunction(input)) {
-            onCleanup(this.marker, effect(() => {
+            ondisconnect(this.marker, effect(() => {
                 let v = input();
                 if (isFunction(v)) {
                     root(() => this.render(v()));
@@ -181,10 +185,10 @@ class Slot {
         return this.nodes.unshift(...after(this.marker, groups));
     }
 }
-const onCleanup = (element, fn) => {
+const ondisconnect = (element, fn) => {
     (element[SLOT_CLEANUP] ??= []).push(fn);
 };
 export default (marker, value) => {
     return new Slot(marker).render(value);
 };
-export { onCleanup, Slot };
+export { ondisconnect, Slot };

package/build/utilities.d.ts

@@ -21,6 +21,7 @@ declare const nodeValue: (v: any) => void;
 declare const parentElement: () => any;
 declare const parentNode: () => any;
 declare const fragment: (html: string) => DocumentFragment;
+declare const microtask: import("@esportsplus/tasks/build/factory").Scheduler;
 declare const raf: import("@esportsplus/tasks/build/factory").Scheduler;
 declare const text: (value: string) => E;
-export { addEventListener, className, cloneNode, firstChild, firstElementChild, fragment, innerHTML, nextElementSibling, nextSibling, nodeValue, parentElement, parentNode, prepend, raf, removeAttribute, removeEventListener, setAttribute, text };
+export { addEventListener, className, cloneNode, firstChild, firstElementChild, fragment, innerHTML, microtask, nextElementSibling, nextSibling, nodeValue, parentElement, parentNode, prepend, raf, removeAttribute, removeEventListener, setAttribute, text };

package/build/utilities.js

@@ -1,4 +1,4 @@
-import { raf as tasks } from '@esportsplus/tasks';
+import { micro as m, raf as r } from '@esportsplus/tasks';
 let prototype, template = document.createElement('template'), t = document.createTextNode('');
 prototype = Element.prototype;
 const addEventListener = prototype.addEventListener;
@@ -23,7 +23,8 @@ const fragment = (html) => {
     template = cloneNode.call(template);
     return content;
 };
-const raf = tasks();
+const microtask = m();
+const raf = r();
 const text = (value) => {
     let element = cloneNode.call(t);
     if (value !== '') {
@@ -31,4 +32,4 @@ const text = (value) => {
     }
     return element;
 };
-export { addEventListener, className, cloneNode, firstChild, firstElementChild, fragment, innerHTML, nextElementSibling, nextSibling, nodeValue, parentElement, parentNode, prepend, raf, removeAttribute, removeEventListener, setAttribute, text };
+export { addEventListener, className, cloneNode, firstChild, firstElementChild, fragment, innerHTML, microtask, nextElementSibling, nextSibling, nodeValue, parentElement, parentNode, prepend, raf, removeAttribute, removeEventListener, setAttribute, text };

package/package.json

@@ -1,8 +1,9 @@
 {
   "author": "ICJR",
   "dependencies": {
-    "@esportsplus/reactivity": "^0.11.8",
-    "@esportsplus/tasks": "^0.1.11",
+    "@esportsplus/queue": "^0.1.0",
+    "@esportsplus/reactivity": "^0.12.2",
+    "@esportsplus/tasks": "^0.2.1",
     "@esportsplus/utilities": "^0.21.1"
   },
   "devDependencies": {
@@ -13,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.15.13",
+  "version": "0.15.15",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/attributes.ts

@@ -1,6 +1,6 @@
 import { effect } from '@esportsplus/reactivity';
 import { isArray, isFunction, isObject, isString } from '@esportsplus/utilities';
-import { onCleanup } from './slot';
+import { ondisconnect } from './slot';
 import { Attributes, Element } from './types';
 import { className, raf, removeAttribute, setAttribute } from './utilities';
 import event from './event';
@@ -42,7 +42,7 @@ function set(element: Element, value: unknown, name: string, wait = false) {
         else {
             let id = ('e' + store(element)[key]++);
 
-            onCleanup(
+            ondisconnect(
                 element,
                 effect(() => {
                     let v = (value as Function)(element);

package/src/event.ts

@@ -1,6 +1,6 @@
 import { root } from '@esportsplus/reactivity';
 import { defineProperty } from '@esportsplus/utilities';
-import { onCleanup } from './slot';
+import { ondisconnect } from './slot';
 import { Element } from './types';
 import { addEventListener, parentElement } from './utilities';
 
@@ -43,7 +43,7 @@ export default (element: Element, event: `on${string}`, listener: Function): voi
         return;
     }
     else if (event === 'ondisconnect') {
-        onCleanup(element, () => listener(element));
+        ondisconnect(element, () => listener(element));
         return;
     }
     else if (event === 'onrender') {
@@ -70,7 +70,7 @@ export default (element: Element, event: `on${string}`, listener: Function): voi
     if (controller) {
         controller.listeners++;
 
-        onCleanup(element, () => {
+        ondisconnect(element, () => {
             if (--controller.listeners) {
                 return;
             }

package/src/slot.ts

@@ -3,10 +3,11 @@ import { isArray, isFunction, isInstanceOf, isObject  } from '@esportsplus/utili
 import { RENDERABLE, RENDERABLE_REACTIVE, SLOT_CLEANUP } from './constants';
 import { hydrate } from './html';
 import { Element, Elements, RenderableReactive, RenderableTemplate } from './types';
-import { firstChild, nextSibling, nodeValue, raf, text } from './utilities'
+import { firstChild, microtask, nextSibling, nodeValue, raf, text } from './utilities'
+import queue from '@esportsplus/queue';
 
 
-let cleanup: VoidFunction[] = [],
+let cleanup = queue<VoidFunction[]>(1024),
     scheduled = false;
 
 
@@ -31,7 +32,7 @@ function remove(...groups: Elements[]) {
             let item = group[j];
 
             if (item[SLOT_CLEANUP]) {
-                cleanup.push(...item[SLOT_CLEANUP]);
+                cleanup.add( item[SLOT_CLEANUP] );
             }
 
             item.remove();
@@ -110,22 +111,26 @@ function schedule() {
 
     scheduled = true;
 
-    raf.add(() => {
-        try {
-            let fn;
+    microtask.add(task);
+}
+
+function task() {
+    let fns;
 
-            while (fn = cleanup.pop()) {
-                fn();
+    while (fns = cleanup.next()) {
+        for (let i = 0, n = fns.length; i < n; i++) {
+            try {
+                fns[i]();
             }
+            catch { }
         }
-        catch(e) { }
+    }
 
-        scheduled = false;
+    scheduled = false;
 
-        if (cleanup.length) {
-            schedule();
-        }
-    });
+    if (cleanup.length) {
+        schedule();
+    }
 }
 
 
@@ -136,7 +141,7 @@ class Slot {
 
 
     constructor(marker: Element) {
-        onCleanup(marker, () => this.clear());
+        ondisconnect(marker, () => this.clear());
 
         this.marker = marker;
         this.nodes = [];
@@ -190,7 +195,7 @@ class Slot {
 
     render(input: unknown) {
         if (isFunction(input)) {
-            onCleanup(
+            ondisconnect(
                 this.marker,
                 effect(() => {
                     let v = (input as Function)();
@@ -256,7 +261,7 @@ class Slot {
 }
 
 
-const onCleanup = (element: Element, fn: VoidFunction) => {
+const ondisconnect = (element: Element, fn: VoidFunction) => {
     ( element[SLOT_CLEANUP] ??= [] ).push(fn);
 };
 
@@ -264,4 +269,4 @@ const onCleanup = (element: Element, fn: VoidFunction) => {
 export default (marker: Element, value: unknown) => {
     return new Slot(marker).render(value);
 };
-export { onCleanup, Slot };
+export { ondisconnect, Slot };

package/src/utilities.ts

@@ -1,4 +1,4 @@
-import { raf as tasks } from '@esportsplus/tasks';
+import { micro as m, raf as r } from '@esportsplus/tasks';
 import { Element as E } from './types';
 
 
@@ -54,7 +54,9 @@ const fragment = (html: string) => {
     return content;
 };
 
-const raf = tasks();
+const microtask = m();
+
+const raf = r();
 
 const text = (value: string) => {
     let element = cloneNode.call(t);
@@ -72,6 +74,7 @@ export {
     className, cloneNode,
     firstChild, firstElementChild, fragment,
     innerHTML,
+    microtask,
     nextElementSibling, nextSibling, nodeValue,
     parentElement, parentNode, prepend,
     raf, removeAttribute, removeEventListener,