@wordpress/data 6.4.0 → 6.6.0

package/src/redux-store/index.js

@@ -321,16 +321,26 @@ function mapActions( actions, store ) {
  * @return {Object} Selectors mapped to their resolution functions.
  */
 function mapResolveSelectors( selectors, store ) {
-	return mapValues(
-		omit( selectors, [
-			'getIsResolving',
-			'hasStartedResolution',
-			'hasFinishedResolution',
-			'isResolving',
-			'getCachedResolvers',
-		] ),
-		( selector, selectorName ) => ( ...args ) =>
-			new Promise( ( resolve, reject ) => {
+	const storeSelectors = omit( selectors, [
+		'getIsResolving',
+		'hasStartedResolution',
+		'hasFinishedResolution',
+		'hasResolutionFailed',
+		'isResolving',
+		'getCachedResolvers',
+		'getResolutionState',
+		'getResolutionError',
+	] );
+
+	return mapValues( storeSelectors, ( selector, selectorName ) => {
+		// If the selector doesn't have a resolver, just convert the return value
+		// (including exceptions) to a Promise, no additional extra behavior is needed.
+		if ( ! selector.hasResolver ) {
+			return async ( ...args ) => selector.apply( null, args );
+		}
+
+		return ( ...args ) => {
+			return new Promise( ( resolve, reject ) => {
 				const hasFinished = () =>
 					selectors.hasFinishedResolution( selectorName, args );
 				const finalize = ( result ) => {
@@ -361,8 +371,9 @@ function mapResolveSelectors( selectors, store ) {
 						finalize( getResult() );
 					}
 				} );
-			} )
-	);
+			} );
+		};
+	} );
 }
 
 /**

package/src/redux-store/test/index.js

@@ -4,7 +4,7 @@
 import { createRegistry } from '../../registry';
 import { createRegistryControl } from '../../factory';
 
-jest.useFakeTimers();
+jest.useRealTimers();
 
 describe( 'controls', () => {
 	let registry;
@@ -90,7 +90,6 @@ describe( 'controls', () => {
 			} );
 
 			registry.select( 'store' ).getItems();
-			jest.runAllTimers();
 		} );
 	} );
 	describe( 'selectors have expected value for the `hasResolver` property', () => {
@@ -250,6 +249,7 @@ describe( 'resolveSelect', () => {
 			},
 			selectors: {
 				getItems: () => 'items',
+				getItemsNoResolver: () => 'items-no-resolver',
 			},
 			resolvers: {
 				getItems: () => {
@@ -264,16 +264,26 @@ describe( 'resolveSelect', () => {
 	it( 'resolves when the resolution succeeded', async () => {
 		shouldFail = false;
 		const promise = registry.resolveSelect( 'store' ).getItems();
-		jest.runAllTimers();
-		await expect( promise ).resolves.toEqual( 'items' );
+		await expect( promise ).resolves.toBe( 'items' );
 	} );
 
 	it( 'rejects when the resolution failed', async () => {
 		shouldFail = true;
 		const promise = registry.resolveSelect( 'store' ).getItems();
-		jest.runAllTimers();
 		await expect( promise ).rejects.toEqual(
 			new Error( 'cannot fetch items' )
 		);
 	} );
+
+	it( 'resolves when calling a sync selector without resolver', async () => {
+		const promise = registry.resolveSelect( 'store' ).getItemsNoResolver();
+		await expect( promise ).resolves.toBe( 'items-no-resolver' );
+	} );
+
+	it( 'returns only store native selectors and excludes all meta ones', () => {
+		expect( Object.keys( registry.resolveSelect( 'store' ) ) ).toEqual( [
+			'getItems',
+			'getItemsNoResolver',
+		] );
+	} );
 } );

package/src/registry.js

@@ -55,7 +55,7 @@ import { createEmitter } from './utils/emitter';
 export function createRegistry( storeConfigs = {}, parent = null ) {
 	const stores = {};
 	const emitter = createEmitter();
-	const __experimentalListeningStores = new Set();
+	const listeningStores = new Set();
 
 	/**
 	 * Global listener called for each store's update.
@@ -87,7 +87,7 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 		const storeName = isObject( storeNameOrDescriptor )
 			? storeNameOrDescriptor.name
 			: storeNameOrDescriptor;
-		__experimentalListeningStores.add( storeName );
+		listeningStores.add( storeName );
 		const store = stores[ storeName ];
 		if ( store ) {
 			return store.getSelectors();
@@ -96,10 +96,10 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 		return parent && parent.select( storeName );
 	}
 
-	function __experimentalMarkListeningStores( callback, ref ) {
-		__experimentalListeningStores.clear();
+	function __unstableMarkListeningStores( callback, ref ) {
+		listeningStores.clear();
 		const result = callback.call( this );
-		ref.current = Array.from( __experimentalListeningStores );
+		ref.current = Array.from( listeningStores );
 		return result;
 	}
 
@@ -118,7 +118,7 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 		const storeName = isObject( storeNameOrDescriptor )
 			? storeNameOrDescriptor.name
 			: storeNameOrDescriptor;
-		__experimentalListeningStores.add( storeName );
+		listeningStores.add( storeName );
 		const store = stores[ storeName ];
 		if ( store ) {
 			return store.getResolveSelectors();
@@ -245,7 +245,7 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 	 * @param {Function} handler   The function subscribed to the store.
 	 * @return {Function} A function to unsubscribe the handler.
 	 */
-	function __experimentalSubscribeStore( storeName, handler ) {
+	function __unstableSubscribeStore( storeName, handler ) {
 		if ( storeName in stores ) {
 			return stores[ storeName ].subscribe( handler );
 		}
@@ -258,7 +258,7 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 			return subscribe( handler );
 		}
 
-		return parent.__experimentalSubscribeStore( storeName, handler );
+		return parent.__unstableSubscribeStore( storeName, handler );
 	}
 
 	function batch( callback ) {
@@ -281,8 +281,8 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 		register,
 		registerGenericStore,
 		registerStore,
-		__experimentalMarkListeningStores,
-		__experimentalSubscribeStore,
+		__unstableMarkListeningStores,
+		__unstableSubscribeStore,
 	};
 
 	//

package/src/test/registry.js

@@ -718,7 +718,7 @@ describe( 'createRegistry', () => {
 			const listener2 = jest.fn();
 			// useSelect subscribes to the stores differently,
 			// This test ensures batching works in this case as well.
-			const unsubscribe = registry.__experimentalSubscribeStore(
+			const unsubscribe = registry.__unstableSubscribeStore(
 				'myAwesomeReducer',
 				listener2
 			);