@fluidframework/container-runtime 2.0.0-dev-rc.1.0.0.228517 → 2.0.0-dev-rc.2.0.0.245554

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-runtime",
-  "version": "2.0.0-dev-rc.1.0.0.228517",
+  "version": "2.0.0-dev-rc.2.0.0.245554",
   "description": "Fluid container runtime",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,114 +11,110 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./test/containerRuntime": {
       "import": {
-        "types": "./lib/containerRuntime.d.mts",
-        "default": "./lib/containerRuntime.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/containerRuntime.d.ts",
-        "default": "./dist/containerRuntime.js"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
-    "./test/deltaScheduler": {
+    "./public": {
       "import": {
-        "types": "./lib/deltaScheduler.d.mts",
-        "default": "./lib/deltaScheduler.mjs"
+        "types": "./lib/container-runtime-public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/deltaScheduler.d.ts",
-        "default": "./dist/deltaScheduler.js"
+        "types": "./dist/container-runtime-public.d.ts",
+        "default": "./dist/index.js"
       }
     },
-    "./test/scheduleManager": {
+    "./alpha": {
       "import": {
-        "types": "./lib/scheduleManager.d.mts",
-        "default": "./lib/scheduleManager.mjs"
+        "types": "./lib/container-runtime-alpha.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/scheduleManager.d.ts",
-        "default": "./dist/scheduleManager.js"
+        "types": "./dist/container-runtime-alpha.d.ts",
+        "default": "./dist/index.js"
       }
     },
-    "./test/blobManager": {
+    "./internal": {
       "import": {
-        "types": "./lib/blobManager.d.mts",
-        "default": "./lib/blobManager.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/blobManager.d.ts",
-        "default": "./dist/blobManager.js"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
-    "./test/summary": {
+    "./test/containerRuntime": {
       "import": {
-        "types": "./lib/summary/index.d.mts",
-        "default": "./lib/summary/index.mjs"
+        "types": "./lib/containerRuntime.d.ts",
+        "default": "./lib/containerRuntime.js"
       },
       "require": {
-        "types": "./dist/summary/index.d.ts",
-        "default": "./dist/summary/index.js"
+        "types": "./dist/containerRuntime.d.ts",
+        "default": "./dist/containerRuntime.js"
       }
     },
-    "./test/gc": {
+    "./test/deltaScheduler": {
       "import": {
-        "types": "./lib/gc/index.d.mts",
-        "default": "./lib/gc/index.mjs"
+        "types": "./lib/deltaScheduler.d.ts",
+        "default": "./lib/deltaScheduler.js"
       },
       "require": {
-        "types": "./gc/index.d.ts",
-        "default": "./gc/index.js"
+        "types": "./dist/deltaScheduler.d.ts",
+        "default": "./dist/deltaScheduler.js"
       }
     },
-    "./alpha": {
+    "./test/scheduleManager": {
       "import": {
-        "types": "./lib/container-runtime-alpha.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/scheduleManager.d.ts",
+        "default": "./lib/scheduleManager.js"
       },
       "require": {
-        "types": "./dist/container-runtime-alpha.d.ts",
-        "default": "./dist/index.js"
+        "types": "./dist/scheduleManager.d.ts",
+        "default": "./dist/scheduleManager.js"
       }
     },
-    "./beta": {
+    "./test/blobManager": {
       "import": {
-        "types": "./lib/container-runtime-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/blobManager.d.ts",
+        "default": "./lib/blobManager.js"
       },
       "require": {
-        "types": "./dist/container-runtime-beta.d.ts",
-        "default": "./dist/index.js"
+        "types": "./dist/blobManager.d.ts",
+        "default": "./dist/blobManager.js"
       }
     },
-    "./internal": {
+    "./test/summary": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/summary/index.d.ts",
+        "default": "./lib/summary/index.js"
       },
       "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
+        "types": "./dist/summary/index.d.ts",
+        "default": "./dist/summary/index.js"
       }
     },
-    "./public": {
+    "./test/gc": {
       "import": {
-        "types": "./lib/container-runtime-public.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/gc/index.d.ts",
+        "default": "./lib/gc/index.js"
       },
       "require": {
-        "types": "./dist/container-runtime-public.d.ts",
-        "default": "./dist/index.js"
+        "types": "./gc/index.d.ts",
+        "default": "./gc/index.js"
       }
     }
   },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -141,54 +137,53 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/datastore": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/driver-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/id-compressor": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/protocol-definitions": "^3.1.0",
-    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/runtime-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.1.0.0.228517",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/common-definitions": "^1.1.0",
+    "@fluidframework/container-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/datastore": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/id-compressor": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.2.0.0.245554",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "double-ended-queue": "^2.1.0-0",
-    "events": "^3.1.0",
     "lz4js": "^0.2.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.1.0.0.228517",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluid-private/stochastic-test-utils": "2.0.0-dev-rc.2.0.0.245554",
     "@fluid-tools/benchmark": "^0.48.0",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.29.0",
+    "@fluidframework/build-tools": "^0.34.0",
     "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-internal.8.0.0",
-    "@fluidframework/eslint-config-fluid": "^3.2.0",
-    "@fluidframework/mocha-test-setup": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@microsoft/api-extractor": "^7.38.3",
+    "@fluidframework/eslint-config-fluid": "^5.1.0",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@microsoft/api-extractor": "^7.42.3",
     "@types/double-ended-queue": "^2.1.0",
-    "@types/events": "^3.0.0",
     "@types/mocha": "^9.1.1",
-    "@types/sinon": "^7.0.13",
+    "@types/node": "^18.19.0",
+    "@types/sinon": "^17.0.3",
     "@types/uuid": "^9.0.2",
     "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",
-    "sinon": "^7.4.2",
-    "tsc-multi": "^1.1.0",
+    "sinon": "^17.0.1",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -206,21 +201,43 @@
   "typeValidation": {
     "broken": {
       "ClassDeclaration_ContainerRuntime": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_ISubmitSummaryOptions": {
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_IContainerRuntimeOptions": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "RemovedFunctionDeclaration_assertIsStableId": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "RemovedFunctionDeclaration_generateStableId": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "RemovedFunctionDeclaration_isStableId": {
+        "backCompat": false,
         "forwardCompat": false
       }
     }
   },
   "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:esnext": "tsc --project ./tsconfig.json",
     "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/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",
@@ -235,9 +252,11 @@
     "test": "npm run test:mocha",
     "test:benchmark:report": "mocha --timeout 999999 --perfMode --parentProcess --fgrep @Benchmark --reporter @fluid-tools/benchmark/dist/MochaReporter.js \"./dist/**/*.perf.spec.*js\"",
     "test:coverage": "c8 npm test",
-    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test -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",
     "tsc:watch": "tsc --watch",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"

package/src/batchTracker.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { EventEmitter } from "events";
 import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils";
 import { assert } from "@fluidframework/core-utils";
+import type { EventEmitter } from "@fluid-internal/client-utils";
 import { performance } from "@fluid-internal/client-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";

package/src/blobManager.ts

@@ -39,8 +39,7 @@ import {
 } from "@fluidframework/runtime-definitions";
 
 import { canRetryOnError, runWithRetry } from "@fluidframework/driver-utils";
-import { disableAttachmentBlobSweepKey } from "./gc";
-import { IBlobMetadata } from "./metadata";
+import { IBlobMetadata } from "./metadata.js";
 
 /**
  * This class represents blob (long string)
@@ -727,14 +726,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		return gcData;
 	}
 
-	/**
-	 * This is called to update blobs whose routes are unused. The unused blobs are deleted.
-	 * @param unusedRoutes - The routes of the blob nodes that are unused. These routes will be based off of local ids.
-	 */
-	public updateUnusedRoutes(unusedRoutes: readonly string[]): void {
-		this.deleteBlobsFromRedirectTable(unusedRoutes);
-	}
-
 	/**
 	 * Delete attachment blobs that are sweep ready.
 	 * @param sweepReadyBlobRoutes - The routes of blobs that are sweep ready and should be deleted. These routes will
@@ -742,11 +733,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 	 * @returns The routes of blobs that were deleted.
 	 */
 	public deleteSweepReadyNodes(sweepReadyBlobRoutes: readonly string[]): readonly string[] {
-		// If sweep for attachment blobs is not enabled, return empty list indicating nothing is deleted.
-		if (this.mc.config.getBoolean(disableAttachmentBlobSweepKey) === true) {
-			return [];
-		}
-
 		this.deleteBlobsFromRedirectTable(sweepReadyBlobRoutes);
 		return Array.from(sweepReadyBlobRoutes);
 	}