@fluidframework/container-loader 2.4.0-297027 → 2.4.0-297385

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/container-loader";
-export declare const pkgVersion = "2.4.0-297027";
+export declare const pkgVersion = "2.4.0-297385";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.4.0-297027";
+export const pkgVersion = "2.4.0-297385";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,kCAAkC,CAAC;AAC1D,MAAM,CAAC,MAAM,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/container-loader\";\nexport const pkgVersion = \"2.4.0-297027\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,kCAAkC,CAAC;AAC1D,MAAM,CAAC,MAAM,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/container-loader\";\nexport const pkgVersion = \"2.4.0-297385\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-loader",
-  "version": "2.4.0-297027",
+  "version": "2.4.0-297385",
   "description": "Fluid container loader",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -117,13 +117,13 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.4.0-297027",
-    "@fluidframework/container-definitions": "2.4.0-297027",
-    "@fluidframework/core-interfaces": "2.4.0-297027",
-    "@fluidframework/core-utils": "2.4.0-297027",
-    "@fluidframework/driver-definitions": "2.4.0-297027",
-    "@fluidframework/driver-utils": "2.4.0-297027",
-    "@fluidframework/telemetry-utils": "2.4.0-297027",
+    "@fluid-internal/client-utils": "2.4.0-297385",
+    "@fluidframework/container-definitions": "2.4.0-297385",
+    "@fluidframework/core-interfaces": "2.4.0-297385",
+    "@fluidframework/core-utils": "2.4.0-297385",
+    "@fluidframework/driver-definitions": "2.4.0-297385",
+    "@fluidframework/driver-utils": "2.4.0-297385",
+    "@fluidframework/telemetry-utils": "2.4.0-297385",
     "@types/events_pkg": "npm:@types/events@^3.0.0",
     "@ungap/structured-clone": "^1.2.0",
     "debug": "^4.3.4",
@@ -134,13 +134,13 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.2",
     "@biomejs/biome": "~1.8.3",
-    "@fluid-internal/client-utils": "2.4.0-297027",
-    "@fluid-internal/mocha-test-setup": "2.4.0-297027",
-    "@fluid-private/test-loader-utils": "2.4.0-297027",
+    "@fluid-internal/client-utils": "2.4.0-297385",
+    "@fluid-internal/mocha-test-setup": "2.4.0-297385",
+    "@fluid-private/test-loader-utils": "2.4.0-297385",
     "@fluid-tools/build-cli": "^0.46.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.46.0",
-    "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@2.3.0",
+    "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@~2.3.0",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
     "@microsoft/api-extractor": "7.47.8",
     "@types/debug": "^4.1.5",
@@ -166,7 +166,7 @@
   },
   "typeValidation": {
     "broken": {},
-    "entrypoint": "internal"
+    "entrypoint": "legacy"
   },
   "scripts": {
     "api": "fluid-build . --task api",

package/src/container.ts

@@ -1045,8 +1045,7 @@ export class Container
 	}
 
 	public dispose(error?: ICriticalContainerError): void {
-		this._deltaManager.dispose(error);
-		this.verifyClosed();
+		this.verifyClosedAfter(() => this._deltaManager.dispose(error));
 	}
 
 	public close(error?: ICriticalContainerError): void {
@@ -1054,20 +1053,30 @@ export class Container
 		// 2. We need to ensure that we deliver disconnect event to runtime properly. See connectionStateChanged
 		//    handler. We only deliver events if container fully loaded. Transitioning from "loading" ->
 		//    "closing" will lose that info (can also solve by tracking extra state).
-		this._deltaManager.close(error);
-		this.verifyClosed();
+		this.verifyClosedAfter(() => this._deltaManager.close(error));
 	}
 
-	private verifyClosed(): void {
-		assert(
-			this.connectionState === ConnectionState.Disconnected,
-			0x0cf /* "disconnect event was not raised!" */,
-		);
+	private verifyClosedAfterCalls = 0;
+	private verifyClosedAfter(callback: () => void): void {
+		this.verifyClosedAfterCalls++;
+		try {
+			callback();
+		} finally {
+			this.verifyClosedAfterCalls--;
+		}
 
-		assert(
-			this._lifecycleState === "closed" || this._lifecycleState === "disposed",
-			0x314 /* Container properly closed */,
-		);
+		// We only want to verify connectionState and lifecycleState after close/dispose has fully finished
+		if (this.verifyClosedAfterCalls === 0) {
+			assert(
+				this.connectionState === ConnectionState.Disconnected,
+				0x0cf /* "disconnect event was not raised!" */,
+			);
+
+			assert(
+				this._lifecycleState === "closed" || this._lifecycleState === "disposed",
+				0x314 /* Container properly closed */,
+			);
+		}
 	}
 
 	private closeCore(error?: ICriticalContainerError): void {

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.4.0-297027";
+export const pkgVersion = "2.4.0-297385";