Editor: Update the store to use Core Data entities.

docs/designers-developers/developers/data/data-core-editor.md

@@ -192,6 +192,8 @@ _Related_
 
 <a name="getBlocksForSerialization" href="#getBlocksForSerialization">#</a> **getBlocksForSerialization**
 
+> **Deprecated** since Gutenberg 6.2.0.
+
 Returns a set of blocks which are to be used in consideration of the post's
 generated save content.
 
@@ -309,8 +311,7 @@ _Returns_
 
 <a name="getEditedPostContent" href="#getEditedPostContent">#</a> **getEditedPostContent**
 
-Returns the content of the post being edited, preferring raw string edit
-before falling back to serialization of block state.
+Returns the content of the post being edited.
 
 _Parameters_
 
@@ -740,6 +741,7 @@ Return true if the current post has already been published.
 _Parameters_
 
 -   _state_ `Object`: Global application state.
+-   _currentPost_ `?Object`: Explicit current post for bypassing registry selector.
 
 _Returns_
 
@@ -1041,10 +1043,6 @@ _Parameters_
 
 -   _edits_ `Object`: Post attributes to edit.
 
-_Returns_
-
--   `Object`: Action object.
-
 <a name="enablePublishSidebar" href="#enablePublishSidebar">#</a> **enablePublishSidebar**
 
 Returns an action object used in signalling that the user has enabled the
@@ -1178,10 +1176,6 @@ _Related_
 Returns an action object used in signalling that undo history should
 restore last popped state.
 
-_Returns_
-
--   `Object`: Action object.
-
 <a name="refreshPost" href="#refreshPost">#</a> **refreshPost**
 
 Action generator for handling refreshing the current post.
@@ -1240,10 +1234,6 @@ _Parameters_
 -   _blocks_ `Array`: Block Array.
 -   _options_ `?Object`: Optional options.
 
-_Returns_
-
--   `Object`: Action object
-
 <a name="resetPost" href="#resetPost">#</a> **resetPost**
 
 Returns an action object used in signalling that the latest version of the
@@ -1357,10 +1347,6 @@ Action generator for trashing the current post in the editor.
 
 Returns an action object used in signalling that undo history should pop.
 
-_Returns_
-
--   `Object`: Action object.
-
 <a name="unlockPostSaving" href="#unlockPostSaving">#</a> **unlockPostSaving**
 
 Returns an action object used to signal that post saving is unlocked.

docs/designers-developers/developers/data/data-core.md

@@ -217,6 +217,22 @@ _Returns_
 
 -   `?Object`: The entity record's save error.
 
+<a name="getRawEntityRecord" href="#getRawEntityRecord">#</a> **getRawEntityRecord**
+
+Returns the entity's record object by key,
+with its attributes mapped to their raw values.
+
+_Parameters_
+
+-   _state_ `Object`: State tree.
+-   _kind_ `string`: Entity kind.
+-   _name_ `string`: Entity name.
+-   _key_ `number`: Record's key.
+
+_Returns_
+
+-   `?Object`: Object with the entity's raw attributes.
+
 <a name="getRedoEdit" href="#getRedoEdit">#</a> **getRedoEdit**
 
 Returns the next edit from the current undo offset

packages/block-editor/src/components/block-list/block.js

@@ -691,6 +691,7 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, { select } ) => {
 		replaceBlocks,
 		toggleSelection,
 		setNavigationMode,
+		__unstableMarkLastChangeAsPersistent,
 	} = dispatch( 'core/block-editor' );
 
 	return {
@@ -744,6 +745,12 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, { select } ) => {
 			}
 		},
 		onReplace( blocks, indexToSelect ) {
+			if (
+				blocks.length &&
+				! isUnmodifiedDefaultBlock( blocks[ blocks.length - 1 ] )
+			) {
+				__unstableMarkLastChangeAsPersistent();
+			}
 			replaceBlocks( [ ownProps.clientId ], blocks, indexToSelect );
 		},
 		onShiftSelection() {

packages/core-data/README.md

@@ -428,6 +428,22 @@ _Returns_
 
 -   `?Object`: The entity record's save error.
 
+<a name="getRawEntityRecord" href="#getRawEntityRecord">#</a> **getRawEntityRecord**
+
+Returns the entity's record object by key,
+with its attributes mapped to their raw values.
+
+_Parameters_
+
+-   _state_ `Object`: State tree.
+-   _kind_ `string`: Entity kind.
+-   _name_ `string`: Entity name.
+-   _key_ `number`: Record's key.
+
+_Returns_
+
+-   `?Object`: Object with the entity's raw attributes.
+
 <a name="getRedoEdit" href="#getRedoEdit">#</a> **getRedoEdit**
 
 Returns the next edit from the current undo offset

packages/core-data/src/actions.js

@@ -132,7 +132,7 @@ export function* editEntityRecord( kind, name, recordId, edits ) {
 		kind,
 		name
 	);
-	const record = yield select( 'getEntityRecord', kind, name, recordId );
+	const record = yield select( 'getRawEntityRecord', kind, name, recordId );
 	const editedRecord = yield select(
 		'getEditedEntityRecord',
 		kind,
@@ -147,9 +147,9 @@ export function* editEntityRecord( kind, name, recordId, edits ) {
 		// Clear edits when they are equal to their persisted counterparts
 		// so that the property is not considered dirty.
 		edits: Object.keys( edits ).reduce( ( acc, key ) => {
-			const recordValue = get( record[ key ], 'raw', record[ key ] );
+			const recordValue = record[ key ];
 			const value = mergedEdits[ key ] ?
-				merge( recordValue, edits[ key ] ) :
+				merge( {}, recordValue, edits[ key ] ) :
 				edits[ key ];
 			acc[ key ] = isEqual( recordValue, value ) ? undefined : value;
 			return acc;
@@ -235,9 +235,14 @@ export function* saveEntityRecord(
 	let error;
 	try {
 		const path = `${ entity.baseURL }${ recordId ? '/' + recordId : '' }`;
+
 		if ( isAutosave ) {
+			// 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,
+			// so the client just sends and receives objects.
 			const persistedRecord = yield select(
-				'getEntityRecord',
+				'getRawEntityRecord',
 				kind,
 				name,
 				recordId
@@ -255,18 +260,49 @@ export function* saveEntityRecord(
 			// to the actual persisted entity if the edits don't
 			// have a value.
 			let data = { ...persistedRecord, ...autosavePost, ...record };
-			data = Object.keys( data ).reduce( ( acc, key ) => {
-				if ( key in [ 'title', 'excerpt', 'content' ] ) {
-					acc[ key ] = get( data[ key ], 'raw', data[ key ] );
-				}
-				return acc;
-			}, {} );
+			data = Object.keys( data ).reduce(
+				( acc, key ) => {
+					if ( [ 'title', 'excerpt', 'content' ].includes( key ) ) {
+						// Edits should be the "raw" attribute values.
+						acc[ key ] = get( data[ key ], 'raw', data[ key ] );
+					}
+					return acc;
+				},
+				{ status: data.status === 'auto-draft' ? 'draft' : data.status }
+			);
 			updatedRecord = yield apiFetch( {
 				path: `${ path }/autosaves`,
 				method: 'POST',
 				data,
 			} );
-			yield receiveAutosaves( persistedRecord.id, updatedRecord );
+			// An autosave may be processed by the server as a regular save
+			// when its update is requested by the author and the post had
+			// draft or auto-draft status.
+			if ( persistedRecord.id === updatedRecord.id ) {
+				let newRecord = { ...persistedRecord, ...data, ...updatedRecord };
+				newRecord = Object.keys( newRecord ).reduce( ( acc, key ) => {
+					// These properties are persisted in autosaves.
+					if ( [ 'title', 'excerpt', 'content' ].includes( key ) ) {
+						// Edits should be the "raw" attribute values.
+						acc[ key ] = get( newRecord[ key ], 'raw', newRecord[ key ] );
+					} else if ( key === 'status' ) {
+						// Status is only persisted in autosaves when going from
+						// "auto-draft" to "draft".
+						acc[ key ] =
+							persistedRecord.status === 'auto-draft' &&
+							newRecord.status === 'draft' ?
+								newRecord.status :
+								persistedRecord.status;
+					} else {
+						// These properties are not persisted in autosaves.
+						acc[ key ] = get( persistedRecord[ key ], 'raw', persistedRecord[ key ] );
+					}
+					return acc;
+				}, {} );
+				yield receiveEntityRecords( kind, name, newRecord, undefined, true );
+			} else {
+				yield receiveAutosaves( persistedRecord.id, updatedRecord );
+			}
 		} else {
 			updatedRecord = yield apiFetch( {
 				path,

packages/core-data/src/reducer.js

@@ -167,6 +167,9 @@ function entity( entityConfig ) {
 								// If the edited value is still different to the persisted value,
 								// keep the edited value in edits.
 								if (
+									// Edits are the "raw" attribute values, but records may have
+									// objects with more properties, so we use `get` here for the
+									// comparison.
 									! isEqual( edits[ key ], get( record[ key ], 'raw', record[ key ] ) )
 								) {
 									acc[ key ] = edits[ key ];
@@ -330,18 +333,19 @@ export function undo( state = UNDO_INITIAL_STATE, action ) {
 						edits: { ...state.flattenedUndo, ...action.meta.undo.edits },
 					},
 				];
-			} else {
-				// Clear potential redos, because this only supports linear history.
-				nextState = state.slice( 0, state.offset || undefined );
-				nextState.flattenedUndo = state.flattenedUndo;
+				nextState.offset = 0;
+				return nextState;
 			}
+
+			// Clear potential redos, because this only supports linear history.
+			nextState = state.slice( 0, state.offset || undefined );
 			nextState.offset = 0;
 
 			nextState.push( {
 				kind: action.kind,
 				name: action.name,
 				recordId: action.recordId,
-				edits: { ...nextState.flattenedUndo, ...action.edits },
+				edits: { ...action.edits, ...state.flattenedUndo },
 			} );
 
 			return nextState;

packages/core-data/src/selectors.js

@@ -107,6 +107,34 @@ export function getEntityRecord( state, kind, name, key ) {
 	return get( state.entities.data, [ kind, name, 'queriedData', 'items', key ] );
 }
 
+/**
+ * Returns the entity's record object by key,
+ * with its attributes mapped to their raw values.
+ *
+ * @param {Object} state  State tree.
+ * @param {string} kind   Entity kind.
+ * @param {string} name   Entity name.
+ * @param {number} key    Record's key.
+ *
+ * @return {Object?} Object with the entity's raw attributes.
+ */
+export const getRawEntityRecord = createSelector(
+	( state, kind, name, key ) => {
+		const record = getEntityRecord( state, kind, name, key );
+		return (
+			record &&
+							Object.keys( record ).reduce( ( acc, _key ) => {
+								// Because edits are the "raw" attribute values,
+								// we return those from record selectors to make rendering,
+								// comparisons, and joins with edits easier.
+								acc[ _key ] = get( record[ _key ], 'raw', record[ _key ] );
+								return acc;
+							}, {} )
+		);
+	},
+	( state ) => [ state.entities.data ]
+);
+
 /**
  * Returns the Entity's records.
  *
@@ -156,8 +184,7 @@ export function getEntityRecordEdits( state, kind, name, recordId ) {
 export const getEntityRecordNonTransientEdits = createSelector(
 	( state, kind, name, recordId ) => {
 		const { transientEdits = {} } = getEntity( state, kind, name );
-		const edits =
-							getEntityRecordEdits( state, kind, name, recordId ) || [];
+		const edits = getEntityRecordEdits( state, kind, name, recordId ) || [];
 		return Object.keys( edits ).reduce( ( acc, key ) => {
 			if ( ! transientEdits[ key ] ) {
 				acc[ key ] = edits[ key ];
@@ -194,16 +221,10 @@ export function hasEditsForEntityRecord( state, kind, name, recordId ) {
  * @return {Object?} The entity record, merged with its edits.
  */
 export const getEditedEntityRecord = createSelector(
-	( state, kind, name, recordId ) => {
-		const record = getEntityRecord( state, kind, name, recordId );
-		return {
-			...Object.keys( record ).reduce( ( acc, key ) => {
-				acc[ key ] = get( record[ key ], 'raw', record[ key ] );
-				return acc;
-			}, {} ),
-			...getEntityRecordEdits( state, kind, name, recordId ),
-		};
-	},
+	( state, kind, name, recordId ) => ( {
+		...getRawEntityRecord( state, kind, name, recordId ),
+		...getEntityRecordEdits( state, kind, name, recordId ),
+	} ),
 	( state ) => [ state.entities.data ]
 );
 
@@ -237,12 +258,11 @@ export function isAutosavingEntityRecord( state, kind, name, recordId ) {
  * @return {boolean} Whether the entity record is saving or not.
  */
 export function isSavingEntityRecord( state, kind, name, recordId ) {
-	const { pending, isAutosave } = get(
+	return get(
 		state.entities.data,
-		[ kind, name, 'saving', recordId ],
-		{}
+		[ kind, name, 'saving', recordId, 'pending' ],
+		false
 	);
-	return Boolean( pending && ! isAutosave );
 }
 
 /**