solid-js 1.4.0-beta.6 → 1.4.0

package/dist/dev.cjs

@@ -441,8 +441,7 @@ 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;

package/dist/dev.js

@@ -437,8 +437,7 @@ 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;

package/dist/solid.cjs

@@ -438,8 +438,7 @@ 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;

package/dist/solid.js

@@ -434,8 +434,7 @@ 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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.0-beta.6",
+  "version": "1.4.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "dce1c4b0c4d7b47f6f8cb743173da3acfd831419"
+  "gitHead": "6c9e976c002d3ae327ff509213a091ce79f7582a"
 }

package/types/reactive/signal.d.ts

@@ -72,7 +72,7 @@ export declare type RootFunction<T> = (dispose: () => void) => T;
  */
 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: Exclude<U, Function> | ((prev: T) => U)) => U);
+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 interface SignalOptions<T> extends MemoOptions<T> {
     internal?: boolean;
@@ -314,21 +314,25 @@ export declare function batch<T>(fn: Accessor<T>): T;
  * @description https://www.solidjs.com/docs/latest/api#untrack
  */
 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;
+/** @deprecated */
+export declare 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<{
+    [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 interface OnOptions {
     defer?: boolean;
 }
 /**
  * on - make dependencies of a computation explicit
  * ```typescript
- * export function on<T extends Array<() => any> | (() => any), U>(
- *   deps: T | T[],
- *   fn: (input: T, prevInput: T, prevValue?: U) => U,
+ * export function on<S, U>(
+ *   deps: Accessor<S> | AccessorArray<S>,
+ *   fn: (input: S, prevInput: S | undefined, prevValue: U | undefined) => U,
  *   options?: { defer?: boolean } = {}
- * ): (prevValue?: U) => U | undefined;
+ * ): (prevValue: U | undefined) => U;
  * ```
  * @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
@@ -347,7 +351,12 @@ export interface OnOptions {
  *
  * @description https://www.solidjs.com/docs/latest/api#on
  */
-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>>;
+export declare function on<S, Next extends Prev, Prev = Next>(deps: AccessorArray<S> | Accessor<S>, fn: OnEffectFunction<S, undefined | NoInfer<Prev>, Next>, options?: OnOptions & {
+    defer?: false;
+}): EffectFunction<undefined | NoInfer<Next>, NoInfer<Next>>;
+export declare function on<S, Next extends Prev, Prev = Next>(deps: AccessorArray<S> | Accessor<S>, fn: OnEffectFunction<S, undefined | NoInfer<Prev>, Next>, options: OnOptions & {
+    defer: true;
+}): EffectFunction<undefined | NoInfer<Next>>;
 /**
  * onMount - run an effect only after initial render on mount
  * @param fn an effect that should run only once on mount

package/types/render/component.d.ts

@@ -66,17 +66,23 @@ export declare type ComponentProps<T extends keyof JSX.IntrinsicElements | Compo
  */
 export declare type Ref<T> = T | ((val: T) => void);
 export declare function createComponent<T>(Comp: Component<T>, props: T): JSX.Element;
+declare type Simplify<T> = T extends object ? {
+    [K in keyof T]: T[K];
+} : T;
 declare type UnboxLazy<T> = T extends () => infer U ? U : T;
-declare type BoxedTupleTypes<T extends any[]> = {
-    [P in keyof T]: [UnboxLazy<T[P]>];
-}[Exclude<keyof T, keyof any[]>];
-declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-declare type UnboxIntersection<T> = T extends {
-    0: infer U;
-} ? U : never;
-declare type MergeProps<T extends any[]> = UnboxIntersection<UnionToIntersection<BoxedTupleTypes<T>>>;
-export declare function mergeProps<T extends any[]>(...sources: T): MergeProps<T>;
-declare type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
+declare type RequiredKeys<T> = keyof {
+    [K in keyof T as T extends {
+        [_ in K]: unknown;
+    } ? K : never]: 0;
+};
+declare type Override<T, U> = {
+    [K in keyof Omit<T, RequiredKeys<U>>]: T[K] | Exclude<U[K & keyof U], undefined>;
+} & {
+    [K in keyof Omit<U, Exclude<keyof T, RequiredKeys<U>>>]: Exclude<U[K], undefined> | (undefined extends U[K] ? (K extends keyof T ? T[K] : undefined) : never);
+};
+export declare type MergeProps<T extends unknown[], Curr = {}> = T extends [infer Next, ...infer Rest] ? MergeProps<Rest, Next extends object ? (Next extends Function ? Curr : Override<Curr, UnboxLazy<Next>>) : Curr> : Simplify<Curr>;
+export declare function mergeProps<T extends [unknown, ...unknown[]]>(...sources: T): MergeProps<T>;
+export declare type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
     ...{
         [P in keyof K]: P extends `${number}` ? Pick<T, Extract<K[P], readonly (keyof T)[]>[number]> : K[P];
     },