avvir 6.0.4 → 7.1.0

package/dist/esm/models/api/trade/api_trade_cost.js

@@ -1,4 +1,4 @@
-export default class ApiTradeCost {
+export class ApiTradeCost {
     constructor({ tradeCode, unitOfMeasure, plannedUnitCost, plannedTotalCost, plannedQuantity, capturedQuantity, modeledQuantity, reportedQuantity } = {}) {
         this.tradeCode = tradeCode;
         this.unitOfMeasure = unitOfMeasure;
@@ -10,4 +10,5 @@ export default class ApiTradeCost {
         this.reportedQuantity = reportedQuantity;
     }
 }
+export default ApiTradeCost;
 //# sourceMappingURL=api_trade_cost.js.map

package/dist/esm/models/api/trade/api_trade_cost.js.map

@@ -1 +1 @@
-{"version":3,"file":"api_trade_cost.js","sourceRoot":"","sources":["../../../../../source/models/api/trade/api_trade_cost.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,KAA4B,EAAE;QAC3K,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;CAWF"}
+{"version":3,"file":"api_trade_cost.js","sourceRoot":"","sources":["../../../../../source/models/api/trade/api_trade_cost.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,YAAY;IACvB,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,KAA4B,EAAE;QAC3K,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;CAWF;AAED,eAAe,YAAY,CAAC"}

package/dist/esm/models/api/trade/index.d.ts

@@ -0,0 +1,4 @@
+export { ApiCapturedTradeCost } from "./api_captured_trade_cost";
+export { ApiPlannedTradeCost } from "./api_planned_trade_cost";
+export { ApiTrade } from "./api_trade";
+export { ApiTradeCost } from "./api_trade_cost";

package/dist/esm/models/api/trade/index.js

@@ -0,0 +1,5 @@
+export { ApiCapturedTradeCost } from "./api_captured_trade_cost";
+export { ApiPlannedTradeCost } from "./api_planned_trade_cost";
+export { ApiTrade } from "./api_trade";
+export { ApiTradeCost } from "./api_trade_cost";
+//# sourceMappingURL=index.js.map

package/dist/esm/models/api/trade/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../source/models/api/trade/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/esm/models/enums/api_floor_file_deletion_mode.d.ts

@@ -0,0 +1,7 @@
+export declare enum ApiFloorFileDeletionMode {
+    ALL_FILES = "ALL_FILES",
+    FLOOR_ONLY = "FLOOR_ONLY"
+}
+export declare const ALL_FILES = ApiFloorFileDeletionMode.ALL_FILES;
+export declare const FLOOR_ONLY = ApiFloorFileDeletionMode.FLOOR_ONLY;
+export default ApiFloorFileDeletionMode;

package/dist/esm/models/{api/ApiFloorFileDeletionMode.js → enums/api_floor_file_deletion_mode.js}

@@ -3,4 +3,7 @@ export var ApiFloorFileDeletionMode;
     ApiFloorFileDeletionMode["ALL_FILES"] = "ALL_FILES";
     ApiFloorFileDeletionMode["FLOOR_ONLY"] = "FLOOR_ONLY";
 })(ApiFloorFileDeletionMode || (ApiFloorFileDeletionMode = {}));
-//# sourceMappingURL=ApiFloorFileDeletionMode.js.map
+export const ALL_FILES = ApiFloorFileDeletionMode.ALL_FILES;
+export const FLOOR_ONLY = ApiFloorFileDeletionMode.FLOOR_ONLY;
+export default ApiFloorFileDeletionMode;
+//# sourceMappingURL=api_floor_file_deletion_mode.js.map

package/dist/esm/models/enums/api_floor_file_deletion_mode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api_floor_file_deletion_mode.js","sourceRoot":"","sources":["../../../../source/models/enums/api_floor_file_deletion_mode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,mDAAuB,CAAA;IACvB,qDAAyB,CAAA;AAC3B,CAAC,EAHW,wBAAwB,KAAxB,wBAAwB,QAGnC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,wBAAwB,CAAC,SAAS,CAAC;AAC5D,MAAM,CAAC,MAAM,UAAU,GAAG,wBAAwB,CAAC,UAAU,CAAC;AAE9D,eAAe,wBAAwB,CAAC"}

package/dist/esm/models/enums/index.d.ts

@@ -1,22 +1,23 @@
+export * from "./api_built_status";
+export * from "./api_floor_file_deletion_mode";
+export * from "./api_integration_credentials_type";
+export * from "./association_type";
 export * from "./deviation_status";
-export * from "./inspection_modes";
 export * from "./event_type";
+export * from "./inspection_modes";
 export * from "./notification_level";
 export * from "./photo_projection_type";
 export * from "./photo_rotation_type";
 export * from "./pipeline_types";
 export * from "./process_status";
+export * from "./progress_type";
+export * from "./project_work_package_type";
 export * from "./running_process_status";
-export * from "./api_built_status";
 export * from "./system_of_measurement";
 export * from "./uploader_status";
-export * from "./user_auth_type";
-export * from "./user_role";
 export * from "./user_action_type";
-export * from "./api_integration_credentials_type";
+export * from "./user_auth_type";
 export * from "./user_permission_action";
 export * from "./user_permission_type";
-export * from "./association_type";
-export * from "./project_work_package_type";
-export * from "./progress_type";
+export * from "./user_role";
 export { ProjectPurposeType, FloorPurposeType, ScanDatasetPurposeType, PhotoAreaPurposeType, ProjectTypeKeys, FloorTypeKeys, ScanDatasetTypeKeys, PhotoAreaTypeKeys, PurposeTypeKeys, PurposeType, isPurposeType, UploadHistoryPurposeTypes, PurposeTypeMap, uploadHistoryPurposeTypes, floorPurposeTypes } from "./purpose_type";

package/dist/esm/models/enums/index.js

@@ -1,23 +1,24 @@
+export * from "./api_built_status";
+export * from "./api_floor_file_deletion_mode";
+export * from "./api_integration_credentials_type";
+export * from "./association_type";
 export * from "./deviation_status";
-export * from "./inspection_modes";
 export * from "./event_type";
+export * from "./inspection_modes";
 export * from "./notification_level";
 export * from "./photo_projection_type";
 export * from "./photo_rotation_type";
 export * from "./pipeline_types";
 export * from "./process_status";
+export * from "./progress_type";
+export * from "./project_work_package_type";
 export * from "./running_process_status";
-export * from "./api_built_status";
 export * from "./system_of_measurement";
 export * from "./uploader_status";
-export * from "./user_auth_type";
-export * from "./user_role";
 export * from "./user_action_type";
-export * from "./api_integration_credentials_type";
+export * from "./user_auth_type";
 export * from "./user_permission_action";
 export * from "./user_permission_type";
-export * from "./association_type";
-export * from "./project_work_package_type";
-export * from "./progress_type";
+export * from "./user_role";
 export { ProjectPurposeType, FloorPurposeType, ScanDatasetPurposeType, PhotoAreaPurposeType, isPurposeType, PurposeTypeMap, uploadHistoryPurposeTypes, floorPurposeTypes } from "./purpose_type";
 //# sourceMappingURL=index.js.map

package/dist/esm/models/enums/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../source/models/enums/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAEhC,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EAOpB,aAAa,EAEb,cAAc,EACd,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../source/models/enums/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAE5B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EAOpB,aAAa,EAEb,cAAc,EACd,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,gBAAgB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "avvir",
   "repository": "git@github.com:Avvir/avvir-javascript-client.git",
-  "version": "6.0.4",
+  "version": "7.1.0",
   "description": "Javascript client for Avvir APIs",
   "license": "Apache-2.0",
   "module": "dist/esm/index.js",

package/source/api/file_information_api.ts

@@ -152,11 +152,9 @@ export default class FileInformationApi {
   }
 
   /** @deprecated */
-  static saveAndConvertE57ProjectFile({
-                                        projectId,
-                                        floorId,
-                                        scanDatasetId
-                                      }: AssociationIds, apiFile: ApiCloudFile, user: User): Promise<ApiCloudFile> {
+  static saveAndConvertE57ProjectFile({ projectId }: AssociationIds,
+                                      apiFile: ApiCloudFile,
+                                      user: User): Promise<ApiCloudFile> {
     return FileInformationApi.saveAndIngestE57ProjectFile({ projectId }, apiFile, user).then((e57CloudFile) => {
       let pipeline: ApiPipelineArgument = new ApiPipeline({
         name: Pipelines.CONVERT_E57_TO_LAS,
@@ -178,6 +176,11 @@ export default class FileInformationApi {
         });
     });
   }
+
+  static deleteFile({ projectId }: AssociationIds, fileId: number, user: User): Promise<void> {
+    const url = `${Http.baseUrl()}/projects/${projectId}/files/${fileId}`;
+    return Http.delete(url, user) as unknown as Promise<void>;
+  }
 }
 
 makeErrorsPretty(FileInformationApi);

package/source/api/index.ts

@@ -17,6 +17,7 @@ import TradeApi from "./trade_api";
 import UserApi from "./user_api";
 import WebGatewayApi from "./web_gateway_api";
 import WebRpcApi from "./web_rpc_api";
+import WorkPackageApi from "./work_package_api";
 
 export {
   AuthApi,
@@ -38,4 +39,5 @@ export {
   UserApi,
   WebGatewayApi,
   WebRpcApi,
+  WorkPackageApi
 };

package/source/api/photo_area_api.ts

@@ -1,22 +1,23 @@
-import {isArray} from "underscore";
-import {ApiPhotoArea, ApiPhotoLocation, ApiPhotoSession, ApiPhotoLocation3d, AssociationIds} from "../models";
-import {User} from "../utilities/get_authorization_headers";
+import { isArray } from "underscore";
+import { ApiPhotoArea, ApiPhotoLocation, ApiPhotoLocation3d, ApiPhotoSession, AssociationIds } from "../models";
+import { User } from "../utilities/get_authorization_headers";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
 import Http from "../utilities/http";
 
 export default class PhotoAreaApi {
 
-  static createPhotoLocations({ projectId, photoAreaId, photoSessionId}: AssociationIds,
+  static createPhotoLocations({ projectId, photoAreaId, photoSessionId }: AssociationIds,
                               locations: ApiPhotoLocation[],
                               user: User): Promise<ApiPhotoLocation[]> {
     let url = `${Http.baseUrl()}/projects/${projectId}/photo-areas/${photoAreaId}/locations`;
     if (photoSessionId) {
-      url += `?photoSessionId=${photoSessionId}`
+      url += `?photoSessionId=${photoSessionId}`;
     }
     return Http.post(url, user, locations) as unknown as Promise<ApiPhotoLocation[]>;
   }
 
-  static listPhotoAreasForProject({ projectId, integrationProjectId }: AssociationIds, user: User): Promise<ApiPhotoArea[]> {
+  static listPhotoAreasForProject({ projectId, integrationProjectId }: AssociationIds,
+                                  user: User): Promise<ApiPhotoArea[]> {
     let url = `${Http.baseUrl()}/projects/${projectId}/photo-areas`;
     if (integrationProjectId != null) {
       url += `?integrationProjectId=${integrationProjectId}`;
@@ -24,7 +25,8 @@ export default class PhotoAreaApi {
     return Http.get(url, user) as unknown as Promise<ApiPhotoArea[]>;
   }
 
-  static listPhotoLocations({ projectId, photoAreaId, photoSessionId }: AssociationIds, user: User): Promise<ApiPhotoLocation[]> {
+  static listPhotoLocations({ projectId, photoAreaId, photoSessionId }: AssociationIds,
+                            user: User): Promise<ApiPhotoLocation[]> {
     let url = `${Http.baseUrl()}/projects/${projectId}/photo-areas/${photoAreaId}/locations`;
     if (photoSessionId) {
       if (isArray(photoSessionId)) {
@@ -36,7 +38,8 @@ export default class PhotoAreaApi {
     return Http.get(url, user) as unknown as Promise<ApiPhotoLocation[]>;
   }
 
-  static listPhotoSessionsForPhotoArea({ projectId, photoAreaId }: AssociationIds, user: User): Promise<ApiPhotoSession[]> {
+  static listPhotoSessionsForPhotoArea({ projectId, photoAreaId }: AssociationIds,
+                                       user: User): Promise<ApiPhotoSession[]> {
     let url = `${Http.baseUrl()}/projects/${projectId}/photo-areas/${photoAreaId}/sessions`;
     return Http.get(url, user) as unknown as Promise<ApiPhotoSession[]>;
   }

package/source/api/project_api.ts

@@ -1,12 +1,10 @@
 import getAuthorizationHeaders, { User } from "../utilities/get_authorization_headers";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
-
-import { ApiCloudFile, ApiMasterformatProgress, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectCostAnalysisProgressValidationResult, ApiProjectListing, ApiProjectWorkPackage, ApiRunningProcess, AssociationIds, ProgressType, ProjectWorkPackageType } from "../models";
-import { DateLike } from "type_aliases";
 import { DateConverter } from "../converters";
-import { ApiClassificationCode } from "../models/api/api_classification_code";
-import ApiProjectWorkPackageCost from "../models/api/api_project_work_package_cost";
+
+import type { ApiClassificationCode, ApiCloudFile, ApiMasterformatProgress, ApiProject, ApiProjectCostAnalysisProgress, ApiProjectCostAnalysisProgressValidationResult, ApiProjectListing, ApiProjectWorkPackage, ApiProjectWorkPackageCost, ApiRunningProcess, AssociationIds, ProgressType, ProjectWorkPackageType } from "../models";
+import type { DateLike } from "type_aliases";
 
 export default class ProjectApi {
   static listProjectsForOrganization(organizationId: string, user: User): Promise<ApiProject[]> {

package/source/api/scan_dataset_api.ts

@@ -1,4 +1,4 @@
-import ApiView, { ViewParameter } from "../models/api/api_view";
+import ApiView, { ApiViewArgument } from "../models/api/api_view";
 import Http from "../utilities/http";
 import makeErrorsPretty from "../utilities/make_errors_pretty";
 import { ApiBuiltStatus, ApiDetailedElement, ApiPhotoSession, ApiScanDataset, ApiScanDatasetQaState, ApiScannedElementType, AssociationIds, DateLike } from "../models";
@@ -124,9 +124,9 @@ export default class ScanDatasetApi {
                                   projectId,
                                   floorId,
                                   scanDatasetId
-                                }: AssociationIds, user: User): Promise<ViewParameter[]> {
+                                }: AssociationIds, user: User): Promise<ApiViewArgument[]> {
     const url = `${Http.baseUrl()}/projects/${projectId}/floors/${floorId}/scan-datasets/${scanDatasetId}/views`;
-    return Http.get(url, user) as unknown as Promise<ViewParameter[]>;
+    return Http.get(url, user) as unknown as Promise<ApiViewArgument[]>;
   }
 
   static getNewElementsForScanDataset({ projectId, floorId, scanDatasetId }: AssociationIds,

package/source/avvir_api.ts

@@ -19,7 +19,8 @@ export default {
   reports: Api.ReportApi,
   scanDatasets: Api.ScanDatasetApi,
   trades: Api.TradeApi,
-  other: Api.WebGatewayApi,
-  webRpcApi: Api.WebRpcApi,
   user: Api.UserApi,
+  webRpcApi: Api.WebRpcApi,
+  workPackages: Api.WorkPackageApi,
+  other: Api.WebGatewayApi,
 };

package/source/converters/floor_file_deletion_mode_converter.ts

@@ -1,20 +1,22 @@
 import _ from "underscore";
-import {ApiFloorFileDeletionMode} from "../models/api/ApiFloorFileDeletionMode";
+
+import ApiFloorFileDeletionMode from "../models/enums/api_floor_file_deletion_mode";
 
 const apiFloorFileDeletionModes = _.invert(ApiFloorFileDeletionMode);
 
 type ApiFloorFileDeletionModeKeys = keyof typeof ApiFloorFileDeletionMode;
 const apiFloorFileDeletionModeTypeKeys: ApiFloorFileDeletionModeKeys[] = Object.values(ApiFloorFileDeletionMode);
 
-const isApiFloorFileDeletionMode = (type: any): type is ApiFloorFileDeletionMode => apiFloorFileDeletionModeTypeKeys.includes(type);
+const isApiFloorFileDeletionMode = (type: any): type is ApiFloorFileDeletionMode => apiFloorFileDeletionModeTypeKeys.includes(
+  type);
 
 export class FloorFileDeletionModeConverter {
-    static toApiFloorFileDeletionMode(fileKey: ApiFloorFileDeletionMode): ApiFloorFileDeletionMode {
-        if (isApiFloorFileDeletionMode(fileKey)) {
-            return fileKey;
-        }
-        return apiFloorFileDeletionModes[fileKey];
+  static toApiFloorFileDeletionMode(fileKey: ApiFloorFileDeletionMode): ApiFloorFileDeletionMode {
+    if (isApiFloorFileDeletionMode(fileKey)) {
+      return fileKey;
     }
+    return apiFloorFileDeletionModes[fileKey];
+  }
 }
 
 export default FloorFileDeletionModeConverter;

package/source/models/api/api_action_payload.ts

@@ -1,4 +1,4 @@
-import {Vector3Like} from "./type_aliases";
+import type { Vector3Like } from "./type_aliases";
 
 export type ApiBehavioralData = {
   deviation?: Vector3Like
@@ -15,7 +15,8 @@ export class ApiActionPayload {
               photoSessionId: number,
               photoLocationId: number,
               scannedBuildingElementId: number,
-              behavioralData: ApiBehavioralData) {
+              behavioralData: ApiBehavioralData)
+  {
     this.globalId = globalId;
     this.firebaseClientAccountId = firebaseClientAccountId;
     this.firebaseProjectId = firebaseProjectId;
@@ -38,5 +39,6 @@ export class ApiActionPayload {
   photoLocationId?: number;
   scannedBuildingElementId?: number;
   behavioralData?: ApiBehavioralData;
-
 }
+
+export default ApiActionPayload;

package/source/models/api/api_argo_response.ts

@@ -10,7 +10,17 @@ export type ArgoMetadata = {
 }
 
 export class ApiArgoResponse {
-  constructor({ name, generateName, namespace, selfLink, uid, resourceVersion, generation, creationTimestamp }: Partial<ArgoMetadata> = {}) {
+  constructor({
+                name,
+                generateName,
+                namespace,
+                selfLink,
+                uid,
+                resourceVersion,
+                generation,
+                creationTimestamp
+              }: Partial<ArgoMetadata> = {})
+  {
     this.metadata = {
       name,
       generateName,

package/source/models/api/api_bcf_building_element.ts

@@ -1,10 +1,10 @@
-import {ApiDetailedElement} from "./api_detailed_element";
-import {ApiBcfIssue} from "./api_bcf_issue";
+import type { ApiBcfIssue } from "./api_bcf_issue";
+import type { ApiDetailedElement } from "./api_detailed_element";
 
-export type ApiBcfBuildingElementArgs = Partial<ApiBcfBuildingElement>;
+export type ApiBcfBuildingElementArgument = Partial<ApiBcfBuildingElement>;
 
 export class ApiBcfBuildingElement {
-  constructor({bcfIssue, detailedElement}: ApiBcfBuildingElementArgs = {}) {
+  constructor({ bcfIssue, detailedElement }: ApiBcfBuildingElementArgument = {}) {
     this.detailedElement = detailedElement;
     this.bcfIssue = bcfIssue;
   }

package/source/models/api/api_bcf_issue.ts

@@ -1,7 +1,7 @@
-export type ApiBcfIssueArgs = Partial<ApiBcfIssue>;
+export type ApiBcfIssueArgument = Partial<ApiBcfIssue>;
 
 export class ApiBcfIssue {
-  constructor({plannedBuildingElementId, commentGuid, viewpointGuid, topicGuid}: ApiBcfIssueArgs = {}) {
+  constructor({plannedBuildingElementId, commentGuid, viewpointGuid, topicGuid}: ApiBcfIssueArgument = {}) {
     this.plannedBuildingElementId = plannedBuildingElementId;
     this.commentGuid = commentGuid;
     this.topicGuid = topicGuid;

package/source/models/api/api_cloud_file.ts

@@ -1,25 +1,23 @@
-import { DateLike, Modify } from "./type_aliases";
 import { addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel } from "../../mixins";
 import { ApiProjectPurposeType, ApiPurposeType, isApiPurposeType } from "./api_purpose_type";
-import { PurposeTypeConverter } from "../../converters";
 import { AssociationType, isPurposeType, PurposeType } from "../enums";
-import ApiPhotoLocation3d from "./api_photo_location_3d";
+import { PurposeTypeConverter } from "../../converters";
+
+import type ApiPhotoLocation3d from "./api_photo_location_3d";
+import type { DateLike, ModifyPartial, Vector2Like } from "type_aliases";
 
 export type AvvirApiFiles<Type extends ApiPurposeType = ApiPurposeType> = { [purposeType in Type]?: ApiCloudFile | ApiCloudFile[] }
 export type AvvirApiFileIds<Type extends ApiPurposeType = ApiPurposeType> = { [purposeType in Type]?: number[] }
 
 export interface ApiCloudFileMetadata {
-  offset?: { x: number, y: number };
+  offset?: Vector2Like;
 }
 
-export interface ApiCloudFileArgument extends Partial<Modify<ApiCloudFile, {
+export type ApiCloudFileArgument = ModifyPartial<ApiCloudFile, {
   lastModified?: DateLike
   createdAt?: DateLike
   purposeType: ApiPurposeType | PurposeType,
-  fileType?: string
-}>>
-{
-}
+}>
 
 export class ApiCloudFile {
   constructor({

package/source/models/api/api_cloud_file_location_3d.ts

@@ -11,7 +11,7 @@ export type ApiCloudFileLocationId = {
   orientation: ApiQuaternion
 }
 
-export type ApiCloudFileLocation3dArguments = {
+export type ApiCloudFileLocation3dArgument = {
   id: number,
   position: Vector3Like,
   orientation: Vector4Like
@@ -25,7 +25,7 @@ export class ApiCloudFileLocation3d {
         id,
         position,
         orientation
-      }: ApiCloudFileLocation3dArguments ) {
+      }: ApiCloudFileLocation3dArgument ) {
     addReadOnlyPropertiesToModel(this, { id });
     this.position = position;
     this.orientation = ApiQuaternion.create(orientation);

package/source/models/api/api_construction_grid.ts

@@ -1,5 +1,6 @@
-import {addReadOnlyPropertiesToModel} from "../../mixins";
-import ApiGridLine from "./api_grid_line";
+import { addReadOnlyPropertiesToModel } from "../../mixins";
+
+import type ApiGridLine from "./api_grid_line";
 
 export class ApiConstructionGrid {
   constructor({ id, globalId, axisULines, axisVLines, firebaseFloorId }: Partial<ApiConstructionGrid>) {
@@ -10,8 +11,8 @@ export class ApiConstructionGrid {
 
   readonly id: number | null = null;
   readonly globalId: string | null = null;
-  axisULines: Array<ApiGridLine> = [];
-  axisVLines: Array<ApiGridLine> = [];
+  axisULines: ApiGridLine[] = [];
+  axisVLines: ApiGridLine[] = [];
   readonly firebaseFloorId: string | null = null;
 }
 

package/source/models/api/api_detailed_element.ts

@@ -1,27 +1,29 @@
-import {ApiPlannedElement} from "./api_planned_element";
-import {ApiBuiltStatus} from "../enums";
-import {ApiElementDeviation} from "./api_element_deviation";
-import {ApiScannedElementTypeMap, isDeviationScanResult} from "./api_scanned_element";
-import {addInstantGetterAndSetterToApiModel} from "../../mixins";
+import ApiElementDeviation from "./api_element_deviation";
+import ApiPlannedElement from "./api_planned_element";
+import { addInstantGetterAndSetterToApiModel } from "../../mixins";
+import { ApiScannedElementTypeMap, isDeviationScanResult } from "./api_scanned_element";
 
+import type { ApiBuiltStatus } from "../enums";
+
+/** @deprecated This information should now all live in the {@link ApiPlannedElement}. */
 export class ApiDetailedElement<Label extends ApiBuiltStatus = ApiBuiltStatus> extends ApiPlannedElement {
-    constructor(detailedElement: Partial<ApiDetailedElement<Label>> = {}) {
-        super(detailedElement);
-        addInstantGetterAndSetterToApiModel(this, "builtAt", detailedElement.builtAt);
-        addInstantGetterAndSetterToApiModel(this, "fixedAt", detailedElement.fixedAt);
-        this.scanResult = detailedElement.scanResult;
-        if (isDeviationScanResult(this.scanResult)) {
-            this.scanResult.deviation = { ...new ApiElementDeviation(this.scanResult.deviation) };
-        }
-        if (detailedElement.fixedDeviation) {
-            this.fixedDeviation = {...new ApiElementDeviation(detailedElement.fixedDeviation)};
-        }
+  constructor(detailedElement: Partial<ApiDetailedElement<Label>> = {}) {
+    super(detailedElement);
+    addInstantGetterAndSetterToApiModel(this, "builtAt", detailedElement.builtAt);
+    addInstantGetterAndSetterToApiModel(this, "fixedAt", detailedElement.fixedAt);
+    this.scanResult = detailedElement.scanResult;
+    if (isDeviationScanResult(this.scanResult)) {
+      this.scanResult.deviation = { ...new ApiElementDeviation(this.scanResult.deviation) };
+    }
+    if (detailedElement.fixedDeviation) {
+      this.fixedDeviation = { ...new ApiElementDeviation(detailedElement.fixedDeviation) };
     }
+  }
 
-    scanResult?: ApiScannedElementTypeMap[Label];
-    builtAt?: number;
-    fixedAt?: number;
-    fixedDeviation?: ApiElementDeviation;
+  scanResult?: ApiScannedElementTypeMap[Label];
+  builtAt?: number;
+  fixedAt?: number;
+  fixedDeviation?: ApiElementDeviation;
 }
 
 export default ApiDetailedElement;

package/source/models/api/api_element_deviation.ts

@@ -1,17 +1,26 @@
-import {Vector3Like} from "./type_aliases";
-import {DeviationStatus} from "../enums";
-import {Vector3} from "three";
+import { Vector3 } from "three";
+
+import { DeviationStatus } from "../enums";
+
+import type { ModifyPartial, Vector3Like } from "type_aliases";
+
+export type ApiElementDeviationArgument = ModifyPartial<ApiElementDeviation, {
+  deviationVectorMeters: Vector3Like
+}>
 
 export class ApiElementDeviation {
-  deviationVectorMeters: Vector3Like;
+  deviationVectorMeters: Vector3;
   deviationMeters: number;
   status: DeviationStatus;
+  /** @deprecated This is now stored as obstructing/obstructed id pairs and will be ignored */
   clashing: boolean;
 
-  constructor(deviation: Partial<ApiElementDeviation> = {}) {
+  constructor(deviation: ApiElementDeviationArgument = {}) {
     let deviationVector: Vector3;
     if (deviation?.deviationVectorMeters) {
-      deviationVector = new Vector3(deviation.deviationVectorMeters.x, deviation.deviationVectorMeters.y, deviation.deviationVectorMeters.z);
+      deviationVector = new Vector3(deviation.deviationVectorMeters.x,
+        deviation.deviationVectorMeters.y,
+        deviation.deviationVectorMeters.z);
     } else {
       deviationVector = new Vector3();
     }

package/source/models/api/api_floor.ts

@@ -1,17 +1,18 @@
+import { Matrix3 } from "three";
+
 import addInstantGetterAndSetterToApiModel from "../../mixins/add_instant_getter_and_setter_to_api_model";
 import addReadOnlyPropertiesToModel from "../../mixins/add_read_only_properties_to_model";
-import ApiConstructionGrid from "./api_construction_grid";
-import {DateLike, Matrix3Like, Modify, Vector2Like} from "./type_aliases";
-import ApiMatrix3 from "./api_matrix_3";
-import {Matrix3} from "three";
 import Matrix3Converter from "../../converters/matrix_3_converter";
 
-export interface ApiFloorArgument extends Partial<Modify<ApiFloor, {
+import type ApiConstructionGrid from "./api_construction_grid";
+import type ApiMatrix3 from "./api_matrix_3";
+import type { DateLike, Matrix3Like, ModifyPartial, Vector2Like } from "type_aliases";
+
+export type ApiFloorArgument = ModifyPartial<ApiFloor, {
   scanDate?: DateLike,
   photoAreaMinimapPixelToBimMinimapPixel?: Matrix3Like;
   bimMinimapToWorld?: Matrix3Like;
-}>> {
-}
+}>
 
 export class ApiFloor {
   constructor({
@@ -33,9 +34,10 @@ export class ApiFloor {
                 bimMinimapToWorld,
                 floorElevation,
                 globalOffsetYaw
-              }: ApiFloorArgument = {}) {
-    addInstantGetterAndSetterToApiModel(this, "scanDate");
-    addReadOnlyPropertiesToModel(this, {id, firebaseId, firebaseProjectId});
+              }: ApiFloorArgument = {})
+  {
+    addReadOnlyPropertiesToModel(this, { id, firebaseId, firebaseProjectId });
+    addInstantGetterAndSetterToApiModel(this, "scanDate", scanDate);
     let offsetVal: Vector2Like, photoMinimapToBimMinimapTransformVal: ApiMatrix3,
       bimMinimapToWorldTransformVal: ApiMatrix3;
     Object.defineProperties(this, {
@@ -45,7 +47,7 @@ export class ApiFloor {
         },
         set(val: Vector2Like) {
           if (val) {
-            offsetVal = {x: val.x, y: val.y};
+            offsetVal = { x: val.x, y: val.y };
           } else {
             offsetVal = null;
           }
@@ -137,7 +139,7 @@ export class ApiFloor {
   /**
    * An array of external identifiers of the capture datasets associated with this area.
    */
-  firebaseScanDatasetIds: Array<string> = [];
+  firebaseScanDatasetIds: string[];
 
   constructionGrid: ApiConstructionGrid | null = null;
   plannedElementCount: number | null = null;

package/source/models/api/api_grid_line.ts

@@ -1,5 +1,6 @@
 import { Vector2 } from "three";
-import { Vector2Like } from "./type_aliases";
+
+import type { Vector2Like } from "type_aliases";
 
 export class ApiGridLine {
   constructor({ name, point1, point2 }: Partial<ApiGridLine>) {