@wordpress/core-data 7.51.0 → 7.53.0

package/build-types/utils/get-template-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-template-info.d.ts","sourceRoot":"","sources":["../../src/utils/get-template-info.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,WAJzB;IAAuB,aAAa,QACpC;IAAwB,aAAa,AAArC,CACA,QAAA;IAAuB,QAAQ,MACjC;CAAA,OAmCA,CAAC"}

package/build-types/utils/get-template-part-icon.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Helper function to retrieve the corresponding icon by area name.
+ *
+ * @param {string} areaOrIconName The area name (e.g., 'header', 'navigation-overlay').
+ *
+ * @return {Object} The corresponding icon.
+ */
+export declare function getTemplatePartIcon(areaOrIconName: string): any;
+//# sourceMappingURL=get-template-part-icon.d.ts.map

package/build-types/utils/get-template-part-icon.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-template-part-icon.d.ts","sourceRoot":"","sources":["../../src/utils/get-template-part-icon.js"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAE,cAAc,EAJxC,MAIwC,OAWlD"}

package/build-types/utils/log-entity-deprecation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-entity-deprecation.d.ts","sourceRoot":"","sources":["../../src/utils/log-entity-deprecation.ts"],"names":[],"mappings":"AAYA;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC3C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,EACC,uBAAuB,EACvB,mBAA2B,GAC3B,GAAE;IACF,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACzB,QAkCN"}
+{"version":3,"file":"log-entity-deprecation.d.ts","sourceRoot":"","sources":["../../src/utils/log-entity-deprecation.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC3C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,EACC,uBAAuB,EACvB,mBAA2B,GAC3B,GAAE;IACF,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACzB,QAkCN"}

package/build-types/utils/save-crdt-doc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save-crdt-doc.d.ts","sourceRoot":"","sources":["../../src/utils/save-crdt-doc.js"],"names":[],"mappings":"AAiCA;;;;;GAKG;AACH,wBAAsB,WAAW,CAAE,UAAU,EAHlC,OAAO,iBAAiB,EAAE,UAGQ,EAAE,QAAQ,EAF5C,OAAO,iBAAiB,EAAE,QAEkB,iBAwBtD"}
+{"version":3,"file":"save-crdt-doc.d.ts","sourceRoot":"","sources":["../../src/utils/save-crdt-doc.js"],"names":[],"mappings":"AA0BA;;;;;GAKG;AACH,wBAAsB,WAAW,CAAE,UAAU,EAHlC,OAAO,iBAAiB,EAAE,UAGQ,EAAE,QAAQ,EAF5C,OAAO,iBAAiB,EAAE,QAEkB,iBAwBtD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "7.51.0",
+	"version": "7.53.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -48,35 +48,41 @@
 		"build-module/index.mjs"
 	],
 	"dependencies": {
-		"@wordpress/api-fetch": "^7.51.0",
-		"@wordpress/block-editor": "^16.0.0",
-		"@wordpress/blocks": "^15.24.0",
-		"@wordpress/compose": "^8.4.0",
-		"@wordpress/data": "^10.51.0",
-		"@wordpress/deprecated": "^4.51.0",
-		"@wordpress/element": "^8.3.0",
-		"@wordpress/html-entities": "^4.51.0",
-		"@wordpress/i18n": "^6.24.0",
-		"@wordpress/is-shallow-equal": "^5.51.0",
-		"@wordpress/private-apis": "^1.51.0",
-		"@wordpress/rich-text": "^7.51.0",
-		"@wordpress/sync": "^1.51.0",
-		"@wordpress/undo-manager": "^1.51.0",
-		"@wordpress/url": "^4.51.0",
-		"@wordpress/warning": "^3.51.0",
+		"@wordpress/api-fetch": "^7.53.0",
+		"@wordpress/base-styles": "^12.1.0",
+		"@wordpress/block-editor": "^16.2.0",
+		"@wordpress/blocks": "^15.26.0",
+		"@wordpress/components": "^39.0.0",
+		"@wordpress/compose": "^8.6.0",
+		"@wordpress/data": "^10.53.0",
+		"@wordpress/deprecated": "^4.53.0",
+		"@wordpress/element": "^8.5.0",
+		"@wordpress/global-styles-engine": "^1.20.0",
+		"@wordpress/html-entities": "^4.53.0",
+		"@wordpress/i18n": "^6.26.0",
+		"@wordpress/icons": "^15.4.0",
+		"@wordpress/is-shallow-equal": "^5.53.0",
+		"@wordpress/notices": "^5.53.0",
+		"@wordpress/private-apis": "^1.53.0",
+		"@wordpress/rich-text": "^7.53.0",
+		"@wordpress/sync": "^1.53.0",
+		"@wordpress/undo-manager": "^1.53.0",
+		"@wordpress/url": "^4.53.0",
+		"@wordpress/warning": "^3.53.0",
 		"change-case": "^4.1.2",
+		"clsx": "^2.1.1",
 		"equivalent-key-map": "^0.2.2",
 		"fast-deep-equal": "^3.1.3",
-		"memize": "^2.1.0",
+		"memize": "^2.1.1",
 		"uuid": "^14.0.0"
 	},
 	"devDependencies": {
-		"@jest/globals": "^30.2.0",
+		"@jest/globals": "^30.4.1",
 		"@testing-library/dom": "^10.4.1",
 		"@testing-library/react": "^16.3.2",
-		"@types/jest": "^29.5.14",
+		"@types/jest": "^30.0.0",
 		"@types/node": "^20.19.39",
-		"@wordpress/block-library": "^10.2.0",
+		"@wordpress/block-library": "^10.4.0",
 		"deep-freeze": "^0.0.1"
 	},
 	"peerDependencies": {
@@ -92,5 +98,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "e9a74f9c14095a34398ecd4d1f7a908e55051205"
+	"gitHead": "989764d42ff93e33684aaf0b96a5b7f3d9bbff52"
 }

package/src/actions.js

@@ -1,34 +1,85 @@
-/**
- * External dependencies
- */
+import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 import { v4 as uuid } from 'uuid';
-
-/**
- * WordPress dependencies
- */
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
 import { clearUnchangedEdits, getNestedValue, setNestedValue } from './utils';
 import { receiveItems, removeItems, receiveQueriedItems } from './queried-data';
 import { DEFAULT_ENTITY_KEY } from './entities';
 import { createBatch } from './batch';
 import { STORE_NAME } from './name';
 import {
+	CRDT_AUTOSAVE_SNAPSHOT_KEY,
 	LOCAL_EDITOR_ORIGIN,
 	LOCAL_UNDO_IGNORED_ORIGIN,
 	getSyncManager,
 } from './sync';
 import logEntityDeprecation from './utils/log-entity-deprecation';
+import {
+	getRawValue,
+	POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE,
+} from './utils/crdt';
 
 function addTitleToAutoDraft( record ) {
 	return record.status === 'auto-draft' ? { ...record, title: '' } : record;
 }
 
+// Post meta is applied to the CRDT one subkey at a time, so compare the save
+// response at the same granularity to avoid carrying stale sibling values.
+function getServerMutatedMetaFields( updatedMeta, persistedMeta, syncedMeta ) {
+	const baseline = { ...persistedMeta, ...syncedMeta };
+
+	return Object.fromEntries(
+		Object.entries( updatedMeta ?? {} ).filter( ( [ key, value ] ) => {
+			if ( key === POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE ) {
+				// The persisted CRDT snapshot may change on save and is
+				// intentionally excluded from CRDT meta synchronization, so it
+				// is not a server mutation.
+				return false;
+			}
+
+			return ! fastDeepEqual( value, baseline[ key ] );
+		} )
+	);
+}
+
+function getServerMutatedFields(
+	updatedRecord,
+	persistedRecord,
+	syncedChanges
+) {
+	return Object.fromEntries(
+		Object.entries( updatedRecord ).flatMap( ( [ key, value ] ) => {
+			if ( key === 'meta' ) {
+				const serverMutatedMeta = getServerMutatedMetaFields(
+					value,
+					persistedRecord.meta,
+					syncedChanges.meta
+				);
+
+				return Object.keys( serverMutatedMeta ).length
+					? [ [ key, serverMutatedMeta ] ]
+					: [];
+			}
+
+			const baseline =
+				key in syncedChanges
+					? syncedChanges[ key ]
+					: persistedRecord[ key ];
+
+			// The save response nests raw attributes as `{ raw, rendered }`
+			// while the baseline holds raw strings; compare raw values so the
+			// shape difference does not read as a server mutation.
+			const wasServerMutated = ! fastDeepEqual(
+				getRawValue( value ) ?? value,
+				getRawValue( baseline ) ?? baseline
+			);
+
+			return wasServerMutated ? [ [ key, value ] ] : [];
+		} )
+	);
+}
+
 /**
  * Returns an action object used in signalling that authors have been received.
  * Ignored from documentation as it's internal to the data store.
@@ -383,6 +434,9 @@ export const deleteEntityRecord =
  * @param {Object}        edits                The edits.
  * @param {Object}        options              Options for the edit.
  * @param {boolean}       [options.undoIgnore] Whether to ignore the edit in undo history or not.
+ * @param {boolean}       [options.isCached]   Whether the edit is transient (e.g. typing). Transient
+ *                                             edits are staged and eventually merged into the
+ *                                             preceding undo level instead of creating a new one.
  *
  * @return {Object} Action object.
  */
@@ -668,6 +722,25 @@ export const saveEntityRecord =
 					? select.getRawEntityRecord( kind, name, recordId )
 					: {};
 
+				// `saveEntityRecord` can be called directly, bypassing
+				// `editEntityRecord`, so make sure its changes enter the
+				// CRDT first. An autosave snapshots the document below, and
+				// a regular save creates the persisted document from it, so
+				// both must see these changes.
+				if (
+					entityConfig.syncConfig &&
+					! __unstableSkipSyncUpdate &&
+					! isNewRecord &&
+					persistedRecord
+				) {
+					getSyncManager()?.update(
+						`${ kind }/${ name }`,
+						recordId,
+						record,
+						LOCAL_UNDO_IGNORED_ORIGIN
+					);
+				}
+
 				// Most of this autosave logic is very specific to posts.
 				// This is fine for now as it is the only supported autosave,
 				// but ideally this should all be handled in the back end,
@@ -701,6 +774,21 @@ export const saveEntityRecord =
 									: undefined,
 						}
 					);
+					// Capture the CRDT snapshot in the same tick as the
+					// payload so it describes exactly the content being
+					// autosaved.
+					if ( entityConfig.syncConfig ) {
+						const crdtSnapshot =
+							getSyncManager()?.getEntitySnapshot(
+								`${ kind }/${ name }`,
+								recordId
+							);
+
+						if ( crdtSnapshot ) {
+							data[ CRDT_AUTOSAVE_SNAPSHOT_KEY ] = crdtSnapshot;
+						}
+					}
+
 					updatedRecord = await __unstableFetch( {
 						path: `${ path }/autosaves`,
 						method: 'POST',
@@ -774,21 +862,40 @@ export const saveEntityRecord =
 						method: recordId ? 'PUT' : 'POST',
 						data: edits,
 					} );
+					// Pass the pre-`__unstablePrePersist` edits so the reducer
+					// can clear the persisted edits from state. The values
+					// added by `__unstablePrePersist` (e.g. a fresh CRDT
+					// snapshot in `meta`) never exist in the state edits, so
+					// comparing against them would fail to match and leave the
+					// record dirty after a successful save.
 					dispatch.receiveEntityRecords(
 						kind,
 						name,
 						updatedRecord,
 						undefined,
 						true,
-						edits
+						record
 					);
 					if ( entityConfig.syncConfig ) {
+						let syncChanges;
+						if ( __unstableSkipSyncUpdate ) {
+							syncChanges = {};
+						} else if ( isNewRecord || ! persistedRecord ) {
+							syncChanges = updatedRecord;
+						} else {
+							syncChanges = getServerMutatedFields(
+								updatedRecord,
+								persistedRecord,
+								record
+							);
+						}
+
 						// Use an untracked origin so that the save
 						// response does not create undo levels.
 						getSyncManager()?.update(
 							`${ kind }/${ name }`,
 							recordId,
-							__unstableSkipSyncUpdate ? {} : updatedRecord,
+							syncChanges,
 							LOCAL_UNDO_IGNORED_ORIGIN,
 							{ isSave: true }
 						);

package/src/awareness/awareness-state.ts

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { REMOVAL_DELAY_IN_MS } from './config';
 import { TypedAwareness } from './typed-awareness';
 import type { EnhancedState, EqualityFieldCheck } from './types';

package/src/awareness/base-awareness.ts

@@ -1,15 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { resolveSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { AwarenessState } from './awareness-state';
 import { STORE_NAME as coreStore } from '../name';
 import { generateCollaboratorInfo, areCollaboratorInfosEqual } from './utils';
-
 import type { BaseState } from './types';
 
 export abstract class BaseAwarenessState<

package/src/awareness/block-lookup.ts

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { useSelect } from '@wordpress/data';
 import { Y } from '@wordpress/sync';
-// @ts-ignore No exported types for block editor store selectors.
+// @ts-expect-error `@wordpress/block-editor` does not expose type declarations for its entry point.
 import { store as blockEditorStore } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
 import type { AbsoluteBlockIndexPath } from '../types';
 import { unlock } from '../lock-unlock';
 

package/src/awareness/post-editor-awareness.ts

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { dispatch, select, subscribe } from '@wordpress/data';
 import { Y } from '@wordpress/sync';
-// @ts-ignore No exported types for block editor store selectors.
+// @ts-expect-error `@wordpress/block-editor` does not expose type declarations for its entry point.
 import { store as blockEditorStore } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
 import { BaseAwarenessState, baseEqualityFieldChecks } from './base-awareness';
 import {
 	getBlockPathInYdoc,
@@ -30,7 +23,6 @@ import {
 	SelectionType,
 	SelectionDirection,
 } from '../utils/crdt-user-selections';
-
 import type {
 	ResolvedSelection,
 	SelectionState,
@@ -200,7 +192,7 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 			undoIgnore: true,
 		};
 
-		// @ts-ignore Types are not provided when using store name instead of store instance.
+		// @ts-expect-error Types are not provided when using the store name instead of the store instance.
 		dispatch( coreStore ).editEntityRecord(
 			this.kind,
 			this.name,
@@ -288,7 +280,18 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 			};
 		}
 
+		// SelectionInMultipleBlocks is decomposed by the caller into per-endpoint
+		// Cursor / WholeBlock calls and should never arrive here directly.
+		if ( selection.type === SelectionType.SelectionInMultipleBlocks ) {
+			return {
+				richTextOffset: null,
+				localClientId: null,
+				attributeKey: null,
+			};
+		}
+
 		// Text-based selections: resolve cursor position and navigate up.
+		// SelectionCursor → cursorPosition; SelectionInOneBlock → cursorStartPosition.
 		const cursorPos =
 			'cursorPosition' in selection
 				? selection.cursorPosition

package/src/awareness/test/awareness-state.ts

@@ -1,6 +1,3 @@
-/**
- * External dependencies
- */
 import {
 	describe,
 	expect,
@@ -9,15 +6,7 @@ import {
 	beforeEach,
 	afterEach,
 } from '@jest/globals';
-
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import { AwarenessState } from '../awareness-state';
 import type { EnhancedState, EqualityFieldCheck } from '../types';
 

package/src/awareness/test/base-awareness.ts

@@ -1,12 +1,5 @@
-/**
- * External dependencies
- */
 import { Y } from '@wordpress/sync';
 import { resolveSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import {
 	BaseAwarenessState,
 	BaseAwareness,

package/src/awareness/test/block-lookup.ts

@@ -1,19 +1,11 @@
-/**
- * External dependencies
- */
 import { Y } from '@wordpress/sync';
 import { renderHook } from '@testing-library/react';
-
-/**
- * Internal dependencies
- */
 import {
 	getBlockPathInYdoc,
 	getContainingBlockYMap,
 	resolveBlockClientIdByPath,
 	usePostContentBlocks,
 } from '../block-lookup';
-
 import type { EditorStoreBlock } from '../block-lookup';
 
 type MockBlock = EditorStoreBlock & {

package/src/awareness/test/post-editor-awareness.ts

@@ -1,12 +1,5 @@
-/**
- * External dependencies
- */
 import { Y } from '@wordpress/sync';
 import { dispatch, select, subscribe, resolveSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { PostEditorAwareness } from '../post-editor-awareness';
 import { SelectionType } from '../../utils/crdt-user-selections';
 import type {

package/src/awareness/test/typed-awareness.ts

@@ -1,16 +1,5 @@
-/**
- * External dependencies
- */
 import { describe, expect, test, beforeEach, afterEach } from '@jest/globals';
-
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import { TypedAwareness } from '../typed-awareness';
 import type { EnhancedState } from '../types';
 

package/src/awareness/test/utils.ts

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { areCollaboratorInfosEqual, generateCollaboratorInfo } from '../utils';
 import type { CollaboratorInfo } from '../types';
 import type { User } from '../../entity-types';

package/src/awareness/typed-awareness.ts

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import { Awareness } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import { getRecordValue } from './utils';
 
 /**

package/src/awareness/types.ts

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import type { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import type { SelectionState } from '../types';
 import type { User } from '../entity-types';
 

package/src/awareness/utils.ts

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import type { User } from '../entity-types';
 import type { CollaboratorInfo } from './types';
 

package/src/batch/create-batch.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import defaultProcessor from './default-processor';
 
 /**

package/src/batch/default-processor.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import apiFetch from '@wordpress/api-fetch';
 
 /**
@@ -41,7 +38,6 @@ export default async function defaultProcessor( requests ) {
 
 	const results = [];
 
-	// @ts-ignore We would have crashed or never gotten to this point if we hadn't received the maxItems count.
 	for ( const batchRequests of chunk( requests, maxItems ) ) {
 		const batchResponse = await apiFetch( {
 			path: '/batch/v1',

package/src/batch/test/create-batch.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import createBatch from '../create-batch';
 
 describe( 'createBatch', () => {

package/src/batch/test/default-processor.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import apiFetch from '@wordpress/api-fetch';
-
-/**
- * Internal dependencies
- */
 import defaultProcessor from '../default-processor';
 
 jest.mock( '@wordpress/api-fetch' );

package/src/components/entities-saved-states/entity-record-item.js

@@ -0,0 +1,53 @@
+import { CheckboxControl, PanelRow } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { STORE_NAME } from '../../name';
+import { getTemplateInfo } from '../../utils/get-template-info';
+
+export default function EntityRecordItem( { record, checked, onChange } ) {
+	const { name, kind, title, key } = record;
+
+	// Handle templates that might use default descriptive titles.
+	const { entityRecordTitle } = useSelect(
+		( select ) => {
+			if ( 'postType' !== kind || 'wp_template' !== name ) {
+				return {
+					entityRecordTitle: title,
+				};
+			}
+
+			const template = select( STORE_NAME ).getEditedEntityRecord(
+				kind,
+				name,
+				key
+			);
+
+			const { default_template_types: templateTypes = [] } =
+				select( STORE_NAME ).getCurrentTheme() ?? {};
+
+			return {
+				entityRecordTitle: getTemplateInfo( {
+					template,
+					templateTypes,
+				} ).title,
+			};
+		},
+		[ name, kind, title, key ]
+	);
+
+	return (
+		<>
+			<PanelRow>
+				<CheckboxControl
+					label={
+						decodeEntities( entityRecordTitle ) || __( 'Untitled' )
+					}
+					checked={ checked }
+					onChange={ onChange }
+					className="entities-saved-states__change-control"
+				/>
+			</PanelRow>
+		</>
+	);
+}