solid-js 1.6.9 → 1.6.11

package/dist/dev.cjs

@@ -169,7 +169,7 @@ function createRoot(fn, detachedOwner) {
       owned: null,
       cleanups: null,
       context: null,
-      owner: detachedOwner || owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     },
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
@@ -299,8 +299,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function completeLoad(v, err) {
     runUpdates(() => {
-      if (!err) setValue(() => v);
-      setState(err ? "errored" : "ready");
+      if (err === undefined) setValue(() => v);
+      setState(err !== undefined ? "errored" : "ready");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -310,7 +310,7 @@ function createResource(pSource, pFetcher, pOptions) {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
       v = value(),
       err = error();
-    if (err && !pr) throw err;
+    if (err !== undefined && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -423,6 +423,7 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
+  if (Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
@@ -471,13 +472,16 @@ function getOwner() {
 }
 function runWithOwner(o, fn) {
   const prev = Owner;
+  const prevListener = Listener;
   Owner = o;
+  Listener = null;
   try {
     return runUpdates(fn, true);
   } catch (err) {
     handleError(err);
   } finally {
     Owner = prev;
+    Listener = prevListener;
   }
 }
 function enableScheduling(scheduler = requestCallback) {
@@ -810,7 +814,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!Updates) Effects = null;
+    if (!wait) Effects = null;
+    Updates = null;
     handleError(err);
   }
 }
@@ -961,11 +966,19 @@ function castError(err) {
   if (err instanceof Error || typeof err === "string") return err;
   return new Error("Unknown error");
 }
+function runErrors(fns, err) {
+  for (const f of fns) f(err);
+}
 function handleError(err) {
   err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  for (const f of fns) f(err);
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(fns, err);
+    },
+    state: STALE
+  });else runErrors(fns, err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;

package/dist/dev.js

@@ -167,7 +167,7 @@ function createRoot(fn, detachedOwner) {
       owned: null,
       cleanups: null,
       context: null,
-      owner: detachedOwner || owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     },
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
@@ -297,8 +297,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function completeLoad(v, err) {
     runUpdates(() => {
-      if (!err) setValue(() => v);
-      setState(err ? "errored" : "ready");
+      if (err === undefined) setValue(() => v);
+      setState(err !== undefined ? "errored" : "ready");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -308,7 +308,7 @@ function createResource(pSource, pFetcher, pOptions) {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
       v = value(),
       err = error();
-    if (err && !pr) throw err;
+    if (err !== undefined && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -421,6 +421,7 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
+  if (Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
@@ -469,13 +470,16 @@ function getOwner() {
 }
 function runWithOwner(o, fn) {
   const prev = Owner;
+  const prevListener = Listener;
   Owner = o;
+  Listener = null;
   try {
     return runUpdates(fn, true);
   } catch (err) {
     handleError(err);
   } finally {
     Owner = prev;
+    Listener = prevListener;
   }
 }
 function enableScheduling(scheduler = requestCallback) {
@@ -808,7 +812,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!Updates) Effects = null;
+    if (!wait) Effects = null;
+    Updates = null;
     handleError(err);
   }
 }
@@ -959,11 +964,19 @@ function castError(err) {
   if (err instanceof Error || typeof err === "string") return err;
   return new Error("Unknown error");
 }
+function runErrors(fns, err) {
+  for (const f of fns) f(err);
+}
 function handleError(err) {
   err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  for (const f of fns) f(err);
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(fns, err);
+    },
+    state: STALE
+  });else runErrors(fns, err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;

package/dist/server.cjs

@@ -23,11 +23,10 @@ const UNOWNED = {
 };
 let Owner = null;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     };
   Owner = root;
   let result;

package/dist/server.js

@@ -21,11 +21,10 @@ const UNOWNED = {
 };
 let Owner = null;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     };
   Owner = root;
   let result;

package/dist/solid.cjs

@@ -163,7 +163,7 @@ function createRoot(fn, detachedOwner) {
       owned: null,
       cleanups: null,
       context: null,
-      owner: detachedOwner || owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     },
     updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
   Owner = root;
@@ -286,8 +286,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function completeLoad(v, err) {
     runUpdates(() => {
-      if (!err) setValue(() => v);
-      setState(err ? "errored" : "ready");
+      if (err === undefined) setValue(() => v);
+      setState(err !== undefined ? "errored" : "ready");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -297,7 +297,7 @@ function createResource(pSource, pFetcher, pOptions) {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
       v = value(),
       err = error();
-    if (err && !pr) throw err;
+    if (err !== undefined && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -410,6 +410,7 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
+  if (Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
@@ -458,13 +459,16 @@ function getOwner() {
 }
 function runWithOwner(o, fn) {
   const prev = Owner;
+  const prevListener = Listener;
   Owner = o;
+  Listener = null;
   try {
     return runUpdates(fn, true);
   } catch (err) {
     handleError(err);
   } finally {
     Owner = prev;
+    Listener = prevListener;
   }
 }
 function enableScheduling(scheduler = requestCallback) {
@@ -740,7 +744,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!Updates) Effects = null;
+    if (!wait) Effects = null;
+    Updates = null;
     handleError(err);
   }
 }
@@ -890,11 +895,19 @@ function castError(err) {
   if (err instanceof Error || typeof err === "string") return err;
   return new Error("Unknown error");
 }
+function runErrors(fns, err) {
+  for (const f of fns) f(err);
+}
 function handleError(err) {
   err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  for (const f of fns) f(err);
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(fns, err);
+    },
+    state: STALE
+  });else runErrors(fns, err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;

package/dist/solid.js

@@ -161,7 +161,7 @@ function createRoot(fn, detachedOwner) {
       owned: null,
       cleanups: null,
       context: null,
-      owner: detachedOwner || owner
+      owner: detachedOwner === undefined ? owner : detachedOwner
     },
     updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
   Owner = root;
@@ -284,8 +284,8 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   function completeLoad(v, err) {
     runUpdates(() => {
-      if (!err) setValue(() => v);
-      setState(err ? "errored" : "ready");
+      if (err === undefined) setValue(() => v);
+      setState(err !== undefined ? "errored" : "ready");
       setError(err);
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
@@ -295,7 +295,7 @@ function createResource(pSource, pFetcher, pOptions) {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
       v = value(),
       err = error();
-    if (err && !pr) throw err;
+    if (err !== undefined && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -408,6 +408,7 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
+  if (Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
@@ -456,13 +457,16 @@ function getOwner() {
 }
 function runWithOwner(o, fn) {
   const prev = Owner;
+  const prevListener = Listener;
   Owner = o;
+  Listener = null;
   try {
     return runUpdates(fn, true);
   } catch (err) {
     handleError(err);
   } finally {
     Owner = prev;
+    Listener = prevListener;
   }
 }
 function enableScheduling(scheduler = requestCallback) {
@@ -738,7 +742,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
-    if (!Updates) Effects = null;
+    if (!wait) Effects = null;
+    Updates = null;
     handleError(err);
   }
 }
@@ -888,11 +893,19 @@ function castError(err) {
   if (err instanceof Error || typeof err === "string") return err;
   return new Error("Unknown error");
 }
+function runErrors(fns, err) {
+  for (const f of fns) f(err);
+}
 function handleError(err) {
   err = castError(err);
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  for (const f of fns) f(err);
+  if (Effects) Effects.push({
+    fn() {
+      runErrors(fns, err);
+    },
+    state: STALE
+  });else runErrors(fns, err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;

package/h/jsx-runtime/dist/jsx.cjs

@@ -5,8 +5,11 @@ var h = require('solid-js/h');
 function Fragment(props) {
   return props.children;
 }
+function jsx(type, props) {
+  return h(type, props);
+}
 
-exports.jsx = h;
-exports.jsxDEV = h;
-exports.jsxs = h;
 exports.Fragment = Fragment;
+exports.jsx = jsx;
+exports.jsxDEV = jsx;
+exports.jsxs = jsx;

package/h/jsx-runtime/dist/jsx.js

@@ -1,7 +1,10 @@
-export { default as jsx, default as jsxDEV, default as jsxs } from 'solid-js/h';
+import h from 'solid-js/h';
 
 function Fragment(props) {
   return props.children;
 }
+function jsx(type, props) {
+  return h(type, props);
+}
 
-export { Fragment };
+export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs };

package/h/jsx-runtime/types/index.d.ts

@@ -1,7 +1,11 @@
-import h from "solid-js/h";
 export type { JSX } from "./jsx";
 import type { JSX } from "./jsx";
 declare function Fragment(props: {
     children: JSX.Element;
 }): JSX.Element;
-export { h as jsx, h as jsxs, h as jsxDEV, Fragment };
+declare function jsx(type: any, props: any): () => (Node & {
+    [key: string]: any;
+}) | (Node & {
+    [key: string]: any;
+})[];
+export { jsx, jsx as jsxs, jsx as jsxDEV, Fragment };

package/h/jsx-runtime/types/jsx.d.ts

@@ -1692,6 +1692,7 @@ export namespace JSX {
     patternUnits?: FunctionMaybe<SVGUnits>;
     patternContentUnits?: FunctionMaybe<SVGUnits>;
     patternTransform?: FunctionMaybe<string>;
+    href?: string;
   }
   interface PolygonSVGAttributes<T>
     extends GraphicsElementSVGAttributes<T>,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -246,7 +246,8 @@
       },
       "require": "./html/dist/html.cjs"
     },
-    "./html/dist/*": "./html/dist/*"
+    "./html/dist/*": "./html/dist/*",
+    "./package.json": "./package.json"
   },
   "keywords": [
     "solid",

package/store/types/modifiers.d.ts

@@ -1,4 +1,4 @@
-export declare type ReconcileOptions = {
+export type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };

package/store/types/server.d.ts

@@ -6,11 +6,11 @@ export declare function setProperty(state: any, property: PropertyKey, value: an
 export declare function updatePath(current: any, path: any[], traversed?: PropertyKey[]): void;
 export declare function createStore<T>(state: T | Store<T>): [Store<T>, SetStoreFunction<T>];
 export declare function createMutable<T>(state: T | Store<T>): T;
-declare type ReconcileOptions = {
+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 reconcile<T extends U, U extends object>(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

@@ -2,12 +2,12 @@ export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique sy
 declare global {
     var _$onStoreNodeUpdate: OnStoreNodeUpdate | undefined;
 }
-declare type DataNode = {
+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;
+type DataNodes = Record<PropertyKey, DataNode>;
+export type OnStoreNodeUpdate = (state: StoreNode, property: PropertyKey, value: StoreNode | NotWrappable, prev: StoreNode | NotWrappable) => void;
 export interface StoreNode {
     [$NAME]?: string;
     [$NODE]?: DataNodes;
@@ -17,8 +17,8 @@ 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> = T;
+export type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
+export 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.
@@ -34,45 +34,45 @@ export declare function isWrappable<T>(obj: T | NotWrappable): obj is T;
 export declare function unwrap<T>(item: T, set?: Set<unknown>): T;
 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 proxyDescriptor(target: StoreNode, property: PropertyKey): TypedPropertyDescriptor<any> | undefined;
 export declare function trackSelf(target: StoreNode): void;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
 export declare function setProperty(state: StoreNode, property: PropertyKey, value: any, deleting?: boolean): void;
 export declare function updatePath(current: StoreNode, path: any[], traversed?: PropertyKey[]): void;
 /** @deprecated */
-export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
+export type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
     readonly [K in keyof T]: DeepReadonly<T[K]>;
 };
 /** @deprecated */
-export declare type DeepMutable<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
+export type DeepMutable<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
     -readonly [K in keyof T]: DeepMutable<T[K]>;
 };
-export declare type CustomPartial<T> = T extends readonly unknown[] ? "0" extends keyof T ? {
+export type CustomPartial<T> = T extends readonly unknown[] ? "0" extends keyof T ? {
     [K in Extract<keyof T, `${number}`>]?: T[K];
 } : {
     [x: number]: T[number];
 } : Partial<T>;
-export declare type PickMutable<T> = {
+export type PickMutable<T> = {
     [K in keyof T as (<U>() => U extends {
         [V in K]: T[V];
     } ? 1 : 2) extends <U>() => U extends {
         -readonly [V in K]: T[V];
     } ? 1 : 2 ? K : never]: T[K];
 };
-export declare type StorePathRange = {
+export type StorePathRange = {
     from?: number;
     to?: number;
     by?: number;
 };
-export declare type ArrayFilterFn<T> = (item: T, index: number) => boolean;
-export declare type StoreSetter<T, U extends PropertyKey[] = []> = T | CustomPartial<T> | ((prevState: T, traversed: U) => T | CustomPartial<T>);
-export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = K | ([K] extends [never] ? never : readonly K[]) | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
-declare type W<T> = Exclude<T, NotWrappable>;
-declare type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [readonly unknown[]] ? number : [T] extends [never] ? never : keyof T : keyof T;
-declare type MutableKeyOf<T> = KeyOf<T> & keyof PickMutable<T>;
-declare type Rest<T, U extends PropertyKey[], K extends KeyOf<T> = KeyOf<T>> = K extends keyof PickMutable<T> ? [Part<T, K>, ...RestSetterOrContinue<T[K], [K, ...U]>] : K extends KeyOf<K> ? [Part<T, K>, ...RestContinue<T[K], [K, ...U]>] : never;
-declare type RestContinue<T, U extends PropertyKey[]> = 0 extends 1 & T ? [...Part<any>[], StoreSetter<any, PropertyKey[]>] : Rest<T, U>;
-declare type RestSetterOrContinue<T, U extends PropertyKey[]> = [StoreSetter<T, U>] | RestContinue<T, U>;
+export type ArrayFilterFn<T> = (item: T, index: number) => boolean;
+export type StoreSetter<T, U extends PropertyKey[] = []> = T | CustomPartial<T> | ((prevState: T, traversed: U) => T | CustomPartial<T>);
+export type Part<T, K extends KeyOf<T> = KeyOf<T>> = K | ([K] extends [never] ? never : readonly K[]) | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
+type W<T> = Exclude<T, NotWrappable>;
+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;
+type MutableKeyOf<T> = KeyOf<T> & keyof PickMutable<T>;
+type Rest<T, U extends PropertyKey[], K extends KeyOf<T> = KeyOf<T>> = [T] extends [never] ? never : K extends MutableKeyOf<T> ? [Part<T, K>, ...RestSetterOrContinue<T[K], [K, ...U]>] : K extends KeyOf<T> ? [Part<T, K>, ...RestContinue<T[K], [K, ...U]>] : never;
+type RestContinue<T, U extends PropertyKey[]> = 0 extends 1 & T ? [...Part<any>[], StoreSetter<any, PropertyKey[]>] : Rest<W<T>, U>;
+type RestSetterOrContinue<T, U extends PropertyKey[]> = [StoreSetter<T, U>] | RestContinue<T, U>;
 export interface SetStoreFunction<T> {
     <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>, K6 extends KeyOf<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>>, K7 extends MutableKeyOf<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, k6: Part<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>, K6>, k7: Part<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>, K7>, setter: StoreSetter<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>[K7], [
         K7,
@@ -83,7 +83,7 @@ export interface SetStoreFunction<T> {
         K2,
         K1
     ]>): void;
-    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>, K6 extends KeyOf<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, k6: Part<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>, K6>, setter: StoreSetter<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6], [K6, K5, K4, K3, K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>, K6 extends MutableKeyOf<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, k6: Part<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>, K6>, setter: StoreSetter<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6], [K6, K5, K4, K3, K2, K1]>): void;
     <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends MutableKeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, setter: StoreSetter<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5], [K5, K4, K3, K2, K1]>): void;
     <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends MutableKeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, setter: StoreSetter<W<W<W<W<T>[K1]>[K2]>[K3]>[K4], [K4, K3, K2, K1]>): void;
     <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends MutableKeyOf<W<W<W<T>[K1]>[K2]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, setter: StoreSetter<W<W<W<T>[K1]>[K2]>[K3], [K3, K2, K1]>): void;

package/types/index.d.ts

@@ -1,11 +1,11 @@
 export { $DEVCOMP, $PROXY, $TRACK, batch, children, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, enableExternalSource, enableScheduling, equalFn, getListener, getOwner, on, onCleanup, onError, onMount, runWithOwner, startTransition, untrack, useContext, useTransition } from "./reactive/signal.js";
-export type { Accessor, AccessorArray, ChildrenReturn, Context, EffectFunction, InitializedResource, InitializedResourceOptions, InitializedResourceReturn, MemoOptions, NoInfer, OnEffectFunction, Owner, Resource, ResourceActions, ResourceFetcher, ResourceFetcherInfo, ResourceOptions, ResourceReturn, ResourceSource, ReturnTypes, Setter, Signal, SignalOptions } from "./reactive/signal.js";
+export type { Accessor, AccessorArray, ChildrenReturn, Context, EffectFunction, EffectOptions, InitializedResource, InitializedResourceOptions, InitializedResourceReturn, MemoOptions, NoInfer, OnEffectFunction, OnOptions, Owner, Resource, ResourceActions, ResourceFetcher, ResourceFetcherInfo, ResourceOptions, ResourceReturn, ResourceSource, ReturnTypes, Setter, Signal, SignalOptions } from "./reactive/signal.js";
 export * from "./reactive/observable.js";
 export * from "./reactive/scheduler.js";
 export * from "./reactive/array.js";
 export * from "./render/index.js";
 import type { JSX } from "./jsx.js";
-declare type JSXElement = JSX.Element;
+type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
 import { hashValue, registerGraph, serializeGraph, writeSignal } from "./reactive/signal.js";
 declare let DEV: {

package/types/jsx.d.ts

@@ -1702,6 +1702,7 @@ export namespace JSX {
     patternUnits?: SVGUnits;
     patternContentUnits?: SVGUnits;
     patternTransform?: string;
+    href?: string;
   }
   interface PolygonSVGAttributes<T>
     extends GraphicsElementSVGAttributes<T>,

package/types/reactive/observable.d.ts

@@ -4,7 +4,13 @@ declare global {
         readonly observable: symbol;
     }
 }
-export declare type ObservableObserver<T> = ((v: T) => void) | {
+interface Observable<T> {
+    subscribe(observer: ObservableObserver<T>): {
+        unsubscribe(): void;
+    };
+    [Symbol.observable](): Observable<T>;
+}
+export type ObservableObserver<T> = ((v: T) => void) | {
     next?: (v: T) => void;
     error?: (v: any) => void;
     complete?: (v: boolean) => void;
@@ -19,14 +25,10 @@ export declare type ObservableObserver<T> = ((v: T) => void) | {
  * ```
  * description https://www.solidjs.com/docs/latest/api#observable
  */
-export declare function observable<T>(input: Accessor<T>): {
-    subscribe(observer: ObservableObserver<T>): {
-        unsubscribe(): void;
-    };
-    [Symbol.observable](): any;
-};
+export declare function observable<T>(input: Accessor<T>): Observable<T>;
 export declare function from<T>(producer: ((setter: Setter<T | undefined>) => () => void) | {
     subscribe: (fn: (v: T) => void) => (() => void) | {
         unsubscribe: () => void;
     };
 }): Accessor<T | undefined>;
+export {};

package/types/reactive/signal.d.ts

@@ -12,7 +12,7 @@ declare global {
     var _$afterUpdate: (() => void) | undefined;
     var _$afterCreateRoot: ((root: Owner) => void) | undefined;
 }
-export declare type ComputationState = 0 | 1 | 2;
+export type ComputationState = 0 | 1 | 2;
 export interface SourceMapValue {
     value: unknown;
     graph?: Owner;
@@ -57,12 +57,12 @@ export interface TransitionState {
     done?: Promise<void>;
     resolve?: () => void;
 }
-declare type ExternalSourceFactory = <Prev, Next extends Prev = Prev>(fn: EffectFunction<Prev, Next>, trigger: () => void) => ExternalSource;
+type ExternalSourceFactory = <Prev, Next extends Prev = Prev>(fn: EffectFunction<Prev, Next>, trigger: () => void) => ExternalSource;
 export interface ExternalSource {
     track: EffectFunction<any, any>;
     dispose: () => void;
 }
-export declare type RootFunction<T> = (dispose: () => void) => T;
+export type RootFunction<T> = (dispose: () => void) => T;
 /**
  * Creates a new non-tracked reactive context that doesn't auto-dispose
  *
@@ -72,10 +72,10 @@ export declare type RootFunction<T> = (dispose: () => void) => T;
  *
  * @description https://www.solidjs.com/docs/latest/api#createroot
  */
-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 ? () => undefined : {}) & (<U extends T>(value: (prev: T) => U) => U) & (<U extends T>(value: Exclude<U, Function>) => U) & (<U extends T>(value: Exclude<U, Function> | ((prev: T) => U)) => U);
-export declare type Signal<T> = [get: Accessor<T>, set: Setter<T>];
+export declare function createRoot<T>(fn: RootFunction<T>, detachedOwner?: typeof Owner): T;
+export type Accessor<T> = () => T;
+export type Setter<T> = (undefined extends T ? () => undefined : {}) & (<U extends T>(value: (prev: T) => U) => U) & (<U extends T>(value: Exclude<U, Function>) => U) & (<U extends T>(value: Exclude<U, Function> | ((prev: T) => U)) => U);
+export type Signal<T> = [get: Accessor<T>, set: Setter<T>];
 export interface SignalOptions<T> extends MemoOptions<T> {
     internal?: boolean;
 }
@@ -107,10 +107,10 @@ export declare function createSignal<T>(value: T, options?: SignalOptions<T>): S
 export interface BaseOptions {
     name?: string;
 }
-export declare type NoInfer<T extends any> = [T][T extends any ? 0 : never];
+export type NoInfer<T extends any> = [T][T extends any ? 0 : never];
 export interface EffectOptions extends BaseOptions {
 }
-export declare type EffectFunction<Prev, Next extends Prev = Prev> = (v: Prev) => Next;
+export type EffectFunction<Prev, Next extends Prev = Prev> = (v: Prev) => Next;
 /**
  * Creates a reactive computation that runs immediately before render, mainly used to write to other reactive primitives
  * ```typescript
@@ -235,19 +235,19 @@ interface Errored {
     latest: never;
     (): never;
 }
-export declare type Resource<T> = Unresolved | Pending | Ready<T> | Refreshing<T> | Errored;
-export declare type InitializedResource<T> = Ready<T> | Refreshing<T> | Errored;
-export declare type ResourceActions<T, R = unknown> = {
+export type Resource<T> = Unresolved | Pending | Ready<T> | Refreshing<T> | Errored;
+export type InitializedResource<T> = Ready<T> | Refreshing<T> | Errored;
+export type ResourceActions<T, R = unknown> = {
     mutate: Setter<T>;
     refetch: (info?: R) => T | Promise<T> | undefined | null;
 };
-export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
-export declare type ResourceFetcher<S, T, R = unknown> = (k: S, info: ResourceFetcherInfo<T, R>) => T | Promise<T>;
-export declare type ResourceFetcherInfo<T, R = unknown> = {
+export type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
+export type ResourceFetcher<S, T, R = unknown> = (k: S, info: ResourceFetcherInfo<T, R>) => T | Promise<T>;
+export type ResourceFetcherInfo<T, R = unknown> = {
     value: T | undefined;
     refetching: R | boolean;
 };
-export declare type ResourceOptions<T, S = unknown> = {
+export type ResourceOptions<T, S = unknown> = {
     initialValue?: T;
     name?: string;
     deferStream?: boolean;
@@ -257,11 +257,11 @@ export declare type ResourceOptions<T, S = unknown> = {
         value: T | undefined;
     }) => void;
 };
-export declare type InitializedResourceOptions<T, S = unknown> = ResourceOptions<T, S> & {
+export type InitializedResourceOptions<T, S = unknown> = ResourceOptions<T, S> & {
     initialValue: T;
 };
-export declare type ResourceReturn<T, R = unknown> = [Resource<T>, ResourceActions<T | undefined, R>];
-export declare type InitializedResourceReturn<T, R = unknown> = [
+export type ResourceReturn<T, R = unknown> = [Resource<T>, ResourceActions<T | undefined, R>];
+export type InitializedResourceReturn<T, R = unknown> = [
     InitializedResource<T>,
     ResourceActions<T, R>
 ];
@@ -316,7 +316,7 @@ export interface DeferredOptions<T> {
  * @description https://www.solidjs.com/docs/latest/api#createdeferred
  */
 export declare function createDeferred<T>(source: Accessor<T>, options?: DeferredOptions<T>): Accessor<T>;
-export declare type EqualityCheckerFunction<T, U> = (a: U, b: T) => boolean;
+export type EqualityCheckerFunction<T, U> = (a: U, b: T) => boolean;
 /**
  * Creates a conditional signal that only notifies subscribers when entering or exiting their key matching the value
  * ```typescript
@@ -359,13 +359,13 @@ export declare function batch<T>(fn: Accessor<T>): T;
  */
 export declare function untrack<T>(fn: Accessor<T>): T;
 /** @deprecated */
-export declare type ReturnTypes<T> = T extends readonly Accessor<unknown>[] ? {
+export type ReturnTypes<T> = T extends readonly Accessor<unknown>[] ? {
     [K in keyof T]: T[K] extends Accessor<infer I> ? I : never;
 } : T extends Accessor<infer I> ? I : never;
-export declare type AccessorArray<T> = [...Extract<{
+export type AccessorArray<T> = [...Extract<{
     [K in keyof T]: Accessor<T[K]>;
 }, readonly unknown[]>];
-export declare type OnEffectFunction<S, Prev, Next extends Prev = Prev> = (input: S, prevInput: S | undefined, prev: Prev) => Next;
+export type OnEffectFunction<S, Prev, Next extends Prev = Prev> = (input: S, prevInput: S | undefined, prev: Prev) => Next;
 export interface OnOptions {
     defer?: boolean;
 }
@@ -412,9 +412,11 @@ export declare function onMount(fn: () => void): void;
  * onCleanup - run an effect once before the reactive scope is disposed
  * @param fn an effect that should run only once on cleanup
  *
+ * @returns the same {@link fn} function that was passed in
+ *
  * @description https://www.solidjs.com/docs/latest/api#oncleanup
  */
-export declare function onCleanup(fn: () => void): () => void;
+export declare function onCleanup<T extends () => any>(fn: T): T;
 /**
  * onError - run an effect whenever an error is thrown within the context of the child scopes
  * @param fn an error handler that receives the error
@@ -426,7 +428,7 @@ export declare function onCleanup(fn: () => void): () => void;
 export declare function onError(fn: (err: any) => void): void;
 export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
-export declare function runWithOwner<T>(o: Owner, fn: () => T): T | undefined;
+export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
 export declare function enableScheduling(scheduler?: typeof requestCallback): void;
 /**
  * ```typescript
@@ -435,7 +437,7 @@ export declare function enableScheduling(scheduler?: typeof requestCallback): vo
  * @description https://www.solidjs.com/docs/latest/api#usetransition
  */
 export declare function startTransition(fn: () => unknown): Promise<void>;
-export declare type Transition = [Accessor<boolean>, (fn: () => void) => Promise<void>];
+export type Transition = [Accessor<boolean>, (fn: () => void) => Promise<void>];
 /**
  * ```typescript
  * export function useTransition(): [
@@ -459,7 +461,7 @@ interface GraphRecord {
     [k: string]: GraphRecord | unknown;
 }
 export declare function serializeGraph(owner?: Owner | null): GraphRecord;
-export declare type ContextProviderComponent<T> = FlowComponent<{
+export type ContextProviderComponent<T> = FlowComponent<{
     value: T;
 }>;
 export interface Context<T> {
@@ -497,9 +499,9 @@ export declare function createContext<T>(defaultValue: T, options?: EffectOption
  * @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[];
-export declare type ChildrenReturn = Accessor<ResolvedChildren> & {
+export type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement | JSX.FunctionElement>;
+export type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
+export type ChildrenReturn = Accessor<ResolvedChildren> & {
     toArray: () => ResolvedJSXElement[];
 };
 /**
@@ -511,14 +513,14 @@ export declare type ChildrenReturn = Accessor<ResolvedChildren> & {
  * @description https://www.solidjs.com/docs/latest/api#children
  */
 export declare function children(fn: Accessor<JSX.Element>): ChildrenReturn;
-export declare type SuspenseContextType = {
+export type SuspenseContextType = {
     increment?: () => void;
     decrement?: () => void;
     inFallback?: () => boolean;
     effects?: Computation<any>[];
     resolved?: boolean;
 };
-declare type SuspenseContext = Context<SuspenseContextType> & {
+type SuspenseContext = Context<SuspenseContextType> & {
     active?(): boolean;
     increment?(): void;
     decrement?(): void;

package/types/render/Suspense.d.ts

@@ -2,7 +2,7 @@ import type { JSX } from "../jsx.js";
 /**
  * **[experimental]** controls the order in which suspended content is rendered
  *
- * @description https://www.solidjs.com/docs/latest/api#%3Csuspenselist%3E-(experimental)
+ * @description https://www.solidjs.com/docs/latest/api#suspenselist-experimental
  */
 export declare function SuspenseList(props: {
     children: JSX.Element;
@@ -18,7 +18,7 @@ export declare function SuspenseList(props: {
  *   <AsyncComponent />
  * </Suspense>
  * ```
- * @description https://www.solidjs.com/docs/latest/api#%3Csuspense%3E
+ * @description https://www.solidjs.com/docs/latest/api#suspense
  */
 export declare function Suspense(props: {
     fallback?: JSX.Element;

package/types/render/component.d.ts

@@ -4,13 +4,13 @@ export declare function enableHydration(): void;
  * A general `Component` has no implicit `children` prop.  If desired, you can
  * specify one as in `Component<{name: String, children: JSX.Element}>`.
  */
-export declare type Component<P = {}> = (props: P) => JSX.Element;
+export type Component<P = {}> = (props: P) => JSX.Element;
 /**
  * Extend props to forbid the `children` prop.
  * Use this to prevent accidentally passing `children` to components that
  * would silently throw them away.
  */
-export declare type VoidProps<P = {}> = P & {
+export type VoidProps<P = {}> = P & {
     children?: never;
 };
 /**
@@ -18,13 +18,13 @@ export declare type VoidProps<P = {}> = P & {
  * Use this to prevent accidentally passing `children` to components that
  * would silently throw them away.
  */
-export declare type VoidComponent<P = {}> = Component<VoidProps<P>>;
+export type VoidComponent<P = {}> = Component<VoidProps<P>>;
 /**
  * Extend props to allow an optional `children` prop with the usual
  * type in JSX, `JSX.Element` (which allows elements, arrays, functions, etc.).
  * Use this for components that you want to accept children.
  */
-export declare type ParentProps<P = {}> = P & {
+export type ParentProps<P = {}> = P & {
     children?: JSX.Element;
 };
 /**
@@ -32,14 +32,14 @@ export declare type ParentProps<P = {}> = P & {
  * type in JSX, `JSX.Element` (which allows elements, arrays, functions, etc.).
  * Use this for components that you want to accept children.
  */
-export declare type ParentComponent<P = {}> = Component<ParentProps<P>>;
+export type ParentComponent<P = {}> = Component<ParentProps<P>>;
 /**
  * Extend props to require a `children` prop with the specified type.
  * Use this for components where you need a specific child type,
  * typically a function that receives specific argument types.
  * Note that all JSX <Elements> are of the type `JSX.Element`.
  */
-export declare type FlowProps<P = {}, C = JSX.Element> = P & {
+export type FlowProps<P = {}, C = JSX.Element> = P & {
     children: C;
 };
 /**
@@ -48,10 +48,10 @@ export declare type FlowProps<P = {}, C = JSX.Element> = P & {
  * typically a function that receives specific argument types.
  * Note that all JSX <Elements> are of the type `JSX.Element`.
  */
-export declare type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
+export type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
 /** @deprecated: use `ParentProps` instead */
-export declare type PropsWithChildren<P = {}> = ParentProps<P>;
-export declare type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
+export type PropsWithChildren<P = {}> = ParentProps<P>;
+export type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
 /**
  * Takes the props of the passed component and returns its type
  *
@@ -59,21 +59,21 @@ export declare type ValidComponent = keyof JSX.IntrinsicElements | Component<any
  * ComponentProps<typeof Portal> // { mount?: Node; useShadow?: boolean; children: JSX.Element }
  * ComponentProps<'div'> // JSX.HTMLAttributes<HTMLDivElement>
  */
-export declare type ComponentProps<T extends ValidComponent> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : Record<string, unknown>;
+export type ComponentProps<T extends ValidComponent> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : Record<string, unknown>;
 /**
  * Type of `props.ref`, for use in `Component` or `props` typing.
  *
  * @example Component<{ref: Ref<Element>}>
  */
-export declare type Ref<T> = T | ((val: T) => void);
+export type Ref<T> = T | ((val: T) => void);
 export declare function createComponent<T>(Comp: Component<T>, props: T): JSX.Element;
-declare type DistributeOverride<T, F> = T extends undefined ? F : T;
-declare type Override<T, U> = T extends any ? U extends any ? {
+type DistributeOverride<T, F> = T extends undefined ? F : T;
+type Override<T, U> = T extends any ? U extends any ? {
     [K in keyof T]: K extends keyof U ? DistributeOverride<U[K], T[K]> : T[K];
 } & {
     [K in keyof U]: K extends keyof T ? DistributeOverride<U[K], T[K]> : U[K];
 } : T & U : T & U;
-declare type OverrideSpread<T, U> = T extends any ? {
+type OverrideSpread<T, U> = T extends any ? {
     [K in keyof ({
         [K in keyof T]: any;
     } & {
@@ -82,16 +82,16 @@ declare type OverrideSpread<T, U> = T extends any ? {
         [K in U extends any ? keyof U : keyof U]?: any;
     })]: K extends keyof T ? Exclude<U extends any ? U[K & keyof U] : never, undefined> | T[K] : U extends any ? U[K & keyof U] : never;
 } : T & U;
-declare type Simplify<T> = T extends any ? {
+type Simplify<T> = T extends any ? {
     [K in keyof T]: T[K];
 } : T;
-declare type _MergeProps<T extends unknown[], Curr = {}> = T extends [
+type _MergeProps<T extends unknown[], Curr = {}> = T extends [
     infer Next | (() => infer Next),
     ...infer Rest
 ] ? _MergeProps<Rest, Override<Curr, Next>> : T extends [...infer Rest, infer Next | (() => infer Next)] ? Override<_MergeProps<Rest, Curr>, Next> : T extends [] ? Curr : T extends (infer I | (() => infer I))[] ? OverrideSpread<Curr, I> : Curr;
-export declare type MergeProps<T extends unknown[]> = Simplify<_MergeProps<T>>;
+export type MergeProps<T extends unknown[]> = Simplify<_MergeProps<T>>;
 export declare function mergeProps<T extends unknown[]>(...sources: T): MergeProps<T>;
-export declare type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
+export type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
     ...{
         [P in keyof K]: P extends `${number}` ? Pick<T, Extract<K[P], readonly (keyof T)[]>[number]> : never;
     },

package/types/render/flow.d.ts

@@ -11,7 +11,7 @@ import type { JSX } from "../jsx.js";
  * ```
  * If you have a list with fixed indices and changing values, consider using `<Index>` instead.
  *
- * @description https://www.solidjs.com/docs/latest/api#%3Cfor%3E
+ * @description https://www.solidjs.com/docs/latest/api#for
  */
 export declare function For<T extends readonly any[], U extends JSX.Element>(props: {
     each: T | undefined | null | false;
@@ -29,7 +29,7 @@ export declare function For<T extends readonly any[], U extends JSX.Element>(pro
  * ```
  * If you have a list with changing indices, better use `<For>`.
  *
- * @description https://www.solidjs.com/docs/latest/api#%3Cindex%3E
+ * @description https://www.solidjs.com/docs/latest/api#index
  */
 export declare function Index<T extends readonly any[], U extends JSX.Element>(props: {
     each: T | undefined | null | false;
@@ -38,7 +38,7 @@ export declare function Index<T extends readonly any[], U extends JSX.Element>(p
 }): Accessor<U[]>;
 /**
  * Conditionally render its children or an optional fallback component
- * @description https://www.solidjs.com/docs/latest/api#%3Cshow%3E
+ * @description https://www.solidjs.com/docs/latest/api#show
  */
 export declare function Show<T>(props: {
     when: T | undefined | null | false;
@@ -64,13 +64,13 @@ export declare function Show<T>(props: {
  *   </Match>
  * </Switch>
  * ```
- * @description https://www.solidjs.com/docs/latest/api#%3Cswitch%3E%2F%3Cmatch%3E
+ * @description https://www.solidjs.com/docs/latest/api#switchmatch
  */
 export declare function Switch(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
 }): Accessor<JSX.Element>;
-export declare type MatchProps<T> = {
+export type MatchProps<T> = {
     when: T | undefined | null | false;
     keyed?: boolean;
     children: JSX.Element | ((item: NonNullable<T>) => JSX.Element);
@@ -82,7 +82,7 @@ export declare type MatchProps<T> = {
  *   <Content/>
  * </Match>
  * ```
- * @description https://www.solidjs.com/docs/latest/api#%3Cswitch%3E%2F%3Cmatch%3E
+ * @description https://www.solidjs.com/docs/latest/api#switchmatch
  */
 export declare function Match<T>(props: {
     when: T | undefined | null | false;
@@ -108,7 +108,7 @@ export declare function resetErrorBoundaries(): void;
  * ```
  * Errors thrown from the fallback can be caught by a parent ErrorBoundary
  *
- * @description https://www.solidjs.com/docs/latest/api#%3Cerrorboundary%3E
+ * @description https://www.solidjs.com/docs/latest/api#errorboundary
  */
 export declare function ErrorBoundary(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);

package/types/render/hydration.d.ts

@@ -1,8 +1,8 @@
-export declare type HydrationContext = {
+export type HydrationContext = {
     id: string;
     count: number;
 };
-declare type SharedConfig = {
+type SharedConfig = {
     context?: HydrationContext;
     resources?: {
         [key: string]: any;

package/types/server/reactive.d.ts

@@ -3,9 +3,9 @@ export declare const $PROXY: unique symbol;
 export declare const $TRACK: 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 type Signal<T> = [get: Accessor<T>, set: Setter<T>];
+export type Accessor<T> = () => T;
+export 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 type Signal<T> = [get: Accessor<T>, set: Setter<T>];
 export declare const BRANCH: unique symbol;
 export declare function castError(err: any): string | Error;
 export declare let Owner: Owner | null;
@@ -13,7 +13,7 @@ interface Owner {
     owner: Owner | null;
     context: any | null;
 }
-export declare function createRoot<T>(fn: (dispose: () => void) => T, detachedOwner?: Owner): T;
+export declare function createRoot<T>(fn: (dispose: () => void) => T, detachedOwner?: typeof Owner): T;
 export declare function createSignal<T>(value: T, options?: {
     equals?: false | ((prev: T, next: T) => boolean);
     name?: string;
@@ -48,11 +48,11 @@ export interface Context<T> {
 export declare function createContext<T>(defaultValue?: T): Context<T>;
 export declare function useContext<T>(context: Context<T>): T;
 export declare function getOwner(): Owner | null;
-declare type ChildrenReturn = Accessor<any> & {
+type ChildrenReturn = Accessor<any> & {
     toArray: () => any[];
 };
 export declare function children(fn: () => any): ChildrenReturn;
-export declare function runWithOwner<T>(o: Owner, fn: () => T): T | undefined;
+export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
 export declare function lookup(owner: Owner | null, key: symbol | string): any;
 export interface Task {
     id: number;
@@ -67,7 +67,7 @@ export declare function cancelCallback(task: Task): void;
 export declare function mapArray<T, U>(list: () => T[], mapFn: (v: T, i: () => number) => U, options?: {
     fallback?: () => any;
 }): () => U[];
-export declare type ObservableObserver<T> = ((v: T) => void) | {
+export type ObservableObserver<T> = ((v: T) => void) | {
     next: (v: T) => void;
     error?: (v: any) => void;
     complete?: (v: boolean) => void;

package/types/server/rendering.d.ts

@@ -1,22 +1,22 @@
 import { Setter, Signal } from "./reactive.js";
 import type { JSX } from "../jsx.js";
-export declare type Component<P = {}> = (props: P) => JSX.Element;
-export declare type VoidProps<P = {}> = P & {
+export type Component<P = {}> = (props: P) => JSX.Element;
+export type VoidProps<P = {}> = P & {
     children?: never;
 };
-export declare type VoidComponent<P = {}> = Component<VoidProps<P>>;
-export declare type ParentProps<P = {}> = P & {
+export type VoidComponent<P = {}> = Component<VoidProps<P>>;
+export type ParentProps<P = {}> = P & {
     children?: JSX.Element;
 };
-export declare type ParentComponent<P = {}> = Component<ParentProps<P>>;
-export declare type FlowProps<P = {}, C = JSX.Element> = P & {
+export type ParentComponent<P = {}> = Component<ParentProps<P>>;
+export type FlowProps<P = {}, C = JSX.Element> = P & {
     children: C;
 };
-export declare type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
-export declare type Ref<T> = T | ((val: T) => void);
-export declare type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
-export declare type ComponentProps<T extends ValidComponent> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : Record<string, unknown>;
-declare type SharedConfig = {
+export type FlowComponent<P = {}, C = JSX.Element> = Component<FlowProps<P, C>>;
+export type Ref<T> = T | ((val: T) => void);
+export type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
+export type ComponentProps<T extends ValidComponent> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : Record<string, unknown>;
+type SharedConfig = {
     context?: HydrationContext;
 };
 export declare const sharedConfig: SharedConfig;
@@ -57,7 +57,7 @@ export declare function Switch(props: {
     fallback?: string;
     children: MatchProps<unknown> | MatchProps<unknown>[];
 }): string;
-declare type MatchProps<T> = {
+type MatchProps<T> = {
     when: T | false;
     keyed?: boolean;
     children: string | ((item: T) => string);
@@ -77,25 +77,25 @@ export interface Resource<T> {
     error: any;
     latest: T | undefined;
 }
-declare type SuspenseContextType = {
+type SuspenseContextType = {
     resources: Map<string, {
         loading: boolean;
         error: any;
     }>;
     completed: () => void;
 };
-export declare type ResourceActions<T> = {
+export 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> = {
+export type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
+export type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
+export type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
+export type ResourceFetcherInfo<T> = {
     value: T | undefined;
     refetching?: unknown;
 };
-export declare type ResourceOptions<T> = undefined extends T ? {
+export type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
     name?: string;
     deferStream?: boolean;
@@ -125,7 +125,7 @@ export declare function enableScheduling(): void;
 export declare function enableHydration(): void;
 export declare function startTransition(fn: () => any): void;
 export declare function useTransition(): [() => boolean, (fn: () => any) => void];
-declare type HydrationContext = {
+type HydrationContext = {
     id: string;
     count: number;
     writeResource: (id: string, v: Promise<any> | any, error?: boolean, deferStream?: boolean) => void;

package/web/dist/server.cjs

@@ -261,6 +261,7 @@ function toRefParam(index) {
   return ref;
 }
 
+const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
 const REPLACE_SCRIPT = `function $df(e,t,n,o,d){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;o.replaceWith(n.content)}n.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -522,13 +523,14 @@ function ssrStyle(value) {
 }
 function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
+  const skipChildren = VOID_ELEMENTS.test(tag);
   if (props == null) props = {};else if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
     if (ChildProperties.has(prop)) {
-      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+      if (children === undefined && !skipChildren) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -548,6 +550,11 @@ function ssrElement(tag, props, children, needsId) {
     }
     if (i !== keys.length - 1) result += " ";
   }
+  if (skipChildren) {
+    return {
+      t: result + '/>'
+    };
+  }
   return {
     t: result + `>${resolveSSRNode(children)}</${tag}>`
   };

package/web/dist/server.js

@@ -260,6 +260,7 @@ function toRefParam(index) {
   return ref;
 }
 
+const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
 const REPLACE_SCRIPT = `function $df(e,t,n,o,d){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;o.replaceWith(n.content)}n.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -521,13 +522,14 @@ function ssrStyle(value) {
 }
 function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
+  const skipChildren = VOID_ELEMENTS.test(tag);
   if (props == null) props = {};else if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
     if (ChildProperties.has(prop)) {
-      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+      if (children === undefined && !skipChildren) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -547,6 +549,11 @@ function ssrElement(tag, props, children, needsId) {
     }
     if (i !== keys.length - 1) result += " ";
   }
+  if (skipChildren) {
+    return {
+      t: result + '/>'
+    };
+  }
   return {
     t: result + `>${resolveSSRNode(children)}</${tag}>`
   };

package/web/types/index.d.ts

@@ -10,7 +10,7 @@ export declare const hydrate: typeof hydrateCore;
  *
  * Useful for inserting modals and tooltips outside of an cropping layout. If no mount point is given, the portal is inserted in document.body; it is wrapped in a `<div>` unless the target is document.head or `isSVG` is true. setting `useShadow` to true places the element in a shadow root to isolate styles.
  *
- * @description https://www.solidjs.com/docs/latest/api#%3Cportal%3E
+ * @description https://www.solidjs.com/docs/latest/api#portal
  */
 export declare function Portal<T extends boolean = false, S extends boolean = false>(props: {
     mount?: Node;
@@ -21,7 +21,7 @@ export declare function Portal<T extends boolean = false, S extends boolean = fa
     } : {}) & (S extends true ? SVGGElement : HTMLDivElement)) => void);
     children: JSX.Element;
 }): Text;
-declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
+export type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
     [K in keyof P]: P[K];
 } & {
     component: T | undefined;
@@ -31,6 +31,6 @@ declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
  * ```typescript
  * <Dynamic component={multiline() ? 'textarea' : 'input'} value={value()} />
  * ```
- * @description https://www.solidjs.com/docs/latest/api#%3Cdynamic%3E
+ * @description https://www.solidjs.com/docs/latest/api#dynamic
  */
 export declare function Dynamic<T extends ValidComponent>(props: DynamicProps<T>): Accessor<JSX.Element>;

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

@@ -42,7 +42,7 @@ export declare function escape(html: string): string;
  * @deprecated Replaced by ssrElement
  */
 export declare function ssrSpread(props: any, isSVG: boolean, skipChildren: boolean): void;
-export declare type LegacyResults = {
+export type LegacyResults = {
     startWriting: () => void;
 };
 /**