bruce-models 3.7.0 → 3.7.2

package/dist/bruce-models.umd.js

@@ -1382,69 +1382,96 @@
                                 env: this.env
                             });
                         }
-                        const env = this.env.toUpperCase();
-                        const domain = this.getDomain();
-                        const host = yield exports.HostingLocation.GetByAccountId({
+                        const { account } = yield exports.Account.Get({
                             accountId: this.accountId,
                             api: guardian
                         });
-                        if (host === null || host === void 0 ? void 0 : host.location) {
-                            const settings = host.location.Settings;
-                            if (!this.loadCancelled) {
-                                // Attempt to load regional base url.
-                                // First try go through settings.
-                                let urlSet = false;
-                                if (settings === null || settings === void 0 ? void 0 : settings.BruceAPIURL) {
-                                    let envUrl = settings.BruceAPIURL[env];
-                                    if (envUrl) {
-                                        envUrl = envUrl
+                        // Precalculated URLs exist.
+                        // Soon this will be a stable requirement for any account record.
+                        if (account.URL) {
+                            const urls = account.URL;
+                            if (urls === null || urls === void 0 ? void 0 : urls.Base) {
+                                this.baseUrl = urls.Base;
+                            }
+                            if (urls === null || urls === void 0 ? void 0 : urls.CDNEntities) {
+                                this.EntityCdnUrl = urls.CDNEntities;
+                            }
+                            if (urls === null || urls === void 0 ? void 0 : urls.CDNTileset) {
+                                this.TilesetCdnUrl = urls.CDNTileset;
+                            }
+                            if (urls === null || urls === void 0 ? void 0 : urls.CDNLegacyTileset) {
+                                this.LegacyTilesetCdnUrl = urls.CDNLegacyTileset;
+                            }
+                            if (urls === null || urls === void 0 ? void 0 : urls.CDNBase) {
+                                this.cdnBaseUrl = urls.CDNBase;
+                            }
+                        }
+                        // Deprecated and will eventually stop working at all.
+                        else {
+                            const env = this.env.toUpperCase();
+                            const domain = this.getDomain();
+                            const host = yield exports.HostingLocation.GetByAccountId({
+                                accountId: this.accountId,
+                                api: guardian
+                            });
+                            if (host === null || host === void 0 ? void 0 : host.location) {
+                                const settings = host.location.Settings;
+                                if (!this.loadCancelled) {
+                                    // Attempt to load regional base url.
+                                    // First try go through settings.
+                                    let urlSet = false;
+                                    if (settings === null || settings === void 0 ? void 0 : settings.BruceAPIURL) {
+                                        let envUrl = settings.BruceAPIURL[env];
+                                        if (envUrl) {
+                                            envUrl = envUrl
+                                                .replace("<ACCOUNTID>", this.accountId)
+                                                .replace("<ACCOUNT>", this.accountId);
+                                            if (envUrl && envUrl.length > 1) {
+                                                this.baseUrl = envUrl;
+                                                urlSet = true;
+                                            }
+                                        }
+                                    }
+                                    // Try go through host location's base url.
+                                    // This may be wrong env which is why it's used as fallback right now.
+                                    if (!urlSet && host.location.BruceAPIURL) {
+                                        const regionalUrl = host.location.BruceAPIURL
                                             .replace("<ACCOUNTID>", this.accountId)
-                                            .replace("<ACCOUNT>", this.accountId);
-                                        if (envUrl && envUrl.length > 1) {
-                                            this.baseUrl = envUrl;
+                                            .replace("<ACCOUNT>", this.accountId)
+                                            .replace("<DOMAIN>", domain);
+                                        if (regionalUrl && regionalUrl.length > 1) {
+                                            this.baseUrl = regionalUrl;
                                             urlSet = true;
                                         }
                                     }
                                 }
-                                // Try go through host location's base url.
-                                // This may be wrong env which is why it's used as fallback right now.
-                                if (!urlSet && host.location.BruceAPIURL) {
-                                    const regionalUrl = host.location.BruceAPIURL
-                                        .replace("<ACCOUNTID>", this.accountId)
-                                        .replace("<ACCOUNT>", this.accountId)
-                                        .replace("<DOMAIN>", domain);
-                                    if (regionalUrl && regionalUrl.length > 1) {
-                                        this.baseUrl = regionalUrl;
-                                        urlSet = true;
-                                    }
-                                }
-                            }
-                            // Attempt to load CDN settings.
-                            if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
-                                this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[env];
-                                // We need to fix our configs.
-                                if (this.EntityCdnUrl) {
-                                    if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
-                                        this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
-                                    }
-                                    else {
-                                        this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                                // Attempt to load CDN settings.
+                                if (settings === null || settings === void 0 ? void 0 : settings.CDN) {
+                                    this.EntityCdnUrl = (_a = settings.CDN.entityURL) === null || _a === void 0 ? void 0 : _a[env];
+                                    // We need to fix our configs.
+                                    if (this.EntityCdnUrl) {
+                                        if (this.EntityCdnUrl.includes("entitiesListForCDN")) {
+                                            this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", this.accountId);
+                                        }
+                                        else {
+                                            this.EntityCdnUrl = this.EntityCdnUrl.replace("<ACCOUNT>", "entitiesListForCDN/" + this.accountId);
+                                        }
                                     }
-                                }
-                                this.LegacyTilesetCdnUrl = (_b = settings.CDN.legacyTilesetURL) === null || _b === void 0 ? void 0 : _b[env];
-                                this.TilesetCdnUrl = (_c = settings.CDN.tilesetURL) === null || _c === void 0 ? void 0 : _c[env];
-                                if (this.TilesetCdnUrl) {
-                                    this.TilesetCdnUrl = this.TilesetCdnUrl.replace("<ACCOUNT>", this.accountId);
-                                }
-                                // TilesetCdnUrl example: "https://blah.cloudfront.net/tilesets/<TILESETID>/files/<FILEPATH>?accountId=<ACCOUNT>".
-                                // Lazy at the moment to go around updating every region we have, I'll interpret the url from tilesetCdnUrl.
-                                if (this.TilesetCdnUrl) {
-                                    try {
-                                        const url = new URL(this.TilesetCdnUrl);
-                                        this.cdnBaseUrl = `${url.protocol}//${url.hostname}/`;
+                                    this.LegacyTilesetCdnUrl = (_b = settings.CDN.legacyTilesetURL) === null || _b === void 0 ? void 0 : _b[env];
+                                    this.TilesetCdnUrl = (_c = settings.CDN.tilesetURL) === null || _c === void 0 ? void 0 : _c[env];
+                                    if (this.TilesetCdnUrl) {
+                                        this.TilesetCdnUrl = this.TilesetCdnUrl.replace("<ACCOUNT>", this.accountId);
                                     }
-                                    catch (e) {
-                                        console.error(e);
+                                    // TilesetCdnUrl example: "https://blah.cloudfront.net/tilesets/<TILESETID>/files/<FILEPATH>?accountId=<ACCOUNT>".
+                                    // Lazy at the moment to go around updating every region we have, I'll interpret the url from tilesetCdnUrl.
+                                    if (this.TilesetCdnUrl) {
+                                        try {
+                                            const url = new URL(this.TilesetCdnUrl);
+                                            this.cdnBaseUrl = `${url.protocol}//${url.hostname}/`;
+                                        }
+                                        catch (e) {
+                                            console.error(e);
+                                        }
                                     }
                                 }
                             }
@@ -2647,33 +2674,6 @@
     })(exports.ObjectUtils || (exports.ObjectUtils = {}));
 
     (function (EntityType) {
-        /**
-         * Returns cache identifier for an entity type.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param typeId
-         * @returns
-         */
-        function GetCacheKey(typeId) {
-            return `${exports.Api.ECacheKey.EntityType}${exports.Api.ECacheKey.Id}${typeId}`;
-        }
-        EntityType.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for a list of entity types.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey();
-         *     api.Cache.Remove(key);
-         * }
-         * @returns
-         */
-        function GetListCacheKey() {
-            return exports.Api.ECacheKey.EntityType;
-        }
-        EntityType.GetListCacheKey = GetListCacheKey;
         /**
          * Gets an entity type record.
          * @param params
@@ -2803,6 +2803,33 @@
             });
         }
         EntityType.Update = Update;
+        /**
+         * Returns cache identifier for an entity type.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param typeId
+         * @returns
+         */
+        function GetCacheKey(typeId) {
+            return `${exports.Api.ECacheKey.EntityType}${exports.Api.ECacheKey.Id}${typeId}`;
+        }
+        EntityType.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a list of entity types.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetListCacheKey();
+         *     api.Cache.Remove(key);
+         * }
+         * @returns
+         */
+        function GetListCacheKey() {
+            return exports.Api.ECacheKey.EntityType;
+        }
+        EntityType.GetListCacheKey = GetListCacheKey;
     })(exports.EntityType || (exports.EntityType = {}));
 
     /**
@@ -2900,38 +2927,6 @@
     })(exports.ZoomControl || (exports.ZoomControl = {}));
 
     (function (Entity) {
-        /**
-         * Returns cache identifier for an entity record.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey({...});
-         *     api.Cache.Remove(key);
-         * }
-         * @param params
-         * @returns
-         */
-        function GetCacheKey(params) {
-            let { entityId, entityTypeId, expandLocation, expandRelations } = params;
-            if (!entityTypeId) {
-                entityTypeId = "";
-            }
-            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}`;
-        }
-        Entity.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for an entity record.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param entityId
-         * @returns
-         */
-        function GetContainsKey(entityId) {
-            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}`;
-        }
-        Entity.GetContainsKey = GetContainsKey;
         /**
          * Returns an entity record for the given entity id.
          * @param params
@@ -3546,6 +3541,38 @@
             };
         }
         Entity.ToGeoJson = ToGeoJson;
+        /**
+         * Returns cache identifier for an entity record.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey({...});
+         *     api.Cache.Remove(key);
+         * }
+         * @param params
+         * @returns
+         */
+        function GetCacheKey(params) {
+            let { entityId, entityTypeId, expandLocation, expandRelations } = params;
+            if (!entityTypeId) {
+                entityTypeId = "";
+            }
+            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}`;
+        }
+        Entity.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for an entity record.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param entityId
+         * @returns
+         */
+        function GetContainsKey(entityId) {
+            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}`;
+        }
+        Entity.GetContainsKey = GetContainsKey;
     })(exports.Entity || (exports.Entity = {}));
 
     /**
@@ -4776,34 +4803,6 @@
     })(exports.EntityAttachment || (exports.EntityAttachment = {}));
 
     (function (EntityComment) {
-        /**
-         * Returns cache identifier for a comment by ID.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("123");
-         *     api.Cache.Remove(key);
-         * }
-         * @param id
-         * @returns
-         */
-        function GetCacheKey(id) {
-            return exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Id + id;
-        }
-        EntityComment.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for a list of comments for an entity.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param entityId
-         * @returns
-         */
-        function GetListCacheKey(entityId) {
-            return exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
-        }
-        EntityComment.GetListCacheKey = GetListCacheKey;
         /**
          * Creates or updates a comment.
          * @param params
@@ -4885,25 +4884,22 @@
             });
         }
         EntityComment.GetListByEntityId = GetListByEntityId;
-    })(exports.EntityComment || (exports.EntityComment = {}));
-
-    (function (EntityLink) {
         /**
-         * Returns cache identifier for a link record.
+         * Returns cache identifier for a comment by ID.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey(1);
+         *     const key = GetCacheKey("123");
          *     api.Cache.Remove(key);
          * }
          * @param id
          * @returns
          */
         function GetCacheKey(id) {
-            return exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Id + id;
+            return exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Id + id;
         }
-        EntityLink.GetCacheKey = GetCacheKey;
+        EntityComment.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of links for an entity.
+         * Returns cache identifier for a list of comments for an entity.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetListCacheKey("abc");
@@ -4913,9 +4909,12 @@
          * @returns
          */
         function GetListCacheKey(entityId) {
-            return exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
+            return exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
-        EntityLink.GetListCacheKey = GetListCacheKey;
+        EntityComment.GetListCacheKey = GetListCacheKey;
+    })(exports.EntityComment || (exports.EntityComment = {}));
+
+    (function (EntityLink) {
         /**
          * Creates or updates a link record.
          * @param params
@@ -4997,40 +4996,22 @@
             });
         }
         EntityLink.GetListByEntityId = GetListByEntityId;
-    })(exports.EntityLink || (exports.EntityLink = {}));
-
-    (function (EntityLod) {
-        /**
-         * Returns cache identifier for an entity lod record.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param url
-         * @returns
-         */
-        function GetCacheKey(url) {
-            return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.Id + url;
-        }
-        EntityLod.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity lods.
+         * Returns cache identifier for a link record.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey("abc", "def");
+         *     const key = GetCacheKey(1);
          *     api.Cache.Remove(key);
          * }
-         * @param typeId
-         * @param group
+         * @param id
          * @returns
          */
-        function GetTypeListKey(typeId, group) {
-            return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.EntityType + typeId + exports.Api.ECacheKey.Id + group;
+        function GetCacheKey(id) {
+            return exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Id + id;
         }
-        EntityLod.GetTypeListKey = GetTypeListKey;
+        EntityLink.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity lods.
+         * Returns cache identifier for a list of links for an entity.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetListCacheKey("abc");
@@ -5039,10 +5020,13 @@
          * @param entityId
          * @returns
          */
-        function GetEntityListKey(entityId) {
-            return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.Entity + entityId;
+        function GetListCacheKey(entityId) {
+            return exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
-        EntityLod.GetEntityListKey = GetEntityListKey;
+        EntityLink.GetListCacheKey = GetListCacheKey;
+    })(exports.EntityLink || (exports.EntityLink = {}));
+
+    (function (EntityLod) {
         /**
          * Returns a url for an entity lod record file.
          * @param params
@@ -5258,39 +5242,55 @@
             });
         }
         EntityLod.Delete = Delete;
-    })(exports.EntityLod || (exports.EntityLod = {}));
-
-    (function (EntityLodCategory) {
         /**
-         * Returns cache identifier for an entity lod category record.
+         * Returns cache identifier for an entity lod record.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetCacheKey("abc");
          *     api.Cache.Remove(key);
          * }
-         * @param id
+         * @param url
          * @returns
          */
-        function GetCacheKey(id) {
-            return exports.Api.ECacheKey.LodCategory + exports.Api.ECacheKey.Id + id;
+        function GetCacheKey(url) {
+            return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.Id + url;
         }
-        EntityLodCategory.GetCacheKey = GetCacheKey;
+        EntityLod.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity lod categories.
+         * Returns cache identifier for a list of entity lods.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey();
+         *     const key = GetListCacheKey("abc", "def");
          *     api.Cache.Remove(key);
          * }
+         * @param typeId
+         * @param group
          * @returns
          */
-        function GetListCacheKey() {
-            return exports.Api.ECacheKey.LodCategory;
+        function GetTypeListKey(typeId, group) {
+            return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.EntityType + typeId + exports.Api.ECacheKey.Id + group;
         }
-        EntityLodCategory.GetListCacheKey = GetListCacheKey;
+        EntityLod.GetTypeListKey = GetTypeListKey;
         /**
-         * Returns a list of entity lod categories.
-         * @param params
+         * Returns cache identifier for a list of entity lods.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetListCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param entityId
+         * @returns
+         */
+        function GetEntityListKey(entityId) {
+            return exports.Api.ECacheKey.Lod + exports.Api.ECacheKey.Entity + entityId;
+        }
+        EntityLod.GetEntityListKey = GetEntityListKey;
+    })(exports.EntityLod || (exports.EntityLod = {}));
+
+    (function (EntityLodCategory) {
+        /**
+         * Returns a list of entity lod categories.
+         * @param params
          * @returns
          */
         function GetList(params) {
@@ -5403,11 +5403,8 @@
             });
         }
         EntityLodCategory.Update = Update;
-    })(exports.EntityLodCategory || (exports.EntityLodCategory = {}));
-
-    (function (EntityRelationType) {
         /**
-         * Returns cache identifier for an entity relation type record.
+         * Returns cache identifier for an entity lod category record.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetCacheKey("abc");
@@ -5417,11 +5414,11 @@
          * @returns
          */
         function GetCacheKey(id) {
-            return exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + id;
+            return exports.Api.ECacheKey.LodCategory + exports.Api.ECacheKey.Id + id;
         }
-        EntityRelationType.GetCacheKey = GetCacheKey;
+        EntityLodCategory.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity relation types.
+         * Returns cache identifier for a list of entity lod categories.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetListCacheKey();
@@ -5430,9 +5427,12 @@
          * @returns
          */
         function GetListCacheKey() {
-            return exports.Api.ECacheKey.RelationType;
+            return exports.Api.ECacheKey.LodCategory;
         }
-        EntityRelationType.GetListCacheKey = GetListCacheKey;
+        EntityLodCategory.GetListCacheKey = GetListCacheKey;
+    })(exports.EntityLodCategory || (exports.EntityLodCategory = {}));
+
+    (function (EntityRelationType) {
         /**
          * Gets a single entity relation type record.
          * @param params
@@ -5552,25 +5552,8 @@
             });
         }
         EntityRelationType.Update = Update;
-    })(exports.EntityRelationType || (exports.EntityRelationType = {}));
-
-    (function (EntityRelation) {
-        /**
-         * Returns cache identifier for an entity relation record.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", "def", "ghi");
-         *     api.Cache.Remove(key);
-         * }
-         * @param id
-         * @returns
-         */
-        function GetCacheKey(entityA, entityB, typeId) {
-            return `${exports.Api.ECacheKey.Relation}${exports.Api.ECacheKey.Id}${entityA}${exports.Api.ECacheKey.Id}${entityB}${exports.Api.ECacheKey.Id}${typeId}`;
-        }
-        EntityRelation.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity relations.
+         * Returns cache identifier for an entity relation type record.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetCacheKey("abc");
@@ -5579,28 +5562,26 @@
          * @param id
          * @returns
          */
-        function GetEntityCacheKey(entityId) {
-            return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
+        function GetCacheKey(id) {
+            return exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + id;
         }
-        EntityRelation.GetEntityCacheKey = GetEntityCacheKey;
+        EntityRelationType.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity relations.
+         * Returns cache identifier for a list of entity relation types.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", {...});
+         *     const key = GetListCacheKey();
          *     api.Cache.Remove(key);
          * }
-         * @param id
          * @returns
          */
-        function GetListCacheKey(entityId, params) {
-            return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType +
-                exports.Api.ECacheKey.Id + params.relationTypeId +
-                exports.Api.ECacheKey.Id + params.oneWayOnly +
-                exports.Api.ECacheKey.Id + params.loadEntityData +
-                exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
+        function GetListCacheKey() {
+            return exports.Api.ECacheKey.RelationType;
         }
-        EntityRelation.GetListCacheKey = GetListCacheKey;
+        EntityRelationType.GetListCacheKey = GetListCacheKey;
+    })(exports.EntityRelationType || (exports.EntityRelationType = {}));
+
+    (function (EntityRelation) {
         /**
          * Creates a new entity relation.
          * @param params
@@ -5759,24 +5740,55 @@
             });
         }
         EntityRelation.GetByDataEntityId = GetByDataEntityId;
-    })(exports.EntityRelation || (exports.EntityRelation = {}));
-
-    (function (EntitySource) {
         /**
-         * Returns cache identifier for an entity source record.
+         * Returns cache identifier for an entity relation record.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey(1, "def");
+         *     const key = GetCacheKey("abc", "def", "ghi");
          *     api.Cache.Remove(key);
          * }
-         * @param sourceId
-         * @param sourceKey
+         * @param id
          * @returns
          */
-        function GetCacheKey(sourceId, sourceKey) {
-            return `${exports.Api.ECacheKey.EntitySource}${exports.Api.ECacheKey.Id}${sourceId}${exports.Api.ECacheKey.Id}${sourceKey}`;
+        function GetCacheKey(entityA, entityB, typeId) {
+            return `${exports.Api.ECacheKey.Relation}${exports.Api.ECacheKey.Id}${entityA}${exports.Api.ECacheKey.Id}${entityB}${exports.Api.ECacheKey.Id}${typeId}`;
         }
-        EntitySource.GetCacheKey = GetCacheKey;
+        EntityRelation.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a list of entity relations.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param id
+         * @returns
+         */
+        function GetEntityCacheKey(entityId) {
+            return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
+        }
+        EntityRelation.GetEntityCacheKey = GetEntityCacheKey;
+        /**
+         * Returns cache identifier for a list of entity relations.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc", {...});
+         *     api.Cache.Remove(key);
+         * }
+         * @param id
+         * @returns
+         */
+        function GetListCacheKey(entityId, params) {
+            return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType +
+                exports.Api.ECacheKey.Id + params.relationTypeId +
+                exports.Api.ECacheKey.Id + params.oneWayOnly +
+                exports.Api.ECacheKey.Id + params.loadEntityData +
+                exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
+        }
+        EntityRelation.GetListCacheKey = GetListCacheKey;
+    })(exports.EntityRelation || (exports.EntityRelation = {}));
+
+    (function (EntitySource) {
         /**
          * Returns an entity source record for the given source id and source key.
          * @param params
@@ -5930,40 +5942,24 @@
             });
         }
         EntitySource.CreateLink = CreateLink;
-    })(exports.EntitySource || (exports.EntitySource = {}));
-
-    (function (EntityTag) {
-        /**
-         * Returns cache identifier for an entity tag record.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey(1);
-         *     api.Cache.Remove(key);
-         * }
-         * @param tagId
-         * @returns
-         */
-        function GetCacheKey(tagId) {
-            return `${exports.Api.ECacheKey.Tag}${exports.Api.ECacheKey.Id}${tagId}`;
-        }
-        EntityTag.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of entity tags.
+         * Returns cache identifier for an entity source record.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey("abc");
+         *     const key = GetCacheKey(1, "def");
          *     api.Cache.Remove(key);
          * }
-         * @param entityTypeId
+         * @param sourceId
+         * @param sourceKey
          * @returns
          */
-        function GetListCacheKey(entityTypeId) {
-            if (entityTypeId) {
-                return exports.Api.ECacheKey.Tag + exports.Api.ECacheKey.EntityType + exports.Api.ECacheKey.Id + entityTypeId;
-            }
-            return exports.Api.ECacheKey.Tag;
+        function GetCacheKey(sourceId, sourceKey) {
+            return `${exports.Api.ECacheKey.EntitySource}${exports.Api.ECacheKey.Id}${sourceId}${exports.Api.ECacheKey.Id}${sourceKey}`;
         }
-        EntityTag.GetListCacheKey = GetListCacheKey;
+        EntitySource.GetCacheKey = GetCacheKey;
+    })(exports.EntitySource || (exports.EntitySource = {}));
+
+    (function (EntityTag) {
         /**
          * Returns an entity tag record for the given tag id.
          * @param params
@@ -6145,6 +6141,37 @@
             });
         }
         EntityTag.Update = Update;
+        /**
+         * Returns cache identifier for an entity tag record.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey(1);
+         *     api.Cache.Remove(key);
+         * }
+         * @param tagId
+         * @returns
+         */
+        function GetCacheKey(tagId) {
+            return `${exports.Api.ECacheKey.Tag}${exports.Api.ECacheKey.Id}${tagId}`;
+        }
+        EntityTag.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a list of entity tags.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetListCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param entityTypeId
+         * @returns
+         */
+        function GetListCacheKey(entityTypeId) {
+            if (entityTypeId) {
+                return exports.Api.ECacheKey.Tag + exports.Api.ECacheKey.EntityType + exports.Api.ECacheKey.Id + entityTypeId;
+            }
+            return exports.Api.ECacheKey.Tag;
+        }
+        EntityTag.GetListCacheKey = GetListCacheKey;
     })(exports.EntityTag || (exports.EntityTag = {}));
 
     (function (MathUtils) {
@@ -6186,20 +6213,6 @@
 
     (function (EntityCoords) {
         EntityCoords.UCS_ENTITY_TYPE_ID = "Bruce_UCS_Type";
-        /**
-         * Returns cache identifier for a UCS by entity id.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("123");
-         *     api.Cache.Remove(key);
-         * }
-         * @param entityId
-         * @returns
-         */
-        function GetCacheKey(entityId) {
-            return exports.Api.ECacheKey.EntityCoords + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
-        }
-        EntityCoords.GetCacheKey = GetCacheKey;
         /**
          * Returns an entity's location with expanded UCS information.
          * @param params
@@ -6371,6 +6384,20 @@
             });
         }
         EntityCoords.UnlinkCoords = UnlinkCoords;
+        /**
+         * Returns cache identifier for a UCS by entity id.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("123");
+         *     api.Cache.Remove(key);
+         * }
+         * @param entityId
+         * @returns
+         */
+        function GetCacheKey(entityId) {
+            return exports.Api.ECacheKey.EntityCoords + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
+        }
+        EntityCoords.GetCacheKey = GetCacheKey;
     })(exports.EntityCoords || (exports.EntityCoords = {}));
 
     /**
@@ -6902,33 +6929,6 @@
     })(exports.ClientFile || (exports.ClientFile = {}));
 
     (function (ProgramKey) {
-        /**
-         * Returns cache identifier for a program key.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param programId
-         * @returns
-         */
-        function GetCacheKey(programId) {
-            return exports.Api.ECacheKey.ProgramKey + exports.Api.ECacheKey.Id + programId;
-        }
-        ProgramKey.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for a list of program keys.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey();
-         *     api.Cache.Remove(key);
-         * }
-         * @returns
-         */
-        function GetListCacheKey() {
-            return exports.Api.ECacheKey.ProgramKey;
-        }
-        ProgramKey.GetListCacheKey = GetListCacheKey;
         /**
          * Known program IDs that Nextspace applications will reference.
          */
@@ -7069,26 +7069,22 @@
             });
         }
         ProgramKey.Update = Update;
-    })(exports.ProgramKey || (exports.ProgramKey = {}));
-
-    (function (Tileset) {
         /**
-         * Returns cache identifier for a tileset.
+         * Returns cache identifier for a program key.
          * Example: {
          *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", false);
+         *     const key = GetCacheKey("abc");
          *     api.Cache.Remove(key);
          * }
-         * @param tilesetId
-         * @param loadFiles
+         * @param programId
          * @returns
          */
-        function GetCacheKey(tilesetId, loadFiles) {
-            return `${exports.Api.ECacheKey.Tileset}${exports.Api.ECacheKey.Id}${tilesetId}${exports.Api.ECacheKey.Id}${loadFiles}`;
+        function GetCacheKey(programId) {
+            return exports.Api.ECacheKey.ProgramKey + exports.Api.ECacheKey.Id + programId;
         }
-        Tileset.GetCacheKey = GetCacheKey;
+        ProgramKey.GetCacheKey = GetCacheKey;
         /**
-         * Returns cache identifier for a list of tilesets.
+         * Returns cache identifier for a list of program keys.
          * Example: {
          *     const api: BruceApi.Api = ...;
          *     const key = GetListCacheKey();
@@ -7097,9 +7093,12 @@
          * @returns
          */
         function GetListCacheKey() {
-            return exports.Api.ECacheKey.Tileset;
+            return exports.Api.ECacheKey.ProgramKey;
         }
-        Tileset.GetListCacheKey = GetListCacheKey;
+        ProgramKey.GetListCacheKey = GetListCacheKey;
+    })(exports.ProgramKey || (exports.ProgramKey = {}));
+
+    (function (Tileset) {
         /**
          * Available tileset types.
          */
@@ -7683,6 +7682,34 @@
                 EExternalMapType["CustomTemplate"] = "Static";
             })(EExternalMapType = Settings.EExternalMapType || (Settings.EExternalMapType = {}));
         })(Settings = Tileset.Settings || (Tileset.Settings = {}));
+        /**
+         * Returns cache identifier for a tileset.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc", false);
+         *     api.Cache.Remove(key);
+         * }
+         * @param tilesetId
+         * @param loadFiles
+         * @returns
+         */
+        function GetCacheKey(tilesetId, loadFiles) {
+            return `${exports.Api.ECacheKey.Tileset}${exports.Api.ECacheKey.Id}${tilesetId}${exports.Api.ECacheKey.Id}${loadFiles}`;
+        }
+        Tileset.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a list of tilesets.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetListCacheKey();
+         *     api.Cache.Remove(key);
+         * }
+         * @returns
+         */
+        function GetListCacheKey() {
+            return exports.Api.ECacheKey.Tileset;
+        }
+        Tileset.GetListCacheKey = GetListCacheKey;
     })(exports.Tileset || (exports.Tileset = {}));
 
     (function (MenuItem) {
@@ -7841,35 +7868,6 @@
     })(exports.MenuItem || (exports.MenuItem = {}));
 
     (function (ProjectViewBookmark) {
-        /**
-         * Returns cache identifier for a bookmark.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", "def");
-         *     api.Cache.Remove(key);
-         * }
-         * @param viewId
-         * @param bookmarkId
-         * @returns
-         */
-        function GetCacheKey(viewId, bookmarkId) {
-            return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${viewId}${exports.Api.ECacheKey.Id}${bookmarkId}`;
-        }
-        ProjectViewBookmark.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for a list of bookmarks.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param viewId
-         * @returns
-         */
-        function GetListCacheKey(viewId) {
-            return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${viewId}`;
-        }
-        ProjectViewBookmark.GetListCacheKey = GetListCacheKey;
         // This is the expected default version for the DataVersion value.
         // This value should NOT be changed without looking at our API and seeing what the default value is.
         ProjectViewBookmark.DEFAULT_DATA_VERSION = 2;
@@ -8028,6 +8026,35 @@
             });
         }
         ProjectViewBookmark.SetOrder = SetOrder;
+        /**
+         * Returns cache identifier for a bookmark.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc", "def");
+         *     api.Cache.Remove(key);
+         * }
+         * @param viewId
+         * @param bookmarkId
+         * @returns
+         */
+        function GetCacheKey(viewId, bookmarkId) {
+            return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${viewId}${exports.Api.ECacheKey.Id}${bookmarkId}`;
+        }
+        ProjectViewBookmark.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a list of bookmarks.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetListCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param viewId
+         * @returns
+         */
+        function GetListCacheKey(viewId) {
+            return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${viewId}`;
+        }
+        ProjectViewBookmark.GetListCacheKey = GetListCacheKey;
     })(exports.ProjectViewBookmark || (exports.ProjectViewBookmark = {}));
 
     (function (ProjectView) {
@@ -8513,33 +8540,6 @@
     })(exports.PendingAction || (exports.PendingAction = {}));
 
     (function (Style) {
-        /**
-         * Returns cache identifier for a style.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey(1);
-         *     api.Cache.Remove(key);
-         * }
-         * @param id
-         * @returns
-         */
-        function GetCacheKey(id) {
-            return exports.Api.ECacheKey.Style + exports.Api.ECacheKey.Id + id;
-        }
-        Style.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for a list of styles.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetListCacheKey();
-         *     api.Cache.Remove(key);
-         * }
-         * @returns
-         */
-        function GetListCacheKey() {
-            return exports.Api.ECacheKey.Style;
-        }
-        Style.GetListCacheKey = GetListCacheKey;
         /**
          * Types of styles available.
          * The type will dictate what settings are available.
@@ -8680,6 +8680,33 @@
             });
         }
         Style.Delete = Delete;
+        /**
+         * Returns cache identifier for a style.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey(1);
+         *     api.Cache.Remove(key);
+         * }
+         * @param id
+         * @returns
+         */
+        function GetCacheKey(id) {
+            return exports.Api.ECacheKey.Style + exports.Api.ECacheKey.Id + id;
+        }
+        Style.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a list of styles.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetListCacheKey();
+         *     api.Cache.Remove(key);
+         * }
+         * @returns
+         */
+        function GetListCacheKey() {
+            return exports.Api.ECacheKey.Style;
+        }
+        Style.GetListCacheKey = GetListCacheKey;
     })(exports.Style || (exports.Style = {}));
 
     /**
@@ -8723,19 +8750,6 @@
     })(exports.Permission || (exports.Permission = {}));
 
     (function (Session) {
-        /**
-         * Returns cache identifier for a session.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc");
-         *     api.Cache.Remove(key);
-         * }
-         * @param sessionId
-         * @returns
-         */
-        function GetCacheKey(sessionId) {
-            return `${exports.Api.ECacheKey.Session}${exports.Api.ECacheKey.Id}${sessionId}`;
-        }
         /**
          * Gets a session record.
          * @param params
@@ -8912,6 +8926,19 @@
             });
         }
         Session.IsSuperAdmin = IsSuperAdmin;
+        /**
+         * Returns cache identifier for a session.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc");
+         *     api.Cache.Remove(key);
+         * }
+         * @param sessionId
+         * @returns
+         */
+        function GetCacheKey(sessionId) {
+            return `${exports.Api.ECacheKey.Session}${exports.Api.ECacheKey.Id}${sessionId}`;
+        }
     })(exports.Session || (exports.Session = {}));
 
     (function (UserGroup) {
@@ -9041,57 +9068,6 @@
     })(exports.UserGroup || (exports.UserGroup = {}));
 
     (function (User) {
-        /**
-         * Returns cache identifier for a user.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", "def");
-         *     api.Cache.Remove(key);
-         * }
-         * @param userId
-         * @param accountId
-         * @returns
-         */
-        function GetCacheKey(userId, accountId) {
-            if (!accountId) {
-                accountId = "";
-            }
-            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + userId + exports.Api.ECacheKey.Id + accountId;
-        }
-        User.GetCacheKey = GetCacheKey;
-        /**
-         * Returns cache identifier for a user.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", "def");
-         *     api.Cache.Remove(key);
-         * }
-         * @param email
-         * @param accountId
-         * @returns
-         */
-        function GetEmailCacheKey(email, accountId) {
-            if (!accountId) {
-                accountId = "";
-            }
-            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserEmail + email + exports.Api.ECacheKey.Id + accountId;
-        }
-        User.GetEmailCacheKey = GetEmailCacheKey;
-        /**
-         * Returns cache identifier for a user's settings.
-         * Example: {
-         *     const api: BruceApi.Api = ...;
-         *     const key = GetCacheKey("abc", "def");
-         *     api.Cache.Remove(key);
-         * }
-         * @param userId
-         * @param appId
-         * @returns
-         */
-        function GetSettingsCacheKey(userId, appId) {
-            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserSettings + userId + exports.Api.ECacheKey.Id + appId;
-        }
-        User.GetSettingsCacheKey = GetSettingsCacheKey;
         /**
          * Available user types.
          */
@@ -9635,6 +9611,57 @@
             }
             AccessToken.Create = Create;
         })(AccessToken = User.AccessToken || (User.AccessToken = {}));
+        /**
+         * Returns cache identifier for a user.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc", "def");
+         *     api.Cache.Remove(key);
+         * }
+         * @param userId
+         * @param accountId
+         * @returns
+         */
+        function GetCacheKey(userId, accountId) {
+            if (!accountId) {
+                accountId = "";
+            }
+            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + userId + exports.Api.ECacheKey.Id + accountId;
+        }
+        User.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for a user.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc", "def");
+         *     api.Cache.Remove(key);
+         * }
+         * @param email
+         * @param accountId
+         * @returns
+         */
+        function GetEmailCacheKey(email, accountId) {
+            if (!accountId) {
+                accountId = "";
+            }
+            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserEmail + email + exports.Api.ECacheKey.Id + accountId;
+        }
+        User.GetEmailCacheKey = GetEmailCacheKey;
+        /**
+         * Returns cache identifier for a user's settings.
+         * Example: {
+         *     const api: BruceApi.Api = ...;
+         *     const key = GetCacheKey("abc", "def");
+         *     api.Cache.Remove(key);
+         * }
+         * @param userId
+         * @param appId
+         * @returns
+         */
+        function GetSettingsCacheKey(userId, appId) {
+            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserSettings + userId + exports.Api.ECacheKey.Id + appId;
+        }
+        User.GetSettingsCacheKey = GetSettingsCacheKey;
     })(exports.User || (exports.User = {}));
 
     (function (AccountInvite) {
@@ -10579,6 +10606,8 @@
                         req: req
                     });
                 }
+                // We changed the expected plugin code without changing the API response so we need to read and reformat the file content.
+                // TODO: Create a v3 request that gives us the plugin code in a more usable format.
                 let fileContent = yield fileContentProm;
                 const start = fileContent.indexOf("{");
                 const end = fileContent.lastIndexOf("}");
@@ -10628,6 +10657,7 @@
                 }
                 return {
                     run: () => {
+                        // 'eval2 = eval' stops the linter from complaining about using eval.
                         const eval2 = eval;
                         eval2(script);
                         // Ensure a function is returned, even if the plugin is not configured properly to return one.
@@ -10831,7 +10861,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "3.7.0";
+    const VERSION = "3.7.2";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;