bruce-models 2.4.5 → 2.4.7

package/dist/types/server/hosting-location.d.ts

@@ -26,21 +26,21 @@ export declare namespace HostingLocation {
      * @returns
      */
     function GetList(params: {
-        api: GuardianApi.Api;
+        api?: GuardianApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         locations: ILocation[];
     }>;
     function GetById(params: {
         id: number;
-        api: GuardianApi.Api;
+        api?: GuardianApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         location: ILocation;
     }>;
     function GetByKey(params: {
         key: string;
-        api: GuardianApi.Api;
+        api?: GuardianApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         location: ILocation;
@@ -57,7 +57,7 @@ export declare namespace HostingLocation {
     function GetKeyByAccountId(params: {
         accountId?: string;
         apiSettings?: AccountSettings.IBruceApi;
-        api: GuardianApi.Api;
+        api?: GuardianApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         key: string;
@@ -66,7 +66,7 @@ export declare namespace HostingLocation {
     function GetByAccountId(params: {
         accountId?: string;
         apiSettings?: AccountSettings.IBruceApi;
-        api: GuardianApi.Api;
+        api?: GuardianApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         location: ILocation;

package/dist/types/server/pending-action.d.ts

@@ -1,5 +1,6 @@
 import { Api } from "../api/api";
-import { BruceApi, UTC } from "../bruce-models";
+import { BruceApi } from "../api/bruce-api";
+import { UTC } from "../common/utc";
 /**
  * Describes the "Pending Action" concept within Bruce.
  * A pending action is a record of a server-side background process.
@@ -39,21 +40,21 @@ export declare namespace PendingAction {
         Info = "INFO"
     }
     function Get(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         actionId: number;
         req?: Api.IReqParams;
     }): Promise<{
         action: IAction;
     }>;
     function GetRelevantList(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         stricter?: boolean;
         reqParams?: Api.IReqParams;
     }): Promise<{
         actions: IAction[];
     }>;
     function GetMessages(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         actionId: number;
         order?: Api.ESortOrder;
         startIndex?: number;

package/dist/types/server/task.d.ts

@@ -1,4 +1,5 @@
-import { Api, GlobalApi } from "../bruce-models";
+import { Api } from "../api/api";
+import { GlobalApi } from "../api/global-api";
 export declare namespace Task {
     interface ITask {
         account: string;
@@ -19,14 +20,14 @@ export declare namespace Task {
         BackupRestore = "BackupRestore"
     }
     function Get(params: {
-        api: GlobalApi.Api;
+        api?: GlobalApi.Api;
         taskId: number;
         req?: Api.IReqParams;
     }): Promise<{
         task: ITask;
     }>;
     function GetList(params: {
-        api: GlobalApi.Api;
+        api?: GlobalApi.Api;
         accountId?: string;
         type?: ETaskPurpose;
         req?: Api.IReqParams;

package/dist/types/style/style.d.ts

@@ -1,5 +1,6 @@
 import { Api } from "../api/api";
-import { BruceApi, Calculator } from "../bruce-models";
+import { BruceApi } from "../api/bruce-api";
+import { Calculator } from "../calculator/calculator";
 /**
  * Describes the "Style" concept within Bruce.
  * A legacy way of referring to styles is "entity display settings".
@@ -80,27 +81,27 @@ export declare namespace Style {
         Type: EType;
     }
     function GetList(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         styles: IStyle[];
     }>;
     function Get(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         styleId: number;
         req?: Api.IReqParams;
     }): Promise<{
         style: IStyle;
     }>;
     function Update(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         style: IStyle;
         req?: Api.IReqParams;
     }): Promise<{
         style: IStyle;
     }>;
     function Delete(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         styleId: number;
         req?: Api.IReqParams;
     }): Promise<void>;

package/dist/types/tileset/tileset.d.ts

@@ -5,8 +5,8 @@ import { GlobalApi } from "../api/global-api";
 import { Transform } from "../common/transform";
 import { Carto } from "../common/carto";
 import { Bounds } from "../common/bounds";
-import { IDictionary } from "../bruce-models";
 import { Uploader } from "../internal/uploader";
+import { IDictionary } from "../common/dictionary";
 type Settings = Tileset.Settings.IPointcloud | Tileset.Settings.ICad | Tileset.Settings.IEntitiesMap | Tileset.Settings.IEntities | Tileset.Settings.IExternalMap | Tileset.Settings.IExternalTerrain | Tileset.Settings.IMap | Tileset.Settings.ITerrain;
 /**
  * Describes the "Tileset" concept in Bruce.
@@ -55,7 +55,7 @@ export declare namespace Tileset {
         UCS = "ucs"
     }
     function Get(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         loadFiles?: boolean;
         req?: Api.IReqParams;
@@ -65,76 +65,77 @@ export declare namespace Tileset {
     /**
      * Returns tileset types for given tileset ids.
      * @param params
+     * @deprecated Just use GetList and Get to find the type from the tileset record.
      * @returns
      */
     function GetTypes(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetIds: string[];
         req?: Api.IReqParams;
     }): Promise<{
         typeMapping: IDictionary<EType>;
     }>;
     function GetList(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         req?: Api.IReqParams;
     }): Promise<{
         tilesets: ITileset[];
     }>;
     function Delete(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         req?: Api.IReqParams;
     }): Promise<void>;
     function Update(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tileset: ITileset;
         req?: Api.IReqParams;
     }): Promise<{
         tileset: ITileset;
     }>;
     function UploadFile(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: File;
         onProgress?: (progress: Uploader.IProgress) => void;
         req?: Api.IUploadReqParams;
     }): Promise<void>;
     function DeleteFile(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: string;
         req?: Api.IReqParams;
     }): Promise<void>;
     function UploadSrcFile(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: File;
         onProgress?: (progress: Uploader.IProgress) => void;
         req?: Api.IUploadReqParams;
     }): Promise<void>;
     function DeleteSrcFile(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: string;
         req?: Api.IReqParams;
     }): Promise<void>;
     function GetFileUrl(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: string;
     }): string;
     function GetSrcFileUrl(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: string;
     }): string;
     function GetPublicFileUrl(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         file: string;
     }): string;
     function Generate(params: {
-        api: BruceApi.Api;
+        api?: BruceApi.Api;
         tilesetId: string;
         req?: Api.IReqParams;
     }): Promise<{
@@ -153,14 +154,14 @@ export declare namespace Tileset {
             "EnabledFor.ClientAccount.ID"?: string[];
         }
         function Update(params: {
-            api: GlobalApi.Api;
+            api?: GlobalApi.Api;
             published: IPublish;
             req?: Api.IReqParams;
         }): Promise<{
             published: IPublish;
         }>;
         function Get(params: {
-            api: GlobalApi.Api;
+            api?: GlobalApi.Api;
             accountId: string;
             tilesetId: string;
             req?: Api.IReqParams;
@@ -168,7 +169,7 @@ export declare namespace Tileset {
             published: IPublish;
         }>;
         function GetList(params: {
-            api: GlobalApi.Api;
+            api?: GlobalApi.Api;
             accountId: string;
             req?: Api.IReqParams;
         }): Promise<{

package/dist/types/user/session.d.ts

@@ -1,4 +1,5 @@
 import { Api } from "../api/api";
+import { GuardianApi } from "../api/guardian-api";
 import { IdmApi } from "../api/idm-api";
 import { UTC } from "../common/utc";
 import { Permission } from "./permission";
@@ -28,7 +29,7 @@ export declare namespace Session {
         UserGroups?: string[];
     }
     function Get(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         sessionId: string;
         req?: Api.IReqParams;
     }): Promise<{
@@ -41,7 +42,7 @@ export declare namespace Session {
      * @returns
      */
     function Login(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         username?: string;
         password?: string;
         accountId?: string;
@@ -50,7 +51,7 @@ export declare namespace Session {
         session: ISession;
     }>;
     function Logout(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         req?: Api.IReqParams;
     }): Promise<void>;
     function IsPermEnabled(params: {

package/dist/types/user/user-group.d.ts

@@ -1,4 +1,7 @@
-import { Api, IdmApi, Permission } from "../bruce-models";
+import { Api } from "../api/api";
+import { GuardianApi } from "../api/guardian-api";
+import { IdmApi } from "../api/idm-api";
+import { Permission } from "./permission";
 import { User } from "./user";
 /**
  * Describes the "User Group" concept within Bruce.
@@ -12,7 +15,7 @@ export declare namespace UserGroup {
         "Name"?: string;
     }
     function GetByName(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         accountId: string;
         name: string;
         req?: Api.IReqParams;
@@ -20,7 +23,7 @@ export declare namespace UserGroup {
         group: IGroup;
     }>;
     function GetUsers(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         accountId: string;
         groupId: string;
         req?: Api.IReqParams;
@@ -28,7 +31,7 @@ export declare namespace UserGroup {
         users: User.IUser[];
     }>;
     function GetListByPerm(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         accountId: string;
         perm: Permission.Perm;
         req?: Api.IReqParams;
@@ -36,20 +39,20 @@ export declare namespace UserGroup {
         groups: IGroup[];
     }>;
     function GetList(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         accountId: string;
         req?: Api.IReqParams;
     }): Promise<{
         groups: IGroup[];
     }>;
     function Delete(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         accountId: string;
         groupId: string;
         req?: Api.IReqParams;
     }): Promise<void>;
     function Update(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         group: IGroup;
         reqParams?: Api.IReqParams;
     }): Promise<{

package/dist/types/user/user.d.ts

@@ -1,4 +1,5 @@
 import { Api } from "../api/api";
+import { GuardianApi } from "../api/guardian-api";
 import { IdmApi } from "../api/idm-api";
 import { UserGroup } from "./user-group";
 /**
@@ -35,7 +36,7 @@ export declare namespace User {
         "UserGroups"?: UserGroup.IGroup[];
     }
     function Get(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         userId: string;
         accountId?: string;
         req?: Api.IReqParams;
@@ -43,7 +44,7 @@ export declare namespace User {
         user: IUser;
     }>;
     function Update(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         user: IUser;
         req?: Api.IReqParams;
     }): Promise<{
@@ -55,7 +56,7 @@ export declare namespace User {
      * @param params
      */
     function GetSettings(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         userId: string;
         appId: string;
         req?: Api.IReqParams;
@@ -69,7 +70,7 @@ export declare namespace User {
      * @param params
      */
     function UpdateSettings(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         accId?: string;
         userId: string;
         appId: string;
@@ -77,7 +78,7 @@ export declare namespace User {
         req?: Api.IReqParams;
     }): Promise<void>;
     function GetUsernameAvailable(params: {
-        api: IdmApi.Api;
+        api?: IdmApi.Api | GuardianApi.Api;
         username: string;
         excludeUserId?: string;
         req?: Api.IReqParams;
@@ -87,7 +88,7 @@ export declare namespace User {
     namespace LoginUser {
         function GetListCacheKey(accountId: string): string;
         function GetByEmail(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             email: string;
             accountId?: string;
             req?: Api.IReqParams;
@@ -95,7 +96,7 @@ export declare namespace User {
             user: IUser;
         }>;
         function GetList(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             accountId: string;
             exclusive?: boolean;
             req?: Api.IReqParams;
@@ -108,7 +109,7 @@ export declare namespace User {
          * @returns
          */
         function Signup(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             email: string;
             req?: Api.IReqParams;
         }): Promise<void>;
@@ -118,7 +119,7 @@ export declare namespace User {
          * @returns
          */
         function SignupResend(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             expiredCode: string;
             req?: Api.IReqParams;
         }): Promise<void>;
@@ -128,7 +129,7 @@ export declare namespace User {
          * @returns
          */
         function SignupComplete(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             code: string;
             user: IUser;
             accountId?: string;
@@ -142,7 +143,7 @@ export declare namespace User {
          * @returns user id associated with provided email.
          */
         function ForgotPassword(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             accountId: string;
             email: string;
             req?: Api.IReqParams;
@@ -155,7 +156,7 @@ export declare namespace User {
          * @returns
          */
         function ForgotPasswordComplete(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             code: string;
             userId: string;
             password: string;
@@ -167,19 +168,19 @@ export declare namespace User {
     namespace AccessToken {
         function GetListCacheKey(accountId: string): string;
         function GetList(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             accountId: string;
             req?: Api.IReqParams;
         }): Promise<{
             users: IUser[];
         }>;
         function Delete(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             tokenId: string;
             req?: Api.IReqParams;
         }): Promise<void>;
         function Create(params: {
-            api: IdmApi.Api;
+            api?: IdmApi.Api | GuardianApi.Api;
             token: IUser;
             req?: Api.IReqParams;
         }): Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bruce-models",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "",
   "keywords": [],
   "main": "dist/bruce-models.umd.js",