Real-time Collaboration: Add user and selection information to awareness

packages/core-data/package.json

@@ -72,6 +72,7 @@
 		"uuid": "^9.0.1"
 	},
 	"devDependencies": {
+		"@types/node": "^20.17.10",
 		"deep-freeze": "0.0.1"
 	},
 	"peerDependencies": {

packages/core-data/src/resolvers.js

@@ -26,6 +26,7 @@ import {
 	isNumericID,
 } from './utils';
 import { fetchBlockPatterns } from './fetch';
+import { subscribeToUserSelectionChanges } from './utils/crdt-user-selections';
 
 /**
  * Requests authors from the REST API.
@@ -192,7 +193,7 @@ export const getEntityRecord =
 						recordWithTransients,
 						{
 							// Handle edits sourced from the sync manager.
-							editRecord: ( edits ) => {
+							editRecord: ( edits, options = {} ) => {
 								if ( ! Object.keys( edits ).length ) {
 									return;
 								}
@@ -206,6 +207,7 @@ export const getEntityRecord =
 									meta: {
 										undo: undefined,
 									},
+									options,
 								} );
 							},
 							// Get the current entity record (with edits)
@@ -232,6 +234,23 @@ export const getEntityRecord =
 									key
 								);
 							},
+							// Get the current user.
+							getCurrentUser: async () => {
+								await resolveSelect.getCurrentUser();
+							},
+							// Subscribe to user selection changes.
+							subscribeToUserSelectionChanges: (
+								yDoc,
+								setSelectionState
+							) => {
+								subscribeToUserSelectionChanges(
+									kind,
+									name,
+									key,
+									yDoc,
+									setSelectionState
+								);
+							},
 						}
 					);
 				}

packages/core-data/src/test/resolvers.js

@@ -172,6 +172,8 @@ describe( 'getEntityRecord', () => {
 				getEditedRecord: expect.any( Function ),
 				refetchRecord: expect.any( Function ),
 				saveRecord: expect.any( Function ),
+				getCurrentUser: expect.any( Function ),
+				subscribeToUserSelectionChanges: expect.any( Function ),
 			}
 		);
 	} );
@@ -225,6 +227,8 @@ describe( 'getEntityRecord', () => {
 				getEditedRecord: expect.any( Function ),
 				refetchRecord: expect.any( Function ),
 				saveRecord: expect.any( Function ),
+				getCurrentUser: expect.any( Function ),
+				subscribeToUserSelectionChanges: expect.any( Function ),
 			}
 		);
 	} );