@wordpress/core-data 7.44.0 → 7.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "7.44.0",
+	"version": "7.45.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -49,22 +49,22 @@
 		"build-module/index.mjs"
 	],
 	"dependencies": {
-		"@wordpress/api-fetch": "^7.44.0",
-		"@wordpress/block-editor": "^15.17.0",
-		"@wordpress/blocks": "^15.17.0",
-		"@wordpress/compose": "^7.44.0",
-		"@wordpress/data": "^10.44.0",
-		"@wordpress/deprecated": "^4.44.0",
-		"@wordpress/element": "^6.44.0",
-		"@wordpress/html-entities": "^4.44.0",
-		"@wordpress/i18n": "^6.17.0",
-		"@wordpress/is-shallow-equal": "^5.44.0",
-		"@wordpress/private-apis": "^1.44.0",
-		"@wordpress/rich-text": "^7.44.0",
-		"@wordpress/sync": "^1.44.0",
-		"@wordpress/undo-manager": "^1.44.0",
-		"@wordpress/url": "^4.44.0",
-		"@wordpress/warning": "^3.44.0",
+		"@wordpress/api-fetch": "^7.45.0",
+		"@wordpress/block-editor": "^15.18.0",
+		"@wordpress/blocks": "^15.18.0",
+		"@wordpress/compose": "^7.45.0",
+		"@wordpress/data": "^10.45.0",
+		"@wordpress/deprecated": "^4.45.0",
+		"@wordpress/element": "^6.45.0",
+		"@wordpress/html-entities": "^4.45.0",
+		"@wordpress/i18n": "^6.18.0",
+		"@wordpress/is-shallow-equal": "^5.45.0",
+		"@wordpress/private-apis": "^1.45.0",
+		"@wordpress/rich-text": "^7.45.0",
+		"@wordpress/sync": "^1.45.0",
+		"@wordpress/undo-manager": "^1.45.0",
+		"@wordpress/url": "^4.45.0",
+		"@wordpress/warning": "^3.45.0",
 		"change-case": "^4.1.2",
 		"equivalent-key-map": "^0.2.2",
 		"fast-deep-equal": "^3.1.3",
@@ -84,5 +84,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "b862d8c84121a47bbeff882f6c87e61681ce2e0d"
+	"gitHead": "8c229eaed0e88c9827e2da3d73a78f9ddd77714b"
 }

package/src/entities.js

@@ -51,10 +51,6 @@ export const rootEntitiesConfig = [
 				'home',
 				'image_sizes',
 				'image_size_threshold',
-				'image_output_formats',
-				'jpeg_interlaced',
-				'png_interlaced',
-				'gif_interlaced',
 				'name',
 				'site_icon',
 				'site_icon_url',

package/src/queried-data/reducer.js

@@ -1,18 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { combineReducers } from '@wordpress/data';
+import { combineReducers, keyedReducer } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
-import {
-	conservativeMapItem,
-	ifMatchingAction,
-	replaceAction,
-	onSubKey,
-} from '../utils';
+import { conservativeMapItem, ifMatchingAction, replaceAction } from '../utils';
 import { DEFAULT_ENTITY_KEY } from '../entities';
 import getQueryParts from './get-query-parts';
 
@@ -221,11 +216,11 @@ const receiveQueries = compose( [
 	// an unhandled action.
 	ifMatchingAction( ( action ) => 'query' in action ),
 
-	// Inject query parts into action for use both in `onSubKey` and reducer.
+	// Inject query parts into action for use both in `keyedReducer` and reducer.
 	replaceAction( ( action ) => {
 		// `ifMatchingAction` still passes on initialization, where state is
 		// undefined and a query is not assigned. Avoid attempting to parse
-		// parts. `onSubKey` will omit by lack of `stableKey`.
+		// parts. `keyedReducer` will omit by lack of `stableKey`.
 		if ( action.query ) {
 			return {
 				...action,
@@ -236,11 +231,11 @@ const receiveQueries = compose( [
 		return action;
 	} ),
 
-	onSubKey( 'context' ),
+	keyedReducer( 'context' ),
 
 	// Queries shape is shared, but keyed by query `stableKey` part. Original
 	// reducer tracks only a single query object.
-	onSubKey( 'stableKey' ),
+	keyedReducer( 'stableKey' ),
 ] )( ( state = {}, action ) => {
 	if ( action.type !== 'RECEIVE_ITEMS' ) {
 		return state;

package/src/queried-data/selectors.js

@@ -3,11 +3,6 @@
  */
 import EquivalentKeyMap from 'equivalent-key-map';
 
-/**
- * WordPress dependencies
- */
-import { createSelector } from '@wordpress/data';
-
 /**
  * Internal dependencies
  */
@@ -114,11 +109,9 @@ function getQueriedItemsUncached( state, query, options = {} ) {
 
 /**
  * Returns items for a given query, or null if the items are not known. Caches
- * result both per state (by reference) and per query (by deep equality).
- * The caching approach is intended to be durable to query objects which are
- * deeply but not referentially equal, since otherwise:
+ * result per state (by reference) and per query (by deep equality), so that:
  *
- * `getQueriedItems( state, {} ) !== getQueriedItems( state, {} )`
+ * `getQueriedItems( state, {} ) === getQueriedItems( state, {} )`
  *
  * @param {Object}  state                      State object.
  * @param {?Object} query                      Optional query.
@@ -127,24 +120,22 @@ function getQueriedItemsUncached( state, query, options = {} ) {
  *
  * @return {?Array} Query items.
  */
-export const getQueriedItems = createSelector(
-	( state, query = {}, options = {} ) => {
-		let queriedItemsCache = queriedItemsCacheByState.get( state );
-		if ( queriedItemsCache ) {
-			const queriedItems = queriedItemsCache.get( query );
-			if ( queriedItems !== undefined ) {
-				return queriedItems;
-			}
-		} else {
-			queriedItemsCache = new EquivalentKeyMap();
-			queriedItemsCacheByState.set( state, queriedItemsCache );
+export function getQueriedItems( state, query = {}, options = {} ) {
+	let queriedItemsCache = queriedItemsCacheByState.get( state );
+	if ( queriedItemsCache ) {
+		const queriedItems = queriedItemsCache.get( query );
+		if ( queriedItems !== undefined ) {
+			return queriedItems;
 		}
-
-		const items = getQueriedItemsUncached( state, query, options );
-		queriedItemsCache.set( query, items );
-		return items;
+	} else {
+		queriedItemsCache = new EquivalentKeyMap();
+		queriedItemsCacheByState.set( state, queriedItemsCache );
 	}
-);
+
+	const items = getQueriedItemsUncached( state, query, options );
+	queriedItemsCache.set( query, items );
+	return items;
+}
 
 export function getQueriedTotalItems( state, query = {} ) {
 	const { stableKey, context } = getQueryParts( query );

package/src/utils/crdt.ts

@@ -340,17 +340,29 @@ export function getPostChangesFromCRDTDoc(
 				}
 
 				case 'meta': {
+					const currentMeta =
+						( currentValue as PostChanges[ 'meta' ] ) ?? {};
+
 					allowedMetaChanges = Object.fromEntries(
 						Object.entries( newValue ?? {} ).filter(
-							( [ metaKey ] ) =>
-								! disallowedPostMetaKeys.has( metaKey )
+							( [ metaKey ] ) => {
+								if ( disallowedPostMetaKeys.has( metaKey ) ) {
+									return false;
+								}
+
+								// Ignore meta keys that are no longer registered
+								// for this post (absent from the REST response).
+								// Without this, orphaned CRDT meta would mark
+								// the post permanently dirty.
+								return metaKey in currentMeta;
+							}
 						)
 					);
 
 					// Merge the allowed meta changes with the current meta values since
 					// not all meta properties are synced.
 					const mergedValue = {
-						...( currentValue as PostChanges[ 'meta' ] ),
+						...currentMeta,
 						...allowedMetaChanges,
 					};
 

package/src/utils/index.js

@@ -2,7 +2,6 @@ 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 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';
 export { default as setNestedValue } from './set-nested-value';

package/src/utils/test/crdt.ts

@@ -773,6 +773,30 @@ describe( 'crdt', () => {
 			} );
 		} );
 
+		it( 'excludes orphaned meta keys not present on the edited record', () => {
+			// If post meta is registered, saved (landing in a CRDT doc),
+			// then unregistered, it can permanently mark the record dirty.
+			// Orphaned values should not show up as a change.
+			const metaMap = createYMap();
+			metaMap.set( 'registered_meta', 'value' );
+			metaMap.set( 'orphaned_meta', 'stale value' );
+			map.set( 'meta', metaMap );
+
+			const editedRecord = {
+				meta: {
+					registered_meta: 'value',
+				},
+			} as unknown as Post;
+
+			const changes = getPostChangesFromCRDTDoc(
+				doc,
+				editedRecord,
+				defaultSyncedProperties
+			);
+
+			expect( changes ).not.toHaveProperty( 'meta' );
+		} );
+
 		it( 'excludes disallowed meta keys in changes', () => {
 			const metaMap = createYMap();
 			metaMap.set( 'public_meta', 'new value' );

package/build/utils/on-sub-key.cjs

@@ -1,46 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/core-data/src/utils/on-sub-key.js
-var on_sub_key_exports = {};
-__export(on_sub_key_exports, {
-  default: () => on_sub_key_default,
-  onSubKey: () => onSubKey
-});
-module.exports = __toCommonJS(on_sub_key_exports);
-var onSubKey = (actionProperty) => (reducer) => (state = {}, action) => {
-  const key = action[actionProperty];
-  if (key === void 0) {
-    return state;
-  }
-  const nextKeyState = reducer(state[key], action);
-  if (nextKeyState === state[key]) {
-    return state;
-  }
-  return {
-    ...state,
-    [key]: nextKeyState
-  };
-};
-var on_sub_key_default = onSubKey;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  onSubKey
-});
-//# sourceMappingURL=on-sub-key.cjs.map

package/build/utils/on-sub-key.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/utils/on-sub-key.js"],
-  "sourcesContent": ["/** @typedef {import('../types').AnyFunction} AnyFunction */\n\n/**\n * Higher-order reducer creator which creates a combined reducer object, keyed\n * by a property on the action object.\n *\n * @param {string} actionProperty Action property by which to key object.\n *\n * @return {AnyFunction} Higher-order reducer.\n */\nexport const onSubKey =\n\t( actionProperty ) =>\n\t( reducer ) =>\n\t( state = {}, action ) => {\n\t\t// Retrieve subkey from action. Do not track if undefined; useful for cases\n\t\t// where reducer is scoped by action shape.\n\t\tconst key = action[ actionProperty ];\n\t\tif ( key === undefined ) {\n\t\t\treturn state;\n\t\t}\n\n\t\t// Avoid updating state if unchanged. Note that this also accounts for a\n\t\t// reducer which returns undefined on a key which is not yet tracked.\n\t\tconst nextKeyState = reducer( state[ key ], action );\n\t\tif ( nextKeyState === state[ key ] ) {\n\t\t\treturn state;\n\t\t}\n\n\t\treturn {\n\t\t\t...state,\n\t\t\t[ key ]: nextKeyState,\n\t\t};\n\t};\n\nexport default onSubKey;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAUO,IAAM,WACZ,CAAE,mBACF,CAAE,YACF,CAAE,QAAQ,CAAC,GAAG,WAAY;AAGzB,QAAM,MAAM,OAAQ,cAAe;AACnC,MAAK,QAAQ,QAAY;AACxB,WAAO;AAAA,EACR;AAIA,QAAM,eAAe,QAAS,MAAO,GAAI,GAAG,MAAO;AACnD,MAAK,iBAAiB,MAAO,GAAI,GAAI;AACpC,WAAO;AAAA,EACR;AAEA,SAAO;AAAA,IACN,GAAG;AAAA,IACH,CAAE,GAAI,GAAG;AAAA,EACV;AACD;AAED,IAAO,qBAAQ;",
-  "names": []
-}

package/build-module/utils/on-sub-key.mjs

@@ -1,21 +0,0 @@
-// packages/core-data/src/utils/on-sub-key.js
-var onSubKey = (actionProperty) => (reducer) => (state = {}, action) => {
-  const key = action[actionProperty];
-  if (key === void 0) {
-    return state;
-  }
-  const nextKeyState = reducer(state[key], action);
-  if (nextKeyState === state[key]) {
-    return state;
-  }
-  return {
-    ...state,
-    [key]: nextKeyState
-  };
-};
-var on_sub_key_default = onSubKey;
-export {
-  on_sub_key_default as default,
-  onSubKey
-};
-//# sourceMappingURL=on-sub-key.mjs.map

package/build-module/utils/on-sub-key.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/utils/on-sub-key.js"],
-  "sourcesContent": ["/** @typedef {import('../types').AnyFunction} AnyFunction */\n\n/**\n * Higher-order reducer creator which creates a combined reducer object, keyed\n * by a property on the action object.\n *\n * @param {string} actionProperty Action property by which to key object.\n *\n * @return {AnyFunction} Higher-order reducer.\n */\nexport const onSubKey =\n\t( actionProperty ) =>\n\t( reducer ) =>\n\t( state = {}, action ) => {\n\t\t// Retrieve subkey from action. Do not track if undefined; useful for cases\n\t\t// where reducer is scoped by action shape.\n\t\tconst key = action[ actionProperty ];\n\t\tif ( key === undefined ) {\n\t\t\treturn state;\n\t\t}\n\n\t\t// Avoid updating state if unchanged. Note that this also accounts for a\n\t\t// reducer which returns undefined on a key which is not yet tracked.\n\t\tconst nextKeyState = reducer( state[ key ], action );\n\t\tif ( nextKeyState === state[ key ] ) {\n\t\t\treturn state;\n\t\t}\n\n\t\treturn {\n\t\t\t...state,\n\t\t\t[ key ]: nextKeyState,\n\t\t};\n\t};\n\nexport default onSubKey;\n"],
-  "mappings": ";AAUO,IAAM,WACZ,CAAE,mBACF,CAAE,YACF,CAAE,QAAQ,CAAC,GAAG,WAAY;AAGzB,QAAM,MAAM,OAAQ,cAAe;AACnC,MAAK,QAAQ,QAAY;AACxB,WAAO;AAAA,EACR;AAIA,QAAM,eAAe,QAAS,MAAO,GAAI,GAAG,MAAO;AACnD,MAAK,iBAAiB,MAAO,GAAI,GAAI;AACpC,WAAO;AAAA,EACR;AAEA,SAAO;AAAA,IACN,GAAG;AAAA,IACH,CAAE,GAAI,GAAG;AAAA,EACV;AACD;AAED,IAAO,qBAAQ;",
-  "names": []
-}

package/build-types/utils/on-sub-key.d.ts

@@ -1,4 +0,0 @@
-export function onSubKey(actionProperty: string): AnyFunction;
-export default onSubKey;
-export type AnyFunction = import("../types").AnyFunction;
-//# sourceMappingURL=on-sub-key.d.ts.map

package/build-types/utils/on-sub-key.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"on-sub-key.d.ts","sourceRoot":"","sources":["../../src/utils/on-sub-key.js"],"names":[],"mappings":"AAUO,yCAJI,MAAM,GAEL,WAAW,CAwBrB;;0BAhCY,OAAO,UAAU,EAAE,WAAW"}

package/src/utils/on-sub-key.js

@@ -1,35 +0,0 @@
-/** @typedef {import('../types').AnyFunction} AnyFunction */
-
-/**
- * Higher-order reducer creator which creates a combined reducer object, keyed
- * by a property on the action object.
- *
- * @param {string} actionProperty Action property by which to key object.
- *
- * @return {AnyFunction} Higher-order reducer.
- */
-export const onSubKey =
-	( actionProperty ) =>
-	( reducer ) =>
-	( state = {}, action ) => {
-		// Retrieve subkey from action. Do not track if undefined; useful for cases
-		// where reducer is scoped by action shape.
-		const key = action[ actionProperty ];
-		if ( key === undefined ) {
-			return state;
-		}
-
-		// Avoid updating state if unchanged. Note that this also accounts for a
-		// reducer which returns undefined on a key which is not yet tracked.
-		const nextKeyState = reducer( state[ key ], action );
-		if ( nextKeyState === state[ key ] ) {
-			return state;
-		}
-
-		return {
-			...state,
-			[ key ]: nextKeyState,
-		};
-	};
-
-export default onSubKey;

package/src/utils/test/on-sub-key.js

@@ -1,46 +0,0 @@
-/**
- * External dependencies
- */
-import deepFreeze from 'deep-freeze';
-
-/**
- * Internal dependencies
- */
-import onSubKey from '../on-sub-key';
-
-describe( 'onSubKey', () => {
-	function createEnhancedReducer( actionProperty ) {
-		const enhanceReducer = onSubKey( actionProperty );
-		return enhanceReducer(
-			( state, action ) => 'Called by ' + action.caller
-		);
-	}
-
-	it( 'should default to an empty object', () => {
-		const reducer = createEnhancedReducer( 'caller' );
-		const nextState = reducer( undefined, { type: '@@INIT' } );
-
-		expect( nextState ).toEqual( {} );
-	} );
-
-	it( 'should ignore actions where property not present', () => {
-		const state = deepFreeze( {} );
-		const reducer = createEnhancedReducer( 'caller' );
-		const nextState = reducer( state, { type: 'DO_FOO' } );
-
-		expect( nextState ).toBe( state );
-	} );
-
-	it( 'should key by action property', () => {
-		const reducer = createEnhancedReducer( 'caller' );
-
-		let state = deepFreeze( {} );
-		state = reducer( state, { type: 'DO_FOO', caller: 1 } );
-		state = reducer( state, { type: 'DO_FOO', caller: 2 } );
-
-		expect( state ).toEqual( {
-			1: 'Called by 1',
-			2: 'Called by 2',
-		} );
-	} );
-} );