@hedhog/pagination 0.0.1 → 0.0.3

package/dist/constants/pagination.constants.d.ts

@@ -0,0 +1,3 @@
+export declare const DEFAULT_PAGE = 1;
+export declare const DEFAULT_PAGE_SIZE = 20;
+//# sourceMappingURL=pagination.constants.d.ts.map

package/dist/constants/pagination.constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.constants.d.ts","sourceRoot":"","sources":["../../src/constants/pagination.constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,IAAI,CAAC;AAC9B,eAAO,MAAM,iBAAiB,KAAK,CAAC"}

package/dist/constants/pagination.constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_PAGE_SIZE = exports.DEFAULT_PAGE = void 0;
+exports.DEFAULT_PAGE = 1;
+exports.DEFAULT_PAGE_SIZE = 20;
+//# sourceMappingURL=pagination.constants.js.map

package/dist/constants/pagination.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.constants.js","sourceRoot":"","sources":["../../src/constants/pagination.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,CAAC,CAAC;AACjB,QAAA,iBAAiB,GAAG,EAAE,CAAC"}

package/dist/decorator/pagination.decorator.d.ts

@@ -0,0 +1,3 @@
+import { PaginationField } from '../enums/patination.enums';
+export declare const Pagination: (...dataOrPipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>> | PaginationField)[]) => ParameterDecorator;
+//# sourceMappingURL=pagination.decorator.d.ts.map

package/dist/decorator/pagination.decorator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.decorator.d.ts","sourceRoot":"","sources":["../../src/decorator/pagination.decorator.ts"],"names":[],"mappings":"AAYA,OAAO,EAAsB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAGhF,eAAO,MAAM,UAAU,kMAoEtB,CAAC"}

package/dist/decorator/pagination.decorator.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Pagination = void 0;
+const common_1 = require("@nestjs/common");
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+const pagination_constants_1 = require("../constants/pagination.constants");
+const pagination_dto_1 = require("../dto/pagination.dto");
+const patination_enums_1 = require("../enums/patination.enums");
+exports.Pagination = (0, common_1.createParamDecorator)((data, ctx) => {
+    const request = ctx.switchToHttp().getRequest();
+    const defaultOptions = {
+        page: pagination_constants_1.DEFAULT_PAGE,
+        pageSize: pagination_constants_1.DEFAULT_PAGE_SIZE,
+        search: '',
+        sortField: 'id',
+        sortOrder: patination_enums_1.PageOrderDirection.Asc,
+        fields: '',
+    };
+    const requestData = Object.assign(Object.assign(Object.assign({}, defaultOptions), (request.body || {})), (request.query || {}));
+    const { page = defaultOptions.page, pageSize = defaultOptions.pageSize, search = defaultOptions.search, sortField = defaultOptions.sortField, sortOrder = defaultOptions.sortOrder, fields = defaultOptions.fields, } = requestData;
+    const validSortOrder = Object.values(patination_enums_1.PageOrderDirection).includes(sortOrder)
+        ? sortOrder
+        : defaultOptions.sortOrder;
+    const finalData = {
+        page,
+        pageSize,
+        search,
+        sortField,
+        sortOrder: validSortOrder,
+        fields,
+    };
+    const paginationDtoInstance = (0, class_transformer_1.plainToClass)(pagination_dto_1.PaginationDTO, finalData);
+    const errors = (0, class_validator_1.validateSync)(paginationDtoInstance);
+    if (errors.length > 0) {
+        throw new common_1.BadRequestException('Pagination data is not valid according to PaginationDto: ' +
+            errors
+                .map((error) => Object.values(error.constraints).join(', '))
+                .join(', '));
+    }
+    if (data) {
+        switch (data) {
+            case patination_enums_1.PaginationField.Page:
+            case patination_enums_1.PaginationField.PageSize:
+                return finalData[data] ? +finalData[data] : defaultOptions[data];
+            case patination_enums_1.PaginationField.SortOrder:
+                return validSortOrder || defaultOptions[data];
+            default:
+                return finalData[data];
+        }
+    }
+    return finalData;
+});
+//# sourceMappingURL=pagination.decorator.js.map

package/dist/decorator/pagination.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.decorator.js","sourceRoot":"","sources":["../../src/decorator/pagination.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAIwB;AACxB,yDAAiD;AACjD,qDAA+C;AAC/C,4EAG2C;AAC3C,0DAAsD;AACtD,gEAAgF;AAGnE,QAAA,UAAU,GAAG,IAAA,6BAAoB,EAC5C,CAAC,IAAqB,EAAE,GAAqB,EAAkB,EAAE;IAC/D,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAEhD,MAAM,cAAc,GAAmB;QACrC,IAAI,EAAE,mCAAY;QAClB,QAAQ,EAAE,wCAAiB;QAC3B,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,qCAAkB,CAAC,GAAG;QACjC,MAAM,EAAE,EAAE;KACX,CAAC;IAEF,MAAM,WAAW,iDACZ,cAAc,GACd,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,GACpB,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CACzB,CAAC;IAEF,MAAM,EACJ,IAAI,GAAG,cAAc,CAAC,IAAI,EAC1B,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAClC,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,SAAS,GAAG,cAAc,CAAC,SAAS,EACpC,SAAS,GAAG,cAAc,CAAC,SAAS,EACpC,MAAM,GAAG,cAAc,CAAC,MAAM,GAC/B,GAAG,WAAW,CAAC;IAEhB,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,qCAAkB,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QAC1E,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC;IAE7B,MAAM,SAAS,GAAG;QAChB,IAAI;QACJ,QAAQ;QACR,MAAM;QACN,SAAS;QACT,SAAS,EAAE,cAAc;QACzB,MAAM;KACP,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAA,gCAAY,EAAC,8BAAa,EAAE,SAAS,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,qBAAqB,CAAC,CAAC;IAEnD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,4BAAmB,CAC3B,2DAA2D;YACzD,MAAM;iBACH,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC3D,IAAI,CAAC,IAAI,CAAC,CAChB,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACT,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,kCAAe,CAAC,IAAI,CAAC;YAC1B,KAAK,kCAAe,CAAC,QAAQ;gBAC3B,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACnE,KAAK,kCAAe,CAAC,SAAS;gBAC5B,OAAO,cAAc,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;YAChD;gBACE,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CACF,CAAC"}

package/dist/dto/pagination.dto.d.ts

@@ -0,0 +1,10 @@
+import { PageOrderDirection } from '../enums/patination.enums';
+export declare class PaginationDTO {
+    page: number;
+    pageSize: number;
+    search: string;
+    sortField: string;
+    sortOrder: PageOrderDirection;
+    fields: string;
+}
+//# sourceMappingURL=pagination.dto.d.ts.map

package/dist/dto/pagination.dto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.dto.d.ts","sourceRoot":"","sources":["../../src/dto/pagination.dto.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,qBAAa,aAAa;IAIxB,IAAI,EAAE,MAAM,CAAC;IAKb,QAAQ,EAAE,MAAM,CAAC;IAIjB,MAAM,EAAE,MAAM,CAAC;IAIf,SAAS,EAAE,MAAM,CAAC;IAKlB,SAAS,EAAE,kBAAkB,CAAC;IAI9B,MAAM,EAAE,MAAM,CAAC;CAChB"}

package/dist/dto/pagination.dto.js

@@ -0,0 +1,52 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginationDTO = void 0;
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+const patination_enums_1 = require("../enums/patination.enums");
+class PaginationDTO {
+}
+exports.PaginationDTO = PaginationDTO;
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Transform)(({ value }) => Number(value)),
+    (0, class_validator_1.IsInt)({ message: 'page must be an integer' }),
+    __metadata("design:type", Number)
+], PaginationDTO.prototype, "page", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Transform)(({ value }) => Number(value)),
+    (0, class_validator_1.IsInt)({ message: 'pageSize must be an integer' }),
+    __metadata("design:type", Number)
+], PaginationDTO.prototype, "pageSize", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)({ message: 'search must be a string' }),
+    __metadata("design:type", String)
+], PaginationDTO.prototype, "search", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)({ message: 'field must be a string' }),
+    __metadata("design:type", String)
+], PaginationDTO.prototype, "sortField", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)({ message: 'sortOrder must be a string' }),
+    (0, class_validator_1.IsEnum)(patination_enums_1.PageOrderDirection, { message: 'sortOrder is not valid' }),
+    __metadata("design:type", String)
+], PaginationDTO.prototype, "sortOrder", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)({ message: 'fields must be a string' }),
+    __metadata("design:type", String)
+], PaginationDTO.prototype, "fields", void 0);
+//# sourceMappingURL=pagination.dto.js.map

package/dist/dto/pagination.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.dto.js","sourceRoot":"","sources":["../../src/dto/pagination.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA8C;AAC9C,qDAAsE;AACtE,gEAA+D;AAC/D,MAAa,aAAa;CA2BzB;AA3BD,sCA2BC;AAvBC;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;;2CACjC;AAKb;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,IAAA,uBAAK,EAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,CAAC;;+CACjC;AAIjB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;;6CAClC;AAIf;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;;gDAC9B;AAKlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACnD,IAAA,wBAAM,EAAC,qCAAkB,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;;gDACpC;AAI9B;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;;6CAClC"}

package/dist/enums/patination.enums.d.ts

@@ -0,0 +1,12 @@
+export declare enum PageOrderDirection {
+    Asc = "asc",
+    Desc = "desc"
+}
+export declare enum PaginationField {
+    Page = "page",
+    PageSize = "pageSize",
+    SortField = "sortOrder",
+    SortOrder = "sortOrder",
+    Search = "search"
+}
+//# sourceMappingURL=patination.enums.d.ts.map

package/dist/enums/patination.enums.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"patination.enums.d.ts","sourceRoot":"","sources":["../../src/enums/patination.enums.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,GAAG,QAAQ;IACX,IAAI,SAAS;CACd;AAED,oBAAY,eAAe;IACzB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,MAAM,WAAW;CAClB"}

package/dist/enums/patination.enums.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginationField = exports.PageOrderDirection = void 0;
+var PageOrderDirection;
+(function (PageOrderDirection) {
+    PageOrderDirection["Asc"] = "asc";
+    PageOrderDirection["Desc"] = "desc";
+})(PageOrderDirection || (exports.PageOrderDirection = PageOrderDirection = {}));
+var PaginationField;
+(function (PaginationField) {
+    PaginationField["Page"] = "page";
+    PaginationField["PageSize"] = "pageSize";
+    PaginationField["SortField"] = "sortOrder";
+    PaginationField["SortOrder"] = "sortOrder";
+    PaginationField["Search"] = "search";
+})(PaginationField || (exports.PaginationField = PaginationField = {}));
+//# sourceMappingURL=patination.enums.js.map

package/dist/enums/patination.enums.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patination.enums.js","sourceRoot":"","sources":["../../src/enums/patination.enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,mCAAa,CAAA;AACf,CAAC,EAHW,kBAAkB,kCAAlB,kBAAkB,QAG7B;AAED,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,gCAAa,CAAA;IACb,wCAAqB,CAAA;IACrB,0CAAuB,CAAA;IACvB,0CAAuB,CAAA;IACvB,oCAAiB,CAAA;AACnB,CAAC,EANW,eAAe,+BAAf,eAAe,QAM1B"}

package/dist/index.d.ts

@@ -0,0 +1,8 @@
+export * from './constants/pagination.constants';
+export * from './decorator/pagination.decorator';
+export * from './dto/pagination.dto';
+export * from './enums/patination.enums';
+export * from './pagination.module';
+export * from './pagination.service';
+export type * from './types/pagination.types';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,mBAAmB,0BAA0B,CAAC"}

package/dist/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./constants/pagination.constants"), exports);
+__exportStar(require("./decorator/pagination.decorator"), exports);
+__exportStar(require("./dto/pagination.dto"), exports);
+__exportStar(require("./enums/patination.enums"), exports);
+__exportStar(require("./pagination.module"), exports);
+__exportStar(require("./pagination.service"), exports);
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mEAAiD;AACjD,mEAAiD;AACjD,uDAAqC;AACrC,2DAAyC;AACzC,sDAAoC;AACpC,uDAAqC"}

package/dist/pagination.module.d.ts

@@ -0,0 +1,3 @@
+export declare class PaginationModule {
+}
+//# sourceMappingURL=pagination.module.d.ts.map

package/dist/pagination.module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.module.d.ts","sourceRoot":"","sources":["../src/pagination.module.ts"],"names":[],"mappings":"AAGA,qBAKa,gBAAgB;CAAG"}

package/dist/pagination.module.js

@@ -0,0 +1,22 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginationModule = void 0;
+const common_1 = require("@nestjs/common");
+const pagination_service_1 = require("./pagination.service");
+let PaginationModule = class PaginationModule {
+};
+exports.PaginationModule = PaginationModule;
+exports.PaginationModule = PaginationModule = __decorate([
+    (0, common_1.Module)({
+        imports: [],
+        providers: [pagination_service_1.PaginationService],
+        exports: [pagination_service_1.PaginationService],
+    })
+], PaginationModule);
+//# sourceMappingURL=pagination.module.js.map

package/dist/pagination.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.module.js","sourceRoot":"","sources":["../src/pagination.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6DAAyD;AAOlD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC,sCAAiB,CAAC;QAC9B,OAAO,EAAE,CAAC,sCAAiB,CAAC;KAC7B,CAAC;GACW,gBAAgB,CAAG"}

package/dist/pagination.service.d.ts

@@ -0,0 +1,9 @@
+import type { BaseModel, FindManyArgs, PaginatedResult, PaginationParams } from './types/pagination.types';
+export declare class PaginationService {
+    private readonly logger;
+    paginate<T, M extends BaseModel>(model: M, paginationParams: PaginationParams, customQuery?: FindManyArgs<M>): Promise<PaginatedResult<T>>;
+    extractFieldNames(model: Record<string, any>): string[];
+    isInvalidField(sortField: string, model: BaseModel): boolean;
+    isInvalidFields(fields: string[], model: BaseModel): boolean;
+}
+//# sourceMappingURL=pagination.service.d.ts.map

package/dist/pagination.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.service.d.ts","sourceRoot":"","sources":["../src/pagination.service.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,eAAe,EACf,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAElC,qBACa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAEvD,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,SAAS,EACnC,KAAK,EAAE,CAAC,EACR,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAC5B,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAuG9B,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE;IAcvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO;IAI5D,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO;CAG7D"}

package/dist/pagination.service.js

@@ -0,0 +1,112 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var PaginationService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginationService = void 0;
+const common_1 = require("@nestjs/common");
+const pagination_constants_1 = require("./constants/pagination.constants");
+const patination_enums_1 = require("./enums/patination.enums");
+let PaginationService = PaginationService_1 = class PaginationService {
+    constructor() {
+        this.logger = new common_1.Logger(PaginationService_1.name);
+    }
+    async paginate(model, paginationParams, customQuery) {
+        try {
+            const page = Number(paginationParams.page || pagination_constants_1.DEFAULT_PAGE);
+            const pageSize = Number(paginationParams.pageSize || pagination_constants_1.DEFAULT_PAGE_SIZE);
+            const search = paginationParams.search || null;
+            const sortField = paginationParams.sortField || null;
+            const sortOrder = paginationParams.sortOrder || patination_enums_1.PageOrderDirection.Asc;
+            const fields = paginationParams.fields
+                ? paginationParams.fields.split(',')
+                : null;
+            if (page < 1 || pageSize < 1) {
+                throw new common_1.BadRequestException('Page and pageSize must be greater than 0');
+            }
+            let selectCondition = undefined;
+            let sortOrderCondition = {
+                id: paginationParams.sortOrder || patination_enums_1.PageOrderDirection.Asc,
+            };
+            if (sortField) {
+                const invalid = this.isInvalidField(sortField, model);
+                if (invalid) {
+                    this.logger.error(`Invalid field: ${sortField}`);
+                    throw new common_1.BadRequestException(`Invalid field: ${sortField}. Valid columns are: ${this.extractFieldNames(model).join(', ')}`);
+                }
+                sortOrderCondition = { [sortField]: sortOrder };
+            }
+            if (search) {
+                if (typeof search !== 'string') {
+                    this.logger.error('Search must be a string');
+                    throw new common_1.BadRequestException('Search must be a string');
+                }
+            }
+            if (fields) {
+                const invalidFields = this.isInvalidFields(fields, model);
+                if (invalidFields) {
+                    this.logger.error(`Invalid fields: ${sortField}. Valid columns are: ${this.extractFieldNames(model).join(', ')}`);
+                    throw new common_1.BadRequestException(`Invalid fields: ${sortField}. Valid columns are: ${this.extractFieldNames(model).join(', ')}`);
+                }
+                selectCondition = fields.reduce((acc, field) => {
+                    acc[field] = true;
+                    return acc;
+                }, {});
+            }
+            const skip = page > 0 ? pageSize * (page - 1) : 0;
+            const query = {
+                select: selectCondition,
+                where: (customQuery === null || customQuery === void 0 ? void 0 : customQuery.where) || {},
+                orderBy: sortOrderCondition,
+                take: pageSize,
+                skip,
+            };
+            const [total, data] = await Promise.all([
+                model.count({ where: (customQuery === null || customQuery === void 0 ? void 0 : customQuery.where) || {} }),
+                model.findMany(query),
+            ]);
+            const lastPage = Math.ceil(total / pageSize);
+            return {
+                total,
+                lastPage,
+                currentPage: page,
+                pageSize,
+                prev: page > 1 ? page - 1 : null,
+                next: page < lastPage ? page + 1 : null,
+                data,
+            };
+        }
+        catch (error) {
+            this.logger.error('Pagination Error:', error);
+            if (error instanceof common_1.BadRequestException) {
+                throw error;
+            }
+            throw new common_1.BadRequestException(`Failed to paginate: ${error}`);
+        }
+    }
+    extractFieldNames(model) {
+        const fieldNames = [];
+        const fields = model.fields;
+        for (const key in fields) {
+            if (fields.hasOwnProperty(key)) {
+                fieldNames.push(key);
+            }
+        }
+        return fieldNames;
+    }
+    isInvalidField(sortField, model) {
+        return !model.fields[sortField];
+    }
+    isInvalidFields(fields, model) {
+        return !fields.every((field) => model.fields[field]);
+    }
+};
+exports.PaginationService = PaginationService;
+exports.PaginationService = PaginationService = PaginationService_1 = __decorate([
+    (0, common_1.Injectable)()
+], PaginationService);
+//# sourceMappingURL=pagination.service.js.map

package/dist/pagination.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.service.js","sourceRoot":"","sources":["../src/pagination.service.ts"],"names":[],"mappings":"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"}

package/dist/pagination.service.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=pagination.service.spec.d.ts.map

package/dist/pagination.service.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.service.spec.d.ts","sourceRoot":"","sources":["../src/pagination.service.spec.ts"],"names":[],"mappings":""}

package/dist/pagination.service.spec.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const testing_1 = require("@nestjs/testing");
+const pagination_service_1 = require("./pagination.service");
+describe('PaginationService', () => {
+    let service;
+    beforeEach(async () => {
+        const module = await testing_1.Test.createTestingModule({
+            providers: [pagination_service_1.PaginationService],
+        }).compile();
+        service = module.get(pagination_service_1.PaginationService);
+    });
+    it('should be defined', () => {
+        expect(service).toBeDefined();
+    });
+});
+//# sourceMappingURL=pagination.service.spec.js.map

package/dist/pagination.service.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.service.spec.js","sourceRoot":"","sources":["../src/pagination.service.spec.ts"],"names":[],"mappings":";;AAAA,6CAAsD;AACtD,6DAAyD;AAEzD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,OAA0B,CAAC;IAE/B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,MAAM,GAAkB,MAAM,cAAI,CAAC,mBAAmB,CAAC;YAC3D,SAAS,EAAE,CAAC,sCAAiB,CAAC;SAC/B,CAAC,CAAC,OAAO,EAAE,CAAC;QAEb,OAAO,GAAG,MAAM,CAAC,GAAG,CAAoB,sCAAiB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/types/pagination.types.d.ts

@@ -0,0 +1,33 @@
+import { PageOrderDirection } from '../enums/patination.enums';
+export type PaginatedResult<T> = {
+    total: number;
+    lastPage: number;
+    currentPage: number;
+    pageSize: number;
+    prev: number | null;
+    next: number | null;
+    data: T[];
+};
+export type PaginationType = string | number | PaginationParams;
+export type PaginateFunction = <K, T>(model: any, args?: K, options?: PaginateOptions) => Promise<PaginatedResult<T>>;
+export type PaginationParams = {
+    page?: number;
+    pageSize?: number;
+    search?: string;
+    sortField?: string;
+    sortOrder?: PageOrderDirection;
+    fields: string;
+};
+export type PaginateOptions = {
+    page?: number | string;
+    pageSize?: number | string;
+};
+export type BaseModel = {
+    findMany: (args: any) => Promise<any[]>;
+    count: (args: any) => Promise<number>;
+    fields?: Record<string, any>;
+};
+export type FindManyArgs<M> = M extends {
+    findMany: (args: infer A) => any;
+} ? A : never;
+//# sourceMappingURL=pagination.types.d.ts.map

package/dist/types/pagination.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.types.d.ts","sourceRoot":"","sources":["../../src/types/pagination.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,CAAC,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC;AAEhE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAClC,KAAK,EAAE,GAAG,EACV,IAAI,CAAC,EAAE,CAAC,EACR,OAAO,CAAC,EAAE,eAAe,KACtB,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACxC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,GAAG,CAAA;CAAE,GACxE,CAAC,GACD,KAAK,CAAC"}

package/dist/types/pagination.types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=pagination.types.js.map

package/dist/types/pagination.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.types.js","sourceRoot":"","sources":["../../src/types/pagination.types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@hedhog/pagination",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "private": false,
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsc && npm version patch",
+    "build": "tsc --project tsconfig.production.json && npm version patch",
     "prod": "npm run build && npm publish --access public"
   },
   "keywords": [],

package/src/decorator/pagination.decorator.ts

@@ -1,8 +1,15 @@
-import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+import {
+  BadRequestException,
+  createParamDecorator,
+  ExecutionContext,
+} from '@nestjs/common';
+import { plainToClass } from 'class-transformer';
+import { validateSync } from 'class-validator';
 import {
   DEFAULT_PAGE,
   DEFAULT_PAGE_SIZE,
 } from '../constants/pagination.constants';
+import { PaginationDTO } from '../dto/pagination.dto';
 import { PageOrderDirection, PaginationField } from '../enums/patination.enums';
 import { PaginationType } from '../types/pagination.types';
 
@@ -38,25 +45,40 @@ export const Pagination = createParamDecorator(
       ? sortOrder
       : defaultOptions.sortOrder;
 
+    const finalData = {
+      page,
+      pageSize,
+      search,
+      sortField,
+      sortOrder: validSortOrder,
+      fields,
+    };
+
+    const paginationDtoInstance = plainToClass(PaginationDTO, finalData);
+
+    const errors = validateSync(paginationDtoInstance);
+
+    if (errors.length > 0) {
+      throw new BadRequestException(
+        'Pagination data is not valid according to PaginationDto: ' +
+          errors
+            .map((error) => Object.values(error.constraints).join(', '))
+            .join(', '),
+      );
+    }
+
     if (data) {
       switch (data) {
         case PaginationField.Page:
         case PaginationField.PageSize:
-          return requestData[data] ? +requestData[data] : defaultOptions[data];
-        case PaginationField.OrderDirection:
-          return requestData[data] || defaultOptions[data];
+          return finalData[data] ? +finalData[data] : defaultOptions[data];
+        case PaginationField.SortOrder:
+          return validSortOrder || defaultOptions[data];
         default:
-          return requestData[data];
+          return finalData[data];
       }
     }
 
-    return {
-      page: +page,
-      pageSize: +pageSize,
-      search,
-      sortField,
-      sortOrder: validSortOrder,
-      fields,
-    };
+    return finalData;
   },
 );

package/src/dto/pagination.dto.ts

@@ -3,12 +3,12 @@ import { IsEnum, IsInt, IsOptional, IsString } from 'class-validator';
 import { PageOrderDirection } from '../enums/patination.enums';
 export class PaginationDTO {
   @IsOptional()
-  @Transform((value) => Number(value))
+  @Transform(({ value }) => Number(value))
   @IsInt({ message: 'page must be an integer' })
   page: number;
 
   @IsOptional()
-  @Transform((value) => Number(value))
+  @Transform(({ value }) => Number(value))
   @IsInt({ message: 'pageSize must be an integer' })
   pageSize: number;
 

package/src/enums/patination.enums.ts

@@ -6,7 +6,7 @@ export enum PageOrderDirection {
 export enum PaginationField {
   Page = 'page',
   PageSize = 'pageSize',
-  OrderField = 'orderField',
-  OrderDirection = 'orderDirection',
+  SortField = 'sortOrder',
+  SortOrder = 'sortOrder',
   Search = 'search',
 }

package/src/pagination.service.ts

@@ -41,34 +41,44 @@ export class PaginationService {
         id: paginationParams.sortOrder || PageOrderDirection.Asc,
       };
 
-      if (search && sortField) {
-        const fieldNames = this.extractFieldNames(model);
-
-        if (!fieldNames.includes(sortField)) {
+      if (sortField) {
+        const invalid = this.isInvalidField(sortField, model);
+        if (invalid) {
+          this.logger.error(`Invalid field: ${sortField}`);
           throw new BadRequestException(
-            `Invalid field: ${sortField}. Valid columns are: ${fieldNames.join(', ')}`,
+            `Invalid field: ${sortField}. Valid columns are: ${this.extractFieldNames(
+              model,
+            ).join(', ')}`,
           );
         }
 
-        if (typeof sortField !== 'string') {
-          throw new BadRequestException('Field must be a string');
-        }
+        sortOrderCondition = { [sortField]: sortOrder };
       }
 
-      if (sortField) {
-        sortOrderCondition = { [sortField]: sortOrder };
+      if (search) {
+        if (typeof search !== 'string') {
+          this.logger.error('Search must be a string');
+          throw new BadRequestException('Search must be a string');
+        }
       }
 
       if (fields) {
-        const fieldNames = this.extractFieldNames(model);
-        const invalidFields = fields.filter(
-          (field) => !fieldNames.includes(field),
-        );
-        if (invalidFields.length > 0) {
+        const invalidFields = this.isInvalidFields(fields, model);
+
+        if (invalidFields) {
+          this.logger.error(
+            `Invalid fields: ${sortField}. Valid columns are: ${this.extractFieldNames(
+              model,
+            ).join(', ')}`,
+          );
+
           throw new BadRequestException(
-            `Invalid fields: ${invalidFields.join(', ')}. Valid columns are: ${fieldNames.join(', ')}`,
+            `Invalid fields: ${sortField}. Valid columns are: ${this.extractFieldNames(
+              model,
+            ).join(', ')}`,
           );
         }
+
         selectCondition = fields.reduce((acc, field) => {
           acc[field] = true;
           return acc;
@@ -108,7 +118,7 @@ export class PaginationService {
         throw error;
       }
 
-      throw new BadRequestException(`Failed to paginate: ${error.message}`);
+      throw new BadRequestException(`Failed to paginate: ${error}`);
     }
   }
 
@@ -125,4 +135,12 @@ export class PaginationService {
 
     return fieldNames;
   }
+
+  isInvalidField(sortField: string, model: BaseModel): boolean {
+    return !model.fields[sortField];
+  }
+
+  isInvalidFields(fields: string[], model: BaseModel): boolean {
+    return !fields.every((field) => model.fields[field]);
+  }
 }