@fluidframework/file-driver 0.56.7 → 0.57.1

package/dist/fileDocumentStorageService.d.ts

@@ -29,7 +29,6 @@ export declare class FluidFetchReader extends ReadDocumentStorageServiceBase imp
     readBlob(sha: string): Promise<ArrayBufferLike>;
 }
 export interface ISnapshotWriterStorage extends IDocumentStorageService {
-    onCommitHandler(dataStoreName: string, tree: api.ITree): void;
     onSnapshotHandler(snapshot: IFileSnapshot): void;
     reset(): void;
 }
@@ -37,25 +36,19 @@ export declare type ReaderConstructor = new (...args: any[]) => IDocumentStorage
 export declare const FileSnapshotWriterClassFactory: <TBase extends ReaderConstructor>(Base: TBase) => {
     new (...args: any[]): {
         blobsWriter: Map<string, ArrayBufferLike>;
-        commitsWriter: {
-            [key: string]: api.ITree;
-        };
         latestWriterTree?: api.ISnapshotTree | undefined;
         docId?: string | undefined;
         reset(): void;
-        onCommitHandler(dataStoreName: string, tree: api.ITree): void;
         onSnapshotHandler(snapshot: IFileSnapshot): void;
         readBlob(sha: string): Promise<ArrayBufferLike>;
         getVersions(versionId: string | null, count: number): Promise<api.IVersion[]>;
         getSnapshotTree(version?: api.IVersion | undefined): Promise<api.ISnapshotTree | null>;
-        write(tree: api.ITree, parents: string[], message: string, ref: string): Promise<api.IVersion>;
-        writeOutFullSnapshot(tree: api.ITree): Promise<void>;
-        sortTree(tree: api.ITree): void;
+        uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string>;
         buildTree(snapshotTree: api.ISnapshotTree): Promise<api.ITree>;
         repositoryUrl: string;
         readonly policies?: IDocumentStorageServicePolicies | undefined;
+        write(root: api.ITree, parents: string[], message: string, ref: string): Promise<api.IVersion>;
         createBlob(file: ArrayBufferLike): Promise<api.ICreateBlobResponse>;
-        uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string>;
         downloadSummary(handle: api.ISummaryHandle): Promise<api.ISummaryTree>;
         readonly disposed?: boolean | undefined;
         dispose?: ((error?: Error | undefined) => void) | undefined;
@@ -64,25 +57,19 @@ export declare const FileSnapshotWriterClassFactory: <TBase extends ReaderConstr
 export declare const FluidFetchReaderFileSnapshotWriter: {
     new (...args: any[]): {
         blobsWriter: Map<string, ArrayBufferLike>;
-        commitsWriter: {
-            [key: string]: api.ITree;
-        };
         latestWriterTree?: api.ISnapshotTree | undefined;
         docId?: string | undefined;
         reset(): void;
-        onCommitHandler(dataStoreName: string, tree: api.ITree): void;
         onSnapshotHandler(snapshot: IFileSnapshot): void;
         readBlob(sha: string): Promise<ArrayBufferLike>;
         getVersions(versionId: string | null, count: number): Promise<api.IVersion[]>;
         getSnapshotTree(version?: api.IVersion | undefined): Promise<api.ISnapshotTree | null>;
-        write(tree: api.ITree, parents: string[], message: string, ref: string): Promise<api.IVersion>;
-        writeOutFullSnapshot(tree: api.ITree): Promise<void>;
-        sortTree(tree: api.ITree): void;
+        uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string>;
         buildTree(snapshotTree: api.ISnapshotTree): Promise<api.ITree>;
         repositoryUrl: string;
         readonly policies?: IDocumentStorageServicePolicies | undefined;
+        write(root: api.ITree, parents: string[], message: string, ref: string): Promise<api.IVersion>;
         createBlob(file: ArrayBufferLike): Promise<api.ICreateBlobResponse>;
-        uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string>;
         downloadSummary(handle: api.ISummaryHandle): Promise<api.ISummaryTree>;
         readonly disposed?: boolean | undefined;
         dispose?: ((error?: Error | undefined) => void) | undefined;

package/dist/fileDocumentStorageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileDocumentStorageService.d.ts","sourceRoot":"","sources":["../src/fileDocumentStorageService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EACH,uBAAuB,EACvB,+BAA+B,EAAK,qCAAqC;AACzE,eAAe,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,GAAG,MAAM,sCAAsC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAI9F,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAQ1D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,8BAA+B,YAAW,uBAAuB;IAGvF,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAU,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAFxE,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,IAAI,CAAQ;gBAEtB,IAAI,EAAE,MAAM,EAAmB,WAAW,CAAC,oBAAQ;IAIhF;;;OAGG;IACU,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;IAiCvF;;;;OAIG;IACU,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAkB7E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAU/D;AAED,MAAM,WAAW,sBAAuB,SAAQ,uBAAuB;IACnE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC;IAC9D,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IACjD,KAAK,IAAI,IAAI,CAAC;CACjB;AAED,oBAAY,iBAAiB,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,uBAAuB,CAAC;AAChF,eAAO,MAAM,8BAA8B;kBADG,GAAG,EAAE;;;;;;;;uCAgBL,MAAM,QAAQ,IAAI,KAAK,GAAG,IAAI;oCAGjC,aAAa,GAAG,IAAI;sBAI5B,MAAM,GAAG,QAAQ,eAAe,CAAC;+BAQxB,MAAM,GAAG,IAAI,SAAS,MAAM,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;6DAuBpC,QAAQ,IAAI,aAAa,GAAG,IAAI,CAAC;oBAW7E,IAAI,KAAK,WACN,MAAM,EAAE,WACR,MAAM,OACV,MAAM,GAAG,QAAQ,IAAI,QAAQ,CAAC;mCA+CC,IAAI,KAAK;uBAc3B,IAAI,KAAK;gCASM,IAAI,aAAa,GAAG,QAAQ,IAAI,KAAK,CAAC;;;;;;;;;SAgC9E,CAAC;AAaN,eAAO,MAAM,kCAAkC;kBAvLD,GAAG,EAAE;;;;;;;;uCAgBL,MAAM,QAAQ,IAAI,KAAK,GAAG,IAAI;oCAGjC,aAAa,GAAG,IAAI;sBAI5B,MAAM,GAAG,QAAQ,eAAe,CAAC;+BAQxB,MAAM,GAAG,IAAI,SAAS,MAAM,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;6DAuBpC,QAAQ,IAAI,aAAa,GAAG,IAAI,CAAC;oBAW7E,IAAI,KAAK,WACN,MAAM,EAAE,WACR,MAAM,OACV,MAAM,GAAG,QAAQ,IAAI,QAAQ,CAAC;mCA+CC,IAAI,KAAK;uBAc3B,IAAI,KAAK;gCASM,IAAI,aAAa,GAAG,QAAQ,IAAI,KAAK,CAAC;;;;;;;;;2BA6Ce,CAAC"}
+{"version":3,"file":"fileDocumentStorageService.d.ts","sourceRoot":"","sources":["../src/fileDocumentStorageService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EACH,uBAAuB,EACvB,+BAA+B,EAAK,qCAAqC;AACzE,eAAe,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,GAAG,MAAM,sCAAsC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAI9F,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAK1D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,8BAA+B,YAAW,uBAAuB;IAGvF,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAU,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAFxE,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,IAAI,CAAQ;gBAEtB,IAAI,EAAE,MAAM,EAAmB,WAAW,CAAC,oBAAQ;IAIhF;;;OAGG;IACU,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;IAgCvF;;;;OAIG;IACU,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAiB7E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAU/D;AAED,MAAM,WAAW,sBAAuB,SAAQ,uBAAuB;IACnE,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IACjD,KAAK,IAAI,IAAI,CAAC;CACjB;AAED,oBAAY,iBAAiB,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,uBAAuB,CAAC;AAChF,eAAO,MAAM,8BAA8B;kBADG,GAAG,EAAE;;;;;oCAcR,aAAa,GAAG,IAAI;sBAI5B,MAAM,GAAG,QAAQ,eAAe,CAAC;+BAQxB,MAAM,GAAG,IAAI,SAAS,MAAM,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;6DAiBpC,QAAQ,IAAI,aAAa,GAAG,IAAI,CAAC;0CAOxC,IAAI,YAAY,WAAW,eAAe,GAAG,QAAQ,MAAM,CAAC;gCActE,IAAI,aAAa,GAAG,QAAQ,IAAI,KAAK,CAAC;;;;;;;;;SAgC9E,CAAC;AAYN,eAAO,MAAM,kCAAkC;kBA5GD,GAAG,EAAE;;;;;oCAcR,aAAa,GAAG,IAAI;sBAI5B,MAAM,GAAG,QAAQ,eAAe,CAAC;+BAQxB,MAAM,GAAG,IAAI,SAAS,MAAM,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;6DAiBpC,QAAQ,IAAI,aAAa,GAAG,IAAI,CAAC;0CAOxC,IAAI,YAAY,WAAW,eAAe,GAAG,QAAQ,MAAM,CAAC;gCActE,IAAI,aAAa,GAAG,QAAQ,IAAI,KAAK,CAAC;;;;;;;;;2BA4Ce,CAAC"}

package/dist/fileDocumentStorageService.js

@@ -37,8 +37,6 @@ const replay_driver_1 = require("@fluidframework/replay-driver");
 exports.FileStorageDocumentName = "FileStorageDocId"; // Some unique document name
 // Tree ID use to communicate between getVersions() & getSnapshotTree() that IVersion is ours.
 const FileStorageVersionTreeId = "FileStorageTreeId";
-// This ID should not show up anywhere, as it's internal only ID that no public API should accept.
-const FileStorageVersionTreeIdUnused = "baad";
 /**
  * Document storage service for the file driver.
  */
@@ -79,7 +77,6 @@ class FluidFetchReader extends replay_driver_1.ReadDocumentStorageServiceBase {
         if (rootTree) {
             this.docTree = tree;
         }
-        // Fill in this.commit right here?
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return tree;
     }
@@ -97,7 +94,6 @@ class FluidFetchReader extends replay_driver_1.ReadDocumentStorageServiceBase {
             return [];
         }
         else if (this.versionName !== undefined) {
-            // We loaded from snapshot - search for commit there.
             common_utils_1.assert(!!this.docTree, 0x094 /* "Missing snapshot tree!" */);
             return [{
                     id: versionId,
@@ -123,16 +119,12 @@ const FileSnapshotWriterClassFactory = (Base) => class extends Base {
         super(...arguments);
         // Note: if variable name has same name as in base class, it overrides it!
         this.blobsWriter = new Map();
-        this.commitsWriter = {};
     }
     reset() {
         this.blobsWriter = new Map();
-        this.commitsWriter = {};
         this.latestWriterTree = undefined;
         this.docId = undefined;
     }
-    onCommitHandler(dataStoreName, tree) {
-    }
     onSnapshotHandler(snapshot) {
         throw new Error("onSnapshotHandler is not setup! Please provide your handler!");
     }
@@ -155,81 +147,23 @@ const FileSnapshotWriterClassFactory = (Base) => class extends Base {
         if (this.docId === undefined && versionId !== null) {
             this.docId = versionId;
         }
-        if (versionId !== null && this.commitsWriter[versionId] !== undefined) {
-            // PrefetchDocumentStorageService likes to prefetch everything!
-            // Skip, as Container does not really need it.
-            throw new Error("Not supporting commit loading");
-            // Return [{id: versionId, treeId: FileStorageVersionTreeId}];
-        }
         return super.getVersions(versionId, count);
     }
     async getSnapshotTree(version) {
         if (this.latestWriterTree && (!version || version.id === "latest")) {
             return this.latestWriterTree;
         }
-        if (version && this.commitsWriter[version.id] !== undefined) {
-            return driver_utils_1.buildSnapshotTree(this.commitsWriter[version.id].entries, this.blobsWriter);
-        }
         return super.getSnapshotTree(version);
     }
-    async write(tree, parents, message, ref) {
-        let dataStoreName = ref ? ref : "container";
-        if (tree && tree.entries) {
-            tree.entries.forEach((entry) => {
-                if (entry.path === ".component" && entry.type === api.TreeEntry.Blob) {
-                    const blob = entry.value;
-                    const content = blob.contents.split(":");
-                    if (content[0] === `{"pkg"`) {
-                        dataStoreName = content[1].substring(1, content[1].lastIndexOf(`"`));
-                    }
-                }
-            });
-        }
-        const commitName = `commit_${dataStoreName}`;
-        // Sort entries for easier diffing
-        this.sortTree(tree);
+    async uploadSummaryWithContext(summary, context) {
+        const tree = driver_utils_1.convertSummaryTreeToSnapshotITree(summary);
         // Remove tree IDs for easier comparison of snapshots
         delete tree.id;
         removeNullTreeIds(tree);
-        if (ref) {
-            this.commitsWriter[commitName] = tree;
-        }
-        else {
-            // Rebuild latest tree - runtime will ask for it when generating next snapshot to write out
-            // non-changed commits for data stores
-            await this.writeOutFullSnapshot(tree);
-            // Prep for the future - refresh latest tree, as it's requests on next snapshot generation.
-            // Do not care about blobs (at least for now), as blobs are not written out (need follow up)
-            this.latestWriterTree = driver_utils_1.buildSnapshotTree(tree.entries, this.blobsWriter);
-            // Do not reset this.commitsWriter - runtime will reference same commits in future snapshots
-            // if data store did not change in between two snapshots.
-            // We can optimize here by filtering commits based on contents of this.docTree.commits
-        }
-        this.onCommitHandler(dataStoreName, tree);
-        return {
-            id: commitName,
-            date: new Date().toUTCString(),
-            treeId: FileStorageVersionTreeIdUnused,
-        };
-    }
-    async writeOutFullSnapshot(tree) {
-        const commits = {};
-        // Sort keys. This does not guarantees that JSON.stringify() would produce sorted result,
-        // but in practice it does.
-        const commitsSorted = {};
-        for (const key of Object.keys(commits).sort()) {
-            commitsSorted[key] = commits[key];
-        }
-        const fileSnapshot = { tree, commits: commitsSorted };
+        this.latestWriterTree = driver_utils_1.buildSnapshotTree(tree.entries, this.blobsWriter);
+        const fileSnapshot = { tree, commits: {} };
         this.onSnapshotHandler(fileSnapshot);
-    }
-    sortTree(tree) {
-        tree.entries.sort((a, b) => a.path.localeCompare(b.path));
-        tree.entries.map((entry) => {
-            if (entry.type === api.TreeEntry.Tree) {
-                this.sortTree(entry.value);
-            }
-        });
+        return "testHandleId";
     }
     async buildTree(snapshotTree) {
         const tree = { entries: [] };

package/dist/fileDocumentStorageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileDocumentStorageService.js","sourceRoot":"","sources":["../src/fileDocumentStorageService.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 fs from \"fs\";\nimport { assert, bufferToString } from \"@fluidframework/common-utils\";\nimport {\n    IDocumentStorageService,\n    IDocumentStorageServicePolicies,    // these are needed for api-extractor\n    ISummaryContext,                    // these are needed for api-extractor\n} from \"@fluidframework/driver-definitions\";\nimport { buildSnapshotTree } from \"@fluidframework/driver-utils\";\nimport * as api from \"@fluidframework/protocol-definitions\";\nimport { IFileSnapshot, ReadDocumentStorageServiceBase } from \"@fluidframework/replay-driver\";\n\n// This ID is used by replay tool as Document Id.\n// We leverage it to figure out when container is asking for root document tree.\nexport const FileStorageDocumentName = \"FileStorageDocId\"; // Some unique document name\n\n// Tree ID use to communicate between getVersions() & getSnapshotTree() that IVersion is ours.\nconst FileStorageVersionTreeId = \"FileStorageTreeId\";\n\n// This ID should not show up anywhere, as it's internal only ID that no public API should accept.\nconst FileStorageVersionTreeIdUnused = \"baad\";\n\n/**\n * Document storage service for the file driver.\n */\nexport class FluidFetchReader extends ReadDocumentStorageServiceBase implements IDocumentStorageService {\n    protected docTree: api.ISnapshotTree | null = null;\n\n    constructor(private readonly path: string, private readonly versionName?: string) {\n        super();\n    }\n\n    /**\n     * Read the file and returns the snapshot tree.\n     * @param version - The version contains the path of the file which contains the snapshot tree.\n     */\n    public async getSnapshotTree(version?: api.IVersion): Promise<api.ISnapshotTree | null> {\n        assert(version !== null, 0x092 /* \"version input for reading snapshot tree is null!\" */);\n        assert(!version || version.treeId === FileStorageVersionTreeId,\n            0x093 /* \"invalid version input for reading snapshot tree!\" */);\n\n        let filename: string;\n        let rootTree = false;\n        if (!version || version.id === \"latest\") {\n            if (this.docTree) {\n                return this.docTree;\n            }\n            if (this.versionName === undefined) {\n                return null;\n            }\n            rootTree = true;\n            filename = `${this.path}/${this.versionName}/tree.json`;\n        } else {\n            filename = `${this.path}/${this.versionName}/${version.id}.json`;\n        }\n\n        if (!fs.existsSync(filename)) {\n            throw new Error(`Can't find file ${filename}`);\n        }\n        const data = fs.readFileSync(filename);\n        const tree = JSON.parse(data.toString(\"utf-8\"));\n        if (rootTree) {\n            this.docTree = tree;\n        }\n        // Fill in this.commit right here?\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n        return tree;\n    }\n\n    /**\n     * Gets the path of the snapshot tree to be read.\n     * @param versionId - version ID.\n     * @param count - Number of versions to be returned.\n     */\n    public async getVersions(versionId: string | null, count: number): Promise<api.IVersion[]> {\n        if (versionId === FileStorageDocumentName || versionId === null) {\n            if (this.docTree || this.versionName !== undefined) {\n                return [{ id: \"latest\", treeId: FileStorageVersionTreeId }];\n            }\n            // Started with ops - return empty set.\n            return [];\n        } else if (this.versionName !== undefined) {\n            // We loaded from snapshot - search for commit there.\n            assert(!!this.docTree, 0x094 /* \"Missing snapshot tree!\" */);\n            return [{\n                id: versionId,\n                treeId: FileStorageVersionTreeId,\n            }];\n        }\n        throw new Error(`Unknown version: ${versionId}`);\n    }\n\n    public async readBlob(sha: string): Promise<ArrayBufferLike> {\n        if (this.versionName !== undefined) {\n            const fileName = `${this.path}/${this.versionName}/${sha}`;\n            if (fs.existsSync(fileName)) {\n                const data = fs.readFileSync(fileName);\n                return data;\n            }\n        }\n        throw new Error(`Can't find blob ${sha}`);\n    }\n}\n\nexport interface ISnapshotWriterStorage extends IDocumentStorageService {\n    onCommitHandler(dataStoreName: string, tree: api.ITree): void;\n    onSnapshotHandler(snapshot: IFileSnapshot): void;\n    reset(): void;\n}\n\nexport type ReaderConstructor = new (...args: any[]) => IDocumentStorageService;\nexport const FileSnapshotWriterClassFactory = <TBase extends ReaderConstructor>(Base: TBase) =>\n    class extends Base implements ISnapshotWriterStorage {\n        // Note: if variable name has same name as in base class, it overrides it!\n        public blobsWriter = new Map<string, ArrayBufferLike>();\n        public commitsWriter: { [key: string]: api.ITree } = {};\n        public latestWriterTree?: api.ISnapshotTree;\n        public docId?: string;\n\n        public reset() {\n            this.blobsWriter = new Map<string, ArrayBufferLike>();\n            this.commitsWriter = {};\n            this.latestWriterTree = undefined;\n            this.docId = undefined;\n        }\n\n        public onCommitHandler(dataStoreName: string, tree: api.ITree): void {\n        }\n\n        public onSnapshotHandler(snapshot: IFileSnapshot): void {\n            throw new Error(\"onSnapshotHandler is not setup! Please provide your handler!\");\n        }\n\n        public async readBlob(sha: string): Promise<ArrayBufferLike> {\n            const blob = this.blobsWriter.get(sha);\n            if (blob !== undefined) {\n                return blob;\n            }\n            return super.readBlob(sha);\n        }\n\n        public async getVersions(versionId: string | null, count: number): Promise<api.IVersion[]> {\n            // If we already saved document, that means we are getting here because of snapshot generation.\n            // Not returning tree ensures that ContainerRuntime.snapshot() would regenerate subtrees for\n            // each unchanged data store.\n            // If we want to change that, we would need to capture docId on first call and return this.latestWriterTree\n            // when latest is requested.\n            if (this.latestWriterTree && (this.docId === versionId || versionId === null)) {\n                return [{ id: \"latest\", treeId: FileStorageVersionTreeId }];\n            }\n\n            if (this.docId === undefined && versionId !== null) {\n                this.docId = versionId;\n            }\n\n            if (versionId !== null && this.commitsWriter[versionId] !== undefined) {\n                // PrefetchDocumentStorageService likes to prefetch everything!\n                // Skip, as Container does not really need it.\n                throw new Error(\"Not supporting commit loading\");\n                // Return [{id: versionId, treeId: FileStorageVersionTreeId}];\n            }\n            return super.getVersions(versionId, count);\n        }\n\n        public async getSnapshotTree(version?: api.IVersion): Promise<api.ISnapshotTree | null> {\n            if (this.latestWriterTree && (!version || version.id === \"latest\")) {\n                return this.latestWriterTree;\n            }\n            if (version && this.commitsWriter[version.id] !== undefined) {\n                return buildSnapshotTree(this.commitsWriter[version.id].entries, this.blobsWriter);\n            }\n            return super.getSnapshotTree(version);\n        }\n\n        public async write(\n            tree: api.ITree,\n            parents: string[],\n            message: string,\n            ref: string): Promise<api.IVersion> {\n            let dataStoreName = ref ? ref : \"container\";\n            if (tree && tree.entries) {\n                tree.entries.forEach((entry) => {\n                    if (entry.path === \".component\" && entry.type === api.TreeEntry.Blob) {\n                        const blob: api.IBlob = entry.value;\n                        const content = blob.contents.split(\":\");\n                        if (content[0] === `{\"pkg\"`) {\n                            dataStoreName = content[1].substring(1, content[1].lastIndexOf(`\"`));\n                        }\n                    }\n                });\n            }\n\n            const commitName = `commit_${dataStoreName}`;\n\n            // Sort entries for easier diffing\n            this.sortTree(tree);\n\n            // Remove tree IDs for easier comparison of snapshots\n            delete tree.id;\n            removeNullTreeIds(tree);\n\n            if (ref) {\n                this.commitsWriter[commitName] = tree;\n            } else {\n                // Rebuild latest tree - runtime will ask for it when generating next snapshot to write out\n                // non-changed commits for data stores\n                await this.writeOutFullSnapshot(tree);\n\n                // Prep for the future - refresh latest tree, as it's requests on next snapshot generation.\n                // Do not care about blobs (at least for now), as blobs are not written out (need follow up)\n                this.latestWriterTree = buildSnapshotTree(tree.entries, this.blobsWriter);\n\n                // Do not reset this.commitsWriter - runtime will reference same commits in future snapshots\n                // if data store did not change in between two snapshots.\n                // We can optimize here by filtering commits based on contents of this.docTree.commits\n            }\n\n            this.onCommitHandler(dataStoreName, tree);\n            return {\n                id: commitName,\n                date: new Date().toUTCString(),\n                treeId: FileStorageVersionTreeIdUnused,\n            };\n        }\n\n        public async writeOutFullSnapshot(tree: api.ITree) {\n            const commits: { [key: string]: api.ITree } = {};\n\n            // Sort keys. This does not guarantees that JSON.stringify() would produce sorted result,\n            // but in practice it does.\n            const commitsSorted: { [key: string]: api.ITree } = {};\n            for (const key of Object.keys(commits).sort()) {\n                commitsSorted[key] = commits[key];\n            }\n\n            const fileSnapshot: IFileSnapshot = { tree, commits: commitsSorted };\n            this.onSnapshotHandler(fileSnapshot);\n        }\n\n        public sortTree(tree: api.ITree) {\n            tree.entries.sort((a, b) => a.path.localeCompare(b.path));\n            tree.entries.map((entry) => {\n                if (entry.type === api.TreeEntry.Tree) {\n                    this.sortTree(entry.value);\n                }\n            });\n        }\n\n        public async buildTree(snapshotTree: api.ISnapshotTree): Promise<api.ITree> {\n            const tree: api.ITree = { entries: [] };\n\n            for (const subTreeId of Object.keys(snapshotTree.trees)) {\n                const subTree = await this.buildTree(snapshotTree.trees[subTreeId]);\n                tree.entries.push({\n                    mode: api.FileMode.Directory,\n                    path: subTreeId,\n                    type: api.TreeEntry.Tree,\n                    value: subTree,\n                });\n            }\n\n            for (const blobName of Object.keys(snapshotTree.blobs)) {\n                const buffer = await this.readBlob(snapshotTree.blobs[blobName]);\n                const contents = bufferToString(buffer, \"utf8\");\n                const blob: api.IBlob = {\n                    contents,\n                    encoding: \"utf-8\",\n                };\n                tree.entries.push({\n                    mode: api.FileMode.File,\n                    path: blobName,\n                    type: api.TreeEntry.Blob,\n                    value: blob,\n                });\n            }\n\n            assert(Object.keys(snapshotTree.commits).length === 0,\n                0x095 /* \"Leftover distinct commits after building tree!\" */);\n            return tree;\n        }\n    };\n\nfunction removeNullTreeIds(tree: api.ITree) {\n    for (const node of tree.entries) {\n        if (node.type === api.TreeEntry.Tree) {\n            removeNullTreeIds(node.value);\n        }\n    }\n    assert(tree.id === undefined || tree.id === null,\n        0x096 /* \"Trying to remove valid tree IDs in removeNullTreeIds()!\" */);\n    delete tree.id;\n}\n\nexport const FluidFetchReaderFileSnapshotWriter = FileSnapshotWriterClassFactory(FluidFetchReader);\n"]}
+{"version":3,"file":"fileDocumentStorageService.js","sourceRoot":"","sources":["../src/fileDocumentStorageService.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 fs from \"fs\";\nimport { assert, bufferToString } from \"@fluidframework/common-utils\";\nimport {\n    IDocumentStorageService,\n    IDocumentStorageServicePolicies,    // these are needed for api-extractor\n    ISummaryContext,                    // these are needed for api-extractor\n} from \"@fluidframework/driver-definitions\";\nimport { buildSnapshotTree, convertSummaryTreeToSnapshotITree } from \"@fluidframework/driver-utils\";\nimport * as api from \"@fluidframework/protocol-definitions\";\nimport { IFileSnapshot, ReadDocumentStorageServiceBase } from \"@fluidframework/replay-driver\";\n\n// This ID is used by replay tool as Document Id.\n// We leverage it to figure out when container is asking for root document tree.\nexport const FileStorageDocumentName = \"FileStorageDocId\"; // Some unique document name\n\n// Tree ID use to communicate between getVersions() & getSnapshotTree() that IVersion is ours.\nconst FileStorageVersionTreeId = \"FileStorageTreeId\";\n\n/**\n * Document storage service for the file driver.\n */\nexport class FluidFetchReader extends ReadDocumentStorageServiceBase implements IDocumentStorageService {\n    protected docTree: api.ISnapshotTree | null = null;\n\n    constructor(private readonly path: string, private readonly versionName?: string) {\n        super();\n    }\n\n    /**\n     * Read the file and returns the snapshot tree.\n     * @param version - The version contains the path of the file which contains the snapshot tree.\n     */\n    public async getSnapshotTree(version?: api.IVersion): Promise<api.ISnapshotTree | null> {\n        assert(version !== null, 0x092 /* \"version input for reading snapshot tree is null!\" */);\n        assert(!version || version.treeId === FileStorageVersionTreeId,\n            0x093 /* \"invalid version input for reading snapshot tree!\" */);\n\n        let filename: string;\n        let rootTree = false;\n        if (!version || version.id === \"latest\") {\n            if (this.docTree) {\n                return this.docTree;\n            }\n            if (this.versionName === undefined) {\n                return null;\n            }\n            rootTree = true;\n            filename = `${this.path}/${this.versionName}/tree.json`;\n        } else {\n            filename = `${this.path}/${this.versionName}/${version.id}.json`;\n        }\n\n        if (!fs.existsSync(filename)) {\n            throw new Error(`Can't find file ${filename}`);\n        }\n        const data = fs.readFileSync(filename);\n        const tree = JSON.parse(data.toString(\"utf-8\"));\n        if (rootTree) {\n            this.docTree = tree;\n        }\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n        return tree;\n    }\n\n    /**\n     * Gets the path of the snapshot tree to be read.\n     * @param versionId - version ID.\n     * @param count - Number of versions to be returned.\n     */\n    public async getVersions(versionId: string | null, count: number): Promise<api.IVersion[]> {\n        if (versionId === FileStorageDocumentName || versionId === null) {\n            if (this.docTree || this.versionName !== undefined) {\n                return [{ id: \"latest\", treeId: FileStorageVersionTreeId }];\n            }\n            // Started with ops - return empty set.\n            return [];\n        } else if (this.versionName !== undefined) {\n            assert(!!this.docTree, 0x094 /* \"Missing snapshot tree!\" */);\n            return [{\n                id: versionId,\n                treeId: FileStorageVersionTreeId,\n            }];\n        }\n        throw new Error(`Unknown version: ${versionId}`);\n    }\n\n    public async readBlob(sha: string): Promise<ArrayBufferLike> {\n        if (this.versionName !== undefined) {\n            const fileName = `${this.path}/${this.versionName}/${sha}`;\n            if (fs.existsSync(fileName)) {\n                const data = fs.readFileSync(fileName);\n                return data;\n            }\n        }\n        throw new Error(`Can't find blob ${sha}`);\n    }\n}\n\nexport interface ISnapshotWriterStorage extends IDocumentStorageService {\n    onSnapshotHandler(snapshot: IFileSnapshot): void;\n    reset(): void;\n}\n\nexport type ReaderConstructor = new (...args: any[]) => IDocumentStorageService;\nexport const FileSnapshotWriterClassFactory = <TBase extends ReaderConstructor>(Base: TBase) =>\n    class extends Base implements ISnapshotWriterStorage {\n        // Note: if variable name has same name as in base class, it overrides it!\n        public blobsWriter = new Map<string, ArrayBufferLike>();\n        public latestWriterTree?: api.ISnapshotTree;\n        public docId?: string;\n\n        public reset() {\n            this.blobsWriter = new Map<string, ArrayBufferLike>();\n            this.latestWriterTree = undefined;\n            this.docId = undefined;\n        }\n\n        public onSnapshotHandler(snapshot: IFileSnapshot): void {\n            throw new Error(\"onSnapshotHandler is not setup! Please provide your handler!\");\n        }\n\n        public async readBlob(sha: string): Promise<ArrayBufferLike> {\n            const blob = this.blobsWriter.get(sha);\n            if (blob !== undefined) {\n                return blob;\n            }\n            return super.readBlob(sha);\n        }\n\n        public async getVersions(versionId: string | null, count: number): Promise<api.IVersion[]> {\n            // If we already saved document, that means we are getting here because of snapshot generation.\n            // Not returning tree ensures that ContainerRuntime.snapshot() would regenerate subtrees for\n            // each unchanged data store.\n            // If we want to change that, we would need to capture docId on first call and return this.latestWriterTree\n            // when latest is requested.\n            if (this.latestWriterTree && (this.docId === versionId || versionId === null)) {\n                return [{ id: \"latest\", treeId: FileStorageVersionTreeId }];\n            }\n\n            if (this.docId === undefined && versionId !== null) {\n                this.docId = versionId;\n            }\n\n            return super.getVersions(versionId, count);\n        }\n\n        public async getSnapshotTree(version?: api.IVersion): Promise<api.ISnapshotTree | null> {\n            if (this.latestWriterTree && (!version || version.id === \"latest\")) {\n                return this.latestWriterTree;\n            }\n            return super.getSnapshotTree(version);\n        }\n\n        public async uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string> {\n            const tree = convertSummaryTreeToSnapshotITree(summary);\n\n            // Remove tree IDs for easier comparison of snapshots\n            delete tree.id;\n            removeNullTreeIds(tree);\n\n            this.latestWriterTree = buildSnapshotTree(tree.entries, this.blobsWriter);\n\n            const fileSnapshot: IFileSnapshot = { tree, commits: {} };\n            this.onSnapshotHandler(fileSnapshot);\n            return \"testHandleId\";\n        }\n\n        public async buildTree(snapshotTree: api.ISnapshotTree): Promise<api.ITree> {\n            const tree: api.ITree = { entries: [] };\n\n            for (const subTreeId of Object.keys(snapshotTree.trees)) {\n                const subTree = await this.buildTree(snapshotTree.trees[subTreeId]);\n                tree.entries.push({\n                    mode: api.FileMode.Directory,\n                    path: subTreeId,\n                    type: api.TreeEntry.Tree,\n                    value: subTree,\n                });\n            }\n\n            for (const blobName of Object.keys(snapshotTree.blobs)) {\n                const buffer = await this.readBlob(snapshotTree.blobs[blobName]);\n                const contents = bufferToString(buffer, \"utf8\");\n                const blob: api.IBlob = {\n                    contents,\n                    encoding: \"utf-8\",\n                };\n                tree.entries.push({\n                    mode: api.FileMode.File,\n                    path: blobName,\n                    type: api.TreeEntry.Blob,\n                    value: blob,\n                });\n            }\n\n            assert(Object.keys(snapshotTree.commits).length === 0,\n                0x095 /* \"Leftover distinct commits after building tree!\" */);\n            return tree;\n        }\n    };\n\nfunction removeNullTreeIds(tree: api.ITree) {\n    for (const node of tree.entries) {\n        if (node.type === api.TreeEntry.Tree) {\n            removeNullTreeIds(node.value);\n        }\n    }\n    assert(tree.id === undefined || tree.id === null,\n        0x096 /* \"Trying to remove valid tree IDs in removeNullTreeIds()!\" */);\n    delete tree.id;\n}\nexport const FluidFetchReaderFileSnapshotWriter = FileSnapshotWriterClassFactory(FluidFetchReader);\n"]}

package/dist/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/file-driver";
-export declare const pkgVersion = "0.56.7";
+export declare const pkgVersion = "0.57.1";
 //# sourceMappingURL=packageVersion.d.ts.map

package/dist/packageVersion.js

@@ -8,5 +8,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pkgVersion = exports.pkgName = void 0;
 exports.pkgName = "@fluidframework/file-driver";
-exports.pkgVersion = "0.56.7";
+exports.pkgVersion = "0.57.1";
 //# sourceMappingURL=packageVersion.js.map

package/dist/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,6BAA6B,CAAC;AACxC,QAAA,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/file-driver\";\nexport const pkgVersion = \"0.56.7\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEU,QAAA,OAAO,GAAG,6BAA6B,CAAC;AACxC,QAAA,UAAU,GAAG,QAAQ,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/file-driver\";\nexport const pkgVersion = \"0.57.1\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/file-driver",
-  "version": "0.56.7",
+  "version": "0.57.1",
   "description": "A driver that reads/write from/to local file storage.",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -31,13 +31,13 @@
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
     "@fluidframework/driver-definitions": "^0.44.0",
-    "@fluidframework/driver-utils": "^0.56.7",
+    "@fluidframework/driver-utils": "^0.57.1",
     "@fluidframework/protocol-definitions": "^0.1026.0",
-    "@fluidframework/replay-driver": "^0.56.7"
+    "@fluidframework/replay-driver": "^0.57.1"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.25.0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/node": "^14.18.0",

package/src/fileDocumentStorageService.ts

@@ -10,7 +10,7 @@ import {
     IDocumentStorageServicePolicies,    // these are needed for api-extractor
     ISummaryContext,                    // these are needed for api-extractor
 } from "@fluidframework/driver-definitions";
-import { buildSnapshotTree } from "@fluidframework/driver-utils";
+import { buildSnapshotTree, convertSummaryTreeToSnapshotITree } from "@fluidframework/driver-utils";
 import * as api from "@fluidframework/protocol-definitions";
 import { IFileSnapshot, ReadDocumentStorageServiceBase } from "@fluidframework/replay-driver";
 
@@ -21,9 +21,6 @@ export const FileStorageDocumentName = "FileStorageDocId"; // Some unique docume
 // Tree ID use to communicate between getVersions() & getSnapshotTree() that IVersion is ours.
 const FileStorageVersionTreeId = "FileStorageTreeId";
 
-// This ID should not show up anywhere, as it's internal only ID that no public API should accept.
-const FileStorageVersionTreeIdUnused = "baad";
-
 /**
  * Document storage service for the file driver.
  */
@@ -66,7 +63,6 @@ export class FluidFetchReader extends ReadDocumentStorageServiceBase implements
         if (rootTree) {
             this.docTree = tree;
         }
-        // Fill in this.commit right here?
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return tree;
     }
@@ -84,7 +80,6 @@ export class FluidFetchReader extends ReadDocumentStorageServiceBase implements
             // Started with ops - return empty set.
             return [];
         } else if (this.versionName !== undefined) {
-            // We loaded from snapshot - search for commit there.
             assert(!!this.docTree, 0x094 /* "Missing snapshot tree!" */);
             return [{
                 id: versionId,
@@ -107,7 +102,6 @@ export class FluidFetchReader extends ReadDocumentStorageServiceBase implements
 }
 
 export interface ISnapshotWriterStorage extends IDocumentStorageService {
-    onCommitHandler(dataStoreName: string, tree: api.ITree): void;
     onSnapshotHandler(snapshot: IFileSnapshot): void;
     reset(): void;
 }
@@ -117,20 +111,15 @@ export const FileSnapshotWriterClassFactory = <TBase extends ReaderConstructor>(
     class extends Base implements ISnapshotWriterStorage {
         // Note: if variable name has same name as in base class, it overrides it!
         public blobsWriter = new Map<string, ArrayBufferLike>();
-        public commitsWriter: { [key: string]: api.ITree } = {};
         public latestWriterTree?: api.ISnapshotTree;
         public docId?: string;
 
         public reset() {
             this.blobsWriter = new Map<string, ArrayBufferLike>();
-            this.commitsWriter = {};
             this.latestWriterTree = undefined;
             this.docId = undefined;
         }
 
-        public onCommitHandler(dataStoreName: string, tree: api.ITree): void {
-        }
-
         public onSnapshotHandler(snapshot: IFileSnapshot): void {
             throw new Error("onSnapshotHandler is not setup! Please provide your handler!");
         }
@@ -157,12 +146,6 @@ export const FileSnapshotWriterClassFactory = <TBase extends ReaderConstructor>(
                 this.docId = versionId;
             }
 
-            if (versionId !== null && this.commitsWriter[versionId] !== undefined) {
-                // PrefetchDocumentStorageService likes to prefetch everything!
-                // Skip, as Container does not really need it.
-                throw new Error("Not supporting commit loading");
-                // Return [{id: versionId, treeId: FileStorageVersionTreeId}];
-            }
             return super.getVersions(versionId, count);
         }
 
@@ -170,84 +153,21 @@ export const FileSnapshotWriterClassFactory = <TBase extends ReaderConstructor>(
             if (this.latestWriterTree && (!version || version.id === "latest")) {
                 return this.latestWriterTree;
             }
-            if (version && this.commitsWriter[version.id] !== undefined) {
-                return buildSnapshotTree(this.commitsWriter[version.id].entries, this.blobsWriter);
-            }
             return super.getSnapshotTree(version);
         }
 
-        public async write(
-            tree: api.ITree,
-            parents: string[],
-            message: string,
-            ref: string): Promise<api.IVersion> {
-            let dataStoreName = ref ? ref : "container";
-            if (tree && tree.entries) {
-                tree.entries.forEach((entry) => {
-                    if (entry.path === ".component" && entry.type === api.TreeEntry.Blob) {
-                        const blob: api.IBlob = entry.value;
-                        const content = blob.contents.split(":");
-                        if (content[0] === `{"pkg"`) {
-                            dataStoreName = content[1].substring(1, content[1].lastIndexOf(`"`));
-                        }
-                    }
-                });
-            }
-
-            const commitName = `commit_${dataStoreName}`;
-
-            // Sort entries for easier diffing
-            this.sortTree(tree);
+        public async uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string> {
+            const tree = convertSummaryTreeToSnapshotITree(summary);
 
             // Remove tree IDs for easier comparison of snapshots
             delete tree.id;
             removeNullTreeIds(tree);
 
-            if (ref) {
-                this.commitsWriter[commitName] = tree;
-            } else {
-                // Rebuild latest tree - runtime will ask for it when generating next snapshot to write out
-                // non-changed commits for data stores
-                await this.writeOutFullSnapshot(tree);
-
-                // Prep for the future - refresh latest tree, as it's requests on next snapshot generation.
-                // Do not care about blobs (at least for now), as blobs are not written out (need follow up)
-                this.latestWriterTree = buildSnapshotTree(tree.entries, this.blobsWriter);
+            this.latestWriterTree = buildSnapshotTree(tree.entries, this.blobsWriter);
 
-                // Do not reset this.commitsWriter - runtime will reference same commits in future snapshots
-                // if data store did not change in between two snapshots.
-                // We can optimize here by filtering commits based on contents of this.docTree.commits
-            }
-
-            this.onCommitHandler(dataStoreName, tree);
-            return {
-                id: commitName,
-                date: new Date().toUTCString(),
-                treeId: FileStorageVersionTreeIdUnused,
-            };
-        }
-
-        public async writeOutFullSnapshot(tree: api.ITree) {
-            const commits: { [key: string]: api.ITree } = {};
-
-            // Sort keys. This does not guarantees that JSON.stringify() would produce sorted result,
-            // but in practice it does.
-            const commitsSorted: { [key: string]: api.ITree } = {};
-            for (const key of Object.keys(commits).sort()) {
-                commitsSorted[key] = commits[key];
-            }
-
-            const fileSnapshot: IFileSnapshot = { tree, commits: commitsSorted };
+            const fileSnapshot: IFileSnapshot = { tree, commits: {} };
             this.onSnapshotHandler(fileSnapshot);
-        }
-
-        public sortTree(tree: api.ITree) {
-            tree.entries.sort((a, b) => a.path.localeCompare(b.path));
-            tree.entries.map((entry) => {
-                if (entry.type === api.TreeEntry.Tree) {
-                    this.sortTree(entry.value);
-                }
-            });
+            return "testHandleId";
         }
 
         public async buildTree(snapshotTree: api.ISnapshotTree): Promise<api.ITree> {
@@ -294,5 +214,4 @@ function removeNullTreeIds(tree: api.ITree) {
         0x096 /* "Trying to remove valid tree IDs in removeNullTreeIds()!" */);
     delete tree.id;
 }
-
 export const FluidFetchReaderFileSnapshotWriter = FileSnapshotWriterClassFactory(FluidFetchReader);

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/file-driver";
-export const pkgVersion = "0.56.7";
+export const pkgVersion = "0.57.1";