solid-js 1.4.5 → 1.4.8

package/dist/dev.cjs

@@ -809,10 +809,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -1022,31 +1020,33 @@ function serializeChildren(root) {
   return result;
 }
 
-function getSymbol() {
-  const SymbolCopy = Symbol;
-  return SymbolCopy.observable || "@@observable";
-}
 function observable(input) {
-  const $$observable = getSymbol();
   return {
     subscribe(observer) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next.bind(observer) : observer;
-      let complete = false;
-      createComputed(() => {
-        if (complete) return;
-        const v = input();
-        untrack(() => handler(v));
+      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      if (!handler) {
+        return {
+          unsubscribe() {}
+        };
+      }
+      const dispose = createRoot(disposer => {
+        createComputed(() => {
+          const v = input();
+          untrack(() => handler(v));
+        });
+        return disposer;
       });
+      if (getOwner()) onCleanup(dispose);
       return {
         unsubscribe() {
-          complete = true;
+          dispose();
         }
       };
     },
-    [$$observable]() {
+    [Symbol.observable || "@@observable"]() {
       return this;
     }
   };
@@ -1552,7 +1552,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/dist/dev.js

@@ -805,10 +805,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -1018,31 +1016,33 @@ function serializeChildren(root) {
   return result;
 }
 
-function getSymbol() {
-  const SymbolCopy = Symbol;
-  return SymbolCopy.observable || "@@observable";
-}
 function observable(input) {
-  const $$observable = getSymbol();
   return {
     subscribe(observer) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next.bind(observer) : observer;
-      let complete = false;
-      createComputed(() => {
-        if (complete) return;
-        const v = input();
-        untrack(() => handler(v));
+      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      if (!handler) {
+        return {
+          unsubscribe() {}
+        };
+      }
+      const dispose = createRoot(disposer => {
+        createComputed(() => {
+          const v = input();
+          untrack(() => handler(v));
+        });
+        return disposer;
       });
+      if (getOwner()) onCleanup(dispose);
       return {
         unsubscribe() {
-          complete = true;
+          dispose();
         }
       };
     },
-    [$$observable]() {
+    [Symbol.observable || "@@observable"]() {
       return this;
     }
   };
@@ -1548,7 +1548,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/dist/server.cjs

@@ -430,10 +430,17 @@ function createResource(source, fetcher, options = {}) {
 }
 function lazy(fn) {
   let resolved;
-  const p = fn();
+  let p;
+  let load = () => {
+    if (!p) {
+      p = fn();
+      p.then(mod => resolved = mod.default);
+    }
+    return p;
+  };
   const contexts = new Set();
-  p.then(mod => resolved = mod.default);
   const wrap = props => {
+    load();
     const id = sharedConfig.context.id.slice(0, -1);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
@@ -451,7 +458,7 @@ function lazy(fn) {
     });
     return "";
   };
-  wrap.preload = () => p;
+  wrap.preload = load;
   return wrap;
 }
 function suspenseComplete(c) {

package/dist/server.js

@@ -426,10 +426,17 @@ function createResource(source, fetcher, options = {}) {
 }
 function lazy(fn) {
   let resolved;
-  const p = fn();
+  let p;
+  let load = () => {
+    if (!p) {
+      p = fn();
+      p.then(mod => resolved = mod.default);
+    }
+    return p;
+  };
   const contexts = new Set();
-  p.then(mod => resolved = mod.default);
   const wrap = props => {
+    load();
     const id = sharedConfig.context.id.slice(0, -1);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
@@ -447,7 +454,7 @@ function lazy(fn) {
     });
     return "";
   };
-  wrap.preload = () => p;
+  wrap.preload = load;
   return wrap;
 }
 function suspenseComplete(c) {

package/dist/solid.cjs

@@ -747,10 +747,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -935,31 +933,33 @@ function createProvider(id) {
   };
 }
 
-function getSymbol() {
-  const SymbolCopy = Symbol;
-  return SymbolCopy.observable || "@@observable";
-}
 function observable(input) {
-  const $$observable = getSymbol();
   return {
     subscribe(observer) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next.bind(observer) : observer;
-      let complete = false;
-      createComputed(() => {
-        if (complete) return;
-        const v = input();
-        untrack(() => handler(v));
+      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      if (!handler) {
+        return {
+          unsubscribe() {}
+        };
+      }
+      const dispose = createRoot(disposer => {
+        createComputed(() => {
+          const v = input();
+          untrack(() => handler(v));
+        });
+        return disposer;
       });
+      if (getOwner()) onCleanup(dispose);
       return {
         unsubscribe() {
-          complete = true;
+          dispose();
         }
       };
     },
-    [$$observable]() {
+    [Symbol.observable || "@@observable"]() {
       return this;
     }
   };
@@ -1461,7 +1461,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/dist/solid.js

@@ -743,10 +743,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -931,31 +929,33 @@ function createProvider(id) {
   };
 }
 
-function getSymbol() {
-  const SymbolCopy = Symbol;
-  return SymbolCopy.observable || "@@observable";
-}
 function observable(input) {
-  const $$observable = getSymbol();
   return {
     subscribe(observer) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next.bind(observer) : observer;
-      let complete = false;
-      createComputed(() => {
-        if (complete) return;
-        const v = input();
-        untrack(() => handler(v));
+      const handler = typeof observer === 'function' ? observer : observer.next && observer.next.bind(observer);
+      if (!handler) {
+        return {
+          unsubscribe() {}
+        };
+      }
+      const dispose = createRoot(disposer => {
+        createComputed(() => {
+          const v = input();
+          untrack(() => handler(v));
+        });
+        return disposer;
       });
+      if (getOwner()) onCleanup(dispose);
       return {
         unsubscribe() {
-          complete = true;
+          dispose();
         }
       };
     },
-    [$$observable]() {
+    [Symbol.observable || "@@observable"]() {
       return this;
     }
   };
@@ -1457,7 +1457,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/html/dist/html.cjs

@@ -2,10 +2,9 @@
 
 var web = require('solid-js/web');
 
-var attrRE, lookup, parseTag, pushCommentNode, pushTextNode, tagRE;
-tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
-attrRE = /\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;
-lookup = {
+const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
+const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
+const lookup = {
   area: true,
   base: true,
   br: true,
@@ -23,9 +22,9 @@ lookup = {
   track: true,
   wbr: true
 };
-parseTag = function (tag) {
-  var res;
-  res = {
+function parseTag(
+tag) {
+  const res = {
     type: 'tag',
     name: '',
     voidElement: false,
@@ -47,64 +46,42 @@ parseTag = function (tag) {
     }
   }
   const reg = new RegExp(attrRE);
-  let result = null;
-  for (;;) {
-    result = reg.exec(tag);
-    if (result === null) {
-      break;
-    }
-    if (!result[0].trim()) {
-      continue;
-    }
-    if (result[1]) {
-      const attr = result[1].trim();
-      let arr = [attr, ''];
-      if (attr.indexOf('=') > -1) {
-        arr = attr.split('=');
-      }
-      res.attrs[arr[0]] = arr[1];
-      reg.lastIndex--;
-    } else if (result[2]) {
-      res.attrs[result[2]] = result[3].trim().substring(1, result[3].length - 1);
-    }
+  for (const match of tag.matchAll(reg)) {
+    res.attrs[match[1] || match[2]] = match[4] || match[5] || '';
   }
   return res;
-};
-pushTextNode = function (list, html, start) {
-  var content, end;
-  end = html.indexOf('<', start);
-  content = html.slice(start, end === -1 ? void 0 : end);
+}
+function pushTextNode(list, html, start) {
+  const end = html.indexOf('<', start);
+  const content = html.slice(start, end === -1 ? void 0 : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
       content: content
     });
   }
-};
-pushCommentNode = function (list, tag) {
-  var content;
-  content = tag.replace('<!--', '').replace('-->', '');
+}
+function pushCommentNode(list, tag) {
+  const content = tag.replace('<!--', '').replace('-->', '');
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'comment',
       content: content
     });
   }
-};
+}
 function parse(html) {
-  var arr, byTag, current, level, result;
-  result = [];
-  current = void 0;
-  level = -1;
-  arr = [];
-  byTag = {};
-  html.replace(tagRE, function (tag, index) {
-    var isComment, isOpen, nextChar, parent, start;
-    isOpen = tag.charAt(1) !== '/';
-    isComment = tag.slice(0, 4) === '<!--';
-    start = index + tag.length;
-    nextChar = html.charAt(start);
-    parent = void 0;
+  const result = [];
+  let current = void 0;
+  let level = -1;
+  const arr = [];
+  const byTag = {};
+  html.replace(tagRE, (tag, index) => {
+    const isOpen = tag.charAt(1) !== '/';
+    const isComment = tag.slice(0, 4) === '<!--';
+    const start = index + tag.length;
+    const nextChar = html.charAt(start);
+    let parent = void 0;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);
@@ -140,19 +117,17 @@ function parse(html) {
   });
   return result;
 }
-var attrString, stringifier;
-attrString = function (attrs) {
-  var buff, key;
-  buff = [];
-  for (key in attrs) {
-    buff.push(key + '="' + attrs[key] + '"');
+function attrString(attrs) {
+  const buff = [];
+  for (const key in attrs) {
+    buff.push(key + '="' + attrs[key].replace(/"/g, '&quot;') + '"');
   }
   if (!buff.length) {
     return '';
   }
   return ' ' + buff.join(' ');
-};
-stringifier = function (buff, doc) {
+}
+function stringifier(buff, doc) {
   switch (doc.type) {
     case 'text':
       return buff + doc.content;
@@ -165,7 +140,7 @@ stringifier = function (buff, doc) {
     case 'comment':
       return buff += '<!--' + doc.content + '-->';
   }
-};
+}
 function stringify(doc) {
   return doc.reduce(function (token, rootEl) {
     return token + stringifier('', rootEl);

package/html/dist/html.js

@@ -1,9 +1,8 @@
 import { effect, style, insert, spread, createComponent, delegateEvents, classList, mergeProps, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, PropAliases, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
 
-var attrRE, lookup, parseTag, pushCommentNode, pushTextNode, tagRE;
-tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
-attrRE = /\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;
-lookup = {
+const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
+const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
+const lookup = {
   area: true,
   base: true,
   br: true,
@@ -21,9 +20,9 @@ lookup = {
   track: true,
   wbr: true
 };
-parseTag = function (tag) {
-  var res;
-  res = {
+function parseTag(
+tag) {
+  const res = {
     type: 'tag',
     name: '',
     voidElement: false,
@@ -45,64 +44,42 @@ parseTag = function (tag) {
     }
   }
   const reg = new RegExp(attrRE);
-  let result = null;
-  for (;;) {
-    result = reg.exec(tag);
-    if (result === null) {
-      break;
-    }
-    if (!result[0].trim()) {
-      continue;
-    }
-    if (result[1]) {
-      const attr = result[1].trim();
-      let arr = [attr, ''];
-      if (attr.indexOf('=') > -1) {
-        arr = attr.split('=');
-      }
-      res.attrs[arr[0]] = arr[1];
-      reg.lastIndex--;
-    } else if (result[2]) {
-      res.attrs[result[2]] = result[3].trim().substring(1, result[3].length - 1);
-    }
+  for (const match of tag.matchAll(reg)) {
+    res.attrs[match[1] || match[2]] = match[4] || match[5] || '';
   }
   return res;
-};
-pushTextNode = function (list, html, start) {
-  var content, end;
-  end = html.indexOf('<', start);
-  content = html.slice(start, end === -1 ? void 0 : end);
+}
+function pushTextNode(list, html, start) {
+  const end = html.indexOf('<', start);
+  const content = html.slice(start, end === -1 ? void 0 : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
       content: content
     });
   }
-};
-pushCommentNode = function (list, tag) {
-  var content;
-  content = tag.replace('<!--', '').replace('-->', '');
+}
+function pushCommentNode(list, tag) {
+  const content = tag.replace('<!--', '').replace('-->', '');
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'comment',
       content: content
     });
   }
-};
+}
 function parse(html) {
-  var arr, byTag, current, level, result;
-  result = [];
-  current = void 0;
-  level = -1;
-  arr = [];
-  byTag = {};
-  html.replace(tagRE, function (tag, index) {
-    var isComment, isOpen, nextChar, parent, start;
-    isOpen = tag.charAt(1) !== '/';
-    isComment = tag.slice(0, 4) === '<!--';
-    start = index + tag.length;
-    nextChar = html.charAt(start);
-    parent = void 0;
+  const result = [];
+  let current = void 0;
+  let level = -1;
+  const arr = [];
+  const byTag = {};
+  html.replace(tagRE, (tag, index) => {
+    const isOpen = tag.charAt(1) !== '/';
+    const isComment = tag.slice(0, 4) === '<!--';
+    const start = index + tag.length;
+    const nextChar = html.charAt(start);
+    let parent = void 0;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);
@@ -138,19 +115,17 @@ function parse(html) {
   });
   return result;
 }
-var attrString, stringifier;
-attrString = function (attrs) {
-  var buff, key;
-  buff = [];
-  for (key in attrs) {
-    buff.push(key + '="' + attrs[key] + '"');
+function attrString(attrs) {
+  const buff = [];
+  for (const key in attrs) {
+    buff.push(key + '="' + attrs[key].replace(/"/g, '&quot;') + '"');
   }
   if (!buff.length) {
     return '';
   }
   return ' ' + buff.join(' ');
-};
-stringifier = function (buff, doc) {
+}
+function stringifier(buff, doc) {
   switch (doc.type) {
     case 'text':
       return buff + doc.content;
@@ -163,7 +138,7 @@ stringifier = function (buff, doc) {
     case 'comment':
       return buff += '<!--' + doc.content + '-->';
   }
-};
+}
 function stringify(doc) {
   return doc.reduce(function (token, rootEl) {
     return token + stringifier('', rootEl);

package/package.json

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

package/store/dist/dev.cjs

@@ -238,11 +238,11 @@ const proxyTraps = {
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set(target, property, value) {
-    setProperty(target, property, unwrap(value));
+    solidJs.batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    solidJs.batch(() => setProperty(target, property, undefined));
     return true;
   },
   ownKeys: ownKeys,

package/store/dist/dev.js

@@ -234,11 +234,11 @@ const proxyTraps = {
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set(target, property, value) {
-    setProperty(target, property, unwrap(value));
+    batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    batch(() => setProperty(target, property, undefined));
     return true;
   },
   ownKeys: ownKeys,

package/store/dist/store.cjs

@@ -226,11 +226,11 @@ const proxyTraps = {
     return isWrappable(value) ? wrap(value) : value;
   },
   set(target, property, value) {
-    setProperty(target, property, unwrap(value));
+    solidJs.batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    solidJs.batch(() => setProperty(target, property, undefined));
     return true;
   },
   ownKeys: ownKeys,

package/store/dist/store.js

@@ -222,11 +222,11 @@ const proxyTraps = {
     return isWrappable(value) ? wrap(value) : value;
   },
   set(target, property, value) {
-    setProperty(target, property, unwrap(value));
+    batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    batch(() => setProperty(target, property, undefined));
     return true;
   },
   ownKeys: ownKeys,

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createReaction, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $DEVCOMP, $PROXY, $TRACK } from "./reactive/signal";
-export type { Accessor, Setter, Signal, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
+export type { Accessor, Setter, Signal, Resource, ResourceOptions, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes, Owner } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";
 export * from "./reactive/array";

package/types/reactive/observable.d.ts

@@ -1,6 +1,11 @@
 import { Accessor, Setter } from "./signal";
+declare global {
+    interface SymbolConstructor {
+        readonly observable: symbol;
+    }
+}
 export declare type ObservableObserver<T> = ((v: T) => void) | {
-    next: (v: T) => void;
+    next?: (v: T) => void;
     error?: (v: any) => void;
     complete?: (v: boolean) => void;
 };
@@ -15,10 +20,10 @@ export declare type ObservableObserver<T> = ((v: T) => void) | {
  * description https://www.solidjs.com/docs/latest/api#observable
  */
 export declare function observable<T>(input: Accessor<T>): {
-    [x: number]: () => any;
     subscribe(observer: ObservableObserver<T>): {
         unsubscribe(): void;
     };
+    [Symbol.observable](): any;
 };
 export declare function from<T>(producer: ((setter: Setter<T>) => () => void) | {
     subscribe: (fn: (v: T) => void) => (() => void) | {

package/universal/types/universal.d.ts

@@ -6,9 +6,9 @@ export interface RendererOptions<NodeType> {
   setProperty<T>(node: NodeType, name: string, value: T, prev?: T): void;
   insertNode(parent: NodeType, node: NodeType, anchor?: NodeType): void;
   removeNode(parent: NodeType, node: NodeType): void;
-  getParentNode(node: NodeType): NodeType;
-  getFirstChild(node: NodeType): NodeType;
-  getNextSibling(node: NodeType): NodeType;
+  getParentNode(node: NodeType): NodeType | undefined;
+  getFirstChild(node: NodeType): NodeType | undefined;
+  getNextSibling(node: NodeType): NodeType | undefined;
 }
 
 export interface Renderer<NodeType> {

package/web/dist/dev.cjs

@@ -446,13 +446,12 @@ 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;
+        prev = current && current[i];
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((t = typeof item) === "function") {
+    } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
@@ -461,7 +460,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
         dynamic = true;
       }
     } else {
-      const value = t === "string" ? item : item.string();
+      const value = String(item);
       if (prev && prev.nodeType === 3 && prev.data === value) {
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/web/dist/dev.js

@@ -443,13 +443,12 @@ 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;
+        prev = current && current[i];
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((t = typeof item) === "function") {
+    } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
@@ -458,7 +457,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
         dynamic = true;
       }
     } else {
-      const value = t === "string" ? item : item.string();
+      const value = String(item);
       if (prev && prev.nodeType === 3 && prev.data === value) {
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/web/dist/server.cjs

@@ -279,17 +279,18 @@ function renderToStringAsync(code, options = {}) {
   });
   function asyncWrap(fn) {
     return new Promise(resolve => {
-      const registry = new Set();
+      const registry = new Map();
       const cache = Object.create(null);
       solidJs.sharedConfig.context.registerFragment = register;
       const rendered = fn();
       if (!registry.size) resolve(rendered);
       function register(key) {
-        registry.add(key);
+        if (!registry.has(key)) registry.set(key, []);
         return (value = "", error) => {
           if (!registry.has(key)) return;
           cache[key] = value;
           registry.delete(key);
+          if (waitForFragments(registry, key)) return;
           if (error) scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;else scripts += `_$HY.set("${key}", null);`;
           if (!registry.size) Promise.resolve().then(() => {
             let source = resolveSSRNode(rendered);
@@ -396,7 +397,7 @@ function renderToStream(code, options = {}) {
               pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}_$HY.set("${key}",${error ? serializeError(error) : "null"})`);
             } else {
               buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div>`);
-              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
+              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") + ";" : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
               scriptFlushed = true;
             }
           }

package/web/dist/server.js

@@ -276,17 +276,18 @@ function renderToStringAsync(code, options = {}) {
   });
   function asyncWrap(fn) {
     return new Promise(resolve => {
-      const registry = new Set();
+      const registry = new Map();
       const cache = Object.create(null);
       sharedConfig.context.registerFragment = register;
       const rendered = fn();
       if (!registry.size) resolve(rendered);
       function register(key) {
-        registry.add(key);
+        if (!registry.has(key)) registry.set(key, []);
         return (value = "", error) => {
           if (!registry.has(key)) return;
           cache[key] = value;
           registry.delete(key);
+          if (waitForFragments(registry, key)) return;
           if (error) scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;else scripts += `_$HY.set("${key}", null);`;
           if (!registry.size) Promise.resolve().then(() => {
             let source = resolveSSRNode(rendered);
@@ -393,7 +394,7 @@ function renderToStream(code, options = {}) {
               pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}_$HY.set("${key}",${error ? serializeError(error) : "null"})`);
             } else {
               buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div>`);
-              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
+              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") + ";" : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
               scriptFlushed = true;
             }
           }

package/web/dist/web.cjs

@@ -445,13 +445,12 @@ 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;
+        prev = current && current[i];
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((t = typeof item) === "function") {
+    } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
@@ -460,7 +459,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
         dynamic = true;
       }
     } else {
-      const value = t === "string" ? item : item.string();
+      const value = String(item);
       if (prev && prev.nodeType === 3 && prev.data === value) {
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/web/dist/web.js

@@ -442,13 +442,12 @@ 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;
+        prev = current && current[i];
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((t = typeof item) === "function") {
+    } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
@@ -457,7 +456,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
         dynamic = true;
       }
     } else {
-      const value = t === "string" ? item : item.string();
+      const value = String(item);
       if (prev && prev.nodeType === 3 && prev.data === value) {
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));