solid-js 1.6.0 → 1.6.2

package/dist/dev.cjs

@@ -296,8 +296,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -419,12 +419,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -1256,7 +1257,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1281,10 +1282,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1298,13 +1310,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;
@@ -1346,7 +1360,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
-      Object.assign(Comp, {
+      if ("_SOLID_DEV_") Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx) return Comp(props);

package/dist/dev.js

@@ -292,8 +292,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -415,12 +415,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -1252,7 +1253,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1277,10 +1278,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1294,13 +1306,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;
@@ -1342,7 +1356,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
-      Object.assign(Comp, {
+      if ("_SOLID_DEV_") Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx) return Comp(props);

package/dist/solid.cjs

@@ -288,8 +288,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -411,12 +411,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -1170,7 +1171,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1195,10 +1196,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1212,13 +1224,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;
@@ -1260,6 +1274,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      if (false) ;
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);

package/dist/solid.js

@@ -284,8 +284,8 @@ function createResource(pSource, pFetcher, pOptions) {
   function completeLoad(v, err) {
     runUpdates(() => {
       if (!err) setValue(() => v);
-      setError(err);
       setState(err ? "errored" : "ready");
+      setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -407,12 +407,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -1166,7 +1167,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1191,10 +1192,21 @@ function mergeProps(...sources) {
     }, propTraps);
   }
   const target = {};
-  for (let i = 0; i < sources.length; i++) {
+  for (let i = sources.length - 1; i >= 0; i--) {
     if (sources[i]) {
       const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-      Object.defineProperties(target, descriptors);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
     }
   }
   return target;
@@ -1208,13 +1220,15 @@ function splitProps(props, ...keys) {
     const clone = {};
     for (let i = 0; i < k.length; i++) {
       const key = k[i];
+      if (!isProxy && !(key in props)) continue;
       Object.defineProperty(clone, key, descriptors[key] ? descriptors[key] : {
         get() {
           return props[key];
         },
         set() {
           return true;
-        }
+        },
+        enumerable: true
       });
     }
     return clone;
@@ -1256,6 +1270,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      if (false) ;
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/store/dist/dev.cjs

@@ -21,6 +21,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }
@@ -115,8 +116,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -132,11 +132,10 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -260,8 +259,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -437,7 +435,14 @@ function produce(fn) {
   };
 }
 
+const DEV = {
+  $NAME,
+  $NODE,
+  isWrappable
+} ;
+
 exports.$RAW = $RAW;
+exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.modifyMutable = modifyMutable;

package/store/dist/dev.js

@@ -1,4 +1,4 @@
-import { DEV, $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
+import { $PROXY, DEV as DEV$1, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
       $NODE = Symbol("store-node"),
@@ -17,6 +17,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }
@@ -111,8 +112,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -128,11 +128,10 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -209,10 +208,10 @@ function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
-  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || DEV.hashValue(unwrappedStore)));
+  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
   {
-    const name = options && options.name || DEV.hashValue(unwrappedStore);
-    DEV.registerGraph(name, {
+    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
+    DEV$1.registerGraph(name, {
       value: unwrappedStore
     });
   }
@@ -256,8 +255,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -304,10 +302,10 @@ function wrap(value, name) {
 function createMutable(state, options) {
   const unwrappedStore = unwrap(state || {});
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createMutable'. Expected an object.`);
-  const wrappedStore = wrap(unwrappedStore, (options && options.name || DEV.hashValue(unwrappedStore)));
+  const wrappedStore = wrap(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
   {
-    const name = options && options.name || DEV.hashValue(unwrappedStore);
-    DEV.registerGraph(name, {
+    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
+    DEV$1.registerGraph(name, {
       value: unwrappedStore
     });
   }
@@ -433,4 +431,10 @@ function produce(fn) {
   };
 }
 
-export { $RAW, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };
+const DEV = {
+  $NAME,
+  $NODE,
+  isWrappable
+} ;
+
+export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/dist/server.cjs

@@ -110,8 +110,10 @@ function produce(fn) {
     return state;
   };
 }
+const DEV = undefined;
 
 exports.$RAW = $RAW;
+exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.isWrappable = isWrappable;

package/store/dist/server.js

@@ -106,5 +106,6 @@ function produce(fn) {
     return state;
   };
 }
+const DEV = undefined;
 
-export { $RAW, createMutable, createStore, isWrappable, produce, reconcile, setProperty, unwrap, updatePath };
+export { $RAW, DEV, createMutable, createStore, isWrappable, produce, reconcile, setProperty, unwrap, updatePath };

package/store/dist/store.cjs

@@ -21,6 +21,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }
@@ -112,8 +113,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -127,11 +127,9 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -248,8 +246,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -415,7 +412,10 @@ function produce(fn) {
   };
 }
 
+const DEV = undefined;
+
 exports.$RAW = $RAW;
+exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.modifyMutable = modifyMutable;

package/store/dist/store.js

@@ -17,6 +17,7 @@ function wrap$1(value, name) {
         if (desc[prop].get) {
           const get = desc[prop].get.bind(p);
           Object.defineProperty(value, prop, {
+            enumerable: desc[prop].enumerable,
             get
           });
         }
@@ -108,8 +109,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -123,11 +123,9 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -244,8 +242,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -411,4 +408,6 @@ function produce(fn) {
   };
 }
 
-export { $RAW, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };
+const DEV = undefined;
+
+export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/types/index.d.ts

@@ -2,3 +2,9 @@ export { createStore, unwrap, $RAW } from "./store.js";
 export type { Store, SetStoreFunction, NotWrappable, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store.js";
 export * from "./mutable.js";
 export * from "./modifiers.js";
+import { $NAME, $NODE, isWrappable } from "./store.js";
+export declare const DEV: {
+    readonly $NAME: typeof $NAME;
+    readonly $NODE: typeof $NODE;
+    readonly isWrappable: typeof isWrappable;
+} | undefined;

package/store/types/server.d.ts

@@ -12,4 +12,5 @@ declare type ReconcileOptions = {
 };
 export declare function reconcile<T extends U, U>(value: T, options?: ReconcileOptions): (state: U) => T;
 export declare function produce<T>(fn: (state: T) => void): (state: T) => T;
+export declare const DEV: undefined;
 export {};

package/store/types/store.d.ts

@@ -1,5 +1,18 @@
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-export declare type StoreNode = Record<PropertyKey, any>;
+declare global {
+    var _$onStoreNodeUpdate: OnStoreNodeUpdate | undefined;
+}
+declare type DataNode = {
+    (): any;
+    $(value?: any): void;
+};
+declare type DataNodes = Record<PropertyKey, DataNode>;
+export declare type OnStoreNodeUpdate = (state: StoreNode, property: PropertyKey, value: StoreNode | NotWrappable, prev: StoreNode | NotWrappable) => void;
+export interface StoreNode {
+    [$NAME]?: string;
+    [$NODE]?: DataNodes;
+    [key: PropertyKey]: any;
+}
 export declare namespace SolidStore {
     interface Unwrappable {
     }
@@ -7,9 +20,20 @@ export declare namespace SolidStore {
 export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
 export declare type Store<T> = T;
 export declare function isWrappable<T>(obj: T | NotWrappable): obj is T;
+/**
+ * Returns the underlying data in the store without a proxy.
+ * @param item store proxy object
+ * @example
+ * ```js
+ * const initial = {z...};
+ * const [state, setState] = createStore(initial);
+ * initial === state; // => false
+ * initial === unwrap(state); // => true
+ * ```
+ */
 export declare function unwrap<T>(item: T, set?: Set<unknown>): T;
-export declare function getDataNodes(target: StoreNode): any;
-export declare function getDataNode(nodes: Record<string, any>, property: string | symbol, value: any): any;
+export declare function getDataNodes(target: StoreNode): DataNodes;
+export declare function getDataNode(nodes: DataNodes, property: PropertyKey, value: any): DataNode;
 export declare function proxyDescriptor(target: StoreNode, property: PropertyKey): PropertyDescriptor | undefined;
 export declare function trackSelf(target: StoreNode): void;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];

package/types/reactive/signal.d.ts

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

package/web/dist/server.cjs

@@ -103,7 +103,7 @@ function writeProp(cur, accessor) {
               case undefined:
                 BUFFER.push("Object.assign(Object.create(null),");
                 writeObject(cur);
-                BUFFER.push("))");
+                BUFFER.push(")");
                 break;
               default:
                 return false;
@@ -638,7 +638,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise(((e,o)=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))));</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!solidJs.sharedConfig.context.noHydrate) return props.children;
@@ -871,4 +871,5 @@ exports.ssrElement = ssrElement;
 exports.ssrHydrationKey = ssrHydrationKey;
 exports.ssrSpread = ssrSpread;
 exports.ssrStyle = ssrStyle;
+exports.stringify = stringify;
 exports.useAssets = useAssets;

package/web/dist/server.js

@@ -100,7 +100,7 @@ function writeProp(cur, accessor) {
               case undefined:
                 BUFFER.push("Object.assign(Object.create(null),");
                 writeObject(cur);
-                BUFFER.push("))");
+                BUFFER.push(")");
                 break;
               default:
                 return false;
@@ -635,7 +635,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise(((e,o)=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))));</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;
@@ -800,4 +800,4 @@ function Portal(props) {
   return "";
 }
 
-export { Assets, Dynamic, Hydration, HydrationScript, NoHydration, Portal, addEventListener, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, insert, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, useAssets };
+export { Assets, Dynamic, Hydration, HydrationScript, NoHydration, Portal, addEventListener, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, insert, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, stringify, useAssets };

package/web/types/server.d.ts

@@ -49,6 +49,7 @@ export function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): J
 export function mergeProps(...sources: unknown[]): unknown;
 export function getOwner(): unknown;
 export function generateHydrationScript(options: { nonce?: string; eventNames?: string[] }): string;
+export function stringify(root: unknown): string;
 
 export function Hydration(props: { children?: JSX.Element }): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;