solid-js 1.3.4 → 1.3.8

package/dist/dev.cjs

@@ -124,7 +124,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -158,14 +158,13 @@ let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
@@ -267,6 +266,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -321,6 +321,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -338,6 +340,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -400,7 +404,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -1010,7 +1015,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1348,7 +1353,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/dev.js

@@ -120,7 +120,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -154,14 +154,13 @@ let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
@@ -263,6 +262,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -317,6 +317,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -334,6 +336,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -396,7 +400,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -1006,7 +1011,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1344,7 +1349,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/server.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
-const $DEVCOMP = Symbol('solid-dev-component');
+const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -79,7 +79,7 @@ function createMemo(fn, value) {
 function createDeferred(source) {
   return source;
 }
-function createSelector(source, fn) {
+function createSelector(source, fn = equalFn) {
   return k => fn(k, source());
 }
 function batch(fn) {
@@ -231,7 +231,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return sharedConfig.context ? { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
 }
@@ -311,6 +311,7 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
   let error, res;
   const ctx = sharedConfig.context;
@@ -411,6 +412,7 @@ function createResource(fn, fetcher, options = {}) {
     mutate: v => value = v
   }];
 }
+function refetchResources(info) {}
 function lazy(fn) {
   let resolved;
   const p = fn();
@@ -558,7 +560,9 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
+exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
+exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;

package/dist/server.js

@@ -1,6 +1,6 @@
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
-const $DEVCOMP = Symbol('solid-dev-component');
+const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -75,7 +75,7 @@ function createMemo(fn, value) {
 function createDeferred(source) {
   return source;
 }
-function createSelector(source, fn) {
+function createSelector(source, fn = equalFn) {
   return k => fn(k, source());
 }
 function batch(fn) {
@@ -227,7 +227,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return sharedConfig.context ? { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
 }
@@ -307,6 +307,7 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
   let error, res;
   const ctx = sharedConfig.context;
@@ -407,6 +408,7 @@ function createResource(fn, fetcher, options = {}) {
     mutate: v => value = v
   }];
 }
+function refetchResources(info) {}
 function lazy(fn) {
   let resolved;
   const p = fn();
@@ -513,4 +515,4 @@ function Suspense(props) {
   return props.fallback;
 }
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -124,7 +124,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -157,14 +157,13 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   Owner = root;
   Listener = null;
@@ -264,6 +263,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -318,6 +318,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -335,6 +337,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -397,7 +401,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -929,7 +934,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1264,7 +1269,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/solid.js

@@ -120,7 +120,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -153,14 +153,13 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   Owner = root;
   Listener = null;
@@ -260,6 +259,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -314,6 +314,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -331,6 +333,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -393,7 +397,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -925,7 +930,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1260,7 +1265,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.4",
+  "version": "1.3.8",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "4c08b520a8cb3ed03886fba160154a679dfab8a6"
+  "gitHead": "6e7f0a80cd949e6dd5c0baaf45432ed2b0693119"
 }

package/store/dist/dev.cjs

@@ -147,12 +147,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -162,7 +162,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/dist/dev.js

@@ -143,12 +143,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -158,7 +158,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/dist/server.cjs

@@ -31,12 +31,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -46,7 +46,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/dist/server.js

@@ -27,12 +27,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -42,7 +42,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/dist/store.cjs

@@ -142,12 +142,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -157,7 +157,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/dist/store.js

@@ -138,12 +138,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -153,7 +153,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/types/jsx.d.ts

@@ -2085,6 +2085,8 @@ export namespace JSX {
   }
   interface DetailsHtmlAttributes<T> extends HTMLAttributes<T> {
     open?: boolean;
+    onToggle?: EventHandlerUnion<T, Event>;
+    ontoggle?: EventHandlerUnion<T, Event>;
   }
   interface DialogHtmlAttributes<T> extends HTMLAttributes<T> {
     open?: boolean;

package/types/reactive/signal.d.ts

@@ -437,6 +437,8 @@ export declare function createContext<T>(defaultValue: T): Context<T>;
  * @description https://www.solidjs.com/docs/latest/api#usecontext
  */
 export declare function useContext<T>(context: Context<T>): T;
+export declare type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement | JSX.FunctionElement>;
+export declare type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
 /**
  * Resolves child elements to help interact with children
  *
@@ -445,7 +447,7 @@ export declare function useContext<T>(context: Context<T>): T;
  *
  * @description https://www.solidjs.com/docs/latest/api#children
  */
-export declare function children(fn: Accessor<JSX.Element>): Accessor<JSX.Element>;
+export declare function children(fn: Accessor<JSX.Element>): Accessor<ResolvedChildren>;
 export declare type SuspenseContextType = {
     increment?: () => void;
     decrement?: () => void;

package/types/server/index.d.ts

@@ -1,3 +1,3 @@
 export { createRoot, createSignal, createComputed, createRenderEffect, createEffect, createReaction, createDeferred, createSelector, createMemo, getListener, onMount, onCleanup, onError, untrack, batch, on, children, createContext, useContext, getOwner, runWithOwner, equalFn, requestCallback, mapArray, observable, from, $PROXY, $DEVCOMP, DEV, enableExternalSource } from "./reactive";
-export { mergeProps, splitProps, createComponent, For, Index, Show, Switch, Match, ErrorBoundary, Suspense, SuspenseList, createResource, enableScheduling, enableHydration, startTransition, useTransition, createUniqueId, lazy, sharedConfig } from "./rendering";
+export { mergeProps, splitProps, createComponent, For, Index, Show, Switch, Match, ErrorBoundary, Suspense, SuspenseList, createResource, refetchResources, resetErrorBoundaries, enableScheduling, enableHydration, startTransition, useTransition, createUniqueId, lazy, sharedConfig } from "./rendering";
 export type { Component, Resource } from "./rendering";

package/types/server/reactive.d.ts

@@ -19,7 +19,7 @@ export declare function createEffect<T>(fn: (v?: T) => T, value?: T): void;
 export declare function createReaction(fn: () => void): (fn: () => void) => void;
 export declare function createMemo<T>(fn: (v?: T) => T, value?: T): () => T;
 export declare function createDeferred<T>(source: () => T): () => T;
-export declare function createSelector<T>(source: () => T, fn: (k: T, value: T) => boolean): (k: T) => boolean;
+export declare function createSelector<T>(source: () => T, fn?: (k: T, value: T) => boolean): (k: T) => boolean;
 export declare function batch<T>(fn: () => T): T;
 export declare const untrack: typeof batch;
 export declare function on<T, U>(deps: Array<() => T> | (() => T), fn: (value: Array<T> | T, prev?: Array<T> | T, prevResults?: U) => U, options?: {

package/web/dist/dev.cjs

@@ -197,6 +197,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !solidJs.sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -391,20 +394,17 @@ 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)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (solidJs.sharedConfig.context && current && current.length) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
@@ -626,6 +626,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.hydrate = hydrate;
+exports.innerHTML = innerHTML;
 exports.insert = insert;
 exports.isServer = isServer;
 exports.memo = memo;

package/web/dist/dev.js

@@ -194,6 +194,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -388,20 +391,17 @@ 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)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (sharedConfig.context && current && current.length) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
@@ -550,4 +550,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };
+export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };

package/web/dist/server.cjs

@@ -232,7 +232,7 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,y,t){t=document.getElementById(e),document.getElementById("pl"+e).replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
+const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
 const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -323,7 +323,11 @@ function renderToStream(code, options = {}) {
   const checkEnd = () => {
     if (!registry.size && !completed) {
       writeTasks();
-      onCompleteAll && onCompleteAll(result);
+      onCompleteAll && onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
       writable && writable.end();
       completed = true;
     }
@@ -375,12 +379,14 @@ function renderToStream(code, options = {}) {
       }
       tasks.push(`_$HY.init("${key}")`);
       return (value, error) => {
-        const keys = registry.get(key);
-        registry.delete(key);
-        if (waitForFragments(registry, key)) return;
-        if ((value !== undefined || error) && !completed) {
-          buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
-          scriptFlushed = true;
+        if (registry.has(key)) {
+          const keys = registry.get(key);
+          registry.delete(key);
+          if (waitForFragments(registry, key)) return;
+          if ((value !== undefined || error) && !completed) {
+            buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
+            scriptFlushed = true;
+          }
         }
         checkEnd();
         return true;
@@ -394,7 +400,11 @@ function renderToStream(code, options = {}) {
     buffer.write(html);
     tasks.length = 0;
     scheduled = false;
-    onCompleteShell && onCompleteShell();
+    onCompleteShell && onCompleteShell({
+      write(v) {
+        !completed && buffer.write(v);
+      }
+    });
   });
   return {
     pipe(w) {
@@ -613,8 +623,11 @@ function serializeSet(registry, key, value) {
 }
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipe(writable);
         }
@@ -626,8 +639,11 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipeTo(writable);
         }

package/web/dist/server.js

@@ -229,7 +229,7 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,y,t){t=document.getElementById(e),document.getElementById("pl"+e).replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
+const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
 const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -320,7 +320,11 @@ function renderToStream(code, options = {}) {
   const checkEnd = () => {
     if (!registry.size && !completed) {
       writeTasks();
-      onCompleteAll && onCompleteAll(result);
+      onCompleteAll && onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
       writable && writable.end();
       completed = true;
     }
@@ -372,12 +376,14 @@ function renderToStream(code, options = {}) {
       }
       tasks.push(`_$HY.init("${key}")`);
       return (value, error) => {
-        const keys = registry.get(key);
-        registry.delete(key);
-        if (waitForFragments(registry, key)) return;
-        if ((value !== undefined || error) && !completed) {
-          buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
-          scriptFlushed = true;
+        if (registry.has(key)) {
+          const keys = registry.get(key);
+          registry.delete(key);
+          if (waitForFragments(registry, key)) return;
+          if ((value !== undefined || error) && !completed) {
+            buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
+            scriptFlushed = true;
+          }
         }
         checkEnd();
         return true;
@@ -391,7 +397,11 @@ function renderToStream(code, options = {}) {
     buffer.write(html);
     tasks.length = 0;
     scheduled = false;
-    onCompleteShell && onCompleteShell();
+    onCompleteShell && onCompleteShell({
+      write(v) {
+        !completed && buffer.write(v);
+      }
+    });
   });
   return {
     pipe(w) {
@@ -610,8 +620,11 @@ function serializeSet(registry, key, value) {
 }
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipe(writable);
         }
@@ -623,8 +636,11 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipeTo(writable);
         }

package/web/dist/web.cjs

@@ -196,6 +196,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !solidJs.sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -390,20 +393,17 @@ 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)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (solidJs.sharedConfig.context && current && current.length) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
@@ -622,6 +622,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.hydrate = hydrate;
+exports.innerHTML = innerHTML;
 exports.insert = insert;
 exports.isServer = isServer;
 exports.memo = memo;

package/web/dist/web.js

@@ -193,6 +193,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -387,20 +390,17 @@ 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)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (sharedConfig.context && current && current.length) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
@@ -546,4 +546,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };
+export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };

package/web/types/client.d.ts

@@ -30,6 +30,7 @@ export function spread<T>(
 export function assign(node: Element, props: any, isSVG?: Boolean, skipChildren?: Boolean): void;
 export function setAttribute(node: Element, name: string, value: string): void;
 export function setAttributeNS(node: Element, namespace: string, name: string, value: string): void;
+export function innerHTML(node: Element, content: string): void;
 export function addEventListener(
   node: Element,
   name: string,