@fluidframework/request-handler 1.4.0-115997 → 2.0.0-dev-rc.1.0.0.224419

package/lib/runtimeRequestHandlerBuilder.d.mts

@@ -0,0 +1,14 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { IRequest, IResponse } from "@fluidframework/core-interfaces";
+import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
+import { RuntimeRequestHandler } from "./requestHandlers.mjs";
+/**
+ * @deprecated Will be removed once Loader LTS version is "2.0.0-internal.7.0.0". Migrate all usage of IFluidRouter to the "entryPoint" pattern. Refer to Removing-IFluidRouter.md
+ *
+ * @internal
+ */
+export declare function buildRuntimeRequestHandler(...handlers: RuntimeRequestHandler[]): (request: IRequest, runtime: IContainerRuntime) => Promise<IResponse>;
+//# sourceMappingURL=runtimeRequestHandlerBuilder.d.ts.map

package/lib/runtimeRequestHandlerBuilder.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtimeRequestHandlerBuilder.d.ts","sourceRoot":"","sources":["../src/runtimeRequestHandlerBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;OAEI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iCAAiC;OAC9D,EAAE,iBAAiB,EAAE,MAAM,+CAA+C;OAG1E,EAAE,qBAAqB,EAAE;AA6BhC;;;;GAIG;AAEH,wBAAgB,0BAA0B,CAAC,GAAG,QAAQ,EAAE,qBAAqB,EAAE,aAGvD,QAAQ,WAAW,iBAAiB,wBAE3D"}

package/lib/{runtimeRequestHandlerBuilder.js → runtimeRequestHandlerBuilder.mjs}

@@ -4,13 +4,15 @@
  */
 import { RequestParser, create404Response } from "@fluidframework/runtime-utils";
 /**
-  * The RuntimeRequestHandlerBuilder creates a runtime request handler based on request handlers.
-  * The provided handlers sequentially applied until one is able to satisfy the request.
-  */
-export class RuntimeRequestHandlerBuilder {
+ * The RuntimeRequestHandlerBuilder creates a runtime request handler based on request handlers.
+ * The provided handlers sequentially applied until one is able to satisfy the request.
+ */
+class RuntimeRequestHandlerBuilder {
     constructor() {
+        // eslint-disable-next-line import/no-deprecated
         this.handlers = [];
     }
+    // eslint-disable-next-line import/no-deprecated
     pushHandler(...handlers) {
         if (handlers !== undefined) {
             this.handlers.push(...handlers);
@@ -27,9 +29,15 @@ export class RuntimeRequestHandlerBuilder {
         return create404Response(request);
     }
 }
+/**
+ * @deprecated Will be removed once Loader LTS version is "2.0.0-internal.7.0.0". Migrate all usage of IFluidRouter to the "entryPoint" pattern. Refer to Removing-IFluidRouter.md
+ *
+ * @internal
+ */
+// eslint-disable-next-line import/no-deprecated
 export function buildRuntimeRequestHandler(...handlers) {
     const builder = new RuntimeRequestHandlerBuilder();
     builder.pushHandler(...handlers);
     return async (request, runtime) => builder.handleRequest(request, runtime);
 }
-//# sourceMappingURL=runtimeRequestHandlerBuilder.js.map
+//# sourceMappingURL=runtimeRequestHandlerBuilder.mjs.map

package/lib/runtimeRequestHandlerBuilder.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtimeRequestHandlerBuilder.mjs","sourceRoot":"","sources":["../src/runtimeRequestHandlerBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;OAII,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,+BAA+B;AAIhF;;;GAGG;AACH,MAAM,4BAA4B;IAAlC;QACC,gDAAgD;QAC/B,aAAQ,GAA4B,EAAE,CAAC;IAmBzD,CAAC;IAjBA,gDAAgD;IACzC,WAAW,CAAC,GAAG,QAAiC;QACtD,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SAChC;IACF,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAiB,EAAE,OAA0B;QACvE,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAChD,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC3B,OAAO,QAAQ,CAAC;aAChB;SACD;QACD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CACD;AAED;;;;GAIG;AACH,gDAAgD;AAChD,MAAM,UAAU,0BAA0B,CAAC,GAAG,QAAiC;IAC9E,MAAM,OAAO,GAAG,IAAI,4BAA4B,EAAE,CAAC;IACnD,OAAO,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC;IACjC,OAAO,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE,CAC9D,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IRequest, IResponse } from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { RequestParser, create404Response } from \"@fluidframework/runtime-utils\";\n// eslint-disable-next-line import/no-deprecated\nimport { RuntimeRequestHandler } from \"./requestHandlers\";\n\n/**\n * The RuntimeRequestHandlerBuilder creates a runtime request handler based on request handlers.\n * The provided handlers sequentially applied until one is able to satisfy the request.\n */\nclass RuntimeRequestHandlerBuilder {\n\t// eslint-disable-next-line import/no-deprecated\n\tprivate readonly handlers: RuntimeRequestHandler[] = [];\n\n\t// eslint-disable-next-line import/no-deprecated\n\tpublic pushHandler(...handlers: RuntimeRequestHandler[]) {\n\t\tif (handlers !== undefined) {\n\t\t\tthis.handlers.push(...handlers);\n\t\t}\n\t}\n\n\tpublic async handleRequest(request: IRequest, runtime: IContainerRuntime): Promise<IResponse> {\n\t\tconst parser = RequestParser.create(request);\n\t\tfor (const handler of this.handlers) {\n\t\t\tconst response = await handler(parser, runtime);\n\t\t\tif (response !== undefined) {\n\t\t\t\treturn response;\n\t\t\t}\n\t\t}\n\t\treturn create404Response(request);\n\t}\n}\n\n/**\n * @deprecated Will be removed once Loader LTS version is \"2.0.0-internal.7.0.0\". Migrate all usage of IFluidRouter to the \"entryPoint\" pattern. Refer to Removing-IFluidRouter.md\n *\n * @internal\n */\n// eslint-disable-next-line import/no-deprecated\nexport function buildRuntimeRequestHandler(...handlers: RuntimeRequestHandler[]) {\n\tconst builder = new RuntimeRequestHandlerBuilder();\n\tbuilder.pushHandler(...handlers);\n\treturn async (request: IRequest, runtime: IContainerRuntime) =>\n\t\tbuilder.handleRequest(request, runtime);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/request-handler",
-  "version": "1.4.0-115997",
+  "version": "2.0.0-dev-rc.1.0.0.224419",
   "description": "A simple request handling library for Fluid Framework",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,44 +11,32 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
-  "main": "dist/index.js",
-  "module": "lib/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
-    "build:commonjs": "npm run tsc && npm run typetests:gen && npm run build:test",
-    "build:compile": "concurrently npm:build:commonjs npm:build:esnext",
-    "build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
-    "build:full": "npm run build",
-    "build:full:compile": "npm run build:compile",
-    "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
-    "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
-    "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-    "lint": "npm run eslint",
-    "lint:fix": "npm run eslint:fix",
-    "test": "npm run test:mocha",
-    "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
-    "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test --exit -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
-    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
-    "typetests:gen": "flub generate typetests --generate --dir . --no-generateInName",
-    "typetests:prepare": "flub generate typetests --prepare --dir . --pin"
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./lib/index.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.cjs"
+      }
+    }
   },
-  "nyc": {
+  "main": "dist/index.cjs",
+  "module": "lib/index.mjs",
+  "types": "dist/index.d.ts",
+  "c8": {
     "all": true,
     "cache-dir": "nyc/.cache",
     "exclude": [
-      "src/test/**/*.ts",
-      "dist/test/**/*.js"
+      "src/test/**/*.*ts",
+      "dist/test/**/*.*js"
     ],
     "exclude-after-remap": false,
     "include": [
-      "src/**/*.ts",
-      "dist/**/*.js"
+      "src/**/*.*ts",
+      "dist/**/*.*js"
     ],
     "report-dir": "nyc/report",
     "reporter": [
@@ -59,40 +47,100 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/container-runtime-definitions": "1.4.0-115997",
-    "@fluidframework/core-interfaces": "1.4.0-115997",
-    "@fluidframework/runtime-definitions": "1.4.0-115997",
-    "@fluidframework/runtime-utils": "1.4.0-115997"
+    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.1.0.0.224419",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.1.0.0.224419",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.1.0.0.224419",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.1.0.0.224419",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.1.0.0.224419"
   },
   "devDependencies": {
-    "@fluidframework/build-common": "^0.24.0",
-    "@fluidframework/build-tools": "^0.6.0-110101",
-    "@fluidframework/eslint-config-fluid": "^0.28.2000",
-    "@fluidframework/mocha-test-setup": "1.4.0-115997",
-    "@fluidframework/request-handler-previous": "npm:@fluidframework/request-handler@1.3.1",
-    "@fluidframework/test-runtime-utils": "1.4.0-115997",
-    "@microsoft/api-extractor": "^7.22.2",
-    "@rushstack/eslint-config": "^2.5.1",
+    "@arethetypeswrong/cli": "^0.13.3",
+    "@fluid-tools/build-cli": "0.29.0-222379",
+    "@fluidframework/build-common": "^2.0.3",
+    "@fluidframework/build-tools": "0.29.0-222379",
+    "@fluidframework/eslint-config-fluid": "^3.1.0",
+    "@fluidframework/mocha-test-setup": "2.0.0-dev-rc.1.0.0.224419",
+    "@fluidframework/request-handler-previous": "npm:@fluidframework/request-handler@2.0.0-internal.7.2.0",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.1.0.0.224419",
+    "@microsoft/api-extractor": "^7.38.3",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
-    "@types/random-js": "^1.0.31",
-    "concurrently": "^6.2.0",
-    "copyfiles": "^2.1.0",
-    "cross-env": "^7.0.2",
+    "@types/node": "^18.19.0",
+    "c8": "^7.7.1",
+    "copyfiles": "^2.4.1",
+    "cross-env": "^7.0.3",
     "diff": "^3.5.0",
-    "eslint": "~8.6.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.0.0",
-    "random-js": "^1.0.8",
-    "rimraf": "^2.6.2",
-    "typescript": "~4.5.5",
-    "typescript-formatter": "7.1.0"
+    "eslint": "~8.50.0",
+    "mocha": "^10.2.0",
+    "mocha-json-output-reporter": "^2.0.1",
+    "mocha-multi-reporters": "^1.5.1",
+    "moment": "^2.21.0",
+    "prettier": "~3.0.3",
+    "renamer": "^4.0.0",
+    "rimraf": "^4.4.0",
+    "tsc-multi": "^1.1.0",
+    "typescript": "~5.1.6"
+  },
+  "fluidBuild": {
+    "tasks": {
+      "build:docs": {
+        "dependsOn": [
+          "...",
+          "api-extractor:commonjs",
+          "api-extractor:esnext"
+        ],
+        "script": false
+      }
+    }
   },
   "typeValidation": {
-    "version": "1.4.0",
-    "baselineRange": "~1.3.0",
-    "baselineVersion": "1.3.1",
-    "broken": {}
+    "broken": {
+      "RemovedVariableDeclaration_createFluidObjectResponse": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "RemovedVariableDeclaration_rootDataStoreRequestHandler": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "RemovedFunctionDeclaration_handleFromLegacyUri": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "RemovedClassDeclaration_RuntimeRequestHandlerBuilder": {
+        "forwardCompat": false,
+        "backCompat": false
+      }
+    }
+  },
+  "scripts": {
+    "api": "fluid-build . --task api",
+    "api-extractor:commonjs": "api-extractor run --local",
+    "api-extractor:esnext": "copyfiles -u 1 \"dist/**/*-@(alpha|beta|public|untrimmed).d.ts\" lib",
+    "build": "fluid-build . --task build",
+    "build:commonjs": "fluid-build . --task commonjs",
+    "build:compile": "fluid-build . --task compile",
+    "build:docs": "fluid-build . --task api",
+    "build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
+    "build:rename-types": "renamer \"lib/**\" -f .d.ts -r .d.mts --force",
+    "build:test": "tsc-multi --config ./tsc-multi.test.json",
+    "check:are-the-types-wrong": "attw --pack",
+    "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",
+    "test": "npm run test:mocha",
+    "test:coverage": "c8 npm test",
+    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test --exit -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
+    "tsc": "tsc-multi --config ../../../common/build/build-common/tsc-multi.cjs.json",
+    "typetests:gen": "fluid-type-test-generator",
+    "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }
-}
+}

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/index.ts

@@ -3,5 +3,5 @@
  * Licensed under the MIT License.
  */
 
-export * from "./requestHandlers";
-export * from "./runtimeRequestHandlerBuilder";
+export { RuntimeRequestHandler } from "./requestHandlers";
+export { buildRuntimeRequestHandler } from "./runtimeRequestHandlerBuilder";

package/src/requestHandlers.ts

@@ -3,17 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/common-utils";
-import {
-    IResponse,
-    IRequest,
-    IFluidHandle,
-    IFluidLoadable,
-    FluidObject,
-    IFluidRouter,
-} from "@fluidframework/core-interfaces";
+import { IResponse } from "@fluidframework/core-interfaces";
 import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
-import { IContainerRuntimeBase } from "@fluidframework/runtime-definitions";
 import { RequestParser } from "@fluidframework/runtime-utils";
 
 /**
@@ -21,68 +12,11 @@ import { RequestParser } from "@fluidframework/runtime-utils";
  * if it does not apply. These handlers are called in series, so there may be other handlers before or after.
  * A handler should only return error if the request is for a route the handler owns, and there is a problem with
  * the route, or fulling the specific request.
+ * @deprecated Will be removed once Loader LTS version is "2.0.0-internal.7.0.0". Migrate all usage of IFluidRouter to the "entryPoint" pattern. Refer to Removing-IFluidRouter.md
+ *
+ * @alpha
  */
-export type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)
-    => Promise<IResponse | undefined>;
-
-/**
- * A request handler to expose access to all root data stores in the container by id.
- * @param request - the request for the root data store.  The first path part must be the data store's ID.
- * @param runtime - the container runtime
- * @returns the result of the request
- */
-export const rootDataStoreRequestHandler = async (request: IRequest, runtime: IContainerRuntime) => {
-    const requestParser = RequestParser.create(request);
-    const id = requestParser.pathParts[0];
-    const wait = typeof request.headers?.wait === "boolean" ? request.headers.wait : undefined;
-    let rootDataStore: IFluidRouter;
-    try {
-        // getRootDataStore currently throws if the data store is not found
-        rootDataStore = await runtime.getRootDataStore(id, wait);
-    } catch (error) {
-        return undefined; // continue search
-    }
-    try {
-        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));
-    } catch (error) {
-        return { status: 500, mimeType: "fluid/object", value: error };
-    }
-};
-
-export const createFluidObjectResponse = (fluidObject: FluidObject):
-    { status: 200; mimeType: "fluid/object"; value: FluidObject; } => {
-    return { status: 200, mimeType: "fluid/object", value: fluidObject };
-};
-
-class LegacyUriHandle<T = FluidObject & IFluidLoadable> implements IFluidHandle<T> {
-    public readonly isAttached = true;
-
-    public get IFluidHandle(): IFluidHandle { return this; }
-
-    public constructor(public readonly absolutePath, public readonly runtime: IContainerRuntimeBase) {
-    }
-
-    public attachGraph() {
-        assert(false, 0x0ca /* "Trying to use legacy graph attach!" */);
-    }
-
-    public async get(): Promise<any> {
-        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });
-        if (response.status === 200 && response.mimeType === "fluid/object") {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return response.value;
-        }
-        throw new Error(`Failed to resolve container path ${this.absolutePath}`);
-    }
-
-    public bind(handle: IFluidHandle) {
-        throw new Error("Cannot bind to LegacyUriHandle");
-    }
-}
-
-export function handleFromLegacyUri<T = FluidObject & IFluidLoadable>(
-    uri: string,
-    runtime: IContainerRuntimeBase,
-): IFluidHandle<T> {
-    return new LegacyUriHandle<T>(uri, runtime);
-}
+export type RuntimeRequestHandler = (
+	request: RequestParser,
+	runtime: IContainerRuntime,
+) => Promise<IResponse | undefined>;

package/src/runtimeRequestHandlerBuilder.ts

@@ -6,35 +6,45 @@
 import { IRequest, IResponse } from "@fluidframework/core-interfaces";
 import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
 import { RequestParser, create404Response } from "@fluidframework/runtime-utils";
+// eslint-disable-next-line import/no-deprecated
 import { RuntimeRequestHandler } from "./requestHandlers";
 
 /**
-  * The RuntimeRequestHandlerBuilder creates a runtime request handler based on request handlers.
-  * The provided handlers sequentially applied until one is able to satisfy the request.
-  */
-export class RuntimeRequestHandlerBuilder {
-    private readonly handlers: RuntimeRequestHandler[] = [];
+ * The RuntimeRequestHandlerBuilder creates a runtime request handler based on request handlers.
+ * The provided handlers sequentially applied until one is able to satisfy the request.
+ */
+class RuntimeRequestHandlerBuilder {
+	// eslint-disable-next-line import/no-deprecated
+	private readonly handlers: RuntimeRequestHandler[] = [];
 
-    public pushHandler(...handlers: RuntimeRequestHandler[]) {
-        if (handlers !== undefined) {
-            this.handlers.push(...handlers);
-        }
-    }
+	// eslint-disable-next-line import/no-deprecated
+	public pushHandler(...handlers: RuntimeRequestHandler[]) {
+		if (handlers !== undefined) {
+			this.handlers.push(...handlers);
+		}
+	}
 
-    public async handleRequest(request: IRequest, runtime: IContainerRuntime): Promise<IResponse> {
-        const parser = RequestParser.create(request);
-        for (const handler of this.handlers) {
-            const response = await handler(parser, runtime);
-            if (response !== undefined) {
-                return response;
-            }
-        }
-        return create404Response(request);
-    }
+	public async handleRequest(request: IRequest, runtime: IContainerRuntime): Promise<IResponse> {
+		const parser = RequestParser.create(request);
+		for (const handler of this.handlers) {
+			const response = await handler(parser, runtime);
+			if (response !== undefined) {
+				return response;
+			}
+		}
+		return create404Response(request);
+	}
 }
 
+/**
+ * @deprecated Will be removed once Loader LTS version is "2.0.0-internal.7.0.0". Migrate all usage of IFluidRouter to the "entryPoint" pattern. Refer to Removing-IFluidRouter.md
+ *
+ * @internal
+ */
+// eslint-disable-next-line import/no-deprecated
 export function buildRuntimeRequestHandler(...handlers: RuntimeRequestHandler[]) {
-    const builder = new RuntimeRequestHandlerBuilder();
-    builder.pushHandler(...handlers);
-    return async (request: IRequest, runtime: IContainerRuntime) => builder.handleRequest(request, runtime);
+	const builder = new RuntimeRequestHandlerBuilder();
+	builder.pushHandler(...handlers);
+	return async (request: IRequest, runtime: IContainerRuntime) =>
+		builder.handleRequest(request, runtime);
 }

package/tsc-multi.test.json

@@ -0,0 +1,4 @@
+{
+	"targets": [{ "extname": ".cjs", "module": "CommonJS", "moduleResolution": "Node10" }],
+	"projects": ["./tsconfig.json", "./src/test/tsconfig.json"]
+}

package/tsconfig.json

@@ -1,14 +1,12 @@
 {
-    "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "src/test/**/*"
-    ],
-    "compilerOptions": {
-        "rootDir": "./src",
-        "outDir": "./dist",
-        "composite": true
-    },
-    "include": [
-        "src/**/*"
-    ]
-}
+	"extends": [
+		"../../../common/build/build-common/tsconfig.base.json",
+		"../../../common/build/build-common/tsconfig.cjs.json",
+	],
+	"include": ["src/**/*"],
+	"exclude": ["src/test/**/*"],
+	"compilerOptions": {
+		"rootDir": "./src",
+		"outDir": "./dist",
+	},
+}

package/dist/index.js

@@ -1,19 +0,0 @@
-"use strict";
-/*!
- * 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("./requestHandlers"), exports);
-__exportStar(require("./runtimeRequestHandlerBuilder"), exports);
-//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;AAEH,oDAAkC;AAClC,iEAA+C","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport * from \"./requestHandlers\";\nexport * from \"./runtimeRequestHandlerBuilder\";\n"]}

package/dist/packageVersion.d.ts

@@ -1,9 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- *
- * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
- */
-export declare const pkgName = "@fluidframework/request-handler";
-export declare const pkgVersion = "1.4.0-115997";
-//# sourceMappingURL=packageVersion.d.ts.map

package/dist/packageVersion.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,oCAAoC,CAAC;AACzD,eAAO,MAAM,UAAU,iBAAiB,CAAC"}

package/dist/packageVersion.js

@@ -1,12 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- *
- * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pkgVersion = exports.pkgName = void 0;
-exports.pkgName = "@fluidframework/request-handler";
-exports.pkgVersion = "1.4.0-115997";
-//# sourceMappingURL=packageVersion.js.map

package/dist/packageVersion.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,iCAAiC,CAAC;AAC5C,QAAA,UAAU,GAAG,cAAc,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/request-handler\";\nexport const pkgVersion = \"1.4.0-115997\";\n"]}

package/dist/requestHandlers.js

@@ -1,67 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleFromLegacyUri = exports.createFluidObjectResponse = exports.rootDataStoreRequestHandler = void 0;
-const common_utils_1 = require("@fluidframework/common-utils");
-const runtime_utils_1 = require("@fluidframework/runtime-utils");
-/**
- * A request handler to expose access to all root data stores in the container by id.
- * @param request - the request for the root data store.  The first path part must be the data store's ID.
- * @param runtime - the container runtime
- * @returns the result of the request
- */
-const rootDataStoreRequestHandler = async (request, runtime) => {
-    var _a;
-    const requestParser = runtime_utils_1.RequestParser.create(request);
-    const id = requestParser.pathParts[0];
-    const wait = typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a.wait) === "boolean" ? request.headers.wait : undefined;
-    let rootDataStore;
-    try {
-        // getRootDataStore currently throws if the data store is not found
-        rootDataStore = await runtime.getRootDataStore(id, wait);
-    }
-    catch (error) {
-        return undefined; // continue search
-    }
-    try {
-        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));
-    }
-    catch (error) {
-        return { status: 500, mimeType: "fluid/object", value: error };
-    }
-};
-exports.rootDataStoreRequestHandler = rootDataStoreRequestHandler;
-const createFluidObjectResponse = (fluidObject) => {
-    return { status: 200, mimeType: "fluid/object", value: fluidObject };
-};
-exports.createFluidObjectResponse = createFluidObjectResponse;
-class LegacyUriHandle {
-    constructor(absolutePath, runtime) {
-        this.absolutePath = absolutePath;
-        this.runtime = runtime;
-        this.isAttached = true;
-    }
-    get IFluidHandle() { return this; }
-    attachGraph() {
-        (0, common_utils_1.assert)(false, 0x0ca /* "Trying to use legacy graph attach!" */);
-    }
-    async get() {
-        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });
-        if (response.status === 200 && response.mimeType === "fluid/object") {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return response.value;
-        }
-        throw new Error(`Failed to resolve container path ${this.absolutePath}`);
-    }
-    bind(handle) {
-        throw new Error("Cannot bind to LegacyUriHandle");
-    }
-}
-function handleFromLegacyUri(uri, runtime) {
-    return new LegacyUriHandle(uri, runtime);
-}
-exports.handleFromLegacyUri = handleFromLegacyUri;
-//# sourceMappingURL=requestHandlers.js.map

package/dist/requestHandlers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"requestHandlers.js","sourceRoot":"","sources":["../src/requestHandlers.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,+DAAsD;AAWtD,iEAA8D;AAW9D;;;;;GAKG;AACI,MAAM,2BAA2B,GAAG,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE;;IAC/F,MAAM,aAAa,GAAG,6BAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,OAAO,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,IAAI,aAA2B,CAAC;IAChC,IAAI;QACA,mEAAmE;QACnE,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC5D;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,SAAS,CAAC,CAAC,kBAAkB;KACvC;IACD,IAAI;QACA,OAAO,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KAChF;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;KAClE;AACL,CAAC,CAAC;AAhBW,QAAA,2BAA2B,+BAgBtC;AAEK,MAAM,yBAAyB,GAAG,CAAC,WAAwB,EACC,EAAE;IACjE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AACzE,CAAC,CAAC;AAHW,QAAA,yBAAyB,6BAGpC;AAEF,MAAM,eAAe;IAKjB,YAAmC,YAAY,EAAkB,OAA8B;QAA5D,iBAAY,GAAZ,YAAY,CAAA;QAAkB,YAAO,GAAP,OAAO,CAAuB;QAJ/E,eAAU,GAAG,IAAI,CAAC;IAKlC,CAAC;IAHD,IAAW,YAAY,KAAmB,OAAO,IAAI,CAAC,CAAC,CAAC;IAKjD,WAAW;QACd,IAAA,qBAAM,EAAC,KAAK,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,GAAG;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAClG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,QAAQ,KAAK,cAAc,EAAE;YACjE,+DAA+D;YAC/D,OAAO,QAAQ,CAAC,KAAK,CAAC;SACzB;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,IAAI,CAAC,MAAoB;QAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,SAAgB,mBAAmB,CAC/B,GAAW,EACX,OAA8B;IAE9B,OAAO,IAAI,eAAe,CAAI,GAAG,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AALD,kDAKC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport {\n    IResponse,\n    IRequest,\n    IFluidHandle,\n    IFluidLoadable,\n    FluidObject,\n    IFluidRouter,\n} from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { IContainerRuntimeBase } from \"@fluidframework/runtime-definitions\";\nimport { RequestParser } from \"@fluidframework/runtime-utils\";\n\n/**\n * A request handler for the container runtime. Each handler should handle a specific request, and return undefined\n * if it does not apply. These handlers are called in series, so there may be other handlers before or after.\n * A handler should only return error if the request is for a route the handler owns, and there is a problem with\n * the route, or fulling the specific request.\n */\nexport type RuntimeRequestHandler = (request: RequestParser, runtime: IContainerRuntime)\n    => Promise<IResponse | undefined>;\n\n/**\n * A request handler to expose access to all root data stores in the container by id.\n * @param request - the request for the root data store.  The first path part must be the data store's ID.\n * @param runtime - the container runtime\n * @returns the result of the request\n */\nexport const rootDataStoreRequestHandler = async (request: IRequest, runtime: IContainerRuntime) => {\n    const requestParser = RequestParser.create(request);\n    const id = requestParser.pathParts[0];\n    const wait = typeof request.headers?.wait === \"boolean\" ? request.headers.wait : undefined;\n    let rootDataStore: IFluidRouter;\n    try {\n        // getRootDataStore currently throws if the data store is not found\n        rootDataStore = await runtime.getRootDataStore(id, wait);\n    } catch (error) {\n        return undefined; // continue search\n    }\n    try {\n        return rootDataStore.IFluidRouter.request(requestParser.createSubRequest(1));\n    } catch (error) {\n        return { status: 500, mimeType: \"fluid/object\", value: error };\n    }\n};\n\nexport const createFluidObjectResponse = (fluidObject: FluidObject):\n    { status: 200; mimeType: \"fluid/object\"; value: FluidObject; } => {\n    return { status: 200, mimeType: \"fluid/object\", value: fluidObject };\n};\n\nclass LegacyUriHandle<T = FluidObject & IFluidLoadable> implements IFluidHandle<T> {\n    public readonly isAttached = true;\n\n    public get IFluidHandle(): IFluidHandle { return this; }\n\n    public constructor(public readonly absolutePath, public readonly runtime: IContainerRuntimeBase) {\n    }\n\n    public attachGraph() {\n        assert(false, 0x0ca /* \"Trying to use legacy graph attach!\" */);\n    }\n\n    public async get(): Promise<any> {\n        const response = await this.runtime.IFluidHandleContext.resolveHandle({ url: this.absolutePath });\n        if (response.status === 200 && response.mimeType === \"fluid/object\") {\n            // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n            return response.value;\n        }\n        throw new Error(`Failed to resolve container path ${this.absolutePath}`);\n    }\n\n    public bind(handle: IFluidHandle) {\n        throw new Error(\"Cannot bind to LegacyUriHandle\");\n    }\n}\n\nexport function handleFromLegacyUri<T = FluidObject & IFluidLoadable>(\n    uri: string,\n    runtime: IContainerRuntimeBase,\n): IFluidHandle<T> {\n    return new LegacyUriHandle<T>(uri, runtime);\n}\n"]}

package/dist/runtimeRequestHandlerBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runtimeRequestHandlerBuilder.js","sourceRoot":"","sources":["../src/runtimeRequestHandlerBuilder.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH,iEAAiF;AAGjF;;;IAGI;AACJ,MAAa,4BAA4B;IAAzC;QACqB,aAAQ,GAA4B,EAAE,CAAC;IAkB5D,CAAC;IAhBU,WAAW,CAAC,GAAG,QAAiC;QACnD,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SACnC;IACL,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAiB,EAAE,OAA0B;QACpE,MAAM,MAAM,GAAG,6BAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAChD,IAAI,QAAQ,KAAK,SAAS,EAAE;gBACxB,OAAO,QAAQ,CAAC;aACnB;SACJ;QACD,OAAO,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CACJ;AAnBD,oEAmBC;AAED,SAAgB,0BAA0B,CAAC,GAAG,QAAiC;IAC3E,MAAM,OAAO,GAAG,IAAI,4BAA4B,EAAE,CAAC;IACnD,OAAO,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC;IACjC,OAAO,KAAK,EAAE,OAAiB,EAAE,OAA0B,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5G,CAAC;AAJD,gEAIC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IRequest, IResponse } from \"@fluidframework/core-interfaces\";\nimport { IContainerRuntime } from \"@fluidframework/container-runtime-definitions\";\nimport { RequestParser, create404Response } from \"@fluidframework/runtime-utils\";\nimport { RuntimeRequestHandler } from \"./requestHandlers\";\n\n/**\n  * The RuntimeRequestHandlerBuilder creates a runtime request handler based on request handlers.\n  * The provided handlers sequentially applied until one is able to satisfy the request.\n  */\nexport class RuntimeRequestHandlerBuilder {\n    private readonly handlers: RuntimeRequestHandler[] = [];\n\n    public pushHandler(...handlers: RuntimeRequestHandler[]) {\n        if (handlers !== undefined) {\n            this.handlers.push(...handlers);\n        }\n    }\n\n    public async handleRequest(request: IRequest, runtime: IContainerRuntime): Promise<IResponse> {\n        const parser = RequestParser.create(request);\n        for (const handler of this.handlers) {\n            const response = await handler(parser, runtime);\n            if (response !== undefined) {\n                return response;\n            }\n        }\n        return create404Response(request);\n    }\n}\n\nexport function buildRuntimeRequestHandler(...handlers: RuntimeRequestHandler[]) {\n    const builder = new RuntimeRequestHandlerBuilder();\n    builder.pushHandler(...handlers);\n    return async (request: IRequest, runtime: IContainerRuntime) => builder.handleRequest(request, runtime);\n}\n"]}

package/lib/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC"}