bruce-models 6.9.3 → 6.9.5

package/dist/bruce-models.umd.js

@@ -3637,7 +3637,7 @@
          */
         function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityId, scenario, migrated, schemaId, req: reqParams, expandLocation, expandRelations, expandAttachments, expandLODs, entityTypeId, historicFrom, historicKey, historicTo, historicPoint } = params;
+                let { api, entityId, scenario, migrated, schemaId, req: reqParams, expandLocation, expandRelations, expandAttachments, expandLODs, expandComments, expandEntityType, expand: expandStr, entityTypeId, historicFrom, historicKey, historicTo, historicPoint } = params;
                 if (!entityId) {
                     throw ("Entity ID is required.");
                 }
@@ -3655,6 +3655,9 @@
                     expandRelations,
                     expandAttachments,
                     expandLODs,
+                    expandComments,
+                    expandEntityType,
+                    expand: expandStr,
                     historicFrom,
                     historicKey,
                     historicTo,
@@ -3685,6 +3688,24 @@
                             }
                             expand += "attachment";
                         }
+                        if (expandEntityType) {
+                            if (expand) {
+                                expand += ",";
+                            }
+                            expand += "EntityType";
+                        }
+                        if (expandComments) {
+                            if (expand) {
+                                expand += ",";
+                            }
+                            expand += "comment";
+                        }
+                        if (expandStr) {
+                            if (expand) {
+                                expand += ",";
+                            }
+                            expand += expandStr;
+                        }
                         if (expand) {
                             urlParams.append("Expand", expand);
                         }
@@ -3738,7 +3759,7 @@
          */
         function GetListByIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityIds, scenario, migrated, schemaId, req: reqParams, expandAttachments, expandLODs, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint, expandSources, expandImports, maxSearchTimeSec } = params;
+                let { api, entityIds, scenario, migrated, schemaId, req: reqParams, expandAttachments, expandLODs, expandRelations, expandLocation, expandSources, expandImports, expandComments, expandEntityType, expand: expandStr, historicFrom, historicKey, historicTo, historicPoint, maxSearchTimeSec } = params;
                 if (!entityIds.length) {
                     throw ("Entity IDs are required.");
                 }
@@ -3756,13 +3777,16 @@
                     expandSources,
                     expandAttachments,
                     expandLODs,
+                    expandComments,
+                    expandEntityType,
+                    expand: expandStr,
                     entityTypeId: null,
                     historicFrom: historicFrom,
                     historicKey: historicKey,
                     historicTo: historicTo,
                     historicPoint: historicPoint,
                     schemaId: schemaId,
-                    scenario: scenario
+                    scenario: scenario,
                 };
                 const crashRiskReqs = [];
                 const reqIds = [];
@@ -3812,6 +3836,30 @@
                         reqData["Expand"] = "attachment";
                     }
                 }
+                if (expandEntityType) {
+                    if (reqData["Expand"]) {
+                        reqData["Expand"] += ",EntityType";
+                    }
+                    else {
+                        reqData["Expand"] = "EntityType";
+                    }
+                }
+                if (expandComments) {
+                    if (reqData["Expand"]) {
+                        reqData["Expand"] += ",comment";
+                    }
+                    else {
+                        reqData["Expand"] = "comment";
+                    }
+                }
+                if (expandStr) {
+                    if (reqData["Expand"]) {
+                        reqData["Expand"] += `,${expandStr}`;
+                    }
+                    else {
+                        reqData["Expand"] = expandStr;
+                    }
+                }
                 if (expandLODs) {
                     reqData["LODType"] = "*";
                 }
@@ -4281,7 +4329,7 @@
         function GetList(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, filter, scenario, migrated, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, expandImports, historicFrom, historicKey, historicTo, historicPoint, expandLocation, expandSources, maxSearchTimeSec } = params;
+                let { api, filter, scenario, migrated, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, expandImports, expandLocation, expandSources, expandComments, expandEntityType, expand: expandStr, historicFrom, historicKey, historicTo, historicPoint, maxSearchTimeSec } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
@@ -4332,7 +4380,7 @@
                     ExpandSources: expandSources,
                     Scenario: scenario
                 };
-                if (expandLocation || expandRelations || expandImports) {
+                if (expandLocation || expandRelations || expandImports || expandEntityType || expandComments || expandStr) {
                     let expand = "";
                     if (expandLocation) {
                         expand += "location";
@@ -4349,6 +4397,24 @@
                         }
                         expand += "import";
                     }
+                    if (expandEntityType) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "EntityType";
+                    }
+                    if (expandComments) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "comment";
+                    }
+                    if (expandStr) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += expandStr;
+                    }
                     if (expand) {
                         body["Expand"] = expand;
                     }
@@ -4409,6 +4475,24 @@
                         }
                         expand += "Source";
                     }
+                    if (expandEntityType) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "EntityType";
+                    }
+                    if (expandComments) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Comment";
+                    }
+                    if (expandStr) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += expandStr;
+                    }
                     if (expand.length) {
                         urlParams.append("Expand", expand);
                     }
@@ -4472,6 +4556,30 @@
                         }
                         expand += "Import";
                     }
+                    if (expandSources) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Source";
+                    }
+                    if (expandEntityType) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "EntityType";
+                    }
+                    if (expandComments) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += "Comment";
+                    }
+                    if (expandStr) {
+                        if (expand.length) {
+                            expand += ",";
+                        }
+                        expand += expandStr;
+                    }
                     if (expand.length) {
                         urlParams.append("Expand", expand);
                     }
@@ -4610,7 +4718,7 @@
          * @returns
          */
         function GetCacheKey(params) {
-            let { entityId, scenario: scenarioId, entityTypeId, schemaId, expandLocation, expandRelations, expandImports, expandAttachments, expandLODs, expandSources, historicFrom, historicKey, historicTo, historicPoint } = params;
+            let { entityId, scenario: scenarioId, entityTypeId, schemaId, expandLocation, expandRelations, expandImports, expandAttachments, expandLODs, expandSources, expandEntityType, expandComments, expand, historicFrom, historicKey, historicTo, historicPoint } = params;
             if (!scenarioId) {
                 scenarioId = 0;
             }
@@ -4637,6 +4745,7 @@
             key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}${String(Boolean(expandSources))}${String(Boolean(expandImports))}`;
             key += `${String(Boolean(expandAttachments))}${String(Boolean(expandLODs))}`;
             key += `${exports.Api.ECacheKey.EntityHistoricData}${exports.Api.ECacheKey.Id}${historicKey}-${historicFrom}-${historicTo}-${historicPoint}`;
+            key += `${String(Boolean(expandEntityType))}${String(Boolean(expandComments))}${expand || ""}`;
             key += `${exports.Api.ECacheKey.Id}${scenarioId}`;
             return key;
         }
@@ -16316,6 +16425,9 @@
                 if (auth === null || auth === void 0 ? void 0 : auth.fingerprint) {
                     headers["X-Fingerprint"] = auth.fingerprint;
                 }
+                if (auth === null || auth === void 0 ? void 0 : auth.apiBaseUrl) {
+                    headers["X-Api-Base-Url"] = auth.apiBaseUrl;
+                }
                 const response = yield fetchImpl(this.buildUrl(path), Object.assign(Object.assign({}, init), { headers }));
                 if (!response.ok) {
                     const message = yield this.safeReadResponseText(response);
@@ -16378,7 +16490,7 @@
             }
         }
         connect(auth) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (auth) {
                 this.currentAuth = auth;
             }
@@ -16386,14 +16498,10 @@
                 (_c = (_b = this.logger()).debug) === null || _c === void 0 ? void 0 : _c.call(_b, "[NavigatorMcpWS] Connection already active or in-flight; skipping connect.");
                 return;
             }
-            if (!((_d = this.currentAuth) === null || _d === void 0 ? void 0 : _d.accountId)) {
-                (_f = (_e = this.logger()).debug) === null || _f === void 0 ? void 0 : _f.call(_e, "[NavigatorMcpWS] Missing accountId; connection not started.");
-                return;
-            }
             try {
                 this.isConnecting = true;
                 const url = this.buildUrl();
-                (_h = (_g = this.logger()).log) === null || _h === void 0 ? void 0 : _h.call(_g, "[NavigatorMcpWS] Connecting to", url);
+                (_e = (_d = this.logger()).log) === null || _e === void 0 ? void 0 : _e.call(_d, "[NavigatorMcpWS] Connecting to", url);
                 this.ws = new WebSocket(url);
                 this.ws.onopen = (event) => {
                     var _a, _b, _c, _d;
@@ -16420,7 +16528,7 @@
                 };
             }
             catch (error) {
-                (_k = (_j = this.logger()).error) === null || _k === void 0 ? void 0 : _k.call(_j, "[NavigatorMcpWS] Failed to establish connection", error);
+                (_g = (_f = this.logger()).error) === null || _g === void 0 ? void 0 : _g.call(_f, "[NavigatorMcpWS] Failed to establish connection", error);
                 this.isConnecting = false;
             }
         }
@@ -16454,12 +16562,14 @@
             return this.appendAuthParams(url);
         }
         appendAuthParams(url) {
-            var _a;
-            if (!((_a = this.currentAuth) === null || _a === void 0 ? void 0 : _a.accountId)) {
+            if (!this.currentAuth) {
                 return url;
             }
             const urlInstance = new URL(url);
-            urlInstance.searchParams.set("accountId", this.currentAuth.accountId);
+            // Add accountId if provided
+            if (this.currentAuth.accountId) {
+                urlInstance.searchParams.set("accountId", this.currentAuth.accountId);
+            }
             // Only add sessionId if it's provided (support anonymous access)
             if (this.currentAuth.sessionId) {
                 urlInstance.searchParams.set("sessionId", this.currentAuth.sessionId);
@@ -16468,6 +16578,10 @@
             if (this.currentAuth.fingerprint) {
                 urlInstance.searchParams.set("fingerprint", this.currentAuth.fingerprint);
             }
+            // Add apiBaseUrl if provided (for anonymous access)
+            if (this.currentAuth.apiBaseUrl) {
+                urlInstance.searchParams.set("apiBaseUrl", this.currentAuth.apiBaseUrl);
+            }
             // Preserve the hash (unlikely to be used, but consistent with URL semantics)
             return urlInstance.toString();
         }
@@ -16524,7 +16638,7 @@
     }
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.9.3";
+    const VERSION = "6.9.5";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;