solid-js 1.6.10 → 1.7.0-beta.0

package/store/types/index.d.ts

@@ -1,10 +1,11 @@
-export { createStore, unwrap, $RAW } from "./store.js";
-export type { Store, SetStoreFunction, NotWrappable, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store.js";
+export { $RAW, createStore, unwrap } from "./store.js";
+export type { ArrayFilterFn, DeepMutable, DeepReadonly, NotWrappable, Part, SetStoreFunction, SolidStore, Store, StoreNode, StorePathRange, StoreSetter } 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;
+import { $NODE, isWrappable, DevHooks } from "./store.js";
+declare let DEV: {
+    $NODE: typeof $NODE;
+    isWrappable: typeof isWrappable;
+    hooks: typeof DevHooks;
 } | undefined;
+export { DEV };

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

@@ -1,15 +1,14 @@
-export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-declare global {
-    var _$onStoreNodeUpdate: OnStoreNodeUpdate | undefined;
-}
-declare type DataNode = {
+export declare const $RAW: unique symbol, $NODE: unique symbol;
+export declare const DevHooks: {
+    onStoreNodeUpdate: OnStoreNodeUpdate | null;
+};
+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;
     [key: PropertyKey]: any;
 }
@@ -17,8 +16,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 +33,47 @@ 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 [never] ? never : [
+    T
+] extends [readonly unknown[]] ? number : 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 +84,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

@@ -5,15 +5,14 @@ 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";
+import { registerGraph, writeSignal, DevHooks } from "./reactive/signal.js";
 declare let DEV: {
-    writeSignal: typeof writeSignal;
-    serializeGraph: typeof serializeGraph;
-    registerGraph: typeof registerGraph;
-    hashValue: typeof hashValue;
-};
+    readonly hooks: typeof DevHooks;
+    readonly writeSignal: typeof writeSignal;
+    readonly registerGraph: typeof registerGraph;
+} | undefined;
 export { DEV };
 declare global {
     var Solid$$: boolean;

package/types/jsx.d.ts

@@ -12,16 +12,12 @@ export namespace JSX {
   type Element =
     | Node
     | ArrayElement
-    | FunctionElement
     | (string & {})
     | number
     | boolean
     | null
     | undefined;
   interface ArrayElement extends Array<Element> {}
-  interface FunctionElement {
-    (): Element;
-  }
   interface ElementClass {
     // empty, libs can define requirements downstream
   }
@@ -1702,6 +1698,7 @@ export namespace JSX {
     patternUnits?: SVGUnits;
     patternContentUnits?: SVGUnits;
     patternTransform?: string;
+    href?: string;
   }
   interface PolygonSVGAttributes<T>
     extends GraphicsElementSVGAttributes<T>,

package/types/reactive/observable.d.ts

@@ -10,7 +10,7 @@ interface Observable<T> {
     };
     [Symbol.observable](): Observable<T>;
 }
-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/reactive/signal.d.ts

@@ -8,13 +8,15 @@ export declare const $DEVCOMP: unique symbol;
 export declare var Owner: Owner | null;
 export declare let Transition: TransitionState | null;
 declare let ExternalSourceFactory: ExternalSourceFactory | null;
-declare global {
-    var _$afterUpdate: (() => void) | undefined;
-    var _$afterCreateRoot: ((root: Owner) => void) | undefined;
-}
-export declare type ComputationState = 0 | 1 | 2;
+/** Object storing callbacks for debugging during development */
+export declare const DevHooks: {
+    afterUpdate: (() => void) | null;
+    afterCreateOwner: ((owner: Owner) => void) | null;
+};
+export type ComputationState = 0 | 1 | 2;
 export interface SourceMapValue {
     value: unknown;
+    name?: string;
     graph?: Owner;
 }
 export interface SignalState<T> extends SourceMapValue {
@@ -23,16 +25,14 @@ export interface SignalState<T> extends SourceMapValue {
     observerSlots: number[] | null;
     tValue?: T;
     comparator?: (prev: T, next: T) => boolean;
-    name?: string;
 }
 export interface Owner {
     owned: Computation<any>[] | null;
     cleanups: (() => void)[] | null;
     owner: Owner | null;
     context: any | null;
-    sourceMap?: Record<string, SourceMapValue>;
+    sourceMap?: SourceMapValue[];
     name?: string;
-    componentName?: string;
 }
 export interface Computation<Init, Next extends Init = Init> extends Owner {
     fn: EffectFunction<Init, Next>;
@@ -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;
 }
@@ -425,10 +425,10 @@ export declare function onCleanup<T extends () => any>(fn: T): T;
  *
  * @description https://www.solidjs.com/docs/latest/api#onerror
  */
-export declare function onError(fn: (err: any) => void): void;
+export declare function onError(fn: (err: Error) => 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
@@ -437,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(): [
@@ -450,18 +450,13 @@ export declare type Transition = [Accessor<boolean>, (fn: () => void) => Promise
  */
 export declare function useTransition(): Transition;
 export declare function resumeEffects(e: Computation<any>[]): void;
-export interface DevComponent<T> extends Memo<JSX.Element> {
+export interface DevComponent<T> extends Memo<unknown> {
     props: T;
     componentName: string;
 }
-export declare function devComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
-export declare function hashValue(v: any): string;
-export declare function registerGraph(name: string, value: SourceMapValue): string;
-interface GraphRecord {
-    [k: string]: GraphRecord | unknown;
-}
-export declare function serializeGraph(owner?: Owner | null): GraphRecord;
-export declare type ContextProviderComponent<T> = FlowComponent<{
+export declare function devComponent<P, V>(Comp: (props: P) => V, props: P): V;
+export declare function registerGraph(value: SourceMapValue): void;
+export type ContextProviderComponent<T> = FlowComponent<{
     value: T;
 }>;
 export interface Context<T> {
@@ -499,9 +494,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>;
+export type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
+export type ChildrenReturn = Accessor<ResolvedChildren> & {
     toArray: () => ResolvedJSXElement[];
 };
 /**
@@ -513,14 +508,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/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

@@ -17,7 +17,7 @@ export declare function For<T extends readonly any[], U extends JSX.Element>(pro
     each: T | undefined | null | false;
     fallback?: JSX.Element;
     children: (item: T[number], index: Accessor<number>) => U;
-}): Accessor<U[]>;
+}): JSX.Element;
 /**
  * Non-keyed iteration over a list creating elements from its items
  *
@@ -35,7 +35,7 @@ export declare function Index<T extends readonly any[], U extends JSX.Element>(p
     each: T | undefined | null | false;
     fallback?: JSX.Element;
     children: (item: Accessor<T[number]>, index: number) => U;
-}): Accessor<U[]>;
+}): JSX.Element;
 /**
  * Conditionally render its children or an optional fallback component
  * @description https://www.solidjs.com/docs/latest/api#show
@@ -45,13 +45,13 @@ export declare function Show<T>(props: {
     keyed: true;
     fallback?: JSX.Element;
     children: JSX.Element | ((item: NonNullable<T>) => JSX.Element);
-}): () => JSX.Element;
+}): JSX.Element;
 export declare function Show<T>(props: {
     when: T | undefined | null | false;
     keyed?: false;
     fallback?: JSX.Element;
-    children: JSX.Element;
-}): () => JSX.Element;
+    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+}): JSX.Element;
 /**
  * switches between content based on mutually exclusive conditions
  * ```typescript
@@ -69,8 +69,8 @@ export declare function Show<T>(props: {
 export declare function Switch(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
-}): Accessor<JSX.Element>;
-export declare type MatchProps<T> = {
+}): JSX.Element;
+export type MatchProps<T> = {
     when: T | undefined | null | false;
     keyed?: boolean;
     children: JSX.Element | ((item: NonNullable<T>) => JSX.Element);
@@ -113,4 +113,4 @@ export declare function resetErrorBoundaries(): void;
 export declare function ErrorBoundary(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
     children: JSX.Element;
-}): Accessor<JSX.Element>;
+}): 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;