Merge pull request #315 from sergey-su/dynamic-selectors-array

added typings for dynamic array of uniform selectors
reduxjs · Jun 22, 2018 · 25ad346 · 25ad346
2 parents 3fa08de + 36f256b
commit 25ad346
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -952,6 +952,15 @@ export function createSelector<S1, S2, S3, S4, S5, S6, S7, S8, S9, S10, S11, S12
   combiner: (res1: R1, res2: R2, res3: R3, res4: R4, res5: R5, res6: R6, res7: R7, res8: R8, res9: R9, res10: R10, res11: R11, res12: R12) => T,
 ): OutputParametricSelector<S1 & S2 & S3 & S4 & S5 & S6 & S7 & S8 & S9 & S10 & S11 & S12, P1 & P2 & P3 & P4 & P5 & P6 & P7 & P8 & P9 & P10 & P11 & P12, T, (res1: R1, res2: R2, res3: R3, res4: R4, res5: R5, res6: R6, res7: R7, res8: R8, res9: R9, res10: R10, res11: R11, res12: R12) => T>;
 
+/* any number of uniform selectors */
+export function createSelector<S, R, T>(
+  selectors: Selector<S, R>[],
+  combiner: (...res: R[]) => T,
+): OutputSelector<S, T, (...res: R[]) => T>;
+export function createSelector<S, P, R, T>(
+  selectors: ParametricSelector<S, P, R>[],
+  combiner: (...res: R[]) => T,
+): OutputParametricSelector<S, P, T, (...res: R[]) => T>;
 
 export function defaultMemoize<F extends Function>(
   func: F, equalityCheck?: <T>(a: T, b: T, index: number) => boolean,

diff --git a/typescript_test/test.ts b/typescript_test/test.ts
@@ -466,3 +466,26 @@ function testCreateStructuredSelector() {
     baz: state => state.foo
   });
 }
+
+function testDynamicArrayArgument() {
+  interface Elem {
+    val1: string;
+    val2: string;
+  }
+  const data: ReadonlyArray<Elem> = [{val1: 'a', val2: 'aa'}, {val1: 'b', val2: 'bb'}];
+
+  createSelector(data.map(obj => () => obj.val1), (...vals) => vals.join(','));
+
+  // typings:expect-error
+  createSelector(data.map(obj => () => obj.val1), (vals) => vals.join(','))
+
+  createSelector(data.map(obj => () => obj.val1), (...vals: string[]) => 0)
+  // typings:expect-error
+  createSelector(data.map(obj => () => obj.val1), (...vals: number[]) => 0)
+
+  const s = createSelector(data.map(obj => (state: {}, fld: keyof Elem) => obj[fld]), (...vals) => vals.join(','));
+  s({}, 'val1');
+  s({}, 'val2');
+  // typings:expect-error
+  s({}, 'val3');
+}