fix(client): exactOptionalPropertyTypes clean up

packages/common/container-definitions/package.json

@@ -114,6 +114,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Interface_IContainerContext": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/common/container-definitions/src/test/types/validateContainerDefinitionsPrevious.generated.ts

@@ -238,6 +238,7 @@ declare type old_as_current_for_Interface_IContainerContext = requireAssignableT
  * typeValidation.broken:
  * "Interface_IContainerContext": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IContainerContext = requireAssignableTo<TypeOnly<current.IContainerContext>, TypeOnly<old.IContainerContext>>
 
 /*

packages/common/driver-definitions/api-report/driver-definitions.legacy.alpha.api.md

@@ -291,7 +291,7 @@ export interface IDocumentStorageService extends Partial<IDisposable> {
     getSnapshot?(snapshotFetchOptions?: ISnapshotFetchOptions): Promise<ISnapshot>;
     getSnapshotTree(version?: IVersion, scenarioName?: string): Promise<ISnapshotTree | null>;
     getVersions(versionId: string | null, count: number, scenarioName?: string, fetchSource?: FetchSource): Promise<IVersion[]>;
-    readonly policies?: IDocumentStorageServicePolicies;
+    readonly policies?: IDocumentStorageServicePolicies | undefined;
     readBlob(id: string): Promise<ArrayBufferLike>;
     uploadSummaryWithContext(summary: ISummaryTree, context: ISummaryContext): Promise<string>;
 }

packages/common/driver-definitions/src/storage.ts

@@ -154,7 +154,7 @@ export interface IDocumentStorageService extends Partial<IDisposable> {
 	/**
 	 * Policies implemented/instructed by driver.
 	 */
-	readonly policies?: IDocumentStorageServicePolicies;
+	readonly policies?: IDocumentStorageServicePolicies | undefined;
 
 	/**
 	 * Returns the snapshot tree.

packages/framework/aqueduct/package.json

@@ -155,6 +155,11 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Interface_IDataObjectProps": {
+				"backCompat": false,
+				"forwardCompat": false
+			}
+		}
 	}
 }

packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts

@@ -184,6 +184,7 @@ declare type current_as_old_for_Interface_DataObjectTypes = requireAssignableTo<
  * typeValidation.broken:
  * "Interface_IDataObjectProps": {"forwardCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type old_as_current_for_Interface_IDataObjectProps = requireAssignableTo<TypeOnly<old.IDataObjectProps>, TypeOnly<current.IDataObjectProps>>
 
 /*
@@ -193,6 +194,7 @@ declare type old_as_current_for_Interface_IDataObjectProps = requireAssignableTo
  * typeValidation.broken:
  * "Interface_IDataObjectProps": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IDataObjectProps = requireAssignableTo<TypeOnly<current.IDataObjectProps>, TypeOnly<old.IDataObjectProps>>
 
 /*

packages/loader/driver-utils/package.json

@@ -153,6 +153,19 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Class_AuthorizationError": {
+				"backCompat": false
+			},
+			"Class_PrefetchDocumentStorageService": {
+				"backCompat": false
+			},
+			"ClassStatics_AuthorizationError": {
+				"backCompat": false
+			},
+			"ClassStatics_PrefetchDocumentStorageService": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/loader/driver-utils/src/documentStorageServiceProxy.ts

@@ -27,7 +27,7 @@ export class DocumentStorageServiceProxy implements IDocumentStorageService {
 		this._policies = policies;
 	}
 
-	public get policies() {
+	public get policies(): IDocumentStorageServicePolicies | undefined {
 		return this._policies ?? this.internalStorageService.policies;
 	}
 

packages/loader/driver-utils/src/network.ts

@@ -112,14 +112,22 @@ export class AuthorizationError
 	implements IAuthorizationError, IFluidErrorBase
 {
 	readonly errorType = DriverErrorTypes.authorizationError;
+	readonly claims?: string;
+	readonly tenantId?: string;
 	readonly canRetry = false;
 
 	constructor(
 		message: string,
-		readonly claims: string | undefined,
-		readonly tenantId: string | undefined,
+		claims: string | undefined,
+		tenantId: string | undefined,
 		props: DriverErrorTelemetryProps,
 	) {
+		if (claims !== undefined) {
+			props.claims = claims;
+		}
+		if (tenantId !== undefined) {
+			props.tenantId = tenantId;
+		}
 		// don't log claims or tenantId
 		super(message, props, new Set(["claims", "tenantId"]));
 	}

packages/loader/driver-utils/src/prefetchDocumentStorageService.ts

@@ -3,11 +3,12 @@
  * Licensed under the MIT License.
  */
 
-import {
-	LoaderCachingPolicy,
+import type {
+	IDocumentStorageServicePolicies,
 	ISnapshotTree,
 	IVersion,
 } from "@fluidframework/driver-definitions/internal";
+import { LoaderCachingPolicy } from "@fluidframework/driver-definitions/internal";
 
 import { DocumentStorageServiceProxy } from "./documentStorageServiceProxy.js";
 import { canRetryOnError } from "./network.js";
@@ -20,7 +21,7 @@ export class PrefetchDocumentStorageService extends DocumentStorageServiceProxy
 	private readonly prefetchCache = new Map<string, Promise<ArrayBufferLike>>();
 	private prefetchEnabled = true;
 
-	public get policies() {
+	public get policies(): IDocumentStorageServicePolicies | undefined {
 		const policies = this.internalStorageService.policies;
 		if (policies) {
 			return { ...policies, caching: LoaderCachingPolicy.NoCaching };

packages/loader/driver-utils/src/test/types/validateDriverUtilsPrevious.generated.ts

@@ -58,6 +58,7 @@ declare type old_as_current_for_Class_AuthorizationError = requireAssignableTo<T
  * typeValidation.broken:
  * "Class_AuthorizationError": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Class_AuthorizationError = requireAssignableTo<TypeOnly<current.AuthorizationError>, TypeOnly<old.AuthorizationError>>
 
 /*
@@ -67,6 +68,7 @@ declare type current_as_old_for_Class_AuthorizationError = requireAssignableTo<T
  * typeValidation.broken:
  * "ClassStatics_AuthorizationError": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_ClassStatics_AuthorizationError = requireAssignableTo<TypeOnly<typeof current.AuthorizationError>, TypeOnly<typeof old.AuthorizationError>>
 
 /*
@@ -463,6 +465,7 @@ declare type old_as_current_for_Class_PrefetchDocumentStorageService = requireAs
  * typeValidation.broken:
  * "Class_PrefetchDocumentStorageService": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Class_PrefetchDocumentStorageService = requireAssignableTo<TypeOnly<current.PrefetchDocumentStorageService>, TypeOnly<old.PrefetchDocumentStorageService>>
 
 /*
@@ -472,6 +475,7 @@ declare type current_as_old_for_Class_PrefetchDocumentStorageService = requireAs
  * typeValidation.broken:
  * "ClassStatics_PrefetchDocumentStorageService": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_ClassStatics_PrefetchDocumentStorageService = requireAssignableTo<TypeOnly<typeof current.PrefetchDocumentStorageService>, TypeOnly<typeof old.PrefetchDocumentStorageService>>
 
 /*

packages/runtime/container-runtime-definitions/package.json

@@ -103,6 +103,13 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Interface_IContainerRuntime": {
+				"backCompat": false
+			},
+			"Interface_IContainerRuntimeWithResolveHandle_Deprecated": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/runtime/container-runtime-definitions/src/test/types/validateContainerRuntimeDefinitionsPrevious.generated.ts

@@ -31,6 +31,7 @@ declare type old_as_current_for_Interface_IContainerRuntime = requireAssignableT
  * typeValidation.broken:
  * "Interface_IContainerRuntime": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IContainerRuntime = requireAssignableTo<TypeOnly<current.IContainerRuntime>, TypeOnly<old.IContainerRuntime>>
 
 /*
@@ -85,4 +86,5 @@ declare type old_as_current_for_Interface_IContainerRuntimeWithResolveHandle_Dep
  * typeValidation.broken:
  * "Interface_IContainerRuntimeWithResolveHandle_Deprecated": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IContainerRuntimeWithResolveHandle_Deprecated = requireAssignableTo<TypeOnly<current.IContainerRuntimeWithResolveHandle_Deprecated>, TypeOnly<old.IContainerRuntimeWithResolveHandle_Deprecated>>

packages/runtime/datastore-definitions/api-report/datastore-definitions.legacy.alpha.api.md

@@ -88,7 +88,7 @@ export interface IFluidDataStoreRuntime extends IEventProvider<IFluidDataStoreRu
     // (undocumented)
     readonly id: string;
     // (undocumented)
-    readonly idCompressor?: IIdCompressor;
+    readonly idCompressor: IIdCompressor | undefined;
     // (undocumented)
     readonly IFluidHandleContext: IFluidHandleContext;
     // (undocumented)

packages/runtime/datastore-definitions/package.json

@@ -104,6 +104,10 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Interface_IFluidDataStoreRuntime": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/runtime/datastore-definitions/src/dataStoreRuntime.ts

@@ -74,7 +74,7 @@ export interface IFluidDataStoreRuntime
 	 */
 	readonly attachState: AttachState;
 
-	readonly idCompressor?: IIdCompressor;
+	readonly idCompressor: IIdCompressor | undefined;
 
 	/**
 	 * Returns the channel with the given id

packages/runtime/datastore-definitions/src/test/types/validateDatastoreDefinitionsPrevious.generated.ts

@@ -166,6 +166,7 @@ declare type current_as_old_for_TypeAlias_IDeltaManagerErased = requireAssignabl
  * typeValidation.broken:
  * "Interface_IFluidDataStoreRuntime": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IFluidDataStoreRuntime = requireAssignableTo<TypeOnly<current.IFluidDataStoreRuntime>, TypeOnly<old.IFluidDataStoreRuntime>>
 
 /*

packages/runtime/runtime-definitions/package.json

@@ -111,6 +111,16 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Interface_IFluidDataStoreContext": {
+				"backCompat": false
+			},
+			"Interface_IFluidDataStoreContextDetached": {
+				"backCompat": false
+			},
+			"Interface_IFluidParentContext": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts

@@ -337,6 +337,7 @@ declare type old_as_current_for_Interface_IFluidDataStoreContext = requireAssign
  * typeValidation.broken:
  * "Interface_IFluidDataStoreContext": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IFluidDataStoreContext = requireAssignableTo<TypeOnly<current.IFluidDataStoreContext>, TypeOnly<old.IFluidDataStoreContext>>
 
 /*
@@ -355,6 +356,7 @@ declare type old_as_current_for_Interface_IFluidDataStoreContextDetached = requi
  * typeValidation.broken:
  * "Interface_IFluidDataStoreContextDetached": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IFluidDataStoreContextDetached = requireAssignableTo<TypeOnly<current.IFluidDataStoreContextDetached>, TypeOnly<old.IFluidDataStoreContextDetached>>
 
 /*
@@ -427,6 +429,7 @@ declare type old_as_current_for_Interface_IFluidParentContext = requireAssignabl
  * typeValidation.broken:
  * "Interface_IFluidParentContext": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Interface_IFluidParentContext = requireAssignableTo<TypeOnly<current.IFluidParentContext>, TypeOnly<old.IFluidParentContext>>
 
 /*

packages/runtime/runtime-utils/api-report/runtime-utils.legacy.alpha.api.md

@@ -38,7 +38,7 @@ export class RequestParser implements IRequest {
     createSubRequest(startingPathIndex: number): IRequest;
     static getPathParts(url: string): readonly string[];
     // (undocumented)
-    get headers(): IRequestHeader | undefined;
+    readonly headers?: IRequestHeader;
     isLeaf(elements: number): boolean;
     get pathParts(): readonly string[];
     // (undocumented)

packages/runtime/runtime-utils/package.json

@@ -154,6 +154,13 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Class_RequestParser": {
+				"backCompat": false
+			},
+			"ClassStatics_RequestParser": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/runtime/runtime-utils/src/requestParser.ts

@@ -42,15 +42,16 @@ export class RequestParser implements IRequest {
 	protected constructor(private readonly request: Readonly<IRequest>) {
 		const queryStartIndex = this.request.url.indexOf("?");
 		this.query = queryStartIndex >= 0 ? this.request.url.substring(queryStartIndex) : "";
+		if (request.headers !== undefined) {
+			this.headers = request.headers;
+		}
 	}
 
 	public get url(): string {
 		return this.request.url;
 	}
 
-	public get headers(): IRequestHeader | undefined {
-		return this.request.headers;
-	}
+	public readonly headers?: IRequestHeader;
 
 	/**
 	 * Returns the decoded path parts of the request's url

packages/runtime/runtime-utils/src/test/types/validateRuntimeUtilsPrevious.generated.ts

@@ -166,6 +166,7 @@ declare type old_as_current_for_Class_RequestParser = requireAssignableTo<TypeOn
  * typeValidation.broken:
  * "Class_RequestParser": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_Class_RequestParser = requireAssignableTo<TypeOnly<current.RequestParser>, TypeOnly<old.RequestParser>>
 
 /*
@@ -175,6 +176,7 @@ declare type current_as_old_for_Class_RequestParser = requireAssignableTo<TypeOn
  * typeValidation.broken:
  * "ClassStatics_RequestParser": {"backCompat": false}
  */
+// @ts-expect-error compatibility expected to be broken
 declare type current_as_old_for_ClassStatics_RequestParser = requireAssignableTo<TypeOnly<typeof current.RequestParser>, TypeOnly<typeof old.RequestParser>>
 
 /*

packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md

@@ -426,7 +426,7 @@ export class MockFluidDataStoreRuntime extends EventEmitter implements IFluidDat
     // (undocumented)
     readonly id: string;
     // (undocumented)
-    idCompressor?: IIdCompressor & IIdCompressorCore;
+    idCompressor: (IIdCompressor & IIdCompressorCore) | undefined;
     // (undocumented)
     get IFluidHandleContext(): IFluidHandleContext;
     // (undocumented)

packages/runtime/test-runtime-utils/package.json

@@ -156,6 +156,20 @@
 		"typescript": "~5.4.5"
 	},
 	"typeValidation": {
-		"broken": {}
+		"broken": {
+			"Class_MockFluidDataStoreContext": {
+				"backCompat": false
+			},
+			"Class_MockFluidDataStoreRuntime": {
+				"backCompat": false,
+				"forwardCompat": false
+			},
+			"ClassStatics_MockFluidDataStoreContext": {
+				"backCompat": false
+			},
+			"ClassStatics_MockFluidDataStoreRuntime": {
+				"backCompat": false
+			}
+		}
 	}
 }

packages/runtime/test-runtime-utils/src/mocks.ts

@@ -854,7 +854,7 @@ export class MockFluidDataStoreRuntime
 	public quorum = new MockQuorumClients();
 	private readonly audience = new MockAudience();
 	public containerRuntime?: MockContainerRuntime;
-	public idCompressor?: IIdCompressor & IIdCompressorCore;
+	public idCompressor: (IIdCompressor & IIdCompressorCore) | undefined;
 	private readonly deltaConnections: MockDeltaConnection[] = [];
 	private readonly registry?: ReadonlyMap<string, IChannelFactory>;