Merge branch 'MatrixOt' into AddColRowMaps

vladsud · Feb 9, 2024 · 1725d68 · 1725d68
2 parents f586702 + 108d361
commit 1725d68
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/packages/framework/collabspaces/api-report/collabspaces.api.md b/packages/framework/collabspaces/api-report/collabspaces.api.md
@@ -16,7 +16,7 @@ import { Serializable } from '@fluidframework/datastore-definitions';
 export type CollabSpaceCellType = MatrixItem<MatrixExternalType>;
 
 // @internal (undocumented)
-export function createCollabSpace(sharedObjects: Readonly<ICollabChannelFactory[]>): IFluidDataStoreFactory;
+export function createCollabSpaces(sharedObjects: Readonly<ICollabChannelFactory[]>): IFluidDataStoreFactory;
 
 // @internal (undocumented)
 export type ICollabChannel = IChannel & ICollabChannelCore;

diff --git a/packages/framework/collabspaces/src/collabSpaces.ts b/packages/framework/collabspaces/src/collabSpaces.ts
@@ -187,7 +187,7 @@ function isChannelDeffered(type?: string) {
 */
 
 /** @internal */
-export class TempCollabSpaceRuntime
+export class CollabSpacesRuntime
 	extends FluidDataStoreRuntime<ISharedMatrixEvents<MatrixExternalType>>
 	implements IEfficientMatrix
 {

diff --git a/packages/framework/collabspaces/src/deferreChannel.ts b/packages/framework/collabspaces/src/deferreChannel.ts
@@ -31,7 +31,7 @@ const snapshotFileName = "header";
  */
 export class DeferredChannel extends SharedObject implements ICollabChannel {
 	readonly type = DeferredChannel.Type;
-	static readonly Type = "CollabSpacedDeferredChannelType";
+	static readonly Type = "CollabSpaceDeferredChannelType";
 
 	private ops: ISequencedDocumentMessage[] = [];
 
@@ -44,7 +44,7 @@ export class DeferredChannel extends SharedObject implements ICollabChannel {
 		runtime: IFluidDataStoreRuntime,
 		attributes: IChannelAttributes,
 	) {
-		super(id, runtime, attributes, "fluid_collabspaces_deferred");
+		super(id, runtime, attributes, "fluid_collabspace_deferred");
 	}
 
 	public get value() {

diff --git a/packages/framework/collabspaces/src/factory.ts b/packages/framework/collabspaces/src/factory.ts
@@ -11,16 +11,16 @@ import {
 import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
 
 import { IEfficientMatrix, ICollabChannelFactory } from "./contracts";
-import { TempCollabSpaceRuntime } from "./collabSpaces";
+import { CollabSpacesRuntime } from "./collabSpaces";
 
 /**
  *
  * Factory for collab spaces
  *
  */
 /** @internal */
-class TempCollabSpaceRuntimeFactory implements IFluidDataStoreFactory {
-	public readonly type = "CollabSpace-DataStore";
+class CollabSpacesRuntimeFactory implements IFluidDataStoreFactory {
+	public readonly type = "CollabSpaces-DataStore";
 	constructor(private readonly sharedObjects: readonly ICollabChannelFactory[]) {}
 
 	public get IFluidDataStoreFactory() {
@@ -31,12 +31,12 @@ class TempCollabSpaceRuntimeFactory implements IFluidDataStoreFactory {
 		context: IFluidDataStoreContext,
 		existing: boolean,
 	): Promise<IFluidDataStoreChannel> {
-		const runtime = new TempCollabSpaceRuntime(
+		const runtime = new CollabSpacesRuntime(
 			context,
 			this.sharedObjects,
 			existing,
 			async (runtimeArg: IFluidDataStoreRuntime) => {
-				return runtimeArg as TempCollabSpaceRuntime as IEfficientMatrix;
+				return runtimeArg as CollabSpacesRuntime as IEfficientMatrix;
 			},
 		);
 
@@ -46,8 +46,8 @@ class TempCollabSpaceRuntimeFactory implements IFluidDataStoreFactory {
 }
 
 /** @internal */
-export function createCollabSpace(
+export function createCollabSpaces(
 	sharedObjects: Readonly<ICollabChannelFactory[]>,
 ): IFluidDataStoreFactory {
-	return new TempCollabSpaceRuntimeFactory(sharedObjects);
+	return new CollabSpacesRuntimeFactory(sharedObjects);
 }
diff --git a/packages/framework/collabspaces/src/index.ts b/packages/framework/collabspaces/src/index.ts
@@ -12,4 +12,4 @@ export {
 	ICollabChannel,
 	CollabSpaceCellType,
 } from "./contracts";
-export { createCollabSpace } from "./factory";
+export { createCollabSpaces } from "./factory";
diff --git a/packages/framework/collabspaces/src/test/collabSpaces.spec.ts b/packages/framework/collabspaces/src/test/collabSpaces.spec.ts
@@ -30,14 +30,14 @@ import {
 	IEfficientMatrix,
 	IEfficientMatrixTest,
 } from "../contracts";
-import { createCollabSpace } from "../factory";
+import { createCollabSpaces } from "../factory";
 
 import { CounterFactory, ISharedCounter } from "./counterFactory";
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 function sampleFactory() {
-	return createCollabSpace([new CounterFactory()]);
+	return createCollabSpaces([new CounterFactory()]);
 }
 
 /*