@esportsplus/template 0.26.4 → 0.26.6

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

package/build/slot/render.js

@@ -26,9 +26,9 @@ export default function render(anchor, value) {
         return fragment;
     }
     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]);
+        let fragment = cloneNode.call(EMPTY_FRAGMENT);
+        for (let i = 0, n = value.length; i < n; i++) {
+            append.call(fragment, value[i]);
         }
         return fragment;
     }

package/package.json

@@ -14,7 +14,7 @@
   "private": false,
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.26.4",
+  "version": "0.26.6",
   "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 {
@@ -61,14 +71,7 @@ class EffectSlot {
             this.group = null;
         }
 
-        if (value == null || value === false) {
-            value = '';
-        }
-
-        if (typeof value === 'function') {
-            this.update( value() );
-        }
-        else if (typeof value !== 'object') {
+        if (typeof value !== 'object') {
             if (textnode) {
                 nodeValue.call(textnode, String(value));
 

package/src/slot/render.ts

@@ -36,11 +36,10 @@ export default function render(anchor: Element, value: unknown): Node {
     }
 
     if (value instanceof NodeList) {
-        let fragment = cloneNode.call(EMPTY_FRAGMENT),
-            nodes = Array.from(value as NodeList);
+        let fragment = cloneNode.call(EMPTY_FRAGMENT);
 
-        for (let i = 0, n = nodes.length; i < n; i++) {
-            append.call(fragment, nodes[i]);
+        for (let i = 0, n = value.length; i < n; i++) {
+            append.call(fragment, value[i]);
         }
 
         return fragment;