@esportsplus/template 0.26.2 → 0.26.4

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/effect.js

@@ -40,15 +40,18 @@ class EffectSlot {
         }
     }
     update(value) {
-        if (this.group) {
-            remove(this.group);
+        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 (typeof value === 'function') {
+            this.update(value());
+        }
+        else if (typeof value !== 'object') {
             if (textnode) {
                 nodeValue.call(textnode, String(value));
                 if (!textnode.isConnected) {

package/build/slot/render.d.ts

@@ -1,2 +1,2 @@
 import { Element } from '../types.js';
-export default function render(anchor: Element, input: unknown): Node;
+export default function render(anchor: Element, value: unknown): Node;

package/build/slot/render.js

@@ -4,34 +4,34 @@ import { cloneNode, lastChild } from '../utilities/node.js';
 import { append } from '../utilities/fragment.js';
 import text from '../utilities/text.js';
 import array from './array.js';
-export default function render(anchor, input) {
-    if (input == null || input === false || input === '') {
+export default function render(anchor, value) {
+    if (value == null || value === false || value === '') {
         return EMPTY_FRAGMENT;
     }
-    if (typeof input !== 'object') {
-        return text(input);
+    if (typeof value !== 'object') {
+        return text(value);
     }
-    if (RENDERABLE in input) {
-        return array(anchor, input);
+    if (RENDERABLE in value) {
+        return array(anchor, value);
     }
-    if ('nodeType' in input) {
-        return input;
+    if ('nodeType' in value) {
+        return value;
     }
-    if (isArray(input)) {
+    if (isArray(value)) {
         let fragment = cloneNode.call(EMPTY_FRAGMENT);
-        for (let i = 0, n = input.length; i < n; i++) {
-            append.call(fragment, render(anchor, input[i]));
+        for (let i = 0, n = value.length; i < n; i++) {
+            append.call(fragment, render(anchor, value[i]));
             anchor = lastChild.call(fragment);
         }
         return fragment;
     }
-    if (input instanceof NodeList) {
-        let fragment = cloneNode.call(EMPTY_FRAGMENT), nodes = Array.from(input);
+    if (value instanceof NodeList) {
+        let fragment = cloneNode.call(EMPTY_FRAGMENT), nodes = Array.from(value);
         for (let i = 0, n = nodes.length; i < n; i++) {
             append.call(fragment, nodes[i]);
         }
         return fragment;
     }
-    return text(input);
+    return text(value);
 }
 ;

package/package.json

@@ -2,9 +2,9 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.1.0",
-    "@esportsplus/reactivity": "^0.18.0",
-    "@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.2",
+  "version": "0.26.4",
   "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/effect.ts

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

package/src/slot/render.ts

@@ -7,37 +7,37 @@ import text from '~/utilities/text';
 import array from './array';
 
 
-export default function render(anchor: Element, input: unknown): Node {
-    if (input == null || input === false || input === '') {
+export default function render(anchor: Element, value: unknown): Node {
+    if (value == null || value === false || value === '') {
         return EMPTY_FRAGMENT;
     }
 
-    if (typeof input !== 'object') {
-        return text(input as any);
+    if (typeof value !== 'object') {
+        return text(value as any);
     }
 
-    if (RENDERABLE in input) {
-        return array(anchor, input as RenderableReactive<unknown>);
+    if (RENDERABLE in value) {
+        return array(anchor, value as RenderableReactive<unknown>);
     }
 
-    if ('nodeType' in input) {
-        return input as Node;
+    if ('nodeType' in value) {
+        return value as Node;
     }
 
-    if (isArray(input)) {
+    if (isArray(value)) {
         let fragment = cloneNode.call(EMPTY_FRAGMENT);
 
-        for (let i = 0, n = (input as unknown[]).length; i < n; i++) {
-            append.call(fragment, render(anchor, (input as unknown[])[i]));
+        for (let i = 0, n = (value as unknown[]).length; i < n; i++) {
+            append.call(fragment, render(anchor, (value as unknown[])[i]));
             anchor = lastChild.call(fragment);
         }
 
         return fragment;
     }
 
-    if (input instanceof NodeList) {
+    if (value instanceof NodeList) {
         let fragment = cloneNode.call(EMPTY_FRAGMENT),
-            nodes = Array.from(input as NodeList);
+            nodes = Array.from(value as NodeList);
 
         for (let i = 0, n = nodes.length; i < n; i++) {
             append.call(fragment, nodes[i]);
@@ -46,5 +46,5 @@ export default function render(anchor: Element, input: unknown): Node {
         return fragment;
     }
 
-    return text(input as any);
+    return text(value as any);
 };