@wordpress/core-data 7.45.0 → 7.45.1-next.v.202605131032.0

package/build-types/utils/get-nested-value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-nested-value.d.ts","sourceRoot":"","sources":["../../src/utils/get-nested-value.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,0DAJW,MAAM,QAAM,gBACZ,GAAC,GACA,GAAC,CAgBZ"}
+{"version":3,"file":"get-nested-value.d.ts","sourceRoot":"","sources":["../../src/utils/get-nested-value.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAE,MAAM,KAAA,EAAE,IAAI,EAJzC,MAAM,QAImC,EAAE,YAAY,EAHvD,GAGuD,GAFtD,GAAC,CAgBZ"}

package/build-types/utils/get-normalized-comma-separable.d.ts

@@ -1,4 +1,3 @@
-export default getNormalizedCommaSeparable;
 /**
  * Given a value which can be specified as one or the other of a comma-separated
  * string or an array, returns a value normalized to an array of strings, or
@@ -9,4 +8,5 @@ export default getNormalizedCommaSeparable;
  * @return {?(string[])} Normalized field value.
  */
 declare function getNormalizedCommaSeparable(value: string | string[] | any): (string[]) | null;
+export default getNormalizedCommaSeparable;
 //# sourceMappingURL=get-normalized-comma-separable.d.ts.map

package/build-types/utils/get-normalized-comma-separable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-normalized-comma-separable.d.ts","sourceRoot":"","sources":["../../src/utils/get-normalized-comma-separable.js"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AACH,oDAJW,MAAM,GAAC,MAAM,EAAE,GAAC,GAAC,GAEf,CAAC,MAAM,EAAE,CAAC,OAAA,CAUtB"}
+{"version":3,"file":"get-normalized-comma-separable.d.ts","sourceRoot":"","sources":["../../src/utils/get-normalized-comma-separable.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,iBAAS,2BAA2B,CAAE,KAAK,EAJhC,MAAM,GAAC,MAAM,EAAE,GAAC,GAIgB,GAF9B,CAAC,MAAM,EAAE,CAAC,OAAA,CAUtB;eAEc,2BAA2B"}

package/build-types/utils/if-matching-action.d.ts

@@ -1,6 +1,5 @@
-export default ifMatchingAction;
-export type AnyFunction = import("../types").AnyFunction;
 /** @typedef {import('../types').AnyFunction} AnyFunction */
+export type AnyFunction = import('../types').AnyFunction;
 /**
  * A higher-order reducer creator which invokes the original reducer only if
  * the dispatching action matches the given predicate, **OR** if state is
@@ -10,5 +9,6 @@ export type AnyFunction = import("../types").AnyFunction;
  *
  * @return {AnyFunction} Higher-order reducer.
  */
-declare function ifMatchingAction(isMatch: AnyFunction): AnyFunction;
+declare const ifMatchingAction: (isMatch: AnyFunction) => AnyFunction;
+export default ifMatchingAction;
 //# sourceMappingURL=if-matching-action.d.ts.map

package/build-types/utils/if-matching-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"if-matching-action.d.ts","sourceRoot":"","sources":["../../src/utils/if-matching-action.js"],"names":[],"mappings":";0BAAc,OAAO,UAAU,EAAE,WAAW;AAA5C,4DAA4D;AAE5D;;;;;;;;GAQG;AACH,2CAJW,WAAW,GAEV,WAAW,CAQtB"}
+{"version":3,"file":"if-matching-action.d.ts","sourceRoot":"","sources":["../../src/utils/if-matching-action.js"],"names":[],"mappings":"AAAA,4DAA4D;AAAxD,YAA0C,WAAW,GAA3C,OAAO,UAAU,EAAE,WAAW,CAAa;AAEzD;;;;;;;;GAQG;AACH,QAAA,MAAM,gBAAgB,YAJX,WAAW,KAEV,WAQX,CAAC;eAEa,gBAAgB"}

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

@@ -1,13 +1,13 @@
-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 replaceAction } from "./replace-action";
-export { default as withWeakMapCache } from "./with-weak-map-cache";
-export { default as setNestedValue } from "./set-nested-value";
-export { default as getNestedValue } from "./get-nested-value";
-export { default as isNumericID } from "./is-numeric-id";
-export { RECEIVE_INTERMEDIATE_RESULTS } from "./receive-intermediate-results";
-export { default as normalizeQueryForResolution } from "./normalize-query-for-resolution";
-export { getUserPermissionCacheKey, getUserPermissionsFromAllowHeader, ALLOWED_RESOURCE_ACTIONS } from "./user-permissions";
+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 replaceAction } from './replace-action';
+export { default as withWeakMapCache } from './with-weak-map-cache';
+export { default as setNestedValue } from './set-nested-value';
+export { default as getNestedValue } from './get-nested-value';
+export { default as isNumericID } from './is-numeric-id';
+export { getUserPermissionCacheKey, getUserPermissionsFromAllowHeader, ALLOWED_RESOURCE_ACTIONS, } from './user-permissions';
+export { RECEIVE_INTERMEDIATE_RESULTS } from './receive-intermediate-results';
+export { default as normalizeQueryForResolution } from './normalize-query-for-resolution';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.js"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EACN,yBAAyB,EACzB,iCAAiC,EACjC,wBAAwB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,2BAA2B,EAAE,MAAM,kCAAkC,CAAC"}

package/build-types/utils/is-numeric-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-numeric-id.d.ts","sourceRoot":"","sources":["../../src/utils/is-numeric-id.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wCAHW,GAAG,GACF,OAAO,CAIlB"}
+{"version":3,"file":"is-numeric-id.d.ts","sourceRoot":"","sources":["../../src/utils/is-numeric-id.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAE,EAAE,EAH5B,GAG4B,GAF3B,OAAO,CAIlB"}

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

@@ -8,7 +8,7 @@
  * @param options.alternativeFunctionName The name of the alternative function that should be used instead.
  * @param options.isShorthandSelector     Whether the function is a shorthand selector.
  */
-export default function logEntityDeprecation(kind: string, name: string, functionName: string, { alternativeFunctionName, isShorthandSelector, }?: {
+export default function logEntityDeprecation(kind: string, name: string, functionName: string, { alternativeFunctionName, isShorthandSelector }?: {
     alternativeFunctionName?: string;
     isShorthandSelector?: boolean;
 }): void;

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":"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,EAC3B,GAAE;IACF,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACzB,QAkCN"}

package/build-types/utils/normalize-query-for-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-query-for-resolution.d.ts","sourceRoot":"","sources":["../../src/utils/normalize-query-for-resolution.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,iEAFY,MAAO,SAAS,CAc3B"}
+{"version":3,"file":"normalize-query-for-resolution.d.ts","sourceRoot":"","sources":["../../src/utils/normalize-query-for-resolution.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,2BAA2B,CAAE,KAAK,KAAA,GAF9C,MAAO,SAAS,CAc3B"}

package/build-types/utils/receive-intermediate-results.d.ts

@@ -1,2 +1,2 @@
-export const RECEIVE_INTERMEDIATE_RESULTS: unique symbol;
+export declare const RECEIVE_INTERMEDIATE_RESULTS: unique symbol;
 //# sourceMappingURL=receive-intermediate-results.d.ts.map

package/build-types/utils/receive-intermediate-results.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"receive-intermediate-results.d.ts","sourceRoot":"","sources":["../../src/utils/receive-intermediate-results.js"],"names":[],"mappings":"AAAA,yDAEE"}
+{"version":3,"file":"receive-intermediate-results.d.ts","sourceRoot":"","sources":["../../src/utils/receive-intermediate-results.js"],"names":[],"mappings":"AAAA,eAAO,MAAM,4BAA4B,eAExC,CAAC"}

package/build-types/utils/replace-action.d.ts

@@ -1,6 +1,5 @@
-export default replaceAction;
-export type AnyFunction = import("../types").AnyFunction;
 /** @typedef {import('../types').AnyFunction} AnyFunction */
+export type AnyFunction = import('../types').AnyFunction;
 /**
  * Higher-order reducer creator which substitutes the action object before
  * passing to the original reducer.
@@ -9,5 +8,6 @@ export type AnyFunction = import("../types").AnyFunction;
  *
  * @return {AnyFunction} Higher-order reducer.
  */
-declare function replaceAction(replacer: AnyFunction): AnyFunction;
+declare const replaceAction: (replacer: AnyFunction) => AnyFunction;
+export default replaceAction;
 //# sourceMappingURL=replace-action.d.ts.map

package/build-types/utils/replace-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-action.d.ts","sourceRoot":"","sources":["../../src/utils/replace-action.js"],"names":[],"mappings":";0BAAc,OAAO,UAAU,EAAE,WAAW;AAA5C,4DAA4D;AAE5D;;;;;;;GAOG;AACH,yCAJW,WAAW,GAEV,WAAW,CAItB"}
+{"version":3,"file":"replace-action.d.ts","sourceRoot":"","sources":["../../src/utils/replace-action.js"],"names":[],"mappings":"AAAA,4DAA4D;AAAxD,YAA0C,WAAW,GAA3C,OAAO,UAAU,EAAE,WAAW,CAAa;AAEzD;;;;;;;GAOG;AACH,QAAA,MAAM,aAAa,aAJR,WAAW,KAEV,WAIX,CAAC;eAEa,aAAa"}

package/build-types/utils/set-nested-value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-nested-value.d.ts","sourceRoot":"","sources":["../../src/utils/set-nested-value.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,0DAHW,QAAM,MAAM,SACZ,GAAC,OAwBX"}
+{"version":3,"file":"set-nested-value.d.ts","sourceRoot":"","sources":["../../src/utils/set-nested-value.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAE,MAAM,KAAA,EAAE,IAAI,EAHzC,QAAM,MAGmC,EAAE,KAAK,EAFhD,GAEgD,OAsB1D"}

package/build-types/utils/user-permissions.d.ts

@@ -1,4 +1,4 @@
-export function getUserPermissionsFromAllowHeader(allowedMethods: any): {};
-export function getUserPermissionCacheKey(action: any, resource: any, id: any): string;
-export const ALLOWED_RESOURCE_ACTIONS: string[];
+export declare const ALLOWED_RESOURCE_ACTIONS: string[];
+export declare function getUserPermissionsFromAllowHeader(allowedMethods: any): {};
+export declare function getUserPermissionCacheKey(action: any, resource: any, id: any): string;
 //# sourceMappingURL=user-permissions.d.ts.map

package/build-types/utils/user-permissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-permissions.d.ts","sourceRoot":"","sources":["../../src/utils/user-permissions.js"],"names":[],"mappings":"AAOA,2EAgBC;AAED,uFAUC;AAnCD,gDAKE"}
+{"version":3,"file":"user-permissions.d.ts","sourceRoot":"","sources":["../../src/utils/user-permissions.js"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,UAKpC,CAAC;AAEF,wBAAgB,iCAAiC,CAAE,cAAc,KAAA,MAgBhE;AAED,wBAAgB,yBAAyB,CAAE,MAAM,KAAA,EAAE,QAAQ,KAAA,EAAE,EAAE,KAAA,UAU9D"}

package/build-types/utils/with-weak-map-cache.d.ts

@@ -1,4 +1,3 @@
-export default withWeakMapCache;
 /**
  * Given a function, returns an enhanced function which caches the result and
  * tracks in WeakMap. The result is only cached if the original function is
@@ -9,4 +8,5 @@ export default withWeakMapCache;
  * @return {Function} Enhanced caching function.
  */
 declare function withWeakMapCache(fn: Function): Function;
+export default withWeakMapCache;
 //# sourceMappingURL=with-weak-map-cache.d.ts.map

package/build-types/utils/with-weak-map-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-weak-map-cache.d.ts","sourceRoot":"","sources":["../../src/utils/with-weak-map-cache.js"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AACH,0DAoBC"}
+{"version":3,"file":"with-weak-map-cache.d.ts","sourceRoot":"","sources":["../../src/utils/with-weak-map-cache.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,iBAAS,gBAAgB,CAAE,EAAE,UAAA,YAoB5B;eAEc,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "7.45.0",
+	"version": "7.45.1-next.v.202605131032.0+f6d6e7149",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -49,32 +49,32 @@
 		"build-module/index.mjs"
 	],
 	"dependencies": {
-		"@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",
+		"@wordpress/api-fetch": "^7.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/block-editor": "^15.19.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/blocks": "^15.18.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/compose": "^7.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/data": "^10.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/deprecated": "^4.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/element": "^6.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/html-entities": "^4.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/i18n": "^6.18.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/is-shallow-equal": "^5.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/private-apis": "^1.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/rich-text": "^7.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/sync": "^1.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/undo-manager": "^1.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/url": "^4.45.1-next.v.202605131032.0+f6d6e7149",
+		"@wordpress/warning": "^3.45.1-next.v.202605131032.0+f6d6e7149",
 		"change-case": "^4.1.2",
 		"equivalent-key-map": "^0.2.2",
 		"fast-deep-equal": "^3.1.3",
 		"memize": "^2.1.0",
-		"uuid": "^9.0.1"
+		"uuid": "^14.0.0"
 	},
 	"devDependencies": {
 		"@jest/globals": "^30.2.0",
 		"@types/jest": "^29.5.14",
-		"@types/node": "^20.19.0",
+		"@types/node": "^20.19.39",
 		"deep-freeze": "0.0.1"
 	},
 	"peerDependencies": {
@@ -84,5 +84,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "8c229eaed0e88c9827e2da3d73a78f9ddd77714b"
+	"gitHead": "0e198c7ac7ca634e73ded9220ce048c0302174dd"
 }

package/src/actions.js

@@ -597,17 +597,15 @@ export const __unstableCreateUndoLevel =
  *                                                the exceptions. Defaults to false.
  */
 export const saveEntityRecord =
-	(
-		kind,
-		name,
-		record,
-		{
+	( kind, name, record, options = {} ) =>
+	async ( { select, resolveSelect, dispatch } ) => {
+		const {
 			isAutosave = false,
 			__unstableFetch = apiFetch,
+			__unstableSkipSyncUpdate = false,
 			throwOnError = false,
-		} = {}
-	) =>
-	async ( { select, resolveSelect, dispatch } ) => {
+		} = options;
+
 		logEntityDeprecation( kind, name, 'saveEntityRecord' );
 		const configs = await resolveSelect.getEntitiesConfig( kind );
 		const entityConfig = configs.find(
@@ -798,7 +796,7 @@ export const saveEntityRecord =
 						getSyncManager()?.update(
 							`${ kind }/${ name }`,
 							recordId,
-							updatedRecord,
+							__unstableSkipSyncUpdate ? {} : updatedRecord,
 							LOCAL_UNDO_IGNORED_ORIGIN,
 							{ isSave: true }
 						);

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

@@ -16,7 +16,10 @@ import {
 	LOCAL_CURSOR_UPDATE_DEBOUNCE_IN_MS,
 } from './config';
 import { STORE_NAME as coreStore } from '../name';
-import { htmlIndexToRichTextOffset } from '../utils/crdt-utils';
+import {
+	asHtmlStringIndex,
+	htmlIndexToRichTextOffset,
+} from '../utils/crdt-utils';
 import {
 	areSelectionsStatesEqual,
 	getSelectionState,
@@ -291,7 +294,7 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 		return {
 			richTextOffset: htmlIndexToRichTextOffset(
 				absolutePosition.type.toString(),
-				absolutePosition.index
+				asHtmlStringIndex( absolutePosition.index )
 			),
 			localClientId,
 		};

package/src/resolvers.js

@@ -253,7 +253,8 @@ export const getEntityRecord =
 									dispatch.saveEntityRecord(
 										kind,
 										name,
-										editedRecord
+										editedRecord,
+										{ __unstableSkipSyncUpdate: true }
 									);
 								} );
 						},

package/src/test/actions.js

@@ -33,6 +33,7 @@ jest.mock( '../batch', () => {
 jest.mock( '../sync', () => ( {
 	getSyncManager: jest.fn(),
 	LOCAL_EDITOR_ORIGIN: 'local-editor',
+	LOCAL_UNDO_IGNORED_ORIGIN: 'local-undo-ignored',
 } ) );
 
 describe( 'editEntityRecord', () => {
@@ -922,6 +923,63 @@ describe( 'saveEntityRecord', () => {
 		expect( result ).toBe( updatedRecord );
 	} );
 
+	it( 'preserves the live sync title when a CRDT persistence save returns stale post fields', async () => {
+		const liveSyncState = {
+			isSaved: false,
+			title: 'synced title',
+		};
+		const post = { id: 10, title: 'synced title' };
+		const configs = [
+			{
+				name: 'post',
+				kind: 'postType',
+				baseURL: '/wp/v2/posts',
+				syncConfig: {},
+			},
+		];
+		const syncManager = {
+			update: jest.fn(
+				( _objectType, _objectId, changes, _origin, options ) => {
+					if (
+						Object.prototype.hasOwnProperty.call( changes, 'title' )
+					) {
+						liveSyncState.title = changes.title;
+					}
+					if ( options?.isSave ) {
+						liveSyncState.isSaved = true;
+					}
+				}
+			),
+		};
+		const select = {
+			getRawEntityRecord: () => post,
+		};
+		const resolveSelect = { getEntitiesConfig: jest.fn( () => configs ) };
+
+		const staleSaveResponse = { ...post, title: 'initial title' };
+		apiFetch.mockImplementation( () => {
+			return staleSaveResponse;
+		} );
+		getSyncManager.mockReturnValue( syncManager );
+
+		const result = await saveEntityRecord( 'postType', 'post', post, {
+			__unstableSkipSyncUpdate: true,
+		} )( { select, dispatch, resolveSelect } );
+
+		expect( syncManager.update ).toHaveBeenCalledWith(
+			'postType/post',
+			10,
+			{},
+			'local-undo-ignored',
+			{ isSave: true }
+		);
+		expect( liveSyncState ).toEqual( {
+			isSaved: true,
+			title: 'synced title',
+		} );
+		expect( result ).toBe( staleSaveResponse );
+	} );
+
 	it( 'triggers a PUT request for an existing record with a custom key', async () => {
 		const postType = { slug: 'page', title: 'Pages' };
 		const configs = [

package/src/test/resolvers.js

@@ -11,6 +11,7 @@ import { getSyncManager } from '../sync';
 jest.mock( '@wordpress/api-fetch' );
 jest.mock( '../sync', () => ( {
 	getSyncManager: jest.fn(),
+	LOCAL_UNDO_IGNORED_ORIGIN: 'local-undo-ignored',
 } ) );
 
 /**
@@ -24,6 +25,7 @@ import {
 	getAutosaves,
 	getCurrentUser,
 } from '../resolvers';
+import { saveEntityRecord } from '../actions';
 import { RECEIVE_INTERMEDIATE_RESULTS } from '../utils';
 
 describe( 'getEntityRecord', () => {
@@ -285,7 +287,8 @@ describe( 'getEntityRecord', () => {
 		expect( dispatch.saveEntityRecord ).toHaveBeenCalledWith(
 			'postType',
 			'post',
-			EDITED_RECORD
+			EDITED_RECORD,
+			{ __unstableSkipSyncUpdate: true }
 		);
 	} );
 
@@ -336,8 +339,118 @@ describe( 'getEntityRecord', () => {
 		expect( dispatch.saveEntityRecord ).toHaveBeenCalledWith(
 			'postType',
 			'post',
-			POST_RECORD
+			POST_RECORD,
+			{ __unstableSkipSyncUpdate: true }
+		);
+	} );
+
+	it( 'persistCRDTDoc does not replay a stale save response into the sync document', async () => {
+		const INITIAL_TITLE = 'Initial Title';
+		const SYNCED_TITLE = 'Synced Title';
+		const POST_RECORD = { id: 1, title: INITIAL_TITLE, meta: {} };
+		const EDITED_RECORD = { id: 1, title: SYNCED_TITLE, meta: {} };
+		const STALE_SAVE_RESPONSE = {
+			id: 1,
+			title: INITIAL_TITLE,
+			meta: { _crdt_document: 'serialized-crdt-doc' },
+		};
+		const liveSyncState = {
+			isSaved: false,
+			title: SYNCED_TITLE,
+		};
+		const POST_RESPONSE = {
+			json: () => Promise.resolve( POST_RECORD ),
+		};
+		const ENTITIES_WITH_SYNC = [
+			{
+				name: 'post',
+				kind: 'postType',
+				baseURL: '/wp/v2/posts',
+				baseURLParams: { context: 'edit' },
+				syncConfig: {},
+				__unstablePrePersist: jest.fn( async () => ( {
+					meta: { _crdt_document: 'serialized-crdt-doc' },
+				} ) ),
+			},
+		];
+
+		const select = {
+			getEditedEntityRecord: jest.fn( () => EDITED_RECORD ),
+			getRawEntityRecord: jest.fn( () => POST_RECORD ),
+		};
+		const resolveSelectWithSync = {
+			getEntitiesConfig: jest.fn( () => ENTITIES_WITH_SYNC ),
+			getEditedEntityRecord: jest.fn( () =>
+				Promise.resolve( EDITED_RECORD )
+			),
+		};
+		let savePromise;
+
+		syncManager.update = jest.fn(
+			( _objectType, _objectId, changes, _origin, options ) => {
+				if (
+					Object.prototype.hasOwnProperty.call( changes, 'title' )
+				) {
+					liveSyncState.title = changes.title;
+				}
+				if ( options?.isSave ) {
+					liveSyncState.isSaved = true;
+				}
+			}
 		);
+		dispatch.saveEntityRecord = jest.fn(
+			( kind, name, record, options ) => {
+				savePromise = saveEntityRecord(
+					kind,
+					name,
+					record,
+					options
+				)( {
+					select,
+					dispatch,
+					resolveSelect: resolveSelectWithSync,
+				} );
+				return savePromise;
+			}
+		);
+
+		triggerFetch
+			.mockImplementationOnce( () => POST_RESPONSE )
+			.mockImplementationOnce( () => STALE_SAVE_RESPONSE );
+
+		await getEntityRecord(
+			'postType',
+			'post',
+			1
+		)( {
+			dispatch,
+			registry,
+			resolveSelect: resolveSelectWithSync,
+		} );
+
+		const handlers = syncManager.load.mock.calls[ 0 ][ 4 ];
+
+		handlers.persistCRDTDoc();
+		await Promise.resolve();
+		await savePromise;
+
+		expect( dispatch.saveEntityRecord ).toHaveBeenCalledWith(
+			'postType',
+			'post',
+			EDITED_RECORD,
+			{ __unstableSkipSyncUpdate: true }
+		);
+		expect( syncManager.update ).toHaveBeenCalledWith(
+			'postType/post',
+			1,
+			{},
+			'local-undo-ignored',
+			{ isSave: true }
+		);
+		expect( liveSyncState ).toEqual( {
+			isSaved: true,
+			title: SYNCED_TITLE,
+		} );
 	} );
 
 	it( 'provides transient properties when read/write config is supplied', async () => {