@fluidframework/driver-utils 2.0.0-dev-rc.2.0.0.246488 → 2.0.0-dev-rc.3.0.0.253463

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/driver-utils",
-  "version": "2.0.0-dev-rc.2.0.0.246488",
+  "version": "2.0.0-dev-rc.3.0.0.253463",
   "description": "Collection of utility functions for Fluid drivers",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -14,16 +14,6 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "types": "./lib/index.d.ts",
-        "default": "./lib/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
-    "./public": {
       "import": {
         "types": "./lib/driver-utils-public.d.ts",
         "default": "./lib/index.js"
@@ -77,21 +67,22 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.3.0.0.253463",
     "@fluidframework/gitresources": "^4.0.0",
     "@fluidframework/protocol-base": "^4.0.0",
     "@fluidframework/protocol-definitions": "^3.2.0",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.3.0.0.253463",
     "axios": "^1.6.2",
     "lz4js": "^0.2.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.2.0.0.246488",
+    "@arethetypeswrong/cli": "^0.15.2",
+    "@biomejs/biome": "^1.6.2",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.3.0.0.253463",
     "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.34.0",
@@ -153,16 +144,16 @@
     "build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
     "build:test:esm": "tsc --project ./src/test/tsconfig.json",
     "check:are-the-types-wrong": "attw --pack . --entrypoints .",
+    "check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
     "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
     "clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
     "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 prettier && npm run check:release-tags && npm run eslint",
-    "lint:fix": "npm run prettier:fix && npm run eslint:fix",
-    "prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
-    "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "format": "fluid-build --task format .",
+    "format:prettier": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "lint": "fluid-build . --task lint",
+    "lint:fix": "fluid-build . --task eslint:fix --task format",
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
     "test:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",

package/src/adapters/compression/documentServiceCompressionAdapter.ts

@@ -3,10 +3,15 @@
  * Licensed under the MIT License.
  */
 
-import { IDocumentService, IDocumentStorageService } from "@fluidframework/driver-definitions";
+import {
+	IDocumentService,
+	IDocumentStorageService,
+} from "@fluidframework/driver-definitions/internal";
+
 import { DocumentServiceProxy } from "../../documentServiceProxy.js";
-import { DocumentStorageServiceCompressionAdapter as DocumentStorageServiceSummaryBlobCompressionAdapter } from "./summaryblob/index.js";
+
 import { ICompressionStorageConfig } from "./compressionTypes.js";
+import { DocumentStorageServiceCompressionAdapter as DocumentStorageServiceSummaryBlobCompressionAdapter } from "./summaryblob/index.js";
 
 export class DocumentServiceCompressionAdapter extends DocumentServiceProxy {
 	constructor(

package/src/adapters/compression/documentServiceFactoryCompressionAdapter.ts

@@ -8,12 +8,14 @@ import {
 	IDocumentService,
 	IDocumentServiceFactory,
 	IResolvedUrl,
-} from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import { ISummaryTree } from "@fluidframework/protocol-definitions";
+
 import { DocumentServiceFactoryProxy } from "../../documentServiceFactoryProxy.js";
+
 import { ICompressionStorageConfig } from "./compressionTypes.js";
-import { DocumentStorageServiceCompressionAdapter as DocumentStorageServiceSummaryBlobCompressionAdapter } from "./summaryblob/index.js";
 import { DocumentServiceCompressionAdapter } from "./documentServiceCompressionAdapter.js";
+import { DocumentStorageServiceCompressionAdapter as DocumentStorageServiceSummaryBlobCompressionAdapter } from "./summaryblob/index.js";
 
 export class DocumentServiceFactoryCompressionAdapter extends DocumentServiceFactoryProxy {
 	constructor(

package/src/adapters/compression/summaryblob/documentStorageServiceSummaryBlobCompressionAdapter.ts

@@ -4,8 +4,11 @@
  */
 
 import { IsoBuffer } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
-import { IDocumentStorageService, ISummaryContext } from "@fluidframework/driver-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
+import {
+	IDocumentStorageService,
+	ISummaryContext,
+} from "@fluidframework/driver-definitions/internal";
 import {
 	ISnapshotTree,
 	ISummaryBlob,
@@ -16,8 +19,9 @@ import {
 	SummaryType,
 } from "@fluidframework/protocol-definitions";
 import { compress, decompress } from "lz4js";
-import { DocumentStorageServiceProxy } from "../../../documentStorageServiceProxy.js";
+
 import { ICompressionStorageConfig, SummaryCompressionAlgorithm } from "..//index.js";
+import { DocumentStorageServiceProxy } from "../../../documentStorageServiceProxy.js";
 
 /**
  * @internal

package/src/adapters/predefinedAdapters.ts

@@ -3,12 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { IDocumentServiceFactory } from "@fluidframework/driver-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
+import { IDocumentServiceFactory } from "@fluidframework/driver-definitions/internal";
+
 import {
+	DefaultCompressionStorageConfig,
 	DocumentServiceFactoryCompressionAdapter,
 	ICompressionStorageConfig,
-	DefaultCompressionStorageConfig,
 } from "./compression/index.js";
 
 /**

package/src/blob.ts

@@ -5,8 +5,8 @@
 
 import {
 	FileMode,
-	IBlob,
 	IAttachment,
+	IBlob,
 	ITree,
 	TreeEntry,
 } from "@fluidframework/protocol-definitions";

package/src/buildSnapshotTree.ts

@@ -4,15 +4,15 @@
  */
 
 import { stringToBuffer } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import * as git from "@fluidframework/gitresources";
+import { buildGitTreeHierarchy } from "@fluidframework/protocol-base";
 import {
 	FileMode,
 	ISnapshotTree,
 	ITreeEntry,
 	TreeEntry,
 } from "@fluidframework/protocol-definitions";
-import { buildGitTreeHierarchy } from "@fluidframework/protocol-base";
 import { v4 as uuid } from "uuid";
 
 function flattenCore(

package/src/documentServiceFactoryProxy.ts

@@ -8,7 +8,7 @@ import {
 	IDocumentService,
 	IDocumentServiceFactory,
 	IResolvedUrl,
-} from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import { ISummaryTree } from "@fluidframework/protocol-definitions";
 
 /**

package/src/documentServiceProxy.ts

@@ -11,7 +11,7 @@ import {
 	IDocumentServiceEvents,
 	IDocumentStorageService,
 	IResolvedUrl,
-} from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import { IClient } from "@fluidframework/protocol-definitions";
 
 /**

package/src/documentStorageServiceProxy.ts

@@ -10,7 +10,7 @@ import {
 	ISnapshot,
 	ISnapshotFetchOptions,
 	ISummaryContext,
-} from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import {
 	ICreateBlobResponse,
 	ISnapshotTree,
@@ -18,7 +18,7 @@ import {
 	ISummaryTree,
 	IVersion,
 } from "@fluidframework/protocol-definitions";
-import { UsageError } from "@fluidframework/telemetry-utils";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 /**
  * @internal

package/src/error.ts

@@ -4,7 +4,7 @@
  */
 
 import { DriverErrorTypes, IDriverErrorBase } from "@fluidframework/driver-definitions";
-import { IFluidErrorBase, LoggingError } from "@fluidframework/telemetry-utils";
+import { IFluidErrorBase, LoggingError } from "@fluidframework/telemetry-utils/internal";
 
 /**
  * Error indicating an API is being used improperly resulting in an invalid operation.

package/src/insecureUrlResolver.ts

@@ -3,9 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
 import { IRequest } from "@fluidframework/core-interfaces";
-import { IResolvedUrl, IUrlResolver, DriverHeader } from "@fluidframework/driver-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
+import {
+	DriverHeader,
+	IResolvedUrl,
+	IUrlResolver,
+} from "@fluidframework/driver-definitions/internal";
 import Axios from "axios";
 
 /**

package/src/network.ts

@@ -3,16 +3,15 @@
  * Licensed under the MIT License.
  */
 
+import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
+import { DriverErrorTypes, IDriverErrorBase } from "@fluidframework/driver-definitions";
 import {
-	IThrottlingWarning,
-	IDriverErrorBase,
 	IAuthorizationError,
 	ILocationRedirectionError,
 	IResolvedUrl,
-	DriverErrorTypes,
-} from "@fluidframework/driver-definitions";
-import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import { IFluidErrorBase, LoggingError } from "@fluidframework/telemetry-utils";
+	IThrottlingWarning,
+} from "@fluidframework/driver-definitions/internal";
+import { IFluidErrorBase, LoggingError } from "@fluidframework/telemetry-utils/internal";
 
 /**
  * @internal

package/src/networkUtils.ts

@@ -3,8 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, type ITelemetryErrorEventExt } from "@fluidframework/telemetry-utils";
-import { isOnline, OnlineStatus, canRetryOnError } from "./network.js";
+import { type ITelemetryErrorEventExt, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+
+import { OnlineStatus, canRetryOnError, isOnline } from "./network.js";
 
 /**
  * @internal

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/driver-utils";
-export const pkgVersion = "2.0.0-dev-rc.2.0.0.246488";
+export const pkgVersion = "2.0.0-dev-rc.3.0.0.253463";

package/src/parallelRequests.ts

@@ -5,11 +5,17 @@
 
 import { performance } from "@fluid-internal/client-utils";
 import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import { assert, Deferred } from "@fluidframework/core-utils";
-import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
+import { assert, Deferred } from "@fluidframework/core-utils/internal";
+import {
+	IDeltasFetchResult,
+	IStream,
+	IStreamResult,
+} from "@fluidframework/driver-definitions/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { IDeltasFetchResult, IStream, IStreamResult } from "@fluidframework/driver-definitions";
-import { getRetryDelayFromError, canRetryOnError, createGenericNetworkError } from "./network.js";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { PerformanceEvent } from "@fluidframework/telemetry-utils/internal";
+
+import { canRetryOnError, createGenericNetworkError, getRetryDelayFromError } from "./network.js";
 import { logNetworkFailure } from "./networkUtils.js";
 // For now, this package is versioned and released in unison with the specific drivers
 import { pkgVersion as driverVersion } from "./packageVersion.js";

package/src/prefetchDocumentStorageService.ts

@@ -3,8 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { LoaderCachingPolicy } from "@fluidframework/driver-definitions";
+import { LoaderCachingPolicy } from "@fluidframework/driver-definitions/internal";
 import { ISnapshotTree, IVersion } from "@fluidframework/protocol-definitions";
+
 import { DocumentStorageServiceProxy } from "./documentStorageServiceProxy.js";
 import { canRetryOnError } from "./network.js";
 

package/src/rateLimiter.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 
 /**
  * @alpha

package/src/readAndParse.ts

@@ -4,7 +4,7 @@
  */
 
 import { bufferToString } from "@fluid-internal/client-utils";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
 
 /**
  * Read a blob from {@link @fluidframework/driver-definitions#IDocumentStorageService} and

package/src/runWithRetry.ts

@@ -3,11 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, isFluidError } from "@fluidframework/telemetry-utils";
 import { performance } from "@fluid-internal/client-utils";
-import { delay } from "@fluidframework/core-utils";
+import { delay } from "@fluidframework/core-utils/internal";
 import { DriverErrorTypes } from "@fluidframework/driver-definitions";
-import { canRetryOnError, getRetryDelayFromError, NonRetryableError } from "./network.js";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { isFluidError } from "@fluidframework/telemetry-utils/internal";
+
+import { NonRetryableError, canRetryOnError, getRetryDelayFromError } from "./network.js";
 import { pkgVersion } from "./packageVersion.js";
 
 /**

package/src/storageUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ISnapshot } from "@fluidframework/driver-definitions";
+import { ISnapshot } from "@fluidframework/driver-definitions/internal";
 import { ISnapshotTree } from "@fluidframework/protocol-definitions";
 
 /**

package/src/summaryForCreateNew.ts

@@ -4,11 +4,11 @@
  */
 
 import {
-	ISummaryTree,
-	SummaryType,
-	ISummaryBlob,
 	ICommittedProposal,
 	IDocumentAttributes,
+	ISummaryBlob,
+	ISummaryTree,
+	SummaryType,
 } from "@fluidframework/protocol-definitions";
 
 /**

package/src/treeConversions.ts

@@ -4,8 +4,9 @@
  */
 
 import { Uint8ArrayToString } from "@fluid-internal/client-utils";
-import { unreachableCase } from "@fluidframework/core-utils";
+import { unreachableCase } from "@fluidframework/core-utils/internal";
 import { ISummaryTree, ITree, ITreeEntry, SummaryType } from "@fluidframework/protocol-definitions";
+
 import { AttachmentTreeEntry, BlobTreeEntry, TreeTreeEntry } from "./blob.js";
 import { isCombinedAppAndProtocolSummary } from "./summaryForCreateNew.js";
 

package/lib/test/insecureUrlResolverTest.spec.js

@@ -1,101 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { strict as assert } from "assert";
-import { DriverHeader } from "@fluidframework/driver-definitions";
-import { InsecureUrlResolver } from "../insecureUrlResolver.js";
-describe("Insecure Url Resolver Test", () => {
-    const deltaStreamUrl = "https://localhost.deltaStream";
-    const hostUrl = "https://localhost";
-    const ordererUrl = "https://localhost.orderer";
-    const storageUrl = "https://localhost.storage";
-    const tenantId = "tenantId";
-    const bearer = "bearer";
-    const fileName = "fileName";
-    let resolver;
-    let request;
-    beforeEach(() => {
-        resolver = new InsecureUrlResolver(hostUrl, ordererUrl, storageUrl, deltaStreamUrl, tenantId, bearer);
-        request = resolver.createCreateNewRequest(fileName);
-        // Mocking window since the resolver depends on window.location.host
-        if (typeof window === "undefined" && typeof global === "object") {
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            global["window"] = {
-                location: { host: "localhost" },
-            };
-        }
-    });
-    it("Create New Request", async () => {
-        assert(
-        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-        !!request.headers?.[DriverHeader.createNew], "Request should contain create new header");
-        const url = `${hostUrl}?fileName=${fileName}`;
-        assert.strictEqual(request.url, url, "Request url should match");
-    });
-    it("Resolved CreateNew Request", async () => {
-        const resolvedUrl = (await resolver.resolve(request));
-        const documentUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}`;
-        assert.strictEqual(resolvedUrl.endpoints.ordererUrl, ordererUrl, "Orderer url should match");
-        assert.strictEqual(resolvedUrl.url, documentUrl, "Document url should match");
-    });
-    it("Test RequestUrl for a data store", async () => {
-        const resolvedUrl = await resolver.resolve(request);
-        const expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}`;
-        assert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, "resolved url is wrong");
-        const dataStoreId = "dataStore";
-        const absoluteUrl = await resolver.getAbsoluteUrl(resolvedUrl, dataStoreId);
-        const expectedUrl = `${hostUrl}/${tenantId}/${fileName}/${dataStoreId}`;
-        assert.strictEqual(absoluteUrl, expectedUrl, "Url should match");
-    });
-    it("Test RequestUrl for url with only document id", async () => {
-        const testRequest = {
-            url: `https://localhost/${fileName}`,
-            headers: {},
-        };
-        const resolvedUrl = await resolver.resolve(testRequest);
-        const expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}`;
-        assert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, "resolved url is wrong");
-    });
-    it("Test RequestUrl for url with data store ids", async () => {
-        const testRequest = {
-            url: `https://localhost/${fileName}/dataStore1/dataStore2`,
-            headers: {},
-        };
-        const resolvedUrl = await resolver.resolve(testRequest);
-        const expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}/dataStore1/dataStore2`;
-        assert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, "resolved url is wrong");
-        const dataStoreId = "dataStore";
-        const absoluteUrl = await resolver.getAbsoluteUrl(resolvedUrl, dataStoreId);
-        const expectedResponseUrl = `${hostUrl}/${tenantId}/${fileName}/${dataStoreId}`;
-        assert.strictEqual(absoluteUrl, expectedResponseUrl, "response url is wrong");
-    });
-    it("Test RequestUrl for url with a slash at the end", async () => {
-        const testRequest = {
-            url: `https://localhost/${fileName}/`,
-            headers: {},
-        };
-        const resolvedUrl = await resolver.resolve(testRequest);
-        const expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}/`;
-        assert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, "resolved url is wrong");
-    });
-    it("Test RequestUrl for url with 2 slashes at the end", async () => {
-        const testRequest = {
-            url: `https://localhost/${fileName}//`,
-            headers: {},
-        };
-        const resolvedUrl = await resolver.resolve(testRequest);
-        const expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}//`;
-        assert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, "resolved url is wrong");
-    });
-    it("Test RequestUrl for url with special characters", async () => {
-        const testRequest = {
-            url: `https://localhost/${fileName}/!@$123/dataStore!@$`,
-            headers: {},
-        };
-        const resolvedUrl = await resolver.resolve(testRequest);
-        const expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}/!@$123/dataStore!@$`;
-        assert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, "resolved url is wrong");
-    });
-});
-//# sourceMappingURL=insecureUrlResolverTest.spec.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"insecureUrlResolverTest.spec.js","sourceRoot":"","sources":["../../src/test/insecureUrlResolverTest.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { DriverHeader, IResolvedUrl } from \"@fluidframework/driver-definitions\";\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport { InsecureUrlResolver } from \"../insecureUrlResolver.js\";\n\ndescribe(\"Insecure Url Resolver Test\", () => {\n\tconst deltaStreamUrl = \"https://localhost.deltaStream\";\n\tconst hostUrl = \"https://localhost\";\n\tconst ordererUrl = \"https://localhost.orderer\";\n\tconst storageUrl = \"https://localhost.storage\";\n\tconst tenantId = \"tenantId\";\n\tconst bearer = \"bearer\";\n\tconst fileName = \"fileName\";\n\tlet resolver: InsecureUrlResolver;\n\tlet request: IRequest;\n\n\tbeforeEach(() => {\n\t\tresolver = new InsecureUrlResolver(\n\t\t\thostUrl,\n\t\t\tordererUrl,\n\t\t\tstorageUrl,\n\t\t\tdeltaStreamUrl,\n\t\t\ttenantId,\n\t\t\tbearer,\n\t\t);\n\t\trequest = resolver.createCreateNewRequest(fileName);\n\n\t\t// Mocking window since the resolver depends on window.location.host\n\t\tif (typeof window === \"undefined\" && typeof global === \"object\") {\n\t\t\t// eslint-disable-next-line @typescript-eslint/dot-notation\n\t\t\tglobal[\"window\"] = {\n\t\t\t\tlocation: { host: \"localhost\" } as unknown as Location,\n\t\t\t} as unknown as Window & typeof globalThis;\n\t\t}\n\t});\n\n\tit(\"Create New Request\", async () => {\n\t\tassert(\n\t\t\t// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions\n\t\t\t!!request.headers?.[DriverHeader.createNew],\n\t\t\t\"Request should contain create new header\",\n\t\t);\n\t\tconst url = `${hostUrl}?fileName=${fileName}`;\n\t\tassert.strictEqual(request.url, url, \"Request url should match\");\n\t});\n\n\tit(\"Resolved CreateNew Request\", async () => {\n\t\tconst resolvedUrl = (await resolver.resolve(request)) as IResolvedUrl;\n\t\tconst documentUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}`;\n\t\tassert.strictEqual(\n\t\t\tresolvedUrl.endpoints.ordererUrl,\n\t\t\tordererUrl,\n\t\t\t\"Orderer url should match\",\n\t\t);\n\t\tassert.strictEqual(resolvedUrl.url, documentUrl, \"Document url should match\");\n\t});\n\n\tit(\"Test RequestUrl for a data store\", async () => {\n\t\tconst resolvedUrl = await resolver.resolve(request);\n\n\t\tconst expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}`;\n\t\tassert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, \"resolved url is wrong\");\n\n\t\tconst dataStoreId = \"dataStore\";\n\t\tconst absoluteUrl = await resolver.getAbsoluteUrl(resolvedUrl, dataStoreId);\n\n\t\tconst expectedUrl = `${hostUrl}/${tenantId}/${fileName}/${dataStoreId}`;\n\t\tassert.strictEqual(absoluteUrl, expectedUrl, \"Url should match\");\n\t});\n\n\tit(\"Test RequestUrl for url with only document id\", async () => {\n\t\tconst testRequest: IRequest = {\n\t\t\turl: `https://localhost/${fileName}`,\n\t\t\theaders: {},\n\t\t};\n\t\tconst resolvedUrl = await resolver.resolve(testRequest);\n\n\t\tconst expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}`;\n\t\tassert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, \"resolved url is wrong\");\n\t});\n\n\tit(\"Test RequestUrl for url with data store ids\", async () => {\n\t\tconst testRequest: IRequest = {\n\t\t\turl: `https://localhost/${fileName}/dataStore1/dataStore2`,\n\t\t\theaders: {},\n\t\t};\n\t\tconst resolvedUrl = await resolver.resolve(testRequest);\n\n\t\tconst expectedResolvedUrl = `https://${\n\t\t\tnew URL(ordererUrl).host\n\t\t}/${tenantId}/${fileName}/dataStore1/dataStore2`;\n\t\tassert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, \"resolved url is wrong\");\n\n\t\tconst dataStoreId = \"dataStore\";\n\t\tconst absoluteUrl = await resolver.getAbsoluteUrl(resolvedUrl, dataStoreId);\n\n\t\tconst expectedResponseUrl = `${hostUrl}/${tenantId}/${fileName}/${dataStoreId}`;\n\t\tassert.strictEqual(absoluteUrl, expectedResponseUrl, \"response url is wrong\");\n\t});\n\n\tit(\"Test RequestUrl for url with a slash at the end\", async () => {\n\t\tconst testRequest: IRequest = {\n\t\t\turl: `https://localhost/${fileName}/`,\n\t\t\theaders: {},\n\t\t};\n\t\tconst resolvedUrl = await resolver.resolve(testRequest);\n\n\t\tconst expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}/`;\n\t\tassert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, \"resolved url is wrong\");\n\t});\n\n\tit(\"Test RequestUrl for url with 2 slashes at the end\", async () => {\n\t\tconst testRequest: IRequest = {\n\t\t\turl: `https://localhost/${fileName}//`,\n\t\t\theaders: {},\n\t\t};\n\t\tconst resolvedUrl = await resolver.resolve(testRequest);\n\n\t\tconst expectedResolvedUrl = `https://${new URL(ordererUrl).host}/${tenantId}/${fileName}//`;\n\t\tassert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, \"resolved url is wrong\");\n\t});\n\n\tit(\"Test RequestUrl for url with special characters\", async () => {\n\t\tconst testRequest: IRequest = {\n\t\t\turl: `https://localhost/${fileName}/!@$123/dataStore!@$`,\n\t\t\theaders: {},\n\t\t};\n\t\tconst resolvedUrl = await resolver.resolve(testRequest);\n\n\t\tconst expectedResolvedUrl = `https://${\n\t\t\tnew URL(ordererUrl).host\n\t\t}/${tenantId}/${fileName}/!@$123/dataStore!@$`;\n\t\tassert.strictEqual(resolvedUrl?.url, expectedResolvedUrl, \"resolved url is wrong\");\n\t});\n});\n"]}