solid-js 1.8.22 → 1.9.0

package/store/types/store.d.ts

@@ -1,22 +1,38 @@
-export declare const $RAW: unique symbol, $NODE: unique symbol, $HAS: unique symbol, $SELF: unique symbol;
+export declare const $RAW: unique symbol,
+  $NODE: unique symbol,
+  $HAS: unique symbol,
+  $SELF: unique symbol;
 export declare const DevHooks: {
-    onStoreNodeUpdate: OnStoreNodeUpdate | null;
+  onStoreNodeUpdate: OnStoreNodeUpdate | null;
 };
 type DataNode = {
-    (): any;
-    $(value?: any): void;
+  (): any;
+  $(value?: any): void;
 };
-type DataNodes = Record<PropertyKey, DataNode | undefined>;
-export type OnStoreNodeUpdate = (state: StoreNode, property: PropertyKey, value: StoreNode | NotWrappable, prev: StoreNode | NotWrappable) => void;
+export type DataNodes = Record<PropertyKey, DataNode | undefined>;
+export type OnStoreNodeUpdate = (
+  state: StoreNode,
+  property: PropertyKey,
+  value: StoreNode | NotWrappable,
+  prev: StoreNode | NotWrappable
+) => void;
 export interface StoreNode {
-    [$NODE]?: DataNodes;
-    [key: PropertyKey]: any;
+  [$NODE]?: DataNodes;
+  [key: PropertyKey]: any;
 }
 export declare namespace SolidStore {
-    interface Unwrappable {
-    }
+  interface Unwrappable {}
 }
-export type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
+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;
 /**
@@ -33,74 +49,215 @@ 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 getNodes(target: StoreNode, symbol: typeof $NODE | typeof $HAS): DataNodes;
 export declare function getNode(nodes: DataNodes, property: PropertyKey, value?: any): DataNode;
-export declare function proxyDescriptor(target: StoreNode, property: PropertyKey): TypedPropertyDescriptor<any> | 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;
+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 type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
-    readonly [K in keyof T]: DeepReadonly<T[K]>;
-};
+export type DeepReadonly<T> = 0 extends 1 & T
+  ? T
+  : T extends NotWrappable
+  ? T
+  : {
+      readonly [K in keyof T]: DeepReadonly<T[K]>;
+    };
 /** @deprecated */
-export type DeepMutable<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
-    -readonly [K in keyof T]: DeepMutable<T[K]>;
-};
-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 type DeepMutable<T> = 0 extends 1 & T
+  ? T
+  : T extends NotWrappable
+  ? T
+  : {
+      -readonly [K in keyof T]: DeepMutable<T[K]>;
+    };
+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 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];
+  [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 type StorePathRange = {
-    from?: number;
-    to?: number;
-    by?: number;
+  from?: number;
+  to?: number;
+  by?: number;
 };
 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);
+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 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 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,
-        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;
-    <K1 extends KeyOf<W<T>>, K2 extends MutableKeyOf<W<W<T>[K1]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, setter: StoreSetter<W<W<T>[K1]>[K2], [K2, K1]>): void;
-    <K1 extends MutableKeyOf<W<T>>>(k1: Part<W<T>, K1>, setter: StoreSetter<W<T>[K1], [K1]>): void;
-    (setter: StoreSetter<T, []>): 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]>>, K7 extends KeyOf<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>, ...rest: Rest<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>[K7], [K7, 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 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, 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;
+  <K1 extends KeyOf<W<T>>, K2 extends MutableKeyOf<W<W<T>[K1]>>>(
+    k1: Part<W<T>, K1>,
+    k2: Part<W<W<T>[K1]>, K2>,
+    setter: StoreSetter<W<W<T>[K1]>[K2], [K2, K1]>
+  ): void;
+  <K1 extends MutableKeyOf<W<T>>>(k1: Part<W<T>, K1>, setter: StoreSetter<W<T>[K1], [K1]>): void;
+  (setter: StoreSetter<T, []>): 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]>>,
+    K7 extends KeyOf<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>,
+    ...rest: Rest<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>[K7], [K7, K6, K5, K4, K3, K2, K1]>
+  ): void;
 }
 /**
  * Creates a reactive store that can be read through a proxy object and written with a setter function
  *
  * @description https://docs.solidjs.com/reference/store-utilities/create-store
  */
-export declare function createStore<T extends object = {}>(...[store, options]: {} extends T ? [store?: T | Store<T>, options?: {
-    name?: string;
-}] : [store: T | Store<T>, options?: {
-    name?: string;
-}]): [get: Store<T>, set: SetStoreFunction<T>];
+export declare function createStore<T extends object = {}>(
+  ...[store, options]: {} extends T
+    ? [
+        store?: T | Store<T>,
+        options?: {
+          name?: string;
+        }
+      ]
+    : [
+        store: T | Store<T>,
+        options?: {
+          name?: string;
+        }
+      ]
+): [get: Store<T>, set: SetStoreFunction<T>];
 export {};

package/types/index.d.ts

@@ -1,5 +1,66 @@
-export { $DEVCOMP, $PROXY, $TRACK, batch, catchError, 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, ContextProviderComponent, EffectFunction, EffectOptions, InitializedResource, InitializedResourceOptions, InitializedResourceReturn, MemoOptions, NoInfer, OnEffectFunction, OnOptions, Owner, ResolvedChildren, ResolvedJSXElement, Resource, ResourceActions, ResourceFetcher, ResourceFetcherInfo, ResourceOptions, ResourceReturn, ResourceSource, ReturnTypes, Setter, Signal, SignalOptions } from "./reactive/signal.js";
+export {
+  $DEVCOMP,
+  $PROXY,
+  $TRACK,
+  batch,
+  catchError,
+  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,
+  ContextProviderComponent,
+  EffectFunction,
+  EffectOptions,
+  InitializedResource,
+  InitializedResourceOptions,
+  InitializedResourceReturn,
+  MemoOptions,
+  NoInfer,
+  OnEffectFunction,
+  OnOptions,
+  Owner,
+  ResolvedChildren,
+  ResolvedJSXElement,
+  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";
@@ -8,15 +69,19 @@ import type { JSX } from "./jsx.js";
 type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
 import { registerGraph, writeSignal } from "./reactive/signal.js";
-export declare const DEV: {
-    readonly hooks: {
+export declare const DEV:
+  | {
+      readonly hooks: {
         afterUpdate: (() => void) | null;
         afterCreateOwner: ((owner: import("./reactive/signal.js").Owner) => void) | null;
-        afterCreateSignal: ((signal: import("./reactive/signal.js").SignalState<any>) => void) | null;
-    };
-    readonly writeSignal: typeof writeSignal;
-    readonly registerGraph: typeof registerGraph;
-} | undefined;
+        afterCreateSignal:
+          | ((signal: import("./reactive/signal.js").SignalState<any>) => void)
+          | null;
+      };
+      readonly writeSignal: typeof writeSignal;
+      readonly registerGraph: typeof registerGraph;
+    }
+  | undefined;
 declare global {
-    var Solid$$: boolean;
+  var Solid$$: boolean;
 }

package/types/jsx.d.ts

@@ -28,6 +28,7 @@ export namespace JSX {
       }
     ): void;
   }
+
   interface BoundEventHandler<T, E extends Event> {
     0: (
       data: any,
@@ -40,6 +41,19 @@ export namespace JSX {
   }
   type EventHandlerUnion<T, E extends Event> = EventHandler<T, E> | BoundEventHandler<T, E>;
 
+  interface EventHandlerWithOptions<T, E extends Event> extends AddEventListenerOptions {
+    handleEvent: (
+      e: E & {
+        currentTarget: T;
+        target: Element;
+      }
+    ) => void;
+  }
+
+  type CustomEventHandlerUnion<T, E extends Event> =
+    | EventHandler<T, E>
+    | EventHandlerWithOptions<T, E>;
+
   interface InputEventHandler<T, E extends InputEvent> {
     (
       e: E & {
@@ -141,7 +155,11 @@ export namespace JSX {
   }
   interface ExplicitProperties {}
   interface ExplicitAttributes {}
+  interface ExplicitBoolAttributes {}
   interface CustomEvents {}
+  /**
+   * @deprecated Replaced by CustomEvents
+   */
   interface CustomCaptureEvents {}
   type DirectiveAttributes = {
     [Key in keyof Directives as `use:${Key}`]?: Directives[Key];
@@ -168,8 +186,11 @@ export namespace JSX {
   type AttrAttributes = {
     [Key in keyof ExplicitAttributes as `attr:${Key}`]?: ExplicitAttributes[Key];
   };
+  type BoolAttributes = {
+    [Key in keyof ExplicitBoolAttributes as `bool:${Key}`]?: ExplicitBoolAttributes[Key];
+  };
   type OnAttributes<T> = {
-    [Key in keyof CustomEvents as `on:${Key}`]?: EventHandler<T, CustomEvents[Key]>;
+    [Key in keyof CustomEvents as `on:${Key}`]?: CustomEventHandlerUnion<T, CustomEvents[Key]>;
   };
   type OnCaptureAttributes<T> = {
     [Key in keyof CustomCaptureEvents as `oncapture:${Key}`]?: EventHandler<
@@ -600,7 +621,8 @@ export namespace JSX {
       | "removals text"
       | "text"
       | "text additions"
-      | "text removals";
+      | "text removals"
+      | undefined;
     /** Indicates that user input is required on the element before a form may be submitted. */
     "aria-required"?: boolean | "false" | "true" | undefined;
     /** Defines a human-readable, author-localized description for the role of an element. */
@@ -713,7 +735,8 @@ export namespace JSX {
       | "tooltip"
       | "tree"
       | "treegrid"
-      | "treeitem";
+      | "treeitem"
+      | undefined;
   }
 
   // TODO: Should we allow this?
@@ -1312,7 +1335,8 @@ export namespace JSX {
       | "alphabetic"
       | "hanging"
       | "mathematical"
-      | "inherit";
+      | "inherit"
+      | undefined;
     "baseline-shift"?: number | string | undefined;
     clip?: string | undefined;
     "clip-path"?: string | undefined;
@@ -1335,7 +1359,8 @@ export namespace JSX {
       | "mathematical"
       | "hanging"
       | "text-top"
-      | "inherit";
+      | "inherit"
+      | undefined;
     "enable-background"?: string | undefined;
     fill?: string | undefined;
     "fill-opacity"?: number | string | "inherit" | undefined;
@@ -1375,7 +1400,8 @@ export namespace JSX {
       | "stroke"
       | "all"
       | "none"
-      | "inherit";
+      | "inherit"
+      | undefined;
     "shape-rendering"?:
       | "auto"
       | "optimizeSpeed"
@@ -1407,7 +1433,8 @@ export namespace JSX {
       | "optimizeSpeed"
       | "optimizeLegibility"
       | "geometricPrecision"
-      | "inherit";
+      | "inherit"
+      | undefined;
     "unicode-bidi"?: string | undefined;
     visibility?: "visible" | "hidden" | "collapse" | "inherit" | undefined;
     "word-spacing"?: number | string | undefined;
@@ -2103,7 +2130,7 @@ export namespace JSX {
     main: HTMLAttributes<HTMLElement>;
     map: MapHTMLAttributes<HTMLMapElement>;
     mark: HTMLAttributes<HTMLElement>;
-    menu: MenuHTMLAttributes<HTMLElement>;
+    menu: MenuHTMLAttributes<HTMLMenuElement>;
     meta: MetaHTMLAttributes<HTMLMetaElement>;
     meter: MeterHTMLAttributes<HTMLElement>;
     nav: HTMLAttributes<HTMLElement>;

package/types/reactive/array.d.ts

@@ -29,9 +29,13 @@ SOFTWARE.
  *
  * @description https://docs.solidjs.com/reference/reactive-utilities/map-array
  */
-export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: T, i: Accessor<number>) => U, options?: {
+export declare function mapArray<T, U>(
+  list: Accessor<readonly T[] | undefined | null | false>,
+  mapFn: (v: T, i: Accessor<number>) => U,
+  options?: {
     fallback?: Accessor<any>;
-}): () => U[];
+  }
+): () => U[];
 /**
  * Reactively maps arrays by index instead of value - underlying helper for the `<Index>` control flow
  *
@@ -39,6 +43,10 @@ export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined |
  *
  * @description https://docs.solidjs.com/reference/reactive-utilities/index-array
  */
-export declare function indexArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: number) => U, options?: {
+export declare function indexArray<T, U>(
+  list: Accessor<readonly T[] | undefined | null | false>,
+  mapFn: (v: Accessor<T>, i: number) => U,
+  options?: {
     fallback?: Accessor<any>;
-}): () => U[];
+  }
+): () => U[];

package/types/reactive/observable.d.ts

@@ -1,20 +1,22 @@
 import { Accessor, Setter } from "./signal.js";
 declare global {
-    interface SymbolConstructor {
-        readonly observable: symbol;
-    }
+  interface SymbolConstructor {
+    readonly observable: symbol;
+  }
 }
 interface Observable<T> {
-    subscribe(observer: ObservableObserver<T>): {
-        unsubscribe(): void;
-    };
-    [Symbol.observable](): 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;
-};
+export type ObservableObserver<T> =
+  | ((v: T) => void)
+  | {
+      next?: (v: T) => void;
+      error?: (v: any) => void;
+      complete?: (v: boolean) => void;
+    };
 /**
  * Creates a simple observable from a signal's accessor to be used with the `from` operator of observable libraries like e.g. rxjs
  * ```typescript
@@ -26,9 +28,15 @@ export type ObservableObserver<T> = ((v: T) => void) | {
  * description https://docs.solidjs.com/reference/reactive-utilities/observable
  */
 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 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/scheduler.d.ts

@@ -1,10 +1,13 @@
 export interface Task {
-    id: number;
-    fn: ((didTimeout: boolean) => void) | null;
-    startTime: number;
-    expirationTime: number;
+  id: number;
+  fn: ((didTimeout: boolean) => void) | null;
+  startTime: number;
+  expirationTime: number;
 }
-export declare function requestCallback(fn: () => void, options?: {
+export declare function requestCallback(
+  fn: () => void,
+  options?: {
     timeout: number;
-}): Task;
+  }
+): Task;
 export declare function cancelCallback(task: Task): void;