[Yjs Collab] fix tests

packages/core-data/src/hooks/test/use-entity-record.js

@@ -64,6 +64,7 @@ describe( 'useEntityRecord', () => {
 				parse: false,
 			} )
 		);
+		await waitFor( () => expect( data.status ).not.toEqual( 'RESOLVING' ) );
 
 		expect( data ).toEqual( {
 			edit: expect.any( Function ),

packages/core-data/src/hooks/use-entity-block-editor.js

@@ -37,7 +37,8 @@ export default function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
 	// @todo is this where the content is set / updated?
 	const providerId = useEntityId( kind, name );
 	const id = _id ?? providerId;
-	const { getEntityRecord, getEntityRecordEdits, getEntityConfig } = useSelect( STORE_NAME );
+	const { getEntityRecord, getEntityRecordEdits, getEntityConfig } =
+		useSelect( STORE_NAME );
 	const { content, editedBlocks, meta } = useSelect(
 		( select ) => {
 			if ( ! id ) {
@@ -106,10 +107,7 @@ export default function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
 			const edits = {
 				selection,
 				content: ( { blocks: blocksForSerialization = [] } ) => {
-					const entityConfig = getEntityConfig(
-						kind,
-						name
-					);
+					const entityConfig = getEntityConfig( kind, name );
 					const objectId = entityConfig.getSyncObjectId( id );
 					return __unstableSerializeAndCleanWithYdoc(
 						blocksForSerialization,
@@ -133,7 +131,7 @@ export default function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
 			meta,
 			__unstableCreateUndoLevel,
 			editEntityRecord,
-			getEntityConfig
+			getEntityConfig,
 		]
 	);
 

packages/core-data/src/resolvers.js

@@ -179,13 +179,15 @@ export const getEntityRecord =
 				}
 			}
 			registry.batch( () => {
-				if (window.__experimentalEnableHeartbeatSync = true) {
+				if ( ( window.__experimentalEnableHeartbeatSync = true ) ) {
 					// @todo put this somewhere else.
 					// The document is collaborative. decrease autosave interval.
-					registry.dispatch( 'core/editor' ).updateEditorSettings( {
-						autosaveInterval: 5,
-						localAutosaveInterval: 4,
-					} );
+					registry
+						.dispatch?.( 'core/editor' )
+						?.updateEditorSettings?.( {
+							autosaveInterval: 5,
+							localAutosaveInterval: 4,
+						} );
 				}
 				dispatch.receiveEntityRecords( kind, name, record, query );
 				dispatch.receiveUserPermissions( receiveUserPermissionArgs );

packages/editor/src/components/post-text-editor/index.js

@@ -26,21 +26,30 @@ import { store as editorStore } from '../../store';
  */
 export default function PostTextEditor() {
 	const instanceId = useInstanceId( PostTextEditor );
-	const { content, blocks, type, id, entityConfig } = useSelect( ( select ) => {
-		const { getEditedEntityRecord, getEntityConfig } = select( coreStore );
-		const { getCurrentPostType, getCurrentPostId } = select( editorStore );
-		const _type = getCurrentPostType();
-		const _id = getCurrentPostId();
-		const editedRecord = getEditedEntityRecord( 'postType', _type, _id );
-		const _entityConfig = getEntityConfig('postType', _type)
-		return {
-			entityConfig: _entityConfig,
-			content: editedRecord?.content,
-			blocks: editedRecord?.blocks,
-			type: _type,
-			id: _id,
-		};
-	}, [] );
+	const { content, blocks, type, id, entityConfig } = useSelect(
+		( select ) => {
+			const { getEditedEntityRecord, getEntityConfig } =
+				select( coreStore );
+			const { getCurrentPostType, getCurrentPostId } =
+				select( editorStore );
+			const _type = getCurrentPostType();
+			const _id = getCurrentPostId();
+			const editedRecord = getEditedEntityRecord(
+				'postType',
+				_type,
+				_id
+			);
+			const _entityConfig = getEntityConfig( 'postType', _type );
+			return {
+				entityConfig: _entityConfig,
+				content: editedRecord?.content,
+				blocks: editedRecord?.blocks,
+				type: _type,
+				id: _id,
+			};
+		},
+		[]
+	);
 	const { editEntityRecord } = useDispatch( coreStore );
 	// Replicates the logic found in getEditedPostContent().
 	const value = useMemo( () => {

packages/editor/src/store/selectors.js

@@ -5,6 +5,7 @@ import {
 	getFreeformContentHandlerName,
 	getDefaultBlockName,
 	__unstableSerializeAndCleanWithYdoc,
+	__unstableSerializeAndClean,
 	parse,
 } from '@wordpress/blocks';
 import { isInTheFuture, getDate } from '@wordpress/date';
@@ -916,6 +917,7 @@ export const getEditedPostContent = createRegistrySelector(
 	( select ) => ( state ) => {
 		const postId = getCurrentPostId( state );
 		const postType = getCurrentPostType( state );
+
 		const record = select( coreStore ).getEditedEntityRecord(
 			'postType',
 			postType,
@@ -929,7 +931,10 @@ export const getEditedPostContent = createRegistrySelector(
 					'postType',
 					postType
 				);
-				const objectId = entityConfig.getSyncObjectId( record.id );
+				const objectId = entityConfig.getSyncObjectId?.( record.id );
+				if ( objectId === null ) {
+					return __unstableSerializeAndClean( record.blocks );
+				}
 				return __unstableSerializeAndCleanWithYdoc(
 					record.blocks,
 					entityConfig.syncObjectType,

packages/editor/src/store/test/selectors.js

@@ -45,6 +45,12 @@ selectorNames.forEach( ( name ) => {
 				);
 			},
 
+			getEntityConfig() {
+				return {
+					getSyncObjectId: () => '0',
+				};
+			},
+
 			getEntityRecordEdits() {
 				const present = state.editor && state.editor.present;
 				let edits = present && present.edits;

packages/sync/src/create-webrtc-connection.js

@@ -33,7 +33,7 @@ export function createWebRTCConnection( { signaling, password } ) {
 				// @ts-ignore
 				password,
 			} );
-		} catch (err) {
+		} catch ( err ) {
 			// nop
 		}
 		return Promise.resolve( () => true );

packages/sync/src/index.js

@@ -62,19 +62,22 @@ let syncProvider;
 
 export function getSyncProvider() {
 	if ( ! syncProvider ) {
+		// @ts-ignore
+		const connectionProvider = window?.__experimentalEnableWebrtcSync
+			? createWebRTCConnection( {
+					signaling: [
+						// @ts-ignore
+						window?.wp?.ajax?.settings?.url,
+						//'ws://localhost:4444',
+					],
+					// @ts-ignore
+					password: window?.__experimentalCollaborativeEditingSecret,
+			  } )
+			: null;
 		syncProvider = createSyncProvider(
 			// connectIndexDb,
 			null,
-			// @ts-ignore
-			window?.__experimentalEnableWebrtcSync ? createWebRTCConnection( {
-				signaling: [
-					// @ts-ignore
-					window?.wp?.ajax?.settings?.url,
-					//'ws://localhost:4444',
-				],
-				// @ts-ignore
-				password: window?.__experimentalCollaborativeEditingSecret,
-			} ) : null
+			connectionProvider
 		);
 	}
 	return syncProvider;

packages/sync/src/provider.js

@@ -36,7 +36,7 @@ export const createSyncProvider = ( connectLocal, connectRemote ) => {
 	const docs = {};
 
 	// @ts-ignore
-	if (window.__experimentalEnableHeartbeatSync) {
+	if ( window.__experimentalEnableHeartbeatSync ) {
 		addAction( 'heartbeat.tick', 'y-sync', ( data ) => {
 			if ( ! data[ 'y-sync' ] ) {
 				return;
@@ -46,7 +46,8 @@ export const createSyncProvider = ( connectLocal, connectRemote ) => {
 					Object.entries( objectDocs ).forEach(
 						( [ objectId, remoteDocDef ] ) => {
 							const localDocDef =
-								( docs[ objectType ] || {} )[ objectId ] || null;
+								( docs[ objectType ] || {} )[ objectId ] ||
+								null;
 							if ( localDocDef ) {
 								Y.applyUpdateV2(
 									localDocDef.ydoc,

packages/sync/tsconfig.json

@@ -4,5 +4,8 @@
 	"compilerOptions": {
 		"types": [ "node" ]
 	},
-	"references": [ { "path": "../url" } ]
+	"references": [
+		{ "path": "../url" },
+		{ "path": "../hooks" }
+	]
 }