Merge main into branch

Author: jgreaves8

dist/index.d.ts

@@ -1,5 +1,6 @@
 export { Client } from './Client';
 export { ClientConfig } from './ClientConfig';
+export { Equipment } from './models/Equipment';
 export { RequestOptions } from './utils/RequestOptions';
 export type { InternalResponse } from './types/Response';
 /**
@@ -14,6 +15,14 @@ export { Permission } from './models/Permission';
 export { Role } from './models/Role';
 export { ServiceAccount } from './models/ServiceAccount';
 export { ServiceAccountKey } from './models/ServiceAccountKey';
+<<<<<<< HEAD
 export { Submission } from './models/Submission';
 export { SubmissionVersion } from './models/SubmissionVersion';
 export { Vehicle } from './models/Vehicle';
+=======
+export { Log } from './models/Log';
+export { Group } from './models/Group';
+export { Permission } from './models/Permission';
+export { Vehicle } from './models/Vehicle';
+export type { InternalResponse } from './types/Response';
+>>>>>>> main

dist/index.js

@@ -907,17 +907,23 @@ Vehicle = __legacyDecorateClassTS([
 ], Vehicle);
 export {
   Vehicle,
+<<<<<<< HEAD
   SubmissionVersion,
   Submission,
+=======
+>>>>>>> main
   ServiceAccountKey,
   ServiceAccount,
   Role,
   RequestOptions,
   Permission,
   Log,
   Group,
+<<<<<<< HEAD
   FormCategory,
   Form,
+=======
+>>>>>>> main
   Equipment,
   ClientConfig,
   Client

dist/services/index.d.ts

@@ -1,7 +1,9 @@
+export { EquipmentService } from "./EquipmentService";
 export { FormCategoriesService } from "./FormCategoriesService";
 export { RolesService } from "./RolesService";
 export { PermissionsService } from "./PermissionsService";
 export { SubmissionsService } from "./SubmissionsService";
 export { FormsService } from "./FormsService";
 export { ServiceAccountsService } from "./ServiceAccountService";
 export { ServiceAccountKeysService } from "./ServiceAccountKeysService";
+export { VehiclesService } from "./VehiclesService";

dist/services/index.js

@@ -1,7 +1,9 @@
+export { EquipmentService } from "./EquipmentService";
 export { FormCategoriesService } from "./FormCategoriesService";
 export { RolesService } from "./RolesService";
 export { PermissionsService } from "./PermissionsService";
 export { SubmissionsService } from "./SubmissionsService";
 export { FormsService } from "./FormsService";
 export { ServiceAccountsService } from "./ServiceAccountService";
 export { ServiceAccountKeysService } from "./ServiceAccountKeysService";
+export { VehiclesService } from "./VehiclesService";

index.ts

@@ -1,9 +1,11 @@
 import { Client } from './src';
+import { Equipment } from './src/models/Equipment';
 import {FormCategory} from "./src/models/FormCategory";
 import {ClientConfig} from "./dist";
 import {Form} from "./src/models/Form";
 import { RequestOptions } from './dist/utils/RequestOptions';
 import { ServiceAccount } from './src/models/ServiceAccount';
+import { Vehicle } from './src/models/Vehicle';
 
 
 // let config = new ClientConfig()

package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/ctrl-hub/sdk.ts"
   },
-  "version": "0.1.51",
+  "version": "0.1.53",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

src/index.ts

@@ -1,5 +1,6 @@
 export { Client } from './Client'
 export { ClientConfig } from './ClientConfig'
+export { Equipment } from './models/Equipment'
 export { RequestOptions } from './utils/RequestOptions'
 export type { InternalResponse } from './types/Response'