@fluidframework/container-runtime 2.0.0-dev.5.2.0.169897 → 2.0.0-dev.6.4.0.191258

package/dist/dataStores.js

@@ -5,14 +5,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSummaryForDatastores = exports.DataStores = void 0;
-const container_utils_1 = require("@fluidframework/container-utils");
 const datastore_1 = require("@fluidframework/datastore");
 const runtime_definitions_1 = require("@fluidframework/runtime-definitions");
 const runtime_utils_1 = require("@fluidframework/runtime-utils");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const driver_utils_1 = require("@fluidframework/driver-utils");
-const common_utils_1 = require("@fluidframework/common-utils");
+const core_utils_1 = require("@fluidframework/core-utils");
 const uuid_1 = require("uuid");
 const dataStoreContexts_1 = require("./dataStoreContexts");
 const containerRuntime_1 = require("./containerRuntime");
@@ -40,13 +39,13 @@ class DataStores {
         this.pendingAttach = new Map();
         // 0.24 back-compat attachingBeforeSummary
         this.attachOpFiredForDataStore = new Set();
-        this.disposeOnce = new common_utils_1.Lazy(() => this.contexts.dispose());
+        this.disposeOnce = new core_utils_1.Lazy(() => this.contexts.dispose());
         // Stores the ids of new data stores between two GC runs. This is used to notify the garbage collector of new
         // root data stores that are added.
         this.dataStoresSinceLastGC = [];
         this.pendingAliasMap = new Map();
         this.dispose = () => this.disposeOnce.value;
-        this.mc = (0, telemetry_utils_1.loggerToMonitoringContext)(telemetry_utils_1.ChildLogger.create(baseLogger));
+        this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({ logger: baseLogger });
         this.containerRuntimeHandle = new datastore_1.FluidObjectHandle(this.runtime, "/", this.runtime.IFluidHandleContext);
         // Tombstone should only throw when the feature flag is enabled and the client isn't a summarizer
         this.throwOnTombstoneLoad =
@@ -118,25 +117,24 @@ class DataStores {
         return pendingAliasPromise === undefined ? "Success" : pendingAliasPromise;
     }
     processAttachMessage(message, local) {
-        var _a, _b;
         const attachMessage = message.contents;
         this.dataStoresSinceLastGC.push(attachMessage.id);
         // The local object has already been attached
         if (local) {
-            (0, common_utils_1.assert)(this.pendingAttach.has(attachMessage.id), 0x15e /* "Local object does not have matching attach message id" */);
-            (_a = this.contexts.get(attachMessage.id)) === null || _a === void 0 ? void 0 : _a.emit("attached");
+            (0, core_utils_1.assert)(this.pendingAttach.has(attachMessage.id), 0x15e /* "Local object does not have matching attach message id" */);
+            this.contexts.get(attachMessage.id)?.emit("attached");
             this.pendingAttach.delete(attachMessage.id);
             return;
         }
         // If a non-local operation then go and create the object, otherwise mark it as officially attached.
         if (this.alreadyProcessed(attachMessage.id)) {
             // TODO: dataStoreId may require a different tag from PackageData #7488
-            const error = new container_utils_1.DataCorruptionError(
+            const error = new telemetry_utils_1.DataCorruptionError(
             // pre-0.58 error message: duplicateDataStoreCreatedWithExistingId
-            "Duplicate DataStore created with existing id", Object.assign(Object.assign({}, (0, container_utils_1.extractSafePropertiesFromMessage)(message)), { dataStoreId: {
-                    value: attachMessage.id,
-                    tag: telemetry_utils_1.TelemetryDataTag.CodeArtifact,
-                } }));
+            "Duplicate DataStore created with existing id", {
+                ...(0, telemetry_utils_1.extractSafePropertiesFromMessage)(message),
+                ...(0, telemetry_utils_1.tagCodeArtifacts)({ dataStoreId: attachMessage.id }),
+            });
             throw error;
         }
         const flatAttachBlobs = new Map();
@@ -156,7 +154,7 @@ class DataStores {
             createSummarizerNodeFn: this.getCreateChildSummarizerNodeFn(attachMessage.id, {
                 type: runtime_definitions_1.CreateSummarizerNodeSource.FromAttach,
                 sequenceNumber: message.sequenceNumber,
-                snapshot: (_b = attachMessage.snapshot) !== null && _b !== void 0 ? _b : {
+                snapshot: attachMessage.snapshot ?? {
                     entries: [(0, dataStoreContext_1.createAttributesBlob)(pkg, true /* isRootDataStore */)],
                 },
             }),
@@ -167,7 +165,9 @@ class DataStores {
     processAliasMessage(message, localOpMetadata, local) {
         const aliasMessage = message.contents;
         if (!(0, dataStore_1.isDataStoreAliasMessage)(aliasMessage)) {
-            throw new container_utils_1.DataCorruptionError("malformedDataStoreAliasMessage", Object.assign({}, (0, container_utils_1.extractSafePropertiesFromMessage)(message)));
+            throw new telemetry_utils_1.DataCorruptionError("malformedDataStoreAliasMessage", {
+                ...(0, telemetry_utils_1.extractSafePropertiesFromMessage)(message),
+            });
         }
         const resolve = localOpMetadata;
         const aliasResult = this.processAliasMessageCore(aliasMessage);
@@ -203,7 +203,7 @@ class DataStores {
      */
     makeDataStoreLocallyVisible(id) {
         const localContext = this.contexts.getUnbound(id);
-        (0, common_utils_1.assert)(!!localContext, 0x15f /* "Could not find unbound context to bind" */);
+        (0, core_utils_1.assert)(!!localContext, 0x15f /* "Could not find unbound context to bind" */);
         /**
          * If the container is not detached, it is globally visible to all clients. This data store should also be
          * globally visible. Move it to attaching state and send an "attach" op for it.
@@ -219,7 +219,7 @@ class DataStores {
         this.contexts.bind(id);
     }
     createDetachedDataStoreCore(pkg, isRoot, id = (0, uuid_1.v4)()) {
-        (0, common_utils_1.assert)(!id.includes("/"), 0x30c /* Id cannot contain slashes */);
+        (0, core_utils_1.assert)(!id.includes("/"), 0x30c /* Id cannot contain slashes */);
         const context = new dataStoreContext_1.LocalDetachedFluidDataStoreContext({
             id,
             pkg,
@@ -237,7 +237,7 @@ class DataStores {
         return context;
     }
     _createFluidDataStoreContext(pkg, id, props) {
-        (0, common_utils_1.assert)(!id.includes("/"), 0x30d /* Id cannot contain slashes */);
+        (0, core_utils_1.assert)(!id.includes("/"), 0x30d /* Id cannot contain slashes */);
         const context = new dataStoreContext_1.LocalFluidDataStoreContext({
             id,
             pkg,
@@ -260,17 +260,17 @@ class DataStores {
     }
     resubmitDataStoreOp(envelope, localOpMetadata) {
         const context = this.contexts.get(envelope.address);
-        (0, common_utils_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
+        (0, core_utils_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
         context.reSubmit(envelope.contents, localOpMetadata);
     }
     rollbackDataStoreOp(envelope, localOpMetadata) {
         const context = this.contexts.get(envelope.address);
-        (0, common_utils_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
+        (0, core_utils_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
         context.rollback(envelope.contents, localOpMetadata);
     }
     async applyStashedOp(envelope) {
         const context = this.contexts.get(envelope.address);
-        (0, common_utils_1.assert)(!!context, 0x161 /* "There should be a store context for the op" */);
+        (0, core_utils_1.assert)(!!context, 0x161 /* "There should be a store context for the op" */);
         return context.applyStashedOp(envelope.contents);
     }
     async applyStashedAttachOp(message) {
@@ -280,97 +280,137 @@ class DataStores {
     }
     processFluidDataStoreOp(message, local, localMessageMetadata) {
         const envelope = message.contents;
-        const transformed = Object.assign(Object.assign({}, message), { contents: envelope.contents });
-        const request = { url: envelope.address };
-        this.validateNotDeleted(envelope.address, request);
+        const transformed = { ...message, contents: envelope.contents };
+        this.validateNotDeleted(envelope.address);
         const context = this.contexts.get(envelope.address);
-        (0, common_utils_1.assert)(!!context, 0x162 /* "There should be a store context for the op" */);
+        (0, core_utils_1.assert)(!!context, 0x162 /* "There should be a store context for the op" */);
         context.process(transformed, local, localMessageMetadata);
         // Notify that a GC node for the data store changed. This is used to detect if a deleted data store is
         // being used.
         this.gcNodeUpdated(`/${envelope.address}`, message.timestamp, context.isLoaded ? context.packagePath : undefined);
     }
     async getDataStore(id, requestHeaderData) {
-        const headerData = Object.assign(Object.assign({}, containerRuntime_1.defaultRuntimeHeaderData), requestHeaderData);
-        const request = { url: id };
-        this.validateNotDeleted(id, request, headerData);
+        const headerData = { ...containerRuntime_1.defaultRuntimeHeaderData, ...requestHeaderData };
+        this.validateNotDeleted(id, headerData);
         const context = await this.contexts.getBoundOrRemoted(id, headerData.wait);
         if (context === undefined) {
             // The requested data store does not exits. Throw a 404 response exception.
+            const request = { url: id };
             throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.create404Response)(request), request);
         }
-        this.validateNotTombstoned(context, request, requestHeaderData);
+        this.validateNotTombstoned(context, requestHeaderData);
         return context;
     }
     /**
-     * Validate that the data store had not been deleted by GC.
-     *
+     * Returns the data store requested with the given id if available. Otherwise, returns undefined.
+     */
+    async getDataStoreIfAvailable(id, requestHeaderData) {
+        // If the data store has been deleted, return undefined.
+        if (this.checkIfDeleted(id, requestHeaderData)) {
+            return undefined;
+        }
+        const headerData = { ...containerRuntime_1.defaultRuntimeHeaderData, ...requestHeaderData };
+        const context = await this.contexts.getBoundOrRemoted(id, headerData.wait);
+        if (context === undefined) {
+            return undefined;
+        }
+        // Check if the data store is tombstoned. If so, we want to log a telemetry event.
+        this.checkIfTombstoned(context, requestHeaderData);
+        return context;
+    }
+    /**
+     * Checks if the data store has been deleted by GC.
      * @param id - data store id
      * @param request - the request information to log if the validation detects the data store has been deleted
      * @param requestHeaderData - the request header information to log if the validation detects the data store has been deleted
+     * @returns true if the data store is deleted. Otherwise, returns false.
      */
-    validateNotDeleted(id, request, requestHeaderData) {
+    checkIfDeleted(id, requestHeaderData) {
         const dataStoreNodePath = `/${id}`;
-        if (this.isDataStoreDeleted(dataStoreNodePath)) {
-            (0, common_utils_1.assert)(!this.contexts.has(id), 0x570 /* Inconsistent state! GC says the data store is deleted, but the data store is not deleted from the runtime. */);
+        if (!this.isDataStoreDeleted(dataStoreNodePath)) {
+            return false;
+        }
+        (0, core_utils_1.assert)(!this.contexts.has(id), 0x570 /* Inconsistent state! GC says the data store is deleted, but the data store is not deleted from the runtime. */);
+        (0, gc_1.sendGCUnexpectedUsageEvent)(this.mc, {
+            eventName: "GC_Deleted_DataStore_Requested",
+            category: "error",
+            isSummarizerClient: this.runtime.clientDetails.type === summary_1.summarizerClientType,
+            id,
+            headers: JSON.stringify(requestHeaderData),
+            gcTombstoneEnforcementAllowed: this.runtime.gcTombstoneEnforcementAllowed,
+        }, undefined /* packagePath */);
+        return true;
+    }
+    /**
+     * Validate that the data store had not been deleted by GC.
+     * @param id - data store id
+     * @param requestHeaderData - the request header information to log if the validation detects the data store has been deleted
+     */
+    validateNotDeleted(id, requestHeaderData) {
+        if (this.checkIfDeleted(id, requestHeaderData)) {
             // The requested data store is removed by gc. Create a 404 gc response exception.
-            const error = (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "DataStore was deleted", request), request);
-            (0, gc_1.sendGCUnexpectedUsageEvent)(this.mc, {
-                eventName: "GC_Deleted_DataStore_Requested",
-                category: "error",
-                isSummarizerClient: this.runtime.clientDetails.type === summary_1.summarizerClientType,
-                headers: JSON.stringify(requestHeaderData),
-                gcTombstoneEnforcementAllowed: this.runtime.gcTombstoneEnforcementAllowed,
-            }, undefined /** packagePath */, error);
-            throw error;
+            const request = { url: id };
+            throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "DataStore was deleted", request), request);
+        }
+    }
+    /**
+     * Checks if the data store has not been marked as tombstone by GC or not.
+     * @param context - the data store context in question
+     * @param requestHeaderData - the request header information to log if the validation detects the data store has been tombstoned
+     * @returns true if the data store is tombstoned. Otherwise, returns false.
+     */
+    checkIfTombstoned(context, requestHeaderData) {
+        if (!context.tombstoned) {
+            return false;
         }
+        const logErrorEvent = this.throwOnTombstoneLoad && !requestHeaderData.allowTombstone;
+        (0, gc_1.sendGCUnexpectedUsageEvent)(this.mc, {
+            eventName: "GC_Tombstone_DataStore_Requested",
+            category: logErrorEvent ? "error" : "generic",
+            isSummarizerClient: this.runtime.clientDetails.type === summary_1.summarizerClientType,
+            id: context.id,
+            headers: JSON.stringify(requestHeaderData),
+            gcTombstoneEnforcementAllowed: this.runtime.gcTombstoneEnforcementAllowed,
+        }, context.isLoaded ? context.packagePath : undefined);
+        return true;
     }
     /**
      * Validates that the data store context requested has not been marked as tombstone by GC.
-     *
      * @param context - the data store context in question
      * @param request - the request information to log if the validation detects the data store has been tombstoned
-     * @param headerData - the request header information to log if the validation detects the data store has been tombstoned
+     * @param requestHeaderData - the request header information to log if the validation detects the data store has been tombstoned
      */
-    validateNotTombstoned(context, request, headerData) {
-        if (context.tombstoned) {
-            const shouldFail = this.throwOnTombstoneLoad && !headerData.allowTombstone;
+    validateNotTombstoned(context, requestHeaderData) {
+        if (this.checkIfTombstoned(context, requestHeaderData)) {
             // The requested data store is removed by gc. Create a 404 gc response exception.
+            const request = { url: context.id };
             const error = (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "DataStore was deleted", request, {
                 [containerRuntime_1.TombstoneResponseHeaderKey]: true,
             }), request);
-            (0, gc_1.sendGCUnexpectedUsageEvent)(this.mc, {
-                eventName: "GC_Tombstone_DataStore_Requested",
-                category: shouldFail ? "error" : "generic",
-                isSummarizerClient: this.runtime.clientDetails.type === summary_1.summarizerClientType,
-                headers: JSON.stringify(headerData),
-                gcTombstoneEnforcementAllowed: this.runtime.gcTombstoneEnforcementAllowed,
-            }, context.isLoaded ? context.packagePath : undefined, error);
-            if (shouldFail) {
+            // Throw an error if configured via options and via request headers.
+            if (this.throwOnTombstoneLoad && !requestHeaderData.allowTombstone) {
                 throw error;
             }
         }
     }
-    processSignal(address, message, local) {
-        const request = { url: address };
-        this.validateNotDeleted(address, request);
-        const context = this.contexts.get(address);
+    processSignal(fluidDataStoreId, message, local) {
+        this.validateNotDeleted(fluidDataStoreId);
+        const context = this.contexts.get(fluidDataStoreId);
         if (!context) {
             // Attach message may not have been processed yet
-            (0, common_utils_1.assert)(!local, 0x163 /* "Missing datastore for local signal" */);
+            (0, core_utils_1.assert)(!local, 0x163 /* "Missing datastore for local signal" */);
             this.mc.logger.sendTelemetryEvent({
                 eventName: "SignalFluidDataStoreNotFound",
-                fluidDataStoreId: {
-                    value: address,
-                    tag: telemetry_utils_1.TelemetryDataTag.CodeArtifact,
-                },
+                ...(0, telemetry_utils_1.tagCodeArtifacts)({
+                    fluidDataStoreId,
+                }),
             });
             return;
         }
         context.processSignal(message, local);
     }
     setConnectionState(connected, clientId) {
-        for (const [fluidDataStore, context] of this.contexts) {
+        for (const [fluidDataStoreId, context] of this.contexts) {
             try {
                 context.setConnectionState(connected, clientId);
             }
@@ -378,7 +418,9 @@ class DataStores {
                 this.mc.logger.sendErrorEvent({
                     eventName: "SetConnectionStateError",
                     clientId,
-                    fluidDataStore,
+                    ...(0, telemetry_utils_1.tagCodeArtifacts)({
+                        fluidDataStoreId,
+                    }),
                     details: JSON.stringify({
                         runtimeConnected: this.runtime.connected,
                         connected,
@@ -406,7 +448,7 @@ class DataStores {
             .filter(([_, context]) => {
             // Summarizer works only with clients with no local changes. A data store in attaching
             // state indicates an op was sent to attach a local data store.
-            (0, common_utils_1.assert)(context.attachState !== container_definitions_1.AttachState.Attaching, 0x588 /* Local data store detected in attaching state during summarize */);
+            (0, core_utils_1.assert)(context.attachState !== container_definitions_1.AttachState.Attaching, 0x588 /* Local data store detected in attaching state during summarize */);
             return context.attachState === container_definitions_1.AttachState.Attached;
         })
             .map(async ([contextId, context]) => {
@@ -441,7 +483,7 @@ class DataStores {
                 else {
                     // If this data store is not yet loaded, then there should be no changes in the snapshot from
                     // which it was created as it is detached container. So just use the previous snapshot.
-                    (0, common_utils_1.assert)(!!this.baseSnapshot, 0x166 /* "BaseSnapshot should be there as detached container loaded from snapshot" */);
+                    (0, core_utils_1.assert)(!!this.baseSnapshot, 0x166 /* "BaseSnapshot should be there as detached container loaded from snapshot" */);
                     dataStoreSummary = (0, runtime_utils_1.convertSnapshotTreeToSummaryTree)(this.baseSnapshot.trees[key]);
                 }
                 builder.addWithStats(key, dataStoreSummary);
@@ -457,7 +499,7 @@ class DataStores {
     async updateStateBeforeGC() {
         for (const id of this.dataStoresSinceLastGC) {
             const context = this.contexts.get(id);
-            (0, common_utils_1.assert)(context !== undefined, 0x2b6 /* Missing data store context */);
+            (0, core_utils_1.assert)(context !== undefined, 0x2b6 /* Missing data store context */);
             if (await context.isRoot()) {
                 // A root data store is basically a reference from the container runtime to the data store.
                 const handle = new datastore_1.FluidObjectHandle(context, id, this.runtime.IFluidHandleContext);
@@ -486,7 +528,7 @@ class DataStores {
             .filter(([_, context]) => {
             // Summarizer client and hence GC works only with clients with no local changes. A data store in
             // attaching state indicates an op was sent to attach a local data store.
-            (0, common_utils_1.assert)(context.attachState !== container_definitions_1.AttachState.Attaching, 0x589 /* Local data store detected in attaching state while running GC */);
+            (0, core_utils_1.assert)(context.attachState !== container_definitions_1.AttachState.Attaching, 0x589 /* Local data store detected in attaching state while running GC */);
             return context.attachState === container_definitions_1.AttachState.Attached;
         })
             .map(async ([contextId, context]) => {
@@ -504,16 +546,15 @@ class DataStores {
      * @param usedRoutes - The routes that are used in all data stores in this Container.
      */
     updateUsedRoutes(usedRoutes) {
-        var _a;
         // Get a map of data store ids to routes used in it.
         const usedDataStoreRoutes = (0, runtime_utils_1.unpackChildNodesUsedRoutes)(usedRoutes);
         // Verify that the used routes are correct.
         for (const [id] of usedDataStoreRoutes) {
-            (0, common_utils_1.assert)(this.contexts.has(id), 0x167 /* "Used route does not belong to any known data store" */);
+            (0, core_utils_1.assert)(this.contexts.has(id), 0x167 /* "Used route does not belong to any known data store" */);
         }
         // Update the used routes in each data store. Used routes is empty for unused data stores.
         for (const [contextId, context] of this.contexts) {
-            context.updateUsedRoutes((_a = usedDataStoreRoutes.get(contextId)) !== null && _a !== void 0 ? _a : []);
+            context.updateUsedRoutes(usedDataStoreRoutes.get(contextId) ?? []);
         }
     }
     /**
@@ -529,7 +570,7 @@ class DataStores {
                 continue;
             }
             const dataStoreId = pathParts[1];
-            (0, common_utils_1.assert)(this.contexts.has(dataStoreId), 0x2d7 /* No data store with specified id */);
+            (0, core_utils_1.assert)(this.contexts.has(dataStoreId), 0x2d7 /* No data store with specified id */);
             // Delete the contexts of unused data stores.
             this.contexts.delete(dataStoreId);
             // Delete the summarizer node of the unused data stores.
@@ -540,11 +581,11 @@ class DataStores {
      * Delete data stores and its objects that are sweep ready.
      * @param sweepReadyDataStoreRoutes - The routes of data stores and its objects that are sweep ready and should
      * be deleted.
-     * @returns - The routes of data stores and its objects that were deleted.
+     * @returns The routes of data stores and its objects that were deleted.
      */
     deleteSweepReadyNodes(sweepReadyDataStoreRoutes) {
         // If sweep for data stores is not enabled, return empty list indicating nothing is deleted.
-        if (this.mc.config.getBoolean(gc_1.sweepDatastoresKey) !== true) {
+        if (this.mc.config.getBoolean(gc_1.disableDatastoreSweepKey) === true) {
             return [];
         }
         for (const route of sweepReadyDataStoreRoutes) {
@@ -563,7 +604,7 @@ class DataStores {
                 });
             }
             const dataStore = this.contexts.get(dataStoreId);
-            (0, common_utils_1.assert)(dataStore !== undefined, 0x571 /* Attempting to delete unknown dataStore */);
+            (0, core_utils_1.assert)(dataStore !== undefined, 0x571 /* Attempting to delete unknown dataStore */);
             dataStore.delete();
             // Delete the contexts of sweep ready data stores.
             this.contexts.delete(dataStoreId);
@@ -586,7 +627,7 @@ class DataStores {
                 continue;
             }
             const dataStoreId = pathParts[1];
-            (0, common_utils_1.assert)(this.contexts.has(dataStoreId), 0x510 /* No data store with specified id */);
+            (0, core_utils_1.assert)(this.contexts.has(dataStoreId), 0x510 /* No data store with specified id */);
             tombstonedDataStoresSet.add(dataStoreId);
         }
         // Update the used routes in each data store. Used routes is empty for unused data stores.
@@ -612,11 +653,10 @@ class DataStores {
      * Called by GC to retrieve the package path of a data store node with the given path.
      */
     async getDataStorePackagePath(nodePath) {
-        var _a;
         // If the node belongs to a data store, return its package path. For DDSes, we return the package path of the
         // data store that contains it.
         const context = this.contexts.get(nodePath.split("/")[1]);
-        return (_a = (await (context === null || context === void 0 ? void 0 : context.getInitialSnapshotDetails()))) === null || _a === void 0 ? void 0 : _a.pkg;
+        return (await context?.getInitialSnapshotDetails())?.pkg;
     }
     /**
      * Called by GC to determine if a node is for a data store or for an object within a data store (for e.g. DDS).
@@ -642,7 +682,7 @@ function getSummaryForDatastores(snapshot, metadata) {
     }
     if ((0, summary_1.rootHasIsolatedChannels)(metadata)) {
         const datastoresSnapshot = snapshot.trees[runtime_definitions_1.channelsTreeName];
-        (0, common_utils_1.assert)(!!datastoresSnapshot, 0x168 /* Expected tree in snapshot not found */);
+        (0, core_utils_1.assert)(!!datastoresSnapshot, 0x168 /* Expected tree in snapshot not found */);
         return datastoresSnapshot;
     }
     else {
@@ -653,7 +693,10 @@ function getSummaryForDatastores(snapshot, metadata) {
                 datastoresTrees[key] = value;
             }
         }
-        return Object.assign(Object.assign({}, snapshot), { trees: datastoresTrees });
+        return {
+            ...snapshot,
+            trees: datastoresTrees,
+        };
     }
 }
 exports.getSummaryForDatastores = getSummaryForDatastores;