bruce-models 7.1.119 → 7.1.121

package/README.md

@@ -48,6 +48,32 @@ parameters. Both filters accept a single value or an array. Use
 
 <br>
 
+### Client File folders
+
+`ClientFileFolder` manages virtual folders through `Get`, `GetList`, `Create`, `Update`, and `Delete`.
+Deleting a folder moves its files and immediate subfolders into its parent, or the top level; it preserves file data.
+
+```ts
+const { folder } = await ClientFileFolder.Create({ api, folder: { Name: "Plans" } });
+await ClientFile.Upload({ api, file, folderId: folder.ID, purpose: "Import" });
+await ClientFile.Update({ api, fileId, folderId: folder.ID });
+const { clientFiles } = await ClientFile.GetList({
+    api, filter: { "ClientFileFolder.ID": folder.ID, Purpose: "Import" }
+});
+const { folders } = await ClientFileFolder.GetList({ api, parentFolderId: folder.ID });
+```
+
+Omit the folder filter to include all folders; use `0` (or `null` in JSON filters) for top-level files.
+Folder filters combine with the existing criteria and layer permissions. `ClientFile.GetListByQuery`
+wraps `GET files` and also returns `nextPage` and `nextPageUrl`. Existing `GetList` callers keep using
+`POST files/filtered` without changes.
+
+`ClientFile.Update`, `UpdateList`, `ReplaceContent`, and `Upload` support folder membership. On updates,
+omit the field to preserve it; set `null` or `0` to clear it. Upload metadata is carried on every multipart request.
+All four `GetCounts*` methods accept `folderId`, with separate caches for each folder and the unfiltered result.
+Pass bigint IDs outside JavaScript's safe integer range as decimal strings when supplying IDs to these methods.
+Folder permissions and record-change events use the `clff` concept code.
+
 ### Local build
 
 - `npm i`

package/dist/bruce-models.es5.js

@@ -48,6 +48,7 @@ var Api;
         ECacheKey["ProjectViewBookmark"] = "pvbookmark";
         ECacheKey["Tileset"] = "tileset";
         ECacheKey["ClientFile"] = "clientfile";
+        ECacheKey["ClientFileFolder"] = "clientfilefolder";
         ECacheKey["ClientFileCountsPurpose"] = "clientfilecountspurpose";
         ECacheKey["ClientFileCountsExtension"] = "clientfilecountsextensions";
         ECacheKey["ClientFileCountsMIMEType"] = "clientfilecountsmimetypes";
@@ -340,6 +341,7 @@ var AccountConcept;
         EConcept["ATTACHMENT_TYPE"] = "at";
         EConcept["CHANGE_SET"] = "cs";
         EConcept["CLIENT_FILE"] = "clf";
+        EConcept["CLIENT_FILE_FOLDER"] = "clff";
         EConcept["COMMENT"] = "cm";
         EConcept["CUSTOM_FORM"] = "csf";
         EConcept["DATA_FEED"] = "df";
@@ -416,6 +418,7 @@ var AccountConcept;
         { concept: EConcept.ATTACHMENT_TYPE, label: "Attachment Type", description: undefined },
         { concept: EConcept.CHANGE_SET, label: "Change Set", description: undefined },
         { concept: EConcept.CLIENT_FILE, label: "Client File", description: undefined },
+        { concept: EConcept.CLIENT_FILE_FOLDER, label: "Client File Folder", description: "Virtual folders for Client Files" },
         { concept: EConcept.CUSTOM_FORM, label: "Custom Form", description: undefined },
         { concept: EConcept.DATA_FEED, label: "Data Feed", description: undefined },
         { concept: EConcept.DATA_LAB_QUERY, label: "DataLab Query", description: undefined },
@@ -666,6 +669,8 @@ var RecordChangeFeed;
                 return [Api.ECacheKey.Assembly];
             case AccountConcept.EConcept.ATTACHMENT_TYPE:
                 return [Api.ECacheKey.AttachmentType];
+            case AccountConcept.EConcept.CLIENT_FILE_FOLDER:
+                return [Api.ECacheKey.ClientFileFolder, ...RecordChangeFeed.getConceptCacheKeys(AccountConcept.EConcept.CLIENT_FILE)];
             case AccountConcept.EConcept.CLIENT_FILE:
                 return [
                     Api.ECacheKey.ClientFile,
@@ -4139,6 +4144,18 @@ var AnnDocument;
         });
     }
     AnnDocument.UploadPDF = UploadPDF;
+    /** Renders every page of an existing PDF without saving a Document View. */
+    function ImportPages(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { fileId, req } = params;
+            if (!fileId || !fileId.trim()) {
+                throw new Error("File ID is required.");
+            }
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            return api.POST("documentView/importPages", { "ClientFile.ID": fileId }, Api.PrepReqParams(req));
+        });
+    }
+    AnnDocument.ImportPages = ImportPages;
     /**
      * Returns an annotated document by ID.
      * @param params
@@ -6821,7 +6838,7 @@ var Entity;
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const urlParams = new URLSearchParams();
-                    let expand;
+                    let expand = "";
                     if (expandLocation) {
                         expand = "location";
                     }
@@ -9150,6 +9167,18 @@ var Uploader;
                         const blob = file.slice(fileOffset, fileOffset + partSize);
                         const partialFile = new File([blob], file.name, { type: file.type });
                         const formData = new FormData();
+                        // Keep custom metadata on every part, including retries. Core transport fields are controlled below.
+                        const appendField = (key, value) => {
+                            if (!["file", "token", "count", "part", "originalfilename"].includes(key.toLowerCase())) {
+                                formData.append(key, value);
+                            }
+                        };
+                        if (typeof FormData !== "undefined" && (req === null || req === void 0 ? void 0 : req.formData) instanceof FormData) {
+                            req.formData.forEach((value, key) => appendField(key, value));
+                        }
+                        else if (req === null || req === void 0 ? void 0 : req.formData) {
+                            Object.keys(req.formData).forEach(key => appendField(key, req.formData[key]));
+                        }
                         formData.append("originalFileName", file.name);
                         formData.append("token", uploadToken);
                         formData.append("count", "" + filePartsCount);
@@ -9215,6 +9244,101 @@ var Uploader;
     Uploader.DoMultiPartUpload = DoMultiPartUpload;
 })(Uploader || (Uploader = {}));
 
+/** Virtual folders organize Client Files without changing their storage paths or versions. */
+var ClientFileFolder;
+(function (ClientFileFolder) {
+    /** Validate and normalize an ID for routes, queries and cache keys without rounding it. */
+    function NormalizeId(id, allowZero = false) {
+        if (typeof id === "number" && (!Number.isSafeInteger(id) || id < 0)) {
+            throw new Error("Folder ID must be a safe integer, or a decimal string for a larger bigint ID.");
+        }
+        if ((typeof id !== "string" && typeof id !== "number") || !/^\d+$/.test(String(id))) {
+            throw new Error("Folder ID must be a non-negative decimal integer.");
+        }
+        const value = String(id).replace(/^0+(?=\d)/, "");
+        if ((!allowZero && value === "0") || value.length > 19 ||
+            (value.length === 19 && value > "9223372036854775807")) {
+            throw new Error("Folder ID must be a positive signed 64-bit integer (0 is allowed only for the top level or creation).");
+        }
+        return value;
+    }
+    ClientFileFolder.NormalizeId = NormalizeId;
+    function Get(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = NormalizeId(params.folderId);
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            const key = GetCacheKey(id);
+            const cache = api.GetCacheItem(key, params.req);
+            if (cache === null || cache === void 0 ? void 0 : cache.found)
+                return cache.data;
+            const promise = api.GET(`clientFileFolder/${id}`, Api.PrepReqParams(params.req))
+                .then(folder => ({ folder }));
+            api.SetCacheItem({ key, value: promise, req: params.req });
+            return promise;
+        });
+    }
+    ClientFileFolder.Get = Get;
+    /** Omit parentFolderId for all folders. Null or 0 selects only top-level folders. */
+    function GetList(params = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            const parent = params.parentFolderId === undefined ? undefined : NormalizeId(params.parentFolderId == null ? 0 : params.parentFolderId, true);
+            const key = GetListCacheKey(parent);
+            const cache = api.GetCacheItem(key, params.req);
+            if (cache === null || cache === void 0 ? void 0 : cache.found)
+                return cache.data;
+            const url = "clientFileFolders" + (parent === undefined ? "" : `?parent_folder_id=${parent}`);
+            const promise = api.GET(url, Api.PrepReqParams(params.req))
+                .then(data => ({ folders: (data === null || data === void 0 ? void 0 : data.Items) || [] }));
+            api.SetCacheItem({ key, value: promise, req: params.req });
+            return promise;
+        });
+    }
+    ClientFileFolder.GetList = GetList;
+    /** Create when folderId and folder.ID are omitted or 0; otherwise update only supplied fields. */
+    function Update(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!params.folder)
+                throw new Error("Folder data is required.");
+            const folder = Object.assign({}, params.folder);
+            const id = NormalizeId(params.folderId !== undefined ? params.folderId : folder.ID == null ? 0 : folder.ID, true);
+            if (folder["Parent.ClientFileFolder.ID"] != null)
+                NormalizeId(folder["Parent.ClientFileFolder.ID"], true);
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            const result = yield api.POST(`clientFileFolder/${id}`, folder, Api.PrepReqParams(params.req));
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFileFolder);
+            return { folder: result };
+        });
+    }
+    ClientFileFolder.Update = Update;
+    function Create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Update(Object.assign(Object.assign({}, params), { folderId: 0 }));
+        });
+    }
+    ClientFileFolder.Create = Create;
+    /** Contents move into the deleted folder's parent (or the top level); files are preserved. */
+    function Delete(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = NormalizeId(params.folderId);
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            yield api.DELETE(`clientFileFolder/${id}`, Api.PrepReqParams(params.req));
+            // This prefix also covers folder records and all scoped file-count caches.
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFile);
+        });
+    }
+    ClientFileFolder.Delete = Delete;
+    function GetCacheKey(folderId) {
+        return `${Api.ECacheKey.ClientFileFolder}${Api.ECacheKey.Id}${NormalizeId(folderId)}`;
+    }
+    ClientFileFolder.GetCacheKey = GetCacheKey;
+    function GetListCacheKey(parentFolderId) {
+        const parent = parentFolderId === undefined ? "all" : NormalizeId(parentFolderId == null ? 0 : parentFolderId, true);
+        return `${Api.ECacheKey.ClientFileFolder}${Api.ECacheKey.ListId}${parent}`;
+    }
+    ClientFileFolder.GetListCacheKey = GetListCacheKey;
+})(ClientFileFolder || (ClientFileFolder = {}));
+
 /**
  * Describes the "Client File" concept within Nextspace.
  * A client file is a record of a file uploaded to Bruce.
@@ -9331,10 +9455,7 @@ var ClientFile;
                 Items: fileIds
             };
             yield api.POST("deleteFiles", data, Api.PrepReqParams(reqParams));
-            for (let i = 0; i < fileIds.length; i++) {
-                const key = GetCacheKey(fileIds[i]);
-                api.Cache.Remove(key);
-            }
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFile);
         });
     }
     ClientFile.Delete = Delete;
@@ -9345,7 +9466,7 @@ var ClientFile;
      */
     function Upload(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, file, purpose, req, onProgress } = params;
+            let { api, file, purpose, folderId, req, onProgress } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
@@ -9357,6 +9478,7 @@ var ClientFile;
                 throw ("You cannot upload a 0byte sized file.");
             }
             req = Api.PrepReqParams(req);
+            req = PrepareUploadMetadata(req, folderId, purpose);
             let clientFile;
             if (size > Uploader.MIN_LARGE_FILE_SIZE) {
                 clientFile = yield Uploader.DoMultiPartUpload({
@@ -9366,15 +9488,6 @@ var ClientFile;
                     req,
                     onProgress
                 });
-                // TODO: Check if we can add it to the request like the small file upload.
-                if ((clientFile === null || clientFile === void 0 ? void 0 : clientFile.ID) && purpose) {
-                    yield ClientFile.UpdatePurpose({
-                        api,
-                        fileId: clientFile.ID,
-                        purpose,
-                        req
-                    });
-                }
             }
             else {
                 req.onProgress = (progress) => {
@@ -9384,17 +9497,13 @@ var ClientFile;
                         uploaded: false
                     });
                 };
-                if (purpose) {
-                    req.formData = {
-                        Purpose: purpose
-                    };
-                }
                 clientFile = yield api.UPLOAD("file/uploadNew", file, req);
             }
             onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                 percent: 100,
                 uploaded: true
             });
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFile);
             return {
                 clientFile
             };
@@ -9407,11 +9516,18 @@ var ClientFile;
      */
     function Update(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, fileId, purpose, layerIds, req: reqParams, dataEntityId } = params;
+            let { api, fileId, purpose, layerIds, folderId, req: reqParams, dataEntityId } = params;
+            if (!fileId)
+                throw new Error("File ID is required.");
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             const data = {};
+            if (folderId !== undefined) {
+                if (folderId !== null)
+                    ClientFileFolder.NormalizeId(folderId, true);
+                data["ClientFileFolder.ID"] = folderId;
+            }
             if (layerIds != null) {
                 data["Layer.ID"] = layerIds;
             }
@@ -9422,8 +9538,7 @@ var ClientFile;
                 data["Data.Entity.ID"] = dataEntityId ? dataEntityId : "";
             }
             yield api.POST(`file/${fileId}/details`, data, Api.PrepReqParams(reqParams));
-            const cacheKey = GetCacheKey(fileId);
-            api.Cache.RemoveByContains(cacheKey);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFile);
         });
     }
     ClientFile.Update = Update;
@@ -9491,19 +9606,19 @@ var ClientFile;
      */
     function GetCountsPurpose(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, req: reqParams } = params;
+            let { api, folderId, req: reqParams } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = Api.PrepReqParams(reqParams);
-            const key = GetCountsPurposeCacheKey();
+            const key = GetCountsPurposeCacheKey(folderId);
             const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET("file/purpose/counts", Api.PrepReqParams(reqParams));
+                    const data = yield api.GET(FolderQuery("file/purpose/counts", folderId), Api.PrepReqParams(reqParams));
                     res({
                         counts: data
                     });
@@ -9530,19 +9645,19 @@ var ClientFile;
      */
     function GetCountsExtension(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, req: reqParams } = params;
+            let { api, folderId, req: reqParams } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = Api.PrepReqParams(reqParams);
-            const key = GetCountsExtensionCacheKey();
+            const key = GetCountsExtensionCacheKey(folderId);
             const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET("file/extension/counts", Api.PrepReqParams(reqParams));
+                    const data = yield api.GET(FolderQuery("file/extension/counts", folderId), Api.PrepReqParams(reqParams));
                     res({
                         counts: data
                     });
@@ -9569,19 +9684,19 @@ var ClientFile;
      */
     function GetCountsMIMEType(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, req: reqParams } = params;
+            let { api, folderId, req: reqParams } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = Api.PrepReqParams(reqParams);
-            const key = GetCountsMIMETypeCacheKey();
+            const key = GetCountsMIMETypeCacheKey(folderId);
             const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET("file/mimetype/counts", Api.PrepReqParams(reqParams));
+                    const data = yield api.GET(FolderQuery("file/mimetype/counts", folderId), Api.PrepReqParams(reqParams));
                     res({
                         counts: data
                     });
@@ -9608,19 +9723,19 @@ var ClientFile;
      */
     function GetCountsUser(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, req: reqParams } = params;
+            let { api, folderId, req: reqParams } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = Api.PrepReqParams(reqParams);
-            const key = GetCountsUserCacheKey();
+            const key = GetCountsUserCacheKey(folderId);
             const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET("file/user/counts", Api.PrepReqParams(reqParams));
+                    const data = yield api.GET(FolderQuery("file/user/counts", folderId), Api.PrepReqParams(reqParams));
                     res({
                         counts: data
                     });
@@ -9655,6 +9770,8 @@ var ClientFile;
             EColumn["User"] = "user";
             EColumn["Extension"] = "extension";
             EColumn["Data"] = "data";
+            // Exact folder equality only. Use 0 for top-level files.
+            EColumn["Folder"] = "ClientFileFolder.ID";
         })(EColumn = Filter.EColumn || (Filter.EColumn = {}));
         let ESortOrder;
         (function (ESortOrder) {
@@ -9678,6 +9795,7 @@ var ClientFile;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
+            ValidateFolderFilter(filter);
             const data = yield api.POST("files/filtered", filter, Api.PrepReqParams(reqParams));
             return {
                 clientFiles: data.Items,
@@ -9696,6 +9814,7 @@ var ClientFile;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
+            ValidateFolderFilter(filter);
             const res = yield api.POST("files/filtered/delete", filter, Api.PrepReqParams(reqParams));
             // We'll clear cache if at least one file was deleted.
             if ((res === null || res === void 0 ? void 0 : res.OK) && (res === null || res === void 0 ? void 0 : res.DeleteFilesCount) > 0) {
@@ -9708,6 +9827,87 @@ var ClientFile;
         });
     }
     ClientFile.DeleteList = DeleteList;
+    function UpdateList(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!params.items || params.items.some(item => !(item === null || item === void 0 ? void 0 : item.ID)))
+                throw new Error("File ID is required for every update.");
+            params.items.forEach(item => ValidateFolderFilter(item));
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            const result = yield api.POST("file/details", { Items: params.items }, Api.PrepReqParams(params.req));
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFile);
+            return { clientFiles: (result === null || result === void 0 ? void 0 : result.Items) || [], errors: (result === null || result === void 0 ? void 0 : result.Error) || [] };
+        });
+    }
+    ClientFile.UpdateList = UpdateList;
+    /** Modern list endpoint. GetList keeps using the legacy JSON filter for existing callers. */
+    function GetListByQuery(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            const query = new URLSearchParams();
+            Object.keys(params.filter || {}).forEach(key => {
+                const value = params.filter[key];
+                if (value === undefined)
+                    return;
+                if (key === "ClientFileFolder.ID") {
+                    query.append(key, ClientFileFolder.NormalizeId(value == null ? 0 : value, true));
+                }
+                else if (value != null) {
+                    (Array.isArray(value) ? value : [value]).forEach(item => query.append(key, String(item)));
+                }
+            });
+            const url = "files" + (query.toString() ? "?" + query.toString() : "");
+            const result = yield api.GET(url, Api.PrepReqParams(params.req));
+            return { clientFiles: (result === null || result === void 0 ? void 0 : result.Items) || [], totalCount: result === null || result === void 0 ? void 0 : result.TotalCount,
+                nextPage: result === null || result === void 0 ? void 0 : result.NextPage, nextPageUrl: result === null || result === void 0 ? void 0 : result.NextPageURL };
+        });
+    }
+    ClientFile.GetListByQuery = GetListByQuery;
+    /** Replace file content through the existing update route, preserving membership when omitted. */
+    function ReplaceContent(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!params.fileId)
+                throw new Error("File ID is required.");
+            if (!params.file)
+                throw new Error("File is required.");
+            const api = params.api || ENVIRONMENT.Api().GetBruceApi();
+            const req = PrepareUploadMetadata(params.req, params.folderId);
+            const clientFile = yield api.UPLOAD(`file/update/${encodeURIComponent(params.fileId)}`, params.file, req);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.ClientFile);
+            return { clientFile };
+        });
+    }
+    ClientFile.ReplaceContent = ReplaceContent;
+    function ValidateFolderFilter(filter) {
+        const folderId = filter === null || filter === void 0 ? void 0 : filter["ClientFileFolder.ID"];
+        if (folderId != null)
+            ClientFileFolder.NormalizeId(folderId, true);
+    }
+    function FolderQuery(url, folderId) {
+        return folderId === undefined ? url : `${url}?ClientFileFolder.ID=${ClientFileFolder.NormalizeId(folderId == null ? 0 : folderId, true)}`;
+    }
+    function FolderCacheSuffix(folderId) {
+        return folderId === undefined ? "" : `:folder:${ClientFileFolder.NormalizeId(folderId == null ? 0 : folderId, true)}`;
+    }
+    function PrepareUploadMetadata(base, folderId, purpose) {
+        const req = Api.PrepReqParams(base);
+        if (folderId === undefined && purpose === undefined)
+            return req;
+        const values = {};
+        if (folderId !== undefined)
+            values["ClientFileFolder.ID"] = ClientFileFolder.NormalizeId(folderId == null ? 0 : folderId, true);
+        if (purpose !== undefined)
+            values.Purpose = purpose;
+        if (typeof FormData !== "undefined" && req.formData instanceof FormData) {
+            const form = new FormData();
+            req.formData.forEach((value, key) => form.append(key, value));
+            Object.keys(values).forEach(key => form.set(key, values[key]));
+            req.formData = form;
+        }
+        else {
+            req.formData = Object.assign(Object.assign({}, req.formData), values);
+        }
+        return req;
+    }
     /**
      * Utility for processing client files.
      * Commonly used to convert a file to a different format. Eg: FBX to GLB.
@@ -9759,20 +9959,20 @@ var ClientFile;
         return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.Id}${fileId}`;
     }
     ClientFile.GetCacheKey = GetCacheKey;
-    function GetCountsPurposeCacheKey() {
-        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsPurpose}`;
+    function GetCountsPurposeCacheKey(folderId) {
+        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsPurpose}${FolderCacheSuffix(folderId)}`;
     }
     ClientFile.GetCountsPurposeCacheKey = GetCountsPurposeCacheKey;
-    function GetCountsExtensionCacheKey() {
-        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsExtension}`;
+    function GetCountsExtensionCacheKey(folderId) {
+        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsExtension}${FolderCacheSuffix(folderId)}`;
     }
     ClientFile.GetCountsExtensionCacheKey = GetCountsExtensionCacheKey;
-    function GetCountsMIMETypeCacheKey() {
-        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsMIMEType}`;
+    function GetCountsMIMETypeCacheKey(folderId) {
+        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsMIMEType}${FolderCacheSuffix(folderId)}`;
     }
     ClientFile.GetCountsMIMETypeCacheKey = GetCountsMIMETypeCacheKey;
-    function GetCountsUserCacheKey() {
-        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsUser}`;
+    function GetCountsUserCacheKey(folderId) {
+        return `${Api.ECacheKey.ClientFile}${Api.ECacheKey.ClientFileCountsUser}${FolderCacheSuffix(folderId)}`;
     }
     ClientFile.GetCountsUserCacheKey = GetCountsUserCacheKey;
 })(ClientFile || (ClientFile = {}));
@@ -25388,7 +25588,7 @@ function getFirstWrappedArray(data, wrapperKeys) {
 }
 
 // This is updated with the package.json version on build.
-const VERSION = "7.1.119";
+const VERSION = "7.1.121";
 
-export { VERSION, Account, AccountAudit, AccountConcept, AccountFeatures, AccountInvite, AccountLimits, AccountTemplate, AccountType, AnnDocument, AbstractApi, Api, ApiGetters, BruceApi, GlobalApi, GuardianApi, Assembly, Calculator, ChangeSet, ClientFile, ClientFileValueMap, Bounds, BruceEvent, BruceVariable, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, RequestLane, GeoJson, Geometry, LRUCache, UTC, CustomForm, DashboardView, DataFeed, DataLab, DataLabGroup, DataSource, DataTransform, Comment, Entity, EntityAttachment, EntityAttachmentType, EntityAttribute, EntityComment, EntityCoords, EntityHistoricData, EntityLink, EntityLod, EntityLodCategory, EntityRelation, EntityRelationType, EntitySource, EntityTableView, EntityTag, EntityType, EntityTypeRelation, EntityTypeSource, EntityTypeTrigger, Ontology, OntologyDocument, ENVIRONMENT, ExportBrz, ExportCsv, ExportNsx, ExportUsd, Hexbin, ImportAssembly, ImportCad, ImportCsv, ImportGeoJson, ImportJson, ImportKml, ImportLcc, ImportTif, ImportedFile, Uploader, Markup, UIMarkup, NAVIGATOR_CHAT_EVENT_ENTITY_HIGHLIGHT_APPLIED, NAVIGATOR_CHAT_EVENT_SCENE_CONTEXT_PREFETCHED, NavigatorChatClient, NavigatorMcpWebSocketClient, Plugin, PluginAiTool, ProgramKey, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewBookmarkGroup, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewLegacyTile, ProjectViewTile, ZoomControl, Scenario, HostingLocation, MessageBroker, PendingAction, RecordChangeFeed, Style, Tileset, Tracking, Permission, Session, User, UserGroup, UserMfaMethod, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, WorkflowItem, WorkflowSchedule, WorkflowType, WorkflowItemType };
+export { VERSION, Account, AccountAudit, AccountConcept, AccountFeatures, AccountInvite, AccountLimits, AccountTemplate, AccountType, AnnDocument, AbstractApi, Api, ApiGetters, BruceApi, GlobalApi, GuardianApi, Assembly, Calculator, ChangeSet, ClientFile, ClientFileFolder, ClientFileValueMap, Bounds, BruceEvent, BruceVariable, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, RequestLane, GeoJson, Geometry, LRUCache, UTC, CustomForm, DashboardView, DataFeed, DataLab, DataLabGroup, DataSource, DataTransform, Comment, Entity, EntityAttachment, EntityAttachmentType, EntityAttribute, EntityComment, EntityCoords, EntityHistoricData, EntityLink, EntityLod, EntityLodCategory, EntityRelation, EntityRelationType, EntitySource, EntityTableView, EntityTag, EntityType, EntityTypeRelation, EntityTypeSource, EntityTypeTrigger, Ontology, OntologyDocument, ENVIRONMENT, ExportBrz, ExportCsv, ExportNsx, ExportUsd, Hexbin, ImportAssembly, ImportCad, ImportCsv, ImportGeoJson, ImportJson, ImportKml, ImportLcc, ImportTif, ImportedFile, Uploader, Markup, UIMarkup, NAVIGATOR_CHAT_EVENT_ENTITY_HIGHLIGHT_APPLIED, NAVIGATOR_CHAT_EVENT_SCENE_CONTEXT_PREFETCHED, NavigatorChatClient, NavigatorMcpWebSocketClient, Plugin, PluginAiTool, ProgramKey, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewBookmarkGroup, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewLegacyTile, ProjectViewTile, ZoomControl, Scenario, HostingLocation, MessageBroker, PendingAction, RecordChangeFeed, Style, Tileset, Tracking, Permission, Session, User, UserGroup, UserMfaMethod, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, WorkflowItem, WorkflowSchedule, WorkflowType, WorkflowItemType };
 //# sourceMappingURL=bruce-models.es5.js.map