@tc-libs/pagination 0.66.0 → 0.68.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/decorators/pagination.decorator.d.ts +1 -1
- package/src/decorators/pagination.decorator.js.map +1 -1
- package/src/pipes/pagination.order.pipe.d.ts +1 -1
- package/src/pipes/pagination.order.pipe.js.map +1 -1
- package/src/services/pagination.service.d.ts +2 -1
- package/src/services/pagination.service.js +16 -4
- package/src/services/pagination.service.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tc-libs/pagination",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.68.0",
|
|
4
4
|
"dependencies": {
|
|
5
5
|
"tslib": "^2.3.0",
|
|
6
6
|
"@nestjs/common": "^10.0.2",
|
|
7
7
|
"@nestjs/swagger": "^7.1.10",
|
|
8
8
|
"@nestjs/core": "^10.0.2",
|
|
9
|
-
"@tc-libs/helper": "0.
|
|
9
|
+
"@tc-libs/helper": "0.68.0",
|
|
10
10
|
"mongoose": "^7.5.0",
|
|
11
11
|
"lodash": "^4.17.21",
|
|
12
12
|
"express": "4.21.0",
|
|
13
|
-
"@tc-libs/errors": "0.
|
|
13
|
+
"@tc-libs/errors": "0.68.0"
|
|
14
14
|
},
|
|
15
15
|
"type": "commonjs",
|
|
16
16
|
"main": "./src/index.js",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ENUM_PAGINATION_ORDER_DIRECTION_TYPE } from '../constants';
|
|
2
2
|
import { IPaginationFilterStringEqualOptions, IPaginationFilterStringContainOptions, IPaginationFilterDateOptions, IPaginationSelect, IPaginationSelectValue } from '../interfaces';
|
|
3
|
-
export declare function PaginationQuery(defaultPerPage: number, defaultOrderBy: string, defaultOrderDirection: ENUM_PAGINATION_ORDER_DIRECTION_TYPE, availableSearch: string[], availableOrderBy: string[], isAdmin?: boolean, availableSelects?: IPaginationSelect[]): ParameterDecorator;
|
|
3
|
+
export declare function PaginationQuery(defaultPerPage: number, defaultOrderBy: string, defaultOrderDirection: ENUM_PAGINATION_ORDER_DIRECTION_TYPE | string, availableSearch: string[], availableOrderBy: string[], isAdmin?: boolean, availableSelects?: IPaginationSelect[]): ParameterDecorator;
|
|
4
4
|
export declare function PaginationQuerySearch(availableSearch: string[]): ParameterDecorator;
|
|
5
5
|
export declare function PaginationQueryFilterInBoolean(field: string, defaultValue: IPaginationSelectValue[]): ParameterDecorator;
|
|
6
6
|
export declare function PaginationQueryFilterInEnum<T>(field: string, defaultValue: T, defaultEnum: Record<string, any>): ParameterDecorator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.decorator.js","sourceRoot":"","sources":["../../../../../packages/pagination/src/decorators/pagination.decorator.ts"],"names":[],"mappings":";;AAqBA,0CAmBC;AAED,sDAIC;AAED,wEAKC;AAED,kEAMC;AAED,gEAKC;AAED,oEAKC;AAED,8DAKC;AAED,gFAIC;AAED,0EAIC;AA9FD,2CAAuC;AASvC,4FAAsF;AACtF,sFAAgF;AAChF,4GAAoG;AACpG,wFAAkF;AAClF,kGAA2F;AAC3F,4FAAqF;AACrF,0EAAqE;AACrE,4EAAuE;AACvE,4EAAuE;AACvE,4EAAuE;AACvE,0FAAoF;AAEpF,SAAgB,eAAe,CAC7B,cAAsB,EACtB,cAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"pagination.decorator.js","sourceRoot":"","sources":["../../../../../packages/pagination/src/decorators/pagination.decorator.ts"],"names":[],"mappings":";;AAqBA,0CAmBC;AAED,sDAIC;AAED,wEAKC;AAED,kEAMC;AAED,gEAKC;AAED,oEAKC;AAED,8DAKC;AAED,gFAIC;AAED,0EAIC;AA9FD,2CAAuC;AASvC,4FAAsF;AACtF,sFAAgF;AAChF,4GAAoG;AACpG,wFAAkF;AAClF,kGAA2F;AAC3F,4FAAqF;AACrF,0EAAqE;AACrE,4EAAuE;AACvE,4EAAuE;AACvE,4EAAuE;AACvE,0FAAoF;AAEpF,SAAgB,eAAe,CAC7B,cAAsB,EACtB,cAAsB,EACtB,qBAAoE,EACpE,eAAyB,EACzB,gBAA0B,EAC1B,OAAO,GAAG,KAAK,EACf,gBAAsC;IAEtC,OAAO,IAAA,cAAK,EACV,IAAA,6CAAoB,EAAC,eAAe,CAAC,EACrC,IAAA,6CAAoB,EAAC,cAAc,EAAE,OAAO,CAAC,EAC7C,IAAA,2CAAmB,EACjB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,CACjB,EACD,IAAA,6CAAoB,EAAC,gBAAgB,CAAC,CACvC,CAAC;AACJ,CAAC;AAED,SAAgB,qBAAqB,CACnC,eAAyB;IAEzB,OAAO,IAAA,cAAK,EAAC,IAAA,6CAAoB,EAAC,eAAe,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,8BAA8B,CAC5C,KAAa,EACb,YAAsC;IAEtC,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,IAAA,iEAA6B,EAAC,YAAY,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,2BAA2B,CACzC,KAAa,EACb,YAAe,EACf,WAAgC;IAEhC,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,IAAA,2DAA0B,EAAI,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,SAAgB,0BAA0B,CACxC,KAAa,EACb,OAA6C;IAE7C,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,IAAA,wDAAyB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAgB,4BAA4B,CAC1C,KAAa,EACb,OAA+C;IAE/C,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,IAAA,4DAA2B,EAAC,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,SAAgB,yBAAyB,CACvC,KAAa,EACb,OAAsC;IAEtC,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,IAAA,sDAAwB,EAAC,OAAO,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,SAAgB,kCAAkC,CAChD,KAAa;IAEb,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,0EAAiC,CAAC,CAAC;AACzD,CAAC;AAED,SAAgB,+BAA+B,CAC7C,KAAa;IAEb,OAAO,IAAA,cAAK,EAAC,KAAK,EAAE,IAAA,0DAA0B,GAAE,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from '@nestjs/common';
|
|
2
2
|
import { PipeTransform } from '@nestjs/common/interfaces';
|
|
3
3
|
import { ENUM_PAGINATION_ORDER_DIRECTION_TYPE } from '../constants';
|
|
4
|
-
export declare function PaginationOrderPipe(defaultOrderBy: string, defaultOrderDirection: ENUM_PAGINATION_ORDER_DIRECTION_TYPE, availableOrderBy: string[]): Type<PipeTransform>;
|
|
4
|
+
export declare function PaginationOrderPipe(defaultOrderBy: string, defaultOrderDirection: ENUM_PAGINATION_ORDER_DIRECTION_TYPE | string, availableOrderBy: string[]): Type<PipeTransform>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.order.pipe.js","sourceRoot":"","sources":["../../../../../packages/pagination/src/pipes/pagination.order.pipe.ts"],"names":[],"mappings":";;AAUA,kDA8CC;;AAvDD,2CAAiE;AACjE,0DAAiE;AACjE,uCAAuC;AACvC,4CAGsB;AACtB,uEAAmE;AAEnE,SAAgB,mBAAmB,CACjC,cAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"pagination.order.pipe.js","sourceRoot":"","sources":["../../../../../packages/pagination/src/pipes/pagination.order.pipe.ts"],"names":[],"mappings":";;AAUA,kDA8CC;;AAvDD,2CAAiE;AACjE,0DAAiE;AACjE,uCAAuC;AACvC,4CAGsB;AACtB,uEAAmE;AAEnE,SAAgB,mBAAmB,CACjC,cAAsB,EACtB,qBAAoE,EACpE,gBAA0B;IAE1B,IACM,wBAAwB,GAD9B,MACM,wBAAwB;QAC5B,YAEqB,OAAwC,EAC1C,iBAAoC;YADlC,YAAO,GAAP,OAAO,CAAiC;YAC1C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpD,CAAC;QAEJ,KAAK,CAAC,SAAS,CACb,KAA0B;YAE1B,MAAM,OAAO,GAAW,KAAK,EAAE,CAAC,SAAS,CAAC,IAAI,cAAc,CAAC;YAC7D,MAAM,cAAc,GAClB,KAAK,EAAE,CAAC,gBAAgB,CAAC,IAAI,qBAAqB,CAAC;YACrD,MAAM,uBAAuB,GAC3B,gDAAoC,CAAC;YAEvC,MAAM,KAAK,GAAwB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC7D,OAAO,EACP,cAAc,EACd,gBAAgB,CACjB,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG;gBAC1B,GAAG,IAAI,CAAC,OAAO,CAAC,YAAa;gBAC7B,OAAO;gBACP,cAAc;gBACd,gBAAgB;gBAChB,uBAAuB;aACxB,CAAC;YAEF,OAAO;gBACL,GAAG,KAAK;gBACR,MAAM,EAAE,KAAK;gBACb,iBAAiB,EAAE,gBAAgB;gBACnC,wBAAwB,EAAE,uBAAuB;aAClD,CAAC;QACJ,CAAC;KACF,CAAA;IArCK,wBAAwB;QAD7B,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,kBAAK,CAAC,OAAO,EAAE,CAAC;QAGhC,mBAAA,IAAA,eAAM,EAAC,cAAO,CAAC,CAAA;yDAEoB,sCAAiB;OAJnD,wBAAwB,CAqC7B;IAED,OAAO,IAAA,cAAK,EAAC,wBAAwB,CAAC,CAAC;AACzC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ENUM_PAGINATION_ORDER_DIRECTION_TYPE } from '../constants';
|
|
1
2
|
import { IPaginationService, IPaginationOrder } from '../interfaces';
|
|
2
3
|
export declare class PaginationService implements IPaginationService {
|
|
3
4
|
offset(page: number, perPage: number): number;
|
|
@@ -6,7 +7,7 @@ export declare class PaginationService implements IPaginationService {
|
|
|
6
7
|
totalPageWithoutMax(totalData: number, perPage: number): number;
|
|
7
8
|
page(page?: number): number;
|
|
8
9
|
perPage(isAdmin: boolean, perPage?: number): number;
|
|
9
|
-
order(orderByValue?: string, orderDirectionValue?:
|
|
10
|
+
order(orderByValue?: string, orderDirectionValue?: ENUM_PAGINATION_ORDER_DIRECTION_TYPE, availableOrderBy?: string[]): IPaginationOrder;
|
|
10
11
|
search(searchValue: string | undefined, availableSearch: string[]): Record<string, any> | undefined;
|
|
11
12
|
filterEqual<T = string>(field: string, filterValue: T): Record<string, T>;
|
|
12
13
|
filterContain(field: string, filterValue: string): Record<string, {
|
|
@@ -41,10 +41,22 @@ let PaginationService = class PaginationService {
|
|
|
41
41
|
: constants_1.PAGINATION_PER_PAGE;
|
|
42
42
|
}
|
|
43
43
|
order(orderByValue = constants_1.PAGINATION_ORDER_BY, orderDirectionValue = constants_1.PAGINATION_ORDER_DIRECTION, availableOrderBy = constants_1.PAGINATION_AVAILABLE_ORDER_BY) {
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
const orderResult = {};
|
|
45
|
+
const orderTokens = orderByValue.split(',').map((x) => x.trim());
|
|
46
|
+
const orderDirectionTokens = orderDirectionValue
|
|
47
|
+
.split(',')
|
|
48
|
+
.map((x) => x.trim());
|
|
49
|
+
for (let i = 0; i < orderTokens.length; i++) {
|
|
50
|
+
const orderToken = orderTokens[i];
|
|
51
|
+
const orderDirectionToken = orderDirectionTokens[i];
|
|
52
|
+
if (availableOrderBy.includes(orderToken))
|
|
53
|
+
orderResult[orderToken] =
|
|
54
|
+
orderDirectionToken ?? constants_1.PAGINATION_ORDER_DIRECTION;
|
|
55
|
+
}
|
|
56
|
+
if (Object.keys(orderResult).length === 0) {
|
|
57
|
+
orderResult[constants_1.PAGINATION_ORDER_BY] = constants_1.PAGINATION_ORDER_DIRECTION;
|
|
58
|
+
}
|
|
59
|
+
return orderResult;
|
|
48
60
|
}
|
|
49
61
|
search(searchValue = '', availableSearch) {
|
|
50
62
|
if (!searchValue) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.service.js","sourceRoot":"","sources":["../../../../../packages/pagination/src/services/pagination.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"pagination.service.js","sourceRoot":"","sources":["../../../../../packages/pagination/src/services/pagination.service.ts"],"names":[],"mappings":"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"}
|