@fluidframework/datastore 2.0.0-dev-rc.3.0.0.250606 → 2.0.0-dev-rc.3.0.0.254274

package/src/channelContext.ts

@@ -10,23 +10,23 @@ import {
 	IChannelFactory,
 	IFluidDataStoreRuntime,
 } from "@fluidframework/datastore-definitions";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
-import { readAndParse } from "@fluidframework/driver-utils";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
+import { readAndParse } from "@fluidframework/driver-utils/internal";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import {
 	IExperimentalIncrementalSummaryContext,
-	IFluidDataStoreContext,
 	IGarbageCollectionData,
-	ISummarizeResult,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { addBlobToSummary } from "@fluidframework/runtime-utils";
 import {
-	DataCorruptionError,
-	ITelemetryLoggerExt,
-	tagCodeArtifacts,
-} from "@fluidframework/telemetry-utils";
+	IFluidDataStoreContext,
+	ISummarizeResult,
+} from "@fluidframework/runtime-definitions/internal";
+import { addBlobToSummary } from "@fluidframework/runtime-utils/internal";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { DataCorruptionError, tagCodeArtifacts } from "@fluidframework/telemetry-utils/internal";
+
 import { ChannelDeltaConnection } from "./channelDeltaConnection.js";
 import { ChannelStorageService } from "./channelStorageService.js";
 import { ISharedObjectRegistry } from "./dataStoreRuntime.js";

package/src/channelDeltaConnection.ts

@@ -4,10 +4,10 @@
  */
 
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import { IDeltaConnection, IDeltaHandler } from "@fluidframework/datastore-definitions";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { DataProcessingError } from "@fluidframework/telemetry-utils";
+import { DataProcessingError } from "@fluidframework/telemetry-utils/internal";
 
 const stashedOpMetadataMark = Symbol();
 

package/src/channelStorageService.ts

@@ -4,9 +4,9 @@
  */
 
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
 import { ISnapshotTree } from "@fluidframework/protocol-definitions";
-import { getNormalizedObjectStoragePathParts } from "@fluidframework/runtime-utils";
+import { getNormalizedObjectStoragePathParts } from "@fluidframework/runtime-utils/internal";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 
 export class ChannelStorageService implements IChannelStorageService {

package/src/dataStoreRuntime.ts

@@ -12,14 +12,19 @@ import {
 	IRequest,
 	IResponse,
 } from "@fluidframework/core-interfaces";
-import { assert, Deferred, LazyPromise, unreachableCase } from "@fluidframework/core-utils";
+import {
+	assert,
+	Deferred,
+	LazyPromise,
+	unreachableCase,
+} from "@fluidframework/core-utils/internal";
 import {
 	IChannel,
 	IChannelFactory,
 	IFluidDataStoreRuntime,
 	IFluidDataStoreRuntimeEvents,
 } from "@fluidframework/datastore-definitions";
-import { buildSnapshotTree } from "@fluidframework/driver-utils";
+import { buildSnapshotTree } from "@fluidframework/driver-utils/internal";
 import { IIdCompressor } from "@fluidframework/id-compressor";
 import {
 	IClientDetails,
@@ -31,6 +36,12 @@ import {
 	ISummaryTree,
 	SummaryType,
 } from "@fluidframework/protocol-definitions";
+import {
+	IGarbageCollectionData,
+	IInboundSignalMessage,
+	ISummaryTreeWithStats,
+	ITelemetryContext,
+} from "@fluidframework/runtime-definitions";
 import {
 	CreateChildSummarizerNodeParam,
 	CreateSummarizerNodeSource,
@@ -38,13 +49,9 @@ import {
 	IEnvelope,
 	IFluidDataStoreChannel,
 	IFluidDataStoreContext,
-	IGarbageCollectionData,
-	IInboundSignalMessage,
-	ISummaryTreeWithStats,
-	ITelemetryContext,
 	VisibilityState,
 	gcDataBlobKey,
-} from "@fluidframework/runtime-definitions";
+} from "@fluidframework/runtime-definitions/internal";
 import {
 	GCDataBuilder,
 	RequestParser,
@@ -59,10 +66,10 @@ import {
 	generateHandleContextPath,
 	processAttachMessageGCData,
 	unpackChildNodesUsedRoutes,
-} from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-utils/internal";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import {
 	DataProcessingError,
-	ITelemetryLoggerExt,
 	LoggingError,
 	MonitoringContext,
 	UsageError,
@@ -70,8 +77,9 @@ import {
 	generateStack,
 	raiseConnectedEvent,
 	tagCodeArtifacts,
-} from "@fluidframework/telemetry-utils";
+} from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
+
 import { IChannelContext, summarizeChannel } from "./channelContext.js";
 import { FluidObjectHandle } from "./fluidHandle.js";
 import {
@@ -79,6 +87,7 @@ import {
 	LocalChannelContextBase,
 	RehydratedLocalChannelContext,
 } from "./localChannelContext.js";
+import { pkgVersion } from "./packageVersion.js";
 import { RemoteChannelContext } from "./remoteChannelContext.js";
 
 /**
@@ -236,7 +245,7 @@ export class FluidDataStoreRuntime
 			logger: dataStoreContext.logger,
 			namespace: "FluidDataStoreRuntime",
 			properties: {
-				all: { dataStoreId: uuid() },
+				all: { dataStoreId: uuid(), dataStoreVersion: pkgVersion },
 			},
 		});
 
@@ -961,10 +970,10 @@ export class FluidDataStoreRuntime
 	/**
 	 * Submits the signal to be sent to other clients.
 	 * @param type - Type of the signal.
-	 * @param content - Content of the signal.
+	 * @param content - Content of the signal. Should be a JSON serializable object or primitive.
 	 * @param targetClientId - When specified, the signal is only sent to the provided client id.
 	 */
-	public submitSignal(type: string, content: any, targetClientId?: string) {
+	public submitSignal(type: string, content: unknown, targetClientId?: string) {
 		this.verifyNotClosed();
 		return this.dataStoreContext.submitSignal(type, content, targetClientId);
 	}

package/src/fluidHandle.ts

@@ -4,7 +4,7 @@
  */
 
 import { FluidObject, IFluidHandle, IFluidHandleContext } from "@fluidframework/core-interfaces";
-import { generateHandleContextPath } from "@fluidframework/runtime-utils";
+import { generateHandleContextPath } from "@fluidframework/runtime-utils/internal";
 
 /**
  * Handle for a shared {@link @fluidframework/core-interfaces#FluidObject}.

package/src/localChannelContext.ts

@@ -3,23 +3,20 @@
  * Licensed under the MIT License.
  */
 
-import lodashPkg from "lodash";
-// eslint-disable-next-line @typescript-eslint/unbound-method
-const { cloneDeep } = lodashPkg;
-
-import { ISnapshotTreeWithBlobContents } from "@fluidframework/container-definitions";
+import { ISnapshotTreeWithBlobContents } from "@fluidframework/container-definitions/internal";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils";
+import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils/internal";
 import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
+import { IGarbageCollectionData, ITelemetryContext } from "@fluidframework/runtime-definitions";
 import {
 	IFluidDataStoreContext,
-	IGarbageCollectionData,
 	ISummarizeResult,
-	ITelemetryContext,
-} from "@fluidframework/runtime-definitions";
-import { DataProcessingError, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+} from "@fluidframework/runtime-definitions/internal";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { DataProcessingError } from "@fluidframework/telemetry-utils/internal";
+
 import {
 	ChannelServiceEndpoints,
 	IChannelContext,
@@ -215,7 +212,7 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 				const blobMap: Map<string, ArrayBufferLike> = new Map<string, ArrayBufferLike>(
 					extraBlob,
 				);
-				const clonedSnapshotTree = cloneDeep(this.snapshotTree);
+				const clonedSnapshotTree = cloneSnapshotTree(this.snapshotTree);
 				// 0.47 back-compat Need to sanitize if snapshotTree.blobs still contains blob contents too.
 				// This is for older snapshot which is generated by loader <=0.47 version which still contains
 				// the contents within blobs. After a couple of revisions we can remove it.
@@ -353,3 +350,20 @@ export class LocalChannelContext extends LocalChannelContextBase {
 		throw new Error("no stashed ops on local channel");
 	}
 }
+
+/**
+ * Deep clones a snapshot tree.
+ *
+ * TODO: Investigate replacing this with a deep clone utility.
+ * This is a temporary solution to avoid issues with lodash deepClone and ungap structuredClone.
+ * Using lodash caused a significant bundle size regression. structuredClone cannot be used since
+ * it does not support ArrayBuffer data types, and ISnapshotTree can contain blobContents properties,
+ * which are ArrayBuffer data types.
+ */
+function cloneSnapshotTree(tree: ISnapshotTree): ISnapshotTree {
+	const clone = { ...tree, blobs: { ...tree.blobs }, trees: {} };
+	for (const [k, v] of Object.entries(tree.trees)) {
+		clone.trees[k] = cloneSnapshotTree(v);
+	}
+	return clone;
+}

package/src/localChannelStorageService.ts

@@ -6,7 +6,7 @@
 import { stringToBuffer } from "@fluid-internal/client-utils";
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
 import { IBlob, ITree, TreeEntry } from "@fluidframework/protocol-definitions";
-import { listBlobsAtTreePath } from "@fluidframework/runtime-utils";
+import { listBlobsAtTreePath } from "@fluidframework/runtime-utils/internal";
 
 export class LocalChannelStorageService implements IChannelStorageService {
 	constructor(private readonly tree: ITree) {}

package/src/packageVersion.ts

@@ -0,0 +1,9 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
+ */
+
+export const pkgName = "@fluidframework/datastore";
+export const pkgVersion = "2.0.0-dev-rc.3.0.0.254274";

package/src/remoteChannelContext.ts

@@ -5,25 +5,25 @@
 
 import { AttachState } from "@fluidframework/container-definitions";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { assert, LazyPromise } from "@fluidframework/core-utils";
+import { assert, LazyPromise } from "@fluidframework/core-utils/internal";
 import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import {
-	CreateChildSummarizerNodeFn,
 	IExperimentalIncrementalSummaryContext,
-	IFluidDataStoreContext,
 	IGarbageCollectionData,
-	ISummarizeInternalResult,
-	ISummarizeResult,
-	ISummarizerNodeWithGC,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
 import {
-	ITelemetryLoggerExt,
-	ThresholdCounter,
-	createChildLogger,
-} from "@fluidframework/telemetry-utils";
+	CreateChildSummarizerNodeFn,
+	IFluidDataStoreContext,
+	ISummarizeInternalResult,
+	ISummarizeResult,
+	ISummarizerNodeWithGC,
+} from "@fluidframework/runtime-definitions/internal";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { ThresholdCounter, createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
 import {
 	ChannelServiceEndpoints,
 	IChannelContext,

package/lib/test/channelStorageService.spec.js

@@ -1,70 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { strict as assert } from "assert";
-import { stringToBuffer } from "@fluid-internal/client-utils";
-import { MockLogger } from "@fluidframework/telemetry-utils";
-import { ChannelStorageService } from "../channelStorageService.js";
-describe("ChannelStorageService", () => {
-    it("Empty Tree", async () => {
-        const tree = {
-            blobs: {},
-            trees: {},
-        };
-        const storage = {
-            readBlob: async (id) => {
-                throw new Error("not implemented");
-            },
-        };
-        const logger = new MockLogger();
-        const ss = new ChannelStorageService(tree, storage, logger.toTelemetryLogger());
-        assert.strictEqual(await ss.contains("/"), false);
-        assert.deepStrictEqual(await ss.list(""), []);
-        logger.assertMatchNone([{ category: "error" }]);
-    });
-    it("Top Level Blob", async () => {
-        const tree = {
-            blobs: {
-                foo: "bar",
-            },
-            trees: {},
-        };
-        const storage = {
-            readBlob: async (id) => {
-                return stringToBuffer(id, "utf8");
-            },
-        };
-        const logger = new MockLogger();
-        const ss = new ChannelStorageService(tree, storage, logger.toTelemetryLogger());
-        assert.strictEqual(await ss.contains("foo"), true);
-        assert.deepStrictEqual(await ss.list(""), ["foo"]);
-        assert.deepStrictEqual(await ss.readBlob("foo"), stringToBuffer("bar", "utf8"));
-        logger.assertMatchNone([{ category: "error" }]);
-    });
-    it("Nested Blob", async () => {
-        const tree = {
-            blobs: {},
-            trees: {
-                nested: {
-                    blobs: {
-                        foo: "bar",
-                    },
-                    trees: {},
-                },
-            },
-        };
-        const storage = {
-            readBlob: async (id) => {
-                return stringToBuffer(id, "utf8");
-            },
-        };
-        const logger = new MockLogger();
-        const ss = new ChannelStorageService(tree, storage, logger.toTelemetryLogger());
-        assert.strictEqual(await ss.contains("nested/foo"), true);
-        assert.deepStrictEqual(await ss.list("nested/"), ["foo"]);
-        assert.deepStrictEqual(await ss.readBlob("nested/foo"), stringToBuffer("bar", "utf8"));
-        logger.assertMatchNone([{ category: "error" }]);
-    });
-});
-//# sourceMappingURL=channelStorageService.spec.js.map

package/lib/test/channelStorageService.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"channelStorageService.spec.js","sourceRoot":"","sources":["../../src/test/channelStorageService.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { stringToBuffer } from \"@fluid-internal/client-utils\";\nimport { IDocumentStorageService } from \"@fluidframework/driver-definitions\";\nimport { ISnapshotTree } from \"@fluidframework/protocol-definitions\";\nimport { MockLogger } from \"@fluidframework/telemetry-utils\";\nimport { ChannelStorageService } from \"../channelStorageService.js\";\n\ndescribe(\"ChannelStorageService\", () => {\n\tit(\"Empty Tree\", async () => {\n\t\tconst tree: ISnapshotTree = {\n\t\t\tblobs: {},\n\t\t\ttrees: {},\n\t\t};\n\t\tconst storage: Pick<IDocumentStorageService, \"readBlob\"> = {\n\t\t\treadBlob: async (id: string) => {\n\t\t\t\tthrow new Error(\"not implemented\");\n\t\t\t},\n\t\t};\n\t\tconst logger = new MockLogger();\n\t\tconst ss = new ChannelStorageService(tree, storage, logger.toTelemetryLogger());\n\n\t\tassert.strictEqual(await ss.contains(\"/\"), false);\n\t\tassert.deepStrictEqual(await ss.list(\"\"), []);\n\t\tlogger.assertMatchNone([{ category: \"error\" }]);\n\t});\n\n\tit(\"Top Level Blob\", async () => {\n\t\tconst tree: ISnapshotTree = {\n\t\t\tblobs: {\n\t\t\t\tfoo: \"bar\",\n\t\t\t},\n\t\t\ttrees: {},\n\t\t};\n\t\tconst storage: Pick<IDocumentStorageService, \"readBlob\"> = {\n\t\t\treadBlob: async (id: string) => {\n\t\t\t\treturn stringToBuffer(id, \"utf8\");\n\t\t\t},\n\t\t};\n\t\tconst logger = new MockLogger();\n\t\tconst ss = new ChannelStorageService(tree, storage, logger.toTelemetryLogger());\n\n\t\tassert.strictEqual(await ss.contains(\"foo\"), true);\n\t\tassert.deepStrictEqual(await ss.list(\"\"), [\"foo\"]);\n\t\tassert.deepStrictEqual(await ss.readBlob(\"foo\"), stringToBuffer(\"bar\", \"utf8\"));\n\t\tlogger.assertMatchNone([{ category: \"error\" }]);\n\t});\n\n\tit(\"Nested Blob\", async () => {\n\t\tconst tree: ISnapshotTree = {\n\t\t\tblobs: {},\n\t\t\ttrees: {\n\t\t\t\tnested: {\n\t\t\t\t\tblobs: {\n\t\t\t\t\t\tfoo: \"bar\",\n\t\t\t\t\t},\n\t\t\t\t\ttrees: {},\n\t\t\t\t},\n\t\t\t},\n\t\t};\n\t\tconst storage: Pick<IDocumentStorageService, \"readBlob\"> = {\n\t\t\treadBlob: async (id: string) => {\n\t\t\t\treturn stringToBuffer(id, \"utf8\");\n\t\t\t},\n\t\t};\n\t\tconst logger = new MockLogger();\n\t\tconst ss = new ChannelStorageService(tree, storage, logger.toTelemetryLogger());\n\n\t\tassert.strictEqual(await ss.contains(\"nested/foo\"), true);\n\t\tassert.deepStrictEqual(await ss.list(\"nested/\"), [\"foo\"]);\n\t\tassert.deepStrictEqual(await ss.readBlob(\"nested/foo\"), stringToBuffer(\"bar\", \"utf8\"));\n\t\tlogger.assertMatchNone([{ category: \"error\" }]);\n\t});\n});\n"]}

package/lib/test/dataStoreRuntime.spec.js

@@ -1,121 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { strict as assert } from "assert";
-import { ContainerErrorTypes } from "@fluidframework/container-definitions";
-import { SummaryType } from "@fluidframework/protocol-definitions";
-import { MockFluidDataStoreContext, validateAssertionError, } from "@fluidframework/test-runtime-utils";
-import { FluidDataStoreRuntime } from "../dataStoreRuntime.js";
-describe("FluidDataStoreRuntime Tests", () => {
-    let dataStoreContext;
-    let sharedObjectRegistry;
-    function createRuntime(context, registry, entrypointInitializationFn) {
-        const runtime = new FluidDataStoreRuntime(context, registry, 
-        /* existing */ false, entrypointInitializationFn ?? (async () => runtime));
-        return runtime;
-    }
-    beforeEach(() => {
-        dataStoreContext = new MockFluidDataStoreContext();
-        // back-compat 0.38 - DataStoreRuntime looks in container runtime for certain properties that are unavailable
-        // in the data store context.
-        dataStoreContext.containerRuntime = {};
-        sharedObjectRegistry = {
-            get(type) {
-                return {
-                    type,
-                    attributes: { type, snapshotFormatVersion: "0" },
-                    create: (runtime, id) => ({
-                        id,
-                        type,
-                        attributes: { type, snapshotFormatVersion: "0" },
-                        clientDetails: {},
-                    }),
-                    load: async () => Promise.resolve({}),
-                };
-            },
-        };
-    });
-    it("constructor rejects ids with forward slashes", () => {
-        const invalidId = "beforeSlash/afterSlash";
-        dataStoreContext = new MockFluidDataStoreContext(invalidId);
-        const codeBlock = () => new FluidDataStoreRuntime(dataStoreContext, sharedObjectRegistry, false, async (dataStoreRuntime) => {
-            throw new Error("This shouldn't be called during the test");
-        });
-        assert.throws(codeBlock, (e) => validateAssertionError(e, "Id cannot contain slashes. DataStoreContext should have validated this."));
-    });
-    it("can create a data store runtime", () => {
-        let failed = false;
-        let dataStoreRuntime;
-        try {
-            dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        }
-        catch (error) {
-            failed = true;
-        }
-        assert.strictEqual(failed, false, "Data store runtime creation failed");
-        assert.strictEqual(dataStoreRuntime?.id, dataStoreContext.id, "Data store runtime's id in incorrect");
-    });
-    it("can summarize an empty data store runtime", async () => {
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        const summarizeResult = await dataStoreRuntime.summarize(true, false);
-        assert(summarizeResult.summary.type === SummaryType.Tree, "Data store runtime did not return a summary tree");
-        assert(Object.keys(summarizeResult.summary.tree).length === 0, "The summary should be empty");
-    });
-    it("can get GC data of an empty data store runtime", async () => {
-        // The GC data should have a single node for the data store runtime with empty outbound routes.
-        const expectedGCData = {
-            gcNodes: { "/": [] },
-        };
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        const gcData = await dataStoreRuntime.getGCData();
-        assert.deepStrictEqual(gcData, expectedGCData, "The GC data is incorrect");
-    });
-    it("createChannel rejects ids with slashes", async () => {
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        const invalidId = "beforeSlash/afterSlash";
-        const codeBlock = () => dataStoreRuntime.createChannel(invalidId, "SomeType");
-        assert.throws(codeBlock, (e) => e.errorType === ContainerErrorTypes.usageError &&
-            e.message === `Id cannot contain slashes: ${invalidId}`);
-    });
-    it("createChannel with default guid", async () => {
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        const type = "SomeType";
-        const channel = dataStoreRuntime.createChannel(undefined, type);
-        assert(channel !== undefined, "channel should be created");
-        assert(type === channel.attributes.type, "type should be as expected");
-    });
-    it("createChannel and then attach to dataStore runtime", async () => {
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        const type = "SomeType";
-        const channel = {
-            id: "id",
-            type,
-            attributes: { type, snapshotFormatVersion: "0" },
-            clientDetails: {},
-        };
-        dataStoreRuntime.addChannel(channel);
-        const channel1 = await dataStoreRuntime.getChannel(channel.id);
-        assert.deepStrictEqual(channel, channel1, "both channel should match");
-    });
-    it("createChannel rejects ids with slashes when channel is created first", async () => {
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);
-        const invalidId = "beforeSlash/afterSlash";
-        const type = "SomeType";
-        const channel = {
-            id: invalidId,
-            type,
-            attributes: { type, snapshotFormatVersion: "0" },
-            clientDetails: {},
-        };
-        const codeBlock = () => dataStoreRuntime.addChannel(channel);
-        assert.throws(codeBlock, (e) => e.errorType === ContainerErrorTypes.usageError &&
-            e.message === `Id cannot contain slashes: ${invalidId}`);
-    });
-    it("entryPoint is initialized correctly", async () => {
-        const myObj = { fakeProp: "fakeValue" };
-        const dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry, async (dsRuntime) => myObj);
-        assert((await dataStoreRuntime.entryPoint?.get()) === myObj, "entryPoint was not initialized");
-    });
-});
-//# sourceMappingURL=dataStoreRuntime.spec.js.map

package/lib/test/dataStoreRuntime.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dataStoreRuntime.spec.js","sourceRoot":"","sources":["../../src/test/dataStoreRuntime.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { ContainerErrorTypes } from \"@fluidframework/container-definitions\";\nimport { FluidObject, IErrorBase } from \"@fluidframework/core-interfaces\";\nimport { IChannel, IFluidDataStoreRuntime } from \"@fluidframework/datastore-definitions\";\nimport { SummaryType } from \"@fluidframework/protocol-definitions\";\nimport {\n\tIContainerRuntimeBase,\n\tIFluidDataStoreContext,\n\tIGarbageCollectionData,\n} from \"@fluidframework/runtime-definitions\";\nimport {\n\tMockFluidDataStoreContext,\n\tvalidateAssertionError,\n} from \"@fluidframework/test-runtime-utils\";\nimport { FluidDataStoreRuntime, ISharedObjectRegistry } from \"../dataStoreRuntime.js\";\n\ndescribe(\"FluidDataStoreRuntime Tests\", () => {\n\tlet dataStoreContext: MockFluidDataStoreContext;\n\tlet sharedObjectRegistry: ISharedObjectRegistry;\n\tfunction createRuntime(\n\t\tcontext: IFluidDataStoreContext,\n\t\tregistry: ISharedObjectRegistry,\n\t\tentrypointInitializationFn?: (rt: IFluidDataStoreRuntime) => Promise<FluidObject>,\n\t) {\n\t\tconst runtime: FluidDataStoreRuntime = new FluidDataStoreRuntime(\n\t\t\tcontext,\n\t\t\tregistry,\n\t\t\t/* existing */ false,\n\t\t\tentrypointInitializationFn ?? (async () => runtime),\n\t\t);\n\t\treturn runtime;\n\t}\n\n\tbeforeEach(() => {\n\t\tdataStoreContext = new MockFluidDataStoreContext();\n\t\t// back-compat 0.38 - DataStoreRuntime looks in container runtime for certain properties that are unavailable\n\t\t// in the data store context.\n\t\tdataStoreContext.containerRuntime = {} as unknown as IContainerRuntimeBase;\n\t\tsharedObjectRegistry = {\n\t\t\tget(type: string) {\n\t\t\t\treturn {\n\t\t\t\t\ttype,\n\t\t\t\t\tattributes: { type, snapshotFormatVersion: \"0\" },\n\t\t\t\t\tcreate: (runtime, id: string) =>\n\t\t\t\t\t\t({\n\t\t\t\t\t\t\tid,\n\t\t\t\t\t\t\ttype,\n\t\t\t\t\t\t\tattributes: { type, snapshotFormatVersion: \"0\" },\n\t\t\t\t\t\t\tclientDetails: {},\n\t\t\t\t\t\t}) as any as IChannel,\n\t\t\t\t\tload: async () => Promise.resolve({} as any as IChannel),\n\t\t\t\t};\n\t\t\t},\n\t\t};\n\t});\n\n\tit(\"constructor rejects ids with forward slashes\", () => {\n\t\tconst invalidId = \"beforeSlash/afterSlash\";\n\t\tdataStoreContext = new MockFluidDataStoreContext(invalidId);\n\t\tconst codeBlock = () =>\n\t\t\tnew FluidDataStoreRuntime(\n\t\t\t\tdataStoreContext,\n\t\t\t\tsharedObjectRegistry,\n\t\t\t\tfalse,\n\t\t\t\tasync (dataStoreRuntime) => {\n\t\t\t\t\tthrow new Error(\"This shouldn't be called during the test\");\n\t\t\t\t},\n\t\t\t);\n\t\tassert.throws(codeBlock, (e: Error) =>\n\t\t\tvalidateAssertionError(\n\t\t\t\te,\n\t\t\t\t\"Id cannot contain slashes. DataStoreContext should have validated this.\",\n\t\t\t),\n\t\t);\n\t});\n\n\tit(\"can create a data store runtime\", () => {\n\t\tlet failed: boolean = false;\n\t\tlet dataStoreRuntime: FluidDataStoreRuntime | undefined;\n\t\ttry {\n\t\t\tdataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\t} catch (error) {\n\t\t\tfailed = true;\n\t\t}\n\t\tassert.strictEqual(failed, false, \"Data store runtime creation failed\");\n\t\tassert.strictEqual(\n\t\t\tdataStoreRuntime?.id,\n\t\t\tdataStoreContext.id,\n\t\t\t\"Data store runtime's id in incorrect\",\n\t\t);\n\t});\n\n\tit(\"can summarize an empty data store runtime\", async () => {\n\t\tconst dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst summarizeResult = await dataStoreRuntime.summarize(true, false);\n\t\tassert(\n\t\t\tsummarizeResult.summary.type === SummaryType.Tree,\n\t\t\t\"Data store runtime did not return a summary tree\",\n\t\t);\n\t\tassert(\n\t\t\tObject.keys(summarizeResult.summary.tree).length === 0,\n\t\t\t\"The summary should be empty\",\n\t\t);\n\t});\n\n\tit(\"can get GC data of an empty data store runtime\", async () => {\n\t\t// The GC data should have a single node for the data store runtime with empty outbound routes.\n\t\tconst expectedGCData: IGarbageCollectionData = {\n\t\t\tgcNodes: { \"/\": [] },\n\t\t};\n\t\tconst dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst gcData = await dataStoreRuntime.getGCData();\n\t\tassert.deepStrictEqual(gcData, expectedGCData, \"The GC data is incorrect\");\n\t});\n\n\tit(\"createChannel rejects ids with slashes\", async () => {\n\t\tconst dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst invalidId = \"beforeSlash/afterSlash\";\n\t\tconst codeBlock = () => dataStoreRuntime.createChannel(invalidId, \"SomeType\");\n\t\tassert.throws(\n\t\t\tcodeBlock,\n\t\t\t(e: IErrorBase) =>\n\t\t\t\te.errorType === ContainerErrorTypes.usageError &&\n\t\t\t\te.message === `Id cannot contain slashes: ${invalidId}`,\n\t\t);\n\t});\n\n\tit(\"createChannel with default guid\", async () => {\n\t\tconst dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst type = \"SomeType\";\n\t\tconst channel = dataStoreRuntime.createChannel(undefined, type);\n\t\tassert(channel !== undefined, \"channel should be created\");\n\t\tassert(type === channel.attributes.type, \"type should be as expected\");\n\t});\n\n\tit(\"createChannel and then attach to dataStore runtime\", async () => {\n\t\tconst dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst type = \"SomeType\";\n\t\tconst channel = {\n\t\t\tid: \"id\",\n\t\t\ttype,\n\t\t\tattributes: { type, snapshotFormatVersion: \"0\" },\n\t\t\tclientDetails: {},\n\t\t} as any as IChannel;\n\t\tdataStoreRuntime.addChannel(channel);\n\t\tconst channel1 = await dataStoreRuntime.getChannel(channel.id);\n\t\tassert.deepStrictEqual(channel, channel1, \"both channel should match\");\n\t});\n\n\tit(\"createChannel rejects ids with slashes when channel is created first\", async () => {\n\t\tconst dataStoreRuntime = createRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst invalidId = \"beforeSlash/afterSlash\";\n\t\tconst type = \"SomeType\";\n\t\tconst channel = {\n\t\t\tid: invalidId,\n\t\t\ttype,\n\t\t\tattributes: { type, snapshotFormatVersion: \"0\" },\n\t\t\tclientDetails: {},\n\t\t} as any as IChannel;\n\t\tconst codeBlock = () => dataStoreRuntime.addChannel(channel);\n\t\tassert.throws(\n\t\t\tcodeBlock,\n\t\t\t(e: IErrorBase) =>\n\t\t\t\te.errorType === ContainerErrorTypes.usageError &&\n\t\t\t\te.message === `Id cannot contain slashes: ${invalidId}`,\n\t\t);\n\t});\n\n\tit(\"entryPoint is initialized correctly\", async () => {\n\t\tconst myObj: FluidObject = { fakeProp: \"fakeValue\" };\n\t\tconst dataStoreRuntime = createRuntime(\n\t\t\tdataStoreContext,\n\t\t\tsharedObjectRegistry,\n\t\t\tasync (dsRuntime) => myObj,\n\t\t);\n\t\tassert(\n\t\t\t(await dataStoreRuntime.entryPoint?.get()) === myObj,\n\t\t\t\"entryPoint was not initialized\",\n\t\t);\n\t});\n});\n"]}

package/lib/test/localChannelContext.spec.js

@@ -1,41 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { strict as assert } from "assert";
-import { MockFluidDataStoreContext, validateAssertionError, } from "@fluidframework/test-runtime-utils";
-import { FluidDataStoreRuntime } from "../dataStoreRuntime.js";
-import { LocalChannelContext, RehydratedLocalChannelContext } from "../localChannelContext.js";
-describe("LocalChannelContext Tests", () => {
-    let dataStoreContext;
-    let sharedObjectRegistry;
-    const loadRuntime = (context, registry) => new FluidDataStoreRuntime(context, registry, /* existing */ false, async () => ({
-        myProp: "myValue",
-    }));
-    beforeEach(() => {
-        dataStoreContext = new MockFluidDataStoreContext();
-        sharedObjectRegistry = {
-            get(type) {
-                return {
-                    type,
-                    attributes: { type, snapshotFormatVersion: "0" },
-                    create: () => ({}),
-                    load: async () => Promise.resolve({}),
-                };
-            },
-        };
-    });
-    it("LocalChannelContext rejects ids with forward slashes", () => {
-        const invalidId = "beforeSlash/afterSlash";
-        const dataStoreRuntime = loadRuntime(dataStoreContext, sharedObjectRegistry);
-        const codeBlock = () => new LocalChannelContext({ id: invalidId }, dataStoreRuntime, dataStoreContext, dataStoreContext.storage, dataStoreContext.logger, () => { }, (s) => { }, (s) => { });
-        assert.throws(codeBlock, (e) => validateAssertionError(e, "Channel context ID cannot contain slashes"), "Expected exception was not thrown");
-    });
-    it("RehydratedLocalChannelContext rejects ids with forward slashes", () => {
-        const invalidId = "beforeSlash/afterSlash";
-        const dataStoreRuntime = loadRuntime(dataStoreContext, sharedObjectRegistry);
-        const codeBlock = () => new RehydratedLocalChannelContext(invalidId, sharedObjectRegistry, dataStoreRuntime, dataStoreContext, dataStoreContext.storage, dataStoreContext.logger, (content, localOpMetadata) => { }, (s) => { }, (s, o) => { }, null);
-        assert.throws(codeBlock, (e) => validateAssertionError(e, "Channel context ID cannot contain slashes"), "Expected exception was not thrown");
-    });
-});
-//# sourceMappingURL=localChannelContext.spec.js.map

package/lib/test/localChannelContext.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"localChannelContext.spec.js","sourceRoot":"","sources":["../../src/test/localChannelContext.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI1C,OAAO,EACN,yBAAyB,EACzB,sBAAsB,GACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAyB,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE/F,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAC1C,IAAI,gBAA2C,CAAC;IAChD,IAAI,oBAA2C,CAAC;IAChD,MAAM,WAAW,GAAG,CAAC,OAA+B,EAAE,QAA+B,EAAE,EAAE,CACxF,IAAI,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;QAC/E,MAAM,EAAE,SAAS;KACjB,CAAC,CAAC,CAAC;IAEL,UAAU,CAAC,GAAG,EAAE;QACf,gBAAgB,GAAG,IAAI,yBAAyB,EAAE,CAAC;QACnD,oBAAoB,GAAG;YACtB,GAAG,CAAC,IAAY;gBACf,OAAO;oBACN,IAAI;oBACJ,UAAU,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE;oBAChD,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAoB;oBACrC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAqB,CAAC;iBACxD,CAAC;YACH,CAAC;SACD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC/D,MAAM,SAAS,GAAG,wBAAwB,CAAC;QAC3C,MAAM,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAG,GAAG,EAAE,CACtB,IAAI,mBAAmB,CACtB,EAAE,EAAE,EAAE,SAAS,EAAqB,EACpC,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,CAAC,OAAO,EACxB,gBAAgB,CAAC,MAAM,EACvB,GAAG,EAAE,GAAE,CAAC,EACR,CAAC,CAAS,EAAE,EAAE,GAAE,CAAC,EACjB,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CACT,CAAC;QACH,MAAM,CAAC,MAAM,CACZ,SAAS,EACT,CAAC,CAAQ,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,EAAE,2CAA2C,CAAC,EACpF,mCAAmC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACzE,MAAM,SAAS,GAAG,wBAAwB,CAAC;QAC3C,MAAM,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAG,GAAG,EAAE,CACtB,IAAI,6BAA6B,CAChC,SAAS,EACT,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,CAAC,OAAO,EACxB,gBAAgB,CAAC,MAAM,EACvB,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,GAAE,CAAC,EAChC,CAAC,CAAS,EAAE,EAAE,GAAE,CAAC,EACjB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,GAAE,CAAC,EACZ,IAAgC,CAChC,CAAC;QACH,MAAM,CAAC,MAAM,CACZ,SAAS,EACT,CAAC,CAAQ,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,EAAE,2CAA2C,CAAC,EACpF,mCAAmC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { IChannel } from \"@fluidframework/datastore-definitions\";\nimport { ISnapshotTree } from \"@fluidframework/protocol-definitions\";\nimport { IFluidDataStoreContext } from \"@fluidframework/runtime-definitions\";\nimport {\n\tMockFluidDataStoreContext,\n\tvalidateAssertionError,\n} from \"@fluidframework/test-runtime-utils\";\nimport { FluidDataStoreRuntime, ISharedObjectRegistry } from \"../dataStoreRuntime.js\";\nimport { LocalChannelContext, RehydratedLocalChannelContext } from \"../localChannelContext.js\";\n\ndescribe(\"LocalChannelContext Tests\", () => {\n\tlet dataStoreContext: MockFluidDataStoreContext;\n\tlet sharedObjectRegistry: ISharedObjectRegistry;\n\tconst loadRuntime = (context: IFluidDataStoreContext, registry: ISharedObjectRegistry) =>\n\t\tnew FluidDataStoreRuntime(context, registry, /* existing */ false, async () => ({\n\t\t\tmyProp: \"myValue\",\n\t\t}));\n\n\tbeforeEach(() => {\n\t\tdataStoreContext = new MockFluidDataStoreContext();\n\t\tsharedObjectRegistry = {\n\t\t\tget(type: string) {\n\t\t\t\treturn {\n\t\t\t\t\ttype,\n\t\t\t\t\tattributes: { type, snapshotFormatVersion: \"0\" },\n\t\t\t\t\tcreate: () => ({}) as any as IChannel,\n\t\t\t\t\tload: async () => Promise.resolve({} as any as IChannel),\n\t\t\t\t};\n\t\t\t},\n\t\t};\n\t});\n\n\tit(\"LocalChannelContext rejects ids with forward slashes\", () => {\n\t\tconst invalidId = \"beforeSlash/afterSlash\";\n\t\tconst dataStoreRuntime = loadRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst codeBlock = () =>\n\t\t\tnew LocalChannelContext(\n\t\t\t\t{ id: invalidId } as any as IChannel,\n\t\t\t\tdataStoreRuntime,\n\t\t\t\tdataStoreContext,\n\t\t\t\tdataStoreContext.storage,\n\t\t\t\tdataStoreContext.logger,\n\t\t\t\t() => {},\n\t\t\t\t(s: string) => {},\n\t\t\t\t(s) => {},\n\t\t\t);\n\t\tassert.throws(\n\t\t\tcodeBlock,\n\t\t\t(e: Error) => validateAssertionError(e, \"Channel context ID cannot contain slashes\"),\n\t\t\t\"Expected exception was not thrown\",\n\t\t);\n\t});\n\n\tit(\"RehydratedLocalChannelContext rejects ids with forward slashes\", () => {\n\t\tconst invalidId = \"beforeSlash/afterSlash\";\n\t\tconst dataStoreRuntime = loadRuntime(dataStoreContext, sharedObjectRegistry);\n\t\tconst codeBlock = () =>\n\t\t\tnew RehydratedLocalChannelContext(\n\t\t\t\tinvalidId,\n\t\t\t\tsharedObjectRegistry,\n\t\t\t\tdataStoreRuntime,\n\t\t\t\tdataStoreContext,\n\t\t\t\tdataStoreContext.storage,\n\t\t\t\tdataStoreContext.logger,\n\t\t\t\t(content, localOpMetadata) => {},\n\t\t\t\t(s: string) => {},\n\t\t\t\t(s, o) => {},\n\t\t\t\tnull as unknown as ISnapshotTree,\n\t\t\t);\n\t\tassert.throws(\n\t\t\tcodeBlock,\n\t\t\t(e: Error) => validateAssertionError(e, \"Channel context ID cannot contain slashes\"),\n\t\t\t\"Expected exception was not thrown\",\n\t\t);\n\t});\n});\n"]}