@fluidframework/test-utils 0.50.1 → 0.51.1

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 = "0.50.1";
+export declare const pkgVersion = "0.51.1";
 //# 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 = "0.50.1";
+exports.pkgVersion = "0.51.1";
 //# 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,QAAQ,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 = \"0.50.1\";\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,QAAQ,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 = \"0.51.1\";\n"]}

package/dist/testObjectProvider.d.ts

@@ -18,6 +18,7 @@ export interface IOpProcessingController {
     resumeProcessing(...containers: IContainer[]): void;
 }
 export interface ITestObjectProvider {
+    createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint;
     createLoader(packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>, options?: ITestLoaderOptions, detachedBlobStorage?: IDetachedBlobStorage): IHostLoader;
     createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions): Promise<IContainer>;
     loadContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions, requestHeader?: IRequestHeader): Promise<IContainer>;
@@ -67,7 +68,7 @@ export declare const createDocumentId: () => string;
 export declare class TestObjectProvider {
     readonly LoaderConstructor: typeof Loader;
     readonly driver: ITestDriver;
-    private readonly createFluidEntryPoint;
+    readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint;
     private readonly _loaderContainerTracker;
     private _documentServiceFactory;
     private _urlResolver;

package/dist/testObjectProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testObjectProvider.d.ts","sourceRoot":"","sources":["../src/testObjectProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testObjectProvider.d.ts","sourceRoot":"","sources":["../src/testObjectProvider.ts"],"names":[],"mappings":"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"}

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, ILoaderOptions } from \"@fluidframework/container-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { Container, IDetachedBlobStorage, Loader, waitContainerToCatchUp } from \"@fluidframework/container-loader\";\nimport { IContainerRuntimeOptions } from \"@fluidframework/container-runtime\";\nimport { IFluidCodeDetails, 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 } 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    createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ): IHostLoader;\n    createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions): Promise<IContainer>;\n    loadContainer(\n        entryPoint: fluidEntryPoint,\n        options?: ITestLoaderOptions,\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, detachedBlobStorage?: IDetachedBlobStorage): IHostLoader,\n    makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,\n    loadTestContainer(testContainerConfig?: ITestContainerConfig): 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(): 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    loaderOptions?: ITestLoaderOptions,\n}\n\n// new interface to help inject custom loggers to tests\nexport interface ITestLoaderOptions extends ILoaderOptions {\n    logger?: ITelemetryBaseLogger;\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 * Shared base class for test object provider.  Contain code for loader and container creation and loading\n */\nexport class TestObjectProvider {\n    private readonly _loaderContainerTracker = new LoaderContainerTracker();\n    private _documentServiceFactory: IDocumentServiceFactory | undefined;\n    private _urlResolver: IUrlResolver | undefined;\n    private _logger: ITelemetryBaseLogger | undefined;\n    private readonly _documentIdStrategy: IDocumentIdStrategy;\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        private readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,\n    ) {\n        this._documentIdStrategy = getDocumentIdStrategy(driver.type);\n    }\n\n    get logger() {\n        if (this._logger === undefined) {\n            this._logger = 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    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        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ) {\n        const multiSinkLogger = new MultiSinkLogger();\n        multiSinkLogger.addLogger(this.logger);\n        if (options?.logger !== undefined) {\n            multiSinkLogger.addLogger(options.logger);\n        }\n\n        const codeLoader = new LocalCodeLoader(packageEntries);\n        const loader = new this.LoaderConstructor({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: multiSinkLogger,\n            options,\n            detachedBlobStorage,\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, options?: ITestLoaderOptions) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\n        const container = await createAndAttachContainer(\n            defaultCodeDetails,\n            loader,\n            this.driver.createCreateNewRequest(this.documentId),\n        );\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(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions,\n        requestHeader?: IRequestHeader) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\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, detachedBlobStorage?: IDetachedBlobStorage) {\n        return this.createLoader(\n            [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],\n            testContainerConfig?.loaderOptions,\n            detachedBlobStorage,\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        const loader = this.makeTestLoader(testContainerConfig);\n        const container =\n            await createAndAttachContainer(\n                defaultCodeDetails,\n                loader,\n                this.driver.createCreateNewRequest(this.documentId));\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     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<Container> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container = await loader.resolve({ url: await this.driver.createContainerUrl(this.documentId) });\n        await waitContainerToCatchUp(container);\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        this._logger = undefined;\n    }\n\n    public async ensureSynchronized() {\n        return this._loaderContainerTracker.ensureSynchronized();\n    }\n\n    updateDocumentId(resolvedUrl: IResolvedUrl | undefined) {\n        this._documentIdStrategy.update(resolvedUrl);\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, ILoaderOptions } from \"@fluidframework/container-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { Container, IDetachedBlobStorage, Loader, waitContainerToCatchUp } from \"@fluidframework/container-loader\";\nimport { IContainerRuntimeOptions } from \"@fluidframework/container-runtime\";\nimport { IFluidCodeDetails, 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 } 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        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ): IHostLoader;\n    createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions): Promise<IContainer>;\n    loadContainer(\n        entryPoint: fluidEntryPoint,\n        options?: ITestLoaderOptions,\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, detachedBlobStorage?: IDetachedBlobStorage): IHostLoader,\n    makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,\n    loadTestContainer(testContainerConfig?: ITestContainerConfig): 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(): 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    loaderOptions?: ITestLoaderOptions,\n}\n\n// new interface to help inject custom loggers to tests\nexport interface ITestLoaderOptions extends ILoaderOptions {\n    logger?: ITelemetryBaseLogger;\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 * Shared base class for test object provider.  Contain code for loader and container creation and loading\n */\nexport class TestObjectProvider {\n    private readonly _loaderContainerTracker = new LoaderContainerTracker();\n    private _documentServiceFactory: IDocumentServiceFactory | undefined;\n    private _urlResolver: IUrlResolver | undefined;\n    private _logger: ITelemetryBaseLogger | undefined;\n    private readonly _documentIdStrategy: IDocumentIdStrategy;\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() {\n        if (this._logger === undefined) {\n            this._logger = 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    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        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ) {\n        const multiSinkLogger = new MultiSinkLogger();\n        multiSinkLogger.addLogger(this.logger);\n        if (options?.logger !== undefined) {\n            multiSinkLogger.addLogger(options.logger);\n        }\n\n        const codeLoader = new LocalCodeLoader(packageEntries);\n        const loader = new this.LoaderConstructor({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: multiSinkLogger,\n            options,\n            detachedBlobStorage,\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, options?: ITestLoaderOptions) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\n        const container = await createAndAttachContainer(\n            defaultCodeDetails,\n            loader,\n            this.driver.createCreateNewRequest(this.documentId),\n        );\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(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions,\n        requestHeader?: IRequestHeader) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\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, detachedBlobStorage?: IDetachedBlobStorage) {\n        return this.createLoader(\n            [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],\n            testContainerConfig?.loaderOptions,\n            detachedBlobStorage,\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        const loader = this.makeTestLoader(testContainerConfig);\n        const container =\n            await createAndAttachContainer(\n                defaultCodeDetails,\n                loader,\n                this.driver.createCreateNewRequest(this.documentId));\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     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<Container> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container = await loader.resolve({ url: await this.driver.createContainerUrl(this.documentId) });\n        await waitContainerToCatchUp(container);\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        this._logger = undefined;\n    }\n\n    public async ensureSynchronized() {\n        return this._loaderContainerTracker.ensureSynchronized();\n    }\n\n    updateDocumentId(resolvedUrl: IResolvedUrl | undefined) {\n        this._documentIdStrategy.update(resolvedUrl);\n    }\n}\n"]}

package/dist/timeoutUtils.d.ts

@@ -11,7 +11,8 @@ export interface TimeoutWithError {
 export interface TimeoutWithValue<T = void> {
     durationMs?: number;
     reject: false;
-    value?: T;
+    value: T;
 }
-export declare function timeoutPromise<T = void>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void, timeoutOptions?: TimeoutWithError | TimeoutWithValue<T>): Promise<T | void>;
+export declare function timeoutAwait<T = void>(promise: PromiseLike<T>, timeoutOptions?: TimeoutWithError | TimeoutWithValue<T>): Promise<T>;
+export declare function timeoutPromise<T = void>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void, timeoutOptions?: TimeoutWithError | TimeoutWithValue<T>): Promise<T>;
 //# sourceMappingURL=timeoutUtils.d.ts.map

package/dist/timeoutUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeoutUtils.d.ts","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,IAAI;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,CAAC,EAAE,CAAC,CAAC;CACZ;AAED,wBAAsB,cAAc,CAAC,CAAC,GAAG,IAAI,EAC1C,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,EAChG,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,GAC5D,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAqBnB"}
+{"version":3,"file":"timeoutUtils.d.ts","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,IAAI;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,CAAC,CAAC;CACX;AAGF,wBAAsB,YAAY,CAAC,CAAC,GAAG,IAAI,EACvC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EACvB,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,cAG9D;AAEA,wBAAsB,cAAc,CAAC,CAAC,GAAG,IAAI,EAC1C,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,EAChG,cAAc,GAAE,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAM,GAC5D,OAAO,CAAC,CAAC,CAAC,CAqBZ"}

package/dist/timeoutUtils.js

@@ -4,8 +4,13 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeoutPromise = exports.defaultTimeoutDurationMs = void 0;
+exports.timeoutPromise = exports.timeoutAwait = exports.defaultTimeoutDurationMs = void 0;
 exports.defaultTimeoutDurationMs = 250;
+// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+async function timeoutAwait(promise, timeoutOptions = {}) {
+    return Promise.race([promise, timeoutPromise(() => { }, timeoutOptions)]);
+}
+exports.timeoutAwait = timeoutAwait;
 async function timeoutPromise(executor, timeoutOptions = {}) {
     var _a;
     // create the timeout error outside the async task, so it's callstack includes

package/dist/timeoutUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeoutUtils.js","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,wBAAwB,GAAG,GAAG,CAAC;AAapC,KAAK,UAAU,cAAc,CACjC,QAAgG,EAChG,iBAAyD,EAAE;;IAE3D,8EAA8E;IAC9E,wDAAwD;IACxD,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,KAAK,KAAK;QACvC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,KAAK,OAAC,cAAc,CAAC,QAAQ,mCAAI,SAAS,CAAC,CAAC;IACtD,OAAO,IAAI,OAAO,CAAW,CAAC,GAAG,EAAC,GAAG,EAAC,EAAE;;QACpC,MAAM,OAAO,GAAG,UAAU,CACtB,GAAE,EAAE,CAAA,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAC1E,cAAc,CAAC,UAAU,mCAAI,gCAAwB,CAAC,CAAC;QAE3D,QAAQ,CACJ,CAAC,KAAK,EAAE,EAAE;YACN,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,CAAC;QACf,CAAC,EACD,CAAC,MAAM,EAAE,EAAE;YACP,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,GAAG,CAAC,MAAM,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC;AAxBA,wCAwBA","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport const defaultTimeoutDurationMs = 250;\n\n export interface TimeoutWithError{\n    durationMs?: number;\n    reject?: true;\n    errorMsg?: string;\n }\n export interface TimeoutWithValue<T = void>{\n    durationMs?: number;\n    reject: false;\n    value?: T;\n }\n\n export async function timeoutPromise<T = void>(\n    executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n): Promise<T | void> {\n    // create the timeout error outside the async task, so it's callstack includes\n    // the original call site, this makes it easier to debug\n    const err = timeoutOptions.reject === false\n        ? undefined\n        : new Error(timeoutOptions.errorMsg ?? \"Timeout\");\n    return new Promise<T | void>((res,rej)=>{\n        const timeout = setTimeout(\n            ()=>timeoutOptions.reject === false ? res(timeoutOptions.value) : rej(err),\n            timeoutOptions.durationMs ?? defaultTimeoutDurationMs);\n\n        executor(\n            (value) => {\n                clearTimeout(timeout);\n                res(value);\n            },\n            (reason) => {\n                clearTimeout(timeout);\n                rej(reason);\n            });\n    });\n}\n"]}
+{"version":3,"file":"timeoutUtils.js","sourceRoot":"","sources":["../src/timeoutUtils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,wBAAwB,GAAG,GAAG,CAAC;AAa5C,+DAA+D;AACxD,KAAK,UAAU,YAAY,CAC9B,OAAuB,EACvB,iBAAyD,EAAE;IAE3D,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAI,GAAE,EAAE,GAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC;AALD,oCAKC;AAEO,KAAK,UAAU,cAAc,CACjC,QAAgG,EAChG,iBAAyD,EAAE;;IAE3D,8EAA8E;IAC9E,wDAAwD;IACxD,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,KAAK,KAAK;QACvC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,KAAK,OAAC,cAAc,CAAC,QAAQ,mCAAI,SAAS,CAAC,CAAC;IACtD,OAAO,IAAI,OAAO,CAAI,CAAC,GAAG,EAAC,GAAG,EAAC,EAAE;;QAC7B,MAAM,OAAO,GAAG,UAAU,CACtB,GAAE,EAAE,CAAA,cAAc,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAC1E,cAAc,CAAC,UAAU,mCAAI,gCAAwB,CAAC,CAAC;QAE3D,QAAQ,CACJ,CAAC,KAAK,EAAE,EAAE;YACN,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,CAAC;QACf,CAAC,EACD,CAAC,MAAM,EAAE,EAAE;YACP,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,GAAG,CAAC,MAAM,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC;AAxBA,wCAwBA","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport const defaultTimeoutDurationMs = 250;\n\n export interface TimeoutWithError{\n    durationMs?: number;\n    reject?: true;\n    errorMsg?: string;\n }\n export interface TimeoutWithValue<T = void>{\n    durationMs?: number;\n    reject: false;\n    value: T;\n }\n\n// eslint-disable-next-line prefer-arrow/prefer-arrow-functions\nexport async function timeoutAwait<T = void>(\n    promise: PromiseLike<T>,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n) {\n    return Promise.race([promise, timeoutPromise<T>(()=>{}, timeoutOptions)]);\n}\n\n export async function timeoutPromise<T = void>(\n    executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,\n    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},\n): Promise<T> {\n    // create the timeout error outside the async task, so it's callstack includes\n    // the original call site, this makes it easier to debug\n    const err = timeoutOptions.reject === false\n        ? undefined\n        : new Error(timeoutOptions.errorMsg ?? \"Timeout\");\n    return new Promise<T>((res,rej)=>{\n        const timeout = setTimeout(\n            ()=>timeoutOptions.reject === false ? res(timeoutOptions.value) : rej(err),\n            timeoutOptions.durationMs ?? defaultTimeoutDurationMs);\n\n        executor(\n            (value) => {\n                clearTimeout(timeout);\n                res(value);\n            },\n            (reason) => {\n                clearTimeout(timeout);\n                rej(reason);\n            });\n    });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "0.50.1",
+  "version": "0.51.1",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -49,33 +49,33 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/aqueduct": "^0.50.1",
+    "@fluidframework/aqueduct": "^0.51.1",
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/container-definitions": "^0.41.0",
-    "@fluidframework/container-loader": "^0.50.1",
-    "@fluidframework/container-runtime": "^0.50.1",
-    "@fluidframework/container-runtime-definitions": "^0.50.1",
+    "@fluidframework/container-loader": "^0.51.1",
+    "@fluidframework/container-runtime": "^0.51.1",
+    "@fluidframework/container-runtime-definitions": "^0.51.1",
     "@fluidframework/core-interfaces": "^0.40.0",
-    "@fluidframework/datastore": "^0.50.1",
-    "@fluidframework/datastore-definitions": "^0.50.1",
+    "@fluidframework/datastore": "^0.51.1",
+    "@fluidframework/datastore-definitions": "^0.51.1",
     "@fluidframework/driver-definitions": "^0.41.0",
-    "@fluidframework/driver-utils": "^0.50.1",
-    "@fluidframework/local-driver": "^0.50.1",
-    "@fluidframework/map": "^0.50.1",
+    "@fluidframework/driver-utils": "^0.51.1",
+    "@fluidframework/local-driver": "^0.51.1",
+    "@fluidframework/map": "^0.51.1",
     "@fluidframework/protocol-definitions": "^0.1025.0",
-    "@fluidframework/request-handler": "^0.50.1",
-    "@fluidframework/routerlicious-driver": "^0.50.1",
-    "@fluidframework/runtime-definitions": "^0.50.1",
-    "@fluidframework/runtime-utils": "^0.50.1",
-    "@fluidframework/telemetry-utils": "^0.50.1",
-    "@fluidframework/test-driver-definitions": "^0.50.1",
-    "@fluidframework/test-runtime-utils": "^0.50.1",
+    "@fluidframework/request-handler": "^0.51.1",
+    "@fluidframework/routerlicious-driver": "^0.51.1",
+    "@fluidframework/runtime-definitions": "^0.51.1",
+    "@fluidframework/runtime-utils": "^0.51.1",
+    "@fluidframework/telemetry-utils": "^0.51.1",
+    "@fluidframework/test-driver-definitions": "^0.51.1",
+    "@fluidframework/test-runtime-utils": "^0.51.1",
     "debug": "^4.1.1",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.23.0",
+    "@fluidframework/eslint-config-fluid": "^0.24.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^8.2.2",
@@ -83,7 +83,7 @@
     "@types/random-js": "^1.0.31",
     "@typescript-eslint/eslint-plugin": "~4.14.0",
     "@typescript-eslint/parser": "~4.14.0",
-    "concurrently": "^5.2.0",
+    "concurrently": "^6.2.0",
     "copyfiles": "^2.1.0",
     "diff": "^3.5.0",
     "eslint": "~7.18.0",

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "0.50.1";
+export const pkgVersion = "0.51.1";

package/src/testObjectProvider.ts

@@ -31,6 +31,7 @@ export interface IOpProcessingController {
 }
 
 export interface ITestObjectProvider {
+    createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint;
     createLoader(
         packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,
         options?: ITestLoaderOptions,
@@ -145,7 +146,7 @@ export class TestObjectProvider {
     constructor(
         public readonly LoaderConstructor: typeof Loader,
         public readonly driver: ITestDriver,
-        private readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,
+        public readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,
     ) {
         this._documentIdStrategy = getDocumentIdStrategy(driver.type);
     }

package/src/timeoutUtils.ts

@@ -13,19 +13,27 @@ export const defaultTimeoutDurationMs = 250;
  export interface TimeoutWithValue<T = void>{
     durationMs?: number;
     reject: false;
-    value?: T;
+    value: T;
  }
 
+// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+export async function timeoutAwait<T = void>(
+    promise: PromiseLike<T>,
+    timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},
+) {
+    return Promise.race([promise, timeoutPromise<T>(()=>{}, timeoutOptions)]);
+}
+
  export async function timeoutPromise<T = void>(
     executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,
     timeoutOptions: TimeoutWithError | TimeoutWithValue<T> = {},
-): Promise<T | void> {
+): Promise<T> {
     // create the timeout error outside the async task, so it's callstack includes
     // the original call site, this makes it easier to debug
     const err = timeoutOptions.reject === false
         ? undefined
         : new Error(timeoutOptions.errorMsg ?? "Timeout");
-    return new Promise<T | void>((res,rej)=>{
+    return new Promise<T>((res,rej)=>{
         const timeout = setTimeout(
             ()=>timeoutOptions.reject === false ? res(timeoutOptions.value) : rej(err),
             timeoutOptions.durationMs ?? defaultTimeoutDurationMs);