solid-js 1.4.4 → 1.4.5

package/dist/dev.cjs

@@ -171,7 +171,10 @@ function createRoot(fn, detachedOwner) {
         updateFn = unowned ? () => fn(() => {
     throw new Error("Dispose method must be an explicit argument to createRoot function");
   })  : () => fn(() => cleanNode(root));
-  if (owner) root.name = `${owner.name}-r${rootCount++}`;
+  {
+    if (owner) root.name = `${owner.name}-r${rootCount++}`;
+    globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
+  }
   Owner = root;
   Listener = null;
   try {
@@ -828,14 +831,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(d);
+      for (const v of sources) {
         v.value = v.tValue;
         if (v.owned) {
           for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
@@ -844,7 +849,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -964,7 +969,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1447,27 +1452,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1480,31 +1482,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);

package/dist/dev.js

@@ -167,7 +167,10 @@ function createRoot(fn, detachedOwner) {
         updateFn = unowned ? () => fn(() => {
     throw new Error("Dispose method must be an explicit argument to createRoot function");
   })  : () => fn(() => cleanNode(root));
-  if (owner) root.name = `${owner.name}-r${rootCount++}`;
+  {
+    if (owner) root.name = `${owner.name}-r${rootCount++}`;
+    globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
+  }
   Owner = root;
   Listener = null;
   try {
@@ -824,14 +827,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(d);
+      for (const v of sources) {
         v.value = v.tValue;
         if (v.owned) {
           for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
@@ -840,7 +845,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -960,7 +965,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1443,27 +1448,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1476,31 +1478,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);

package/dist/solid.cjs

@@ -769,14 +769,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(d);
+      for (const v of sources) {
         v.value = v.tValue;
         if (v.owned) {
           for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
@@ -785,7 +787,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -903,7 +905,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1359,27 +1361,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1392,31 +1391,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);

package/dist/solid.js

@@ -765,14 +765,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(d);
+      for (const v of sources) {
         v.value = v.tValue;
         if (v.owned) {
           for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
@@ -781,7 +783,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -899,7 +901,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1355,27 +1357,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1388,31 +1387,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9f1de6b3cea905aa0857789a0e4738cae73cb1b1"
+  "gitHead": "2c2252d6e4bd0d59f9164da32d6b6afc65dd4220"
 }

package/store/dist/dev.cjs

@@ -200,7 +200,7 @@ function updatePath(current, path, traversed = []) {
     mergeStoreNode(prev, value);
   } else setProperty(current, part, value);
 }
-function createStore(store, options) {
+function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);

package/store/dist/dev.js

@@ -196,7 +196,7 @@ function updatePath(current, path, traversed = []) {
     mergeStoreNode(prev, value);
   } else setProperty(current, part, value);
 }
-function createStore(store, options) {
+function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);

package/store/dist/store.cjs

@@ -195,7 +195,7 @@ function updatePath(current, path, traversed = []) {
     mergeStoreNode(prev, value);
   } else setProperty(current, part, value);
 }
-function createStore(store, options) {
+function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   const wrappedStore = wrap$1(unwrappedStore);

package/store/dist/store.js

@@ -191,7 +191,7 @@ function updatePath(current, path, traversed = []) {
     mergeStoreNode(prev, value);
   } else setProperty(current, part, value);
 }
-function createStore(store, options) {
+function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   const wrappedStore = wrap$1(unwrappedStore);

package/store/types/store.d.ts

@@ -34,8 +34,8 @@ export declare type StorePathRange = {
     by?: number;
 };
 export declare type ArrayFilterFn<T> = (item: T, index: number) => boolean;
-export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: T, traversed: U) => T | CustomPartial<T> | void) | T | CustomPartial<T>;
-export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = [K] extends [never] ? never : K | readonly K[] | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
+export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: T, traversed: U) => T | CustomPartial<T>) | T | CustomPartial<T>;
+export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = K | ([K] extends [never] ? never : readonly K[]) | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
 declare type W<T> = Exclude<T, NotWrappable>;
 declare type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [readonly unknown[]] ? number : [T] extends [never] ? never : keyof T : keyof T;
 declare type Rest<T, U extends PropertyKey[]> = [StoreSetter<T, U>] | (0 extends 1 & T ? [...Part<any>[], StoreSetter<any, PropertyKey[]>] : DistributeRest<W<T>, KeyOf<W<T>>, U>);
@@ -55,7 +55,9 @@ export interface SetStoreFunction<T> {
  *
  * @description https://www.solidjs.com/docs/latest/api#createstore
  */
-export declare function createStore<T extends StoreNode>(store: T | Store<T>, options?: {
+export declare function createStore<T extends {}>(...[store, options]: {} extends T ? [store?: T | Store<T>, options?: {
     name?: string;
-}): [get: Store<T>, set: SetStoreFunction<T>];
+}] : [store: object & (T | Store<T>), options?: {
+    name?: string;
+}]): [get: Store<T>, set: SetStoreFunction<T>];
 export {};

package/types/reactive/signal.d.ts

@@ -11,6 +11,7 @@ export declare let Transition: TransitionState | null;
 declare let ExternalSourceFactory: ExternalSourceFactory | null;
 declare global {
     var _$afterUpdate: () => void;
+    var _$afterCreateRoot: (root: Owner) => void;
 }
 export interface SignalState<T> {
     value?: T;

package/web/dist/dev.cjs

@@ -408,7 +408,8 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     return () => current;
   } else if (Array.isArray(value)) {
     const array = [];
-    if (normalizeIncomingArray(array, value, unwrapArray)) {
+    const currentArray = current && Array.isArray(current);
+    if (normalizeIncomingArray(array, value, current, unwrapArray)) {
       solidJs.createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
@@ -420,7 +421,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     if (array.length === 0) {
       current = cleanChildren(parent, current, marker);
       if (multi) return current;
-    } else if (Array.isArray(current)) {
+    } else if (currentArray) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
       } else reconcileArrays(parent, current, array);
@@ -441,26 +442,30 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
 }
-function normalizeIncomingArray(normalized, array, unwrap) {
+function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
+        prev = current && current[i],
         t;
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
-      dynamic = normalizeIncomingArray(normalized, item) || dynamic;
-    } else if ((t = typeof item) === "string") {
-      normalized.push(document.createTextNode(item));
-    } else if (t === "function") {
+      dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
+    } else if ((t = typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;
       }
-    } else normalized.push(document.createTextNode(item.toString()));
+    } else {
+      const value = t === "string" ? item : item.string();
+      if (prev && prev.nodeType === 3 && prev.data === value) {
+        normalized.push(prev);
+      } else normalized.push(document.createTextNode(value));
+    }
   }
   return dynamic;
 }

package/web/dist/dev.js

@@ -405,7 +405,8 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     return () => current;
   } else if (Array.isArray(value)) {
     const array = [];
-    if (normalizeIncomingArray(array, value, unwrapArray)) {
+    const currentArray = current && Array.isArray(current);
+    if (normalizeIncomingArray(array, value, current, unwrapArray)) {
       createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
@@ -417,7 +418,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     if (array.length === 0) {
       current = cleanChildren(parent, current, marker);
       if (multi) return current;
-    } else if (Array.isArray(current)) {
+    } else if (currentArray) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
       } else reconcileArrays(parent, current, array);
@@ -438,26 +439,30 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
 }
-function normalizeIncomingArray(normalized, array, unwrap) {
+function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
+        prev = current && current[i],
         t;
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
-      dynamic = normalizeIncomingArray(normalized, item) || dynamic;
-    } else if ((t = typeof item) === "string") {
-      normalized.push(document.createTextNode(item));
-    } else if (t === "function") {
+      dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
+    } else if ((t = typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;
       }
-    } else normalized.push(document.createTextNode(item.toString()));
+    } else {
+      const value = t === "string" ? item : item.string();
+      if (prev && prev.nodeType === 3 && prev.data === value) {
+        normalized.push(prev);
+      } else normalized.push(document.createTextNode(value));
+    }
   }
   return dynamic;
 }

package/web/dist/server.cjs

@@ -273,7 +273,10 @@ function renderToStringAsync(code, options = {}) {
       p.then(d => scripts += serializeSet(dedupe, id, d) + ";").catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };
-  const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
+  let timeoutHandle;
+  const timeout = new Promise((_, reject) => {
+    timeoutHandle = setTimeout(() => reject("renderToString timed out"), timeoutMs);
+  });
   function asyncWrap(fn) {
     return new Promise(resolve => {
       const registry = new Set();
@@ -304,6 +307,7 @@ function renderToStringAsync(code, options = {}) {
     });
   }
   return Promise.race([asyncWrap(() => escape(code())), timeout]).then(res => {
+    clearTimeout(timeoutHandle);
     let html = injectAssets(context.assets, resolveSSRNode(res));
     if (scripts.length) html = injectScripts(html, scripts, nonce);
     return html;

package/web/dist/server.js

@@ -270,7 +270,10 @@ function renderToStringAsync(code, options = {}) {
       p.then(d => scripts += serializeSet(dedupe, id, d) + ";").catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };
-  const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
+  let timeoutHandle;
+  const timeout = new Promise((_, reject) => {
+    timeoutHandle = setTimeout(() => reject("renderToString timed out"), timeoutMs);
+  });
   function asyncWrap(fn) {
     return new Promise(resolve => {
       const registry = new Set();
@@ -301,6 +304,7 @@ function renderToStringAsync(code, options = {}) {
     });
   }
   return Promise.race([asyncWrap(() => escape(code())), timeout]).then(res => {
+    clearTimeout(timeoutHandle);
     let html = injectAssets(context.assets, resolveSSRNode(res));
     if (scripts.length) html = injectScripts(html, scripts, nonce);
     return html;

package/web/dist/web.cjs

@@ -407,7 +407,8 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     return () => current;
   } else if (Array.isArray(value)) {
     const array = [];
-    if (normalizeIncomingArray(array, value, unwrapArray)) {
+    const currentArray = current && Array.isArray(current);
+    if (normalizeIncomingArray(array, value, current, unwrapArray)) {
       solidJs.createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
@@ -419,7 +420,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     if (array.length === 0) {
       current = cleanChildren(parent, current, marker);
       if (multi) return current;
-    } else if (Array.isArray(current)) {
+    } else if (currentArray) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
       } else reconcileArrays(parent, current, array);
@@ -440,26 +441,30 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   } else ;
   return current;
 }
-function normalizeIncomingArray(normalized, array, unwrap) {
+function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
+        prev = current && current[i],
         t;
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
-      dynamic = normalizeIncomingArray(normalized, item) || dynamic;
-    } else if ((t = typeof item) === "string") {
-      normalized.push(document.createTextNode(item));
-    } else if (t === "function") {
+      dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
+    } else if ((t = typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;
       }
-    } else normalized.push(document.createTextNode(item.toString()));
+    } else {
+      const value = t === "string" ? item : item.string();
+      if (prev && prev.nodeType === 3 && prev.data === value) {
+        normalized.push(prev);
+      } else normalized.push(document.createTextNode(value));
+    }
   }
   return dynamic;
 }

package/web/dist/web.js

@@ -404,7 +404,8 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     return () => current;
   } else if (Array.isArray(value)) {
     const array = [];
-    if (normalizeIncomingArray(array, value, unwrapArray)) {
+    const currentArray = current && Array.isArray(current);
+    if (normalizeIncomingArray(array, value, current, unwrapArray)) {
       createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
@@ -416,7 +417,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     if (array.length === 0) {
       current = cleanChildren(parent, current, marker);
       if (multi) return current;
-    } else if (Array.isArray(current)) {
+    } else if (currentArray) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
       } else reconcileArrays(parent, current, array);
@@ -437,26 +438,30 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   } else ;
   return current;
 }
-function normalizeIncomingArray(normalized, array, unwrap) {
+function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
+        prev = current && current[i],
         t;
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
-      dynamic = normalizeIncomingArray(normalized, item) || dynamic;
-    } else if ((t = typeof item) === "string") {
-      normalized.push(document.createTextNode(item));
-    } else if (t === "function") {
+      dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
+    } else if ((t = typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item]) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;
       }
-    } else normalized.push(document.createTextNode(item.toString()));
+    } else {
+      const value = t === "string" ? item : item.string();
+      if (prev && prev.nodeType === 3 && prev.data === value) {
+        normalized.push(prev);
+      } else normalized.push(document.createTextNode(value));
+    }
   }
   return dynamic;
 }