rotacloud 1.0.25 → 1.0.27

package/dist/cjs/services/leave-embargoes.service.d.ts

@@ -2,37 +2,32 @@ import { AxiosResponse } from 'axios';
 import { ApiLeaveEmbargo } from '../interfaces/index.js';
 import { Service, Options, RequirementsOf } from './index.js';
 import { LeaveEmbargo } from '../models/leave-embargo.model.js';
-import { UsersQueryParams } from '../interfaces/query-params/users-query-params.interface.js';
-import { InternalQueryParams } from '../interfaces/query-params/internal-query-params.interface.js';
+import { LeaveEmbargoesQueryParams } from '../rotacloud.js';
 declare type RequiredProps = 'start_date' | 'end_date' | 'users';
-declare class LeaveEmbargoesService extends Service {
+export declare class LeaveEmbargoesService extends Service {
     private apiPath;
     create(data: RequirementsOf<ApiLeaveEmbargo, RequiredProps>): Promise<LeaveEmbargo>;
     create(data: RequirementsOf<ApiLeaveEmbargo, RequiredProps>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeaveEmbargo, any>>;
-    create(data: RequirementsOf<ApiLeaveEmbargo, RequiredProps>, options: Options<InternalQueryParams>): Promise<LeaveEmbargo>;
+    } & Options): Promise<AxiosResponse<ApiLeaveEmbargo, any>>;
+    create(data: RequirementsOf<ApiLeaveEmbargo, RequiredProps>, options: Options): Promise<LeaveEmbargo>;
     get(id: number): Promise<LeaveEmbargo>;
     get(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
     }): Promise<AxiosResponse<ApiLeaveEmbargo, any>>;
-    get(id: number, options: Options<InternalQueryParams>): Promise<LeaveEmbargo>;
-    list(options?: Options<UsersQueryParams & InternalQueryParams>): AsyncGenerator<LeaveEmbargo, void, unknown>;
-    listAll(): Promise<LeaveEmbargo[]>;
-    listByPage(options?: Options<UsersQueryParams & InternalQueryParams>): AsyncGenerator<AxiosResponse<ApiLeaveEmbargo[], any>, any, unknown>;
+    get(id: number, options: Options): Promise<LeaveEmbargo>;
+    list(query: LeaveEmbargoesQueryParams, options?: Options): AsyncGenerator<LeaveEmbargo, void, unknown>;
+    listAll(query: LeaveEmbargoesQueryParams, options?: Options): Promise<LeaveEmbargo[]>;
+    listByPage(query: LeaveEmbargoesQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiLeaveEmbargo[], any>, any, unknown>;
     update(id: number, data: Partial<ApiLeaveEmbargo>): Promise<LeaveEmbargo>;
     update(id: number, data: Partial<ApiLeaveEmbargo>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeaveEmbargo, any>>;
-    update(id: number, data: Partial<ApiLeaveEmbargo>, options: Options<InternalQueryParams>): Promise<LeaveEmbargo>;
+    } & Options): Promise<AxiosResponse<ApiLeaveEmbargo, any>>;
+    update(id: number, data: Partial<ApiLeaveEmbargo>, options: Options): Promise<LeaveEmbargo>;
     delete(id: number): Promise<number>;
     delete(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    delete(id: number, options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    delete(id: number, options: Options): Promise<number>;
 }
-export { LeaveEmbargoesService };
+export {};

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

@@ -43,14 +43,14 @@ class LeaveEmbargoesService extends index_js_1.Service {
     get(id, options) {
         return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : new leave_embargo_model_js_1.LeaveEmbargo(res.data)), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
     }
-    list(options) {
+    list(query, options) {
         const _super = Object.create(null, {
             iterator: { get: () => super.iterator }
         });
         return __asyncGenerator(this, arguments, function* list_1() {
             var e_1, _a;
             try {
-                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
+                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath, params: query }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
                     const res = _c.value;
                     yield yield __await(new leave_embargo_model_js_1.LeaveEmbargo(res));
                 }
@@ -64,13 +64,13 @@ class LeaveEmbargoesService extends index_js_1.Service {
             }
         });
     }
-    listAll() {
+    listAll(query, options) {
         var e_2, _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const leave = [];
                 try {
-                    for (var _b = __asyncValues(this.list()), _c; _c = yield _b.next(), !_c.done;) {
+                    for (var _b = __asyncValues(this.list(query, options)), _c; _c = yield _b.next(), !_c.done;) {
                         const leaveEmbargoRecord = _c.value;
                         leave.push(leaveEmbargoRecord);
                     }
@@ -89,8 +89,8 @@ class LeaveEmbargoesService extends index_js_1.Service {
             }
         });
     }
-    listByPage(options) {
-        return super.iterator({ url: this.apiPath }, options).byPage();
+    listByPage(query, options) {
+        return super.iterator({ url: this.apiPath, params: query }, options).byPage();
     }
     update(id, data, options) {
         return super

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

@@ -2,37 +2,32 @@ 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 { InternalQueryParams } from '../interfaces/query-params/internal-query-params.interface.js';
 import { LeaveRequest } from '../models/leave-request.model.js';
 declare type RequiredProps = 'start_date' | 'end_date' | 'type' | 'user';
-declare class LeaveRequestService extends Service {
+export declare class LeaveRequestService extends Service {
     private apiPath;
     create(data: RequirementsOf<ApiLeaveRequest, RequiredProps>): Promise<LeaveRequest>;
     create(data: RequirementsOf<ApiLeaveRequest, RequiredProps>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeaveRequest, any>>;
-    create(data: RequirementsOf<ApiLeaveRequest, RequiredProps>, options: Options<InternalQueryParams>): Promise<LeaveRequest>;
+    } & Options): Promise<AxiosResponse<ApiLeaveRequest, any>>;
+    create(data: RequirementsOf<ApiLeaveRequest, RequiredProps>, options: Options): Promise<LeaveRequest>;
     get(id: number): Promise<LeaveRequest>;
     get(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
     }): Promise<AxiosResponse<ApiLeaveRequest, any>>;
-    get(id: number, options: Options<InternalQueryParams>): Promise<LeaveRequest>;
-    list(options?: Options<LeaveQueryParams & InternalQueryParams>): AsyncGenerator<LeaveRequest, void, unknown>;
-    listAll(): Promise<LeaveRequest[]>;
-    listByPage(options?: Options<LeaveQueryParams & InternalQueryParams>): AsyncGenerator<AxiosResponse<ApiLeaveRequest[], any>, any, unknown>;
+    get(id: number, options: Options): Promise<LeaveRequest>;
+    list(query: LeaveQueryParams, options?: Options): AsyncGenerator<LeaveRequest, void, unknown>;
+    listAll(query: LeaveQueryParams, options?: Options): Promise<LeaveRequest[]>;
+    listByPage(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;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeaveRequest, any>>;
-    update(id: number, data: Partial<ApiLeaveRequest>, options: Options<InternalQueryParams>): Promise<LeaveRequest>;
+    } & Options): Promise<AxiosResponse<ApiLeaveRequest, any>>;
+    update(id: number, data: Partial<ApiLeaveRequest>, options: Options): Promise<LeaveRequest>;
     delete(id: number): Promise<number>;
     delete(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeaveRequest, any>>;
-    delete(id: number, options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<ApiLeaveRequest, any>>;
+    delete(id: number, options: Options): Promise<number>;
 }
-export { LeaveRequestService };
+export {};

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

@@ -43,14 +43,14 @@ class LeaveRequestService extends index_js_1.Service {
     get(id, options) {
         return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : new leave_request_model_js_1.LeaveRequest(res.data)), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
     }
-    list(options) {
+    list(query, options) {
         const _super = Object.create(null, {
             iterator: { get: () => super.iterator }
         });
         return __asyncGenerator(this, arguments, function* list_1() {
             var e_1, _a;
             try {
-                for (var _b = __asyncValues(_super.iterator.call(this, { url: `${this.apiPath}` }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
+                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath, params: query }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
                     const res = _c.value;
                     yield yield __await(new leave_request_model_js_1.LeaveRequest(res));
                 }
@@ -64,13 +64,13 @@ class LeaveRequestService extends index_js_1.Service {
             }
         });
     }
-    listAll() {
+    listAll(query, options) {
         var e_2, _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const leave = [];
                 try {
-                    for (var _b = __asyncValues(this.list()), _c; _c = yield _b.next(), !_c.done;) {
+                    for (var _b = __asyncValues(this.list(query, options)), _c; _c = yield _b.next(), !_c.done;) {
                         const leaveRequestRecord = _c.value;
                         leave.push(leaveRequestRecord);
                     }

package/dist/cjs/services/leave.service.d.ts

@@ -3,38 +3,33 @@ import { ApiLeave } from '../interfaces/index.js';
 import { Service, Options, RequirementsOf } from './index.js';
 import { Leave } from '../models/leave.model.js';
 import { LeaveQueryParams } from '../interfaces/query-params/leave-query-params.interface.js';
-import { InternalQueryParams } from '../interfaces/query-params/internal-query-params.interface.js';
 import { LeaveType } from '../models/leave-type.model.js';
 declare type RequiredProps = 'users' | 'type' | 'start_date' | 'end_date';
-declare class LeaveService extends Service {
+export declare class LeaveService extends Service {
     private apiPath;
     create(data: RequirementsOf<ApiLeave, RequiredProps>): Promise<Leave[]>;
     create(data: RequirementsOf<ApiLeave, RequiredProps>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeave[], any>>;
-    create(data: RequirementsOf<ApiLeave, RequiredProps>, options: Options<InternalQueryParams>): Promise<Leave[]>;
+    } & Options): Promise<AxiosResponse<ApiLeave[], any>>;
+    create(data: RequirementsOf<ApiLeave, RequiredProps>, options: Options): Promise<Leave[]>;
     get(id: number): Promise<Leave>;
     get(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
     }): Promise<AxiosResponse<ApiLeave, any>>;
-    get(id: number, options: Options<InternalQueryParams>): Promise<Leave>;
-    list(options?: Options<LeaveQueryParams & InternalQueryParams>): AsyncGenerator<Leave, void, unknown>;
-    listAll(): Promise<Leave[]>;
-    listLeaveTypes(options?: Options<InternalQueryParams>): AsyncGenerator<LeaveType, void, unknown>;
-    listByPage(options?: Options<LeaveQueryParams & InternalQueryParams>): AsyncGenerator<AxiosResponse<ApiLeave[], any>, any, unknown>;
+    get(id: number, options: Options): Promise<Leave>;
+    list(query: LeaveQueryParams, options?: Options): AsyncGenerator<Leave, void, unknown>;
+    listAll(query: LeaveQueryParams, options?: Options): Promise<Leave[]>;
+    listLeaveTypes(query: LeaveQueryParams, options?: Options): AsyncGenerator<LeaveType, void, unknown>;
+    listByPage(query: LeaveQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiLeave[], any>, any, unknown>;
     update(id: number, data: Partial<ApiLeave>): Promise<Leave>;
     update(id: number, data: Partial<ApiLeave>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeave, any>>;
-    update(id: number, data: Partial<ApiLeave>, options: Options<InternalQueryParams>): Promise<Leave>;
+    } & Options): Promise<AxiosResponse<ApiLeave, any>>;
+    update(id: number, data: Partial<ApiLeave>, options: Options): Promise<Leave>;
     delete(id: number): Promise<number>;
     delete(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLeave, any>>;
-    delete(id: number, options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<ApiLeave, any>>;
+    delete(id: number, options: Options): Promise<number>;
 }
-export { LeaveService };
+export {};

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

@@ -39,19 +39,19 @@ class LeaveService extends index_js_1.Service {
         this.apiPath = '/leave';
     }
     create(data, options) {
-        return super.fetch({ url: `${this.apiPath}`, data, method: 'POST' }).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : [...res.data.map((leave) => new leave_model_js_1.Leave(leave))]), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
+        return super.fetch({ url: this.apiPath, data, method: 'POST' }).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : [...res.data.map((leave) => new leave_model_js_1.Leave(leave))]), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
     }
     get(id, options) {
         return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : new leave_model_js_1.Leave(res.data)), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
     }
-    list(options) {
+    list(query, options) {
         const _super = Object.create(null, {
             iterator: { get: () => super.iterator }
         });
         return __asyncGenerator(this, arguments, function* list_1() {
             var e_1, _a;
             try {
-                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
+                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath, params: query }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
                     const res = _c.value;
                     yield yield __await(new leave_model_js_1.Leave(res));
                 }
@@ -65,13 +65,13 @@ class LeaveService extends index_js_1.Service {
             }
         });
     }
-    listAll() {
+    listAll(query, options) {
         var e_2, _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const leave = [];
                 try {
-                    for (var _b = __asyncValues(this.list()), _c; _c = yield _b.next(), !_c.done;) {
+                    for (var _b = __asyncValues(this.list(query, options)), _c; _c = yield _b.next(), !_c.done;) {
                         const leaveRecord = _c.value;
                         leave.push(leaveRecord);
                     }
@@ -90,14 +90,14 @@ class LeaveService extends index_js_1.Service {
             }
         });
     }
-    listLeaveTypes(options) {
+    listLeaveTypes(query, options) {
         const _super = Object.create(null, {
             iterator: { get: () => super.iterator }
         });
         return __asyncGenerator(this, arguments, function* listLeaveTypes_1() {
             var e_3, _a;
             try {
-                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
+                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath, params: query }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
                     const res = _c.value;
                     yield yield __await(new leave_type_model_js_1.LeaveType(res));
                 }
@@ -111,8 +111,8 @@ class LeaveService extends index_js_1.Service {
             }
         });
     }
-    listByPage(options) {
-        return super.iterator({ url: this.apiPath }, options).byPage();
+    listByPage(query, options) {
+        return super.iterator({ url: this.apiPath, params: query }, options).byPage();
     }
     update(id, data, options) {
         return super

package/dist/cjs/services/locations.service.d.ts

@@ -3,36 +3,31 @@ import { ApiLocation } from '../interfaces/index.js';
 import { Service, Options, RequirementsOf } from './index.js';
 import { Location } from '../models/location.model.js';
 import { LocationsQueryParams } from '../interfaces/query-params/locations-query-params.interface.js';
-import { InternalQueryParams } from '../interfaces/query-params/internal-query-params.interface.js';
 declare type RequiredProps = 'name';
-declare class LocationsService extends Service {
+export declare class LocationsService extends Service {
     private apiPath;
     create(data: RequirementsOf<ApiLocation, RequiredProps>): Promise<Location>;
     create(data: RequirementsOf<ApiLocation, RequiredProps>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLocation, any>>;
-    create(data: RequirementsOf<ApiLocation, RequiredProps>, options: Options<InternalQueryParams>): Promise<ApiLocation>;
+    } & Options): Promise<AxiosResponse<ApiLocation, any>>;
+    create(data: RequirementsOf<ApiLocation, RequiredProps>, options: Options): Promise<Location>;
     get(id: number): Promise<Location>;
     get(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLocation, any>>;
-    get(id: number, options: Options<InternalQueryParams>): Promise<ApiLocation>;
-    list(options?: Options<LocationsQueryParams & InternalQueryParams>): AsyncGenerator<Location, void, unknown>;
-    listAll(): Promise<Location[]>;
-    listByPage(options?: Options<LocationsQueryParams & InternalQueryParams>): AsyncGenerator<AxiosResponse<ApiLocation[], any>, any, unknown>;
+    } & Options): Promise<AxiosResponse<ApiLocation, any>>;
+    get(id: number, options: Options): Promise<Location>;
+    list(query: LocationsQueryParams, options?: Options): AsyncGenerator<Location, void, unknown>;
+    listAll(query: LocationsQueryParams, options?: Options): Promise<Location[]>;
+    listByPage(query: LocationsQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiLocation[], any>, any, unknown>;
     update(id: number, data: Partial<ApiLocation>): Promise<Location>;
     update(id: number, data: Partial<ApiLocation>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiLocation, any>>;
-    update(id: number, data: Partial<ApiLocation>, options: Options<InternalQueryParams>): Promise<ApiLocation>;
+    } & Options): Promise<AxiosResponse<ApiLocation, any>>;
+    update(id: number, data: Partial<ApiLocation>, options: Options): Promise<Location>;
     delete(id: number): Promise<number>;
     delete(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    delete(id: number, options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    delete(id: number, options: Options): Promise<number>;
 }
-export { LocationsService };
+export {};

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

@@ -43,14 +43,14 @@ class LocationsService extends index_js_1.Service {
     get(id, options) {
         return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : new location_model_js_1.Location(res.data)), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
     }
-    list(options) {
+    list(query, options) {
         const _super = Object.create(null, {
             iterator: { get: () => super.iterator }
         });
         return __asyncGenerator(this, arguments, function* list_1() {
             var e_1, _a;
             try {
-                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
+                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath, params: query }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
                     const res = _c.value;
                     yield yield __await(new location_model_js_1.Location(res));
                 }
@@ -64,13 +64,13 @@ class LocationsService extends index_js_1.Service {
             }
         });
     }
-    listAll() {
+    listAll(query, options) {
         var e_2, _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const locations = [];
                 try {
-                    for (var _b = __asyncValues(this.list()), _c; _c = yield _b.next(), !_c.done;) {
+                    for (var _b = __asyncValues(this.list(query, options)), _c; _c = yield _b.next(), !_c.done;) {
                         const location = _c.value;
                         locations.push(location);
                     }
@@ -89,8 +89,8 @@ class LocationsService extends index_js_1.Service {
             }
         });
     }
-    listByPage(options) {
-        return super.iterator({ url: this.apiPath }, options).byPage();
+    listByPage(query, options) {
+        return super.iterator({ url: this.apiPath, params: query }, options).byPage();
     }
     update(id, data, options) {
         return super

package/dist/cjs/services/roles.service.d.ts

@@ -3,36 +3,31 @@ import { ApiRole } from '../interfaces/index.js';
 import { Service, Options, RequirementsOf } from './index.js';
 import { Role } from '../models/role.model.js';
 import { RolesQueryParams } from '../interfaces/query-params/roles-query-params.interface.js';
-import { InternalQueryParams } from '../interfaces/query-params/internal-query-params.interface.js';
 declare type RequiredProps = 'name';
-declare class RolesService extends Service {
+export declare class RolesService extends Service {
     private apiPath;
     create(data: RequirementsOf<ApiRole, RequiredProps>): Promise<Role>;
     create(data: RequirementsOf<ApiRole, RequiredProps>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiRole, any>>;
-    create(data: RequirementsOf<ApiRole, RequiredProps>, options: Options<InternalQueryParams>): Promise<Role>;
+    } & Options): Promise<AxiosResponse<ApiRole, any>>;
+    create(data: RequirementsOf<ApiRole, RequiredProps>, options: Options): Promise<Role>;
     get(id: number): Promise<Role>;
     get(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiRole, any>>;
-    get(id: number, options: Options<InternalQueryParams>): Promise<Role>;
-    list(options?: Options<RolesQueryParams & InternalQueryParams>): AsyncGenerator<Role, void, unknown>;
-    listAll(): Promise<Role[]>;
-    listByPage(options?: Options<RolesQueryParams & InternalQueryParams>): AsyncGenerator<AxiosResponse<ApiRole[], any>, any, unknown>;
+    } & Options): Promise<AxiosResponse<ApiRole, any>>;
+    get(id: number, options: Options): Promise<Role>;
+    list(query: RolesQueryParams, options?: Options): AsyncGenerator<Role, void, unknown>;
+    listAll(query: RolesQueryParams, options?: Options): Promise<Role[]>;
+    listByPage(query: RolesQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiRole[], any>, any, unknown>;
     update(id: number, data: Partial<ApiRole>): Promise<Role>;
     update(id: number, data: Partial<ApiRole>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiRole, any>>;
-    update(id: number, data: Partial<ApiRole>, options: Options<InternalQueryParams>): Promise<Role>;
+    } & Options): Promise<AxiosResponse<ApiRole, any>>;
+    update(id: number, data: Partial<ApiRole>, options: Options): Promise<Role>;
     delete(id: number): Promise<number>;
     delete(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    delete(id: number, options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    delete(id: number, options: Options): Promise<number>;
 }
-export { RolesService };
+export {};

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

@@ -43,14 +43,14 @@ class RolesService extends index_js_1.Service {
     get(id, options) {
         return super.fetch({ url: `${this.apiPath}/${id}` }, options).then((res) => Promise.resolve((options === null || options === void 0 ? void 0 : options.rawResponse) ? res : new role_model_js_1.Role(res.data)), (err) => Promise.reject((options === null || options === void 0 ? void 0 : options.rawResponse) ? err : new error_response_model_js_1.ErrorResponse(err)));
     }
-    list(options) {
+    list(query, options) {
         const _super = Object.create(null, {
             iterator: { get: () => super.iterator }
         });
         return __asyncGenerator(this, arguments, function* list_1() {
             var e_1, _a;
             try {
-                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
+                for (var _b = __asyncValues(_super.iterator.call(this, { url: this.apiPath, params: query }, options)), _c; _c = yield __await(_b.next()), !_c.done;) {
                     const res = _c.value;
                     yield yield __await(new role_model_js_1.Role(res));
                 }
@@ -64,13 +64,13 @@ class RolesService extends index_js_1.Service {
             }
         });
     }
-    listAll() {
+    listAll(query, options) {
         var e_2, _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const roles = [];
                 try {
-                    for (var _b = __asyncValues(this.list()), _c; _c = yield _b.next(), !_c.done;) {
+                    for (var _b = __asyncValues(this.list(query, options)), _c; _c = yield _b.next(), !_c.done;) {
                         const role = _c.value;
                         roles.push(role);
                     }
@@ -89,8 +89,8 @@ class RolesService extends index_js_1.Service {
             }
         });
     }
-    listByPage(options) {
-        return super.iterator({ url: this.apiPath }, options).byPage();
+    listByPage(query, options) {
+        return super.iterator({ url: this.apiPath, params: query }, options).byPage();
     }
     update(id, data, options) {
         return super

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

@@ -1,17 +1,19 @@
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
 export declare type RequirementsOf<T, K extends keyof T> = Required<Pick<T, K>> & Partial<T>;
-export interface Options<T> {
+export interface Options {
     rawResponse?: boolean;
-    params?: T;
+    expand?: string[];
+    fields?: string[];
+    limit?: number;
 }
 export declare abstract class Service<ApiResponse = any> {
     isLeaveRequest(endpoint?: string): boolean;
     private buildQueryStr;
     private getPagingObject;
-    fetch<T = ApiResponse>(httpOptions: AxiosRequestConfig, options?: any): Promise<AxiosResponse<T>>;
+    fetch<T = ApiResponse>(httpOptions: AxiosRequestConfig, options?: Options): Promise<AxiosResponse<T>>;
     private listFetch;
     private listResponses;
-    iterator<T = ApiResponse>(reqObject: any, options?: any): {
+    iterator<T = ApiResponse>(reqObject: any, options?: Options): {
         [Symbol.asyncIterator](): {
             next(): Promise<IteratorResult<T, void>>;
         };

package/dist/cjs/services/service.js

@@ -81,7 +81,7 @@ class Service {
                 // need to convert user field in payload to a header for creating leave_requests when using an API key
                 this.isLeaveRequest(httpOptions.url) ? (headers.User = `${httpOptions.data.user}`) : undefined;
             }
-            const reqObject = Object.assign(Object.assign({}, httpOptions), { baseURL: rotacloud_js_1.RotaCloud.config.baseUri, headers, params: options === null || options === void 0 ? void 0 : options.params, paramsSerializer: (params) => {
+            const reqObject = Object.assign(Object.assign({}, httpOptions), { baseURL: rotacloud_js_1.RotaCloud.config.baseUri, headers, params: Object.assign({ expand: options === null || options === void 0 ? void 0 : options.expand, fields: options === null || options === void 0 ? void 0 : options.fields, limit: options === null || options === void 0 ? void 0 : options.limit }, httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.params), paramsSerializer: (params) => {
                     return params ? this.buildQueryStr(params) : '';
                 } });
             const response = yield axios_1.default.request(reqObject);
@@ -105,7 +105,7 @@ class Service {
                 else {
                     running = false;
                 }
-                yield yield __await(yield __await(res));
+                yield yield __await(res);
             } while (running);
         });
     }

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

@@ -3,54 +3,46 @@ import { ApiShift } from '../interfaces/index.js';
 import { Service, Options, RequirementsOf } from './index.js';
 import { Shift } from '../models/shift.model.js';
 import { ShiftsQueryParams } from '../interfaces/query-params/shifts-query-params.interface.js';
-import { InternalQueryParams } from '../interfaces/query-params/internal-query-params.interface.js';
 declare type RequiredProps = 'end_time' | 'start_time' | 'location';
-declare class ShiftsService extends Service {
+export declare class ShiftsService extends Service {
     private apiPath;
     create(data: RequirementsOf<ApiShift, RequiredProps>): Promise<Shift>;
     create(data: RequirementsOf<ApiShift, RequiredProps>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiShift, any>>;
-    create(data: RequirementsOf<ApiShift, RequiredProps>, options: Options<InternalQueryParams>): Promise<Shift>;
+    } & Options): Promise<AxiosResponse<ApiShift, any>>;
+    create(data: RequirementsOf<ApiShift, RequiredProps>, options: Options): Promise<Shift>;
     get(id: number): Promise<Shift>;
     get(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiShift, any>>;
-    get(id: number, options: Options<InternalQueryParams>): Promise<Shift>;
-    list(options?: Options<ShiftsQueryParams & InternalQueryParams>): AsyncGenerator<Shift, void, unknown>;
-    listAll(): Promise<Shift[]>;
-    listByPage(options?: Options<ShiftsQueryParams & InternalQueryParams>): AsyncGenerator<AxiosResponse<ApiShift[], any>, any, unknown>;
+    } & Options): Promise<AxiosResponse<ApiShift, any>>;
+    get(id: number, options: Options): Promise<Shift>;
+    list(query: ShiftsQueryParams, options?: Options): AsyncGenerator<Shift, void, unknown>;
+    listAll(query: ShiftsQueryParams, options?: Options): Promise<Shift[]>;
+    listByPage(query: ShiftsQueryParams, options?: Options): AsyncGenerator<AxiosResponse<ApiShift[], any>, any, unknown>;
     update(id: number, data: Partial<ApiShift>): Promise<Shift>;
     update(id: number, data: Partial<ApiShift>, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<ApiShift, any>>;
-    update(id: number, data: Partial<ApiShift>, options: Options<InternalQueryParams>): Promise<Shift>;
+    } & Options): Promise<AxiosResponse<ApiShift, any>>;
+    update(id: number, data: Partial<ApiShift>, options: Options): Promise<Shift>;
     delete(id: number): Promise<number>;
     delete(id: number, options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    delete(id: number, options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    delete(id: number, options: Options): Promise<number>;
     acknowledge(data: number[]): Promise<number>;
     acknowledge(data: number[], options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    acknowledge(data: number[], options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    acknowledge(data: number[], options: Options): Promise<number>;
     publish(data: number[]): Promise<number>;
     publish(data: number[], options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    publish(data: number[], options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    publish(data: number[], options: Options): Promise<number>;
     unpublish(data: number[]): Promise<number>;
     unpublish(data: number[], options: {
         rawResponse: true;
-        params?: InternalQueryParams;
-    }): Promise<AxiosResponse<any, any>>;
-    unpublish(data: number[], options: Options<InternalQueryParams>): Promise<number>;
+    } & Options): Promise<AxiosResponse<any, any>>;
+    unpublish(data: number[], options: Options): Promise<number>;
 }
-export { ShiftsService };
+export {};