@fluidframework/test-utils 2.0.0-dev.1.4.6.106135 → 2.0.0-dev.2.3.0.115467

package/.eslintrc.js

@@ -5,9 +5,12 @@
 
 module.exports = {
     "extends": [
-        require.resolve("@fluidframework/eslint-config-fluid")
+        require.resolve("@fluidframework/eslint-config-fluid"), "prettier"
     ],
     "parserOptions": {
         "project": ["./tsconfig.json", "./src/test/tsconfig.json"]
     },
+    "rules": {
+        "import/no-nodejs-modules": "off",
+    }
 }

package/dist/TestSummaryUtils.d.ts

@@ -10,6 +10,10 @@ import { IConfigProviderBase } from "@fluidframework/telemetry-utils";
 import { ITestObjectProvider } from "./testObjectProvider";
 export declare function createSummarizerFromFactory(provider: ITestObjectProvider, container: IContainer, dataStoreFactory: IFluidDataStoreFactory, summaryVersion?: string, containerRuntimeFactoryType?: typeof ContainerRuntimeFactoryWithDefaultDataStore, registryEntries?: NamedFluidDataStoreRegistryEntries): Promise<ISummarizer>;
 export declare function createSummarizer(provider: ITestObjectProvider, container: IContainer, summaryVersion?: string, gcOptions?: IGCRuntimeOptions, configProvider?: IConfigProviderBase): Promise<ISummarizer>;
+export declare function createSummarizerWithContainer(provider: ITestObjectProvider, absoluteUrl: string | undefined, summaryVersion?: string, gcOptions?: IGCRuntimeOptions, configProvider?: IConfigProviderBase): Promise<{
+    container: IContainer;
+    summarizer: ISummarizer;
+}>;
 export declare function summarizeNow(summarizer: ISummarizer, reason?: string): Promise<{
     summaryTree: import("@fluidframework/protocol-definitions").ISummaryTree;
     summaryVersion: string;

package/dist/TestSummaryUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestSummaryUtils.d.ts","sourceRoot":"","sources":["../src/TestSummaryUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,2CAA2C,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAAE,UAAU,EAA6B,MAAM,uCAAuC,CAAC;AAE9F,OAAO,EACH,iBAAiB,EACjB,WAAW,EAEd,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAEH,sBAAsB,EACtB,kCAAkC,EACrC,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAwB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AA6CjF,wBAAsB,2BAA2B,CAC7C,QAAQ,EAAE,mBAAmB,EAC7B,SAAS,EAAE,UAAU,EACrB,gBAAgB,EAAE,sBAAsB,EACxC,cAAc,CAAC,EAAE,MAAM,EACvB,2BAA2B,qDAA8C,EACzE,eAAe,CAAC,EAAE,kCAAkC,GACrD,OAAO,CAAC,WAAW,CAAC,CAoBtB;AAED,wBAAsB,gBAAgB,CAClC,QAAQ,EAAE,mBAAmB,EAC7B,SAAS,EAAE,UAAU,EACrB,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,iBAAiB,EAC7B,cAAc,GAAE,mBAA0C,GAC3D,OAAO,CAAC,WAAW,CAAC,CAWtB;AAED,wBAAsB,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,GAAE,MAA0B;;;GAqB7F;AAED,wBAAsB,0BAA0B,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrF"}
+{"version":3,"file":"TestSummaryUtils.d.ts","sourceRoot":"","sources":["../src/TestSummaryUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,2CAA2C,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAAE,UAAU,EAA6B,MAAM,uCAAuC,CAAC;AAE9F,OAAO,EACH,iBAAiB,EACjB,WAAW,EAEd,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAEH,sBAAsB,EACtB,kCAAkC,EACrC,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAwB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAgDjF,wBAAsB,2BAA2B,CAC7C,QAAQ,EAAE,mBAAmB,EAC7B,SAAS,EAAE,UAAU,EACrB,gBAAgB,EAAE,sBAAsB,EACxC,cAAc,CAAC,EAAE,MAAM,EACvB,2BAA2B,qDAA8C,EACzE,eAAe,CAAC,EAAE,kCAAkC,GACrD,OAAO,CAAC,WAAW,CAAC,CAoBtB;AAED,wBAAsB,gBAAgB,CAClC,QAAQ,EAAE,mBAAmB,EAC7B,SAAS,EAAE,UAAU,EACrB,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,iBAAiB,EAC7B,cAAc,GAAE,mBAA0C,GAC3D,OAAO,CAAC,WAAW,CAAC,CAStB;AAED,wBAAsB,6BAA6B,CAC/C,QAAQ,EAAE,mBAAmB,EAC7B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,iBAAiB,EAC7B,cAAc,GAAE,mBAA0C,GAC3D,OAAO,CAAC;IAAE,SAAS,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,WAAW,CAAC;CAAE,CAAC,CAU9D;AAED,wBAAsB,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,GAAE,MAA0B;;;GAqB7F;AAED,wBAAsB,0BAA0B,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrF"}

package/dist/TestSummaryUtils.js

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForContainerConnection = exports.summarizeNow = exports.createSummarizer = exports.createSummarizerFromFactory = void 0;
+exports.waitForContainerConnection = exports.summarizeNow = exports.createSummarizerWithContainer = exports.createSummarizer = exports.createSummarizerFromFactory = void 0;
 const aqueduct_1 = require("@fluidframework/aqueduct");
 const common_utils_1 = require("@fluidframework/common-utils");
 const container_definitions_1 = require("@fluidframework/container-definitions");
@@ -13,8 +13,7 @@ const driver_definitions_1 = require("@fluidframework/driver-definitions");
 const runtime_utils_1 = require("@fluidframework/runtime-utils");
 const TestConfigs_1 = require("./TestConfigs");
 const summarizerClientType = "summarizer";
-async function createSummarizerCore(container, loader, summaryVersion) {
-    const absoluteUrl = await container.getAbsoluteUrl("");
+async function createSummarizerCore(absoluteUrl, loader, summaryVersion) {
     if (absoluteUrl === undefined) {
         throw new Error("URL could not be resolved");
     }
@@ -37,7 +36,10 @@ async function createSummarizerCore(container, loader, summaryVersion) {
     if (fluidObject.ISummarizer === undefined) {
         throw new Error("Fluid object does not implement ISummarizer");
     }
-    return fluidObject.ISummarizer;
+    return {
+        container: summarizerContainer,
+        summarizer: fluidObject.ISummarizer,
+    };
 }
 const defaultSummaryOptions = {
     summaryConfigOverrides: {
@@ -54,10 +56,16 @@ async function createSummarizerFromFactory(provider, container, dataStoreFactory
         [dataStoreFactory.type, Promise.resolve(dataStoreFactory)],
     ], undefined, [innerRequestHandler], { summaryOptions: defaultSummaryOptions });
     const loader = provider.createLoader([[provider.defaultCodeDetails, runtimeFactory]], { configProvider: (0, TestConfigs_1.mockConfigProvider)() });
-    return createSummarizerCore(container, loader, summaryVersion);
+    const absoluteUrl = await container.getAbsoluteUrl("");
+    return (await createSummarizerCore(absoluteUrl, loader, summaryVersion)).summarizer;
 }
 exports.createSummarizerFromFactory = createSummarizerFromFactory;
 async function createSummarizer(provider, container, summaryVersion, gcOptions, configProvider = (0, TestConfigs_1.mockConfigProvider)()) {
+    const absoluteUrl = await container.getAbsoluteUrl("");
+    return (await createSummarizerWithContainer(provider, absoluteUrl, summaryVersion, gcOptions, configProvider)).summarizer;
+}
+exports.createSummarizer = createSummarizer;
+async function createSummarizerWithContainer(provider, absoluteUrl, summaryVersion, gcOptions, configProvider = (0, TestConfigs_1.mockConfigProvider)()) {
     const testContainerConfig = {
         runtimeOptions: {
             summaryOptions: defaultSummaryOptions,
@@ -66,9 +74,9 @@ async function createSummarizer(provider, container, summaryVersion, gcOptions,
         loaderProps: { configProvider },
     };
     const loader = provider.makeTestLoader(testContainerConfig);
-    return createSummarizerCore(container, loader, summaryVersion);
+    return createSummarizerCore(absoluteUrl, loader, summaryVersion);
 }
-exports.createSummarizer = createSummarizer;
+exports.createSummarizerWithContainer = createSummarizerWithContainer;
 async function summarizeNow(summarizer, reason = "end-to-end test") {
     const result = summarizer.summarizeOnDemand({ reason });
     const submitResult = await result.summarySubmitted;

package/dist/TestSummaryUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestSummaryUtils.js","sourceRoot":"","sources":["../src/TestSummaryUtils.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 { ContainerRuntimeFactoryWithDefaultDataStore } from \"@fluidframework/aqueduct\";\nimport { assert } from \"@fluidframework/common-utils\";\nimport { IContainer, IHostLoader, LoaderHeader } from \"@fluidframework/container-definitions\";\nimport { ConnectionState } from \"@fluidframework/container-loader\";\nimport {\n    IGCRuntimeOptions,\n    ISummarizer,\n    ISummaryRuntimeOptions,\n} from \"@fluidframework/container-runtime\";\nimport { FluidObject, IRequest } from \"@fluidframework/core-interfaces\";\nimport { DriverHeader } from \"@fluidframework/driver-definitions\";\nimport {\n    IContainerRuntimeBase,\n    IFluidDataStoreFactory,\n    NamedFluidDataStoreRegistryEntries,\n} from \"@fluidframework/runtime-definitions\";\nimport { requestFluidObject } from \"@fluidframework/runtime-utils\";\nimport { IConfigProviderBase } from \"@fluidframework/telemetry-utils\";\nimport { ITestContainerConfig, ITestObjectProvider } from \"./testObjectProvider\";\nimport { mockConfigProvider } from \"./TestConfigs\";\n\nconst summarizerClientType = \"summarizer\";\n\nasync function createSummarizerCore(container: IContainer, loader: IHostLoader, summaryVersion?: string) {\n    const absoluteUrl = await container.getAbsoluteUrl(\"\");\n    if (absoluteUrl === undefined) {\n        throw new Error(\"URL could not be resolved\");\n    }\n\n    const request: IRequest = {\n        headers: {\n            [LoaderHeader.cache]: false,\n            [LoaderHeader.clientDetails]: {\n                capabilities: { interactive: false },\n                type: summarizerClientType,\n            },\n            [DriverHeader.summarizingClient]: true,\n            [LoaderHeader.reconnect]: false,\n            [LoaderHeader.version]: summaryVersion,\n        },\n        url: absoluteUrl,\n    };\n    const summarizerContainer = await loader.resolve(request);\n    await waitForContainerConnection(summarizerContainer);\n\n    const fluidObject =\n        await requestFluidObject<FluidObject<ISummarizer>>(summarizerContainer, { url: \"_summarizer\" });\n    if (fluidObject.ISummarizer === undefined) {\n        throw new Error(\"Fluid object does not implement ISummarizer\");\n    }\n    return fluidObject.ISummarizer;\n}\n\nconst defaultSummaryOptions: ISummaryRuntimeOptions = {\n    summaryConfigOverrides: {\n        state: \"disableHeuristics\",\n        maxAckWaitTime: 10000,\n        maxOpsSinceLastSummary: 7000,\n        initialSummarizerDelayMs: 0,\n        summarizerClientElection: false,\n    },\n};\n\nexport async function createSummarizerFromFactory(\n    provider: ITestObjectProvider,\n    container: IContainer,\n    dataStoreFactory: IFluidDataStoreFactory,\n    summaryVersion?: string,\n    containerRuntimeFactoryType = ContainerRuntimeFactoryWithDefaultDataStore,\n    registryEntries?: NamedFluidDataStoreRegistryEntries,\n): Promise<ISummarizer> {\n    const innerRequestHandler = async (request: IRequest, runtime: IContainerRuntimeBase) =>\n        runtime.IFluidHandleContext.resolveHandle(request);\n    const runtimeFactory = new containerRuntimeFactoryType(\n        dataStoreFactory,\n        registryEntries ??\n        [\n            [dataStoreFactory.type, Promise.resolve(dataStoreFactory)],\n        ],\n        undefined,\n        [innerRequestHandler],\n        { summaryOptions: defaultSummaryOptions },\n    );\n\n    const loader = provider.createLoader(\n        [[provider.defaultCodeDetails, runtimeFactory]],\n        { configProvider: mockConfigProvider() },\n    );\n\n    return createSummarizerCore(container, loader, summaryVersion);\n}\n\nexport async function createSummarizer(\n    provider: ITestObjectProvider,\n    container: IContainer,\n    summaryVersion?: string,\n    gcOptions?: IGCRuntimeOptions,\n    configProvider: IConfigProviderBase = mockConfigProvider(),\n): Promise<ISummarizer> {\n    const testContainerConfig: ITestContainerConfig = {\n        runtimeOptions: {\n            summaryOptions: defaultSummaryOptions,\n            gcOptions,\n        },\n        loaderProps: { configProvider },\n    };\n\n    const loader = provider.makeTestLoader(testContainerConfig);\n    return createSummarizerCore(container, loader, summaryVersion);\n}\n\nexport async function summarizeNow(summarizer: ISummarizer, reason: string = \"end-to-end test\") {\n    const result = summarizer.summarizeOnDemand({ reason });\n\n    const submitResult = await result.summarySubmitted;\n    assert(submitResult.success, \"on-demand summary should submit\");\n    assert(submitResult.data.stage === \"submit\",\n        \"on-demand summary submitted data stage should be submit\");\n    assert(submitResult.data.summaryTree !== undefined, \"summary tree should exist\");\n\n    const broadcastResult = await result.summaryOpBroadcasted;\n    assert(broadcastResult.success, \"summary op should be broadcast\");\n\n    const ackNackResult = await result.receivedSummaryAckOrNack;\n    assert(ackNackResult.success, \"summary op should be acked\");\n\n    await new Promise((resolve) => process.nextTick(resolve));\n\n    return {\n        summaryTree: submitResult.data.summaryTree,\n        summaryVersion: ackNackResult.data.summaryAckOp.contents.handle,\n    };\n}\n\nexport async function waitForContainerConnection(container: IContainer): Promise<void> {\n    if (container.connectionState !== ConnectionState.Connected) {\n        return new Promise((resolve) => container.once(\"connected\", () => resolve()));\n    }\n}\n"]}
+{"version":3,"file":"TestSummaryUtils.js","sourceRoot":"","sources":["../src/TestSummaryUtils.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 { ContainerRuntimeFactoryWithDefaultDataStore } from \"@fluidframework/aqueduct\";\nimport { assert } from \"@fluidframework/common-utils\";\nimport { IContainer, IHostLoader, LoaderHeader } from \"@fluidframework/container-definitions\";\nimport { ConnectionState } from \"@fluidframework/container-loader\";\nimport {\n    IGCRuntimeOptions,\n    ISummarizer,\n    ISummaryRuntimeOptions,\n} from \"@fluidframework/container-runtime\";\nimport { FluidObject, IRequest } from \"@fluidframework/core-interfaces\";\nimport { DriverHeader } from \"@fluidframework/driver-definitions\";\nimport {\n    IContainerRuntimeBase,\n    IFluidDataStoreFactory,\n    NamedFluidDataStoreRegistryEntries,\n} from \"@fluidframework/runtime-definitions\";\nimport { requestFluidObject } from \"@fluidframework/runtime-utils\";\nimport { IConfigProviderBase } from \"@fluidframework/telemetry-utils\";\nimport { ITestContainerConfig, ITestObjectProvider } from \"./testObjectProvider\";\nimport { mockConfigProvider } from \"./TestConfigs\";\n\nconst summarizerClientType = \"summarizer\";\n\nasync function createSummarizerCore(absoluteUrl: string | undefined, loader: IHostLoader, summaryVersion?: string) {\n    if (absoluteUrl === undefined) {\n        throw new Error(\"URL could not be resolved\");\n    }\n\n    const request: IRequest = {\n        headers: {\n            [LoaderHeader.cache]: false,\n            [LoaderHeader.clientDetails]: {\n                capabilities: { interactive: false },\n                type: summarizerClientType,\n            },\n            [DriverHeader.summarizingClient]: true,\n            [LoaderHeader.reconnect]: false,\n            [LoaderHeader.version]: summaryVersion,\n        },\n        url: absoluteUrl,\n    };\n    const summarizerContainer = await loader.resolve(request);\n    await waitForContainerConnection(summarizerContainer);\n\n    const fluidObject =\n        await requestFluidObject<FluidObject<ISummarizer>>(summarizerContainer, { url: \"_summarizer\" });\n    if (fluidObject.ISummarizer === undefined) {\n        throw new Error(\"Fluid object does not implement ISummarizer\");\n    }\n\n    return {\n        container: summarizerContainer,\n        summarizer: fluidObject.ISummarizer,\n    };\n}\n\nconst defaultSummaryOptions: ISummaryRuntimeOptions = {\n    summaryConfigOverrides: {\n        state: \"disableHeuristics\",\n        maxAckWaitTime: 10000,\n        maxOpsSinceLastSummary: 7000,\n        initialSummarizerDelayMs: 0,\n        summarizerClientElection: false,\n    },\n};\n\nexport async function createSummarizerFromFactory(\n    provider: ITestObjectProvider,\n    container: IContainer,\n    dataStoreFactory: IFluidDataStoreFactory,\n    summaryVersion?: string,\n    containerRuntimeFactoryType = ContainerRuntimeFactoryWithDefaultDataStore,\n    registryEntries?: NamedFluidDataStoreRegistryEntries,\n): Promise<ISummarizer> {\n    const innerRequestHandler = async (request: IRequest, runtime: IContainerRuntimeBase) =>\n        runtime.IFluidHandleContext.resolveHandle(request);\n    const runtimeFactory = new containerRuntimeFactoryType(\n        dataStoreFactory,\n        registryEntries ??\n        [\n            [dataStoreFactory.type, Promise.resolve(dataStoreFactory)],\n        ],\n        undefined,\n        [innerRequestHandler],\n        { summaryOptions: defaultSummaryOptions },\n    );\n\n    const loader = provider.createLoader(\n        [[provider.defaultCodeDetails, runtimeFactory]],\n        { configProvider: mockConfigProvider() },\n    );\n    const absoluteUrl = await container.getAbsoluteUrl(\"\");\n    return (await createSummarizerCore(absoluteUrl, loader, summaryVersion)).summarizer;\n}\n\nexport async function createSummarizer(\n    provider: ITestObjectProvider,\n    container: IContainer,\n    summaryVersion?: string,\n    gcOptions?: IGCRuntimeOptions,\n    configProvider: IConfigProviderBase = mockConfigProvider(),\n): Promise<ISummarizer> {\n    const absoluteUrl = await container.getAbsoluteUrl(\"\");\n    return (await createSummarizerWithContainer(\n        provider,\n        absoluteUrl,\n        summaryVersion,\n        gcOptions,\n        configProvider,\n    )).summarizer;\n}\n\nexport async function createSummarizerWithContainer(\n    provider: ITestObjectProvider,\n    absoluteUrl: string | undefined,\n    summaryVersion?: string,\n    gcOptions?: IGCRuntimeOptions,\n    configProvider: IConfigProviderBase = mockConfigProvider(),\n): Promise<{ container: IContainer; summarizer: ISummarizer; }> {\n    const testContainerConfig: ITestContainerConfig = {\n        runtimeOptions: {\n            summaryOptions: defaultSummaryOptions,\n            gcOptions,\n        },\n        loaderProps: { configProvider },\n    };\n    const loader = provider.makeTestLoader(testContainerConfig);\n    return createSummarizerCore(absoluteUrl, loader, summaryVersion);\n}\n\nexport async function summarizeNow(summarizer: ISummarizer, reason: string = \"end-to-end test\") {\n    const result = summarizer.summarizeOnDemand({ reason });\n\n    const submitResult = await result.summarySubmitted;\n    assert(submitResult.success, \"on-demand summary should submit\");\n    assert(submitResult.data.stage === \"submit\",\n        \"on-demand summary submitted data stage should be submit\");\n    assert(submitResult.data.summaryTree !== undefined, \"summary tree should exist\");\n\n    const broadcastResult = await result.summaryOpBroadcasted;\n    assert(broadcastResult.success, \"summary op should be broadcast\");\n\n    const ackNackResult = await result.receivedSummaryAckOrNack;\n    assert(ackNackResult.success, \"summary op should be acked\");\n\n    await new Promise((resolve) => process.nextTick(resolve));\n\n    return {\n        summaryTree: submitResult.data.summaryTree,\n        summaryVersion: ackNackResult.data.summaryAckOp.contents.handle,\n    };\n}\n\nexport async function waitForContainerConnection(container: IContainer): Promise<void> {\n    if (container.connectionState !== ConnectionState.Connected) {\n        return new Promise((resolve) => container.once(\"connected\", () => resolve()));\n    }\n}\n"]}

package/dist/index.d.ts

@@ -2,16 +2,16 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export * from "./interfaces";
-export * from "./testObjectProvider";
-export * from "./loaderContainerTracker";
-export * from "./localLoader";
-export * from "./localCodeLoader";
-export * from "./retry";
-export * from "./testContainerRuntimeFactory";
-export * from "./testFluidObject";
-export * from "./timeoutUtils";
-export * from "./DriverWrappers";
-export * from "./TestSummaryUtils";
-export * from "./TestConfigs";
+export { wrapDocumentService, wrapDocumentServiceFactory, wrapDocumentStorageService } from "./DriverWrappers";
+export { IProvideTestFluidObject, ITestFluidObject } from "./interfaces";
+export { LoaderContainerTracker } from "./loaderContainerTracker";
+export { fluidEntryPoint, LocalCodeLoader, SupportedExportInterfaces } from "./localCodeLoader";
+export { createAndAttachContainer, createLoader } from "./localLoader";
+export { retryWithEventualValue } from "./retry";
+export { mockConfigProvider } from "./TestConfigs";
+export { createTestContainerRuntimeFactory, TestContainerRuntimeFactory } from "./testContainerRuntimeFactory";
+export { ChannelFactoryRegistry, TestFluidObject, TestFluidObjectFactory } from "./testFluidObject";
+export { createDocumentId, DataObjectFactoryType, EventAndErrorTrackingLogger, getUnexpectedLogErrorException, IOpProcessingController, ITestContainerConfig, ITestObjectProvider, TestObjectProvider, } from "./testObjectProvider";
+export { createSummarizer, createSummarizerFromFactory, createSummarizerWithContainer, summarizeNow, waitForContainerConnection, } from "./TestSummaryUtils";
+export { defaultTimeoutDurationMs, ensureContainerConnected, timeoutAwait, timeoutPromise, TimeoutWithError, TimeoutWithValue, } from "./timeoutUtils";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,SAAS,CAAC;AACxB,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC/G,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAChG,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,iCAAiC,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC/G,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EACH,gBAAgB,EAChB,qBAAqB,EACrB,2BAA2B,EAC3B,8BAA8B,EAC9B,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACH,gBAAgB,EAChB,2BAA2B,EAC3B,6BAA6B,EAC7B,YAAY,EACZ,0BAA0B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACH,wBAAwB,EACxB,wBAAwB,EACxB,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,gBAAgB,GACnB,MAAM,gBAAgB,CAAC"}

package/dist/index.js

@@ -3,27 +3,44 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./interfaces"), exports);
-__exportStar(require("./testObjectProvider"), exports);
-__exportStar(require("./loaderContainerTracker"), exports);
-__exportStar(require("./localLoader"), exports);
-__exportStar(require("./localCodeLoader"), exports);
-__exportStar(require("./retry"), exports);
-__exportStar(require("./testContainerRuntimeFactory"), exports);
-__exportStar(require("./testFluidObject"), exports);
-__exportStar(require("./timeoutUtils"), exports);
-__exportStar(require("./DriverWrappers"), exports);
-__exportStar(require("./TestSummaryUtils"), exports);
-__exportStar(require("./TestConfigs"), exports);
+exports.timeoutPromise = exports.timeoutAwait = exports.ensureContainerConnected = exports.defaultTimeoutDurationMs = exports.waitForContainerConnection = exports.summarizeNow = exports.createSummarizerWithContainer = exports.createSummarizerFromFactory = exports.createSummarizer = exports.TestObjectProvider = exports.getUnexpectedLogErrorException = exports.EventAndErrorTrackingLogger = exports.DataObjectFactoryType = exports.createDocumentId = exports.TestFluidObjectFactory = exports.TestFluidObject = exports.TestContainerRuntimeFactory = exports.createTestContainerRuntimeFactory = exports.mockConfigProvider = exports.retryWithEventualValue = exports.createLoader = exports.createAndAttachContainer = exports.LocalCodeLoader = exports.LoaderContainerTracker = exports.wrapDocumentStorageService = exports.wrapDocumentServiceFactory = exports.wrapDocumentService = void 0;
+var DriverWrappers_1 = require("./DriverWrappers");
+Object.defineProperty(exports, "wrapDocumentService", { enumerable: true, get: function () { return DriverWrappers_1.wrapDocumentService; } });
+Object.defineProperty(exports, "wrapDocumentServiceFactory", { enumerable: true, get: function () { return DriverWrappers_1.wrapDocumentServiceFactory; } });
+Object.defineProperty(exports, "wrapDocumentStorageService", { enumerable: true, get: function () { return DriverWrappers_1.wrapDocumentStorageService; } });
+var loaderContainerTracker_1 = require("./loaderContainerTracker");
+Object.defineProperty(exports, "LoaderContainerTracker", { enumerable: true, get: function () { return loaderContainerTracker_1.LoaderContainerTracker; } });
+var localCodeLoader_1 = require("./localCodeLoader");
+Object.defineProperty(exports, "LocalCodeLoader", { enumerable: true, get: function () { return localCodeLoader_1.LocalCodeLoader; } });
+var localLoader_1 = require("./localLoader");
+Object.defineProperty(exports, "createAndAttachContainer", { enumerable: true, get: function () { return localLoader_1.createAndAttachContainer; } });
+Object.defineProperty(exports, "createLoader", { enumerable: true, get: function () { return localLoader_1.createLoader; } });
+var retry_1 = require("./retry");
+Object.defineProperty(exports, "retryWithEventualValue", { enumerable: true, get: function () { return retry_1.retryWithEventualValue; } });
+var TestConfigs_1 = require("./TestConfigs");
+Object.defineProperty(exports, "mockConfigProvider", { enumerable: true, get: function () { return TestConfigs_1.mockConfigProvider; } });
+var testContainerRuntimeFactory_1 = require("./testContainerRuntimeFactory");
+Object.defineProperty(exports, "createTestContainerRuntimeFactory", { enumerable: true, get: function () { return testContainerRuntimeFactory_1.createTestContainerRuntimeFactory; } });
+Object.defineProperty(exports, "TestContainerRuntimeFactory", { enumerable: true, get: function () { return testContainerRuntimeFactory_1.TestContainerRuntimeFactory; } });
+var testFluidObject_1 = require("./testFluidObject");
+Object.defineProperty(exports, "TestFluidObject", { enumerable: true, get: function () { return testFluidObject_1.TestFluidObject; } });
+Object.defineProperty(exports, "TestFluidObjectFactory", { enumerable: true, get: function () { return testFluidObject_1.TestFluidObjectFactory; } });
+var testObjectProvider_1 = require("./testObjectProvider");
+Object.defineProperty(exports, "createDocumentId", { enumerable: true, get: function () { return testObjectProvider_1.createDocumentId; } });
+Object.defineProperty(exports, "DataObjectFactoryType", { enumerable: true, get: function () { return testObjectProvider_1.DataObjectFactoryType; } });
+Object.defineProperty(exports, "EventAndErrorTrackingLogger", { enumerable: true, get: function () { return testObjectProvider_1.EventAndErrorTrackingLogger; } });
+Object.defineProperty(exports, "getUnexpectedLogErrorException", { enumerable: true, get: function () { return testObjectProvider_1.getUnexpectedLogErrorException; } });
+Object.defineProperty(exports, "TestObjectProvider", { enumerable: true, get: function () { return testObjectProvider_1.TestObjectProvider; } });
+var TestSummaryUtils_1 = require("./TestSummaryUtils");
+Object.defineProperty(exports, "createSummarizer", { enumerable: true, get: function () { return TestSummaryUtils_1.createSummarizer; } });
+Object.defineProperty(exports, "createSummarizerFromFactory", { enumerable: true, get: function () { return TestSummaryUtils_1.createSummarizerFromFactory; } });
+Object.defineProperty(exports, "createSummarizerWithContainer", { enumerable: true, get: function () { return TestSummaryUtils_1.createSummarizerWithContainer; } });
+Object.defineProperty(exports, "summarizeNow", { enumerable: true, get: function () { return TestSummaryUtils_1.summarizeNow; } });
+Object.defineProperty(exports, "waitForContainerConnection", { enumerable: true, get: function () { return TestSummaryUtils_1.waitForContainerConnection; } });
+var timeoutUtils_1 = require("./timeoutUtils");
+Object.defineProperty(exports, "defaultTimeoutDurationMs", { enumerable: true, get: function () { return timeoutUtils_1.defaultTimeoutDurationMs; } });
+Object.defineProperty(exports, "ensureContainerConnected", { enumerable: true, get: function () { return timeoutUtils_1.ensureContainerConnected; } });
+Object.defineProperty(exports, "timeoutAwait", { enumerable: true, get: function () { return timeoutUtils_1.timeoutAwait; } });
+Object.defineProperty(exports, "timeoutPromise", { enumerable: true, get: function () { return timeoutUtils_1.timeoutPromise; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;AAEH,+CAA6B;AAC7B,uDAAqC;AACrC,2DAAyC;AACzC,gDAA8B;AAC9B,oDAAkC;AAClC,0CAAwB;AACxB,gEAA8C;AAC9C,oDAAkC;AAClC,iDAA+B;AAC/B,mDAAiC;AACjC,qDAAmC;AACnC,gDAA8B","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport * from \"./interfaces\";\nexport * from \"./testObjectProvider\";\nexport * from \"./loaderContainerTracker\";\nexport * from \"./localLoader\";\nexport * from \"./localCodeLoader\";\nexport * from \"./retry\";\nexport * from \"./testContainerRuntimeFactory\";\nexport * from \"./testFluidObject\";\nexport * from \"./timeoutUtils\";\nexport * from \"./DriverWrappers\";\nexport * from \"./TestSummaryUtils\";\nexport * from \"./TestConfigs\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mDAA+G;AAAtG,qHAAA,mBAAmB,OAAA;AAAE,4HAAA,0BAA0B,OAAA;AAAE,4HAAA,0BAA0B,OAAA;AAEpF,mEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,qDAAgG;AAAtE,kHAAA,eAAe,OAAA;AACzC,6CAAuE;AAA9D,uHAAA,wBAAwB,OAAA;AAAE,2GAAA,YAAY,OAAA;AAC/C,iCAAiD;AAAxC,+GAAA,sBAAsB,OAAA;AAC/B,6CAAmD;AAA1C,iHAAA,kBAAkB,OAAA;AAC3B,6EAA+G;AAAtG,gJAAA,iCAAiC,OAAA;AAAE,0IAAA,2BAA2B,OAAA;AACvE,qDAAoG;AAAnE,kHAAA,eAAe,OAAA;AAAE,yHAAA,sBAAsB,OAAA;AACxE,2DAS8B;AAR1B,sHAAA,gBAAgB,OAAA;AAChB,2HAAA,qBAAqB,OAAA;AACrB,iIAAA,2BAA2B,OAAA;AAC3B,oIAAA,8BAA8B,OAAA;AAI9B,wHAAA,kBAAkB,OAAA;AAEtB,uDAM4B;AALxB,oHAAA,gBAAgB,OAAA;AAChB,+HAAA,2BAA2B,OAAA;AAC3B,iIAAA,6BAA6B,OAAA;AAC7B,gHAAA,YAAY,OAAA;AACZ,8HAAA,0BAA0B,OAAA;AAE9B,+CAOwB;AANpB,wHAAA,wBAAwB,OAAA;AACxB,wHAAA,wBAAwB,OAAA;AACxB,4GAAA,YAAY,OAAA;AACZ,8GAAA,cAAc,OAAA","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport { wrapDocumentService, wrapDocumentServiceFactory, wrapDocumentStorageService } from \"./DriverWrappers\";\nexport { IProvideTestFluidObject, ITestFluidObject } from \"./interfaces\";\nexport { LoaderContainerTracker } from \"./loaderContainerTracker\";\nexport { fluidEntryPoint, LocalCodeLoader, SupportedExportInterfaces } from \"./localCodeLoader\";\nexport { createAndAttachContainer, createLoader } from \"./localLoader\";\nexport { retryWithEventualValue } from \"./retry\";\nexport { mockConfigProvider } from \"./TestConfigs\";\nexport { createTestContainerRuntimeFactory, TestContainerRuntimeFactory } from \"./testContainerRuntimeFactory\";\nexport { ChannelFactoryRegistry, TestFluidObject, TestFluidObjectFactory } from \"./testFluidObject\";\nexport {\n    createDocumentId,\n    DataObjectFactoryType,\n    EventAndErrorTrackingLogger,\n    getUnexpectedLogErrorException,\n    IOpProcessingController,\n    ITestContainerConfig,\n    ITestObjectProvider,\n    TestObjectProvider,\n} from \"./testObjectProvider\";\nexport {\n    createSummarizer,\n    createSummarizerFromFactory,\n    createSummarizerWithContainer,\n    summarizeNow,\n    waitForContainerConnection,\n} from \"./TestSummaryUtils\";\nexport {\n    defaultTimeoutDurationMs,\n    ensureContainerConnected,\n    timeoutAwait,\n    timeoutPromise,\n    TimeoutWithError,\n    TimeoutWithValue,\n} from \"./timeoutUtils\";\n"]}

package/dist/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/test-utils";
-export declare const pkgVersion = "2.0.0-dev.1.4.6.106135";
+export declare const pkgVersion = "2.0.0-dev.2.3.0.115467";
 //# sourceMappingURL=packageVersion.d.ts.map

package/dist/packageVersion.js

@@ -8,5 +8,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pkgVersion = exports.pkgName = void 0;
 exports.pkgName = "@fluidframework/test-utils";
-exports.pkgVersion = "2.0.0-dev.1.4.6.106135";
+exports.pkgVersion = "2.0.0-dev.2.3.0.115467";
 //# sourceMappingURL=packageVersion.js.map

package/dist/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,4BAA4B,CAAC;AACvC,QAAA,UAAU,GAAG,wBAAwB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/test-utils\";\nexport const pkgVersion = \"2.0.0-dev.1.4.6.106135\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,4BAA4B,CAAC;AACvC,QAAA,UAAU,GAAG,wBAAwB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/test-utils\";\nexport const pkgVersion = \"2.0.0-dev.2.3.0.115467\";\n"]}

package/dist/testFluidObject.d.ts

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { IRequest, IResponse, IFluidHandle } from "@fluidframework/core-interfaces";
+import { IRequest, IResponse, IFluidHandle, IFluidRouter } from "@fluidframework/core-interfaces";
 import { FluidDataStoreRuntime } from "@fluidframework/datastore";
 import { ISharedMap } from "@fluidframework/map";
 import { IFluidDataStoreContext, IFluidDataStoreFactory, IFluidDataStoreChannel } from "@fluidframework/runtime-definitions";
@@ -13,7 +13,7 @@ import { ITestFluidObject } from "./interfaces";
  * The shared objects can be retrieved by passing the key of the entry to getSharedObject.
  * It exposes the IFluidDataStoreContext and IFluidDataStoreRuntime.
  */
-export declare class TestFluidObject implements ITestFluidObject {
+export declare class TestFluidObject implements ITestFluidObject, IFluidRouter {
     readonly runtime: IFluidDataStoreRuntime;
     readonly channel: IFluidDataStoreChannel;
     readonly context: IFluidDataStoreContext;
@@ -21,6 +21,7 @@ export declare class TestFluidObject implements ITestFluidObject {
     static load(runtime: IFluidDataStoreRuntime, channel: IFluidDataStoreChannel, context: IFluidDataStoreContext, factoryEntries: Map<string, IChannelFactory>, existing: boolean): Promise<TestFluidObject>;
     get ITestFluidObject(): this;
     get IFluidLoadable(): this;
+    get IFluidRouter(): this;
     get handle(): IFluidHandle<this>;
     root: ISharedMap;
     private readonly innerHandle;

package/dist/testFluidObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testFluidObject.d.ts","sourceRoot":"","sources":["../src/testFluidObject.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAqB,qBAAqB,EAAuB,MAAM,2BAA2B,CAAC;AAC1G,OAAO,EAAa,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;GAIG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;aAmChC,OAAO,EAAE,sBAAsB;aAC/B,OAAO,EAAE,sBAAsB;aAC/B,OAAO,EAAE,sBAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB;WArClB,IAAI,CACpB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5C,QAAQ,EAAE,OAAO;IAQrB,IAAW,gBAAgB,SAE1B;IAED,IAAW,cAAc,SAExB;IAED,IAAW,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,CAA6B;IAE7D,IAAI,EAAG,UAAU,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD;;;;;;OAMG;gBAEiB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;IAKpE;;;OAGG;IACU,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAehD,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;YAI7C,UAAU;CAc3B;AAED,oBAAY,sBAAsB,GAAG,QAAQ,CAAC,CAAC,MAAM,GAAG,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;AAErF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,sBAAuB,YAAW,sBAAsB;IASrD,OAAO,CAAC,QAAQ,CAAC,cAAc;aACvB,IAAI;IATxB,IAAW,sBAAsB,SAAmB;IAEpD;;;;;OAKG;gBAC0B,cAAc,EAAE,sBAAsB,EAC/C,IAAI,SAA2B;IAEtC,oBAAoB,CAC7B,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,OAAO,GAClB,OAAO,CAAC,qBAAqB,CAAC;CAwCpC"}
+{"version":3,"file":"testFluidObject.d.ts","sourceRoot":"","sources":["../src/testFluidObject.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EAGf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAqB,qBAAqB,EAAuB,MAAM,2BAA2B,CAAC;AAC1G,OAAO,EAAa,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;GAIG;AACH,qBAAa,eAAgB,YAAW,gBAAgB,EAAE,YAAY;aAuC9C,OAAO,EAAE,sBAAsB;aAC/B,OAAO,EAAE,sBAAsB;aAC/B,OAAO,EAAE,sBAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB;WAzClB,IAAI,CACpB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5C,QAAQ,EAAE,OAAO;IAQrB,IAAW,gBAAgB,SAE1B;IAED,IAAW,cAAc,SAExB;IAED,IAAW,YAAY,SAEtB;IAED,IAAW,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,CAA6B;IAE7D,IAAI,EAAG,UAAU,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD;;;;;;OAMG;gBAEiB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,sBAAsB,EAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;IAKpE;;;OAGG;IACU,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAehD,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;YAI7C,UAAU;CAc3B;AAED,oBAAY,sBAAsB,GAAG,QAAQ,CAAC,CAAC,MAAM,GAAG,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;AAErF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,sBAAuB,YAAW,sBAAsB;IASrD,OAAO,CAAC,QAAQ,CAAC,cAAc;aACvB,IAAI;IATxB,IAAW,sBAAsB,SAAmB;IAEpD;;;;;OAKG;gBAC0B,cAAc,EAAE,sBAAsB,EAC/C,IAAI,SAA2B;IAEtC,oBAAoB,CAC7B,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,OAAO,GAClB,OAAO,CAAC,qBAAqB,CAAC;CA6CpC"}

package/dist/testFluidObject.js

@@ -8,6 +8,7 @@ exports.TestFluidObjectFactory = exports.TestFluidObject = void 0;
 const aqueduct_1 = require("@fluidframework/aqueduct");
 const datastore_1 = require("@fluidframework/datastore");
 const map_1 = require("@fluidframework/map");
+const common_utils_1 = require("@fluidframework/common-utils");
 /**
  * A test Fluid object that will create a shared object for each key-value pair in the factoryEntries passed to load.
  * The shared objects can be retrieved by passing the key of the entry to getSharedObject.
@@ -39,6 +40,9 @@ class TestFluidObject {
     get IFluidLoadable() {
         return this;
     }
+    get IFluidRouter() {
+        return this;
+    }
     get handle() { return this.innerHandle; }
     /**
      * Retrieves a shared object with the given id.
@@ -127,13 +131,16 @@ class TestFluidObjectFactory {
                 factoryEntriesMapForObject.set(id, entry[1]);
             }
         }
-        const runtimeClass = (0, datastore_1.mixinRequestHandler)(async (request) => {
-            const router = await routerP;
-            return router.request(request);
+        const runtimeClass = (0, datastore_1.mixinRequestHandler)(async (request, rt) => {
+            var _a;
+            const maybeRouter = await ((_a = rt.entryPoint) === null || _a === void 0 ? void 0 : _a.get());
+            (0, common_utils_1.assert)((maybeRouter === null || maybeRouter === void 0 ? void 0 : maybeRouter.IFluidRouter) !== undefined, "entryPoint should have been initialized by now");
+            return maybeRouter.IFluidRouter.request(request);
         });
-        const runtime = new runtimeClass(context, dataTypes, existing);
-        const routerP = TestFluidObject.load(runtime, runtime, context, factoryEntriesMapForObject, existing);
-        return runtime;
+        return new runtimeClass(context, dataTypes, existing, async (dataStoreRuntime) => TestFluidObject.load(dataStoreRuntime, 
+        // This works because 'runtime' is an instance of runtimeClass (which is a FluidDataStoreRuntime and
+        // thus implements IFluidDataStoreChannel) which passes itself as the parameter to this function.
+        dataStoreRuntime, context, factoryEntriesMapForObject, existing));
     }
 }
 exports.TestFluidObjectFactory = TestFluidObjectFactory;

package/dist/testFluidObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"testFluidObject.js","sourceRoot":"","sources":["../src/testFluidObject.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 { defaultFluidObjectRequestHandler } from \"@fluidframework/aqueduct\";\nimport { IRequest, IResponse, IFluidHandle } from \"@fluidframework/core-interfaces\";\nimport { FluidObjectHandle, FluidDataStoreRuntime, mixinRequestHandler } from \"@fluidframework/datastore\";\nimport { SharedMap, ISharedMap } from \"@fluidframework/map\";\nimport {\n    IFluidDataStoreContext,\n    IFluidDataStoreFactory,\n    IFluidDataStoreChannel,\n} from \"@fluidframework/runtime-definitions\";\nimport { IFluidDataStoreRuntime, IChannelFactory } from \"@fluidframework/datastore-definitions\";\nimport { ITestFluidObject } from \"./interfaces\";\n\n/**\n * A test Fluid object that will create a shared object for each key-value pair in the factoryEntries passed to load.\n * The shared objects can be retrieved by passing the key of the entry to getSharedObject.\n * It exposes the IFluidDataStoreContext and IFluidDataStoreRuntime.\n */\nexport class TestFluidObject implements ITestFluidObject {\n    public static async load(\n        runtime: IFluidDataStoreRuntime,\n        channel: IFluidDataStoreChannel,\n        context: IFluidDataStoreContext,\n        factoryEntries: Map<string, IChannelFactory>,\n        existing: boolean,\n    ) {\n        const fluidObject = new TestFluidObject(runtime, channel, context, factoryEntries);\n        await fluidObject.initialize(existing);\n\n        return fluidObject;\n    }\n\n    public get ITestFluidObject() {\n        return this;\n    }\n\n    public get IFluidLoadable() {\n        return this;\n    }\n\n    public get handle(): IFluidHandle<this> { return this.innerHandle; }\n\n    public root!: ISharedMap;\n    private readonly innerHandle: IFluidHandle<this>;\n\n    /**\n     * Creates a new TestFluidObject.\n     * @param runtime - The data store runtime.\n     * @param context - The data store context.\n     * @param factoryEntries - A list of id to IChannelFactory mapping. For each item in the list,\n     * a shared object is created which can be retrieved by calling getSharedObject() with the id;\n     */\n    constructor(\n        public readonly runtime: IFluidDataStoreRuntime,\n        public readonly channel: IFluidDataStoreChannel,\n        public readonly context: IFluidDataStoreContext,\n        private readonly factoryEntriesMap: Map<string, IChannelFactory>,\n    ) {\n        this.innerHandle = new FluidObjectHandle(this, \"\", runtime.objectsRoutingContext);\n    }\n\n    /**\n     * Retrieves a shared object with the given id.\n     * @param id - The id of the shared object to retrieve.\n     */\n    public async getSharedObject<T = any>(id: string): Promise<T> {\n        if (this.factoryEntriesMap === undefined) {\n            throw new Error(\"Shared objects were not provided during creation.\");\n        }\n\n        for (const key of this.factoryEntriesMap.keys()) {\n            if (key === id) {\n                const handle = this.root.get<IFluidHandle>(id);\n                return handle?.get() as unknown as T;\n            }\n        }\n\n        throw new Error(`Shared object with id ${id} not found.`);\n    }\n\n    public async request(request: IRequest): Promise<IResponse> {\n        return defaultFluidObjectRequestHandler(this, request);\n    }\n\n    private async initialize(existing: boolean) {\n        if (!existing) {\n            this.root = SharedMap.create(this.runtime, \"root\");\n\n            this.factoryEntriesMap.forEach((sharedObjectFactory: IChannelFactory, key: string) => {\n                const sharedObject = this.runtime.createChannel(key, sharedObjectFactory.type);\n                this.root.set(key, sharedObject.handle);\n            });\n\n            this.root.bindToContext();\n        }\n\n        this.root = await this.runtime.getChannel(\"root\") as ISharedMap;\n    }\n}\n\nexport type ChannelFactoryRegistry = Iterable<[string | undefined, IChannelFactory]>;\n\n/**\n * Creates a factory for a TestFluidObject with the given object factory entries. It creates a data store runtime\n * with the object factories in the entry list. All the entries with an id other than undefined are passed to the\n * Fluid object so that it can create a shared object for each.\n *\n * @example\n * The following will create a Fluid object that creates and loads a SharedString and SharedDirectory.\n * It will add SparseMatrix to the data store's factory so that it can be created later.\n *\n * ```typescript\n * new TestFluidObjectFactory([\n *  [ \"sharedString\", SharedString.getFactory() ],\n *  [ \"sharedDirectory\", SharedDirectory.getFactory() ],\n *  [ undefined, SparseMatrix.getFactory() ],\n * ]);\n * ```\n *\n * The SharedString and SharedDirectory can be retrieved via getSharedObject() on the TestFluidObject as follows:\n *\n * ```typescript\n * sharedString = testFluidObject.getSharedObject<SharedString>(\"sharedString\");\n * sharedDir = testFluidObject.getSharedObject<SharedDirectory>(\"sharedDirectory\");\n * ```\n */\nexport class TestFluidObjectFactory implements IFluidDataStoreFactory {\n    public get IFluidDataStoreFactory() { return this; }\n\n    /**\n     * Creates a new TestFluidObjectFactory.\n     * @param factoryEntries - A list of id to IChannelFactory mapping. It creates a data store runtime with each\n     * IChannelFactory. Entries with string ids are passed to the Fluid object so that it can create a shared object\n     * for it.\n     */\n    constructor(private readonly factoryEntries: ChannelFactoryRegistry,\n        public readonly type = \"TestFluidObjectFactory\") { }\n\n    public async instantiateDataStore(\n        context: IFluidDataStoreContext,\n        existing: boolean,\n    ): Promise<FluidDataStoreRuntime> {\n        const dataTypes = new Map<string, IChannelFactory>();\n\n        // Add SharedMap's factory which will be used to create the root map.\n        const sharedMapFactory = SharedMap.getFactory();\n        dataTypes.set(sharedMapFactory.type, sharedMapFactory);\n\n        // Add the object factories to the list to be sent to data store runtime.\n        for (const entry of this.factoryEntries) {\n            const factory = entry[1];\n            dataTypes.set(factory.type, factory);\n        }\n\n        // Create a map from the factory entries with entries that don't have the id as undefined. This will be\n        // passed to the Fluid object.\n        const factoryEntriesMapForObject = new Map<string, IChannelFactory>();\n        for (const entry of this.factoryEntries) {\n            const id = entry[0];\n            if (id !== undefined) {\n                factoryEntriesMapForObject.set(id, entry[1]);\n            }\n        }\n\n        const runtimeClass = mixinRequestHandler(\n            async (request: IRequest) => {\n                const router = await routerP;\n                return router.request(request);\n            });\n\n        const runtime = new runtimeClass(context, dataTypes, existing);\n        const routerP = TestFluidObject.load(\n            runtime,\n            runtime,\n            context,\n            factoryEntriesMapForObject,\n            existing,\n        );\n\n        return runtime;\n    }\n}\n"]}
+{"version":3,"file":"testFluidObject.js","sourceRoot":"","sources":["../src/testFluidObject.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 { defaultFluidObjectRequestHandler } from \"@fluidframework/aqueduct\";\nimport {\n    IRequest,\n    IResponse,\n    IFluidHandle,\n    IFluidRouter,\n    FluidObject,\n    IProvideFluidRouter,\n} from \"@fluidframework/core-interfaces\";\nimport { FluidObjectHandle, FluidDataStoreRuntime, mixinRequestHandler } from \"@fluidframework/datastore\";\nimport { SharedMap, ISharedMap } from \"@fluidframework/map\";\nimport {\n    IFluidDataStoreContext,\n    IFluidDataStoreFactory,\n    IFluidDataStoreChannel,\n} from \"@fluidframework/runtime-definitions\";\nimport { IFluidDataStoreRuntime, IChannelFactory } from \"@fluidframework/datastore-definitions\";\nimport { assert } from \"@fluidframework/common-utils\";\nimport { ITestFluidObject } from \"./interfaces\";\n\n/**\n * A test Fluid object that will create a shared object for each key-value pair in the factoryEntries passed to load.\n * The shared objects can be retrieved by passing the key of the entry to getSharedObject.\n * It exposes the IFluidDataStoreContext and IFluidDataStoreRuntime.\n */\nexport class TestFluidObject implements ITestFluidObject, IFluidRouter {\n    public static async load(\n        runtime: IFluidDataStoreRuntime,\n        channel: IFluidDataStoreChannel,\n        context: IFluidDataStoreContext,\n        factoryEntries: Map<string, IChannelFactory>,\n        existing: boolean,\n    ) {\n        const fluidObject = new TestFluidObject(runtime, channel, context, factoryEntries);\n        await fluidObject.initialize(existing);\n\n        return fluidObject;\n    }\n\n    public get ITestFluidObject() {\n        return this;\n    }\n\n    public get IFluidLoadable() {\n        return this;\n    }\n\n    public get IFluidRouter() {\n        return this;\n    }\n\n    public get handle(): IFluidHandle<this> { return this.innerHandle; }\n\n    public root!: ISharedMap;\n    private readonly innerHandle: IFluidHandle<this>;\n\n    /**\n     * Creates a new TestFluidObject.\n     * @param runtime - The data store runtime.\n     * @param context - The data store context.\n     * @param factoryEntries - A list of id to IChannelFactory mapping. For each item in the list,\n     * a shared object is created which can be retrieved by calling getSharedObject() with the id;\n     */\n    constructor(\n        public readonly runtime: IFluidDataStoreRuntime,\n        public readonly channel: IFluidDataStoreChannel,\n        public readonly context: IFluidDataStoreContext,\n        private readonly factoryEntriesMap: Map<string, IChannelFactory>,\n    ) {\n        this.innerHandle = new FluidObjectHandle(this, \"\", runtime.objectsRoutingContext);\n    }\n\n    /**\n     * Retrieves a shared object with the given id.\n     * @param id - The id of the shared object to retrieve.\n     */\n    public async getSharedObject<T = any>(id: string): Promise<T> {\n        if (this.factoryEntriesMap === undefined) {\n            throw new Error(\"Shared objects were not provided during creation.\");\n        }\n\n        for (const key of this.factoryEntriesMap.keys()) {\n            if (key === id) {\n                const handle = this.root.get<IFluidHandle>(id);\n                return handle?.get() as unknown as T;\n            }\n        }\n\n        throw new Error(`Shared object with id ${id} not found.`);\n    }\n\n    public async request(request: IRequest): Promise<IResponse> {\n        return defaultFluidObjectRequestHandler(this, request);\n    }\n\n    private async initialize(existing: boolean) {\n        if (!existing) {\n            this.root = SharedMap.create(this.runtime, \"root\");\n\n            this.factoryEntriesMap.forEach((sharedObjectFactory: IChannelFactory, key: string) => {\n                const sharedObject = this.runtime.createChannel(key, sharedObjectFactory.type);\n                this.root.set(key, sharedObject.handle);\n            });\n\n            this.root.bindToContext();\n        }\n\n        this.root = await this.runtime.getChannel(\"root\") as ISharedMap;\n    }\n}\n\nexport type ChannelFactoryRegistry = Iterable<[string | undefined, IChannelFactory]>;\n\n/**\n * Creates a factory for a TestFluidObject with the given object factory entries. It creates a data store runtime\n * with the object factories in the entry list. All the entries with an id other than undefined are passed to the\n * Fluid object so that it can create a shared object for each.\n *\n * @example\n * The following will create a Fluid object that creates and loads a SharedString and SharedDirectory.\n * It will add SparseMatrix to the data store's factory so that it can be created later.\n *\n * ```typescript\n * new TestFluidObjectFactory([\n *  [ \"sharedString\", SharedString.getFactory() ],\n *  [ \"sharedDirectory\", SharedDirectory.getFactory() ],\n *  [ undefined, SparseMatrix.getFactory() ],\n * ]);\n * ```\n *\n * The SharedString and SharedDirectory can be retrieved via getSharedObject() on the TestFluidObject as follows:\n *\n * ```typescript\n * sharedString = testFluidObject.getSharedObject<SharedString>(\"sharedString\");\n * sharedDir = testFluidObject.getSharedObject<SharedDirectory>(\"sharedDirectory\");\n * ```\n */\nexport class TestFluidObjectFactory implements IFluidDataStoreFactory {\n    public get IFluidDataStoreFactory() { return this; }\n\n    /**\n     * Creates a new TestFluidObjectFactory.\n     * @param factoryEntries - A list of id to IChannelFactory mapping. It creates a data store runtime with each\n     * IChannelFactory. Entries with string ids are passed to the Fluid object so that it can create a shared object\n     * for it.\n     */\n    constructor(private readonly factoryEntries: ChannelFactoryRegistry,\n        public readonly type = \"TestFluidObjectFactory\") { }\n\n    public async instantiateDataStore(\n        context: IFluidDataStoreContext,\n        existing: boolean,\n    ): Promise<FluidDataStoreRuntime> {\n        const dataTypes = new Map<string, IChannelFactory>();\n\n        // Add SharedMap's factory which will be used to create the root map.\n        const sharedMapFactory = SharedMap.getFactory();\n        dataTypes.set(sharedMapFactory.type, sharedMapFactory);\n\n        // Add the object factories to the list to be sent to data store runtime.\n        for (const entry of this.factoryEntries) {\n            const factory = entry[1];\n            dataTypes.set(factory.type, factory);\n        }\n\n        // Create a map from the factory entries with entries that don't have the id as undefined. This will be\n        // passed to the Fluid object.\n        const factoryEntriesMapForObject = new Map<string, IChannelFactory>();\n        for (const entry of this.factoryEntries) {\n            const id = entry[0];\n            if (id !== undefined) {\n                factoryEntriesMapForObject.set(id, entry[1]);\n            }\n        }\n\n        const runtimeClass = mixinRequestHandler(\n            async (request: IRequest, rt: FluidDataStoreRuntime) => {\n                const maybeRouter: FluidObject<IProvideFluidRouter> | undefined\n                    = await rt.entryPoint?.get();\n                assert(maybeRouter?.IFluidRouter !== undefined, \"entryPoint should have been initialized by now\");\n                return maybeRouter.IFluidRouter.request(request);\n            });\n\n        return new runtimeClass(\n            context,\n            dataTypes,\n            existing,\n            async (dataStoreRuntime: IFluidDataStoreRuntime) => TestFluidObject.load(\n                dataStoreRuntime,\n                // This works because 'runtime' is an instance of runtimeClass (which is a FluidDataStoreRuntime and\n                // thus implements IFluidDataStoreChannel) which passes itself as the parameter to this function.\n                dataStoreRuntime as FluidDataStoreRuntime,\n                context,\n                factoryEntriesMapForObject,\n                existing,\n            ));\n    }\n}\n"]}

package/dist/testObjectProvider.d.ts

@@ -68,6 +68,8 @@ export declare const createDocumentId: () => string;
  */
 export declare class EventAndErrorTrackingLogger extends TelemetryLogger {
     private readonly baseLogger;
+    /** Even if these error events are logged, tests should still be allowed to pass */
+    private readonly allowedErrors;
     constructor(baseLogger: ITelemetryBaseLogger);
     private readonly expectedEvents;
     private readonly unexpectedErrors;

package/dist/testObjectProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testObjectProvider.d.ts","sourceRoot":"","sources":["../src/testObjectProvider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AACnG,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACvH,OAAO,EACH,YAAY,EACZ,MAAM,EAET,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEzG,OAAO,EAAE,WAAW,EAAmB,MAAM,yCAAyC,CAAC;AAEvF,OAAO,EAAgC,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAmB,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAO3D,MAAM,WAAW,uBAAuB;IACpC,eAAe,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,eAAe,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,eAAe,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,gBAAgB,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CACvD;AAED,MAAM,WAAW,mBAAmB;IAChC,qBAAqB,EAAE,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,KAAK,eAAe,CAAC;IACvF,YAAY,CACR,cAAc,EAAE,QAAQ,CAAC,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,EAC9D,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GACpC,WAAW,CAAC;IACf,eAAe,CAAC,UAAU,EAAE,eAAe,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACvG,aAAa,CACT,UAAU,EAAE,eAAe,EAC3B,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,EACnC,aAAa,CAAC,EAAE,cAAc,GAC/B,OAAO,CAAC,UAAU,CAAC,CAAC;IAEvB;;;OAGG;IACH,cAAc,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,WAAW,CAAC;IACxE,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACnF,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,EAAE,aAAa,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACnH;;;OAGG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,CAAC;IAEtD,MAAM,EAAE,oBAAoB,CAAC;IAC7B,sBAAsB,EAAE,uBAAuB,CAAC;IAChD,WAAW,EAAE,YAAY,CAAC;IAC1B,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,sBAAsB,EAAE,uBAAuB,CAAC;IAEhD,kBAAkB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,KAAK,IAAI,IAAI,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,CAAC;CACvB;AAED,oBAAY,qBAAqB;IAC7B,MAAM,IAAA;IACN,IAAI,IAAA;CACP;AAED,MAAM,WAAW,oBAAoB;IACjC,qDAAqD;IACrD,mBAAmB,CAAC,EAAE,qBAAqB,CAAC;IAE5C,yFAAyF;IACzF,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC,2DAA2D;IAC3D,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAE1C,8DAA8D;IAC9D,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CACvC;AAED,eAAO,MAAM,gBAAgB,QAAO,MAAgB,CAAC;AAkCrD;;;;;GAKG;AACH,qBAAa,2BAA4B,SAAQ,eAAe;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,oBAAoB;IAI7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqF;IACpH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAEvD,qBAAqB,CAAC,GAAI,qBAAqB,EAAE,sBAAsB,EAAE;IAWhF,IAAI,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;IA6B/B,2BAA2B;;;;;;;CAQrC;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,mBAAmB;aAetC,iBAAiB,EAAE,OAAO,MAAM;aAChC,MAAM,EAAE,WAAW;aACnB,qBAAqB,EAAE,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,KAAK,eAAe;IAhB1G,OAAO,CAAC,uBAAuB,CAAgC;IAC/D,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,OAAO,CAA0C;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAE1D,OAAO,CAAC,gBAAgB,CAAS;IAEjC;;;;OAIG;gBAEiB,iBAAiB,EAAE,OAAO,MAAM,EAChC,MAAM,EAAE,WAAW,EACnB,qBAAqB,EAAE,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,KAAK,eAAe;IAK1G,IAAI,MAAM,IAAI,2BAA2B,CAcxC;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,2BAA2B,EAE7C;IAED,IAAI,sBAAsB,4BAKzB;IAED,IAAI,WAAW,iBAKd;IAED,IAAI,UAAU,WAEb;IAED,IAAI,kBAAkB,sBAErB;IAED,IAAI,sBAAsB,IAAI,uBAAuB,CAEpD;IAED;;;;;;;OAOG;IACI,YAAY,CACf,cAAc,EAAE,QAAQ,CAAC,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,EAC9D,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAmBvC;;;;;;;;OAQG;IACU,eAAe,CAAC,UAAU,EAAE,eAAe,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAkBhF,aAAa,CACtB,UAAU,EAAE,eAAe,EAC3B,WAAW,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,EACnC,aAAa,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAKxD;;;;OAIG;IACI,cAAc,CAAC,mBAAmB,CAAC,EAAE,oBAAoB;IAOhE;;;;OAIG;IACU,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC;IAkB/F;;;;;OAKG;IACU,iBAAiB,CAC1B,mBAAmB,CAAC,EAAE,oBAAoB,EAC1C,aAAa,CAAC,EAAE,cAAc,GAC/B,OAAO,CAAC,UAAU,CAAC;IAWf,KAAK;IAaC,kBAAkB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D,sBAAsB,CAAC,SAAS,EAAE,UAAU;IAYzD,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS;IAI/C,2BAA2B,CAAC,qBAAqB,GAAE,OAAe;CAI5E;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,2BAA2B,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,qBAa9G"}
+{"version":3,"file":"testObjectProvider.d.ts","sourceRoot":"","sources":["../src/testObjectProvider.ts"],"names":[],"mappings":"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"}

package/dist/testObjectProvider.js

@@ -59,6 +59,11 @@ class EventAndErrorTrackingLogger extends telemetry_utils_1.TelemetryLogger {
     constructor(baseLogger) {
         super();
         this.baseLogger = baseLogger;
+        /** Even if these error events are logged, tests should still be allowed to pass */
+        this.allowedErrors = [
+            // This log was removed in current version as unnecessary, but it's still present in previous versions
+            "fluid:telemetry:Container:NoRealStorageInDetachedContainer",
+        ];
         this.expectedEvents = [];
         this.unexpectedErrors = [];
     }
@@ -95,7 +100,12 @@ class EventAndErrorTrackingLogger extends telemetry_utils_1.TelemetryLogger {
             }
         }
         if (event.category === "error") {
-            this.unexpectedErrors.push(event);
+            if (this.allowedErrors.includes(event.eventName)) {
+                event.category = "generic";
+            }
+            else {
+                this.unexpectedErrors.push(event);
+            }
         }
         this.baseLogger.send(event);
     }

package/dist/testObjectProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"testObjectProvider.js","sourceRoot":"","sources":["../src/testObjectProvider.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 { IContainer, IHostLoader, IFluidCodeDetails } from \"@fluidframework/container-definitions\";\nimport { ITelemetryGenericEvent, ITelemetryBaseLogger, ITelemetryBaseEvent } from \"@fluidframework/common-definitions\";\nimport {\n    ILoaderProps,\n    Loader,\n    waitContainerToCatchUp as waitContainerToCatchUp_original,\n} from \"@fluidframework/container-loader\";\nimport { IContainerRuntimeOptions } from \"@fluidframework/container-runtime\";\nimport { IRequestHeader } from \"@fluidframework/core-interfaces\";\nimport { IDocumentServiceFactory, IResolvedUrl, IUrlResolver } from \"@fluidframework/driver-definitions\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport { ITestDriver, TestDriverTypes } from \"@fluidframework/test-driver-definitions\";\nimport { v4 as uuid } from \"uuid\";\nimport { ChildLogger, MultiSinkLogger, TelemetryLogger } from \"@fluidframework/telemetry-utils\";\nimport { LoaderContainerTracker } from \"./loaderContainerTracker\";\nimport { fluidEntryPoint, LocalCodeLoader } from \"./localCodeLoader\";\nimport { createAndAttachContainer } from \"./localLoader\";\nimport { ChannelFactoryRegistry } from \"./testFluidObject\";\n\nconst defaultCodeDetails: IFluidCodeDetails = {\n    package: \"defaultTestPackage\",\n    config: {},\n};\n\nexport interface IOpProcessingController {\n    processIncoming(...containers: IContainer[]): Promise<void>;\n    processOutgoing(...containers: IContainer[]): Promise<void>;\n    pauseProcessing(...containers: IContainer[]): Promise<void>;\n    resumeProcessing(...containers: IContainer[]): void;\n}\n\nexport interface ITestObjectProvider {\n    createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint;\n    createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        loaderProps?: Partial<ILoaderProps>,\n    ): IHostLoader;\n    createContainer(entryPoint: fluidEntryPoint, loaderProps?: Partial<ILoaderProps>): Promise<IContainer>;\n    loadContainer(\n        entryPoint: fluidEntryPoint,\n        loaderProps?: Partial<ILoaderProps>,\n        requestHeader?: IRequestHeader,\n    ): Promise<IContainer>;\n\n    /**\n     * Used to create a test Container. The Loader/ContainerRuntime/DataRuntime might be different versioned.\n     * In generateLocalCompatTest(), this Container and its runtime will be arbitrarily-versioned.\n     */\n    makeTestLoader(testContainerConfig?: ITestContainerConfig): IHostLoader;\n    makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>;\n    loadTestContainer(testContainerConfig?: ITestContainerConfig, requestHeader?: IRequestHeader): Promise<IContainer>;\n    /**\n     *\n     * @param url - Resolved container URL\n     */\n    updateDocumentId(url: IResolvedUrl | undefined): void;\n\n    logger: ITelemetryBaseLogger;\n    documentServiceFactory: IDocumentServiceFactory;\n    urlResolver: IUrlResolver;\n    defaultCodeDetails: IFluidCodeDetails;\n    opProcessingController: IOpProcessingController;\n\n    ensureSynchronized(timeoutDuration?: number): Promise<void>;\n    reset(): void;\n\n    documentId: string;\n    driver: ITestDriver;\n}\n\nexport enum DataObjectFactoryType {\n    Primed, // default\n    Test,\n}\n\nexport interface ITestContainerConfig {\n    /** TestFluidDataObject instead of PrimedDataStore */\n    fluidDataObjectType?: DataObjectFactoryType;\n\n    /** An array of channel name and DDS factory pair to create on container creation time */\n    registry?: ChannelFactoryRegistry;\n\n    /** Container runtime options for the container instance */\n    runtimeOptions?: IContainerRuntimeOptions;\n\n    /** Loader options for the loader used to create containers */\n    loaderProps?: Partial<ILoaderProps>;\n}\n\nexport const createDocumentId = (): string => uuid();\n\ninterface IDocumentIdStrategy {\n    get(): string;\n    update(resolvedUrl?: IResolvedUrl): void;\n    reset(): void;\n}\n\n/**\n * Document ID is treated differently by test drivers. The key difference is in generating\n * a new container ID and accessing the container in multi-instance test cases.\n */\nfunction getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {\n    let documentId = createDocumentId();\n    switch (type) {\n        case \"odsp\":\n            return {\n                get: () => documentId,\n                update: () => { }, // do not update the document ID in odsp test cases\n                reset: () => { documentId = createDocumentId(); },\n            };\n        default:\n            return {\n                get: () => documentId,\n                update: (resolvedUrl?: IResolvedUrl) => {\n                    // Extract the document ID from the resolved container's URL and reset the ID property\n                    ensureFluidResolvedUrl(resolvedUrl);\n                    documentId = resolvedUrl.id ?? documentId;\n                },\n                reset: () => { documentId = createDocumentId(); },\n            };\n    }\n}\n\n/**\n * This class tracks events. It allows specifying expected events, which will be looked for in order.\n * It also tracks all unexpected errors.\n * At any point you call reportAndClearTrackedEvents which will provide all unexpected errors, and\n * any expected events that have not occurred.\n */\nexport class EventAndErrorTrackingLogger extends TelemetryLogger {\n    constructor(private readonly baseLogger: ITelemetryBaseLogger) {\n        super();\n    }\n\n    private readonly expectedEvents: ({ index: number; event: ITelemetryGenericEvent | undefined; } | undefined)[] = [];\n    private readonly unexpectedErrors: ITelemetryBaseEvent[] = [];\n\n    public registerExpectedEvent(... orderedExpectedEvents: ITelemetryGenericEvent[]) {\n        if (this.expectedEvents.length !== 0) {\n            // we don't have to error here. just no reason not to. given the events must be\n            // ordered it could be tricky to figure out problems around multiple registrations.\n            throw new Error(\n                \"Expected events already registered.\\n\"\n                + \"Call reportAndClearTrackedEvents to clear them before registering more\");\n        }\n        this.expectedEvents.push(... orderedExpectedEvents.map((event, index) => ({ index, event })));\n    }\n\n    send(event: ITelemetryBaseEvent): void {\n        const ee = this.expectedEvents[0]?.event;\n        if (ee?.eventName === event.eventName) {\n            let matches = true;\n            for (const key of Object.keys(ee)) {\n                if (ee[key] !== event[key]) {\n                    matches = false;\n                    break;\n                }\n            }\n            if (matches) {\n                // we found an expected event\n                // so remove it from the list of expected events\n                // and if it is an error, change it to generic\n                // this helps keep our telemetry clear of\n                // expected errors.\n                this.expectedEvents.shift();\n                if (event.category === \"error\") {\n                    event.category = \"generic\";\n                }\n            }\n        }\n        if (event.category === \"error\") {\n            this.unexpectedErrors.push(event);\n        }\n\n        this.baseLogger.send(event);\n    }\n\n    public reportAndClearTrackedEvents() {\n        const expectedNotFound = this.expectedEvents.splice(0, this.expectedEvents.length);\n        const unexpectedErrors = this.unexpectedErrors.splice(0, this.unexpectedErrors.length);\n        return {\n            expectedNotFound,\n            unexpectedErrors,\n        };\n    }\n}\n\n/**\n * Shared base class for test object provider.  Contain code for loader and container creation and loading\n */\nexport class TestObjectProvider implements ITestObjectProvider {\n    private _loaderContainerTracker = new LoaderContainerTracker();\n    private _documentServiceFactory: IDocumentServiceFactory | undefined;\n    private _urlResolver: IUrlResolver | undefined;\n    private _logger: EventAndErrorTrackingLogger | undefined;\n    private readonly _documentIdStrategy: IDocumentIdStrategy;\n    // Since documentId doesn't change we can only create/make one container. Call the load functions instead.\n    private _documentCreated = false;\n\n    /**\n     * Manage objects for loading and creating container, including the driver, loader, and OpProcessingController\n     * @param createFluidEntryPoint - callback to create a fluidEntryPoint, with an optional set of channel name\n     * and factory for TestFluidObject\n     */\n    constructor(\n        public readonly LoaderConstructor: typeof Loader,\n        public readonly driver: ITestDriver,\n        public readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,\n    ) {\n        this._documentIdStrategy = getDocumentIdStrategy(driver.type);\n    }\n\n    get logger(): EventAndErrorTrackingLogger {\n        if (this._logger === undefined) {\n            this._logger = new EventAndErrorTrackingLogger(\n                ChildLogger.create(getTestLogger?.(), undefined,\n                {\n                    all: {\n                        driverType: this.driver.type,\n                        driverEndpointName: this.driver.endpointName,\n                        driverTenantName: this.driver.tenantName,\n                        driverUserIndex: this.driver.userIndex,\n                    },\n                }));\n        }\n        return this._logger;\n    }\n\n    set logger(logger: EventAndErrorTrackingLogger) {\n        this._logger = logger;\n    }\n\n    get documentServiceFactory() {\n        if (!this._documentServiceFactory) {\n            this._documentServiceFactory = this.driver.createDocumentServiceFactory();\n        }\n        return this._documentServiceFactory;\n    }\n\n    get urlResolver() {\n        if (!this._urlResolver) {\n            this._urlResolver = this.driver.createUrlResolver();\n        }\n        return this._urlResolver;\n    }\n\n    get documentId() {\n        return this._documentIdStrategy.get();\n    }\n\n    get defaultCodeDetails() {\n        return defaultCodeDetails;\n    }\n\n    get opProcessingController(): IOpProcessingController {\n        return this._loaderContainerTracker;\n    }\n\n    /**\n     * Create a loader. Containers created/loaded through this loader will be added to the OpProcessingController.\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        loaderProps?: Partial<ILoaderProps>,\n    ) {\n        const multiSinkLogger = new MultiSinkLogger();\n        multiSinkLogger.addLogger(this.logger);\n        if (loaderProps?.logger !== undefined) {\n            multiSinkLogger.addLogger(loaderProps.logger);\n        }\n\n        const loader = new this.LoaderConstructor({\n            ... loaderProps,\n            logger: multiSinkLogger,\n            codeLoader: loaderProps?.codeLoader ?? new LocalCodeLoader(packageEntries),\n            urlResolver: loaderProps?.urlResolver ?? this.urlResolver,\n            documentServiceFactory: loaderProps?.documentServiceFactory ?? this.documentServiceFactory,\n        });\n        this._loaderContainerTracker.add(loader);\n        return loader;\n    }\n\n    /**\n     * Create a container using a default document id and code details.\n     * Container created is automatically added to the OpProcessingController to manage op flow\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public async createContainer(entryPoint: fluidEntryPoint, loaderProps?: Partial<ILoaderProps>) {\n        if (this._documentCreated) {\n            throw new Error(\n                \"Only one container/document can be created. To load the container/document use loadContainer\");\n        }\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], loaderProps);\n        const container = await createAndAttachContainer(\n            defaultCodeDetails,\n            loader,\n            this.driver.createCreateNewRequest(this.documentId),\n        );\n        this._documentCreated = true;\n        // r11s driver will generate a new ID for the new container.\n        // update the document ID with the actual ID of the attached container.\n        this._documentIdStrategy.update(container.resolvedUrl);\n        return container;\n    }\n\n    public async loadContainer(\n        entryPoint: fluidEntryPoint,\n        loaderProps?: Partial<ILoaderProps>,\n        requestHeader?: IRequestHeader): Promise<IContainer> {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], loaderProps);\n        return loader.resolve({ url: await this.driver.createContainerUrl(this.documentId), headers: requestHeader });\n    }\n\n    /**\n     * Make a test loader. Containers created/loaded through this loader will be added to the OpProcessingController.\n     * The version of the loader/containerRuntime/dataRuntime may vary based on compat config of the current run\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public makeTestLoader(testContainerConfig?: ITestContainerConfig) {\n        return this.createLoader(\n            [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],\n            testContainerConfig?.loaderProps,\n        );\n    }\n\n    /**\n     * Make a container using a default document id and code details\n     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer> {\n        if (this._documentCreated) {\n            throw new Error(\n                \"Only one container/document can be created. To load the container/document use loadTestContainer\");\n        }\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container =\n            await createAndAttachContainer(\n                defaultCodeDetails,\n                loader,\n                this.driver.createCreateNewRequest(this.documentId));\n        this._documentCreated = true;\n        // r11s driver will generate a new ID for the new container.\n        // update the document ID with the actual ID of the attached container.\n        this._documentIdStrategy.update(container.resolvedUrl);\n        return container;\n    }\n\n    /**\n     * Load a container using a default document id and code details.\n     * IContainer loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     * @param requestHeader - optional headers to be supplied to the loader\n     */\n    public async loadTestContainer(\n        testContainerConfig?: ITestContainerConfig,\n        requestHeader?: IRequestHeader,\n    ): Promise<IContainer> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container = await loader.resolve({\n            url: await this.driver.createContainerUrl(this.documentId),\n            headers: requestHeader,\n        });\n        await this.waitContainerToCatchUp(container);\n\n        return container;\n    }\n\n    public reset() {\n        this._loaderContainerTracker.reset();\n        this._documentServiceFactory = undefined;\n        this._urlResolver = undefined;\n        this._documentIdStrategy.reset();\n        const logError = getUnexpectedLogErrorException(this._logger);\n        if (logError) {\n            throw logError;\n        }\n        this._logger = undefined;\n        this._documentCreated = false;\n    }\n\n    public async ensureSynchronized(timeoutDuration?: number): Promise<void> {\n        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions\n        return !timeoutDuration\n            ? this._loaderContainerTracker.ensureSynchronized()\n            : this._loaderContainerTracker.ensureSynchronizedWithTimeout?.(timeoutDuration);\n    }\n\n    public async waitContainerToCatchUp(container: IContainer) {\n        // The original waitContainerToCatchUp() from container loader uses either Container.resume()\n        // or Container.connect() as part of its implementation. However, resume() was deprecated\n        // and eventually replaced with connect(). To avoid issues during LTS compatibility testing\n        // with older container versions issues, we use resume() when connect() is unavailable.\n        if ((container as any).connect === undefined) {\n            (container as any).connect = (container as any).resume;\n        }\n\n        return waitContainerToCatchUp_original(container);\n    }\n\n    updateDocumentId(resolvedUrl: IResolvedUrl | undefined) {\n        this._documentIdStrategy.update(resolvedUrl);\n    }\n\n    public resetLoaderContainerTracker(syncSummarizerClients: boolean = false) {\n        this._loaderContainerTracker.reset();\n        this._loaderContainerTracker = new LoaderContainerTracker(syncSummarizerClients);\n    }\n}\n\nexport function getUnexpectedLogErrorException(logger: EventAndErrorTrackingLogger | undefined, prefix?: string) {\n    if (logger === undefined) {\n        return;\n    }\n    const results = logger.reportAndClearTrackedEvents();\n    if (results.unexpectedErrors.length > 0) {\n        return new Error(\n            `${prefix ?? \"\"}Unexpected Errors in Logs:\\n${JSON.stringify(results.unexpectedErrors, undefined, 2)}`);\n    }\n    if (results.expectedNotFound.length > 0) {\n        return new Error(\n            `${prefix ?? \"\"}Expected Events not found:\\n${JSON.stringify(results.expectedNotFound, undefined, 2)}`);\n    }\n}\n"]}
+{"version":3,"file":"testObjectProvider.js","sourceRoot":"","sources":["../src/testObjectProvider.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 { IContainer, IHostLoader, IFluidCodeDetails } from \"@fluidframework/container-definitions\";\nimport { ITelemetryGenericEvent, ITelemetryBaseLogger, ITelemetryBaseEvent } from \"@fluidframework/common-definitions\";\nimport {\n    ILoaderProps,\n    Loader,\n    waitContainerToCatchUp as waitContainerToCatchUp_original,\n} from \"@fluidframework/container-loader\";\nimport { IContainerRuntimeOptions } from \"@fluidframework/container-runtime\";\nimport { IRequestHeader } from \"@fluidframework/core-interfaces\";\nimport { IDocumentServiceFactory, IResolvedUrl, IUrlResolver } from \"@fluidframework/driver-definitions\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport { ITestDriver, TestDriverTypes } from \"@fluidframework/test-driver-definitions\";\nimport { v4 as uuid } from \"uuid\";\nimport { ChildLogger, MultiSinkLogger, TelemetryLogger } from \"@fluidframework/telemetry-utils\";\nimport { LoaderContainerTracker } from \"./loaderContainerTracker\";\nimport { fluidEntryPoint, LocalCodeLoader } from \"./localCodeLoader\";\nimport { createAndAttachContainer } from \"./localLoader\";\nimport { ChannelFactoryRegistry } from \"./testFluidObject\";\n\nconst defaultCodeDetails: IFluidCodeDetails = {\n    package: \"defaultTestPackage\",\n    config: {},\n};\n\nexport interface IOpProcessingController {\n    processIncoming(...containers: IContainer[]): Promise<void>;\n    processOutgoing(...containers: IContainer[]): Promise<void>;\n    pauseProcessing(...containers: IContainer[]): Promise<void>;\n    resumeProcessing(...containers: IContainer[]): void;\n}\n\nexport interface ITestObjectProvider {\n    createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint;\n    createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        loaderProps?: Partial<ILoaderProps>,\n    ): IHostLoader;\n    createContainer(entryPoint: fluidEntryPoint, loaderProps?: Partial<ILoaderProps>): Promise<IContainer>;\n    loadContainer(\n        entryPoint: fluidEntryPoint,\n        loaderProps?: Partial<ILoaderProps>,\n        requestHeader?: IRequestHeader,\n    ): Promise<IContainer>;\n\n    /**\n     * Used to create a test Container. The Loader/ContainerRuntime/DataRuntime might be different versioned.\n     * In generateLocalCompatTest(), this Container and its runtime will be arbitrarily-versioned.\n     */\n    makeTestLoader(testContainerConfig?: ITestContainerConfig): IHostLoader;\n    makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>;\n    loadTestContainer(testContainerConfig?: ITestContainerConfig, requestHeader?: IRequestHeader): Promise<IContainer>;\n    /**\n     *\n     * @param url - Resolved container URL\n     */\n    updateDocumentId(url: IResolvedUrl | undefined): void;\n\n    logger: ITelemetryBaseLogger;\n    documentServiceFactory: IDocumentServiceFactory;\n    urlResolver: IUrlResolver;\n    defaultCodeDetails: IFluidCodeDetails;\n    opProcessingController: IOpProcessingController;\n\n    ensureSynchronized(timeoutDuration?: number): Promise<void>;\n    reset(): void;\n\n    documentId: string;\n    driver: ITestDriver;\n}\n\nexport enum DataObjectFactoryType {\n    Primed, // default\n    Test,\n}\n\nexport interface ITestContainerConfig {\n    /** TestFluidDataObject instead of PrimedDataStore */\n    fluidDataObjectType?: DataObjectFactoryType;\n\n    /** An array of channel name and DDS factory pair to create on container creation time */\n    registry?: ChannelFactoryRegistry;\n\n    /** Container runtime options for the container instance */\n    runtimeOptions?: IContainerRuntimeOptions;\n\n    /** Loader options for the loader used to create containers */\n    loaderProps?: Partial<ILoaderProps>;\n}\n\nexport const createDocumentId = (): string => uuid();\n\ninterface IDocumentIdStrategy {\n    get(): string;\n    update(resolvedUrl?: IResolvedUrl): void;\n    reset(): void;\n}\n\n/**\n * Document ID is treated differently by test drivers. The key difference is in generating\n * a new container ID and accessing the container in multi-instance test cases.\n */\nfunction getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {\n    let documentId = createDocumentId();\n    switch (type) {\n        case \"odsp\":\n            return {\n                get: () => documentId,\n                update: () => { }, // do not update the document ID in odsp test cases\n                reset: () => { documentId = createDocumentId(); },\n            };\n        default:\n            return {\n                get: () => documentId,\n                update: (resolvedUrl?: IResolvedUrl) => {\n                    // Extract the document ID from the resolved container's URL and reset the ID property\n                    ensureFluidResolvedUrl(resolvedUrl);\n                    documentId = resolvedUrl.id ?? documentId;\n                },\n                reset: () => { documentId = createDocumentId(); },\n            };\n    }\n}\n\n/**\n * This class tracks events. It allows specifying expected events, which will be looked for in order.\n * It also tracks all unexpected errors.\n * At any point you call reportAndClearTrackedEvents which will provide all unexpected errors, and\n * any expected events that have not occurred.\n */\nexport class EventAndErrorTrackingLogger extends TelemetryLogger {\n    /** Even if these error events are logged, tests should still be allowed to pass */\n    private readonly allowedErrors: string[] = [\n        // This log was removed in current version as unnecessary, but it's still present in previous versions\n        \"fluid:telemetry:Container:NoRealStorageInDetachedContainer\",\n    ];\n\n    constructor(private readonly baseLogger: ITelemetryBaseLogger) {\n        super();\n    }\n\n    private readonly expectedEvents: ({ index: number; event: ITelemetryGenericEvent | undefined; } | undefined)[] = [];\n    private readonly unexpectedErrors: ITelemetryBaseEvent[] = [];\n\n    public registerExpectedEvent(... orderedExpectedEvents: ITelemetryGenericEvent[]) {\n        if (this.expectedEvents.length !== 0) {\n            // we don't have to error here. just no reason not to. given the events must be\n            // ordered it could be tricky to figure out problems around multiple registrations.\n            throw new Error(\n                \"Expected events already registered.\\n\"\n                + \"Call reportAndClearTrackedEvents to clear them before registering more\");\n        }\n        this.expectedEvents.push(... orderedExpectedEvents.map((event, index) => ({ index, event })));\n    }\n\n    send(event: ITelemetryBaseEvent): void {\n        const ee = this.expectedEvents[0]?.event;\n        if (ee?.eventName === event.eventName) {\n            let matches = true;\n            for (const key of Object.keys(ee)) {\n                if (ee[key] !== event[key]) {\n                    matches = false;\n                    break;\n                }\n            }\n            if (matches) {\n                // we found an expected event\n                // so remove it from the list of expected events\n                // and if it is an error, change it to generic\n                // this helps keep our telemetry clear of\n                // expected errors.\n                this.expectedEvents.shift();\n                if (event.category === \"error\") {\n                    event.category = \"generic\";\n                }\n            }\n        }\n        if (event.category === \"error\") {\n            if (this.allowedErrors.includes(event.eventName)) {\n                event.category = \"generic\";\n            } else {\n                this.unexpectedErrors.push(event);\n            }\n        }\n\n        this.baseLogger.send(event);\n    }\n\n    public reportAndClearTrackedEvents() {\n        const expectedNotFound = this.expectedEvents.splice(0, this.expectedEvents.length);\n        const unexpectedErrors = this.unexpectedErrors.splice(0, this.unexpectedErrors.length);\n        return {\n            expectedNotFound,\n            unexpectedErrors,\n        };\n    }\n}\n\n/**\n * Shared base class for test object provider.  Contain code for loader and container creation and loading\n */\nexport class TestObjectProvider implements ITestObjectProvider {\n    private _loaderContainerTracker = new LoaderContainerTracker();\n    private _documentServiceFactory: IDocumentServiceFactory | undefined;\n    private _urlResolver: IUrlResolver | undefined;\n    private _logger: EventAndErrorTrackingLogger | undefined;\n    private readonly _documentIdStrategy: IDocumentIdStrategy;\n    // Since documentId doesn't change we can only create/make one container. Call the load functions instead.\n    private _documentCreated = false;\n\n    /**\n     * Manage objects for loading and creating container, including the driver, loader, and OpProcessingController\n     * @param createFluidEntryPoint - callback to create a fluidEntryPoint, with an optional set of channel name\n     * and factory for TestFluidObject\n     */\n    constructor(\n        public readonly LoaderConstructor: typeof Loader,\n        public readonly driver: ITestDriver,\n        public readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,\n    ) {\n        this._documentIdStrategy = getDocumentIdStrategy(driver.type);\n    }\n\n    get logger(): EventAndErrorTrackingLogger {\n        if (this._logger === undefined) {\n            this._logger = new EventAndErrorTrackingLogger(\n                ChildLogger.create(getTestLogger?.(), undefined,\n                {\n                    all: {\n                        driverType: this.driver.type,\n                        driverEndpointName: this.driver.endpointName,\n                        driverTenantName: this.driver.tenantName,\n                        driverUserIndex: this.driver.userIndex,\n                    },\n                }));\n        }\n        return this._logger;\n    }\n\n    set logger(logger: EventAndErrorTrackingLogger) {\n        this._logger = logger;\n    }\n\n    get documentServiceFactory() {\n        if (!this._documentServiceFactory) {\n            this._documentServiceFactory = this.driver.createDocumentServiceFactory();\n        }\n        return this._documentServiceFactory;\n    }\n\n    get urlResolver() {\n        if (!this._urlResolver) {\n            this._urlResolver = this.driver.createUrlResolver();\n        }\n        return this._urlResolver;\n    }\n\n    get documentId() {\n        return this._documentIdStrategy.get();\n    }\n\n    get defaultCodeDetails() {\n        return defaultCodeDetails;\n    }\n\n    get opProcessingController(): IOpProcessingController {\n        return this._loaderContainerTracker;\n    }\n\n    /**\n     * Create a loader. Containers created/loaded through this loader will be added to the OpProcessingController.\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        loaderProps?: Partial<ILoaderProps>,\n    ) {\n        const multiSinkLogger = new MultiSinkLogger();\n        multiSinkLogger.addLogger(this.logger);\n        if (loaderProps?.logger !== undefined) {\n            multiSinkLogger.addLogger(loaderProps.logger);\n        }\n\n        const loader = new this.LoaderConstructor({\n            ... loaderProps,\n            logger: multiSinkLogger,\n            codeLoader: loaderProps?.codeLoader ?? new LocalCodeLoader(packageEntries),\n            urlResolver: loaderProps?.urlResolver ?? this.urlResolver,\n            documentServiceFactory: loaderProps?.documentServiceFactory ?? this.documentServiceFactory,\n        });\n        this._loaderContainerTracker.add(loader);\n        return loader;\n    }\n\n    /**\n     * Create a container using a default document id and code details.\n     * Container created is automatically added to the OpProcessingController to manage op flow\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public async createContainer(entryPoint: fluidEntryPoint, loaderProps?: Partial<ILoaderProps>) {\n        if (this._documentCreated) {\n            throw new Error(\n                \"Only one container/document can be created. To load the container/document use loadContainer\");\n        }\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], loaderProps);\n        const container = await createAndAttachContainer(\n            defaultCodeDetails,\n            loader,\n            this.driver.createCreateNewRequest(this.documentId),\n        );\n        this._documentCreated = true;\n        // r11s driver will generate a new ID for the new container.\n        // update the document ID with the actual ID of the attached container.\n        this._documentIdStrategy.update(container.resolvedUrl);\n        return container;\n    }\n\n    public async loadContainer(\n        entryPoint: fluidEntryPoint,\n        loaderProps?: Partial<ILoaderProps>,\n        requestHeader?: IRequestHeader): Promise<IContainer> {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], loaderProps);\n        return loader.resolve({ url: await this.driver.createContainerUrl(this.documentId), headers: requestHeader });\n    }\n\n    /**\n     * Make a test loader. Containers created/loaded through this loader will be added to the OpProcessingController.\n     * The version of the loader/containerRuntime/dataRuntime may vary based on compat config of the current run\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public makeTestLoader(testContainerConfig?: ITestContainerConfig) {\n        return this.createLoader(\n            [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],\n            testContainerConfig?.loaderProps,\n        );\n    }\n\n    /**\n     * Make a container using a default document id and code details\n     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer> {\n        if (this._documentCreated) {\n            throw new Error(\n                \"Only one container/document can be created. To load the container/document use loadTestContainer\");\n        }\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container =\n            await createAndAttachContainer(\n                defaultCodeDetails,\n                loader,\n                this.driver.createCreateNewRequest(this.documentId));\n        this._documentCreated = true;\n        // r11s driver will generate a new ID for the new container.\n        // update the document ID with the actual ID of the attached container.\n        this._documentIdStrategy.update(container.resolvedUrl);\n        return container;\n    }\n\n    /**\n     * Load a container using a default document id and code details.\n     * IContainer loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     * @param requestHeader - optional headers to be supplied to the loader\n     */\n    public async loadTestContainer(\n        testContainerConfig?: ITestContainerConfig,\n        requestHeader?: IRequestHeader,\n    ): Promise<IContainer> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container = await loader.resolve({\n            url: await this.driver.createContainerUrl(this.documentId),\n            headers: requestHeader,\n        });\n        await this.waitContainerToCatchUp(container);\n\n        return container;\n    }\n\n    public reset() {\n        this._loaderContainerTracker.reset();\n        this._documentServiceFactory = undefined;\n        this._urlResolver = undefined;\n        this._documentIdStrategy.reset();\n        const logError = getUnexpectedLogErrorException(this._logger);\n        if (logError) {\n            throw logError;\n        }\n        this._logger = undefined;\n        this._documentCreated = false;\n    }\n\n    public async ensureSynchronized(timeoutDuration?: number): Promise<void> {\n        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions\n        return !timeoutDuration\n            ? this._loaderContainerTracker.ensureSynchronized()\n            : this._loaderContainerTracker.ensureSynchronizedWithTimeout?.(timeoutDuration);\n    }\n\n    public async waitContainerToCatchUp(container: IContainer) {\n        // The original waitContainerToCatchUp() from container loader uses either Container.resume()\n        // or Container.connect() as part of its implementation. However, resume() was deprecated\n        // and eventually replaced with connect(). To avoid issues during LTS compatibility testing\n        // with older container versions issues, we use resume() when connect() is unavailable.\n        if ((container as any).connect === undefined) {\n            (container as any).connect = (container as any).resume;\n        }\n\n        return waitContainerToCatchUp_original(container);\n    }\n\n    updateDocumentId(resolvedUrl: IResolvedUrl | undefined) {\n        this._documentIdStrategy.update(resolvedUrl);\n    }\n\n    public resetLoaderContainerTracker(syncSummarizerClients: boolean = false) {\n        this._loaderContainerTracker.reset();\n        this._loaderContainerTracker = new LoaderContainerTracker(syncSummarizerClients);\n    }\n}\n\nexport function getUnexpectedLogErrorException(logger: EventAndErrorTrackingLogger | undefined, prefix?: string) {\n    if (logger === undefined) {\n        return;\n    }\n    const results = logger.reportAndClearTrackedEvents();\n    if (results.unexpectedErrors.length > 0) {\n        return new Error(\n            `${prefix ?? \"\"}Unexpected Errors in Logs:\\n${JSON.stringify(results.unexpectedErrors, undefined, 2)}`);\n    }\n    if (results.expectedNotFound.length > 0) {\n        return new Error(\n            `${prefix ?? \"\"}Expected Events not found:\\n${JSON.stringify(results.expectedNotFound, undefined, 2)}`);\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "2.0.0-dev.1.4.6.106135",
+  "version": "2.0.0-dev.2.3.0.115467",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -27,12 +27,14 @@
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
+    "format": "npm run prettier:fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
+    "prettier": "prettier --check . --ignore-path ../../../.prettierignore",
+    "prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
     "tsc": "tsc",
-    "tsfmt": "tsfmt --verify",
-    "tsfmt:fix": "tsfmt --replace",
-    "typetests:gen": "fluid-type-validator -g -d ."
+    "typetests:gen": "flub generate typetests --generate --dir .",
+    "typetests:prepare": "flub generate typetests --prepare --dir . --pin"
   },
   "nyc": {
     "all": true,
@@ -55,37 +57,38 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/aqueduct": "2.0.0-dev.1.4.6.106135",
+    "@fluidframework/aqueduct": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/container-loader": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/container-runtime": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/container-runtime-definitions": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/core-interfaces": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/datastore": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/datastore-definitions": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/driver-definitions": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/driver-utils": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/local-driver": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/map": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/protocol-definitions": "^1.0.0",
-    "@fluidframework/request-handler": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/routerlicious-driver": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/runtime-definitions": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/runtime-utils": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/telemetry-utils": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/test-driver-definitions": "2.0.0-dev.1.4.6.106135",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev.1.4.6.106135",
+    "@fluidframework/container-definitions": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/container-loader": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/container-runtime": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/container-runtime-definitions": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/datastore": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/driver-utils": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/local-driver": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/map": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/protocol-definitions": "^1.1.0",
+    "@fluidframework/request-handler": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/routerlicious-driver": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/test-driver-definitions": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-dev.2.3.0.115467 <2.0.0-dev.3.0.0",
     "best-random": "^1.0.0",
     "debug": "^4.1.1",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluidframework/build-common": "^1.0.0",
-    "@fluidframework/build-tools": "^0.4.4000",
-    "@fluidframework/eslint-config-fluid": "^1.0.0",
-    "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@^1.0.0",
+    "@fluid-tools/build-cli": "^0.7.0",
+    "@fluidframework/build-common": "^1.1.0",
+    "@fluidframework/build-tools": "^0.7.0",
+    "@fluidframework/eslint-config-fluid": "^1.2.0",
+    "@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@2.0.0-internal.2.2.0",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/diff": "^3.5.1",
@@ -98,13 +101,15 @@
     "eslint": "~8.6.0",
     "mocha": "^10.0.0",
     "nyc": "^15.0.0",
+    "prettier": "~2.6.2",
     "random-js": "^1.0.8",
     "rimraf": "^2.6.2",
-    "typescript": "~4.5.5",
-    "typescript-formatter": "7.1.0"
+    "typescript": "~4.5.5"
   },
   "typeValidation": {
-    "version": "2.0.0",
+    "version": "2.0.0-internal.2.3.0",
+    "baselineRange": ">=2.0.0-internal.2.2.0 <2.0.0-internal.2.3.0",
+    "baselineVersion": "2.0.0-internal.2.2.0",
     "broken": {}
   }
 }

package/prettier.config.cjs

@@ -0,0 +1,8 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+module.exports = {
+    ...require("@fluidframework/build-common/prettier.config.cjs"),
+};

package/src/TestSummaryUtils.ts

@@ -26,8 +26,7 @@ import { mockConfigProvider } from "./TestConfigs";
 
 const summarizerClientType = "summarizer";
 
-async function createSummarizerCore(container: IContainer, loader: IHostLoader, summaryVersion?: string) {
-    const absoluteUrl = await container.getAbsoluteUrl("");
+async function createSummarizerCore(absoluteUrl: string | undefined, loader: IHostLoader, summaryVersion?: string) {
     if (absoluteUrl === undefined) {
         throw new Error("URL could not be resolved");
     }
@@ -53,7 +52,11 @@ async function createSummarizerCore(container: IContainer, loader: IHostLoader,
     if (fluidObject.ISummarizer === undefined) {
         throw new Error("Fluid object does not implement ISummarizer");
     }
-    return fluidObject.ISummarizer;
+
+    return {
+        container: summarizerContainer,
+        summarizer: fluidObject.ISummarizer,
+    };
 }
 
 const defaultSummaryOptions: ISummaryRuntimeOptions = {
@@ -91,8 +94,8 @@ export async function createSummarizerFromFactory(
         [[provider.defaultCodeDetails, runtimeFactory]],
         { configProvider: mockConfigProvider() },
     );
-
-    return createSummarizerCore(container, loader, summaryVersion);
+    const absoluteUrl = await container.getAbsoluteUrl("");
+    return (await createSummarizerCore(absoluteUrl, loader, summaryVersion)).summarizer;
 }
 
 export async function createSummarizer(
@@ -102,6 +105,23 @@ export async function createSummarizer(
     gcOptions?: IGCRuntimeOptions,
     configProvider: IConfigProviderBase = mockConfigProvider(),
 ): Promise<ISummarizer> {
+    const absoluteUrl = await container.getAbsoluteUrl("");
+    return (await createSummarizerWithContainer(
+        provider,
+        absoluteUrl,
+        summaryVersion,
+        gcOptions,
+        configProvider,
+    )).summarizer;
+}
+
+export async function createSummarizerWithContainer(
+    provider: ITestObjectProvider,
+    absoluteUrl: string | undefined,
+    summaryVersion?: string,
+    gcOptions?: IGCRuntimeOptions,
+    configProvider: IConfigProviderBase = mockConfigProvider(),
+): Promise<{ container: IContainer; summarizer: ISummarizer; }> {
     const testContainerConfig: ITestContainerConfig = {
         runtimeOptions: {
             summaryOptions: defaultSummaryOptions,
@@ -109,9 +129,8 @@ export async function createSummarizer(
         },
         loaderProps: { configProvider },
     };
-
     const loader = provider.makeTestLoader(testContainerConfig);
-    return createSummarizerCore(container, loader, summaryVersion);
+    return createSummarizerCore(absoluteUrl, loader, summaryVersion);
 }
 
 export async function summarizeNow(summarizer: ISummarizer, reason: string = "end-to-end test") {

package/src/index.ts

@@ -3,15 +3,37 @@
  * Licensed under the MIT License.
  */
 
-export * from "./interfaces";
-export * from "./testObjectProvider";
-export * from "./loaderContainerTracker";
-export * from "./localLoader";
-export * from "./localCodeLoader";
-export * from "./retry";
-export * from "./testContainerRuntimeFactory";
-export * from "./testFluidObject";
-export * from "./timeoutUtils";
-export * from "./DriverWrappers";
-export * from "./TestSummaryUtils";
-export * from "./TestConfigs";
+export { wrapDocumentService, wrapDocumentServiceFactory, wrapDocumentStorageService } from "./DriverWrappers";
+export { IProvideTestFluidObject, ITestFluidObject } from "./interfaces";
+export { LoaderContainerTracker } from "./loaderContainerTracker";
+export { fluidEntryPoint, LocalCodeLoader, SupportedExportInterfaces } from "./localCodeLoader";
+export { createAndAttachContainer, createLoader } from "./localLoader";
+export { retryWithEventualValue } from "./retry";
+export { mockConfigProvider } from "./TestConfigs";
+export { createTestContainerRuntimeFactory, TestContainerRuntimeFactory } from "./testContainerRuntimeFactory";
+export { ChannelFactoryRegistry, TestFluidObject, TestFluidObjectFactory } from "./testFluidObject";
+export {
+    createDocumentId,
+    DataObjectFactoryType,
+    EventAndErrorTrackingLogger,
+    getUnexpectedLogErrorException,
+    IOpProcessingController,
+    ITestContainerConfig,
+    ITestObjectProvider,
+    TestObjectProvider,
+} from "./testObjectProvider";
+export {
+    createSummarizer,
+    createSummarizerFromFactory,
+    createSummarizerWithContainer,
+    summarizeNow,
+    waitForContainerConnection,
+} from "./TestSummaryUtils";
+export {
+    defaultTimeoutDurationMs,
+    ensureContainerConnected,
+    timeoutAwait,
+    timeoutPromise,
+    TimeoutWithError,
+    TimeoutWithValue,
+} from "./timeoutUtils";

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.0.0-dev.1.4.6.106135";
+export const pkgVersion = "2.0.0-dev.2.3.0.115467";

package/src/testFluidObject.ts

@@ -4,7 +4,14 @@
  */
 
 import { defaultFluidObjectRequestHandler } from "@fluidframework/aqueduct";
-import { IRequest, IResponse, IFluidHandle } from "@fluidframework/core-interfaces";
+import {
+    IRequest,
+    IResponse,
+    IFluidHandle,
+    IFluidRouter,
+    FluidObject,
+    IProvideFluidRouter,
+} from "@fluidframework/core-interfaces";
 import { FluidObjectHandle, FluidDataStoreRuntime, mixinRequestHandler } from "@fluidframework/datastore";
 import { SharedMap, ISharedMap } from "@fluidframework/map";
 import {
@@ -13,6 +20,7 @@ import {
     IFluidDataStoreChannel,
 } from "@fluidframework/runtime-definitions";
 import { IFluidDataStoreRuntime, IChannelFactory } from "@fluidframework/datastore-definitions";
+import { assert } from "@fluidframework/common-utils";
 import { ITestFluidObject } from "./interfaces";
 
 /**
@@ -20,7 +28,7 @@ import { ITestFluidObject } from "./interfaces";
  * The shared objects can be retrieved by passing the key of the entry to getSharedObject.
  * It exposes the IFluidDataStoreContext and IFluidDataStoreRuntime.
  */
-export class TestFluidObject implements ITestFluidObject {
+export class TestFluidObject implements ITestFluidObject, IFluidRouter {
     public static async load(
         runtime: IFluidDataStoreRuntime,
         channel: IFluidDataStoreChannel,
@@ -42,6 +50,10 @@ export class TestFluidObject implements ITestFluidObject {
         return this;
     }
 
+    public get IFluidRouter() {
+        return this;
+    }
+
     public get handle(): IFluidHandle<this> { return this.innerHandle; }
 
     public root!: ISharedMap;
@@ -167,20 +179,25 @@ export class TestFluidObjectFactory implements IFluidDataStoreFactory {
         }
 
         const runtimeClass = mixinRequestHandler(
-            async (request: IRequest) => {
-                const router = await routerP;
-                return router.request(request);
+            async (request: IRequest, rt: FluidDataStoreRuntime) => {
+                const maybeRouter: FluidObject<IProvideFluidRouter> | undefined
+                    = await rt.entryPoint?.get();
+                assert(maybeRouter?.IFluidRouter !== undefined, "entryPoint should have been initialized by now");
+                return maybeRouter.IFluidRouter.request(request);
             });
 
-        const runtime = new runtimeClass(context, dataTypes, existing);
-        const routerP = TestFluidObject.load(
-            runtime,
-            runtime,
+        return new runtimeClass(
             context,
-            factoryEntriesMapForObject,
+            dataTypes,
             existing,
-        );
-
-        return runtime;
+            async (dataStoreRuntime: IFluidDataStoreRuntime) => TestFluidObject.load(
+                dataStoreRuntime,
+                // This works because 'runtime' is an instance of runtimeClass (which is a FluidDataStoreRuntime and
+                // thus implements IFluidDataStoreChannel) which passes itself as the parameter to this function.
+                dataStoreRuntime as FluidDataStoreRuntime,
+                context,
+                factoryEntriesMapForObject,
+                existing,
+            ));
     }
 }

package/src/testObjectProvider.ts

@@ -133,6 +133,12 @@ function getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {
  * any expected events that have not occurred.
  */
 export class EventAndErrorTrackingLogger extends TelemetryLogger {
+    /** Even if these error events are logged, tests should still be allowed to pass */
+    private readonly allowedErrors: string[] = [
+        // This log was removed in current version as unnecessary, but it's still present in previous versions
+        "fluid:telemetry:Container:NoRealStorageInDetachedContainer",
+    ];
+
     constructor(private readonly baseLogger: ITelemetryBaseLogger) {
         super();
     }
@@ -174,7 +180,11 @@ export class EventAndErrorTrackingLogger extends TelemetryLogger {
             }
         }
         if (event.category === "error") {
-            this.unexpectedErrors.push(event);
+            if (this.allowedErrors.includes(event.eventName)) {
+                event.category = "generic";
+            } else {
+                this.unexpectedErrors.push(event);
+            }
         }
 
         this.baseLogger.send(event);