solid-js 1.2.5 → 1.3.0-beta.0

package/dist/solid.cjs

@@ -184,12 +184,13 @@ function createSignal(value, options) {
     pending: NOTPENDING,
     comparator: options.equals || undefined
   };
-  return [readSignal.bind(s), value => {
+  const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.pending !== NOTPENDING ? s.pending : s.tValue);else value = value(s.pending !== NOTPENDING ? s.pending : s.value);
     }
     return writeSignal(s, value);
-  }];
+  };
+  return [readSignal.bind(s), setter];
 }
 function createComputed(fn, value, options) {
   const c = createComputation(fn, value, true, STALE);
@@ -246,12 +247,7 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    if (sharedConfig.context.loadResource) {
-      initP = sharedConfig.context.loadResource(id);
-    } else if (sharedConfig.resources && id && id in sharedConfig.resources) {
-      initP = sharedConfig.resources[id];
-      delete sharedConfig.resources[id];
-    }
+    if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
     if (pr === p) {
@@ -406,7 +402,8 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn, options) {
+function on(deps, fn,
+options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;
@@ -1161,7 +1158,7 @@ function lazy(fn) {
   let comp;
   const wrap = props => {
     const ctx = sharedConfig.context;
-    if (ctx && sharedConfig.resources) {
+    if (ctx) {
       ctx.count++;
       const [s, set] = createSignal();
       fn().then(mod => {
@@ -1234,7 +1231,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a && a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1328,7 +1325,10 @@ function SuspenseList(props) {
 function Suspense(props) {
   let counter = 0,
       showContent,
-      showFallback;
+      showFallback,
+      ctx,
+      waitingHydration,
+      flicker;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1343,6 +1343,24 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
+  if (sharedConfig.context && sharedConfig.load) {
+    const key = sharedConfig.context.id + sharedConfig.context.count;
+    const p = sharedConfig.load(key);
+    if (p) {
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(() => {
+        sharedConfig.gather(key);
+        waitingHydration = true;
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext(undefined);
+        waitingHydration = false;
+      });
+    }
+  }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
   let dispose;
@@ -1350,28 +1368,35 @@ function Suspense(props) {
   return createComponent(SuspenseContext.Provider, {
     value: store,
     get children() {
-      const rendered = untrack(() => props.children);
       return createMemo(() => {
-        const inFallback = store.inFallback(),
-              visibleContent = showContent ? showContent() : true,
-              visibleFallback = showFallback ? showFallback() : true;
-        dispose && dispose();
-        if (!inFallback && visibleContent) {
-          store.resolved = true;
-          resumeEffects(store.effects);
-          return rendered;
+        if (flicker) {
+          ctx = sharedConfig.context;
+          flicker();
+          return flicker = undefined;
         }
-        if (!visibleFallback) return;
-        return createRoot(disposer => {
-          dispose = disposer;
-          return props.fallback;
-        }, owner);
+        const rendered = untrack(() => props.children);
+        return createMemo(() => {
+          const inFallback = store.inFallback(),
+                visibleContent = showContent ? showContent() : true,
+                visibleFallback = showFallback ? showFallback() : true;
+          dispose && dispose();
+          if ((!inFallback || waitingHydration) && visibleContent) {
+            store.resolved = true;
+            resumeEffects(store.effects);
+            return rendered;
+          }
+          if (!visibleFallback) return;
+          return createRoot(disposer => {
+            dispose = disposer;
+            if (sharedConfig.context) sharedConfig.context.count = 0;
+            return props.fallback;
+          }, owner);
+        });
       });
     }
   });
 }
 
-function awaitSuspense() {}
 let DEV;
 
 exports.$PROXY = $PROXY;
@@ -1384,7 +1409,6 @@ exports.Show = Show;
 exports.Suspense = Suspense;
 exports.SuspenseList = SuspenseList;
 exports.Switch = Switch;
-exports.awaitSuspense = awaitSuspense;
 exports.batch = batch;
 exports.cancelCallback = cancelCallback;
 exports.children = children;

package/dist/solid.js

@@ -180,12 +180,13 @@ function createSignal(value, options) {
     pending: NOTPENDING,
     comparator: options.equals || undefined
   };
-  return [readSignal.bind(s), value => {
+  const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.pending !== NOTPENDING ? s.pending : s.tValue);else value = value(s.pending !== NOTPENDING ? s.pending : s.value);
     }
     return writeSignal(s, value);
-  }];
+  };
+  return [readSignal.bind(s), setter];
 }
 function createComputed(fn, value, options) {
   const c = createComputation(fn, value, true, STALE);
@@ -242,12 +243,7 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    if (sharedConfig.context.loadResource) {
-      initP = sharedConfig.context.loadResource(id);
-    } else if (sharedConfig.resources && id && id in sharedConfig.resources) {
-      initP = sharedConfig.resources[id];
-      delete sharedConfig.resources[id];
-    }
+    if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
     if (pr === p) {
@@ -402,7 +398,8 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn, options) {
+function on(deps, fn,
+options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;
@@ -1157,7 +1154,7 @@ function lazy(fn) {
   let comp;
   const wrap = props => {
     const ctx = sharedConfig.context;
-    if (ctx && sharedConfig.resources) {
+    if (ctx) {
       ctx.count++;
       const [s, set] = createSignal();
       fn().then(mod => {
@@ -1230,7 +1227,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a && a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1324,7 +1321,10 @@ function SuspenseList(props) {
 function Suspense(props) {
   let counter = 0,
       showContent,
-      showFallback;
+      showFallback,
+      ctx,
+      waitingHydration,
+      flicker;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1339,6 +1339,24 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
+  if (sharedConfig.context && sharedConfig.load) {
+    const key = sharedConfig.context.id + sharedConfig.context.count;
+    const p = sharedConfig.load(key);
+    if (p) {
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(() => {
+        sharedConfig.gather(key);
+        waitingHydration = true;
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext(undefined);
+        waitingHydration = false;
+      });
+    }
+  }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
   let dispose;
@@ -1346,28 +1364,35 @@ function Suspense(props) {
   return createComponent(SuspenseContext.Provider, {
     value: store,
     get children() {
-      const rendered = untrack(() => props.children);
       return createMemo(() => {
-        const inFallback = store.inFallback(),
-              visibleContent = showContent ? showContent() : true,
-              visibleFallback = showFallback ? showFallback() : true;
-        dispose && dispose();
-        if (!inFallback && visibleContent) {
-          store.resolved = true;
-          resumeEffects(store.effects);
-          return rendered;
+        if (flicker) {
+          ctx = sharedConfig.context;
+          flicker();
+          return flicker = undefined;
         }
-        if (!visibleFallback) return;
-        return createRoot(disposer => {
-          dispose = disposer;
-          return props.fallback;
-        }, owner);
+        const rendered = untrack(() => props.children);
+        return createMemo(() => {
+          const inFallback = store.inFallback(),
+                visibleContent = showContent ? showContent() : true,
+                visibleFallback = showFallback ? showFallback() : true;
+          dispose && dispose();
+          if ((!inFallback || waitingHydration) && visibleContent) {
+            store.resolved = true;
+            resumeEffects(store.effects);
+            return rendered;
+          }
+          if (!visibleFallback) return;
+          return createRoot(disposer => {
+            dispose = disposer;
+            if (sharedConfig.context) sharedConfig.context.count = 0;
+            return props.fallback;
+          }, owner);
+        });
       });
     }
   });
 }
 
-function awaitSuspense() {}
 let DEV;
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, awaitSuspense, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.2.5",
+  "version": "1.3.0-beta.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://github.com/solidjs/solid#readme",
@@ -132,5 +132,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "faf884b19acc078f1e202030bbd6b22c49a5ae6b"
+  "gitHead": "4efd2be2d5180db0a4875c7c05d8fb4cd9bf44f3"
 }

package/types/index.d.ts

@@ -7,7 +7,6 @@ export * from "./render";
 import type { JSX } from "./jsx";
 declare type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
-export declare function awaitSuspense(): void;
 import { writeSignal, serializeGraph, registerGraph, hashValue } from "./reactive/signal";
 declare let DEV: {
     writeSignal: typeof writeSignal;

package/types/reactive/signal.d.ts

@@ -1,16 +1,14 @@
 import { requestCallback } from "./scheduler";
 import type { JSX } from "../jsx";
-export declare type Accessor<T> = () => T;
-export declare type Setter<T> = undefined extends T ? <U extends T>(v?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(v: (U extends Function ? never : U) | ((prev: T) => U)) => U;
 export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
 export declare const NOTPENDING: {};
 export declare var Owner: Owner | null;
-export declare let Transition: Transition | null;
+export declare let Transition: TransitionState | null;
 declare global {
     var _$afterUpdate: () => void;
 }
-interface Signal<T> {
+export interface SignalState<T> {
     value?: T;
     observers: Computation<any>[] | null;
     observerSlots: number[] | null;
@@ -19,7 +17,7 @@ interface Signal<T> {
     comparator?: (prev: T, next: T) => boolean;
     name?: string;
 }
-interface Owner {
+export interface Owner {
     owned: Computation<any>[] | null;
     cleanups: (() => void)[] | null;
     owner: Owner | null;
@@ -30,23 +28,20 @@ interface Owner {
     name?: string;
     componentName?: string;
 }
-interface Computation<T> extends Owner {
-    fn: (v?: T) => T;
+export interface Computation<Init, Next extends Init = Init> extends Owner {
+    fn: EffectFunction<Init, Next>;
     state: number;
     tState?: number;
-    sources: Signal<T>[] | null;
+    sources: SignalState<Next>[] | null;
     sourceSlots: number[] | null;
-    value?: T;
+    value?: Init;
     updatedAt: number | null;
     pure: boolean;
     user?: boolean;
     suspense?: SuspenseContextType;
 }
-interface Memo<T> extends Signal<T>, Computation<T> {
-    tOwned?: Computation<any>[];
-}
-interface Transition {
-    sources: Set<Signal<any>>;
+export interface TransitionState {
+    sources: Set<SignalState<any>>;
     effects: Computation<any>[];
     promises: Set<Promise<any>>;
     disposed: Set<Computation<any>>;
@@ -55,6 +50,7 @@ interface Transition {
     running: boolean;
     cb: (() => void)[];
 }
+export declare type RootFunction<T> = (dispose: () => void) => T;
 /**
  * Creates a new non-tracked reactive context that doesn't auto-dispose
  *
@@ -64,11 +60,13 @@ interface Transition {
  *
  * @description https://www.solidjs.com/docs/latest/api#createroot
  */
-export declare function createRoot<T>(fn: (dispose: () => void) => T, detachedOwner?: Owner): T;
-export declare type SignalOptions<T> = {
-    name?: string;
-    equals?: false | ((prev: T, next: T) => boolean);
-};
+export declare function createRoot<T>(fn: RootFunction<T>, detachedOwner?: Owner): T;
+export declare type Accessor<T> = () => T;
+export declare type Setter<T> = undefined extends T ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
+export declare type Signal<T> = [get: Accessor<T>, set: Setter<T>];
+export interface SignalOptions<T> extends MemoOptions<T> {
+    internal?: boolean;
+}
 /**
  * Creates a simple reactive state with a getter and setter
  * ```typescript
@@ -92,18 +90,21 @@ export declare type SignalOptions<T> = {
  *
  * @description https://www.solidjs.com/docs/latest/api#createsignal
  */
-export declare function createSignal<T>(): [get: Accessor<T | undefined>, set: Setter<T | undefined>];
-export declare function createSignal<T>(value: T, options?: {
-    equals?: false | ((prev: T, next: T) => boolean);
+export declare function createSignal<T>(): Signal<T | undefined>;
+export declare function createSignal<T>(value: T, options?: SignalOptions<T>): Signal<T>;
+export interface BaseOptions {
     name?: string;
-    internal?: boolean;
-}): [get: Accessor<T>, set: Setter<T>];
+}
+export declare 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;
 /**
  * Creates a reactive computation that runs immediately before render, mainly used to write to other reactive primitives
  * ```typescript
- * export function createComputed<T>(
- *   fn: (v: T) => T,
- *   value?: T,
+ * export function createComputed<Next, Init = Next>(
+ *   fn: (v: Init | Next) => Next,
+ *   value?: Init,
  *   options?: { name?: string }
  * ): void;
  * ```
@@ -113,10 +114,8 @@ export declare function createSignal<T>(value: T, options?: {
  *
  * @description https://www.solidjs.com/docs/latest/api#createcomputed
  */
-export declare function createComputed<T>(fn: (v?: T) => T | undefined): void;
-export declare function createComputed<T>(fn: (v: T) => T, value: T, options?: {
-    name?: string;
-}): void;
+export declare function createComputed<Next, Init = Next>(fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions): void;
+export declare function createComputed<Next, Init = undefined>(..._: undefined extends Init ? [fn: EffectFunction<Init | Next, Next>, value?: Init, options?: EffectOptions] : [fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions]): void;
 /**
  * Creates a reactive computation that runs during the render phase as DOM elements are created and updated but not necessarily connected
  * ```typescript
@@ -132,10 +131,8 @@ export declare function createComputed<T>(fn: (v: T) => T, value: T, options?: {
  *
  * @description https://www.solidjs.com/docs/latest/api#createrendereffect
  */
-export declare function createRenderEffect<T>(fn: (v?: T) => T | undefined): void;
-export declare function createRenderEffect<T>(fn: (v: T) => T, value: T, options?: {
-    name?: string;
-}): void;
+export declare function createRenderEffect<Next, Init = Next>(fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions): void;
+export declare function createRenderEffect<Next, Init = undefined>(..._: undefined extends Init ? [fn: EffectFunction<Init | Next, Next>, value?: Init, options?: EffectOptions] : [fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions]): void;
 /**
  * Creates a reactive computation that runs after the render phase
  * ```typescript
@@ -151,10 +148,14 @@ export declare function createRenderEffect<T>(fn: (v: T) => T, value: T, options
  *
  * @description https://www.solidjs.com/docs/latest/api#createeffect
  */
-export declare function createEffect<T>(fn: (v?: T) => T | undefined): void;
-export declare function createEffect<T>(fn: (v: T) => T, value: T, options?: {
-    name?: string;
-}): void;
+export declare function createEffect<Next, Init = Next>(fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions): void;
+export declare function createEffect<Next, Init = undefined>(..._: undefined extends Init ? [fn: EffectFunction<Init | Next, Next>, value?: Init, options?: EffectOptions] : [fn: EffectFunction<Init | Next, Next>, value: Init, options?: EffectOptions]): void;
+interface Memo<Prev, Next = Prev> extends SignalState<Next>, Computation<Next> {
+    tOwned?: Computation<Prev | Next, Next>[];
+}
+export interface MemoOptions<T> extends EffectOptions {
+    equals?: false | ((prev: T, next: T) => boolean);
+}
 /**
  * Creates a readonly derived reactive memoized signal
  * ```typescript
@@ -170,14 +171,8 @@ export declare function createEffect<T>(fn: (v: T) => T, value: T, options?: {
  *
  * @description https://www.solidjs.com/docs/latest/api#creatememo
  */
-export declare function createMemo<T>(fn: (v?: T) => T, value?: undefined, options?: {
-    equals?: false | ((prev: T, next: T) => boolean);
-    name?: string;
-}): Accessor<T>;
-export declare function createMemo<T>(fn: (v: T) => T, value: T, options?: {
-    equals?: false | ((prev: T, next: T) => boolean);
-    name?: string;
-}): Accessor<T>;
+export declare function createMemo<Next extends _Next, Init = Next, _Next = Next>(fn: EffectFunction<Init | _Next, Next>, value: Init, options?: MemoOptions<Next>): Accessor<Next>;
+export declare function createMemo<Next extends _Next, Init = undefined, _Next = Next>(..._: undefined extends Init ? [fn: EffectFunction<Init | _Next, Next>, value?: Init, options?: MemoOptions<Next>] : [fn: EffectFunction<Init | _Next, Next>, value: Init, options?: MemoOptions<Next>]): Accessor<Next>;
 export interface Resource<T> extends Accessor<T> {
     loading: boolean;
     error: any;
@@ -221,30 +216,30 @@ export declare type ResourceOptions<T> = T extends undefined ? {
  *
  * @description https://www.solidjs.com/docs/latest/api#createresource
  */
-export declare function createResource<T extends any, S = true>(fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): [Resource<T | undefined>, ResourceActions<T | undefined>];
-export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): [Resource<T>, ResourceActions<T>];
-export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): [Resource<T | undefined>, ResourceActions<T | undefined>];
-export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): [Resource<T>, ResourceActions<T>];
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export interface DeferredOptions<T> {
+    equals?: false | ((prev: T, next: T) => boolean);
+    name?: string;
+    timeoutMs?: number;
+}
 /**
  * Creates a reactive computation that only runs and notifies the reactive context when the browser is idle
  * ```typescript
  * export function createDeferred<T>(
  *   fn: (v: T) => T,
- *   value?: T,
  *   options?: { timeoutMs?: number, name?: string, equals?: false | ((prev: T, next: T) => boolean) }
  * ): () => T);
  * ```
  * @param fn a function that receives its previous or the initial value, if set, and returns a new value used to react on a computation
- * @param value an optional initial value for the computation; if set, fn will never receive undefined as first argument
  * @param options allows to set the timeout in milliseconds, use a custom comparison function and set a name in dev mode for debugging purposes
  *
  * @description https://www.solidjs.com/docs/latest/api#createdeferred
  */
-export declare function createDeferred<T>(source: Accessor<T>, options?: {
-    equals?: false | ((prev: T, next: T) => boolean);
-    name?: string;
-    timeoutMs?: number;
-}): Accessor<T>;
+export declare function createDeferred<T>(source: Accessor<T>, options?: DeferredOptions<T>): Accessor<T>;
+export declare 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
@@ -269,9 +264,7 @@ export declare function createDeferred<T>(source: Accessor<T>, options?: {
  *
  * @description https://www.solidjs.com/docs/latest/api#createselector
  */
-export declare function createSelector<T, U>(source: Accessor<T>, fn?: (a: U, b: T) => boolean, options?: {
-    name?: string;
-}): (key: U) => boolean;
+export declare function createSelector<T, U>(source: Accessor<T>, fn?: EqualityCheckerFunction<T, U>, options?: BaseOptions): (key: U) => boolean;
 /**
  * Holds changes inside the block before the reactive context is updated
  * @param fn wraps the reactive updates that should be batched
@@ -279,7 +272,7 @@ export declare function createSelector<T, U>(source: Accessor<T>, fn?: (a: U, b:
  *
  * @description https://www.solidjs.com/docs/latest/api#batch
  */
-export declare function batch<T>(fn: () => T): T;
+export declare function batch<T>(fn: Accessor<T>): T;
 /**
  * Ignores tracking context inside its scope
  * @param fn the scope that is out of the tracking context
@@ -291,6 +284,10 @@ export declare function untrack<T>(fn: Accessor<T>): T;
 export declare type ReturnTypes<T> = T extends (() => any)[] ? {
     [I in keyof T]: ReturnTypes<T[I]>;
 } : T extends () => any ? ReturnType<T> : never;
+export declare type OnEffectFunction<S, Prev, Next extends Prev = Prev> = (input: ReturnTypes<S>, prevInput: ReturnTypes<S>, v: Prev) => Next;
+export interface OnOptions {
+    defer?: boolean;
+}
 /**
  * on - make dependencies of a computation explicit
  * ```typescript
@@ -303,6 +300,8 @@ export declare type ReturnTypes<T> = T extends (() => any)[] ? {
  * @param deps list of reactive dependencies or a single reactive dependency
  * @param fn computation on input; the current previous content(s) of input and the previous value are given as arguments and it returns a new value
  * @param options optional, allows deferred computation until at the end of the next change
+ * @returns an effect function that is passed into createEffect. For example:
+ *
  * ```typescript
  * createEffect(on(a, (v) => console.log(v, b())));
  *
@@ -315,12 +314,7 @@ export declare type ReturnTypes<T> = T extends (() => any)[] ? {
  *
  * @description https://www.solidjs.com/docs/latest/api#on
  */
-export declare function on<T extends (() => any)[], U>(deps: [...T], fn: (input: ReturnTypes<T>, prevInput: ReturnTypes<T>, prevValue?: U) => U, options?: {
-    defer?: boolean;
-}): (prevValue?: U) => U;
-export declare function on<T extends () => any, U>(deps: T, fn: (input: ReturnType<T>, prevInput: ReturnType<T>, prevValue?: U) => U, options?: {
-    defer?: boolean;
-}): (prevValue?: U) => U;
+export declare function on<S extends Accessor<unknown> | Accessor<unknown>[] | [], Next, Init = unknown>(deps: S, fn: OnEffectFunction<S, Init | Next, Next>, options?: OnOptions): EffectFunction<NoInfer<Init> | NoInfer<Next>, NoInfer<Next>>;
 /**
  * onMount - run an effect only after initial render on mount
  * @param fn an effect that should run only once on mount
@@ -344,11 +338,12 @@ export declare function onCleanup(fn: () => void): () => void;
  * @description https://www.solidjs.com/docs/latest/api#onerror
  */
 export declare function onError(fn: (err: any) => void): void;
-export declare function getListener(): Computation<any> | null;
+export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
 export declare function runWithOwner(o: Owner, fn: () => any): any;
 export declare function enableScheduling(scheduler?: typeof requestCallback): void;
 export declare function startTransition(fn: () => void, cb?: () => void): void;
+export declare type Transition = [Accessor<boolean>, (fn: () => void, cb?: () => void) => void];
 /**
  * ```typescript
  * export function useTransition(): [
@@ -359,7 +354,7 @@ export declare function startTransition(fn: () => void, cb?: () => void): void;
  *
  * @description https://www.solidjs.com/docs/latest/api#usetransition
  */
-export declare function useTransition(): [Accessor<boolean>, (fn: () => void, cb?: () => void) => void];
+export declare function useTransition(): Transition;
 export declare function resumeEffects(e: Computation<any>[]): void;
 export declare function devComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
 export declare function hashValue(v: any): string;
@@ -370,12 +365,13 @@ interface GraphRecord {
     [k: string]: GraphRecord | unknown;
 }
 export declare function serializeGraph(owner?: Owner | null): GraphRecord;
+export declare type ContextProviderComponent<T> = (props: {
+    value: T;
+    children: any;
+}) => any;
 export interface Context<T> {
     id: symbol;
-    Provider: (props: {
-        value: T;
-        children: any;
-    }) => any;
+    Provider: ContextProviderComponent<T>;
     defaultValue: T;
 }
 /**
@@ -413,18 +409,20 @@ export declare function useContext<T>(context: Context<T>): T;
  * @description https://www.solidjs.com/docs/latest/api#children
  */
 export declare function children(fn: Accessor<JSX.Element>): Accessor<JSX.Element>;
-declare type SuspenseContextType = {
+export declare type SuspenseContextType = {
     increment?: () => void;
     decrement?: () => void;
     inFallback?: () => boolean;
     effects?: Computation<any>[];
     resolved?: boolean;
 };
-export declare function getSuspenseContext(): Context<SuspenseContextType> & {
+declare type SuspenseContext = Context<SuspenseContextType> & {
     active?(): boolean;
     increment?(): void;
     decrement?(): void;
 };
-export declare function readSignal(this: Signal<any> | Memo<any>): any;
-export declare function writeSignal(node: Signal<any> | Memo<any>, value: any, isComp?: boolean): any;
+declare let SuspenseContext: SuspenseContext;
+export declare function getSuspenseContext(): SuspenseContext;
+export declare function readSignal(this: SignalState<any> | Memo<any>): any;
+export declare function writeSignal(node: SignalState<any> | Memo<any>, value: any, isComp?: boolean): any;
 export {};