@fluid-experimental/attributor 2.0.0-rc.1.0.4 → 2.0.0-rc.2.0.0

package/lib/test/utils.js

@@ -0,0 +1,32 @@
+/**
+ * Creates a mock {@link @fluidframework/container-definitions#IAudience} for testing.
+ */
+export function makeMockAudience(clientIds) {
+    const clients = new Map();
+    for (const [index, clientId] of clientIds.entries()) {
+        // eslint-disable-next-line unicorn/prefer-code-point
+        const stringId = String.fromCharCode(index + 65);
+        const name = stringId.repeat(10);
+        const userId = `${name}@microsoft.com`;
+        const email = userId;
+        const user = {
+            id: userId,
+            name,
+            email,
+        };
+        clients.set(clientId, {
+            mode: "write",
+            details: { capabilities: { interactive: true } },
+            permission: [],
+            user,
+            scopes: [],
+        });
+    }
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return {
+        getMember: (clientId) => {
+            return clients.get(clientId);
+        },
+    };
+}
+//# sourceMappingURL=utils.js.map

package/lib/test/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAmB;IACnD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC3C,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;QACpD,qDAAqD;QACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,GAAG,IAAI,gBAAgB,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC;QACrB,MAAM,IAAI,GAAG;YACZ,EAAE,EAAE,MAAM;YACV,IAAI;YACJ,KAAK;SACL,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;YACrB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE;YAChD,UAAU,EAAE,EAAE;YACd,IAAI;YACJ,MAAM,EAAE,EAAE;SACV,CAAC,CAAC;KACH;IACD,yEAAyE;IACzE,OAAO;QACN,SAAS,EAAE,CAAC,QAAgB,EAAuB,EAAE;YACpD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;KACY,CAAC;AAChB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\nimport { type IClient } from \"@fluidframework/protocol-definitions\";\nimport { type IAudience } from \"@fluidframework/container-definitions\";\n\n/**\n * Creates a mock {@link @fluidframework/container-definitions#IAudience} for testing.\n */\nexport function makeMockAudience(clientIds: string[]): IAudience {\n\tconst clients = new Map<string, IClient>();\n\tfor (const [index, clientId] of clientIds.entries()) {\n\t\t// eslint-disable-next-line unicorn/prefer-code-point\n\t\tconst stringId = String.fromCharCode(index + 65);\n\t\tconst name = stringId.repeat(10);\n\t\tconst userId = `${name}@microsoft.com`;\n\t\tconst email = userId;\n\t\tconst user = {\n\t\t\tid: userId,\n\t\t\tname,\n\t\t\temail,\n\t\t};\n\t\tclients.set(clientId, {\n\t\t\tmode: \"write\",\n\t\t\tdetails: { capabilities: { interactive: true } },\n\t\t\tpermission: [],\n\t\t\tuser,\n\t\t\tscopes: [],\n\t\t});\n\t}\n\t// eslint-disable-next-line @typescript-eslint/consistent-type-assertions\n\treturn {\n\t\tgetMember: (clientId: string): IClient | undefined => {\n\t\t\treturn clients.get(clientId);\n\t\t},\n\t} as IAudience;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-experimental/attributor",
-  "version": "2.0.0-rc.1.0.4",
+  "version": "2.0.0-rc.2.0.0",
   "description": "Operation attributor",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,60 +11,40 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "type": "module",
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./alpha": {
-      "import": {
-        "types": "./lib/attributor-alpha.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/attributor-alpha.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
-    "./beta": {
+    "./public": {
       "import": {
-        "types": "./lib/attributor-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/attributor-public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/attributor-beta.d.ts",
+        "types": "./dist/attributor-public.d.ts",
         "default": "./dist/index.js"
       }
     },
     "./internal": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
-    },
-    "./public": {
-      "import": {
-        "types": "./lib/attributor-public.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/attributor-public.d.ts",
-        "default": "./dist/index.js"
-      }
     }
   },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -87,45 +67,44 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/container-runtime": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/protocol-definitions": "^3.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-runtime": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-runtime-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
     "lz4js": "^0.2.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.29.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/eslint-config-fluid": "^3.2.0",
-    "@fluidframework/merge-tree": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/sequence": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.1.0.4 <2.0.0-rc.1.1.0",
-    "@microsoft/api-extractor": "^7.38.3",
+    "@fluidframework/build-tools": "^0.34.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/eslint-config-fluid": "^4.0.0",
+    "@fluidframework/merge-tree": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/sequence": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@microsoft/api-extractor": "^7.42.3",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
     "c8": "^8.0.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "~8.50.0",
+    "eslint": "~8.55.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",
     "rimraf": "^4.4.0",
-    "tsc-multi": "^1.1.0",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -146,14 +125,16 @@
   },
   "scripts": {
     "api": "fluid-build . --task api",
-    "api-extractor:commonjs": "api-extractor run --local",
-    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
+    "api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
+    "api-extractor:esnext": "api-extractor run --local",
     "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:test": "tsc --project ./src/test/tsconfig.json",
+    "build:esnext": "tsc --project ./tsconfig.json",
+    "build:test": "npm run build:test:esm && npm run build:test:cjs",
+    "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:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
@@ -167,9 +148,11 @@
     "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
-    "test:mocha": "mocha --ignore \"dist/test/memory/**/*\" --recursive \"dist/test/**/*.spec.*js\" -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",
+    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
+    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
+    "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }

package/src/attributor.ts

@@ -3,10 +3,13 @@
  * Licensed under the MIT License.
  */
 import { assert } from "@fluidframework/core-utils";
-import { IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { AttributionInfo } from "@fluidframework/runtime-definitions";
+import {
+	type IDocumentMessage,
+	type ISequencedDocumentMessage,
+} from "@fluidframework/protocol-definitions";
+import { type AttributionInfo } from "@fluidframework/runtime-definitions";
 import { UsageError } from "@fluidframework/telemetry-utils";
-import { IAudience, IDeltaManager } from "@fluidframework/container-definitions";
+import { type IAudience, type IDeltaManager } from "@fluidframework/container-definitions";
 
 /**
  * Provides lookup between attribution keys and their associated attribution information.
@@ -45,7 +48,7 @@ export class Attributor implements IAttributor {
 	/**
 	 * @param initialEntries - Any entries which should be populated on instantiation.
 	 */
-	constructor(initialEntries?: Iterable<[number, AttributionInfo]>) {
+	public constructor(initialEntries?: Iterable<[number, AttributionInfo]>) {
 		this.keyToInfo = new Map(initialEntries ?? []);
 	}
 
@@ -81,7 +84,7 @@ export class Attributor implements IAttributor {
  * @internal
  */
 export class OpStreamAttributor extends Attributor implements IAttributor {
-	constructor(
+	public constructor(
 		deltaManager: IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>,
 		audience: IAudience,
 		initialEntries?: Iterable<[number, AttributionInfo]>,
@@ -89,7 +92,6 @@ export class OpStreamAttributor extends Attributor implements IAttributor {
 		super(initialEntries);
 		deltaManager.on("op", (message: ISequencedDocumentMessage) => {
 			// TODO: Verify whether this should be able to handle server-generated ops (with null clientId)
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 			const client = audience.getMember(message.clientId as string);
 			if (message.type === "op") {
 				// TODO: This case may be legitimate, and if so we need to figure out how to handle it.

package/src/encoders.ts

@@ -3,14 +3,13 @@
  * Licensed under the MIT License.
  */
 import { assert } from "@fluidframework/core-utils";
-import { IUser } from "@fluidframework/protocol-definitions";
-import { AttributionInfo } from "@fluidframework/runtime-definitions";
-import { IAttributor } from "./attributor";
-import { InternedStringId, MutableStringInterner } from "./stringInterner";
+import { type IUser } from "@fluidframework/protocol-definitions";
+import { type AttributionInfo } from "@fluidframework/runtime-definitions";
+import { type IAttributor } from "./attributor.js";
+import { type InternedStringId, MutableStringInterner } from "./stringInterner.js";
 
 export interface Encoder<TDecoded, TEncoded> {
 	encode(decoded: TDecoded): TEncoded;
-
 	decode(encoded: TEncoded): TDecoded;
 }
 
@@ -20,7 +19,7 @@ export type TimestampEncoder = Encoder<number[], number[]>;
 
 export const deltaEncoder: TimestampEncoder = {
 	encode: (timestamps: number[]) => {
-		const deltaTimestamps: number[] = new Array(timestamps.length);
+		const deltaTimestamps: number[] = Array.from({ length: timestamps.length });
 		let prev = 0;
 		for (let i = 0; i < timestamps.length; i++) {
 			deltaTimestamps[i] = timestamps[i] - prev;
@@ -33,7 +32,7 @@ export const deltaEncoder: TimestampEncoder = {
 			Array.isArray(encoded),
 			0x4b0 /* Encoded timestamps should be an array of numbers */,
 		);
-		const timestamps: number[] = new Array(encoded.length);
+		const timestamps: number[] = Array.from({ length: encoded.length });
 		let cumulativeSum = 0;
 		for (let i = 0; i < encoded.length; i++) {
 			cumulativeSum += encoded[i];
@@ -53,13 +52,16 @@ export interface SerializedAttributor {
 }
 
 export class AttributorSerializer implements IAttributorSerializer {
-	constructor(
+	public constructor(
 		private readonly makeAttributor: (
 			entries: Iterable<[number, AttributionInfo]>,
 		) => IAttributor,
 		private readonly timestampEncoder: TimestampEncoder,
 	) {}
 
+	/**
+	 * {@inheritDoc Encoder.encode}
+	 */
 	public encode(attributor: IAttributor): SerializedAttributor {
 		const interner = new MutableStringInterner();
 		const seqs: number[] = [];
@@ -82,6 +84,9 @@ export class AttributorSerializer implements IAttributorSerializer {
 		return serialized;
 	}
 
+	/**
+	 * {@inheritDoc Encoder.decode}
+	 */
 	public decode(encoded: SerializedAttributor): IAttributor {
 		const interner = new MutableStringInterner(encoded.interner);
 		const { seqs, timestamps: encodedTimestamps, attributionRefs } = encoded;
@@ -90,12 +95,12 @@ export class AttributorSerializer implements IAttributorSerializer {
 			seqs.length === timestamps.length && timestamps.length === attributionRefs.length,
 			0x4b1 /* serialized attribution columns should have the same length */,
 		);
-		const entries = new Array(seqs.length);
+		const entries: [number, AttributionInfo][] = Array.from({ length: seqs.length });
 		for (let i = 0; i < seqs.length; i++) {
 			const key = seqs[i];
 			const timestamp = timestamps[i];
 			const ref = attributionRefs[i];
-			const user: IUser = JSON.parse(interner.getString(ref));
+			const user = JSON.parse(interner.getString(ref)) as IUser;
 			entries[i] = [key, { user, timestamp }];
 		}
 		return this.makeAttributor(entries);
@@ -103,7 +108,7 @@ export class AttributorSerializer implements IAttributorSerializer {
 }
 
 /**
- * @returns an encoder which composes `a` and `b`.
+ * Creates an encoder which composes `a` and `b`.
  */
 export const chain = <T1, T2, T3>(a: Encoder<T1, T2>, b: Encoder<T2, T3>): Encoder<T1, T3> => ({
 	encode: (content) => b.encode(a.encode(content)),

package/src/index.ts

@@ -2,11 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { Attributor, OpStreamAttributor, IAttributor } from "./attributor";
+export { Attributor, type IAttributor, OpStreamAttributor } from "./attributor.js";
 export {
 	createRuntimeAttributor,
 	enableOnNewFileKey,
-	IProvideRuntimeAttributor,
+	type IProvideRuntimeAttributor,
 	IRuntimeAttributor,
 	mixinAttributor,
-} from "./mixinAttributor";
+} from "./mixinAttributor.js";

package/src/lz4Encoder.ts

@@ -4,23 +4,27 @@
  */
 import { compress, decompress } from "lz4js";
 import { bufferToString, stringToBuffer } from "@fluid-internal/client-utils";
-import { Jsonable } from "@fluidframework/datastore-definitions";
-import { Encoder } from "./encoders";
+import { type Jsonable } from "@fluidframework/datastore-definitions";
+import { type Encoder } from "./encoders.js";
 
+// TODO: document this
+// eslint-disable-next-line jsdoc/require-description
 /**
  * @alpha
  */
 export function makeLZ4Encoder<T>(): Encoder<Jsonable<T>, string> {
 	return {
-		encode: (decoded: Jsonable<T>) => {
+		encode: (decoded: Jsonable<T>): string => {
 			const uncompressed = new TextEncoder().encode(JSON.stringify(decoded));
-			const compressed = compress(uncompressed);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+			const compressed = compress(uncompressed) as ArrayBufferLike;
 			return bufferToString(compressed, "base64");
 		},
 		decode: (serializedSummary: string): Jsonable<T> => {
 			const compressed = new Uint8Array(stringToBuffer(serializedSummary, "base64"));
-			const uncompressed = decompress(compressed);
-			const decoded: Jsonable<T> = JSON.parse(new TextDecoder().decode(uncompressed));
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+			const uncompressed = decompress(compressed) as BufferSource;
+			const decoded = JSON.parse(new TextDecoder().decode(uncompressed)) as Jsonable<T>;
 			return decoded;
 		},
 	};

package/src/mixinAttributor.ts

@@ -3,23 +3,27 @@
  * Licensed under the MIT License.
  */
 import {
-	IDocumentMessage,
-	ISequencedDocumentMessage,
-	ISnapshotTree,
+	type IDocumentMessage,
+	type ISequencedDocumentMessage,
+	type ISnapshotTree,
 } from "@fluidframework/protocol-definitions";
-import { IAudience, IContainerContext, IDeltaManager } from "@fluidframework/container-definitions";
+import {
+	type IAudience,
+	type IContainerContext,
+	type IDeltaManager,
+} from "@fluidframework/container-definitions";
 import { ContainerRuntime } from "@fluidframework/container-runtime";
 import type { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
 import {
-	AttributionInfo,
-	AttributionKey,
-	ISummaryTreeWithStats,
-	ITelemetryContext,
-	NamedFluidDataStoreRegistryEntries,
+	type AttributionInfo,
+	type AttributionKey,
+	type ISummaryTreeWithStats,
+	type ITelemetryContext,
+	type NamedFluidDataStoreRegistryEntries,
 } from "@fluidframework/runtime-definitions";
 import { addSummarizeResultToSummary, SummaryTreeBuilder } from "@fluidframework/runtime-utils";
-import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
-import { IRequest, IResponse, FluidObject } from "@fluidframework/core-interfaces";
+import { type IContainerRuntime } from "@fluidframework/container-runtime-definitions";
+import { type IRequest, type IResponse, type FluidObject } from "@fluidframework/core-interfaces";
 import { bufferToString } from "@fluid-internal/client-utils";
 import { assert, unreachableCase } from "@fluidframework/core-utils";
 import {
@@ -28,9 +32,9 @@ import {
 	PerformanceEvent,
 	UsageError,
 } from "@fluidframework/telemetry-utils";
-import { Attributor, IAttributor, OpStreamAttributor } from "./attributor";
-import { AttributorSerializer, chain, deltaEncoder, Encoder } from "./encoders";
-import { makeLZ4Encoder } from "./lz4Encoder";
+import { Attributor, type IAttributor, OpStreamAttributor } from "./attributor.js";
+import { AttributorSerializer, chain, deltaEncoder, type Encoder } from "./encoders.js";
+import { makeLZ4Encoder } from "./lz4Encoder.js";
 
 // Summary tree keys
 const attributorTreeName = ".attributor";
@@ -56,7 +60,8 @@ export interface IProvideRuntimeAttributor {
 /**
  * Provides access to attribution information stored on the container runtime.
  *
- * Attributors are only populated after the container runtime they are injected into has initialized.
+ * @remarks Attributors are only populated after the container runtime into which they are being injected has initialized.
+ *
  * @sealed
  * @internal
  */
@@ -79,8 +84,10 @@ export interface IRuntimeAttributor extends IProvideRuntimeAttributor {
 }
 
 /**
- * @returns an IRuntimeAttributor for usage with `mixinAttributor`. The attributor will only be populated with data
- * once it's passed via scope to a container runtime load flow. See {@link mixinAttributor}.
+ * Creates an `IRuntimeAttributor` for usage with {@link mixinAttributor}.
+ *
+ * @remarks The attributor will only be populated with data once it's passed via scope to a container runtime load flow.
+ *
  * @internal
  */
 export function createRuntimeAttributor(): IRuntimeAttributor {
@@ -98,7 +105,9 @@ export function createRuntimeAttributor(): IRuntimeAttributor {
  * @param Base - base class, inherits from FluidAttributorRuntime
  * @internal
  */
-export const mixinAttributor = (Base: typeof ContainerRuntime = ContainerRuntime) =>
+export const mixinAttributor = (
+	Base: typeof ContainerRuntime = ContainerRuntime,
+): typeof ContainerRuntime =>
 	class ContainerRuntimeWithAttributor extends Base {
 		public static async loadRuntime(params: {
 			context: IContainerContext;
@@ -107,7 +116,9 @@ export const mixinAttributor = (Base: typeof ContainerRuntime = ContainerRuntime
 			runtimeOptions?: IContainerRuntimeOptions;
 			containerScope?: FluidObject;
 			containerRuntimeCtor?: typeof ContainerRuntime;
-			/** @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 */
+			/**
+			 * @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
+			 */
 			requestHandler?: (request: IRequest, runtime: IContainerRuntime) => Promise<IResponse>;
 			provideEntryPoint: (containerRuntime: IContainerRuntime) => Promise<FluidObject>;
 		}): Promise<ContainerRuntime> {
@@ -137,19 +148,22 @@ export const mixinAttributor = (Base: typeof ContainerRuntime = ContainerRuntime
 			const baseSnapshot: ISnapshotTree | undefined =
 				pendingRuntimeState?.baseSnapshot ?? context.baseSnapshot;
 
-			const { audience, deltaManager } = context;
+			const { audience, deltaManager, taggedLogger } = context;
 			assert(
 				audience !== undefined,
 				0x508 /* Audience must exist when instantiating attribution-providing runtime */,
 			);
 
-			const mc = loggerToMonitoringContext(context.taggedLogger);
+			const mc = loggerToMonitoringContext(taggedLogger);
 
 			const shouldTrackAttribution = mc.config.getBoolean(enableOnNewFileKey) ?? false;
 			if (shouldTrackAttribution) {
-				(context.options.attribution ??= {}).track = true;
+				const { options } = context;
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				(options.attribution ??= {}).track = true;
 			}
 
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			const runtime = (await Base.loadRuntime({
 				context,
 				registryEntries,
@@ -161,6 +175,7 @@ export const mixinAttributor = (Base: typeof ContainerRuntime = ContainerRuntime
 				containerScope,
 				existing,
 				containerRuntimeCtor,
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			} as any)) as ContainerRuntimeWithAttributor;
 			runtime.runtimeAttributor = runtimeAttributor as RuntimeAttributor;
 
@@ -202,7 +217,7 @@ export const mixinAttributor = (Base: typeof ContainerRuntime = ContainerRuntime
 			fullTree: boolean,
 			trackState: boolean,
 			telemetryContext?: ITelemetryContext,
-		) {
+		): void {
 			super.addContainerStateToSummary(summaryTree, fullTree, trackState, telemetryContext);
 			const attributorSummary = this.runtimeAttributor?.summarize();
 			if (attributorSummary) {
@@ -286,7 +301,9 @@ class RuntimeAttributor implements IRuntimeAttributor {
 			makeLZ4Encoder(),
 		);
 
-		if (attributorTree !== undefined) {
+		if (attributorTree === undefined) {
+			this.opAttributor = new OpStreamAttributor(deltaManager, audience);
+		} else {
 			const id = attributorTree.blobs[opBlobName];
 			assert(
 				id !== undefined,
@@ -295,8 +312,6 @@ class RuntimeAttributor implements IRuntimeAttributor {
 			const blobContents = await readBlob(id);
 			const attributorSnapshot = bufferToString(blobContents, "utf8");
 			this.opAttributor = this.encoder.decode(attributorSnapshot);
-		} else {
-			this.opAttributor = new OpStreamAttributor(deltaManager, audience);
 		}
 	}
 

package/src/stringInterner.ts

@@ -36,15 +36,15 @@ export class MutableStringInterner implements StringInterner {
 	 * @param inputStrings - A list of strings to intern in the order given. Can be used to rehydrate from a previous
 	 * `StringInterner`'s {@link StringInterner.getSerializable} return value.
 	 */
-	constructor(inputStrings: readonly string[] = []) {
+	public constructor(inputStrings: readonly string[] = []) {
 		for (const value of inputStrings) {
 			this.getOrCreateInternedId(value);
 		}
 	}
 
 	/**
-	 * @param input - The string to get the associated intern ID for
-	 * @returns an intern ID that is uniquely associated with the input string
+	 * Creates an intern ID that is uniquely associated with the input string.
+	 * @param input - The string to get the associated intern ID for.
 	 */
 	public getOrCreateInternedId(input: string): InternedStringId {
 		return this.getInternedId(input) ?? this.createNewId(input);
@@ -55,10 +55,9 @@ export class MutableStringInterner implements StringInterner {
 	}
 
 	/**
-	 *
+	 * Creates a string that is uniquely associated with the given intern ID.
 	 * @param internId - The intern ID to get the associated string for. Can only retrieve strings that have been
 	 * used as inputs to calls of `getInternId`.
-	 * @returns a string that is uniquely associated with the given intern ID
 	 */
 	public getString(internId: number): string {
 		const result = this.internedStrings[internId];
@@ -69,14 +68,18 @@ export class MutableStringInterner implements StringInterner {
 	}
 
 	/**
-	 * @returns The list of strings interned where the indices map to the associated {@link InternedStringId} of
+	 * Gets the list of strings interned where the indices map to the associated {@link InternedStringId} of
 	 * each string.
 	 */
 	public getSerializable(): readonly string[] {
 		return this.internedStrings;
 	}
 
-	/** Create a new interned id. Assumes without validation that the input doesn't already have an interned id. */
+	/**
+	 * Create a new interned id.
+	 *
+	 * @remarks Assumes (without validation) that the input doesn't already have an interned id.
+	 */
 	private createNewId(input: string): InternedStringId {
 		const internedId = this.stringToInternedIdMap.size as InternedStringId;
 		this.stringToInternedIdMap.set(input, internedId);

package/tsconfig.cjs.json

@@ -0,0 +1,7 @@
+{
+	// This config must be used in a "type": "commonjs" environment. (Use fluid-tsc commonjs.)
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./dist",
+	},
+}

package/tsconfig.json

@@ -1,12 +1,9 @@
 {
-	"extends": [
-		"../../../common/build/build-common/tsconfig.base.json",
-		"../../../common/build/build-common/tsconfig.cjs.json",
-	],
+	"extends": "../../../common/build/build-common/tsconfig.node16.json",
 	"include": ["src/**/*"],
 	"exclude": ["src/test/**/*"],
 	"compilerOptions": {
 		"rootDir": "./src",
-		"outDir": "./dist",
+		"outDir": "./lib",
 	},
 }

package/lib/attributor.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"attributor.d.mts","sourceRoot":"","sources":["../src/attributor.ts"],"names":[],"mappings":"OAKO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,sCAAsC;OAC3F,EAAE,eAAe,EAAE,MAAM,qCAAqC;OAE9D,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,uCAAuC;AAEhF;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC3B;;;;OAIG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IAEjD;;;OAGG;IACH,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IAEhE;;OAEG;IACH,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;CAIvD;AAED;;;GAGG;AACH,qBAAa,UAAW,YAAW,WAAW;IAC7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAE3D;;OAEG;gBACS,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAIhE;;OAEG;IACI,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe;IAQvD;;OAEG;IACI,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAItE;;OAEG;IACI,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAG7D;AAED;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,UAAW,YAAW,WAAW;gBAEvE,YAAY,EAAE,aAAa,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,EACxE,QAAQ,EAAE,SAAS,EACnB,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAoBrD"}