bruce-models 5.9.5 → 5.9.7

package/dist/bruce-models.umd.js

@@ -1734,21 +1734,26 @@
          */
         function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, assemblyId, req: reqParams } = params;
+                let { api, assemblyId, req: reqParams, expand } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
+                if (expand == null) {
+                    expand = true;
+                }
                 if (!assemblyId) {
                     throw ("Assembly ID is required.");
                 }
-                const key = GetCacheKey(assemblyId);
+                const key = GetCacheKey(assemblyId, expand);
                 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(`v3/assembly/${assemblyId}`, exports.Api.PrepReqParams(reqParams));
+                        let url = `v3/assembly/${assemblyId}`;
+                        url += "?Expand=" + (expand ? "true" : "false");
+                        const data = yield api.GET(url, exports.Api.PrepReqParams(reqParams));
                         res({
                             assembly: data
                         });
@@ -1835,7 +1840,7 @@
                 }
                 const url = `v3/assembly/${data.ID}`;
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Remove(GetCacheKey(data.ID));
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Assembly + exports.Api.ECacheKey.Id + data.ID);
                 return {
                     assembly: res
                 };
@@ -1856,7 +1861,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`v3/assembly/${assemblyId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Remove(GetCacheKey(assemblyId));
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Assembly + exports.Api.ECacheKey.Id + assemblyId);
             });
         }
         Assembly.Delete = Delete;
@@ -1912,8 +1917,8 @@
          * @param assemblyId
          * @returns
          */
-        function GetCacheKey(assemblyId) {
-            return `${exports.Api.ECacheKey.Assembly}${exports.Api.ECacheKey.Id}${assemblyId}`;
+        function GetCacheKey(assemblyId, expand) {
+            return `${exports.Api.ECacheKey.Assembly}${exports.Api.ECacheKey.Id}${assemblyId}${String(Boolean(expand))}`;
         }
         Assembly.GetCacheKey = GetCacheKey;
     })(exports.Assembly || (exports.Assembly = {}));
@@ -4027,7 +4032,7 @@
                     OrderBy: filter.orderBy,
                     Filter: requestFilter,
                     LODType: filter.lodCategoryId,
-                    BruceEntityType: filter.entityTypeId,
+                    BruceEntityType: (!filter.entityTypeId ? null : filter.entityTypeId),
                     PageIndex: filter.pageIndex,
                     PageSize: filter.pageSize,
                     historicKey: historicKey,
@@ -4079,7 +4084,7 @@
                         urlParams.set("LODType", body.LODType);
                     }
                     if (body.BruceEntityType) {
-                        urlParams.set("BruceEntityType", body.BruceEntityType);
+                        urlParams.set("BruceEntityType", typeof body.BruceEntityType == "string" ? body.BruceEntityType : body.BruceEntityType.join(","));
                     }
                     if (body.PageIndex) {
                         urlParams.set("PageIndex", String(body.PageIndex));
@@ -4178,7 +4183,7 @@
                                     expandLocation,
                                     expandImports,
                                     expandSources,
-                                    entityTypeId: filter.entityTypeId,
+                                    entityTypeId: typeof filter.entityTypeId == "string" ? filter.entityTypeId : filter.entityTypeId.join(","),
                                     historicFrom: historicFrom,
                                     historicKey: historicKey,
                                     historicTo: historicTo,
@@ -4197,12 +4202,40 @@
                     nextPage = data.NextPage;
                     nextPageUrl = data.NextPageURL;
                 }
+                // Callback to get the next page.
+                let getNextPage;
+                if (nextPage) {
+                    getNextPage = () => __awaiter(this, void 0, void 0, function* () {
+                        let urlStr = null;
+                        if (nextPageUrl.startsWith("http")) {
+                            urlStr = nextPageUrl;
+                        }
+                        else {
+                            urlStr = api.ConstructUrl({
+                                cdn: false,
+                                url: nextPageUrl
+                            });
+                        }
+                        const data = yield api.get(urlStr, exports.Api.PrepReqParams(reqParams));
+                        // Update URL so we can re-use the same function instance.
+                        nextPageUrl = data.NextPageURL;
+                        return {
+                            entities: data.Items,
+                            totalCount: data.TotalCount,
+                            imports: data.Imports,
+                            nextPage: data.NextPage,
+                            nextPageUrl: data.NextPageURL,
+                            getNextPage: nextPageUrl ? getNextPage : null
+                        };
+                    });
+                }
                 return {
                     entities,
                     totalCount,
                     imports,
                     nextPage,
-                    nextPageUrl
+                    nextPageUrl,
+                    getNextPage
                 };
             });
         }
@@ -15307,7 +15340,7 @@
     })(exports.Scenario || (exports.Scenario = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "5.9.5";
+    const VERSION = "5.9.7";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;