solid-js 1.3.11 → 1.3.14

package/dist/dev.cjs

@@ -621,7 +621,7 @@ function readSignal() {
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
     const updates = Updates;
     Updates = null;
-    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookDownstream(this);
+    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookUpstream(this);
     Updates = updates;
   }
   if (Listener) {
@@ -645,16 +645,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;
@@ -671,7 +671,7 @@ function writeSignal(node, value, isComp) {
         if (TransitionRunning && Transition.disposed.has(o)) continue;
         if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
           if (o.pure) Updates.push(o);else Effects.push(o);
-          if (o.observers) markUpstream(o);
+          if (o.observers) markDownstream(o);
         }
         if (TransitionRunning) o.tState = STALE;else o.state = STALE;
       }
@@ -764,7 +764,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
 function runTop(node) {
   const runningTransition = Transition && Transition.running;
   if (!runningTransition && node.state === 0 || runningTransition && node.tState === 0) return;
-  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookDownstream(node);
+  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookUpstream(node);
   if (node.suspense && untrack(node.suspense.inFallback)) return node.suspense.effects.push(node);
   const ancestors = [node];
   while ((node = node.owner) && (!node.updatedAt || node.updatedAt < ExecCount)) {
@@ -785,7 +785,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node, ancestors[0]);
+      lookUpstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -884,7 +884,7 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node, ignore) {
+function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
   for (let i = 0; i < node.sources.length; i += 1) {
@@ -892,18 +892,18 @@ function lookDownstream(node, ignore) {
     if (source.sources) {
       if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
         if (source !== ignore) runTop(source);
-      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookUpstream(source, ignore);
     }
   }
 }
-function markUpstream(node) {
+function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.observers.length; i += 1) {
     const o = node.observers[i];
     if (!runningTransition && !o.state || runningTransition && !o.tState) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
-      o.observers && markUpstream(o);
+      o.observers && markDownstream(o);
     }
   }
 }
@@ -1426,6 +1426,7 @@ function ErrorBoundary(props) {
   return createMemo(() => {
     if ((e = errored()) != null) {
       const f = props.fallback;
+      if ((typeof f !== "function" || f.length == 0)) console.error(e);
       return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
     }
     onError(setErrored);

package/dist/dev.js

@@ -617,7 +617,7 @@ function readSignal() {
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
     const updates = Updates;
     Updates = null;
-    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookDownstream(this);
+    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookUpstream(this);
     Updates = updates;
   }
   if (Listener) {
@@ -641,16 +641,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;
@@ -667,7 +667,7 @@ function writeSignal(node, value, isComp) {
         if (TransitionRunning && Transition.disposed.has(o)) continue;
         if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
           if (o.pure) Updates.push(o);else Effects.push(o);
-          if (o.observers) markUpstream(o);
+          if (o.observers) markDownstream(o);
         }
         if (TransitionRunning) o.tState = STALE;else o.state = STALE;
       }
@@ -760,7 +760,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
 function runTop(node) {
   const runningTransition = Transition && Transition.running;
   if (!runningTransition && node.state === 0 || runningTransition && node.tState === 0) return;
-  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookDownstream(node);
+  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookUpstream(node);
   if (node.suspense && untrack(node.suspense.inFallback)) return node.suspense.effects.push(node);
   const ancestors = [node];
   while ((node = node.owner) && (!node.updatedAt || node.updatedAt < ExecCount)) {
@@ -781,7 +781,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node, ancestors[0]);
+      lookUpstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -880,7 +880,7 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node, ignore) {
+function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
   for (let i = 0; i < node.sources.length; i += 1) {
@@ -888,18 +888,18 @@ function lookDownstream(node, ignore) {
     if (source.sources) {
       if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
         if (source !== ignore) runTop(source);
-      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookUpstream(source, ignore);
     }
   }
 }
-function markUpstream(node) {
+function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.observers.length; i += 1) {
     const o = node.observers[i];
     if (!runningTransition && !o.state || runningTransition && !o.tState) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
-      o.observers && markUpstream(o);
+      o.observers && markDownstream(o);
     }
   }
 }
@@ -1422,6 +1422,7 @@ function ErrorBoundary(props) {
   return createMemo(() => {
     if ((e = errored()) != null) {
       const f = props.fallback;
+      if ((typeof f !== "function" || f.length == 0)) console.error(e);
       return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
     }
     onError(setErrored);

package/dist/server.cjs

@@ -331,16 +331,16 @@ function ErrorBoundary(props) {
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
-function createResource(fn, fetcher, options = {}) {
+function createResource(source, fetcher, options = {}) {
   if (arguments.length === 2) {
     if (typeof fetcher === "object") {
       options = fetcher;
-      fetcher = fn;
-      fn = true;
+      fetcher = source;
+      source = true;
     }
   } else if (arguments.length === 1) {
-    fetcher = fn;
-    fn = true;
+    fetcher = source;
+    source = true;
   }
   const contexts = new Set();
   const id = sharedConfig.context.id + sharedConfig.context.count++;
@@ -372,23 +372,27 @@ function createResource(fn, fetcher, options = {}) {
   read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
+    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
     }
     resourceContext = [];
-    const lookup = typeof fn === "function" ? fn() : fn;
+    const lookup = typeof source === "function" ? source() : source;
     if (resourceContext.length) {
-      p = Promise.all(resourceContext).then(() => fetcher(fn(), () => value));
+      p = Promise.all(resourceContext).then(() => fetcher(source(), {
+        value
+      }));
     }
     resourceContext = null;
     if (!p) {
       if (lookup == null || lookup === false) return;
-      p = fetcher(lookup, () => value);
+      p = fetcher(lookup, {
+        value
+      });
     }
-    read.loading = true;
-    if ("then" in p) {
+    if (p && "then" in p) {
+      read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p);
       return p.then(res => {
         read.loading = false;

package/dist/server.js

@@ -327,16 +327,16 @@ function ErrorBoundary(props) {
 }
 const SuspenseContext = createContext();
 let resourceContext = null;
-function createResource(fn, fetcher, options = {}) {
+function createResource(source, fetcher, options = {}) {
   if (arguments.length === 2) {
     if (typeof fetcher === "object") {
       options = fetcher;
-      fetcher = fn;
-      fn = true;
+      fetcher = source;
+      source = true;
     }
   } else if (arguments.length === 1) {
-    fetcher = fn;
-    fn = true;
+    fetcher = source;
+    source = true;
   }
   const contexts = new Set();
   const id = sharedConfig.context.id + sharedConfig.context.count++;
@@ -368,23 +368,27 @@ function createResource(fn, fetcher, options = {}) {
   read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
+    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
     }
     resourceContext = [];
-    const lookup = typeof fn === "function" ? fn() : fn;
+    const lookup = typeof source === "function" ? source() : source;
     if (resourceContext.length) {
-      p = Promise.all(resourceContext).then(() => fetcher(fn(), () => value));
+      p = Promise.all(resourceContext).then(() => fetcher(source(), {
+        value
+      }));
     }
     resourceContext = null;
     if (!p) {
       if (lookup == null || lookup === false) return;
-      p = fetcher(lookup, () => value);
+      p = fetcher(lookup, {
+        value
+      });
     }
-    read.loading = true;
-    if ("then" in p) {
+    if (p && "then" in p) {
+      read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p);
       return p.then(res => {
         read.loading = false;

package/dist/solid.cjs

@@ -565,7 +565,7 @@ function readSignal() {
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
     const updates = Updates;
     Updates = null;
-    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookDownstream(this);
+    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookUpstream(this);
     Updates = updates;
   }
   if (Listener) {
@@ -589,16 +589,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;
@@ -615,7 +615,7 @@ function writeSignal(node, value, isComp) {
         if (TransitionRunning && Transition.disposed.has(o)) continue;
         if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
           if (o.pure) Updates.push(o);else Effects.push(o);
-          if (o.observers) markUpstream(o);
+          if (o.observers) markDownstream(o);
         }
         if (TransitionRunning) o.tState = STALE;else o.state = STALE;
       }
@@ -707,7 +707,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
 function runTop(node) {
   const runningTransition = Transition && Transition.running;
   if (!runningTransition && node.state === 0 || runningTransition && node.tState === 0) return;
-  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookDownstream(node);
+  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookUpstream(node);
   if (node.suspense && untrack(node.suspense.inFallback)) return node.suspense.effects.push(node);
   const ancestors = [node];
   while ((node = node.owner) && (!node.updatedAt || node.updatedAt < ExecCount)) {
@@ -728,7 +728,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node, ancestors[0]);
+      lookUpstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -826,7 +826,7 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node, ignore) {
+function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
   for (let i = 0; i < node.sources.length; i += 1) {
@@ -834,18 +834,18 @@ function lookDownstream(node, ignore) {
     if (source.sources) {
       if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
         if (source !== ignore) runTop(source);
-      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookUpstream(source, ignore);
     }
   }
 }
-function markUpstream(node) {
+function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.observers.length; i += 1) {
     const o = node.observers[i];
     if (!runningTransition && !o.state || runningTransition && !o.tState) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
-      o.observers && markUpstream(o);
+      o.observers && markDownstream(o);
     }
   }
 }

package/dist/solid.js

@@ -561,7 +561,7 @@ function readSignal() {
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
     const updates = Updates;
     Updates = null;
-    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookDownstream(this);
+    !runningTransition && this.state === STALE || runningTransition && this.tState === STALE ? updateComputation(this) : lookUpstream(this);
     Updates = updates;
   }
   if (Listener) {
@@ -585,16 +585,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;
@@ -611,7 +611,7 @@ function writeSignal(node, value, isComp) {
         if (TransitionRunning && Transition.disposed.has(o)) continue;
         if (TransitionRunning && !o.tState || !TransitionRunning && !o.state) {
           if (o.pure) Updates.push(o);else Effects.push(o);
-          if (o.observers) markUpstream(o);
+          if (o.observers) markDownstream(o);
         }
         if (TransitionRunning) o.tState = STALE;else o.state = STALE;
       }
@@ -703,7 +703,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
 function runTop(node) {
   const runningTransition = Transition && Transition.running;
   if (!runningTransition && node.state === 0 || runningTransition && node.tState === 0) return;
-  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookDownstream(node);
+  if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) return lookUpstream(node);
   if (node.suspense && untrack(node.suspense.inFallback)) return node.suspense.effects.push(node);
   const ancestors = [node];
   while ((node = node.owner) && (!node.updatedAt || node.updatedAt < ExecCount)) {
@@ -724,7 +724,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node, ancestors[0]);
+      lookUpstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -822,7 +822,7 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node, ignore) {
+function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
   for (let i = 0; i < node.sources.length; i += 1) {
@@ -830,18 +830,18 @@ function lookDownstream(node, ignore) {
     if (source.sources) {
       if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
         if (source !== ignore) runTop(source);
-      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookUpstream(source, ignore);
     }
   }
 }
-function markUpstream(node) {
+function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.observers.length; i += 1) {
     const o = node.observers[i];
     if (!runningTransition && !o.state || runningTransition && !o.tState) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
-      o.observers && markUpstream(o);
+      o.observers && markDownstream(o);
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.11",
+  "version": "1.3.14",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "f880eac70b79292cb3452bfbe27a9a94f283d605"
+  "gitHead": "9a41feafea10717e785c603eadb96c6133cd2988"
 }

package/store/types/index.d.ts

@@ -1,4 +1,4 @@
 export { createStore, unwrap, $RAW } from "./store";
-export type { Store, SetStoreFunction, NotWrappable, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store";
+export type { Store, SetStoreFunction, NotWrappable, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store";
 export * from "./mutable";
 export * from "./modifiers";

package/store/types/modifiers.d.ts

@@ -1,7 +1,7 @@
-import { DeepMutable, NotWrappable } from "./store";
+import { DeepMutable } from "./store";
 export declare type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };
 export declare function reconcile<T extends U, U>(value: T, options?: ReconcileOptions): (state: U) => T;
-export declare function produce<T>(fn: (state: DeepMutable<Exclude<T, NotWrappable>>) => void): (state: T) => T;
+export declare function produce<T>(fn: (state: DeepMutable<T>) => void): (state: T) => T;

package/store/types/store.d.ts

@@ -1,7 +1,11 @@
 import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
 export declare type StoreNode = Record<PropertyKey, any>;
-export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined;
+export declare namespace SolidStore {
+    interface Unwrappable {
+    }
+}
+export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
 export declare type Store<T> = DeepReadonly<T>;
 export declare function isWrappable(obj: any): any;
 export declare function unwrap<T extends StoreNode>(item: any, set?: Set<unknown>): T;
@@ -13,11 +17,11 @@ export declare function createDataNode(): Accessor<void> & {
 };
 export declare function setProperty(state: StoreNode, property: PropertyKey, value: any): void;
 export declare function updatePath(current: StoreNode, path: any[], traversed?: PropertyKey[]): void;
-export declare type DeepReadonly<T> = 0 extends 1 & T ? T : {
-    readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepReadonly<T[K]>;
+export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
+    readonly [K in keyof T]: DeepReadonly<T[K]>;
 };
-export declare type DeepMutable<T> = 0 extends 1 & T ? T : {
-    -readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepMutable<T[K]>;
+export declare type DeepMutable<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
+    -readonly [K in keyof T]: DeepMutable<T[K]>;
 };
 export declare type StorePathRange = {
     from?: number;
@@ -25,10 +29,10 @@ export declare type StorePathRange = {
     by?: number;
 };
 export declare type ArrayFilterFn<T> = (item: DeepReadonly<T>, index: number) => boolean;
-export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: DeepReadonly<T>, traversed: U) => DeepReadonly<T> | Partial<DeepReadonly<T>> | void) | DeepReadonly<T> | Partial<DeepReadonly<T>>;
-export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = [K] extends [never] ? never : K | readonly K[] | (number extends K ? ArrayFilterFn<T[number]> | StorePathRange : never);
+export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: DeepReadonly<T>, traversed: U) => T | Partial<T> | DeepReadonly<T> | Partial<DeepReadonly<T>> | void) | T | Partial<T> | DeepReadonly<T> | Partial<DeepReadonly<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);
 declare type W<T> = Exclude<T, NotWrappable>;
-declare type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [never] ? never : number : keyof T;
+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>);
 declare type DistributeRest<T, K, U extends PropertyKey[]> = [T] extends [never] ? never : K extends KeyOf<T> ? [Part<T, K>, ...Rest<T[K], [K, ...U]>] : never;
 export interface SetStoreFunction<T> {

package/types/jsx.d.ts

@@ -21,7 +21,7 @@ export namespace JSX {
     (): Element;
   }
   interface ElementClass {
-    render(props: any): Element;
+    // empty, libs can define requirements downstream
   }
   type LibraryManagedAttributes<Component, Props> = Props;
   interface ElementChildrenAttribute {
@@ -3112,7 +3112,7 @@ export namespace JSX {
       ZoomAndPanSVGAttributes,
       PresentationSVGAttributes {
     version?: string;
-    "base-profile"?: string;
+    baseProfile?: string;
     x?: number | string;
     y?: number | string;
     width?: number | string;

package/types/reactive/signal.d.ts

@@ -70,7 +70,7 @@ export declare type RootFunction<T> = (dispose: () => void) => T;
  */
 export declare function createRoot<T>(fn: RootFunction<T>, detachedOwner?: Owner): T;
 export declare type Accessor<T> = () => T;
-export declare type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
+export declare type Setter<T> = (undefined extends T ? (value?: undefined) => undefined : {}) & (<U extends T>(value: Exclude<U, Function> | ((prev: T) => U)) => U);
 export declare type Signal<T> = [get: Accessor<T>, set: Setter<T>];
 export interface SignalOptions<T> extends MemoOptions<T> {
     internal?: boolean;

package/types/server/reactive.d.ts

@@ -1,8 +1,9 @@
-import type { Accessor, Setter } from "../reactive/signal";
 export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
 export declare const $DEVCOMP: unique symbol;
 export declare const DEV: {};
+export declare type Accessor<T> = () => T;
+export declare type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
 export declare let Owner: Owner | null;
 interface Owner {
     owner: Owner | null;

package/types/server/rendering.d.ts

@@ -1,3 +1,4 @@
+import { Setter } from "./reactive";
 import type { JSX } from "../jsx";
 declare type PropsWithChildren<P> = P & {
     children?: JSX.Element;
@@ -72,19 +73,32 @@ declare type SuspenseContextType = {
     }>;
     completed: () => void;
 };
-declare type ResourceReturn<T> = [
-    Resource<T>,
-    {
-        mutate: (v: T | undefined) => T | undefined;
-        refetch: () => void;
-    }
-];
-export declare function createResource<T, U = true>(fetcher: (k: U, getPrev: () => T | undefined) => T | Promise<T>, options?: {
-    initialValue?: T;
-}): ResourceReturn<T>;
-export declare function createResource<T, U>(fn: U | false | (() => U | false), fetcher: (k: U, getPrev: () => T | undefined) => T | Promise<T>, options?: {
+export declare type ResourceActions<T> = {
+    mutate: Setter<T>;
+    refetch: (info?: unknown) => void;
+};
+export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
+export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
+export declare type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
+export declare type ResourceFetcherInfo<T> = {
+    value: T | undefined;
+    refetching?: unknown;
+};
+export declare type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
-}): ResourceReturn<T>;
+    name?: string;
+    globalRefetch?: boolean;
+    onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
+} : {
+    initialValue: T;
+    name?: string;
+    globalRefetch?: boolean;
+    onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
+};
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
 export declare function refetchResources(info?: unknown): void;
 export declare function lazy(fn: () => Promise<{
     default: any;

package/universal/dist/dev.cjs

@@ -194,18 +194,18 @@ function createRenderer$1({
     removeNode(parent, oldNode);
   }
   function spreadExpression(node, props, prevProps = {}, skipChildren) {
+    props || (props = {});
     if (!skipChildren && "children" in props) {
       solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
     }
+    props.ref && props.ref(node);
     solidJs.createRenderEffect(() => {
       for (const prop in props) {
-        if (prop === "children") continue;
+        if (prop === "children" || prop === "ref") continue;
         const value = props[prop];
         if (value === prevProps[prop]) continue;
-        if (prop === "ref") value(node);else {
-          setProperty(node, prop, value, prevProps[prop]);
-          prevProps[prop] = value;
-        }
+        setProperty(node, prop, value, prevProps[prop]);
+        prevProps[prop] = value;
       }
     });
     return prevProps;

package/universal/dist/dev.js

@@ -190,18 +190,18 @@ function createRenderer$1({
     removeNode(parent, oldNode);
   }
   function spreadExpression(node, props, prevProps = {}, skipChildren) {
+    props || (props = {});
     if (!skipChildren && "children" in props) {
       createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
     }
+    props.ref && props.ref(node);
     createRenderEffect(() => {
       for (const prop in props) {
-        if (prop === "children") continue;
+        if (prop === "children" || prop === "ref") continue;
         const value = props[prop];
         if (value === prevProps[prop]) continue;
-        if (prop === "ref") value(node);else {
-          setProperty(node, prop, value, prevProps[prop]);
-          prevProps[prop] = value;
-        }
+        setProperty(node, prop, value, prevProps[prop]);
+        prevProps[prop] = value;
       }
     });
     return prevProps;

package/universal/dist/universal.cjs

@@ -194,18 +194,18 @@ function createRenderer$1({
     removeNode(parent, oldNode);
   }
   function spreadExpression(node, props, prevProps = {}, skipChildren) {
+    props || (props = {});
     if (!skipChildren && "children" in props) {
       solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
     }
+    props.ref && props.ref(node);
     solidJs.createRenderEffect(() => {
       for (const prop in props) {
-        if (prop === "children") continue;
+        if (prop === "children" || prop === "ref") continue;
         const value = props[prop];
         if (value === prevProps[prop]) continue;
-        if (prop === "ref") value(node);else {
-          setProperty(node, prop, value, prevProps[prop]);
-          prevProps[prop] = value;
-        }
+        setProperty(node, prop, value, prevProps[prop]);
+        prevProps[prop] = value;
       }
     });
     return prevProps;

package/universal/dist/universal.js

@@ -190,18 +190,18 @@ function createRenderer$1({
     removeNode(parent, oldNode);
   }
   function spreadExpression(node, props, prevProps = {}, skipChildren) {
+    props || (props = {});
     if (!skipChildren && "children" in props) {
       createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
     }
+    props.ref && props.ref(node);
     createRenderEffect(() => {
       for (const prop in props) {
-        if (prop === "children") continue;
+        if (prop === "children" || prop === "ref") continue;
         const value = props[prop];
         if (value === prevProps[prop]) continue;
-        if (prop === "ref") value(node);else {
-          setProperty(node, prop, value, prevProps[prop]);
-          prevProps[prop] = value;
-        }
+        setProperty(node, prop, value, prevProps[prop]);
+        prevProps[prop] = value;
       }
     });
     return prevProps;

package/web/dist/dev.cjs

@@ -166,8 +166,10 @@ function classList(node, value, prev = {}) {
 }
 function style(node, value, prev = {}) {
   const nodeStyle = node.style;
-  if (value == null || typeof value === "string") return nodeStyle.cssText = value;
-  typeof prev === "string" && (prev = {});
+  const prevString = typeof prev === "string";
+  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
+  prevString && (nodeStyle.cssText = undefined, prev = {});
+  value || (value = {});
   let v, s;
   for (s in prev) {
     value[s] == null && nodeStyle.removeProperty(s);
@@ -205,11 +207,12 @@ function insert(parent, accessor, marker, initial) {
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
   solidJs.createRenderEffect(current => insertExpression(parent, accessor(), current, marker), initial);
 }
-function assign(node, props, isSVG, skipChildren, prevProps = {}) {
+function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = false) {
+  props || (props = {});
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG);
+      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {
@@ -218,7 +221,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}) {
       continue;
     }
     const value = props[prop];
-    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG);
+    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG, skipRef);
   }
 }
 function hydrate$1(code, element, options = {}) {
@@ -293,13 +296,15 @@ function toggleClassKey(node, key, value) {
   const classNames = key.trim().split(/\s+/);
   for (let i = 0, nameLen = classNames.length; i < nameLen; i++) node.classList.toggle(classNames[i], value);
 }
-function assignProp(node, prop, value, prev, isSVG) {
+function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
   if (value === prev) return prev;
   if (prop === "ref") {
-    value(node);
+    if (!skipRef) {
+      value(node);
+    }
   } else if (prop.slice(0, 3) === "on:") {
     node.addEventListener(prop.slice(3), value);
   } else if (prop.slice(0, 10) === "oncapture:") {
@@ -343,10 +348,12 @@ function eventHandler(e) {
   }
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
+  props || (props = {});
   if (!skipChildren && "children" in props) {
     solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps));
+  props.ref && props.ref(node);
+  solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -357,6 +364,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (solidJs.sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -460,7 +468,7 @@ function gatherHydratable(element, root) {
   for (let i = 0; i < templates.length; i++) {
     const node = templates[i];
     const key = node.getAttribute("data-hk");
-    if (!root || key.startsWith(root)) solidJs.sharedConfig.registry.set(key, node);
+    if ((!root || key.startsWith(root)) && !solidJs.sharedConfig.registry.has(key)) solidJs.sharedConfig.registry.set(key, node);
   }
 }
 function getHydrationKey() {
@@ -474,9 +482,19 @@ function NoHydration(props) {
   return solidJs.sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/dist/dev.js

@@ -163,8 +163,10 @@ function classList(node, value, prev = {}) {
 }
 function style(node, value, prev = {}) {
   const nodeStyle = node.style;
-  if (value == null || typeof value === "string") return nodeStyle.cssText = value;
-  typeof prev === "string" && (prev = {});
+  const prevString = typeof prev === "string";
+  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
+  prevString && (nodeStyle.cssText = undefined, prev = {});
+  value || (value = {});
   let v, s;
   for (s in prev) {
     value[s] == null && nodeStyle.removeProperty(s);
@@ -202,11 +204,12 @@ function insert(parent, accessor, marker, initial) {
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
   createRenderEffect(current => insertExpression(parent, accessor(), current, marker), initial);
 }
-function assign(node, props, isSVG, skipChildren, prevProps = {}) {
+function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = false) {
+  props || (props = {});
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG);
+      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {
@@ -215,7 +218,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}) {
       continue;
     }
     const value = props[prop];
-    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG);
+    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG, skipRef);
   }
 }
 function hydrate$1(code, element, options = {}) {
@@ -290,13 +293,15 @@ function toggleClassKey(node, key, value) {
   const classNames = key.trim().split(/\s+/);
   for (let i = 0, nameLen = classNames.length; i < nameLen; i++) node.classList.toggle(classNames[i], value);
 }
-function assignProp(node, prop, value, prev, isSVG) {
+function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
   if (value === prev) return prev;
   if (prop === "ref") {
-    value(node);
+    if (!skipRef) {
+      value(node);
+    }
   } else if (prop.slice(0, 3) === "on:") {
     node.addEventListener(prop.slice(3), value);
   } else if (prop.slice(0, 10) === "oncapture:") {
@@ -340,10 +345,12 @@ function eventHandler(e) {
   }
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
+  props || (props = {});
   if (!skipChildren && "children" in props) {
     createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  createRenderEffect(() => assign(node, props, isSVG, true, prevProps));
+  props.ref && props.ref(node);
+  createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -354,6 +361,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -457,7 +465,7 @@ function gatherHydratable(element, root) {
   for (let i = 0; i < templates.length; i++) {
     const node = templates[i];
     const key = node.getAttribute("data-hk");
-    if (!root || key.startsWith(root)) sharedConfig.registry.set(key, node);
+    if ((!root || key.startsWith(root)) && !sharedConfig.registry.has(key)) sharedConfig.registry.set(key, node);
   }
 }
 function getHydrationKey() {
@@ -471,9 +479,19 @@ function NoHydration(props) {
   return sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/dist/server.cjs

@@ -233,7 +233,7 @@ function stringifyString(str) {
 }
 
 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.]+)\]>/;
+const FRAGMENT_REPLACE = /<!\[([\d-]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
   solidJs.sharedConfig.context = {
@@ -604,7 +604,19 @@ function injectScripts(html, scripts, nonce) {
   return html + tag;
 }
 function serializeError(error) {
-  return error.message ? `new Error(${devalue(error.message)})` : devalue(error);
+  if (error.message) {
+    const fields = {};
+    const keys = Object.getOwnPropertyNames(error);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = error[key];
+      if (!value || key !== "message" && typeof value !== "function") {
+        fields[key] = value;
+      }
+    }
+    return `Object.assign(new Error(${devalue(error.message)}), ${devalue(fields)})`;
+  }
+  return devalue(error);
 }
 function waitForFragments(registry, key) {
   for (const k of [...registry.keys()].reverse()) {

package/web/dist/server.js

@@ -230,7 +230,7 @@ function stringifyString(str) {
 }
 
 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.]+)\]>/;
+const FRAGMENT_REPLACE = /<!\[([\d-]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
   sharedConfig.context = {
@@ -601,7 +601,19 @@ function injectScripts(html, scripts, nonce) {
   return html + tag;
 }
 function serializeError(error) {
-  return error.message ? `new Error(${devalue(error.message)})` : devalue(error);
+  if (error.message) {
+    const fields = {};
+    const keys = Object.getOwnPropertyNames(error);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = error[key];
+      if (!value || key !== "message" && typeof value !== "function") {
+        fields[key] = value;
+      }
+    }
+    return `Object.assign(new Error(${devalue(error.message)}), ${devalue(fields)})`;
+  }
+  return devalue(error);
 }
 function waitForFragments(registry, key) {
   for (const k of [...registry.keys()].reverse()) {

package/web/dist/web.cjs

@@ -165,8 +165,10 @@ function classList(node, value, prev = {}) {
 }
 function style(node, value, prev = {}) {
   const nodeStyle = node.style;
-  if (value == null || typeof value === "string") return nodeStyle.cssText = value;
-  typeof prev === "string" && (prev = {});
+  const prevString = typeof prev === "string";
+  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
+  prevString && (nodeStyle.cssText = undefined, prev = {});
+  value || (value = {});
   let v, s;
   for (s in prev) {
     value[s] == null && nodeStyle.removeProperty(s);
@@ -204,11 +206,12 @@ function insert(parent, accessor, marker, initial) {
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
   solidJs.createRenderEffect(current => insertExpression(parent, accessor(), current, marker), initial);
 }
-function assign(node, props, isSVG, skipChildren, prevProps = {}) {
+function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = false) {
+  props || (props = {});
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG);
+      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {
@@ -217,7 +220,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}) {
       continue;
     }
     const value = props[prop];
-    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG);
+    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG, skipRef);
   }
 }
 function hydrate$1(code, element, options = {}) {
@@ -292,13 +295,15 @@ function toggleClassKey(node, key, value) {
   const classNames = key.trim().split(/\s+/);
   for (let i = 0, nameLen = classNames.length; i < nameLen; i++) node.classList.toggle(classNames[i], value);
 }
-function assignProp(node, prop, value, prev, isSVG) {
+function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
   if (value === prev) return prev;
   if (prop === "ref") {
-    value(node);
+    if (!skipRef) {
+      value(node);
+    }
   } else if (prop.slice(0, 3) === "on:") {
     node.addEventListener(prop.slice(3), value);
   } else if (prop.slice(0, 10) === "oncapture:") {
@@ -342,10 +347,12 @@ function eventHandler(e) {
   }
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
+  props || (props = {});
   if (!skipChildren && "children" in props) {
     solidJs.createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps));
+  props.ref && props.ref(node);
+  solidJs.createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -356,6 +363,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (solidJs.sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -459,7 +467,7 @@ function gatherHydratable(element, root) {
   for (let i = 0; i < templates.length; i++) {
     const node = templates[i];
     const key = node.getAttribute("data-hk");
-    if (!root || key.startsWith(root)) solidJs.sharedConfig.registry.set(key, node);
+    if ((!root || key.startsWith(root)) && !solidJs.sharedConfig.registry.has(key)) solidJs.sharedConfig.registry.set(key, node);
   }
 }
 function getHydrationKey() {
@@ -473,9 +481,19 @@ function NoHydration(props) {
   return solidJs.sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/dist/web.js

@@ -162,8 +162,10 @@ function classList(node, value, prev = {}) {
 }
 function style(node, value, prev = {}) {
   const nodeStyle = node.style;
-  if (value == null || typeof value === "string") return nodeStyle.cssText = value;
-  typeof prev === "string" && (prev = {});
+  const prevString = typeof prev === "string";
+  if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value;
+  prevString && (nodeStyle.cssText = undefined, prev = {});
+  value || (value = {});
   let v, s;
   for (s in prev) {
     value[s] == null && nodeStyle.removeProperty(s);
@@ -201,11 +203,12 @@ function insert(parent, accessor, marker, initial) {
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
   createRenderEffect(current => insertExpression(parent, accessor(), current, marker), initial);
 }
-function assign(node, props, isSVG, skipChildren, prevProps = {}) {
+function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = false) {
+  props || (props = {});
   for (const prop in prevProps) {
     if (!(prop in props)) {
       if (prop === "children") continue;
-      assignProp(node, prop, null, prevProps[prop], isSVG);
+      assignProp(node, prop, null, prevProps[prop], isSVG, skipRef);
     }
   }
   for (const prop in props) {
@@ -214,7 +217,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}) {
       continue;
     }
     const value = props[prop];
-    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG);
+    prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG, skipRef);
   }
 }
 function hydrate$1(code, element, options = {}) {
@@ -289,13 +292,15 @@ function toggleClassKey(node, key, value) {
   const classNames = key.trim().split(/\s+/);
   for (let i = 0, nameLen = classNames.length; i < nameLen; i++) node.classList.toggle(classNames[i], value);
 }
-function assignProp(node, prop, value, prev, isSVG) {
+function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
   if (value === prev) return prev;
   if (prop === "ref") {
-    value(node);
+    if (!skipRef) {
+      value(node);
+    }
   } else if (prop.slice(0, 3) === "on:") {
     node.addEventListener(prop.slice(3), value);
   } else if (prop.slice(0, 10) === "oncapture:") {
@@ -339,10 +344,12 @@ function eventHandler(e) {
   }
 }
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
+  props || (props = {});
   if (!skipChildren && "children" in props) {
     createRenderEffect(() => prevProps.children = insertExpression(node, props.children, prevProps.children));
   }
-  createRenderEffect(() => assign(node, props, isSVG, true, prevProps));
+  props.ref && props.ref(node);
+  createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -353,6 +360,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
         multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
+    if (sharedConfig.context) return current;
     if (t === "number") value = value.toString();
     if (multi) {
       let node = current[0];
@@ -456,7 +464,7 @@ function gatherHydratable(element, root) {
   for (let i = 0; i < templates.length; i++) {
     const node = templates[i];
     const key = node.getAttribute("data-hk");
-    if (!root || key.startsWith(root)) sharedConfig.registry.set(key, node);
+    if ((!root || key.startsWith(root)) && !sharedConfig.registry.has(key)) sharedConfig.registry.set(key, node);
   }
 }
 function getHydrationKey() {
@@ -470,9 +478,19 @@ function NoHydration(props) {
   return sharedConfig.context ? undefined : props.children;
 }
 
-function renderToString(fn, options) {}
-function renderToStringAsync(fn, options) {}
-function renderToStream(fn, options) {}
+function throwInBrowser(func) {
+  const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
+  console.error(err);
+}
+function renderToString(fn, options) {
+  throwInBrowser(renderToString);
+}
+function renderToStringAsync(fn, options) {
+  throwInBrowser(renderToStringAsync);
+}
+function renderToStream(fn, options) {
+  throwInBrowser(renderToStream);
+}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}

package/web/types/server-mock.d.ts

@@ -10,8 +10,12 @@ export declare function renderToStringAsync<T>(fn: () => T, options?: {
 export declare function renderToStream<T>(fn: () => T, options?: {
     nonce?: string;
     renderId?: string;
-    onCompleteShell?: () => void;
-    onCompleteAll?: () => void;
+    onCompleteShell?: (info: {
+        write: (v: string) => void;
+    }) => void;
+    onCompleteAll?: (info: {
+        write: (v: string) => void;
+    }) => void;
 }): {
     pipe: (writable: {
         write: (v: string) => void;