diff --git a/packages/common/container-definitions/package.json b/packages/common/container-definitions/package.json index 374c255a4ff7..10d92d1120b0 100644 --- a/packages/common/container-definitions/package.json +++ b/packages/common/container-definitions/package.json @@ -114,6 +114,10 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {} + "broken": { + "Interface_IContainerContext": { + "backCompat": false + } + } } } diff --git a/packages/common/container-definitions/src/test/types/validateContainerDefinitionsPrevious.generated.ts b/packages/common/container-definitions/src/test/types/validateContainerDefinitionsPrevious.generated.ts index 9cd6778b923c..52936371f16c 100644 --- a/packages/common/container-definitions/src/test/types/validateContainerDefinitionsPrevious.generated.ts +++ b/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> /* diff --git a/packages/common/driver-definitions/api-report/driver-definitions.legacy.alpha.api.md b/packages/common/driver-definitions/api-report/driver-definitions.legacy.alpha.api.md index 5064f819b34b..42045242e411 100644 --- a/packages/common/driver-definitions/api-report/driver-definitions.legacy.alpha.api.md +++ b/packages/common/driver-definitions/api-report/driver-definitions.legacy.alpha.api.md @@ -291,7 +291,7 @@ export interface IDocumentStorageService extends Partial { getSnapshot?(snapshotFetchOptions?: ISnapshotFetchOptions): Promise; getSnapshotTree(version?: IVersion, scenarioName?: string): Promise; getVersions(versionId: string | null, count: number, scenarioName?: string, fetchSource?: FetchSource): Promise; - readonly policies?: IDocumentStorageServicePolicies; + readonly policies?: IDocumentStorageServicePolicies | undefined; readBlob(id: string): Promise; uploadSummaryWithContext(summary: ISummaryTree, context: ISummaryContext): Promise; } diff --git a/packages/common/driver-definitions/src/storage.ts b/packages/common/driver-definitions/src/storage.ts index 119dc8b28744..8ef0f412e4ff 100644 --- a/packages/common/driver-definitions/src/storage.ts +++ b/packages/common/driver-definitions/src/storage.ts @@ -154,7 +154,7 @@ export interface IDocumentStorageService extends Partial { /** * Policies implemented/instructed by driver. */ - readonly policies?: IDocumentStorageServicePolicies; + readonly policies?: IDocumentStorageServicePolicies | undefined; /** * Returns the snapshot tree. diff --git a/packages/framework/aqueduct/package.json b/packages/framework/aqueduct/package.json index 47575d8e6171..0d467b3fd3fb 100644 --- a/packages/framework/aqueduct/package.json +++ b/packages/framework/aqueduct/package.json @@ -155,6 +155,11 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {} + "broken": { + "Interface_IDataObjectProps": { + "backCompat": false, + "forwardCompat": false + } + } } } diff --git a/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts b/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts index 3a04451f7633..970ed5d780d4 100644 --- a/packages/framework/aqueduct/src/test/types/validateAqueductPrevious.generated.ts +++ b/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> /* @@ -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> /* diff --git a/packages/loader/driver-utils/package.json b/packages/loader/driver-utils/package.json index 72525758d42e..06002b26ded3 100644 --- a/packages/loader/driver-utils/package.json +++ b/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 + } + } } } diff --git a/packages/loader/driver-utils/src/documentStorageServiceProxy.ts b/packages/loader/driver-utils/src/documentStorageServiceProxy.ts index 4a27cc438d2b..b517d3b0e144 100644 --- a/packages/loader/driver-utils/src/documentStorageServiceProxy.ts +++ b/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; } diff --git a/packages/loader/driver-utils/src/network.ts b/packages/loader/driver-utils/src/network.ts index ef42e709621a..84f6c72ec58d 100644 --- a/packages/loader/driver-utils/src/network.ts +++ b/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"])); } diff --git a/packages/loader/driver-utils/src/prefetchDocumentStorageService.ts b/packages/loader/driver-utils/src/prefetchDocumentStorageService.ts index e99e5c60fe0c..61ba241e460d 100644 --- a/packages/loader/driver-utils/src/prefetchDocumentStorageService.ts +++ b/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>(); private prefetchEnabled = true; - public get policies() { + public get policies(): IDocumentStorageServicePolicies | undefined { const policies = this.internalStorageService.policies; if (policies) { return { ...policies, caching: LoaderCachingPolicy.NoCaching }; diff --git a/packages/loader/driver-utils/src/test/types/validateDriverUtilsPrevious.generated.ts b/packages/loader/driver-utils/src/test/types/validateDriverUtilsPrevious.generated.ts index 2b62c33267b9..18bdf90a8fa8 100644 --- a/packages/loader/driver-utils/src/test/types/validateDriverUtilsPrevious.generated.ts +++ b/packages/loader/driver-utils/src/test/types/validateDriverUtilsPrevious.generated.ts @@ -58,6 +58,7 @@ declare type old_as_current_for_Class_AuthorizationError = requireAssignableTo, TypeOnly> /* @@ -67,6 +68,7 @@ declare type current_as_old_for_Class_AuthorizationError = requireAssignableTo, TypeOnly> /* @@ -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> /* @@ -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> /* diff --git a/packages/runtime/container-runtime-definitions/package.json b/packages/runtime/container-runtime-definitions/package.json index aa358ada00f0..36688ff5074d 100644 --- a/packages/runtime/container-runtime-definitions/package.json +++ b/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 + } + } } } diff --git a/packages/runtime/container-runtime-definitions/src/test/types/validateContainerRuntimeDefinitionsPrevious.generated.ts b/packages/runtime/container-runtime-definitions/src/test/types/validateContainerRuntimeDefinitionsPrevious.generated.ts index 9bbbffcf9c05..5577a5db9a57 100644 --- a/packages/runtime/container-runtime-definitions/src/test/types/validateContainerRuntimeDefinitionsPrevious.generated.ts +++ b/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> /* @@ -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> diff --git a/packages/runtime/datastore-definitions/api-report/datastore-definitions.legacy.alpha.api.md b/packages/runtime/datastore-definitions/api-report/datastore-definitions.legacy.alpha.api.md index 878ba1bbf720..8da87e8e2ec7 100644 --- a/packages/runtime/datastore-definitions/api-report/datastore-definitions.legacy.alpha.api.md +++ b/packages/runtime/datastore-definitions/api-report/datastore-definitions.legacy.alpha.api.md @@ -88,7 +88,7 @@ export interface IFluidDataStoreRuntime extends IEventProvider, TypeOnly> /* diff --git a/packages/runtime/runtime-definitions/package.json b/packages/runtime/runtime-definitions/package.json index 89dc026c0d72..e91ddfd74613 100644 --- a/packages/runtime/runtime-definitions/package.json +++ b/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 + } + } } } diff --git a/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts b/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts index 0624f36e1e6b..9687c313b443 100644 --- a/packages/runtime/runtime-definitions/src/test/types/validateRuntimeDefinitionsPrevious.generated.ts +++ b/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> /* @@ -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> /* @@ -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> /* diff --git a/packages/runtime/runtime-utils/api-report/runtime-utils.legacy.alpha.api.md b/packages/runtime/runtime-utils/api-report/runtime-utils.legacy.alpha.api.md index 8c04ee518715..17aead66a64d 100644 --- a/packages/runtime/runtime-utils/api-report/runtime-utils.legacy.alpha.api.md +++ b/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) diff --git a/packages/runtime/runtime-utils/package.json b/packages/runtime/runtime-utils/package.json index 72a7aa8c007d..4293e1b4088e 100644 --- a/packages/runtime/runtime-utils/package.json +++ b/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 + } + } } } diff --git a/packages/runtime/runtime-utils/src/requestParser.ts b/packages/runtime/runtime-utils/src/requestParser.ts index 94ef33c5933e..f6328590f053 100644 --- a/packages/runtime/runtime-utils/src/requestParser.ts +++ b/packages/runtime/runtime-utils/src/requestParser.ts @@ -42,15 +42,16 @@ export class RequestParser implements IRequest { protected constructor(private readonly request: Readonly) { 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 diff --git a/packages/runtime/runtime-utils/src/test/types/validateRuntimeUtilsPrevious.generated.ts b/packages/runtime/runtime-utils/src/test/types/validateRuntimeUtilsPrevious.generated.ts index 8058a358cfba..d458c8d6c12d 100644 --- a/packages/runtime/runtime-utils/src/test/types/validateRuntimeUtilsPrevious.generated.ts +++ b/packages/runtime/runtime-utils/src/test/types/validateRuntimeUtilsPrevious.generated.ts @@ -166,6 +166,7 @@ declare type old_as_current_for_Class_RequestParser = requireAssignableTo, TypeOnly> /* @@ -175,6 +176,7 @@ declare type current_as_old_for_Class_RequestParser = requireAssignableTo, TypeOnly> /* diff --git a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md b/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md index 51248b4a6338..e8af0df00209 100644 --- a/packages/runtime/test-runtime-utils/api-report/test-runtime-utils.legacy.alpha.api.md +++ b/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) diff --git a/packages/runtime/test-runtime-utils/package.json b/packages/runtime/test-runtime-utils/package.json index 1fee979bc742..4be4dc542528 100644 --- a/packages/runtime/test-runtime-utils/package.json +++ b/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 + } + } } } diff --git a/packages/runtime/test-runtime-utils/src/mocks.ts b/packages/runtime/test-runtime-utils/src/mocks.ts index b1e0a9d19747..febbc577ffd6 100644 --- a/packages/runtime/test-runtime-utils/src/mocks.ts +++ b/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; diff --git a/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts b/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts index 6d7d57cb9608..60d9ee7629d0 100644 --- a/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts +++ b/packages/runtime/test-runtime-utils/src/test/types/validateTestRuntimeUtilsPrevious.generated.ts @@ -373,6 +373,7 @@ declare type old_as_current_for_Class_MockFluidDataStoreContext = requireAssigna * typeValidation.broken: * "Class_MockFluidDataStoreContext": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Class_MockFluidDataStoreContext = requireAssignableTo, TypeOnly> /* @@ -382,6 +383,7 @@ declare type current_as_old_for_Class_MockFluidDataStoreContext = requireAssigna * typeValidation.broken: * "ClassStatics_MockFluidDataStoreContext": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_ClassStatics_MockFluidDataStoreContext = requireAssignableTo, TypeOnly> /* @@ -391,6 +393,7 @@ declare type current_as_old_for_ClassStatics_MockFluidDataStoreContext = require * typeValidation.broken: * "Class_MockFluidDataStoreRuntime": {"forwardCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type old_as_current_for_Class_MockFluidDataStoreRuntime = requireAssignableTo, TypeOnly> /* @@ -400,6 +403,7 @@ declare type old_as_current_for_Class_MockFluidDataStoreRuntime = requireAssigna * typeValidation.broken: * "Class_MockFluidDataStoreRuntime": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Class_MockFluidDataStoreRuntime = requireAssignableTo, TypeOnly> /* @@ -409,6 +413,7 @@ declare type current_as_old_for_Class_MockFluidDataStoreRuntime = requireAssigna * typeValidation.broken: * "ClassStatics_MockFluidDataStoreRuntime": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_ClassStatics_MockFluidDataStoreRuntime = requireAssignableTo, TypeOnly> /* diff --git a/packages/test/test-utils/package.json b/packages/test/test-utils/package.json index 6ad6338b0c28..187cfe4b1946 100644 --- a/packages/test/test-utils/package.json +++ b/packages/test/test-utils/package.json @@ -167,6 +167,22 @@ "typescript": "~5.4.5" }, "typeValidation": { - "broken": {} + "broken": { + "Interface_IProvideTestFluidObject": { + "backCompat": false, + "forwardCompat": false + }, + "Interface_ITestFluidObject": { + "backCompat": false, + "forwardCompat": false + }, + "Class_TestFluidObject": { + "backCompat": false, + "forwardCompat": false + }, + "ClassStatics_TestFluidObject": { + "backCompat": false + } + } } } diff --git a/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts b/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts index 4c18c078a374..fd92d57ee667 100644 --- a/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts +++ b/packages/test/test-utils/src/test/types/validateTestUtilsPrevious.generated.ts @@ -139,6 +139,7 @@ declare type current_as_old_for_Interface_IOpProcessingController = requireAssig * typeValidation.broken: * "Interface_IProvideTestFluidObject": {"forwardCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type old_as_current_for_Interface_IProvideTestFluidObject = requireAssignableTo, TypeOnly> /* @@ -148,6 +149,7 @@ declare type old_as_current_for_Interface_IProvideTestFluidObject = requireAssig * typeValidation.broken: * "Interface_IProvideTestFluidObject": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_IProvideTestFluidObject = requireAssignableTo, TypeOnly> /* @@ -193,6 +195,7 @@ declare type current_as_old_for_Interface_ITestContainerConfig = requireAssignab * typeValidation.broken: * "Interface_ITestFluidObject": {"forwardCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type old_as_current_for_Interface_ITestFluidObject = requireAssignableTo, TypeOnly> /* @@ -202,6 +205,7 @@ declare type old_as_current_for_Interface_ITestFluidObject = requireAssignableTo * typeValidation.broken: * "Interface_ITestFluidObject": {"backCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type current_as_old_for_Interface_ITestFluidObject = requireAssignableTo, TypeOnly> /* @@ -328,6 +332,7 @@ declare type current_as_old_for_Variable_TestContainerRuntimeFactory = requireAs * typeValidation.broken: * "Class_TestFluidObject": {"forwardCompat": false} */ +// @ts-expect-error compatibility expected to be broken declare type old_as_current_for_Class_TestFluidObject = requireAssignableTo, TypeOnly> /* @@ -337,6 +342,7 @@ declare type old_as_current_for_Class_TestFluidObject = requireAssignableTo, TypeOnly> /* @@ -346,6 +352,7 @@ declare type current_as_old_for_Class_TestFluidObject = requireAssignableTo, TypeOnly> /*