rotacloud 1.0.39 → 1.0.41

package/dist/mjs/services/groups.service.js

@@ -1,5 +1,4 @@
 import { Service } from './index.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 import { Group } from '../models/group.model.js';
 export class GroupsService extends Service {
     constructor() {
@@ -7,10 +6,14 @@ export class GroupsService extends Service {
         this.apiPath = '/groups';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new Group(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Group(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new Group(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Group(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,9 +37,11 @@ export class GroupsService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new Group(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Group(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/leave-embargoes.service.js

@@ -1,16 +1,19 @@
 import { Service } from './index.js';
 import { LeaveEmbargo } from '../models/leave-embargo.model.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 export class LeaveEmbargoesService extends Service {
     constructor() {
         super(...arguments);
         this.apiPath = '/leave_embargoes';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveEmbargo(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveEmbargo(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveEmbargo(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveEmbargo(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,9 +37,11 @@ export class LeaveEmbargoesService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveEmbargo(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveEmbargo(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/leave-request.service.d.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { ApiLeaveRequest } from '../interfaces/index.js';
 import { Service, Options, RequirementsOf } from './index.js';
-import { LeaveQueryParams } from '../interfaces/query-params/leave-query-params.interface.js';
+import { LeaveRequestsQueryParams } from '../interfaces/query-params/leave-requests-query-params.interface.js';
 import { LeaveRequest } from '../models/leave-request.model.js';
 declare type RequiredProps = 'start_date' | 'end_date' | 'type' | 'user';
 export declare class LeaveRequestService extends Service {
@@ -16,9 +16,9 @@ export declare class LeaveRequestService extends Service {
         rawResponse: true;
     }): Promise<AxiosResponse<ApiLeaveRequest, any>>;
     get(id: number, options: Options): Promise<LeaveRequest>;
-    list(query?: LeaveQueryParams, options?: Options): AsyncGenerator<LeaveRequest, void, unknown>;
-    listAll(query?: LeaveQueryParams, options?: Options): Promise<LeaveRequest[]>;
-    listByPage(query?: LeaveQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiLeaveRequest[], any>, any, unknown>;
+    list(query?: LeaveRequestsQueryParams, options?: Options): AsyncGenerator<LeaveRequest, void, unknown>;
+    listAll(query?: LeaveRequestsQueryParams, options?: Options): Promise<LeaveRequest[]>;
+    listByPage(query?: LeaveRequestsQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiLeaveRequest[], any>, any, unknown>;
     update(id: number, data: Partial<ApiLeaveRequest>): Promise<LeaveRequest>;
     update(id: number, data: Partial<ApiLeaveRequest>, options: {
         rawResponse: true;

package/dist/mjs/services/leave-request.service.js

@@ -1,5 +1,4 @@
 import { Service } from './index.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 import { LeaveRequest } from '../models/leave-request.model.js';
 export class LeaveRequestService extends Service {
     constructor() {
@@ -7,10 +6,14 @@ export class LeaveRequestService extends Service {
         this.apiPath = '/leave_requests';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveRequest(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveRequest(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveRequest(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveRequest(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,9 +37,11 @@ export class LeaveRequestService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveRequest(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new LeaveRequest(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/leave.service.js

@@ -1,6 +1,5 @@
 import { Service } from './index.js';
 import { Leave } from '../models/leave.model.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 import { LeaveType } from '../models/leave-type.model.js';
 export class LeaveService extends Service {
     constructor() {
@@ -8,10 +7,14 @@ export class LeaveService extends Service {
         this.apiPath = '/leave';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : [...res.data.map((leave) => new Leave(leave))]), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : [...res.data.map((leave) => new Leave(leave))]));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new Leave(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Leave(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -40,9 +43,11 @@ export class LeaveService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new Leave(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Leave(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/locations.service.js

@@ -1,16 +1,19 @@
 import { Service } from './index.js';
 import { Location } from '../models/location.model.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 export class LocationsService extends Service {
     constructor() {
         super(...arguments);
         this.apiPath = '/locations';
     }
     create(data, options) {
-        return super.fetch({ url: `${this.apiPath}`, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new Location(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}`, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Location(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new Location(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Location(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,9 +37,11 @@ export class LocationsService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new Location(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Location(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/roles.service.js

@@ -1,16 +1,19 @@
 import { Service } from './index.js';
 import { Role } from '../models/role.model.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 export class RolesService extends Service {
     constructor() {
         super(...arguments);
         this.apiPath = '/roles';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new Role(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Role(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new Role(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Role(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,9 +37,11 @@ export class RolesService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new Role(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Role(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/service.d.ts

@@ -25,6 +25,8 @@ export interface Options {
 }
 export declare abstract class Service<ApiResponse = any> {
     protected client: AxiosInstance;
+    private initialiseAxios;
+    private parseClientError;
     isLeaveRequest(endpoint?: string): boolean;
     private buildQueryStr;
     private parsePageLinkHeader;

package/dist/mjs/services/service.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import axiosRetry from 'axios-retry';
 import { RotaCloud } from '../rotacloud.js';
 import { Version } from '../version.js';
+import { SDKError } from '../models/SDKError.model.js';
 export var RetryStrategy;
 (function (RetryStrategy) {
     RetryStrategy["Exponential"] = "expo";
@@ -22,7 +23,27 @@ const DEFAULT_RETRY_STRATEGY_OPTIONS = {
 };
 export class Service {
     constructor() {
-        this.client = axios.create();
+        this.client = this.initialiseAxios();
+    }
+    initialiseAxios() {
+        const client = axios.create();
+        client.interceptors.response.use((response) => response, (error) => {
+            const parsedError = this.parseClientError(error);
+            return Promise.reject(parsedError);
+        });
+        return client;
+    }
+    parseClientError(error) {
+        if (!axios.isAxiosError(error))
+            return error;
+        const axiosErrorLocation = error.response || error.request;
+        const apiErrorMessage = axiosErrorLocation.data?.error;
+        const sdkErrorParams = {
+            code: axiosErrorLocation.status,
+            message: apiErrorMessage || error.message,
+            data: axiosErrorLocation.data,
+        };
+        return new SDKError(sdkErrorParams);
     }
     isLeaveRequest(endpoint) {
         return endpoint === '/leave_requests';

package/dist/mjs/services/settings.service.js

@@ -1,13 +1,14 @@
 import { Settings } from '../models/settings.model.js';
 import { Service } from './index.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 class SettingsService extends Service {
     constructor() {
         super(...arguments);
         this.apiPath = '/settings';
     }
     get(query, options) {
-        return super.fetch({ url: `${this.apiPath}`, params: query }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new Settings(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}`, params: query }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Settings(res.data)));
     }
 }
 export { SettingsService };

package/dist/mjs/services/shifts.service.d.ts

@@ -24,11 +24,11 @@ export declare class ShiftsService extends Service {
         rawResponse: true;
     } & Options): Promise<AxiosResponse<ApiShift, any>>;
     update(id: number, data: Partial<ApiShift>, options: Options): Promise<Shift>;
-    delete(id: number): Promise<number>;
-    delete(id: number, options: {
+    delete(ids: number | number[]): Promise<number>;
+    delete(ids: number | number[], options: {
         rawResponse: true;
     } & Options): Promise<AxiosResponse<any, any>>;
-    delete(id: number, options: Options): Promise<number>;
+    delete(ids: number | number[], options: Options): Promise<number>;
     acknowledge(data: number[]): Promise<number>;
     acknowledge(data: number[], options: {
         rawResponse: true;

package/dist/mjs/services/shifts.service.js

@@ -1,16 +1,19 @@
 import { Service } from './index.js';
 import { Shift } from '../models/shift.model.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 export class ShiftsService extends Service {
     constructor() {
         super(...arguments);
         this.apiPath = '/shifts';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new Shift(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Shift(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new Shift(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Shift(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,18 +37,27 @@ export class ShiftsService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new Shift(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new Shift(res.data)));
     }
-    delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+    delete(ids, options) {
+        const params = typeof ids !== 'number'
+            ? { url: this.apiPath, data: ids, method: 'DELETE' }
+            : { url: `${this.apiPath}/${ids}`, method: 'DELETE' };
+        return super.fetch(params).then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
     acknowledge(data, options) {
-        return super.fetch({ url: '/shifts_acknowledged', data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: '/shifts_acknowledged', data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
     publish(data, options) {
-        return super.fetch({ url: '/shifts_published', data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: '/shifts_published', data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
     unpublish(data, options) {
-        return super.fetch({ url: '/shifts_published', data, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: '/shifts_published', data, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }

package/dist/mjs/services/users.service.js

@@ -1,16 +1,19 @@
 import { Service } from './index.js';
 import { User } from '../models/user.model.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 class UsersService extends Service {
     constructor() {
         super(...arguments);
         this.apiPath = '/users';
     }
     create(data, options) {
-        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve(options?.rawResponse ? res : new User(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: this.apiPath, data, method: 'POST' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new User(res.data)));
     }
     get(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve(options?.rawResponse ? res : new User(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}` }, options)
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new User(res.data)));
     }
     async *list(query, options) {
         for await (const res of super.iterator({ url: this.apiPath, params: query }, options)) {
@@ -34,10 +37,12 @@ class UsersService extends Service {
             data,
             method: 'POST',
         })
-            .then((res) => Promise.resolve(options?.rawResponse ? res : new User(res.data)), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+            .then((res) => Promise.resolve(options?.rawResponse ? res : new User(res.data)));
     }
     delete(id, options) {
-        return super.fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' }).then((res) => Promise.resolve(options?.rawResponse ? res : res.status), (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err)));
+        return super
+            .fetch({ url: `${this.apiPath}/${id}`, method: 'DELETE' })
+            .then((res) => Promise.resolve(options?.rawResponse ? res : res.status));
     }
 }
 export { UsersService };

package/dist/mjs/version.js

@@ -1 +1 @@
-export const Version = { version: '1.0.39' };
+export const Version = { version: '1.0.41' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rotacloud",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "The RotaCloud SDK for the RotaCloud API",
   "engines": {
     "node": ">=14.17.0"
@@ -47,7 +47,6 @@
   "dependencies": {
     "@types/node": "^16.11.6",
     "axios": "^0.23.0",
-    "axios-retry": "^3.3.1",
-    "cross-var": "^1.1.0"
+    "axios-retry": "^3.3.1"
   }
 }

package/src/interfaces/query-params/leave-requests-query-params.interface.ts

@@ -1,5 +1,4 @@
 export interface LeaveRequestsQueryParams {
-  users?: number[];
-  status?: string;
+  status?: 'requested' | 'approved' | 'denied' | 'expired';
   include_deleted?: boolean;
 }

package/src/interfaces/shift.interface.ts

@@ -8,7 +8,7 @@ export interface ApiShift {
   start_time: number;
   end_time: number;
   minutes_break: number;
-  user: number;
+  user: number | null;
   location: number;
   role: number | null;
   notes: string | null;

package/src/models/SDKError.model.ts

@@ -0,0 +1,20 @@
+export interface SDKErrorConfig {
+  message?: string;
+  code?: number;
+  data?: unknown;
+}
+export class SDKError extends Error {
+  readonly code?: number;
+  readonly data?: unknown;
+  override name = this.constructor.name;
+
+  constructor(errorConfig: SDKErrorConfig) {
+    super(errorConfig.message);
+
+    Error.captureStackTrace?.(this, SDKError);
+    // optional chaining needed as is v8 specific https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error#static_methods
+
+    this.data = errorConfig.data;
+    this.code = errorConfig.code;
+  }
+}

package/src/models/index.ts

@@ -0,0 +1,29 @@
+export * from './account.model.js';
+export * from './attendance.model.js';
+export * from './auth.model.js';
+export * from './availability-pattern.model.js';
+export * from './availability.model.js';
+export * from './daily-budgets.model.js';
+export * from './daily-revenue.model.js';
+export * from './day-note.model.js';
+export * from './days-off-pattern.model.js';
+export * from './days-off.model.js';
+export * from './document.model.js';
+export * from './SDKError.model.js';
+export * from './group.model.js';
+export * from './holiday-allowance-custom.model.js';
+export * from './holiday-allowance.model.js';
+export * from './leave-embargo.model.js';
+export * from './leave-request.model.js';
+export * from './leave-type.model.js';
+export * from './leave.model.js';
+export * from './location.model.js';
+export * from './logbook-category.model.js';
+export * from './logbook-event.model.js';
+export * from './memo.model.js';
+export * from './pay-period.model.js';
+export * from './role.model.js';
+export * from './settings.model.js';
+export * from './shift.model.js';
+export * from './terminal.model.js';
+export * from './user.model.js';

package/src/models/location.model.ts

@@ -1,17 +1,11 @@
-import { ApiLocation } from '../interfaces/index.js';
-
-export class LatLngObject {
-  public lat: number;
-  public lng: number;
-  public radius: number;
-}
+import { ApiLocation, ApiLocationCoordinate } from '../interfaces/index.js';
 
 export class Location {
   public id: number;
   public name: string;
   public deleted: boolean;
   public address: string;
-  public location: LatLngObject;
+  public location: ApiLocationCoordinate;
   public timezone: number;
   public users: number[];
   public managers: number[];

package/src/models/shift.model.ts

@@ -10,7 +10,7 @@ export class Shift {
   public start_time: number;
   public end_time: number;
   public minutes_break: number;
-  public user: number;
+  public user: number | null;
   public location: number;
   public role: number | null;
   public notes: string | null;

package/src/models/terminal.model.ts

@@ -1,8 +1,4 @@
-export class LatLngObject {
-  public lat: number;
-  public lng: number;
-  public radius: number;
-}
+import { ApiLocationCoordinate } from '../interfaces/index.js';
 
 export class Terminal {
   public id: number;
@@ -13,7 +9,7 @@ export class Terminal {
   public device: string;
   public version: string;
   public ip: string;
-  public location: LatLngObject;
+  public location: ApiLocationCoordinate;
   public timezone: number;
   public require_photo: boolean;
   public require_photo_breaks: boolean;

package/src/rotacloud.ts

@@ -66,3 +66,4 @@ export class RotaCloud {
 export { RetryStrategy, RetryOptions } from './services/service.js';
 export * from './interfaces/index.js';
 export * from './interfaces/query-params/index.js';
+export * from './models/index.js';

package/src/services/accounts.service.ts

@@ -3,7 +3,6 @@ import { Account } from '../models/account.model.js';
 import { Service, Options } from './index.js';
 
 import { ApiAccount } from '../interfaces/index.js';
-import { ErrorResponse } from '../models/error-response.model.js';
 
 class AccountsService extends Service {
   private apiPath = '/accounts';
@@ -12,10 +11,9 @@ class AccountsService extends Service {
   get(id: number, options: { rawResponse: true } & Options): Promise<AxiosResponse<ApiAccount, any>>;
   get(id: number, options: Options): Promise<Account>;
   get(id: number, options?: Options) {
-    return super.fetch<ApiAccount>({ url: `${this.apiPath}/${id}` }, options).then(
-      (res) => Promise.resolve(options?.rawResponse ? res : new Account(res.data)),
-      (err) => Promise.reject(options?.rawResponse ? err : new ErrorResponse(err))
-    );
+    return super
+      .fetch<ApiAccount>({ url: `${this.apiPath}/${id}` }, options)
+      .then((res) => Promise.resolve(options?.rawResponse ? res : new Account(res.data)));
   }
 
   async *list(options?: Options) {