@wordpress/data 6.1.4 → 6.2.1

package/build-module/utils/emitter.js

@@ -1,7 +1,7 @@
 /**
  * Create an event emitter.
  *
- * @return {import("../types").WPDataEmitter} Emitter.
+ * @return {import("../types").DataEmitter} Emitter.
  */
 export function createEmitter() {
   let isPaused = false;

package/build-module/utils/emitter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/data/src/utils/emitter.js"],"names":["createEmitter","isPaused","isPending","listeners","Set","notifyListeners","Array","from","forEach","listener","subscribe","add","delete","pause","resume","emit"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,aAAT,GAAyB;AAC/B,MAAIC,QAAQ,GAAG,KAAf;AACA,MAAIC,SAAS,GAAG,KAAhB;AACA,QAAMC,SAAS,GAAG,IAAIC,GAAJ,EAAlB;;AACA,QAAMC,eAAe,GAAG,MACvB;AACA;AACA;AACAC,EAAAA,KAAK,CAACC,IAAN,CAAYJ,SAAZ,EAAwBK,OAAxB,CAAmCC,QAAF,IAAgBA,QAAQ,EAAzD,CAJD;;AAMA,SAAO;AACN,QAAIR,QAAJ,GAAe;AACd,aAAOA,QAAP;AACA,KAHK;;AAKNS,IAAAA,SAAS,CAAED,QAAF,EAAa;AACrBN,MAAAA,SAAS,CAACQ,GAAV,CAAeF,QAAf;AACA,aAAO,MAAMN,SAAS,CAACS,MAAV,CAAkBH,QAAlB,CAAb;AACA,KARK;;AAUNI,IAAAA,KAAK,GAAG;AACPZ,MAAAA,QAAQ,GAAG,IAAX;AACA,KAZK;;AAcNa,IAAAA,MAAM,GAAG;AACRb,MAAAA,QAAQ,GAAG,KAAX;;AACA,UAAKC,SAAL,EAAiB;AAChBA,QAAAA,SAAS,GAAG,KAAZ;AACAG,QAAAA,eAAe;AACf;AACD,KApBK;;AAsBNU,IAAAA,IAAI,GAAG;AACN,UAAKd,QAAL,EAAgB;AACfC,QAAAA,SAAS,GAAG,IAAZ;AACA;AACA;;AACDG,MAAAA,eAAe;AACf;;AA5BK,GAAP;AA8BA","sourcesContent":["/**\n * Create an event emitter.\n *\n * @return {import(\"../types\").WPDataEmitter} Emitter.\n */\nexport function createEmitter() {\n\tlet isPaused = false;\n\tlet isPending = false;\n\tconst listeners = new Set();\n\tconst notifyListeners = () =>\n\t\t// We use Array.from to clone the listeners Set\n\t\t// This ensures that we don't run a listener\n\t\t// that was added as a response to another listener.\n\t\tArray.from( listeners ).forEach( ( listener ) => listener() );\n\n\treturn {\n\t\tget isPaused() {\n\t\t\treturn isPaused;\n\t\t},\n\n\t\tsubscribe( listener ) {\n\t\t\tlisteners.add( listener );\n\t\t\treturn () => listeners.delete( listener );\n\t\t},\n\n\t\tpause() {\n\t\t\tisPaused = true;\n\t\t},\n\n\t\tresume() {\n\t\t\tisPaused = false;\n\t\t\tif ( isPending ) {\n\t\t\t\tisPending = false;\n\t\t\t\tnotifyListeners();\n\t\t\t}\n\t\t},\n\n\t\temit() {\n\t\t\tif ( isPaused ) {\n\t\t\t\tisPending = true;\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tnotifyListeners();\n\t\t},\n\t};\n}\n"]}
+{"version":3,"sources":["@wordpress/data/src/utils/emitter.js"],"names":["createEmitter","isPaused","isPending","listeners","Set","notifyListeners","Array","from","forEach","listener","subscribe","add","delete","pause","resume","emit"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,aAAT,GAAyB;AAC/B,MAAIC,QAAQ,GAAG,KAAf;AACA,MAAIC,SAAS,GAAG,KAAhB;AACA,QAAMC,SAAS,GAAG,IAAIC,GAAJ,EAAlB;;AACA,QAAMC,eAAe,GAAG,MACvB;AACA;AACA;AACAC,EAAAA,KAAK,CAACC,IAAN,CAAYJ,SAAZ,EAAwBK,OAAxB,CAAmCC,QAAF,IAAgBA,QAAQ,EAAzD,CAJD;;AAMA,SAAO;AACN,QAAIR,QAAJ,GAAe;AACd,aAAOA,QAAP;AACA,KAHK;;AAKNS,IAAAA,SAAS,CAAED,QAAF,EAAa;AACrBN,MAAAA,SAAS,CAACQ,GAAV,CAAeF,QAAf;AACA,aAAO,MAAMN,SAAS,CAACS,MAAV,CAAkBH,QAAlB,CAAb;AACA,KARK;;AAUNI,IAAAA,KAAK,GAAG;AACPZ,MAAAA,QAAQ,GAAG,IAAX;AACA,KAZK;;AAcNa,IAAAA,MAAM,GAAG;AACRb,MAAAA,QAAQ,GAAG,KAAX;;AACA,UAAKC,SAAL,EAAiB;AAChBA,QAAAA,SAAS,GAAG,KAAZ;AACAG,QAAAA,eAAe;AACf;AACD,KApBK;;AAsBNU,IAAAA,IAAI,GAAG;AACN,UAAKd,QAAL,EAAgB;AACfC,QAAAA,SAAS,GAAG,IAAZ;AACA;AACA;;AACDG,MAAAA,eAAe;AACf;;AA5BK,GAAP;AA8BA","sourcesContent":["/**\n * Create an event emitter.\n *\n * @return {import(\"../types\").DataEmitter} Emitter.\n */\nexport function createEmitter() {\n\tlet isPaused = false;\n\tlet isPending = false;\n\tconst listeners = new Set();\n\tconst notifyListeners = () =>\n\t\t// We use Array.from to clone the listeners Set\n\t\t// This ensures that we don't run a listener\n\t\t// that was added as a response to another listener.\n\t\tArray.from( listeners ).forEach( ( listener ) => listener() );\n\n\treturn {\n\t\tget isPaused() {\n\t\t\treturn isPaused;\n\t\t},\n\n\t\tsubscribe( listener ) {\n\t\t\tlisteners.add( listener );\n\t\t\treturn () => listeners.delete( listener );\n\t\t},\n\n\t\tpause() {\n\t\t\tisPaused = true;\n\t\t},\n\n\t\tresume() {\n\t\t\tisPaused = false;\n\t\t\tif ( isPending ) {\n\t\t\t\tisPending = false;\n\t\t\t\tnotifyListeners();\n\t\t\t}\n\t\t},\n\n\t\temit() {\n\t\t\tif ( isPaused ) {\n\t\t\t\tisPending = true;\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tnotifyListeners();\n\t\t},\n\t};\n}\n"]}

package/build-types/types.d.ts

@@ -1,35 +1,48 @@
-export declare type WPDataFunctionOrGeneratorArray = Array<Function | Generator>;
-export declare type WPDataFunctionArray = Array<Function>;
-export interface WPDataAttachedStore {
-    getSelectors: () => WPDataFunctionArray;
-    getActions: () => WPDataFunctionArray;
+declare type MapOf<T> = {
+    [name: string]: T;
+};
+export declare type ActionCreator = Function | Generator;
+export declare type Resolver = Function | Generator;
+export declare type Selector = Function;
+export declare type AnyConfig = ReduxStoreConfig<any, any, any>;
+export interface StoreInstance<Config extends AnyConfig> {
+    getSelectors: () => SelectorsOf<Config>;
+    getActions: () => ActionCreatorsOf<Config>;
     subscribe: (listener: () => void) => () => void;
 }
-export interface WPDataStore {
+export interface StoreDescriptor<Config extends AnyConfig> {
     /**
      * Store Name
      */
     name: string;
     /**
-     * Store configuration object.
+     * Creates a store instance
      */
-    instantiate: (registry: WPDataRegistry) => WPDataAttachedStore;
+    instantiate: (registry: DataRegistry) => StoreInstance<Config>;
 }
-export interface WPDataReduxStoreConfig {
+export interface ReduxStoreConfig<State, ActionCreators extends MapOf<ActionCreator>, Selectors extends MapOf<Selector>> {
+    initialState?: State;
     reducer: (state: any, action: any) => any;
-    actions?: WPDataFunctionOrGeneratorArray;
-    resolvers?: WPDataFunctionOrGeneratorArray;
-    selectors?: WPDataFunctionArray;
-    controls?: WPDataFunctionArray;
+    actions?: ActionCreators;
+    resolvers?: MapOf<Resolver>;
+    selectors?: Selectors;
+    controls?: MapOf<Function>;
 }
-export interface WPDataRegistry {
-    register: (store: WPDataStore) => void;
+export interface DataRegistry {
+    register: (store: StoreDescriptor<any>) => void;
 }
-export interface WPDataEmitter {
+export interface DataEmitter {
     emit: () => void;
     subscribe: (listener: () => void) => () => void;
     pause: () => void;
     resume: () => void;
     isPaused: boolean;
 }
+declare type ActionCreatorsOf<Config extends AnyConfig> = Config extends ReduxStoreConfig<any, infer ActionCreators, any> ? {
+    [name in keyof ActionCreators]: Function | Generator;
+} : never;
+declare type SelectorsOf<Config extends AnyConfig> = Config extends ReduxStoreConfig<any, any, infer Selectors> ? {
+    [name in keyof Selectors]: Function;
+} : never;
+export {};
 //# sourceMappingURL=types.d.ts.map

package/build-types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,8BAA8B,GAAG,KAAK,CAAE,QAAQ,GAAG,SAAS,CAAE,CAAC;AAC3E,oBAAY,mBAAmB,GAAG,KAAK,CAAE,QAAQ,CAAE,CAAC;AAEpD,MAAM,WAAW,mBAAmB;IACnC,YAAY,EAAE,MAAM,mBAAmB,CAAC;IACxC,UAAU,EAAE,MAAM,mBAAmB,CAAC;IACtC,SAAS,EAAE,CAAE,QAAQ,EAAE,MAAM,IAAI,KAAM,MAAM,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,WAAW;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,WAAW,EAAE,CAAE,QAAQ,EAAE,cAAc,KAAM,mBAAmB,CAAC;CACjE;AAED,MAAM,WAAW,sBAAsB;IACtC,OAAO,EAAE,CAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAM,GAAG,CAAC;IAC5C,OAAO,CAAC,EAAE,8BAA8B,CAAC;IACzC,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAC3C,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,EAAE,CAAE,KAAK,EAAE,WAAW,KAAM,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,SAAS,EAAE,CAAE,QAAQ,EAAE,MAAM,IAAI,KAAM,MAAM,IAAI,CAAC;IAClD,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,aAAK,KAAK,CAAE,CAAC,IAAK;IAAE,CAAE,IAAI,EAAE,MAAM,GAAI,CAAC,CAAA;CAAE,CAAC;AAE1C,oBAAY,aAAa,GAAG,QAAQ,GAAG,SAAS,CAAC;AACjD,oBAAY,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC5C,oBAAY,QAAQ,GAAG,QAAQ,CAAC;AAEhC,oBAAY,SAAS,GAAG,gBAAgB,CAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAE,CAAC;AAE1D,MAAM,WAAW,aAAa,CAAE,MAAM,SAAS,SAAS;IACvD,YAAY,EAAE,MAAM,WAAW,CAAE,MAAM,CAAE,CAAC;IAC1C,UAAU,EAAE,MAAM,gBAAgB,CAAE,MAAM,CAAE,CAAC;IAC7C,SAAS,EAAE,CAAE,QAAQ,EAAE,MAAM,IAAI,KAAM,MAAM,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,eAAe,CAAE,MAAM,SAAS,SAAS;IACzD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,WAAW,EAAE,CAAE,QAAQ,EAAE,YAAY,KAAM,aAAa,CAAE,MAAM,CAAE,CAAC;CACnE;AAED,MAAM,WAAW,gBAAgB,CAChC,KAAK,EACL,cAAc,SAAS,KAAK,CAAE,aAAa,CAAE,EAC7C,SAAS,SAAS,KAAK,CAAE,QAAQ,CAAE;IAEnC,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,OAAO,EAAE,CAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAM,GAAG,CAAC;IAC5C,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,KAAK,CAAE,QAAQ,CAAE,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAE,QAAQ,CAAE,CAAC;CAC7B;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,EAAE,CAAE,KAAK,EAAE,eAAe,CAAE,GAAG,CAAE,KAAM,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,SAAS,EAAE,CAAE,QAAQ,EAAE,MAAM,IAAI,KAAM,MAAM,IAAI,CAAC;IAClD,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CAClB;AAMD,aAAK,gBAAgB,CACpB,MAAM,SAAS,SAAS,IACrB,MAAM,SAAS,gBAAgB,CAAE,GAAG,EAAE,MAAM,cAAc,EAAE,GAAG,CAAE,GAClE;KAAI,IAAI,IAAI,MAAM,cAAc,GAAI,QAAQ,GAAG,SAAS;CAAE,GAC1D,KAAK,CAAC;AAET,aAAK,WAAW,CAAE,MAAM,SAAS,SAAS,IAAK,MAAM,SAAS,gBAAgB,CAC7E,GAAG,EACH,GAAG,EACH,MAAM,SAAS,CACf,GACE;KAAI,IAAI,IAAI,MAAM,SAAS,GAAI,QAAQ;CAAE,GACzC,KAAK,CAAC"}

package/build-types/utils/emitter.d.ts

@@ -1,7 +1,7 @@
 /**
  * Create an event emitter.
  *
- * @return {import("../types").WPDataEmitter} Emitter.
+ * @return {import("../types").DataEmitter} Emitter.
  */
-export function createEmitter(): import("../types").WPDataEmitter;
+export function createEmitter(): import("../types").DataEmitter;
 //# sourceMappingURL=emitter.d.ts.map

package/build-types/utils/emitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/utils/emitter.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,iCAFY,OAAO,UAAU,EAAE,aAAa,CA0C3C"}
+{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/utils/emitter.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,iCAFY,OAAO,UAAU,EAAE,WAAW,CA0CzC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "6.1.4",
+	"version": "6.2.1",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -28,24 +28,24 @@
 	"sideEffects": false,
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/compose": "^5.0.6",
-		"@wordpress/deprecated": "^3.2.3",
-		"@wordpress/element": "^4.0.4",
-		"@wordpress/is-shallow-equal": "^4.2.1",
-		"@wordpress/priority-queue": "^2.2.3",
-		"@wordpress/redux-routine": "^4.2.2",
+		"@wordpress/compose": "^5.1.1",
+		"@wordpress/deprecated": "^3.3.1",
+		"@wordpress/element": "^4.1.1",
+		"@wordpress/is-shallow-equal": "^4.3.1",
+		"@wordpress/priority-queue": "^2.3.1",
+		"@wordpress/redux-routine": "^4.3.1",
 		"equivalent-key-map": "^0.2.2",
 		"is-promise": "^4.0.0",
 		"lodash": "^4.17.21",
-		"memize": "^1.1.0",
+		"redux": "^4.1.2",
 		"turbo-combine-reducers": "^1.0.2",
 		"use-memo-one": "^1.1.1"
 	},
 	"peerDependencies": {
-		"redux": "^4.1.0"
+		"react": "^17.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9a1dd3474d937468e4cf9caf9886ad61ef0a8f50"
+	"gitHead": "2e4922861e49f5a090f9dc52056165092cfba163"
 }

package/src/components/use-dispatch/test/use-dispatch.js

@@ -82,7 +82,7 @@ describe( 'useDispatch', () => {
 		expect( testAction ).toHaveBeenCalledTimes( 1 );
 	} );
 
-	it( 'returns expected action creators from store for given store definition', () => {
+	it( 'returns expected action creators from store for given store descriptor', () => {
 		const noop = () => ( { type: '__INERT__' } );
 		const testAction = jest.fn().mockImplementation( noop );
 		registry.registerStore( 'demoStore', {

package/src/components/use-dispatch/use-dispatch.js

@@ -3,7 +3,7 @@
  */
 import useRegistry from '../registry-provider/use-registry';
 
-/** @typedef {import('./types').WPDataStore} WPDataStore */
+/** @typedef {import('../../types').StoreDescriptor} StoreDescriptor */
 
 /**
  * A custom react hook returning the current registry dispatch actions creators.
@@ -11,11 +11,11 @@ import useRegistry from '../registry-provider/use-registry';
  * Note: The component using this hook must be within the context of a
  * RegistryProvider.
  *
- * @param {string|WPDataStore} [storeNameOrDefinition] Optionally provide the name of the
- *                                                     store or its definition from which to
- *                                                     retrieve action creators. If not
- *                                                     provided, the registry.dispatch
- *                                                     function is returned instead.
+ * @param {string|StoreDescriptor} [storeNameOrDescriptor] Optionally provide the name of the
+ *                                                         store or its descriptor from which to
+ *                                                         retrieve action creators. If not
+ *                                                         provided, the registry.dispatch
+ *                                                         function is returned instead.
  *
  * @example
  * This illustrates a pattern where you may need to retrieve dynamic data from
@@ -49,11 +49,11 @@ import useRegistry from '../registry-provider/use-registry';
  * ```
  * @return {Function}  A custom react hook.
  */
-const useDispatch = ( storeNameOrDefinition ) => {
+const useDispatch = ( storeNameOrDescriptor ) => {
 	const { dispatch } = useRegistry();
-	return storeNameOrDefinition === void 0
+	return storeNameOrDescriptor === void 0
 		? dispatch
-		: dispatch( storeNameOrDefinition );
+		: dispatch( storeNameOrDescriptor );
 };
 
 export default useDispatch;

package/src/components/use-select/index.js

@@ -7,7 +7,7 @@ import { useMemoOne } from 'use-memo-one';
  * WordPress dependencies
  */
 import { createQueue } from '@wordpress/priority-queue';
-import { useRef, useCallback, useReducer, useMemo } from '@wordpress/element';
+import { useRef, useCallback, useMemo, useReducer } from '@wordpress/element';
 import isShallowEqual from '@wordpress/is-shallow-equal';
 import { useIsomorphicLayoutEffect } from '@wordpress/compose';
 
@@ -17,9 +17,10 @@ import { useIsomorphicLayoutEffect } from '@wordpress/compose';
 import useRegistry from '../registry-provider/use-registry';
 import useAsyncMode from '../async-mode-provider/use-async-mode';
 
+const noop = () => {};
 const renderQueue = createQueue();
 
-/** @typedef {import('./types').WPDataStore} WPDataStore */
+/** @typedef {import('../../types').StoreDescriptor} StoreDescriptor */
 
 /**
  * Custom react hook for retrieving props from registered selectors.
@@ -27,20 +28,20 @@ const renderQueue = createQueue();
  * In general, this custom React hook follows the
  * [rules of hooks](https://reactjs.org/docs/hooks-rules.html).
  *
- * @param {Function|WPDataStore|string} _mapSelect Function called on every state change. The
- *                                                 returned value is exposed to the component
- *                                                 implementing this hook. The function receives
- *                                                 the `registry.select` method on the first
- *                                                 argument and the `registry` on the second
- *                                                 argument.
- *                                                 When a store key is passed, all selectors for
- *                                                 the store will be returned. This is only meant
- *                                                 for usage of these selectors in event
- *                                                 callbacks, not for data needed to create the
- *                                                 element tree.
- * @param {Array}                       deps       If provided, this memoizes the mapSelect so the
- *                                                 same `mapSelect` is invoked on every state
- *                                                 change unless the dependencies change.
+ * @param {Function|StoreDescriptor|string} mapSelect Function called on every state change. The
+ *                                                    returned value is exposed to the component
+ *                                                    implementing this hook. The function receives
+ *                                                    the `registry.select` method on the first
+ *                                                    argument and the `registry` on the second
+ *                                                    argument.
+ *                                                    When a store key is passed, all selectors for
+ *                                                    the store will be returned. This is only meant
+ *                                                    for usage of these selectors in event
+ *                                                    callbacks, not for data needed to create the
+ *                                                    element tree.
+ * @param {Array}                           deps      If provided, this memoizes the mapSelect so the
+ *                                                    same `mapSelect` is invoked on every state
+ *                                                    change unless the dependencies change.
  *
  * @example
  * ```js
@@ -88,14 +89,27 @@ const renderQueue = createQueue();
  *
  * @return {Function}  A custom react hook.
  */
-export default function useSelect( _mapSelect, deps ) {
-	const isWithoutMapping = typeof _mapSelect !== 'function';
+export default function useSelect( mapSelect, deps ) {
+	const hasMappingFunction = 'function' === typeof mapSelect;
 
-	if ( isWithoutMapping ) {
+	// If we're recalling a store by its name or by
+	// its descriptor then we won't be caching the
+	// calls to `mapSelect` because we won't be calling it.
+	if ( ! hasMappingFunction ) {
 		deps = [];
 	}
 
-	const mapSelect = useCallback( _mapSelect, deps );
+	// Because of the "rule of hooks" we have to call `useCallback`
+	// on every invocation whether or not we have a real function
+	// for `mapSelect`. we'll create this intermediate variable to
+	// fulfill that need and then reference it with our "real"
+	// `_mapSelect` if we can.
+	const callbackMapper = useCallback(
+		hasMappingFunction ? mapSelect : noop,
+		deps
+	);
+	const _mapSelect = hasMappingFunction ? callbackMapper : null;
+
 	const registry = useRegistry();
 	const isAsync = useAsyncMode();
 	// React can sometimes clear the `useMemo` cache.
@@ -110,7 +124,7 @@ export default function useSelect( _mapSelect, deps ) {
 	const latestMapOutputError = useRef();
 	const isMountedAndNotUnsubscribing = useRef();
 
-	// Keep track of the stores being selected in the mapSelect function,
+	// Keep track of the stores being selected in the _mapSelect function,
 	// and only subscribe to those stores later.
 	const listeningStores = useRef( [] );
 	const trapSelect = useCallback(
@@ -129,39 +143,37 @@ export default function useSelect( _mapSelect, deps ) {
 
 	let mapOutput;
 
-	if ( ! isWithoutMapping ) {
-		try {
-			if (
-				latestMapSelect.current !== mapSelect ||
-				latestMapOutputError.current
-			) {
+	if ( _mapSelect ) {
+		mapOutput = latestMapOutput.current;
+		const hasReplacedMapSelect = latestMapSelect.current !== _mapSelect;
+		const lastMapSelectFailed = !! latestMapOutputError.current;
+
+		if ( hasReplacedMapSelect || lastMapSelectFailed ) {
+			try {
 				mapOutput = trapSelect( () =>
-					mapSelect( registry.select, registry )
+					_mapSelect( registry.select, registry )
 				);
-			} else {
-				mapOutput = latestMapOutput.current;
-			}
-		} catch ( error ) {
-			let errorMessage = `An error occurred while running 'mapSelect': ${ error.message }`;
+			} catch ( error ) {
+				let errorMessage = `An error occurred while running 'mapSelect': ${ error.message }`;
 
-			if ( latestMapOutputError.current ) {
-				errorMessage += `\nThe error may be correlated with this previous error:\n`;
-				errorMessage += `${ latestMapOutputError.current.stack }\n\n`;
-				errorMessage += 'Original stack trace:';
-			}
+				if ( latestMapOutputError.current ) {
+					errorMessage += `\nThe error may be correlated with this previous error:\n`;
+					errorMessage += `${ latestMapOutputError.current.stack }\n\n`;
+					errorMessage += 'Original stack trace:';
+				}
 
-			// eslint-disable-next-line no-console
-			console.error( errorMessage );
-			mapOutput = latestMapOutput.current;
+				// eslint-disable-next-line no-console
+				console.error( errorMessage );
+			}
 		}
 	}
 
 	useIsomorphicLayoutEffect( () => {
-		if ( isWithoutMapping ) {
+		if ( ! hasMappingFunction ) {
 			return;
 		}
 
-		latestMapSelect.current = mapSelect;
+		latestMapSelect.current = _mapSelect;
 		latestMapOutput.current = mapOutput;
 		latestMapOutputError.current = undefined;
 		isMountedAndNotUnsubscribing.current = true;
@@ -177,7 +189,7 @@ export default function useSelect( _mapSelect, deps ) {
 	} );
 
 	useIsomorphicLayoutEffect( () => {
-		if ( isWithoutMapping ) {
+		if ( ! hasMappingFunction ) {
 			return;
 		}
 
@@ -227,7 +239,10 @@ export default function useSelect( _mapSelect, deps ) {
 			unsubscribers.forEach( ( unsubscribe ) => unsubscribe?.() );
 			renderQueue.flush( queueContext );
 		};
-	}, [ registry, trapSelect, depsChangedFlag, isWithoutMapping ] );
+		// If you're tempted to eliminate the spread dependencies below don't do it!
+		// We're passing these in from the calling function and want to make sure we're
+		// examining every individual value inside the `deps` array.
+	}, [ registry, trapSelect, hasMappingFunction, depsChangedFlag ] );
 
-	return isWithoutMapping ? registry.select( _mapSelect ) : mapOutput;
+	return hasMappingFunction ? mapOutput : registry.select( mapSelect );
 }

package/src/components/use-select/test/index.js

@@ -723,42 +723,42 @@ describe( 'useSelect', () => {
 		it( 'handles custom generic stores without a unsubscribe function', () => {
 			let renderer;
 
-			function createCustomStore() {
-				let storeChanged = () => {};
-				let counter = 0;
-
-				const selectors = {
-					getCounter: () => counter,
-				};
-
-				const actions = {
-					increment: () => {
-						counter += 1;
-						storeChanged();
-					},
-				};
+			const customStore = {
+				name: 'generic-store',
+				instantiate() {
+					let storeChanged = () => {};
+					let counter = 0;
+
+					const selectors = {
+						getCounter: () => counter,
+					};
+
+					const actions = {
+						increment: () => {
+							counter += 1;
+							storeChanged();
+						},
+					};
 
-				return {
-					getSelectors() {
-						return selectors;
-					},
-					getActions() {
-						return actions;
-					},
-					subscribe( listener ) {
-						storeChanged = listener;
-					},
-				};
-			}
+					return {
+						getSelectors() {
+							return selectors;
+						},
+						getActions() {
+							return actions;
+						},
+						subscribe( listener ) {
+							storeChanged = listener;
+						},
+					};
+				},
+			};
 
-			registry.registerGenericStore(
-				'generic-store',
-				createCustomStore()
-			);
+			registry.register( customStore );
 
 			const TestComponent = jest.fn( () => {
 				const state = useSelect(
-					( select ) => select( 'generic-store' ).getCounter(),
+					( select ) => select( customStore ).getCounter(),
 					[]
 				);
 
@@ -778,7 +778,7 @@ describe( 'useSelect', () => {
 			expect( testInstance.findByType( 'div' ).props.data ).toBe( 0 );
 
 			act( () => {
-				registry.dispatch( 'generic-store' ).increment();
+				registry.dispatch( customStore ).increment();
 			} );
 
 			expect( testInstance.findByType( 'div' ).props.data ).toBe( 1 );

package/src/controls.js

@@ -8,7 +8,7 @@ import { isObject } from 'lodash';
  */
 import { createRegistryControl } from './factory';
 
-/** @typedef {import('./types').WPDataStore} WPDataStore */
+/** @typedef {import('./types').StoreDescriptor} StoreDescriptor */
 
 const SELECT = '@@data/SELECT';
 const RESOLVE_SELECT = '@@data/RESOLVE_SELECT';
@@ -20,9 +20,9 @@ const DISPATCH = '@@data/DISPATCH';
  * Note: This control synchronously returns the current selector value, triggering the
  * resolution, but not waiting for it.
  *
- * @param {string|WPDataStore} storeNameOrDefinition Unique namespace identifier for the store
- * @param {string}             selectorName          The name of the selector.
- * @param {Array}              args                  Arguments for the selector.
+ * @param {string|StoreDescriptor} storeNameOrDescriptor Unique namespace identifier for the store
+ * @param {string}                 selectorName          The name of the selector.
+ * @param {Array}                  args                  Arguments for the selector.
  *
  * @example
  * ```js
@@ -37,12 +37,12 @@ const DISPATCH = '@@data/DISPATCH';
  *
  * @return {Object} The control descriptor.
  */
-function select( storeNameOrDefinition, selectorName, ...args ) {
+function select( storeNameOrDescriptor, selectorName, ...args ) {
 	return {
 		type: SELECT,
-		storeKey: isObject( storeNameOrDefinition )
-			? storeNameOrDefinition.name
-			: storeNameOrDefinition,
+		storeKey: isObject( storeNameOrDescriptor )
+			? storeNameOrDescriptor.name
+			: storeNameOrDescriptor,
 		selectorName,
 		args,
 	};
@@ -55,9 +55,9 @@ function select( storeNameOrDefinition, selectorName, ...args ) {
  * selectors that may have a resolver. In such case, it will return a `Promise` that resolves
  * after the selector finishes resolving, with the final result value.
  *
- * @param {string|WPDataStore} storeNameOrDefinition Unique namespace identifier for the store
- * @param {string}             selectorName          The name of the selector
- * @param {Array}              args                  Arguments for the selector.
+ * @param {string|StoreDescriptor} storeNameOrDescriptor Unique namespace identifier for the store
+ * @param {string}                 selectorName          The name of the selector
+ * @param {Array}                  args                  Arguments for the selector.
  *
  * @example
  * ```js
@@ -72,12 +72,12 @@ function select( storeNameOrDefinition, selectorName, ...args ) {
  *
  * @return {Object} The control descriptor.
  */
-function resolveSelect( storeNameOrDefinition, selectorName, ...args ) {
+function resolveSelect( storeNameOrDescriptor, selectorName, ...args ) {
 	return {
 		type: RESOLVE_SELECT,
-		storeKey: isObject( storeNameOrDefinition )
-			? storeNameOrDefinition.name
-			: storeNameOrDefinition,
+		storeKey: isObject( storeNameOrDescriptor )
+			? storeNameOrDescriptor.name
+			: storeNameOrDescriptor,
 		selectorName,
 		args,
 	};
@@ -86,9 +86,9 @@ function resolveSelect( storeNameOrDefinition, selectorName, ...args ) {
 /**
  * Dispatches a control action for triggering a registry dispatch.
  *
- * @param {string|WPDataStore} storeNameOrDefinition Unique namespace identifier for the store
- * @param {string}             actionName            The name of the action to dispatch
- * @param {Array}              args                  Arguments for the dispatch action.
+ * @param {string|StoreDescriptor} storeNameOrDescriptor Unique namespace identifier for the store
+ * @param {string}                 actionName            The name of the action to dispatch
+ * @param {Array}                  args                  Arguments for the dispatch action.
  *
  * @example
  * ```js
@@ -103,12 +103,12 @@ function resolveSelect( storeNameOrDefinition, selectorName, ...args ) {
  *
  * @return {Object}  The control descriptor.
  */
-function dispatch( storeNameOrDefinition, actionName, ...args ) {
+function dispatch( storeNameOrDescriptor, actionName, ...args ) {
 	return {
 		type: DISPATCH,
-		storeKey: isObject( storeNameOrDefinition )
-			? storeNameOrDefinition.name
-			: storeNameOrDefinition,
+		storeKey: isObject( storeNameOrDescriptor )
+			? storeNameOrDescriptor.name
+			: storeNameOrDescriptor,
 		actionName,
 		args,
 	};

package/src/index.js

@@ -9,7 +9,7 @@ import combineReducers from 'turbo-combine-reducers';
 import defaultRegistry from './default-registry';
 import * as plugins from './plugins';
 
-/** @typedef {import('./types').WPDataStore} WPDataStore */
+/** @typedef {import('./types').StoreDescriptor} StoreDescriptor */
 
 export { default as withSelect } from './components/with-select';
 export { default as withDispatch } from './components/with-dispatch';
@@ -77,12 +77,12 @@ export { plugins };
 export { combineReducers };
 
 /**
- * Given the name or definition of a registered store, returns an object of the store's selectors.
+ * Given the name or descriptor of a registered store, returns an object of the store's selectors.
  * The selector functions are been pre-bound to pass the current state automatically.
  * As a consumer, you need only pass arguments of the selector, if applicable.
  *
- * @param {string|WPDataStore} storeNameOrDefinition Unique namespace identifier for the store
- *                                                   or the store definition.
+ * @param {string|StoreDescriptor} storeNameOrDescriptor Unique namespace identifier for the store
+ *                                                       or the store descriptor.
  *
  * @example
  * ```js
@@ -101,8 +101,8 @@ export const select = defaultRegistry.select;
  * and modified so that they return promises that resolve to their eventual values,
  * after any resolvers have ran.
  *
- * @param {string|WPDataStore} storeNameOrDefinition Unique namespace identifier for the store
- *                                                   or the store definition.
+ * @param {string|StoreDescriptor} storeNameOrDescriptor Unique namespace identifier for the store
+ *                                                       or the store descriptor.
  *
  * @example
  * ```js
@@ -122,8 +122,8 @@ export const resolveSelect = defaultRegistry.resolveSelect;
  * Note: Action creators returned by the dispatch will return a promise when
  * they are called.
  *
- * @param {string|WPDataStore} storeNameOrDefinition Unique namespace identifier for the store
- *                                                   or the store definition.
+ * @param {string|StoreDescriptor} storeNameOrDescriptor Unique namespace identifier for the store
+ *                                                       or the store descriptor.
  *
  * @example
  * ```js
@@ -158,12 +158,12 @@ export const dispatch = defaultRegistry.dispatch;
 export const subscribe = defaultRegistry.subscribe;
 
 /**
- * Registers a generic store.
+ * Registers a generic store instance.
  *
- * @deprecated Use `register` instead.
+ * @deprecated Use `register( storeDescriptor )` instead.
  *
- * @param {string} key    Store registry key.
- * @param {Object} config Configuration (getSelectors, getActions, subscribe).
+ * @param {string} name  Store registry name.
+ * @param {Object} store Store instance (`{ getSelectors, getActions, subscribe }`).
  */
 export const registerGenericStore = defaultRegistry.registerGenericStore;
 
@@ -189,7 +189,7 @@ export const registerStore = defaultRegistry.registerStore;
 export const use = defaultRegistry.use;
 
 /**
- * Registers a standard `@wordpress/data` store definition.
+ * Registers a standard `@wordpress/data` store descriptor.
  *
  * @example
  * ```js
@@ -204,6 +204,6 @@ export const use = defaultRegistry.use;
  * register( store );
  * ```
  *
- * @param {WPDataStore} store Store definition.
+ * @param {StoreDescriptor} store Store descriptor.
  */
 export const register = defaultRegistry.register;