@fluidframework/container-loader 2.0.0-dev-rc.1.0.0.232845 → 2.0.0-dev-rc.2.0.0.245554

package/lib/test/snapshotConversionTest.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshotConversionTest.spec.js","sourceRoot":"","sources":["../../src/test/snapshotConversionTest.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { ISummaryTree, SummaryType } from \"@fluidframework/protocol-definitions\";\nimport {\n\tcombineAppAndProtocolSummary,\n\tgetSnapshotTreeAndBlobsFromSerializedContainer,\n} from \"../utils.js\";\n\ndescribe(\"Dehydrate Container\", () => {\n\tconst protocolSummary: ISummaryTree = {\n\t\ttype: SummaryType.Tree,\n\t\ttree: {\n\t\t\tattributes: {\n\t\t\t\ttype: SummaryType.Blob,\n\t\t\t\tcontent: JSON.stringify(\"attributes\"),\n\t\t\t},\n\t\t\tquorumValues: {\n\t\t\t\ttype: SummaryType.Blob,\n\t\t\t\tcontent: JSON.stringify(\"quorumValues\"),\n\t\t\t},\n\t\t},\n\t};\n\tconst appSummary: ISummaryTree = {\n\t\ttype: SummaryType.Tree,\n\t\ttree: {\n\t\t\tdefault: {\n\t\t\t\ttype: SummaryType.Tree,\n\t\t\t\ttree: {\n\t\t\t\t\t\".component\": {\n\t\t\t\t\t\ttype: SummaryType.Blob,\n\t\t\t\t\t\tcontent: JSON.stringify(\"defaultDataStore\"),\n\t\t\t\t\t},\n\t\t\t\t\t\"root\": {\n\t\t\t\t\t\ttype: SummaryType.Tree,\n\t\t\t\t\t\ttree: {\n\t\t\t\t\t\t\tattributes: {\n\t\t\t\t\t\t\t\ttype: SummaryType.Blob,\n\t\t\t\t\t\t\t\tcontent: JSON.stringify(\"rootattributes\"),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t\t\"unref\": {\n\t\t\t\t\t\ttype: SummaryType.Tree,\n\t\t\t\t\t\ttree: {},\n\t\t\t\t\t\tunreferenced: true,\n\t\t\t\t\t},\n\t\t\t\t\t\"groupId\": {\n\t\t\t\t\t\ttype: SummaryType.Tree,\n\t\t\t\t\t\ttree: {},\n\t\t\t\t\t\tgroupId: \"group\",\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t},\n\t};\n\n\tit(\"Summary to snapshottree and snapshotBlobs conversion\", async () => {\n\t\tconst combinedSummary = combineAppAndProtocolSummary(appSummary, protocolSummary);\n\t\tconst { tree, blobs } = getSnapshotTreeAndBlobsFromSerializedContainer(combinedSummary);\n\n\t\tassert.strictEqual(Object.keys(tree.trees).length, 2, \"2 trees should be there\");\n\t\tassert.strictEqual(\n\t\t\tObject.keys(tree.trees[\".protocol\"].blobs).length,\n\t\t\t2,\n\t\t\t\"2 protocol blobs should be there.\",\n\t\t);\n\n\t\t// Validate the \".component\" blob.\n\t\tconst defaultDataStoreBlobId = tree.trees.default.blobs[\".component\"];\n\t\tconst defaultDataStoreBlob = blobs[defaultDataStoreBlobId];\n\t\tassert.strict(defaultDataStoreBlob, \"defaultDataStoreBlob undefined\");\n\t\tassert.strictEqual(\n\t\t\tJSON.parse(defaultDataStoreBlob),\n\t\t\t\"defaultDataStore\",\n\t\t\t\"The .component blob's content is incorrect\",\n\t\t);\n\n\t\t// Validate \"root\" sub-tree.\n\t\tconst rootAttributesBlobId = tree.trees.default.trees.root.blobs.attributes;\n\t\tconst rootAttributesBlob = blobs[rootAttributesBlobId];\n\t\tassert.strict(rootAttributesBlob, \"rootAttributesBlob undefined\");\n\t\tassert.strictEqual(\n\t\t\tJSON.parse(rootAttributesBlob),\n\t\t\t\"rootattributes\",\n\t\t\t\"The root sub-tree's content is incorrect\",\n\t\t);\n\t\tassert.strictEqual(\n\t\t\ttree.trees.default.trees.root.unreferenced,\n\t\t\tundefined,\n\t\t\t\"The root sub-tree should not be marked as unreferenced\",\n\t\t);\n\n\t\t// Validate \"unref\" sub-tree.\n\t\tassert.strictEqual(\n\t\t\ttree.trees.default.trees.unref.unreferenced,\n\t\t\ttrue,\n\t\t\t\"The unref sub-tree should be marked as unreferenced\",\n\t\t);\n\n\t\t// Validate \"groupId\" sub-tree.\n\t\tassert.strictEqual(\n\t\t\ttree.trees.default.trees.groupId.groupId,\n\t\t\t\"group\",\n\t\t\t\"The groupId sub-tree should have a groupId\",\n\t\t);\n\n\t\t// Validate \"groupId\" sub-tree.\n\t\tassert.strictEqual(\n\t\t\ttree.trees.default.trees.groupId.groupId,\n\t\t\t\"group\",\n\t\t\t\"The groupId sub-tree should have a groupId\",\n\t\t);\n\t});\n});\n"]}

package/lib/test/types/validateContainerLoaderPrevious.generated.js

@@ -0,0 +1,38 @@
+use_current_EnumDeclaration_ConnectionState(get_old_EnumDeclaration_ConnectionState());
+use_old_EnumDeclaration_ConnectionState(get_current_EnumDeclaration_ConnectionState());
+use_current_InterfaceDeclaration_ICodeDetailsLoader(get_old_InterfaceDeclaration_ICodeDetailsLoader());
+use_old_InterfaceDeclaration_ICodeDetailsLoader(get_current_InterfaceDeclaration_ICodeDetailsLoader());
+use_current_InterfaceDeclaration_IContainerExperimental(
+// @ts-expect-error compatibility expected to be broken
+get_old_InterfaceDeclaration_IContainerExperimental());
+use_old_InterfaceDeclaration_IContainerExperimental(get_current_InterfaceDeclaration_IContainerExperimental());
+use_current_TypeAliasDeclaration_IDetachedBlobStorage(get_old_TypeAliasDeclaration_IDetachedBlobStorage());
+use_old_TypeAliasDeclaration_IDetachedBlobStorage(get_current_TypeAliasDeclaration_IDetachedBlobStorage());
+use_current_InterfaceDeclaration_IFluidModuleWithDetails(get_old_InterfaceDeclaration_IFluidModuleWithDetails());
+use_old_InterfaceDeclaration_IFluidModuleWithDetails(get_current_InterfaceDeclaration_IFluidModuleWithDetails());
+use_current_InterfaceDeclaration_ILoaderOptions(get_old_InterfaceDeclaration_ILoaderOptions());
+use_old_InterfaceDeclaration_ILoaderOptions(get_current_InterfaceDeclaration_ILoaderOptions());
+use_current_InterfaceDeclaration_ILoaderProps(get_old_InterfaceDeclaration_ILoaderProps());
+use_old_InterfaceDeclaration_ILoaderProps(get_current_InterfaceDeclaration_ILoaderProps());
+use_current_InterfaceDeclaration_ILoaderServices(get_old_InterfaceDeclaration_ILoaderServices());
+use_old_InterfaceDeclaration_ILoaderServices(get_current_InterfaceDeclaration_ILoaderServices());
+use_current_InterfaceDeclaration_IParsedUrl(
+// @ts-expect-error compatibility expected to be broken
+get_old_InterfaceDeclaration_IParsedUrl());
+use_old_InterfaceDeclaration_IParsedUrl(get_current_InterfaceDeclaration_IParsedUrl());
+use_current_InterfaceDeclaration_IProtocolHandler(get_old_InterfaceDeclaration_IProtocolHandler());
+use_old_InterfaceDeclaration_IProtocolHandler(get_current_InterfaceDeclaration_IProtocolHandler());
+use_current_ClassDeclaration_Loader(get_old_ClassDeclaration_Loader());
+use_old_ClassDeclaration_Loader(get_current_ClassDeclaration_Loader());
+use_current_TypeAliasDeclaration_ProtocolHandlerBuilder(get_old_TypeAliasDeclaration_ProtocolHandlerBuilder());
+use_old_TypeAliasDeclaration_ProtocolHandlerBuilder(get_current_TypeAliasDeclaration_ProtocolHandlerBuilder());
+use_current_FunctionDeclaration_isLocationRedirectionError(get_old_FunctionDeclaration_isLocationRedirectionError());
+use_old_FunctionDeclaration_isLocationRedirectionError(get_current_FunctionDeclaration_isLocationRedirectionError());
+use_current_FunctionDeclaration_resolveWithLocationRedirectionHandling(get_old_FunctionDeclaration_resolveWithLocationRedirectionHandling());
+use_old_FunctionDeclaration_resolveWithLocationRedirectionHandling(get_current_FunctionDeclaration_resolveWithLocationRedirectionHandling());
+use_current_FunctionDeclaration_tryParseCompatibleResolvedUrl(get_old_FunctionDeclaration_tryParseCompatibleResolvedUrl());
+use_old_FunctionDeclaration_tryParseCompatibleResolvedUrl(get_current_FunctionDeclaration_tryParseCompatibleResolvedUrl());
+use_current_FunctionDeclaration_waitContainerToCatchUp(get_old_FunctionDeclaration_waitContainerToCatchUp());
+use_old_FunctionDeclaration_waitContainerToCatchUp(get_current_FunctionDeclaration_waitContainerToCatchUp());
+export {};
+//# sourceMappingURL=validateContainerLoaderPrevious.generated.js.map

package/lib/test/types/validateContainerLoaderPrevious.generated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateContainerLoaderPrevious.generated.js","sourceRoot":"","sources":["../../../src/test/types/validateContainerLoaderPrevious.generated.ts"],"names":[],"mappings":"AAgCA,2CAA2C,CACvC,uCAAuC,EAAE,CAAC,CAAC;AAW/C,uCAAuC,CACnC,2CAA2C,EAAE,CAAC,CAAC;AAWnD,mDAAmD,CAC/C,+CAA+C,EAAE,CAAC,CAAC;AAWvD,+CAA+C,CAC3C,mDAAmD,EAAE,CAAC,CAAC;AAW3D,uDAAuD;AACnD,uDAAuD;AACvD,mDAAmD,EAAE,CAAC,CAAC;AAW3D,mDAAmD,CAC/C,uDAAuD,EAAE,CAAC,CAAC;AAW/D,qDAAqD,CACjD,iDAAiD,EAAE,CAAC,CAAC;AAWzD,iDAAiD,CAC7C,qDAAqD,EAAE,CAAC,CAAC;AAW7D,wDAAwD,CACpD,oDAAoD,EAAE,CAAC,CAAC;AAW5D,oDAAoD,CAChD,wDAAwD,EAAE,CAAC,CAAC;AAWhE,+CAA+C,CAC3C,2CAA2C,EAAE,CAAC,CAAC;AAWnD,2CAA2C,CACvC,+CAA+C,EAAE,CAAC,CAAC;AAWvD,6CAA6C,CACzC,yCAAyC,EAAE,CAAC,CAAC;AAWjD,yCAAyC,CACrC,6CAA6C,EAAE,CAAC,CAAC;AAWrD,gDAAgD,CAC5C,4CAA4C,EAAE,CAAC,CAAC;AAWpD,4CAA4C,CACxC,gDAAgD,EAAE,CAAC,CAAC;AAWxD,2CAA2C;AACvC,uDAAuD;AACvD,uCAAuC,EAAE,CAAC,CAAC;AAW/C,uCAAuC,CACnC,2CAA2C,EAAE,CAAC,CAAC;AAWnD,iDAAiD,CAC7C,6CAA6C,EAAE,CAAC,CAAC;AAWrD,6CAA6C,CACzC,iDAAiD,EAAE,CAAC,CAAC;AAWzD,mCAAmC,CAC/B,+BAA+B,EAAE,CAAC,CAAC;AAWvC,+BAA+B,CAC3B,mCAAmC,EAAE,CAAC,CAAC;AAW3C,uDAAuD,CACnD,mDAAmD,EAAE,CAAC,CAAC;AAW3D,mDAAmD,CAC/C,uDAAuD,EAAE,CAAC,CAAC;AAW/D,0DAA0D,CACtD,sDAAsD,EAAE,CAAC,CAAC;AAW9D,sDAAsD,CAClD,0DAA0D,EAAE,CAAC,CAAC;AAWlE,sEAAsE,CAClE,kEAAkE,EAAE,CAAC,CAAC;AAW1E,kEAAkE,CAC9D,sEAAsE,EAAE,CAAC,CAAC;AAW9E,6DAA6D,CACzD,yDAAyD,EAAE,CAAC,CAAC;AAWjE,yDAAyD,CACrD,6DAA6D,EAAE,CAAC,CAAC;AAWrE,sDAAsD,CAClD,kDAAkD,EAAE,CAAC,CAAC;AAW1D,kDAAkD,CAC9C,sDAAsD,EAAE,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/*\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n * Generated by fluid-type-test-generator in @fluidframework/build-tools.\n */\nimport type * as old from \"@fluidframework/container-loader-previous\";\nimport type * as current from \"../../index.js\";\n\n\n// See 'build-tools/src/type-test-generator/compatibility.ts' for more information.\ntype TypeOnly<T> = T extends number\n\t? number\n\t: T extends string\n\t? string\n\t: T extends boolean | bigint | symbol\n\t? T\n\t: {\n\t\t\t[P in keyof T]: TypeOnly<T[P]>;\n\t  };\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"EnumDeclaration_ConnectionState\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_EnumDeclaration_ConnectionState():\n    TypeOnly<old.ConnectionState>;\ndeclare function use_current_EnumDeclaration_ConnectionState(\n    use: TypeOnly<current.ConnectionState>): void;\nuse_current_EnumDeclaration_ConnectionState(\n    get_old_EnumDeclaration_ConnectionState());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"EnumDeclaration_ConnectionState\": {\"backCompat\": false}\n*/\ndeclare function get_current_EnumDeclaration_ConnectionState():\n    TypeOnly<current.ConnectionState>;\ndeclare function use_old_EnumDeclaration_ConnectionState(\n    use: TypeOnly<old.ConnectionState>): void;\nuse_old_EnumDeclaration_ConnectionState(\n    get_current_EnumDeclaration_ConnectionState());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ICodeDetailsLoader\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_ICodeDetailsLoader():\n    TypeOnly<old.ICodeDetailsLoader>;\ndeclare function use_current_InterfaceDeclaration_ICodeDetailsLoader(\n    use: TypeOnly<current.ICodeDetailsLoader>): void;\nuse_current_InterfaceDeclaration_ICodeDetailsLoader(\n    get_old_InterfaceDeclaration_ICodeDetailsLoader());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ICodeDetailsLoader\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_ICodeDetailsLoader():\n    TypeOnly<current.ICodeDetailsLoader>;\ndeclare function use_old_InterfaceDeclaration_ICodeDetailsLoader(\n    use: TypeOnly<old.ICodeDetailsLoader>): void;\nuse_old_InterfaceDeclaration_ICodeDetailsLoader(\n    get_current_InterfaceDeclaration_ICodeDetailsLoader());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IContainerExperimental\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_IContainerExperimental():\n    TypeOnly<old.IContainerExperimental>;\ndeclare function use_current_InterfaceDeclaration_IContainerExperimental(\n    use: TypeOnly<current.IContainerExperimental>): void;\nuse_current_InterfaceDeclaration_IContainerExperimental(\n    // @ts-expect-error compatibility expected to be broken\n    get_old_InterfaceDeclaration_IContainerExperimental());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IContainerExperimental\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_IContainerExperimental():\n    TypeOnly<current.IContainerExperimental>;\ndeclare function use_old_InterfaceDeclaration_IContainerExperimental(\n    use: TypeOnly<old.IContainerExperimental>): void;\nuse_old_InterfaceDeclaration_IContainerExperimental(\n    get_current_InterfaceDeclaration_IContainerExperimental());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"TypeAliasDeclaration_IDetachedBlobStorage\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_TypeAliasDeclaration_IDetachedBlobStorage():\n    TypeOnly<old.IDetachedBlobStorage>;\ndeclare function use_current_TypeAliasDeclaration_IDetachedBlobStorage(\n    use: TypeOnly<current.IDetachedBlobStorage>): void;\nuse_current_TypeAliasDeclaration_IDetachedBlobStorage(\n    get_old_TypeAliasDeclaration_IDetachedBlobStorage());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"TypeAliasDeclaration_IDetachedBlobStorage\": {\"backCompat\": false}\n*/\ndeclare function get_current_TypeAliasDeclaration_IDetachedBlobStorage():\n    TypeOnly<current.IDetachedBlobStorage>;\ndeclare function use_old_TypeAliasDeclaration_IDetachedBlobStorage(\n    use: TypeOnly<old.IDetachedBlobStorage>): void;\nuse_old_TypeAliasDeclaration_IDetachedBlobStorage(\n    get_current_TypeAliasDeclaration_IDetachedBlobStorage());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IFluidModuleWithDetails\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_IFluidModuleWithDetails():\n    TypeOnly<old.IFluidModuleWithDetails>;\ndeclare function use_current_InterfaceDeclaration_IFluidModuleWithDetails(\n    use: TypeOnly<current.IFluidModuleWithDetails>): void;\nuse_current_InterfaceDeclaration_IFluidModuleWithDetails(\n    get_old_InterfaceDeclaration_IFluidModuleWithDetails());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IFluidModuleWithDetails\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_IFluidModuleWithDetails():\n    TypeOnly<current.IFluidModuleWithDetails>;\ndeclare function use_old_InterfaceDeclaration_IFluidModuleWithDetails(\n    use: TypeOnly<old.IFluidModuleWithDetails>): void;\nuse_old_InterfaceDeclaration_IFluidModuleWithDetails(\n    get_current_InterfaceDeclaration_IFluidModuleWithDetails());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ILoaderOptions\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_ILoaderOptions():\n    TypeOnly<old.ILoaderOptions>;\ndeclare function use_current_InterfaceDeclaration_ILoaderOptions(\n    use: TypeOnly<current.ILoaderOptions>): void;\nuse_current_InterfaceDeclaration_ILoaderOptions(\n    get_old_InterfaceDeclaration_ILoaderOptions());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ILoaderOptions\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_ILoaderOptions():\n    TypeOnly<current.ILoaderOptions>;\ndeclare function use_old_InterfaceDeclaration_ILoaderOptions(\n    use: TypeOnly<old.ILoaderOptions>): void;\nuse_old_InterfaceDeclaration_ILoaderOptions(\n    get_current_InterfaceDeclaration_ILoaderOptions());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ILoaderProps\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_ILoaderProps():\n    TypeOnly<old.ILoaderProps>;\ndeclare function use_current_InterfaceDeclaration_ILoaderProps(\n    use: TypeOnly<current.ILoaderProps>): void;\nuse_current_InterfaceDeclaration_ILoaderProps(\n    get_old_InterfaceDeclaration_ILoaderProps());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ILoaderProps\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_ILoaderProps():\n    TypeOnly<current.ILoaderProps>;\ndeclare function use_old_InterfaceDeclaration_ILoaderProps(\n    use: TypeOnly<old.ILoaderProps>): void;\nuse_old_InterfaceDeclaration_ILoaderProps(\n    get_current_InterfaceDeclaration_ILoaderProps());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ILoaderServices\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_ILoaderServices():\n    TypeOnly<old.ILoaderServices>;\ndeclare function use_current_InterfaceDeclaration_ILoaderServices(\n    use: TypeOnly<current.ILoaderServices>): void;\nuse_current_InterfaceDeclaration_ILoaderServices(\n    get_old_InterfaceDeclaration_ILoaderServices());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ILoaderServices\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_ILoaderServices():\n    TypeOnly<current.ILoaderServices>;\ndeclare function use_old_InterfaceDeclaration_ILoaderServices(\n    use: TypeOnly<old.ILoaderServices>): void;\nuse_old_InterfaceDeclaration_ILoaderServices(\n    get_current_InterfaceDeclaration_ILoaderServices());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IParsedUrl\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_IParsedUrl():\n    TypeOnly<old.IParsedUrl>;\ndeclare function use_current_InterfaceDeclaration_IParsedUrl(\n    use: TypeOnly<current.IParsedUrl>): void;\nuse_current_InterfaceDeclaration_IParsedUrl(\n    // @ts-expect-error compatibility expected to be broken\n    get_old_InterfaceDeclaration_IParsedUrl());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IParsedUrl\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_IParsedUrl():\n    TypeOnly<current.IParsedUrl>;\ndeclare function use_old_InterfaceDeclaration_IParsedUrl(\n    use: TypeOnly<old.IParsedUrl>): void;\nuse_old_InterfaceDeclaration_IParsedUrl(\n    get_current_InterfaceDeclaration_IParsedUrl());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IProtocolHandler\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_IProtocolHandler():\n    TypeOnly<old.IProtocolHandler>;\ndeclare function use_current_InterfaceDeclaration_IProtocolHandler(\n    use: TypeOnly<current.IProtocolHandler>): void;\nuse_current_InterfaceDeclaration_IProtocolHandler(\n    get_old_InterfaceDeclaration_IProtocolHandler());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_IProtocolHandler\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_IProtocolHandler():\n    TypeOnly<current.IProtocolHandler>;\ndeclare function use_old_InterfaceDeclaration_IProtocolHandler(\n    use: TypeOnly<old.IProtocolHandler>): void;\nuse_old_InterfaceDeclaration_IProtocolHandler(\n    get_current_InterfaceDeclaration_IProtocolHandler());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_Loader\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_ClassDeclaration_Loader():\n    TypeOnly<old.Loader>;\ndeclare function use_current_ClassDeclaration_Loader(\n    use: TypeOnly<current.Loader>): void;\nuse_current_ClassDeclaration_Loader(\n    get_old_ClassDeclaration_Loader());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_Loader\": {\"backCompat\": false}\n*/\ndeclare function get_current_ClassDeclaration_Loader():\n    TypeOnly<current.Loader>;\ndeclare function use_old_ClassDeclaration_Loader(\n    use: TypeOnly<old.Loader>): void;\nuse_old_ClassDeclaration_Loader(\n    get_current_ClassDeclaration_Loader());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"TypeAliasDeclaration_ProtocolHandlerBuilder\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_TypeAliasDeclaration_ProtocolHandlerBuilder():\n    TypeOnly<old.ProtocolHandlerBuilder>;\ndeclare function use_current_TypeAliasDeclaration_ProtocolHandlerBuilder(\n    use: TypeOnly<current.ProtocolHandlerBuilder>): void;\nuse_current_TypeAliasDeclaration_ProtocolHandlerBuilder(\n    get_old_TypeAliasDeclaration_ProtocolHandlerBuilder());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"TypeAliasDeclaration_ProtocolHandlerBuilder\": {\"backCompat\": false}\n*/\ndeclare function get_current_TypeAliasDeclaration_ProtocolHandlerBuilder():\n    TypeOnly<current.ProtocolHandlerBuilder>;\ndeclare function use_old_TypeAliasDeclaration_ProtocolHandlerBuilder(\n    use: TypeOnly<old.ProtocolHandlerBuilder>): void;\nuse_old_TypeAliasDeclaration_ProtocolHandlerBuilder(\n    get_current_TypeAliasDeclaration_ProtocolHandlerBuilder());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_isLocationRedirectionError\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_isLocationRedirectionError():\n    TypeOnly<typeof old.isLocationRedirectionError>;\ndeclare function use_current_FunctionDeclaration_isLocationRedirectionError(\n    use: TypeOnly<typeof current.isLocationRedirectionError>): void;\nuse_current_FunctionDeclaration_isLocationRedirectionError(\n    get_old_FunctionDeclaration_isLocationRedirectionError());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_isLocationRedirectionError\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_isLocationRedirectionError():\n    TypeOnly<typeof current.isLocationRedirectionError>;\ndeclare function use_old_FunctionDeclaration_isLocationRedirectionError(\n    use: TypeOnly<typeof old.isLocationRedirectionError>): void;\nuse_old_FunctionDeclaration_isLocationRedirectionError(\n    get_current_FunctionDeclaration_isLocationRedirectionError());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_resolveWithLocationRedirectionHandling\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_resolveWithLocationRedirectionHandling():\n    TypeOnly<typeof old.resolveWithLocationRedirectionHandling>;\ndeclare function use_current_FunctionDeclaration_resolveWithLocationRedirectionHandling(\n    use: TypeOnly<typeof current.resolveWithLocationRedirectionHandling>): void;\nuse_current_FunctionDeclaration_resolveWithLocationRedirectionHandling(\n    get_old_FunctionDeclaration_resolveWithLocationRedirectionHandling());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_resolveWithLocationRedirectionHandling\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_resolveWithLocationRedirectionHandling():\n    TypeOnly<typeof current.resolveWithLocationRedirectionHandling>;\ndeclare function use_old_FunctionDeclaration_resolveWithLocationRedirectionHandling(\n    use: TypeOnly<typeof old.resolveWithLocationRedirectionHandling>): void;\nuse_old_FunctionDeclaration_resolveWithLocationRedirectionHandling(\n    get_current_FunctionDeclaration_resolveWithLocationRedirectionHandling());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_tryParseCompatibleResolvedUrl\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_tryParseCompatibleResolvedUrl():\n    TypeOnly<typeof old.tryParseCompatibleResolvedUrl>;\ndeclare function use_current_FunctionDeclaration_tryParseCompatibleResolvedUrl(\n    use: TypeOnly<typeof current.tryParseCompatibleResolvedUrl>): void;\nuse_current_FunctionDeclaration_tryParseCompatibleResolvedUrl(\n    get_old_FunctionDeclaration_tryParseCompatibleResolvedUrl());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_tryParseCompatibleResolvedUrl\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_tryParseCompatibleResolvedUrl():\n    TypeOnly<typeof current.tryParseCompatibleResolvedUrl>;\ndeclare function use_old_FunctionDeclaration_tryParseCompatibleResolvedUrl(\n    use: TypeOnly<typeof old.tryParseCompatibleResolvedUrl>): void;\nuse_old_FunctionDeclaration_tryParseCompatibleResolvedUrl(\n    get_current_FunctionDeclaration_tryParseCompatibleResolvedUrl());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_waitContainerToCatchUp\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_waitContainerToCatchUp():\n    TypeOnly<typeof old.waitContainerToCatchUp>;\ndeclare function use_current_FunctionDeclaration_waitContainerToCatchUp(\n    use: TypeOnly<typeof current.waitContainerToCatchUp>): void;\nuse_current_FunctionDeclaration_waitContainerToCatchUp(\n    get_old_FunctionDeclaration_waitContainerToCatchUp());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_waitContainerToCatchUp\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_waitContainerToCatchUp():\n    TypeOnly<typeof current.waitContainerToCatchUp>;\ndeclare function use_old_FunctionDeclaration_waitContainerToCatchUp(\n    use: TypeOnly<typeof old.waitContainerToCatchUp>): void;\nuse_old_FunctionDeclaration_waitContainerToCatchUp(\n    get_current_FunctionDeclaration_waitContainerToCatchUp());\n"]}

package/lib/test/utils.spec.js

@@ -0,0 +1,31 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { strict as assert } from "assert";
+import { runSingle } from "../utils.js";
+describe("container-loader utils", () => {
+    describe("runSingle", () => {
+        it("correctly calls internal func", async () => {
+            const wrappedFunc = runSingle(async (base, plus) => base + plus);
+            assert.strictEqual(await wrappedFunc(4, 1), 5);
+        });
+        it("returns same promise for same args", async () => {
+            const wrappedFunc = runSingle(async (base, plus) => base + plus);
+            const [p1, p2] = [wrappedFunc(4, 1), wrappedFunc(4, 1)];
+            assert.strictEqual(p2, p1);
+            assert.strictEqual(await p1, 5);
+            assert.strictEqual(await p2, 5);
+        });
+        it("fails for different args", async () => {
+            const wrappedFunc = runSingle(async (base, plus) => base + plus);
+            const [p1, p2] = [wrappedFunc(4, 1), wrappedFunc(4, 2)];
+            assert.notStrictEqual(p2, p1);
+            assert.strictEqual(await p1, 5);
+            await p2
+                .then(() => assert.fail("should fail"))
+                .catch((e) => assert.strictEqual(e.message, "Subsequent calls cannot use different arguments."));
+        });
+    });
+});
+//# sourceMappingURL=utils.spec.js.map

package/lib/test/utils.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../../src/test/utils.spec.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACvC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;YAEjF,MAAM,CAAC,WAAW,CAAC,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;YAEjF,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAExD,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3B,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;YAChC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;YAEjF,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAExD,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9B,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;YAChC,MAAM,EAAE;iBACN,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBACtC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE,CACnB,MAAM,CAAC,WAAW,CACjB,CAAC,CAAC,OAAO,EACT,kDAAkD,CAClD,CACD,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"assert\";\nimport { runSingle } from \"../utils.js\";\n\ndescribe(\"container-loader utils\", () => {\n\tdescribe(\"runSingle\", () => {\n\t\tit(\"correctly calls internal func\", async () => {\n\t\t\tconst wrappedFunc = runSingle(async (base: number, plus: number) => base + plus);\n\n\t\t\tassert.strictEqual(await wrappedFunc(4, 1), 5);\n\t\t});\n\n\t\tit(\"returns same promise for same args\", async () => {\n\t\t\tconst wrappedFunc = runSingle(async (base: number, plus: number) => base + plus);\n\n\t\t\tconst [p1, p2] = [wrappedFunc(4, 1), wrappedFunc(4, 1)];\n\n\t\t\tassert.strictEqual(p2, p1);\n\t\t\tassert.strictEqual(await p1, 5);\n\t\t\tassert.strictEqual(await p2, 5);\n\t\t});\n\n\t\tit(\"fails for different args\", async () => {\n\t\t\tconst wrappedFunc = runSingle(async (base: number, plus: number) => base + plus);\n\n\t\t\tconst [p1, p2] = [wrappedFunc(4, 1), wrappedFunc(4, 2)];\n\n\t\t\tassert.notStrictEqual(p2, p1);\n\t\t\tassert.strictEqual(await p1, 5);\n\t\t\tawait p2\n\t\t\t\t.then(() => assert.fail(\"should fail\"))\n\t\t\t\t.catch((e: Error) =>\n\t\t\t\t\tassert.strictEqual(\n\t\t\t\t\t\te.message,\n\t\t\t\t\t\t\"Subsequent calls cannot use different arguments.\",\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t});\n\t});\n});\n"]}

package/lib/{utils.d.mts → utils.d.ts}

@@ -4,8 +4,8 @@
  */
 import { ISummaryTree, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import { CombinedAppAndProtocolSummary, DeltaStreamConnectionForbiddenError } from "@fluidframework/driver-utils";
-import { ISerializableBlobContents } from "./containerStorageAdapter.mjs";
-import { IPendingDetachedContainerState } from "./container.mjs";
+import { ISerializableBlobContents } from "./containerStorageAdapter.js";
+import { IPendingDetachedContainerState } from "./container.js";
 export interface ISnapshotTreeWithBlobContents extends ISnapshotTree {
     blobsContents: {
         [path: string]: ArrayBufferLike;
@@ -34,11 +34,10 @@ export interface IParsedUrl {
      */
     query: string;
     /**
-     * Null means do not use snapshots, undefined means load latest snapshot
-     * otherwise it's version ID passed to IDocumentStorageService.getVersions() to figure out what snapshot to use.
-     * If needed, can add undefined which is treated by Container.load() as load latest snapshot.
+     * Undefined means load latest snapshot, otherwise it's version ID passed to IDocumentStorageService.getVersions()
+     * to figure out what snapshot to use.
      */
-    version: string | null | undefined;
+    version: string | undefined;
 }
 /**
  * Utility api to parse the IResolvedUrl.url into specific parts like querystring, path to get
@@ -70,4 +69,4 @@ export declare function getDetachedContainerStateFromSerializedContainer(seriali
  * If there are multiple calls they will all get the same promise to wait on.
  */
 export declare const runSingle: <A extends any[], R>(func: (...args: A) => Promise<R>) => (...args: A) => Promise<R>;
-//# sourceMappingURL=utils.d.mts.map
+//# sourceMappingURL=utils.d.ts.map

package/lib/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAe,MAAM,sCAAsC,CAAC;AAEhG,OAAO,EACN,6BAA6B,EAC7B,mCAAmC,EAEnC,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAIhE,MAAM,WAAW,6BAA8B,SAAQ,aAAa;IACnE,aAAa,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAC;IACnD,KAAK,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAC;CACzD;AAED;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IAC1B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAiBjF;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC3C,UAAU,EAAE,YAAY,EACxB,eAAe,EAAE,YAAY,GAC3B,6BAA6B,CAiB/B;AA2ED,eAAO,MAAM,8CAA8C,8BAC/B,YAAY,KACrC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,yBAAyB,CAAA;CAYzD,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAE9E;AAED,eAAO,MAAM,mCAAmC,iBACjC,aAAa,iBACZ,yBAAyB,KACtC,6BAwBF,CAAC;AAEF,wBAAgB,qCAAqC,CACpD,KAAK,EAAE,GAAG,GACR,KAAK,IAAI,mCAAmC,CAM9C;AAoBD,wBAAgB,gDAAgD,CAC/D,mBAAmB,EAAE,MAAM,GACzB,8BAA8B,CAkBhC;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,sFAsBrB,CAAC"}

package/lib/{utils.mjs → utils.js}

@@ -2,7 +2,6 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { parse } from "url";
 import { v4 as uuid } from "uuid";
 import { Uint8ArrayToString, stringToBuffer } from "@fluid-internal/client-utils";
 import { assert, compareArrays, unreachableCase } from "@fluidframework/core-utils";
@@ -20,7 +19,7 @@ import { DriverErrorTypes } from "@fluidframework/driver-definitions";
  * @internal
  */
 export function tryParseCompatibleResolvedUrl(url) {
-    const parsed = parse(url, true);
+    const parsed = new URL(url);
     if (typeof parsed.pathname !== "string") {
         throw new LoggingError("Failed to parse pathname");
     }
@@ -28,7 +27,13 @@ export function tryParseCompatibleResolvedUrl(url) {
     const regex = /^\/([^/]*\/[^/]*)(\/?.*)$/;
     const match = regex.exec(parsed.pathname);
     return match?.length === 3
-        ? { id: match[1], path: match[2], query, version: parsed.query.version }
+        ? {
+            id: match[1],
+            path: match[2],
+            query,
+            // URLSearchParams returns null if the param is not provided.
+            version: parsed.searchParams.get("version") ?? undefined,
+        }
         : undefined;
 }
 /**
@@ -61,6 +66,7 @@ function convertSummaryToSnapshotAndBlobs(summary) {
         trees: {},
         id: uuid(),
         unreferenced: summary.unreferenced,
+        groupId: summary.groupId,
     };
     const keys = Object.keys(summary.tree);
     for (const key of keys) {
@@ -109,7 +115,7 @@ function convertProtocolAndAppSummaryToSnapshotAndBlobs(protocolSummaryTree, app
     return snapshotTreeWithBlobContents;
 }
 export const getSnapshotTreeAndBlobsFromSerializedContainer = (detachedContainerSnapshot) => {
-    assert(isCombinedAppAndProtocolSummary(detachedContainerSnapshot), "Protocol and App summary trees should be present");
+    assert(isCombinedAppAndProtocolSummary(detachedContainerSnapshot), 0x8e6 /* Protocol and App summary trees should be present */);
     const protocolSummaryTree = detachedContainerSnapshot.tree[".protocol"];
     const appSummaryTree = detachedContainerSnapshot.tree[".app"];
     const snapshotTreeWithBlobContents = convertProtocolAndAppSummaryToSnapshotAndBlobs(protocolSummaryTree, appSummaryTree);
@@ -197,4 +203,4 @@ export const runSingle = (func) => {
         return running.result;
     };
 };
-//# sourceMappingURL=utils.mjs.map
+//# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { v4 as uuid } from \"uuid\";\nimport { Uint8ArrayToString, stringToBuffer } from \"@fluid-internal/client-utils\";\nimport { assert, compareArrays, unreachableCase } from \"@fluidframework/core-utils\";\nimport { ISummaryTree, ISnapshotTree, SummaryType } from \"@fluidframework/protocol-definitions\";\nimport { LoggingError, UsageError } from \"@fluidframework/telemetry-utils\";\nimport {\n\tCombinedAppAndProtocolSummary,\n\tDeltaStreamConnectionForbiddenError,\n\tisCombinedAppAndProtocolSummary,\n} from \"@fluidframework/driver-utils\";\nimport { DriverErrorTypes } from \"@fluidframework/driver-definitions\";\nimport { ISerializableBlobContents } from \"./containerStorageAdapter.js\";\nimport { IPendingDetachedContainerState } from \"./container.js\";\n\n// This is used when we rehydrate a container from the snapshot. Here we put the blob contents\n// in separate property: blobContents.\nexport interface ISnapshotTreeWithBlobContents extends ISnapshotTree {\n\tblobsContents: { [path: string]: ArrayBufferLike };\n\ttrees: { [path: string]: ISnapshotTreeWithBlobContents };\n}\n\n/**\n * Interface to represent the parsed parts of IResolvedUrl.url to help\n * in getting info about different parts of the url.\n * May not be compatible or relevant for any Url Resolver\n * @internal\n */\nexport interface IParsedUrl {\n\t/**\n\t * It is combination of tenantid/docId part of the url.\n\t */\n\tid: string;\n\t/**\n\t * It is the deep link path in the url.\n\t */\n\tpath: string;\n\t/**\n\t * Query string part of the url.\n\t */\n\tquery: string;\n\t/**\n\t * Undefined means load latest snapshot, otherwise it's version ID passed to IDocumentStorageService.getVersions()\n\t * to figure out what snapshot to use.\n\t */\n\tversion: string | undefined;\n}\n\n/**\n * Utility api to parse the IResolvedUrl.url into specific parts like querystring, path to get\n * deep link info etc.\n * Warning - This function may not be compatible with any Url Resolver's resolved url. It works\n * with urls of type: protocol://<string>/.../..?<querystring>\n * @param url - This is the IResolvedUrl.url part of the resolved url.\n * @returns The IParsedUrl representing the input URL, or undefined if the format was not supported\n * @internal\n */\nexport function tryParseCompatibleResolvedUrl(url: string): IParsedUrl | undefined {\n\tconst parsed = new URL(url);\n\tif (typeof parsed.pathname !== \"string\") {\n\t\tthrow new LoggingError(\"Failed to parse pathname\");\n\t}\n\tconst query = parsed.search ?? \"\";\n\tconst regex = /^\\/([^/]*\\/[^/]*)(\\/?.*)$/;\n\tconst match = regex.exec(parsed.pathname);\n\treturn match?.length === 3\n\t\t? {\n\t\t\t\tid: match[1],\n\t\t\t\tpath: match[2],\n\t\t\t\tquery,\n\t\t\t\t// URLSearchParams returns null if the param is not provided.\n\t\t\t\tversion: parsed.searchParams.get(\"version\") ?? undefined,\n\t\t  }\n\t\t: undefined;\n}\n\n/**\n * Combine the app summary and protocol summary in 1 tree.\n * @param appSummary - Summary of the app.\n * @param protocolSummary - Summary of the protocol.\n * @internal\n */\nexport function combineAppAndProtocolSummary(\n\tappSummary: ISummaryTree,\n\tprotocolSummary: ISummaryTree,\n): CombinedAppAndProtocolSummary {\n\tassert(\n\t\t!isCombinedAppAndProtocolSummary(appSummary),\n\t\t0x5a8 /* app summary is already a combined tree! */,\n\t);\n\tassert(\n\t\t!isCombinedAppAndProtocolSummary(protocolSummary),\n\t\t0x5a9 /* protocol summary is already a combined tree! */,\n\t);\n\tconst createNewSummary: CombinedAppAndProtocolSummary = {\n\t\ttype: SummaryType.Tree,\n\t\ttree: {\n\t\t\t\".protocol\": protocolSummary,\n\t\t\t\".app\": appSummary,\n\t\t},\n\t};\n\treturn createNewSummary;\n}\n\n/**\n * Converts a summary to snapshot tree and separate its blob contents\n * to align detached container format with IPendingContainerState\n * @param summary - ISummaryTree\n */\nfunction convertSummaryToSnapshotAndBlobs(summary: ISummaryTree): {\n\ttree: ISnapshotTree;\n\tblobs: ISerializableBlobContents;\n} {\n\tlet blobContents: ISerializableBlobContents = {};\n\tconst treeNode: ISnapshotTree = {\n\t\tblobs: {},\n\t\ttrees: {},\n\t\tid: uuid(),\n\t\tunreferenced: summary.unreferenced,\n\t\tgroupId: summary.groupId,\n\t};\n\tconst keys = Object.keys(summary.tree);\n\tfor (const key of keys) {\n\t\tconst summaryObject = summary.tree[key];\n\n\t\tswitch (summaryObject.type) {\n\t\t\tcase SummaryType.Tree: {\n\t\t\t\tconst { tree, blobs } = convertSummaryToSnapshotAndBlobs(summaryObject);\n\t\t\t\ttreeNode.trees[key] = tree;\n\t\t\t\tblobContents = { ...blobContents, ...blobs };\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tcase SummaryType.Attachment:\n\t\t\t\ttreeNode.blobs[key] = summaryObject.id;\n\t\t\t\tbreak;\n\t\t\tcase SummaryType.Blob: {\n\t\t\t\tconst blobId = uuid();\n\t\t\t\ttreeNode.blobs[key] = blobId;\n\t\t\t\tconst contentString: string =\n\t\t\t\t\tsummaryObject.content instanceof Uint8Array\n\t\t\t\t\t\t? Uint8ArrayToString(summaryObject.content)\n\t\t\t\t\t\t: summaryObject.content;\n\t\t\t\tblobContents[blobId] = contentString;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tcase SummaryType.Handle:\n\t\t\t\tthrow new LoggingError(\n\t\t\t\t\t\"No handles should be there in summary in detached container!!\",\n\t\t\t\t);\n\t\t\t\tbreak;\n\t\t\tdefault: {\n\t\t\t\tunreachableCase(summaryObject, `Unknown tree type ${(summaryObject as any).type}`);\n\t\t\t}\n\t\t}\n\t}\n\treturn { tree: treeNode, blobs: blobContents };\n}\n\n/**\n * Converts summary parts into a SnapshotTree and its blob contents.\n * @param protocolSummaryTree - Protocol Summary Tree\n * @param appSummaryTree - App Summary Tree\n */\nfunction convertProtocolAndAppSummaryToSnapshotAndBlobs(\n\tprotocolSummaryTree: ISummaryTree,\n\tappSummaryTree: ISummaryTree,\n): { tree: ISnapshotTree; blobs: ISerializableBlobContents } {\n\tconst combinedSummary: ISummaryTree = {\n\t\ttype: SummaryType.Tree,\n\t\ttree: { ...appSummaryTree.tree },\n\t};\n\n\tcombinedSummary.tree[\".protocol\"] = protocolSummaryTree;\n\tconst snapshotTreeWithBlobContents = convertSummaryToSnapshotAndBlobs(combinedSummary);\n\treturn snapshotTreeWithBlobContents;\n}\n\nexport const getSnapshotTreeAndBlobsFromSerializedContainer = (\n\tdetachedContainerSnapshot: ISummaryTree,\n): { tree: ISnapshotTree; blobs: ISerializableBlobContents } => {\n\tassert(\n\t\tisCombinedAppAndProtocolSummary(detachedContainerSnapshot),\n\t\t0x8e6 /* Protocol and App summary trees should be present */,\n\t);\n\tconst protocolSummaryTree = detachedContainerSnapshot.tree[\".protocol\"];\n\tconst appSummaryTree = detachedContainerSnapshot.tree[\".app\"];\n\tconst snapshotTreeWithBlobContents = convertProtocolAndAppSummaryToSnapshotAndBlobs(\n\t\tprotocolSummaryTree,\n\t\tappSummaryTree,\n\t);\n\treturn snapshotTreeWithBlobContents;\n};\n\nexport function getProtocolSnapshotTree(snapshot: ISnapshotTree): ISnapshotTree {\n\treturn \".protocol\" in snapshot.trees ? snapshot.trees[\".protocol\"] : snapshot;\n}\n\nexport const combineSnapshotTreeAndSnapshotBlobs = (\n\tbaseSnapshot: ISnapshotTree,\n\tsnapshotBlobs: ISerializableBlobContents,\n): ISnapshotTreeWithBlobContents => {\n\tconst blobsContents: { [path: string]: ArrayBufferLike } = {};\n\n\t// Process blobs in the current level\n\tfor (const [, id] of Object.entries(baseSnapshot.blobs)) {\n\t\tif (snapshotBlobs[id]) {\n\t\t\tblobsContents[id] = stringToBuffer(snapshotBlobs[id], \"utf8\");\n\t\t}\n\t}\n\n\t// Recursively process trees in the current level\n\tconst trees: { [path: string]: ISnapshotTreeWithBlobContents } = {};\n\tfor (const [path, tree] of Object.entries(baseSnapshot.trees)) {\n\t\ttrees[path] = combineSnapshotTreeAndSnapshotBlobs(tree, snapshotBlobs);\n\t}\n\n\t// Create a new snapshot tree with blob contents and processed trees\n\tconst snapshotTreeWithBlobContents: ISnapshotTreeWithBlobContents = {\n\t\t...baseSnapshot,\n\t\tblobsContents,\n\t\ttrees,\n\t};\n\n\treturn snapshotTreeWithBlobContents;\n};\n\nexport function isDeltaStreamConnectionForbiddenError(\n\terror: any,\n): error is DeltaStreamConnectionForbiddenError {\n\treturn (\n\t\ttypeof error === \"object\" &&\n\t\terror !== null &&\n\t\terror?.errorType === DriverErrorTypes.deltaStreamConnectionForbidden\n\t);\n}\n\n/**\n * Validates format in parsed string get from detached container\n * serialization using IPendingDetachedContainerState format.\n */\nfunction isPendingDetachedContainerState(\n\tdetachedContainerState: IPendingDetachedContainerState,\n): detachedContainerState is IPendingDetachedContainerState {\n\tif (\n\t\tdetachedContainerState?.attached === undefined ||\n\t\tdetachedContainerState?.baseSnapshot === undefined ||\n\t\tdetachedContainerState?.snapshotBlobs === undefined ||\n\t\tdetachedContainerState?.hasAttachmentBlobs === undefined\n\t) {\n\t\treturn false;\n\t}\n\treturn true;\n}\n\nexport function getDetachedContainerStateFromSerializedContainer(\n\tserializedContainer: string,\n): IPendingDetachedContainerState {\n\tconst hasBlobsSummaryTree = \".hasAttachmentBlobs\";\n\tconst parsedContainerState = JSON.parse(serializedContainer);\n\tif (isPendingDetachedContainerState(parsedContainerState)) {\n\t\treturn parsedContainerState;\n\t} else if (isCombinedAppAndProtocolSummary(parsedContainerState)) {\n\t\tconst { tree, blobs } =\n\t\t\tgetSnapshotTreeAndBlobsFromSerializedContainer(parsedContainerState);\n\t\tconst detachedContainerState: IPendingDetachedContainerState = {\n\t\t\tattached: false,\n\t\t\tbaseSnapshot: tree,\n\t\t\tsnapshotBlobs: blobs,\n\t\t\thasAttachmentBlobs: parsedContainerState.tree[hasBlobsSummaryTree] !== undefined,\n\t\t};\n\t\treturn detachedContainerState;\n\t} else {\n\t\tthrow new UsageError(\"Cannot rehydrate detached container. Incorrect format\");\n\t}\n}\n\n/**\n * Ensures only a single instance of the provided async function is running.\n * If there are multiple calls they will all get the same promise to wait on.\n */\nexport const runSingle = <A extends any[], R>(func: (...args: A) => Promise<R>) => {\n\tlet running:\n\t\t| {\n\t\t\t\targs: A;\n\t\t\t\tresult: Promise<R>;\n\t\t  }\n\t\t| undefined;\n\t// don't mark this function async, so we return the same promise,\n\t// rather than one that is wrapped due to async\n\t// eslint-disable-next-line @typescript-eslint/promise-function-async\n\treturn (...args: A) => {\n\t\tif (running !== undefined) {\n\t\t\tif (!compareArrays(running.args, args)) {\n\t\t\t\treturn Promise.reject(\n\t\t\t\t\tnew UsageError(\"Subsequent calls cannot use different arguments.\"),\n\t\t\t\t);\n\t\t\t}\n\t\t\treturn running.result;\n\t\t}\n\t\trunning = { args, result: func(...args).finally(() => (running = undefined)) };\n\t\treturn running.result;\n\t};\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-loader",
-  "version": "2.0.0-dev-rc.1.0.0.232845",
+  "version": "2.0.0-dev-rc.2.0.0.245554",
   "description": "Fluid container loader",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,11 +11,12 @@
   "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",
@@ -24,8 +25,8 @@
     },
     "./test/container": {
       "import": {
-        "types": "./lib/container.d.mts",
-        "default": "./lib/container.mjs"
+        "types": "./lib/container.d.ts",
+        "default": "./lib/container.js"
       },
       "require": {
         "types": "./dist/container.d.ts",
@@ -34,8 +35,8 @@
     },
     "./test/contracts": {
       "import": {
-        "types": "./lib/contracts.d.mts",
-        "default": "./lib/contracts.mjs"
+        "types": "./lib/contracts.d.ts",
+        "default": "./lib/contracts.js"
       },
       "require": {
         "types": "./dist/contracts.d.ts",
@@ -44,8 +45,8 @@
     },
     "./test/connectionManager": {
       "import": {
-        "types": "./lib/connectionManager.d.mts",
-        "default": "./lib/connectionManager.mjs"
+        "types": "./lib/connectionManager.d.ts",
+        "default": "./lib/connectionManager.js"
       },
       "require": {
         "types": "./dist/connectionManager.d.ts",
@@ -54,8 +55,8 @@
     },
     "./test/deltaManager": {
       "import": {
-        "types": "./lib/deltaManager.d.mts",
-        "default": "./lib/deltaManager.mjs"
+        "types": "./lib/deltaManager.d.ts",
+        "default": "./lib/deltaManager.js"
       },
       "require": {
         "types": "./dist/deltaManager.d.ts",
@@ -64,57 +65,46 @@
     },
     "./test/utils": {
       "import": {
-        "types": "./lib/utils.d.mts",
-        "default": "./lib/utils.mjs"
+        "types": "./lib/utils.d.ts",
+        "default": "./lib/utils.js"
       },
       "require": {
         "types": "./dist/utils.d.ts",
         "default": "./dist/utils.js"
       }
     },
-    "./alpha": {
+    "./public": {
       "import": {
-        "types": "./lib/container-loader-alpha.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/container-loader-public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/container-loader-alpha.d.ts",
+        "types": "./dist/container-loader-public.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./beta": {
+    "./alpha": {
       "import": {
-        "types": "./lib/container-loader-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/container-loader-alpha.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/container-loader-beta.d.ts",
+        "types": "./dist/container-loader-alpha.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/container-loader-public.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/container-loader-public.d.ts",
-        "default": "./dist/index.js"
-      }
     }
   },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -137,51 +127,48 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/driver-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluidframework/protocol-base": "^3.1.0-231702",
-    "@fluidframework/protocol-definitions": "^3.2.0-231454",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.1.0.0.232845",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/container-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/driver-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/protocol-base": "^4.0.0",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.2.0.0.245554",
     "@ungap/structured-clone": "^1.2.0",
     "debug": "^4.3.4",
     "double-ended-queue": "^2.1.0-0",
-    "events": "^3.1.0",
-    "url": "^0.11.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-private/test-loader-utils": "2.0.0-dev-rc.1.0.0.232845",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluid-private/test-loader-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@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-loader-previous": "npm:@fluidframework/container-loader@2.0.0-internal.8.0.0",
-    "@fluidframework/eslint-config-fluid": "^3.3.0",
-    "@fluidframework/mocha-test-setup": "2.0.0-dev-rc.1.0.0.232845",
-    "@microsoft/api-extractor": "^7.39.1",
+    "@fluidframework/eslint-config-fluid": "^5.1.0",
+    "@microsoft/api-extractor": "^7.42.3",
     "@types/debug": "^4.1.5",
     "@types/double-ended-queue": "^2.1.0",
-    "@types/events": "^3.0.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
-    "@types/sinon": "^7.0.13",
+    "@types/sinon": "^17.0.3",
     "@types/ungap__structured-clone": "^1.2.0",
+    "@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": {
@@ -200,20 +187,25 @@
     "broken": {
       "InterfaceDeclaration_IContainerExperimental": {
         "forwardCompat": false
+      },
+      "InterfaceDeclaration_IParsedUrl": {
+        "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",
@@ -227,9 +219,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/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/attachment.ts

@@ -7,9 +7,9 @@ import { CombinedAppAndProtocolSummary } from "@fluidframework/driver-utils";
 import { ISnapshotTree, ISummaryTree } from "@fluidframework/protocol-definitions";
 import { assert } from "@fluidframework/core-utils";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
-import { getSnapshotTreeAndBlobsFromSerializedContainer } from "./utils";
-import { ISerializableBlobContents } from "./containerStorageAdapter";
-import { IDetachedBlobStorage } from ".";
+import { getSnapshotTreeAndBlobsFromSerializedContainer } from "./utils.js";
+import { ISerializableBlobContents } from "./containerStorageAdapter.js";
+import { IDetachedBlobStorage } from "./index.js";
 
 /**
  * The default state a newly created detached container will have.
@@ -65,10 +65,6 @@ export interface AttachingDataWithoutBlobs {
  */
 export interface AttachedData {
 	readonly state: AttachState.Attached;
-	readonly snapshot?: {
-		tree: ISnapshotTree;
-		blobs: ISerializableBlobContents;
-	};
 }
 
 /**
@@ -136,7 +132,9 @@ export interface AttachProcessProps {
  *
  * @param props - The data and services necessary to run the attachment process
  */
-export const runRetriableAttachProcess = async (props: AttachProcessProps): Promise<void> => {
+export const runRetriableAttachProcess = async (
+	props: AttachProcessProps,
+): Promise<{ tree: ISnapshotTree; blobs: ISerializableBlobContents } | undefined> => {
 	const {
 		detachedBlobStorage,
 		createOrGetStorageService,
@@ -195,7 +193,10 @@ export const runRetriableAttachProcess = async (props: AttachProcessProps): Prom
 		);
 	}
 
-	assert(currentData.state === AttachState.Attaching, "must be attaching by this point");
+	assert(
+		currentData.state === AttachState.Attaching,
+		0x8e2 /* must be attaching by this point */,
+	);
 
 	if (currentData.blobs === "done") {
 		// done means outstanding blobs were uploaded.
@@ -208,12 +209,14 @@ export const runRetriableAttachProcess = async (props: AttachProcessProps): Prom
 		});
 	}
 
+	const snapshot = offlineLoadEnabled
+		? getSnapshotTreeAndBlobsFromSerializedContainer(currentData.summary)
+		: undefined;
+
 	setAttachmentData(
 		(currentData = {
 			state: AttachState.Attached,
-			snapshot: offlineLoadEnabled
-				? getSnapshotTreeAndBlobsFromSerializedContainer(currentData.summary)
-				: undefined,
 		}),
 	);
+	return snapshot;
 };

package/src/audience.ts

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { EventEmitter } from "events";
+import { EventEmitter } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils";
 import { IAudienceOwner } from "@fluidframework/container-definitions";
 import { IClient } from "@fluidframework/protocol-definitions";
@@ -61,14 +61,20 @@ export class Audience extends EventEmitter implements IAudienceOwner {
 	}
 
 	/**
-	 * Retrieves all the members in the audience
+	 * Retrieves all the members in the audience.
+	 *
+	 * @remarks When the container is disconnected, this will keep returning the audience as it was last seen before the
+	 * container disconnected.
 	 */
 	public getMembers(): Map<string, IClient> {
 		return new Map(this.members);
 	}
 
 	/**
-	 * Retrieves a specific member of the audience
+	 * Retrieves a specific member of the audience.
+	 *
+	 * @remarks When the container is disconnected, this will keep returning members from the audience as it was last seen
+	 * before the container disconnected.
 	 */
 	public getMember(clientId: string): IClient | undefined {
 		return this.members.get(clientId);