@wordpress/core-data 4.0.2 → 4.0.6

package/src/test/selectors.js

@@ -418,7 +418,7 @@ describe( 'getEntityRecords', () => {
 } );
 
 describe( '__experimentalGetDirtyEntityRecords', () => {
-	it( 'should return a map of objects with each raw edited entity record and its corresponding edits', () => {
+	it( 'returns a map of objects with each raw edited entity record and its corresponding edits', () => {
 		const state = deepFreeze( {
 			entities: {
 				config: [
@@ -466,6 +466,61 @@ describe( '__experimentalGetDirtyEntityRecords', () => {
 			{ kind: 'someKind', name: 'someName', key: 'someKey', title: '' },
 		] );
 	} );
+
+	it( 'excludes entity records that no longer exist', () => {
+		const state = deepFreeze( {
+			entities: {
+				config: [
+					{
+						kind: 'someKind',
+						name: 'someName',
+						transientEdits: { someTransientEditProperty: true },
+					},
+				],
+				data: {
+					someKind: {
+						someName: {
+							queriedData: {
+								items: {
+									default: {
+										someKey: {
+											someProperty: 'somePersistedValue',
+											someRawProperty: {
+												raw: 'somePersistedRawValue',
+											},
+											id: 'someKey',
+										},
+									},
+								},
+								itemIsComplete: {
+									default: {
+										someKey: true,
+									},
+								},
+							},
+							edits: {
+								someKey: {
+									someProperty: 'someEditedValue',
+									someRawProperty: 'someEditedRawValue',
+									someTransientEditProperty:
+										'someEditedTransientEditValue',
+								},
+								deletedKey: {
+									someProperty: 'someEditedValue',
+									someRawProperty: 'someEditedRawValue',
+									someTransientEditProperty:
+										'someEditedTransientEditValue',
+								},
+							},
+						},
+					},
+				},
+			},
+		} );
+		expect( __experimentalGetDirtyEntityRecords( state ) ).toEqual( [
+			{ kind: 'someKind', name: 'someName', key: 'someKey', title: '' },
+		] );
+	} );
 } );
 
 describe( '__experimentalGetEntitiesBeingSaved', () => {

package/src/utils/forward-resolver.js

@@ -0,0 +1,14 @@
+/**
+ * Higher-order function which forward the resolution to another resolver with the same arguments.
+ *
+ * @param {string} resolverName forwarded resolver.
+ *
+ * @return {Function} Enhanced resolver.
+ */
+const forwardResolver = ( resolverName ) => ( ...args ) => async ( {
+	resolveSelect,
+} ) => {
+	await resolveSelect[ resolverName ]( ...args );
+};
+
+export default forwardResolver;

package/src/utils/index.js

@@ -1,7 +1,7 @@
 export { default as conservativeMapItem } from './conservative-map-item';
 export { default as getNormalizedCommaSeparable } from './get-normalized-comma-separable';
 export { default as ifMatchingAction } from './if-matching-action';
-export { default as ifNotResolved } from './if-not-resolved';
+export { default as forwardResolver } from './forward-resolver';
 export { default as onSubKey } from './on-sub-key';
 export { default as replaceAction } from './replace-action';
 export { default as withWeakMapCache } from './with-weak-map-cache';

package/build/controls.js

@@ -1,44 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.regularFetch = regularFetch;
-exports.getDispatch = getDispatch;
-exports.default = void 0;
-
-var _data = require("@wordpress/data");
-
-/**
- * WordPress dependencies
- */
-function regularFetch(url) {
-  return {
-    type: 'REGULAR_FETCH',
-    url
-  };
-}
-
-function getDispatch() {
-  return {
-    type: 'GET_DISPATCH'
-  };
-}
-
-const controls = {
-  async REGULAR_FETCH({
-    url
-  }) {
-    const {
-      data
-    } = await window.fetch(url).then(res => res.json());
-    return data;
-  },
-
-  GET_DISPATCH: (0, _data.createRegistryControl)(({
-    dispatch
-  }) => () => dispatch)
-};
-var _default = controls;
-exports.default = _default;
-//# sourceMappingURL=controls.js.map

package/build/controls.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["@wordpress/core-data/src/controls.js"],"names":["regularFetch","url","type","getDispatch","controls","REGULAR_FETCH","data","window","fetch","then","res","json","GET_DISPATCH","dispatch"],"mappings":";;;;;;;;;AAGA;;AAHA;AACA;AACA;AAGO,SAASA,YAAT,CAAuBC,GAAvB,EAA6B;AACnC,SAAO;AACNC,IAAAA,IAAI,EAAE,eADA;AAEND,IAAAA;AAFM,GAAP;AAIA;;AAEM,SAASE,WAAT,GAAuB;AAC7B,SAAO;AACND,IAAAA,IAAI,EAAE;AADA,GAAP;AAGA;;AAED,MAAME,QAAQ,GAAG;AAChB,QAAMC,aAAN,CAAqB;AAAEJ,IAAAA;AAAF,GAArB,EAA+B;AAC9B,UAAM;AAAEK,MAAAA;AAAF,QAAW,MAAMC,MAAM,CAC3BC,KADqB,CACdP,GADc,EAErBQ,IAFqB,CAEbC,GAAF,IAAWA,GAAG,CAACC,IAAJ,EAFI,CAAvB;AAIA,WAAOL,IAAP;AACA,GAPe;;AAShBM,EAAAA,YAAY,EAAE,iCAAuB,CAAE;AAAEC,IAAAA;AAAF,GAAF,KAAoB,MAAMA,QAAjD;AATE,CAAjB;eAYeT,Q","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { createRegistryControl } from '@wordpress/data';\n\nexport function regularFetch( url ) {\n\treturn {\n\t\ttype: 'REGULAR_FETCH',\n\t\turl,\n\t};\n}\n\nexport function getDispatch() {\n\treturn {\n\t\ttype: 'GET_DISPATCH',\n\t};\n}\n\nconst controls = {\n\tasync REGULAR_FETCH( { url } ) {\n\t\tconst { data } = await window\n\t\t\t.fetch( url )\n\t\t\t.then( ( res ) => res.json() );\n\n\t\treturn data;\n\t},\n\n\tGET_DISPATCH: createRegistryControl( ( { dispatch } ) => () => dispatch ),\n};\n\nexport default controls;\n"]}

package/build/utils/if-not-resolved.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-/**
- * Higher-order function which invokes the given resolver only if it has not
- * already been resolved with the arguments passed to the enhanced function.
- *
- * This only considers resolution state, and notably does not support resolver
- * custom `isFulfilled` behavior.
- *
- * @param {Function} resolver     Original resolver.
- * @param {string}   selectorName Selector name associated with resolver.
- *
- * @return {Function} Enhanced resolver.
- */
-const ifNotResolved = (resolver, selectorName) => (...args) => async ({
-  select,
-  dispatch
-}) => {
-  if (!select.hasStartedResolution(selectorName, args)) {
-    await dispatch(resolver(...args));
-  }
-};
-
-var _default = ifNotResolved;
-exports.default = _default;
-//# sourceMappingURL=if-not-resolved.js.map

package/build/utils/if-not-resolved.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["@wordpress/core-data/src/utils/if-not-resolved.js"],"names":["ifNotResolved","resolver","selectorName","args","select","dispatch","hasStartedResolution"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,aAAa,GAAG,CAAEC,QAAF,EAAYC,YAAZ,KAA8B,CAAE,GAAGC,IAAL,KAAe,OAAQ;AAC1EC,EAAAA,MAD0E;AAE1EC,EAAAA;AAF0E,CAAR,KAG5D;AACN,MAAK,CAAED,MAAM,CAACE,oBAAP,CAA6BJ,YAA7B,EAA2CC,IAA3C,CAAP,EAA2D;AAC1D,UAAME,QAAQ,CAAEJ,QAAQ,CAAE,GAAGE,IAAL,CAAV,CAAd;AACA;AACD,CAPD;;eASeH,a","sourcesContent":["/**\n * Higher-order function which invokes the given resolver only if it has not\n * already been resolved with the arguments passed to the enhanced function.\n *\n * This only considers resolution state, and notably does not support resolver\n * custom `isFulfilled` behavior.\n *\n * @param {Function} resolver     Original resolver.\n * @param {string}   selectorName Selector name associated with resolver.\n *\n * @return {Function} Enhanced resolver.\n */\nconst ifNotResolved = ( resolver, selectorName ) => ( ...args ) => async ( {\n\tselect,\n\tdispatch,\n} ) => {\n\tif ( ! select.hasStartedResolution( selectorName, args ) ) {\n\t\tawait dispatch( resolver( ...args ) );\n\t}\n};\n\nexport default ifNotResolved;\n"]}

package/build-module/controls.js

@@ -1,31 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createRegistryControl } from '@wordpress/data';
-export function regularFetch(url) {
-  return {
-    type: 'REGULAR_FETCH',
-    url
-  };
-}
-export function getDispatch() {
-  return {
-    type: 'GET_DISPATCH'
-  };
-}
-const controls = {
-  async REGULAR_FETCH({
-    url
-  }) {
-    const {
-      data
-    } = await window.fetch(url).then(res => res.json());
-    return data;
-  },
-
-  GET_DISPATCH: createRegistryControl(({
-    dispatch
-  }) => () => dispatch)
-};
-export default controls;
-//# sourceMappingURL=controls.js.map

package/build-module/controls.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["@wordpress/core-data/src/controls.js"],"names":["createRegistryControl","regularFetch","url","type","getDispatch","controls","REGULAR_FETCH","data","window","fetch","then","res","json","GET_DISPATCH","dispatch"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,qBAAT,QAAsC,iBAAtC;AAEA,OAAO,SAASC,YAAT,CAAuBC,GAAvB,EAA6B;AACnC,SAAO;AACNC,IAAAA,IAAI,EAAE,eADA;AAEND,IAAAA;AAFM,GAAP;AAIA;AAED,OAAO,SAASE,WAAT,GAAuB;AAC7B,SAAO;AACND,IAAAA,IAAI,EAAE;AADA,GAAP;AAGA;AAED,MAAME,QAAQ,GAAG;AAChB,QAAMC,aAAN,CAAqB;AAAEJ,IAAAA;AAAF,GAArB,EAA+B;AAC9B,UAAM;AAAEK,MAAAA;AAAF,QAAW,MAAMC,MAAM,CAC3BC,KADqB,CACdP,GADc,EAErBQ,IAFqB,CAEbC,GAAF,IAAWA,GAAG,CAACC,IAAJ,EAFI,CAAvB;AAIA,WAAOL,IAAP;AACA,GAPe;;AAShBM,EAAAA,YAAY,EAAEb,qBAAqB,CAAE,CAAE;AAAEc,IAAAA;AAAF,GAAF,KAAoB,MAAMA,QAA5B;AATnB,CAAjB;AAYA,eAAeT,QAAf","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { createRegistryControl } from '@wordpress/data';\n\nexport function regularFetch( url ) {\n\treturn {\n\t\ttype: 'REGULAR_FETCH',\n\t\turl,\n\t};\n}\n\nexport function getDispatch() {\n\treturn {\n\t\ttype: 'GET_DISPATCH',\n\t};\n}\n\nconst controls = {\n\tasync REGULAR_FETCH( { url } ) {\n\t\tconst { data } = await window\n\t\t\t.fetch( url )\n\t\t\t.then( ( res ) => res.json() );\n\n\t\treturn data;\n\t},\n\n\tGET_DISPATCH: createRegistryControl( ( { dispatch } ) => () => dispatch ),\n};\n\nexport default controls;\n"]}

package/build-module/utils/if-not-resolved.js

@@ -1,23 +0,0 @@
-/**
- * Higher-order function which invokes the given resolver only if it has not
- * already been resolved with the arguments passed to the enhanced function.
- *
- * This only considers resolution state, and notably does not support resolver
- * custom `isFulfilled` behavior.
- *
- * @param {Function} resolver     Original resolver.
- * @param {string}   selectorName Selector name associated with resolver.
- *
- * @return {Function} Enhanced resolver.
- */
-const ifNotResolved = (resolver, selectorName) => (...args) => async ({
-  select,
-  dispatch
-}) => {
-  if (!select.hasStartedResolution(selectorName, args)) {
-    await dispatch(resolver(...args));
-  }
-};
-
-export default ifNotResolved;
-//# sourceMappingURL=if-not-resolved.js.map

package/build-module/utils/if-not-resolved.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["@wordpress/core-data/src/utils/if-not-resolved.js"],"names":["ifNotResolved","resolver","selectorName","args","select","dispatch","hasStartedResolution"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,aAAa,GAAG,CAAEC,QAAF,EAAYC,YAAZ,KAA8B,CAAE,GAAGC,IAAL,KAAe,OAAQ;AAC1EC,EAAAA,MAD0E;AAE1EC,EAAAA;AAF0E,CAAR,KAG5D;AACN,MAAK,CAAED,MAAM,CAACE,oBAAP,CAA6BJ,YAA7B,EAA2CC,IAA3C,CAAP,EAA2D;AAC1D,UAAME,QAAQ,CAAEJ,QAAQ,CAAE,GAAGE,IAAL,CAAV,CAAd;AACA;AACD,CAPD;;AASA,eAAeH,aAAf","sourcesContent":["/**\n * Higher-order function which invokes the given resolver only if it has not\n * already been resolved with the arguments passed to the enhanced function.\n *\n * This only considers resolution state, and notably does not support resolver\n * custom `isFulfilled` behavior.\n *\n * @param {Function} resolver     Original resolver.\n * @param {string}   selectorName Selector name associated with resolver.\n *\n * @return {Function} Enhanced resolver.\n */\nconst ifNotResolved = ( resolver, selectorName ) => ( ...args ) => async ( {\n\tselect,\n\tdispatch,\n} ) => {\n\tif ( ! select.hasStartedResolution( selectorName, args ) ) {\n\t\tawait dispatch( resolver( ...args ) );\n\t}\n};\n\nexport default ifNotResolved;\n"]}

package/src/controls.js

@@ -1,31 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createRegistryControl } from '@wordpress/data';
-
-export function regularFetch( url ) {
-	return {
-		type: 'REGULAR_FETCH',
-		url,
-	};
-}
-
-export function getDispatch() {
-	return {
-		type: 'GET_DISPATCH',
-	};
-}
-
-const controls = {
-	async REGULAR_FETCH( { url } ) {
-		const { data } = await window
-			.fetch( url )
-			.then( ( res ) => res.json() );
-
-		return data;
-	},
-
-	GET_DISPATCH: createRegistryControl( ( { dispatch } ) => () => dispatch ),
-};
-
-export default controls;

package/src/utils/if-not-resolved.js

@@ -1,22 +0,0 @@
-/**
- * Higher-order function which invokes the given resolver only if it has not
- * already been resolved with the arguments passed to the enhanced function.
- *
- * This only considers resolution state, and notably does not support resolver
- * custom `isFulfilled` behavior.
- *
- * @param {Function} resolver     Original resolver.
- * @param {string}   selectorName Selector name associated with resolver.
- *
- * @return {Function} Enhanced resolver.
- */
-const ifNotResolved = ( resolver, selectorName ) => ( ...args ) => async ( {
-	select,
-	dispatch,
-} ) => {
-	if ( ! select.hasStartedResolution( selectorName, args ) ) {
-		await dispatch( resolver( ...args ) );
-	}
-};
-
-export default ifNotResolved;

package/src/utils/test/if-not-resolved.js

@@ -1,76 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { controls } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import ifNotResolved from '../if-not-resolved';
-
-jest.mock( '@wordpress/data', () => ( {
-	controls: {
-		select: jest.fn(),
-	},
-} ) );
-
-describe( 'ifNotResolved', () => {
-	beforeEach( () => {
-		controls.select.mockReset();
-	} );
-
-	it( 'returns a new function', () => {
-		const originalResolver = () => {};
-
-		const resolver = ifNotResolved( originalResolver, 'originalResolver' );
-
-		expect( resolver ).toBeInstanceOf( Function );
-	} );
-
-	it( 'triggers original resolver if not already resolved', async () => {
-		const select = { hasStartedResolution: () => false };
-		const dispatch = () => {};
-
-		const originalResolver = jest
-			.fn()
-			.mockImplementation( async function () {} );
-
-		const resolver = ifNotResolved( originalResolver, 'originalResolver' );
-		await resolver()( { select, dispatch } );
-
-		expect( originalResolver ).toHaveBeenCalledTimes( 1 );
-	} );
-
-	it( 'does not trigger original resolver if already resolved', async () => {
-		const select = { hasStartedResolution: () => true };
-		const dispatch = () => {};
-
-		const originalResolver = jest
-			.fn()
-			.mockImplementation( async function () {} );
-
-		const resolver = ifNotResolved( originalResolver, 'originalResolver' );
-		await resolver()( { select, dispatch } );
-
-		expect( originalResolver ).toHaveBeenCalledTimes( 0 );
-	} );
-
-	it( 'returns a promise when the resolver was not already resolved', async () => {
-		const select = { hasStartedResolution: () => false };
-		let thunkRetval;
-		const dispatch = jest.fn( ( thunk ) => {
-			thunkRetval = thunk();
-			return thunkRetval;
-		} );
-
-		const originalResolver = jest.fn( () => () =>
-			Promise.resolve( 'success!' )
-		);
-
-		const resolver = ifNotResolved( originalResolver, 'originalResolver' );
-		const result = resolver()( { select, dispatch } );
-
-		await expect( result ).resolves.toBe( undefined );
-		await expect( thunkRetval ).resolves.toBe( 'success!' );
-	} );
-} );