chore: update reselect and re-reselect

denbezrukov · denbezrukov · commit 36604dd2c499 · 2022-07-30T21:04:37.000+03:00
diff --git a/examples/redux-todos/package.json b/examples/redux-todos/package.json
@@ -11,12 +11,12 @@
     "@types/react-dom": "^17.0.0",
     "@types/react-redux": "^7.1.12",
     "@types/uuid": "^8.3.0",
-    "re-reselect": "^4.0.0",
+    "re-reselect": "^4.0.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-redux": "^7.2.2",
     "redux": "^4.0.5",
-    "reselect": "^4.0.0",
+    "reselect": "^4.1.6",
     "reselect-utils": "^2.0.0-beta.16",
     "typescript-fsa": "^3.0.0",
     "typescript-fsa-reducers": "^1.2.2",
diff --git a/packages/eslint-plugin-reselect-utils/package.json b/packages/eslint-plugin-reselect-utils/package.json
@@ -22,16 +22,16 @@
     "build": "yarn clean && yarn build:cjs && yarn build:es"
   },
   "dependencies": {
-    "@typescript-eslint/experimental-utils": "^4.17.0"
+    "@typescript-eslint/experimental-utils": "^5.31.0"
   },
   "peerDependencies": {
-    "@typescript-eslint/parser": "^4.17.0",
-    "typescript": "^4.2.3"
+    "@typescript-eslint/parser": "^5.31.0",
+    "typescript": "^4.7.4"
   },
   "devDependencies": {
     "common-tags": "^1.8.0",
-    "re-reselect": "^4.0.0",
-    "reselect": "^4.0.0",
+    "re-reselect": "^4.0.1",
+    "reselect": "^4.1.6",
     "reselect-utils": "^2.0.0-beta.16"
   }
 }
diff --git a/packages/eslint-plugin-reselect-utils/src/rules/noDifferentProps.ts b/packages/eslint-plugin-reselect-utils/src/rules/noDifferentProps.ts
@@ -31,7 +31,6 @@ export const noDifferentPropsRule = ruleCreator({
   ] as [Options],
   meta: {
     docs: {
-      category: 'Possible Errors',
       description: 'Cached selector and key selector must have same props.',
       recommended: 'error',
     },
diff --git a/packages/eslint-plugin-reselect-utils/src/rules/requireKeySelector.ts b/packages/eslint-plugin-reselect-utils/src/rules/requireKeySelector.ts
@@ -19,7 +19,6 @@ export const requireKeySelectorRule = ruleCreator({
   defaultOptions: [],
   meta: {
     docs: {
-      category: 'Possible Errors',
       description: 'Cached selector can`t work without key selector.',
       recommended: 'error',
     },
diff --git a/packages/eslint-plugin-reselect-utils/src/utils/getSelectorProps.ts b/packages/eslint-plugin-reselect-utils/src/utils/getSelectorProps.ts
@@ -1,5 +1,17 @@
 import ts from 'typescript';
 
+export function getTypeArguments(
+  type: ts.TypeReference,
+  checker: ts.TypeChecker,
+): readonly ts.Type[] {
+  // getTypeArguments was only added in TS3.7
+  if (checker.getTypeArguments) {
+    return checker.getTypeArguments(type);
+  }
+
+  return type.typeArguments ?? [];
+}
+
 export const getSelectorProps = (
   selectorType: ts.Type,
   typeChecker: ts.TypeChecker,
@@ -12,15 +24,17 @@ export const getSelectorProps = (
     return [];
   }
 
-  const [, props] = signature.parameters;
+  const [, props] = signature.getParameters();
   if (props === undefined || props.valueDeclaration === undefined) {
     return [];
   }
 
-  const propsType = typeChecker.getTypeOfSymbolAtLocation(
+  const nodeType = typeChecker.getTypeOfSymbolAtLocation(
     props,
     props.valueDeclaration,
   );
 
-  return typeChecker.getPropertiesOfType(propsType);
+  const [params] = getTypeArguments(nodeType as ts.TypeReference, typeChecker);
+
+  return typeChecker.getPropertiesOfType(params ?? nodeType);
 };
diff --git a/packages/reselect-utils/package.json b/packages/reselect-utils/package.json
@@ -30,9 +30,9 @@
     "@types/react": "^17.0.0",
     "cytoscape": "^3.17.1",
     "cytoscape-dagre": "^2.3.2",
-    "re-reselect": "^4.0.0",
+    "re-reselect": "^4.0.1",
     "react": "^16.13.1",
-    "reselect": "^4.0.0",
+    "reselect": "^4.1.6",
     "reselect-tools": "^0.0.7"
   }
 }
diff --git a/packages/reselect-utils/src/__tests__/createChainSelector.test.ts b/packages/reselect-utils/src/__tests__/createChainSelector.test.ts
@@ -84,6 +84,7 @@ describe('createChainSelector', () => {
     );
 
     (fullNameNamedSelector as NamedParametricSelector<
+      unknown,
       unknown,
       unknown,
       unknown
diff --git a/packages/reselect-utils/src/createCachedSequenceSelector.ts b/packages/reselect-utils/src/createCachedSequenceSelector.ts
@@ -4,10 +4,10 @@ import { Options, ParametricOptions } from './types';
 import { createSequenceSelector } from './createSequenceSelector';
 
 export function createCachedSequenceSelector<S, R>(
-  selectors: Selector<S, R>[],
+  selectors: Selector<S, R, never>[],
 ): (
-  options: Options<S, (...results: R[]) => R[], Selector<S, R>[]>,
-) => Selector<S, R[]>;
+  options: Options<S, (...results: R[]) => R[], Selector<S, R, never>[]>,
+) => Selector<S, R[], never>;
 
 export function createCachedSequenceSelector<S, P, R>(
   selectors: ParametricSelector<S, P, R>[],
diff --git a/packages/reselect-utils/src/createCachedStructuredSelector.ts b/packages/reselect-utils/src/createCachedStructuredSelector.ts
@@ -5,14 +5,14 @@ import { createStructuredSelector } from './createStructuredSelector';
 
 export function createCachedStructuredSelector<M>(
   selectors: M,
-): M extends { [K in keyof M]: Selector<infer S, unknown> }
+): M extends { [K in keyof M]: Selector<infer S, unknown, never> }
   ? (
       options: Options<
         S,
         (...results: unknown[]) => { [K in keyof M]: ReturnType<M[K]> },
-        Selector<S, unknown>[]
+        Selector<S, unknown, never>[]
       >,
-    ) => Selector<S, { [K in keyof M]: ReturnType<M[K]> }>
+    ) => Selector<S, { [K in keyof M]: ReturnType<M[K]> }, never>
   : M extends { [K in keyof M]: ParametricSelector<infer S, infer P, unknown> }
   ? (
       options: ParametricOptions<
diff --git a/packages/reselect-utils/src/createChainSelector.ts b/packages/reselect-utils/src/createChainSelector.ts
@@ -45,7 +45,7 @@ export type ChainSelectorOptions = {
 };
 
 export type SelectorChain<R1, S, P, R2> =
-  | ((result: R1) => Selector<S, R2>)
+  | ((result: R1) => Selector<S, R2, never>)
   | ((result: R1) => ParametricSelector<S, P, R2>);
 
 export type SelectorChainHierarchy<
@@ -54,15 +54,15 @@ export type SelectorChainHierarchy<
 > = C & { parentChain?: H };
 
 export type SelectorCreator<S, P, R1, R2> = (
-  selector: Selector<S, R1> | ParametricSelector<S, P, R1>,
+  selector: Selector<S, R1, never> | ParametricSelector<S, P, R1>,
   combiner: (result: R1) => R2,
-) => Selector<S, R2> | ParametricSelector<S, P, R2>;
+) => Selector<S, R2, never> | ParametricSelector<S, P, R2>;
 
 export class SelectorMonad<
   S1,
   P1,
   R1,
-  SelectorType extends Selector<S1, R1> | ParametricSelector<S1, P1, R1>,
+  SelectorType extends Selector<S1, R1, never> | ParametricSelector<S1, P1, R1>,
   SelectorChainType extends SelectorChainHierarchy<any, any>
 > {
   private readonly selector: SelectorType;
@@ -82,16 +82,16 @@ export class SelectorMonad<
   }
 
   public chain<S2, R2>(
-    fn: (result: R1) => Selector<S2, R2>,
+    fn: (result: R1) => Selector<S2, R2, never>,
     options?: ChainSelectorOptions,
-  ): SelectorType extends Selector<S1, R1>
+  ): SelectorType extends Selector<S1, R1, never>
     ? SelectorMonad<
         S1 & S2,
         void,
         R2,
         NamedSelector<S1 & S2, R2>,
         SelectorChainHierarchy<
-          (result: R1) => Selector<S2, R2>,
+          (result: R1) => Selector<S2, R2, never>,
           SelectorChainType
         >
       >
@@ -101,15 +101,15 @@ export class SelectorMonad<
         R2,
         NamedParametricSelector<S1 & S2, P1, R2>,
         SelectorChainHierarchy<
-          (result: R1) => Selector<S2, R2>,
+          (result: R1) => Selector<S2, R2, never>,
           SelectorChainType
         >
       >;
 
   public chain<S2, P2, R2>(
     fn: (result: R1) => ParametricSelector<S2, P2, R2>,
     options?: ChainSelectorOptions,
-  ): SelectorType extends Selector<S1, R1>
+  ): SelectorType extends Selector<S1, R1, never>
     ? SelectorMonad<
         S1 & S2,
         P2,
@@ -276,17 +276,17 @@ export class SelectorMonad<
 }
 
 export function createChainSelector<S, R>(
-  selector: Selector<S, R>,
+  selector: Selector<S, R, never>,
   options?: ChainSelectorOptions,
-): SelectorMonad<S, void, R, Selector<S, R>, void>;
+): SelectorMonad<S, void, R, Selector<S, R, never>, void>;
 
 export function createChainSelector<S, P, R>(
   selector: ParametricSelector<S, P, R>,
   options?: ChainSelectorOptions,
 ): SelectorMonad<S, P, R, ParametricSelector<S, P, R>, void>;
 
 export function createChainSelector<S, P, R>(
-  selector: Selector<S, R> | ParametricSelector<S, P, R>,
+  selector: Selector<S, R, never> | ParametricSelector<S, P, R>,
   options?: ChainSelectorOptions,
 ) {
   return new SelectorMonad<S, P, R, typeof selector, never>(
diff --git a/packages/reselect-utils/src/createEmptySelector.ts b/packages/reselect-utils/src/createEmptySelector.ts
@@ -3,8 +3,8 @@ import { defaultKeySelector, isCachedSelector } from './helpers';
 import { CachedSelector } from './types';
 
 export const createEmptySelector = <S, P, R>(
-  baseSelector: ParametricSelector<S, P, R> | Selector<S, R>,
-): Selector<S, R | undefined> => {
+  baseSelector: ParametricSelector<S, P, R> | Selector<S, R, never>,
+): Selector<S, R | undefined, never> => {
   const emptySelector = () => undefined;
 
   if (isCachedSelector(baseSelector)) {
diff --git a/packages/reselect-utils/src/createPathSelector.ts b/packages/reselect-utils/src/createPathSelector.ts
@@ -237,10 +237,10 @@ export const innerCreatePathSelector = (
 };
 
 export function createPathSelector<S, R>(
-  baseSelector: Selector<S, R>,
+  baseSelector: Selector<S, R, never>,
 ): IsOptional<R> extends true
-  ? OptionalPathSelectorType<S, R, [Selector<S, R>]>
-  : RequiredPathSelectorType<S, R, [Selector<S, R>]>;
+  ? OptionalPathSelectorType<S, R, [Selector<S, R, never>]>
+  : RequiredPathSelectorType<S, R, [Selector<S, R, never>]>;
 
 export function createPathSelector<S, P, R>(
   baseSelector: ParametricSelector<S, P, R>,
diff --git a/packages/reselect-utils/src/createSequenceSelector.ts b/packages/reselect-utils/src/createSequenceSelector.ts
@@ -1,9 +1,9 @@
 import { createSelector, ParametricSelector, Selector } from 'reselect';
 
 export function createSequenceSelector<S, R>(
-  selectors: Selector<S, R>[],
+  selectors: Selector<S, R, never>[],
   selectorCreator?: typeof createSelector,
-): Selector<S, R[]>;
+): Selector<S, R[], never>;
 
 export function createSequenceSelector<S, P, R>(
   selectors: ParametricSelector<S, P, R>[],
diff --git a/packages/reselect-utils/src/createStructuredSelector.ts b/packages/reselect-utils/src/createStructuredSelector.ts
@@ -1,31 +1,5 @@
-import { createSelector, ParametricSelector, Selector } from 'reselect';
+import {
+  createStructuredSelector as reselectStructuredSelector,
+} from 'reselect';
 
-export function createStructuredSelector<M>(
-  selectors: M,
-  selectorCreator?: typeof createSelector,
-): M extends { [K in keyof M]: Selector<infer S, unknown> }
-  ? Selector<S, { [K in keyof M]: ReturnType<M[K]> }>
-  : M extends { [K in keyof M]: ParametricSelector<infer S, infer P, unknown> }
-  ? ParametricSelector<S, P, { [K in keyof M]: ReturnType<M[K]> }>
-  : never;
-
-export function createStructuredSelector(
-  selectors: Record<
-    PropertyKey,
-    Selector<any, any> | ParametricSelector<any, any, any>
-  >,
-  selectorCreator = createSelector,
-): any {
-  const objectKeys = Object.keys(selectors);
-  return selectorCreator(
-    objectKeys.map((key) => selectors[key]),
-    (...values: unknown[]) =>
-      values.reduce<Record<string, unknown>>(
-        (composition, value, index) => ({
-          ...composition,
-          [objectKeys[index]]: value,
-        }),
-        {},
-      ),
-  );
-}
+export const createStructuredSelector = reselectStructuredSelector;
diff --git a/packages/reselect-utils/src/reselect-tools.d.ts b/packages/reselect-utils/src/reselect-tools.d.ts
@@ -16,7 +16,7 @@ declare module 'reselect-tools' {
 
   type Edges = Edge[];
 
-  type AnySelector = Selector<any, any> | ParametricSelector<any, any, any>;
+  type AnySelector = Selector<any, any, never> | ParametricSelector<any, any, any>;
 
   type CheckResult = {
     isNamed: boolean;
diff --git a/packages/reselect-utils/src/types.ts b/packages/reselect-utils/src/types.ts
@@ -10,7 +10,7 @@ import {
   ParametricKeySelectorCreator,
 } from 're-reselect';
 
-export type NamedSelector<S, R, D = any[]> = Selector<S, R> & {
+export type NamedSelector<S, R, D = any[]> = Selector<S, R, never> & {
   selectorName?: string;
   dependencies?: D;
 };
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@`
`30`	`30`	`"@types/react": "^17.0.0",`
`31`	`31`	`"cytoscape": "^3.17.1",`
`32`	`32`	`"cytoscape-dagre": "^2.3.2",`
`33`		`- "re-reselect": "^4.0.0",`
	`33`	`+ "re-reselect": "^4.0.1",`
`34`	`34`	`"react": "^16.13.1",`
`35`		`- "reselect": "^4.0.0",`
	`35`	`+ "reselect": "^4.1.6",`
`36`	`36`	`"reselect-tools": "^0.0.7"`
`37`	`37`	`}`
`38`	`38`	`}`