Remove unnecessary overload from createSelector

solidjs · Jun 5, 2023 · fcf55d1 · fcf55d1
1 parent a7270bc
commit fcf55d1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.changeset/five-cats-compare.md b/.changeset/five-cats-compare.md
@@ -2,4 +2,4 @@
 "solid-js": patch
 ---
 
-Add function overloads to `createSelector` to improve type inference.
+Improve type inference of `createSelector`.
diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
@@ -784,13 +784,7 @@ export type EqualityCheckerFunction<T, U> = (a: U, b: T) => boolean;
  *
  * @description https://www.solidjs.com/docs/latest/api#createselector
  */
-export function createSelector<T, U = T>(source: Accessor<T>): (key: U) => boolean;
 export function createSelector<T, U = T>(
-  source: Accessor<T>,
-  fn: EqualityCheckerFunction<T, U>,
-  options?: BaseOptions
-): (key: U) => boolean;
-export function createSelector<T, U>(
   source: Accessor<T>,
   fn: EqualityCheckerFunction<T, U> = equalFn as TODO,
   options?: BaseOptions

diff --git a/packages/solid/test/signals.type-tests.ts b/packages/solid/test/signals.type-tests.ts
@@ -721,6 +721,12 @@ const onMemo4: Accessor<number> = onMemo3;
   // @ts-expect-error Argument of type 'string' is not assignable to parameter of type 'number'. ts(2345)
   const bool2: boolean = selector("123");
 }
+{
+  const selector = createSelector(() => 123, undefined, { name: "test" });
+  const bool: boolean = selector(123);
+  // @ts-expect-error Argument of type 'string' is not assignable to parameter of type 'number'. ts(2345)
+  const bool2: boolean = selector("123");
+}
 {
   const selector = createSelector<number | string>(() => 123);
   const bool: boolean = selector(123);
@@ -746,6 +752,16 @@ const onMemo4: Accessor<number> = onMemo3;
   const bool: boolean = selector(123);
   const bool2: boolean = selector("123");
 }
+{
+  const selector = createSelector(
+    () => 123,
+    (key, source) => key === source,
+    { name: "test" }
+  );
+  const bool: boolean = selector(123);
+  // @ts-expect-error Argument of type 'string' is not assignable to parameter of type 'number'. ts(2345)
+  const bool2: boolean = selector("123");
+}
 
 //////////////////////////////////////////////////////////////////////////
 // variations of signal types ////////////////////////////////////////////