@esportsplus/template 0.26.3 → 0.26.5

package/build/slot/effect.js

@@ -1,22 +1,29 @@
 import { effect } from '@esportsplus/reactivity';
-import { STATE_HYDRATING, STATE_NONE } from '../constants.js';
 import { firstChild, lastChild, nodeValue } from '../utilities/node.js';
 import { raf } from '../utilities/queue.js';
 import { remove } from './cleanup.js';
 import text from '../utilities/text.js';
 import render from './render.js';
+function read(value) {
+    if (typeof value === 'function') {
+        return read(value());
+    }
+    if (value == null || value === false) {
+        return '';
+    }
+    return value;
+}
 class EffectSlot {
     anchor;
     disposer;
     group = null;
     textnode = null;
     constructor(anchor, fn) {
-        let dispose = fn.length ? () => this.dispose() : undefined, state = STATE_HYDRATING;
+        let dispose = fn.length ? () => this.dispose() : undefined;
         this.anchor = anchor;
         this.disposer = effect(() => {
-            let value = fn(dispose);
-            if (state === STATE_HYDRATING) {
-                state = STATE_NONE;
+            let value = read(fn(dispose));
+            if (!this.disposer) {
                 this.update(value);
             }
             else {
@@ -40,17 +47,11 @@ class EffectSlot {
         }
     }
     update(value) {
-        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 = '';
-        }
         if (typeof value !== 'object') {
             if (textnode) {
                 nodeValue.call(textnode, String(value));

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

@@ -14,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.26.3",
+  "version": "0.26.5",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/slot/effect.ts

@@ -1,5 +1,4 @@
 import { effect } from '@esportsplus/reactivity';
-import { STATE_HYDRATING, STATE_NONE } from '~/constants';
 import { Element, Renderable, SlotGroup } from '~/types';
 import { firstChild, lastChild, nodeValue } from '~/utilities/node'
 import { raf } from '~/utilities/queue'
@@ -8,6 +7,19 @@ import text from '~/utilities/text';
 import render from './render';
 
 
+function read(value: unknown): unknown {
+    if (typeof value === 'function') {
+        return read( value() );
+    }
+
+    if (value == null || value === false) {
+        return '';
+    }
+
+    return value;
+}
+
+
 class EffectSlot {
     anchor: Element;
     disposer: VoidFunction;
@@ -16,15 +28,13 @@ class EffectSlot {
 
 
     constructor(anchor: Element, fn: (dispose?: VoidFunction) => Renderable<any>) {
-        let dispose = fn.length ? () => this.dispose() : undefined,
-            state = STATE_HYDRATING;
+        let dispose = fn.length ? () => this.dispose() : undefined;
 
         this.anchor = anchor;
         this.disposer = effect(() => {
-            let value = fn(dispose);
+            let value = read( fn(dispose) );
 
-            if (state === STATE_HYDRATING) {
-                state = STATE_NONE;
+            if (!this.disposer) {
                 this.update(value);
             }
             else {
@@ -54,10 +64,6 @@ class EffectSlot {
     }
 
     update(value: unknown): void {
-        if (typeof value === 'function') {
-            return this.update( value() );
-        }
-
         let { anchor, group, textnode } = this;
 
         if (group) {
@@ -65,10 +71,6 @@ class EffectSlot {
             this.group = null;
         }
 
-        if (value == null || value === false) {
-            value = '';
-        }
-
         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);
 };