@esportsplus/template 0.26.1 → 0.26.3

package/build/attributes.js

@@ -31,20 +31,20 @@ function list(ctx, element, id, name, state, value) {
     if (value == null || value === false || value === '') {
         value = '';
     }
-    let base = name + '.static', delimiter = delimiters[name], store = (ctx ??= context(element)).store ??= {}, dynamic = store[name], type = typeof value;
+    let base = name + '.static', delimiter = delimiters[name], store = (ctx ??= context(element)).store ??= {}, dynamic = store[name];
     if (dynamic === undefined) {
         let value = (element.getAttribute(name) || '').trim();
         store[base] = value;
         store[name] = dynamic = new Set();
     }
     if (id === null) {
-        if (value && type === 'string') {
+        if (value && typeof value === 'string') {
             store[base] += (store[base] ? delimiter : '') + value;
         }
     }
     else {
         let hot = {};
-        if (value && type === 'string') {
+        if (value && typeof value === 'string') {
             let part, parts = value.split(delimiter);
             for (let i = 0, n = parts.length; i < n; i++) {
                 part = parts[i].trim();
@@ -126,8 +126,8 @@ function task() {
     }
 }
 const set = (element, name, value) => {
-    let fn = name === 'class' || name === 'style' ? list : property, state = STATE_HYDRATING, type = typeof value;
-    if (type === 'function') {
+    let fn = name === 'class' || name === 'style' ? list : property, state = STATE_HYDRATING;
+    if (typeof value === 'function') {
         if (name.startsWith('on')) {
             return event(element, name, value);
         }
@@ -151,7 +151,7 @@ const set = (element, name, value) => {
         state = STATE_NONE;
         return;
     }
-    if (type !== 'object') {
+    if (typeof value !== 'object') {
     }
     else if (isArray(value)) {
         for (let i = 0, n = value.length; i < n; i++) {

package/build/slot/array.js

@@ -1,4 +1,4 @@
-import { read, root, set, signal } from '@esportsplus/reactivity';
+import { root } from '@esportsplus/reactivity';
 import { EMPTY_FRAGMENT } from '../constants.js';
 import { append } from '../utilities/fragment.js';
 import { cloneNode, firstChild, lastChild } from '../utilities/node.js';
@@ -9,7 +9,6 @@ class ArraySlot {
     marker;
     nodes = [];
     template;
-    trigger = signal(false);
     constructor(anchor, array, template) {
         let fragment = this.fragment = cloneNode.call(EMPTY_FRAGMENT);
         this.array = array;
@@ -46,7 +45,6 @@ class ArraySlot {
         });
     }
     get length() {
-        read(this.trigger);
         return this.nodes.length;
     }
     set length(n) {
@@ -59,7 +57,6 @@ class ArraySlot {
         else {
             this.splice(n);
         }
-        set(this.trigger, !this.trigger.value);
     }
     anchor(index = this.nodes.length - 1) {
         let node = this.nodes[index];
@@ -70,20 +67,17 @@ class ArraySlot {
     }
     clear() {
         remove(...this.nodes.splice(0));
-        set(this.trigger, !this.trigger.value);
     }
     pop() {
         let group = this.nodes.pop();
         if (group) {
             remove(group);
-            set(this.trigger, !this.trigger.value);
         }
     }
     push(items) {
         let anchor = this.anchor();
         this.nodes.push(...items.map(this.template));
         anchor.after(this.fragment);
-        set(this.trigger, !this.trigger.value);
     }
     render() {
         if (this.nodes.length) {
@@ -96,23 +90,19 @@ class ArraySlot {
         let group = this.nodes.shift();
         if (group) {
             remove(group);
-            set(this.trigger, !this.trigger.value);
         }
     }
     splice(start, stop = this.nodes.length, ...items) {
         if (!items.length) {
             remove(...this.nodes.splice(start, stop));
-            set(this.trigger, !this.trigger.value);
             return;
         }
         remove(...this.nodes.splice(start, stop, ...items.map(this.template)));
         this.anchor(start - 1).after(this.fragment);
-        set(this.trigger, !this.trigger.value);
     }
     unshift(items) {
         this.nodes.unshift(...items.map(this.template));
         this.marker.after(this.fragment);
-        set(this.trigger, !this.trigger.value);
     }
 }
 export default (anchor, renderable) => {

package/build/slot/effect.js

@@ -40,14 +40,17 @@ class EffectSlot {
         }
     }
     update(value) {
-        if (this.group) {
-            remove(this.group);
+        if (typeof value === 'function') {
+            return this.update(value());
+        }
+        let { anchor, group, textnode } = this;
+        if (group) {
+            remove(group);
             this.group = null;
         }
         if (value == null || value === false) {
             value = '';
         }
-        let { anchor, textnode } = this;
         if (typeof value !== 'object') {
             if (textnode) {
                 nodeValue.call(textnode, String(value));

package/package.json

@@ -2,9 +2,9 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.1.0",
-    "@esportsplus/reactivity": "^0.17.2",
-    "@esportsplus/tasks": "^0.2.1",
-    "@esportsplus/utilities": "^0.22.2"
+    "@esportsplus/reactivity": "^0.18.1",
+    "@esportsplus/tasks": "^0.4.0",
+    "@esportsplus/utilities": "^0.25.0"
   },
   "devDependencies": {
     "@esportsplus/typescript": "^0.9.2"
@@ -14,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.26.1",
+  "version": "0.26.3",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/attributes.ts

@@ -64,8 +64,7 @@ function list(
     let base = name + '.static',
         delimiter = delimiters[name],
         store = (ctx ??= context(element)).store ??= {},
-        dynamic = store[name] as Set<string> | undefined,
-        type = typeof value;
+        dynamic = store[name] as Set<string> | undefined;
 
     if (dynamic === undefined) {
         let value = (element.getAttribute(name) || '').trim();
@@ -75,14 +74,14 @@ function list(
     }
 
     if (id === null) {
-        if (value && type === 'string') {
+        if (value && typeof value === 'string') {
             store[base] += (store[base] ? delimiter : '') + value;
         }
     }
     else {
         let hot: Attributes = {};
 
-        if (value && type === 'string') {
+        if (value && typeof value === 'string') {
             let part: string,
                 parts = (value as string).split(delimiter);
 
@@ -200,10 +199,9 @@ function task() {
 
 const set = (element: Element, name: string, value: unknown) => {
     let fn = name === 'class' || name === 'style' ? list : property,
-        state: State = STATE_HYDRATING,
-        type = typeof value;
+        state: State = STATE_HYDRATING;
 
-    if (type === 'function') {
+    if (typeof value === 'function') {
         if (name.startsWith('on')) {
             return event(element, name as `on${string}`, value as Function);
         }
@@ -243,7 +241,7 @@ const set = (element: Element, name: string, value: unknown) => {
         return;
     }
 
-    if (type !== 'object') {
+    if (typeof value !== 'object') {
         // Skip isArray when possible
     }
     else if (isArray(value)) {

package/src/slot/array.ts

@@ -1,4 +1,4 @@
-import { read, root, set, signal, ReactiveArray } from '@esportsplus/reactivity';
+import { root, ReactiveArray } from '@esportsplus/reactivity';
 import { EMPTY_FRAGMENT } from '~/constants';
 import { RenderableReactive, SlotGroup } from '~/types';
 import { append } from '~/utilities/fragment';
@@ -12,7 +12,6 @@ class ArraySlot<T> {
     marker: Element;
     nodes: SlotGroup[] = [];
     template: (...args: Parameters< RenderableReactive<T>['template'] >) => SlotGroup;
-    trigger = signal(false);
 
 
     constructor(anchor: Element, array: ReactiveArray<T>, template: RenderableReactive<T>['template']) {
@@ -59,7 +58,6 @@ class ArraySlot<T> {
 
 
     get length() {
-        read(this.trigger);
         return this.nodes.length;
     }
 
@@ -73,8 +71,6 @@ class ArraySlot<T> {
         else {
             this.splice(n);
         }
-
-        set(this.trigger, !this.trigger.value);
     }
 
 
@@ -90,7 +86,7 @@ class ArraySlot<T> {
 
     clear() {
         remove(...this.nodes.splice(0));
-        set(this.trigger, !this.trigger.value);
+
     }
 
     pop() {
@@ -98,7 +94,6 @@ class ArraySlot<T> {
 
         if (group) {
             remove(group);
-            set(this.trigger, !this.trigger.value);
         }
     }
 
@@ -108,7 +103,6 @@ class ArraySlot<T> {
         this.nodes.push( ...items.map(this.template) );
 
         anchor.after(this.fragment);
-        set(this.trigger, !this.trigger.value);
     }
 
     render() {
@@ -125,28 +119,22 @@ class ArraySlot<T> {
 
         if (group) {
             remove(group);
-            set(this.trigger, !this.trigger.value);
         }
     }
 
     splice(start: number, stop: number = this.nodes.length, ...items: T[]) {
         if (!items.length) {
             remove(...this.nodes.splice(start, stop));
-            set(this.trigger, !this.trigger.value);
             return;
         }
 
         remove( ...this.nodes.splice(start, stop, ...items.map(this.template)) );
         this.anchor(start - 1).after(this.fragment);
-
-        set(this.trigger, !this.trigger.value);
     }
 
     unshift(items: T[]) {
         this.nodes.unshift(...items.map(this.template));
         this.marker.after(this.fragment);
-
-        set(this.trigger, !this.trigger.value);
     }
 }
 

package/src/slot/effect.ts

@@ -53,9 +53,15 @@ class EffectSlot {
         }
     }
 
-    update(value: unknown) {
-        if (this.group) {
-            remove(this.group);
+    update(value: unknown): void {
+        if (typeof value === 'function') {
+            return this.update( value() );
+        }
+
+        let { anchor, group, textnode } = this;
+
+        if (group) {
+            remove(group);
             this.group = null;
         }
 
@@ -63,8 +69,6 @@ class EffectSlot {
             value = '';
         }
 
-        let { anchor, textnode } = this;
-
         if (typeof value !== 'object') {
             if (textnode) {
                 nodeValue.call(textnode, String(value));