@ptc-org/nestjs-query-graphql 6.0.0 → 6.1.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 +2 -2
- package/src/types/connection/cursor/pager/index.d.ts +1 -0
- package/src/types/connection/cursor/pager/index.js +2 -2
- package/src/types/connection/cursor/pager/index.js.map +1 -1
- package/src/types/connection/cursor/pager/pager.d.ts +2 -1
- package/src/types/connection/cursor/pager/pager.js +10 -3
- package/src/types/connection/cursor/pager/pager.js.map +1 -1
- package/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.d.ts +2 -1
- package/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.js +8 -4
- package/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.js.map +1 -1
- package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.d.ts +2 -0
- package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.js +15 -2
- package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.js.map +1 -1
- package/src/types/connection/interfaces.d.ts +1 -0
- package/src/types/connection/offset/offset-connection.type.js +1 -1
- package/src/types/connection/offset/offset-connection.type.js.map +1 -1
- package/src/types/connection/offset/pager/index.d.ts +1 -1
- package/src/types/connection/offset/pager/index.js +1 -1
- package/src/types/connection/offset/pager/index.js.map +1 -1
- package/src/types/connection/offset/pager/pager.d.ts +2 -0
- package/src/types/connection/offset/pager/pager.js +10 -2
- package/src/types/connection/offset/pager/pager.js.map +1 -1
- package/src/types/query/paging/cursor-paging.type.d.ts +2 -1
- package/src/types/query/paging/cursor-paging.type.js +6 -5
- package/src/types/query/paging/cursor-paging.type.js.map +1 -1
- package/src/types/query/query-args/cursor-query-args.type.js +2 -3
- package/src/types/query/query-args/cursor-query-args.type.js.map +1 -1
- package/src/types/query/query-args/interfaces.d.ts +7 -0
- package/src/types/query/query-args/offset-query-args.type.js +1 -1
- package/src/types/query/query-args/offset-query-args.type.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-graphql",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.1.0",
|
|
4
4
|
"description": "Nestjs graphql query adapter",
|
|
5
5
|
"author": "doug-martin <doug@dougamartin.com>",
|
|
6
6
|
"homepage": "https://github.com/tripss/nestjs-query#readme",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"pluralize": "^8.0.0",
|
|
40
40
|
"tslib": "^2.6.2",
|
|
41
41
|
"upper-case-first": "^2.0.2",
|
|
42
|
-
"@ptc-org/nestjs-query-core": "6.
|
|
42
|
+
"@ptc-org/nestjs-query-core": "6.1.0",
|
|
43
43
|
"lodash.merge": "4.6.2",
|
|
44
44
|
"reflect-metadata": "0.2.1"
|
|
45
45
|
},
|
|
@@ -3,5 +3,6 @@ import { Pager } from '../../interfaces';
|
|
|
3
3
|
import { CursorPagerResult } from './interfaces';
|
|
4
4
|
export type PagerOpts = {
|
|
5
5
|
disableKeySetPagination?: boolean;
|
|
6
|
+
enableFetchAllWithNegative?: boolean;
|
|
6
7
|
};
|
|
7
8
|
export declare const createPager: <DTO>(DTOClass: Class<DTO>, opts: PagerOpts) => Pager<DTO, CursorPagerResult<DTO>>;
|
|
@@ -8,9 +8,9 @@ const strategies_1 = require("./strategies");
|
|
|
8
8
|
const createPager = (DTOClass, opts) => {
|
|
9
9
|
const keySet = opts.disableKeySetPagination ? undefined : (0, decorators_1.getKeySet)(DTOClass);
|
|
10
10
|
if (keySet && keySet.length) {
|
|
11
|
-
return new pager_1.CursorPager(new strategies_1.KeysetPagerStrategy(DTOClass, keySet));
|
|
11
|
+
return new pager_1.CursorPager(new strategies_1.KeysetPagerStrategy(DTOClass, keySet, opts.enableFetchAllWithNegative), opts.enableFetchAllWithNegative);
|
|
12
12
|
}
|
|
13
|
-
return new pager_1.CursorPager(new strategies_1.LimitOffsetPagerStrategy());
|
|
13
|
+
return new pager_1.CursorPager(new strategies_1.LimitOffsetPagerStrategy(opts.enableFetchAllWithNegative), opts.enableFetchAllWithNegative);
|
|
14
14
|
};
|
|
15
15
|
exports.createPager = createPager;
|
|
16
16
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/index.ts"],"names":[],"mappings":";;;AAEA,uDAAkD;AAGlD,mCAAqC;AACrC,6CAA4E;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/index.ts"],"names":[],"mappings":";;;AAEA,uDAAkD;AAGlD,mCAAqC;AACrC,6CAA4E;AAO5E,wEAAwE;AACjE,MAAM,WAAW,GAAG,CAAM,QAAoB,EAAE,IAAe,EAAsC,EAAE;IAC5G,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,sBAAS,EAAC,QAAQ,CAAC,CAAA;IAC7E,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO,IAAI,mBAAW,CACpB,IAAI,gCAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,0BAA0B,CAAC,EAC1E,IAAI,CAAC,0BAA0B,CAChC,CAAA;IACH,CAAC;IACD,OAAO,IAAI,mBAAW,CAAM,IAAI,qCAAwB,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAA;AAC7H,CAAC,CAAA;AATY,QAAA,WAAW,eASvB"}
|
|
@@ -4,7 +4,8 @@ import { CursorPagerResult } from './interfaces';
|
|
|
4
4
|
import { PagerStrategy } from './strategies';
|
|
5
5
|
export declare class CursorPager<DTO> implements Pager<DTO, CursorPagerResult<DTO>> {
|
|
6
6
|
readonly strategy: PagerStrategy<DTO>;
|
|
7
|
-
|
|
7
|
+
private readonly enableFetchAllWithNegative?;
|
|
8
|
+
constructor(strategy: PagerStrategy<DTO>, enableFetchAllWithNegative?: boolean);
|
|
8
9
|
page<Q extends CursorQueryArgsType<DTO>>(queryMany: QueryMany<DTO, Q>, query: Q, count: Count<DTO>): Promise<CursorPagerResult<DTO>>;
|
|
9
10
|
private isValidPaging;
|
|
10
11
|
private runQuery;
|
|
@@ -11,8 +11,9 @@ const DEFAULT_PAGING_META = (query) => ({
|
|
|
11
11
|
query
|
|
12
12
|
});
|
|
13
13
|
class CursorPager {
|
|
14
|
-
constructor(strategy) {
|
|
14
|
+
constructor(strategy, enableFetchAllWithNegative) {
|
|
15
15
|
this.strategy = strategy;
|
|
16
|
+
this.enableFetchAllWithNegative = enableFetchAllWithNegative;
|
|
16
17
|
}
|
|
17
18
|
async page(queryMany, query, count) {
|
|
18
19
|
const pagingMeta = this.getPageMeta(query);
|
|
@@ -26,10 +27,16 @@ class CursorPager {
|
|
|
26
27
|
return this.createPagingResult(results, pagingMeta, () => count(query.filter ?? {}));
|
|
27
28
|
}
|
|
28
29
|
isValidPaging(pagingMeta) {
|
|
30
|
+
const minimumLimit = this.enableFetchAllWithNegative ? -1 : 1;
|
|
31
|
+
const hasLimit = 'limit' in pagingMeta.opts && pagingMeta.opts.limit !== null;
|
|
32
|
+
const isValidLimit = pagingMeta.opts.limit >= minimumLimit;
|
|
33
|
+
if (hasLimit && !isValidLimit) {
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
29
36
|
if ('offset' in pagingMeta.opts) {
|
|
30
|
-
return pagingMeta.opts.offset > 0 ||
|
|
37
|
+
return pagingMeta.opts.offset > 0 || hasLimit;
|
|
31
38
|
}
|
|
32
|
-
return
|
|
39
|
+
return hasLimit;
|
|
33
40
|
}
|
|
34
41
|
async runQuery(queryMany, query, pagingMeta) {
|
|
35
42
|
const { opts } = pagingMeta;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/pager.ts"],"names":[],"mappings":";;;AAOA,MAAM,oBAAoB,GAAG,GAAgC,EAAE,CAAC,CAAC;IAC/D,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE;IACxD,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CACrC,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAAM,KAAiB,EAAqC,EAAE,CAAC,CAAC;IAC1F,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;IACnF,KAAK;CACN,CAAC,CAAA;AAEF,MAAa,WAAW;IACtB,
|
|
1
|
+
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/pager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ import { KeySetPagingOpts, PagerStrategy } from './pager-strategy';
|
|
|
4
4
|
export declare class KeysetPagerStrategy<DTO> implements PagerStrategy<DTO> {
|
|
5
5
|
readonly DTOClass: Class<DTO>;
|
|
6
6
|
readonly pageFields: (keyof DTO)[];
|
|
7
|
-
|
|
7
|
+
private readonly enableFetchAllWithNegative?;
|
|
8
|
+
constructor(DTOClass: Class<DTO>, pageFields: (keyof DTO)[], enableFetchAllWithNegative?: boolean);
|
|
8
9
|
fromCursorArgs(cursor: CursorPagingType): KeySetPagingOpts<DTO>;
|
|
9
10
|
toCursor(dto: DTO, index: number, opts: KeySetPagingOpts<DTO>, query: Query<DTO>): string;
|
|
10
11
|
isEmptyCursor(opts: KeySetPagingOpts<DTO>): boolean;
|
|
@@ -6,9 +6,10 @@ const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
|
|
|
6
6
|
const class_transformer_1 = require("class-transformer");
|
|
7
7
|
const helpers_1 = require("./helpers");
|
|
8
8
|
class KeysetPagerStrategy {
|
|
9
|
-
constructor(DTOClass, pageFields) {
|
|
9
|
+
constructor(DTOClass, pageFields, enableFetchAllWithNegative) {
|
|
10
10
|
this.DTOClass = DTOClass;
|
|
11
11
|
this.pageFields = pageFields;
|
|
12
|
+
this.enableFetchAllWithNegative = enableFetchAllWithNegative;
|
|
12
13
|
}
|
|
13
14
|
fromCursorArgs(cursor) {
|
|
14
15
|
const { defaultSort } = this;
|
|
@@ -36,7 +37,7 @@ class KeysetPagerStrategy {
|
|
|
36
37
|
}
|
|
37
38
|
createQuery(query, opts, includeExtraNode) {
|
|
38
39
|
const paging = { limit: opts.limit };
|
|
39
|
-
if (includeExtraNode) {
|
|
40
|
+
if (includeExtraNode && (!this.enableFetchAllWithNegative || opts.limit !== -1)) {
|
|
40
41
|
// Add 1 to the limit so we will fetch an additional node
|
|
41
42
|
paging.limit += 1;
|
|
42
43
|
}
|
|
@@ -44,10 +45,13 @@ class KeysetPagerStrategy {
|
|
|
44
45
|
// Add 1 to the limit so we will fetch an additional node with the current node
|
|
45
46
|
const sorting = this.getSortFields(query, opts);
|
|
46
47
|
const filter = (0, nestjs_query_core_1.mergeFilter)(query.filter ?? {}, this.createFieldsFilter(sorting, payload));
|
|
47
|
-
|
|
48
|
+
const createdQuery = { ...query, filter, sorting, paging };
|
|
49
|
+
if (this.enableFetchAllWithNegative && opts.limit === -1)
|
|
50
|
+
delete createdQuery.paging;
|
|
51
|
+
return createdQuery;
|
|
48
52
|
}
|
|
49
53
|
checkForExtraNode(nodes, opts) {
|
|
50
|
-
const hasExtraNode = nodes.length > opts.limit;
|
|
54
|
+
const hasExtraNode = nodes.length > opts.limit && !(this.enableFetchAllWithNegative && opts.limit === -1);
|
|
51
55
|
const returnNodes = [...nodes];
|
|
52
56
|
if (hasExtraNode) {
|
|
53
57
|
returnNodes.pop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyset.pager-strategy.js","sourceRoot":"","sources":["../../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.ts"],"names":[],"mappings":";;;AAAA,2CAAoD;AACpD,kEAAoH;AACpH,yDAAgD;AAGhD,uCAA0G;AAG1G,MAAa,mBAAmB;IAC9B,YACW,QAAoB,EACpB,UAAyB;
|
|
1
|
+
{"version":3,"file":"keyset.pager-strategy.js","sourceRoot":"","sources":["../../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@ import { Query } from '@ptc-org/nestjs-query-core';
|
|
|
2
2
|
import { CursorPagingType } from '../../../../query';
|
|
3
3
|
import { OffsetPagingOpts, PagerStrategy } from './pager-strategy';
|
|
4
4
|
export declare class LimitOffsetPagerStrategy<DTO> implements PagerStrategy<DTO> {
|
|
5
|
+
private readonly enableFetchAllWithNegative?;
|
|
6
|
+
constructor(enableFetchAllWithNegative?: boolean);
|
|
5
7
|
private static CURSOR_PREFIX;
|
|
6
8
|
toCursor(dto: DTO, index: number, pagingOpts: OffsetPagingOpts): string;
|
|
7
9
|
fromCursorArgs(cursor: CursorPagingType): OffsetPagingOpts;
|
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LimitOffsetPagerStrategy = void 0;
|
|
4
4
|
const helpers_1 = require("./helpers");
|
|
5
5
|
class LimitOffsetPagerStrategy {
|
|
6
|
+
constructor(enableFetchAllWithNegative) {
|
|
7
|
+
this.enableFetchAllWithNegative = enableFetchAllWithNegative;
|
|
8
|
+
}
|
|
6
9
|
toCursor(dto, index, pagingOpts) {
|
|
7
10
|
return LimitOffsetPagerStrategy.offsetToCursor(pagingOpts.offset + index);
|
|
8
11
|
}
|
|
@@ -18,7 +21,7 @@ class LimitOffsetPagerStrategy {
|
|
|
18
21
|
createQuery(query, opts, includeExtraNode) {
|
|
19
22
|
const { isBackward } = opts;
|
|
20
23
|
const paging = { limit: opts.limit, offset: opts.offset };
|
|
21
|
-
if (includeExtraNode) {
|
|
24
|
+
if (includeExtraNode && (!this.enableFetchAllWithNegative || opts.limit !== -1)) {
|
|
22
25
|
// Add 1 to the limit so we will fetch an additional node
|
|
23
26
|
paging.limit += 1;
|
|
24
27
|
// if paging backwards remove one from the offset to check for a previous page.
|
|
@@ -31,9 +34,15 @@ class LimitOffsetPagerStrategy {
|
|
|
31
34
|
paging.limit = opts.limit;
|
|
32
35
|
}
|
|
33
36
|
}
|
|
37
|
+
if (this.enableFetchAllWithNegative && paging.limit === -1)
|
|
38
|
+
delete paging.limit;
|
|
34
39
|
return { ...query, paging };
|
|
35
40
|
}
|
|
36
41
|
checkForExtraNode(nodes, opts) {
|
|
42
|
+
if (opts.limit === -1) {
|
|
43
|
+
// If we are fetching all the nodes we don't need to check for an extra node.
|
|
44
|
+
return nodes;
|
|
45
|
+
}
|
|
37
46
|
const returnNodes = [...nodes];
|
|
38
47
|
// check if we have an additional node
|
|
39
48
|
// if paging forward that indicates we have a next page
|
|
@@ -54,6 +63,8 @@ class LimitOffsetPagerStrategy {
|
|
|
54
63
|
if ((0, helpers_1.isBackwardPaging)(cursor)) {
|
|
55
64
|
const { last = 0, before } = cursor;
|
|
56
65
|
const offsetFromCursor = before ? LimitOffsetPagerStrategy.cursorToOffset(before) : 0;
|
|
66
|
+
if (this.enableFetchAllWithNegative && last === -1)
|
|
67
|
+
return offsetFromCursor;
|
|
57
68
|
const offset = offsetFromCursor - last;
|
|
58
69
|
// Check to see if our before-page is underflowing past the 0th item
|
|
59
70
|
if (offset < 0) {
|
|
@@ -62,10 +73,12 @@ class LimitOffsetPagerStrategy {
|
|
|
62
73
|
}
|
|
63
74
|
return last;
|
|
64
75
|
}
|
|
65
|
-
return cursor.first
|
|
76
|
+
return cursor.first ?? 0;
|
|
66
77
|
}
|
|
67
78
|
getOffset(cursor) {
|
|
68
79
|
if ((0, helpers_1.isBackwardPaging)(cursor)) {
|
|
80
|
+
if (this.enableFetchAllWithNegative && cursor.last === -1)
|
|
81
|
+
return 0;
|
|
69
82
|
const { last, before } = cursor;
|
|
70
83
|
const beforeOffset = before ? LimitOffsetPagerStrategy.cursorToOffset(before) : 0;
|
|
71
84
|
const offset = last ? beforeOffset - last : 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limit-offset.pager-strategy.js","sourceRoot":"","sources":["../../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.ts"],"names":[],"mappings":";;;AAGA,uCAA0G;AAG1G,MAAa,wBAAwB;
|
|
1
|
+
{"version":3,"file":"limit-offset.pager-strategy.js","sourceRoot":"","sources":["../../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ interface BaseConnectionOptions {
|
|
|
6
6
|
enableTotalCount?: boolean;
|
|
7
7
|
connectionName?: string;
|
|
8
8
|
disableKeySetPagination?: boolean;
|
|
9
|
+
enableFetchAllWithNegative?: boolean;
|
|
9
10
|
}
|
|
10
11
|
export interface CursorConnectionOptions extends BaseConnectionOptions {
|
|
11
12
|
pagingStrategy?: PagingStrategies.CURSOR;
|
|
@@ -23,7 +23,7 @@ function getOrCreateOffsetConnectionType(TItemClass, opts) {
|
|
|
23
23
|
const connectionName = getOrCreateConnectionName(TItemClass, opts);
|
|
24
24
|
return reflector.memoize(TItemClass, connectionName, () => {
|
|
25
25
|
var AbstractConnection_1;
|
|
26
|
-
const pager = (0, pager_1.createPager)();
|
|
26
|
+
const pager = (0, pager_1.createPager)(opts.enableFetchAllWithNegative);
|
|
27
27
|
const PIT = (0, offset_page_info_type_1.getOrCreateOffsetPageInfoType)();
|
|
28
28
|
let AbstractConnection = AbstractConnection_1 = class AbstractConnection {
|
|
29
29
|
static get resolveType() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offset-connection.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/connection/offset/offset-connection.type.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AACxD,6CAAmE;AACnE,kEAAuE;AAEvE,4CAAsD;AACtD,oDAA4C;AAW5C,mEAAuE;AACvE,mCAAqC;AAErC,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,gCAAuB,CAAC,4BAA4B,CAAC,CAAC,CAAA;AAErG,MAAM,SAAS,GAAG,IAAI,gCAAY,CAAC,qCAAqC,CAAC,CAAA;AAEzE,SAAS,yBAAyB,CAAM,QAAoB,EAAE,IAA6B;IACzF,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAA;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAA;IACtF,OAAO,GAAG,OAAO,kBAAkB,CAAA;AACrC,CAAC;AAED,SAAgB,+BAA+B,CAC7C,UAAsB,EACtB,IAA6B;IAE7B,MAAM,cAAc,GAAG,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAClE,OAAO,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE;;QACxD,MAAM,KAAK,GAAG,IAAA,mBAAW,
|
|
1
|
+
{"version":3,"file":"offset-connection.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/connection/offset/offset-connection.type.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AACxD,6CAAmE;AACnE,kEAAuE;AAEvE,4CAAsD;AACtD,oDAA4C;AAW5C,mEAAuE;AACvE,mCAAqC;AAErC,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,gCAAuB,CAAC,4BAA4B,CAAC,CAAC,CAAA;AAErG,MAAM,SAAS,GAAG,IAAI,gCAAY,CAAC,qCAAqC,CAAC,CAAA;AAEzE,SAAS,yBAAyB,CAAM,QAAoB,EAAE,IAA6B;IACzF,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;IAC/B,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAA;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAA;IACtF,OAAO,GAAG,OAAO,kBAAkB,CAAA;AACrC,CAAC;AAED,SAAgB,+BAA+B,CAC7C,UAAsB,EACtB,IAA6B;IAE7B,MAAM,cAAc,GAAG,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAClE,OAAO,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE;;QACxD,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAM,IAAI,CAAC,0BAA0B,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,IAAA,qDAA6B,GAAE,CAAA;QAE3C,IAEM,kBAAkB,0BAFxB,MAEM,kBAAkB;YACtB,MAAM,KAAK,WAAW;gBACpB,OAAO,IAAI,CAAA;YACb,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC5B,SAA4B,EAC5B,KAAQ,EACR,KAAkB;gBAElB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,IAAI,aAAa,CAAC,CAAA;gBAClG,OAAO,IAAI,oBAAkB;gBAC3B,0CAA0C;gBAC1C,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,EACvD,KAAK,EACL,UAAU,CACX,CAAA;YACH,CAAC;YAID,YAAY,QAA6B,EAAE,KAAa,EAAE,YAAsB;gBAC9E,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;gBAC1E,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,CAAA;gBACxB,IAAI,CAAC,YAAY,GAAG,YAAY,IAAI,aAAa,CAAA;YACnD,CAAC;YAYD,IAMI,UAAU;gBACZ,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;YAC5B,CAAC;SACF,CAAA;QAhBC;YAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE;gBAChB,WAAW,EAAE,oBAAoB;aAClC,CAAC;;4DAC2B;QAK7B;YAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE;gBACzB,WAAW,EAAE,iBAAiB;aAC/B,CAAC;;yDACW;QAEb;YAAC,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAC5B,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE;gBACf,WAAW,EAAE,8BAA8B;aAC5C,CAAC,CACH;;;4DAGA;QA7CG,kBAAkB;YAFvB,IAAA,mBAAS,EAAC,YAAY,CAAC;YACvB,IAAA,oBAAU,EAAC,cAAc,CAAC;;WACrB,kBAAkB,CA8CvB;QAED,OAAO,kBAAkB,CAAA;IAC3B,CAAC,CAAC,CAAA;AACJ,CAAC;AA7DD,0EA6DC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Pager } from '../../interfaces';
|
|
2
2
|
import { OffsetPagerResult } from './interfaces';
|
|
3
3
|
export { OffsetPagerResult } from './interfaces';
|
|
4
|
-
export declare const createPager: <DTO>() => Pager<DTO, OffsetPagerResult<DTO>>;
|
|
4
|
+
export declare const createPager: <DTO>(enableFetchAllWithNegative?: boolean) => Pager<DTO, OffsetPagerResult<DTO>>;
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.createPager = void 0;
|
|
4
4
|
const pager_1 = require("./pager");
|
|
5
5
|
// default pager factory to plug in addition paging strategies later on.
|
|
6
|
-
const createPager = () => new pager_1.OffsetPager();
|
|
6
|
+
const createPager = (enableFetchAllWithNegative) => new pager_1.OffsetPager(enableFetchAllWithNegative);
|
|
7
7
|
exports.createPager = createPager;
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/index.ts"],"names":[],"mappings":";;;AAEA,mCAAqC;AAIrC,wEAAwE;AACjE,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/index.ts"],"names":[],"mappings":";;;AAEA,mCAAqC;AAIrC,wEAAwE;AACjE,MAAM,WAAW,GAAG,CAAM,0BAAoC,EAAsC,EAAE,CAC3G,IAAI,mBAAW,CAAM,0BAA0B,CAAC,CAAA;AADrC,QAAA,WAAW,eAC0B"}
|
|
@@ -2,6 +2,8 @@ import { Query } from '@ptc-org/nestjs-query-core';
|
|
|
2
2
|
import { Count, Pager, QueryMany } from '../../interfaces';
|
|
3
3
|
import { OffsetPagerResult } from './interfaces';
|
|
4
4
|
export declare class OffsetPager<DTO> implements Pager<DTO, OffsetPagerResult<DTO>> {
|
|
5
|
+
private readonly enableFetchAllWithNegative?;
|
|
6
|
+
constructor(enableFetchAllWithNegative?: boolean);
|
|
5
7
|
page<Q extends Query<DTO>>(queryMany: QueryMany<DTO, Q>, query: Q, count: Count<DTO>): Promise<OffsetPagerResult<DTO>>;
|
|
6
8
|
private isValidPaging;
|
|
7
9
|
private runQuery;
|
|
@@ -11,6 +11,9 @@ const DEFAULT_PAGING_META = (query) => ({
|
|
|
11
11
|
query
|
|
12
12
|
});
|
|
13
13
|
class OffsetPager {
|
|
14
|
+
constructor(enableFetchAllWithNegative) {
|
|
15
|
+
this.enableFetchAllWithNegative = enableFetchAllWithNegative;
|
|
16
|
+
}
|
|
14
17
|
async page(queryMany, query, count) {
|
|
15
18
|
const pagingMeta = this.getPageMeta(query);
|
|
16
19
|
if (!this.isValidPaging(pagingMeta)) {
|
|
@@ -20,7 +23,7 @@ class OffsetPager {
|
|
|
20
23
|
return this.createPagingResult(results, pagingMeta, () => count(query.filter ?? {}));
|
|
21
24
|
}
|
|
22
25
|
isValidPaging(pagingMeta) {
|
|
23
|
-
return pagingMeta.opts.limit
|
|
26
|
+
return pagingMeta.opts.limit >= (this.enableFetchAllWithNegative ? -1 : 1);
|
|
24
27
|
}
|
|
25
28
|
async runQuery(queryMany, query, pagingMeta) {
|
|
26
29
|
const windowedQuery = this.createQuery(query, pagingMeta);
|
|
@@ -47,9 +50,14 @@ class OffsetPager {
|
|
|
47
50
|
}
|
|
48
51
|
createQuery(query, pagingMeta) {
|
|
49
52
|
const { limit, offset } = pagingMeta.opts;
|
|
50
|
-
|
|
53
|
+
const paging = { limit: limit + 1, offset };
|
|
54
|
+
if (this.enableFetchAllWithNegative && limit === -1)
|
|
55
|
+
delete paging.limit;
|
|
56
|
+
return { ...query, paging };
|
|
51
57
|
}
|
|
52
58
|
checkForExtraNode(nodes, opts) {
|
|
59
|
+
if (this.enableFetchAllWithNegative && opts.limit === -1)
|
|
60
|
+
return nodes;
|
|
53
61
|
const returnNodes = [...nodes];
|
|
54
62
|
const hasExtraNode = nodes.length > opts.limit;
|
|
55
63
|
if (hasExtraNode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/pager.ts"],"names":[],"mappings":";;;AAMA,MAAM,oBAAoB,GAAG,GAAgC,EAAE,CAAC,CAAC;IAC/D,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE;IACxD,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CACrC,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAAM,KAAiB,EAAyB,EAAE,CAAC,CAAC;IAC9E,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;IAC7B,KAAK;CACN,CAAC,CAAA;AAEF,MAAa,WAAW;IACtB,KAAK,CAAC,IAAI,CAAuB,SAA4B,EAAE,KAAQ,EAAE,KAAiB;QACxF,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC1C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,OAAO,oBAAoB,EAAE,CAAA;QAC/B,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;QACjE,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAA;IACtF,CAAC;IAEO,aAAa,CAAC,UAAiC;QACrD,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/pager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Class } from '@ptc-org/nestjs-query-core';
|
|
2
|
+
import { CursorQueryArgsTypeOpts } from '..';
|
|
2
3
|
import { CursorPagingType } from './interfaces';
|
|
3
|
-
export declare const getOrCreateCursorPagingType: () => Class<CursorPagingType>;
|
|
4
|
+
export declare const getOrCreateCursorPagingType: <DTO>(opts: CursorQueryArgsTypeOpts<DTO>) => Class<CursorPagingType>;
|
|
@@ -4,13 +4,14 @@ exports.getOrCreateCursorPagingType = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const graphql_1 = require("@nestjs/graphql");
|
|
6
6
|
const class_validator_1 = require("class-validator");
|
|
7
|
+
const decorators_1 = require("../../../decorators");
|
|
7
8
|
const cursor_scalar_1 = require("../../cursor.scalar");
|
|
8
9
|
const validators_1 = require("../../validators");
|
|
9
10
|
const constants_1 = require("./constants");
|
|
10
11
|
/** @internal */
|
|
11
12
|
let graphQLCursorPaging = null;
|
|
12
13
|
// eslint-disable-next-line @typescript-eslint/no-redeclare -- intentional
|
|
13
|
-
const getOrCreateCursorPagingType = () => {
|
|
14
|
+
const getOrCreateCursorPagingType = (opts) => {
|
|
14
15
|
if (graphQLCursorPaging) {
|
|
15
16
|
return graphQLCursorPaging;
|
|
16
17
|
}
|
|
@@ -41,8 +42,8 @@ const getOrCreateCursorPagingType = () => {
|
|
|
41
42
|
tslib_1.__decorate([
|
|
42
43
|
(0, graphql_1.Field)(() => graphql_1.Int, { nullable: true, description: 'Paginate first' }),
|
|
43
44
|
(0, validators_1.IsUndefined)(),
|
|
44
|
-
(0, class_validator_1.IsPositive)(),
|
|
45
|
-
(0, class_validator_1.Min)(1),
|
|
45
|
+
(0, decorators_1.SkipIf)(() => opts.enableFetchAllWithNegative, (0, class_validator_1.IsPositive)()),
|
|
46
|
+
(0, class_validator_1.Min)(opts.enableFetchAllWithNegative ? -1 : 1),
|
|
46
47
|
(0, class_validator_1.Validate)(validators_1.CannotUseWith, ['before', 'last']),
|
|
47
48
|
tslib_1.__metadata("design:type", Number)
|
|
48
49
|
], GraphQLCursorPagingImpl.prototype, "first", void 0);
|
|
@@ -55,8 +56,8 @@ const getOrCreateCursorPagingType = () => {
|
|
|
55
56
|
,
|
|
56
57
|
(0, class_validator_1.Validate)(validators_1.CannotUseWithout, ['before']),
|
|
57
58
|
(0, class_validator_1.Validate)(validators_1.CannotUseWith, ['after', 'first']),
|
|
58
|
-
(0, class_validator_1.
|
|
59
|
-
(0, class_validator_1.
|
|
59
|
+
(0, decorators_1.SkipIf)(() => opts.enableFetchAllWithNegative, (0, class_validator_1.IsPositive)()),
|
|
60
|
+
(0, class_validator_1.Min)(opts.enableFetchAllWithNegative ? -1 : 1),
|
|
60
61
|
tslib_1.__metadata("design:type", Number)
|
|
61
62
|
], GraphQLCursorPagingImpl.prototype, "last", void 0);
|
|
62
63
|
GraphQLCursorPagingImpl = tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-paging.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/paging/cursor-paging.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAuD;AAEvD,qDAA2D;AAE3D,uDAAkF;AAClF,iDAA+E;
|
|
1
|
+
{"version":3,"file":"cursor-paging.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/paging/cursor-paging.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAuD;AAEvD,qDAA2D;AAE3D,oDAA4C;AAC5C,uDAAkF;AAClF,iDAA+E;AAE/E,2CAA8C;AAG9C,gBAAgB;AAChB,IAAI,mBAAmB,GAAmC,IAAI,CAAA;AAC9D,0EAA0E;AACnE,MAAM,2BAA2B,GAAG,CAAM,IAAkC,EAA2B,EAAE;IAC9G,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,mBAAmB,CAAA;IAC5B,CAAC;IAED,yFAAyF;IAEzF,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;;IACpB,gCAAQ,GAA4B,4BAAgB,CAAC,MAAM,AAAnD,CAAmD;IASlE;QAPC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,sCAAsB,EAAE;YACnC,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,+BAA+B;SAC7C,CAAC;QACD,IAAA,wBAAW,GAAE;QACb,IAAA,0BAAQ,EAAC,6BAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;QACpC,IAAA,0BAAQ,EAAC,0BAAa,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;2DACf;IAS7B;QAPC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,sCAAsB,EAAE;YACnC,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,8BAA8B;SAC5C,CAAC;QACD,IAAA,wBAAW,GAAE;QACb,IAAA,0BAAQ,EAAC,6BAAgB,EAAE,CAAC,OAAO,CAAC,CAAC;QACrC,IAAA,0BAAQ,EAAC,0BAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;;0DAChB;IAO5B;QALC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;QACnE,IAAA,wBAAW,GAAE;QACb,IAAA,mBAAM,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,IAAA,4BAAU,GAAE,CAAC;QAC3D,IAAA,qBAAG,EAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAA,0BAAQ,EAAC,0BAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;;0DAC9B;IAWd;QATC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,aAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;QAClE,IAAA,wBAAW,GAAE;QACd,kDAAkD;QAClD,mHAAmH;QACnH,gCAAgC;;QAC/B,IAAA,0BAAQ,EAAC,6BAAgB,EAAE,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAA,0BAAQ,EAAC,0BAAa,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAA,mBAAM,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,IAAA,4BAAU,GAAE,CAAC;QAC3D,IAAA,qBAAG,EAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;yDACjC;IArCT,uBAAuB;QAD5B,IAAA,mBAAS,EAAC,cAAc,CAAC;OACpB,uBAAuB,CAsC5B;IAED,mBAAmB,GAAG,uBAAuB,CAAA;IAC7C,OAAO,mBAAmB,CAAA;AAC5B,CAAC,CAAA;AAjDY,QAAA,2BAA2B,+BAiDvC"}
|
|
@@ -15,7 +15,7 @@ const constants_1 = require("./constants");
|
|
|
15
15
|
function createCursorQueryArgsType(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_OPTS, pagingStrategy: paging_1.PagingStrategies.CURSOR }) {
|
|
16
16
|
const F = (0, filter_type_1.FilterType)(DTOClass);
|
|
17
17
|
const S = (0, sorting_type_1.getOrCreateSortType)(DTOClass);
|
|
18
|
-
const P = (0, paging_1.getOrCreateCursorPagingType)();
|
|
18
|
+
const P = (0, paging_1.getOrCreateCursorPagingType)(opts);
|
|
19
19
|
const C = (0, connection_1.getOrCreateCursorConnectionType)(DTOClass, opts);
|
|
20
20
|
let QueryArgs = class QueryArgs {
|
|
21
21
|
constructor() {
|
|
@@ -33,8 +33,7 @@ function createCursorQueryArgsType(DTOClass, opts = { ...constants_1.DEFAULT_QUE
|
|
|
33
33
|
description: 'Limit or page results.'
|
|
34
34
|
}),
|
|
35
35
|
(0, class_validator_1.ValidateNested)(),
|
|
36
|
-
(0, class_validator_1.Validate)(property_max_validator_1.PropertyMax, ['first', opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize]),
|
|
37
|
-
(0, class_validator_1.Validate)(property_max_validator_1.PropertyMax, ['last', opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize]),
|
|
36
|
+
(0, decorators_1.SkipIf)(() => opts.enableFetchAllWithNegative, (0, class_validator_1.Validate)(property_max_validator_1.PropertyMax, ['first', opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize]), (0, class_validator_1.Validate)(property_max_validator_1.PropertyMax, ['last', opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize])),
|
|
38
37
|
(0, class_transformer_1.Type)(() => P),
|
|
39
38
|
tslib_1.__metadata("design:type", Object)
|
|
40
39
|
], QueryArgs.prototype, "paging", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-query-args.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/query-args/cursor-query-args.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAiD;AAEjD,yDAAwC;AACxC,qDAA0D;AAE1D,oDAA4C;AAC5C,iDAAkE;AAClE,oFAAqE;AACrE,gDAA2C;AAC3C,sCAA2F;AAC3F,kDAAqD;AACrD,2CAAgD;AAKhD,SAAgB,yBAAyB,CACvC,QAAoB,EACpB,OAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,MAAM,EAAE;IAEvG,MAAM,CAAC,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,IAAA,kCAAmB,EAAC,QAAQ,CAAC,CAAA;IACvC,MAAM,CAAC,GAAG,IAAA,oCAA2B,
|
|
1
|
+
{"version":3,"file":"cursor-query-args.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/query-args/cursor-query-args.type.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,9 @@ export type BaseQueryArgsTypeOpts<DTO> = {
|
|
|
11
11
|
/**
|
|
12
12
|
* The maximum number of results that can be returned from a query.
|
|
13
13
|
* [Default=50]
|
|
14
|
+
*
|
|
15
|
+
* If `-1` it means there is no limit to the number of results that can be
|
|
16
|
+
* returned.
|
|
14
17
|
*/
|
|
15
18
|
maxResultsSize?: number;
|
|
16
19
|
/**
|
|
@@ -31,6 +34,10 @@ export type BaseQueryArgsTypeOpts<DTO> = {
|
|
|
31
34
|
* Disable the filtering
|
|
32
35
|
*/
|
|
33
36
|
disableFilter?: boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Enable the fetch all with negative limit.
|
|
39
|
+
*/
|
|
40
|
+
enableFetchAllWithNegative?: boolean;
|
|
34
41
|
} & FilterTypeOptions;
|
|
35
42
|
export interface CursorQueryArgsTypeOpts<DTO> extends BaseQueryArgsTypeOpts<DTO>, CursorConnectionOptions {
|
|
36
43
|
pagingStrategy?: PagingStrategies.CURSOR;
|
|
@@ -33,7 +33,7 @@ function createOffsetQueryArgs(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_O
|
|
|
33
33
|
description: 'Limit or page results.'
|
|
34
34
|
}),
|
|
35
35
|
(0, class_validator_1.ValidateNested)(),
|
|
36
|
-
(0, class_validator_1.Validate)(property_max_validator_1.PropertyMax, ['limit', opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize]),
|
|
36
|
+
(0, decorators_1.SkipIf)(() => opts.maxResultsSize === -1, (0, class_validator_1.Validate)(property_max_validator_1.PropertyMax, ['limit', opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize])),
|
|
37
37
|
(0, class_transformer_1.Type)(() => P),
|
|
38
38
|
tslib_1.__metadata("design:type", Object)
|
|
39
39
|
], QueryArgs.prototype, "paging", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offset-query-args.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/query-args/offset-query-args.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAiD;AAEjD,yDAAwC;AACxC,qDAA0D;AAE1D,oDAA4C;AAC5C,iDAAkE;AAClE,oFAAqE;AACrE,gDAA2C;AAC3C,sCAA2F;AAC3F,kDAAqD;AACrD,2CAAgD;AAKhD,SAAgB,qBAAqB,CACnC,QAAoB,EACpB,OAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,MAAM,EAAE;IAEvG,MAAM,CAAC,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,IAAA,kCAAmB,EAAC,QAAQ,CAAC,CAAA;IACvC,MAAM,CAAC,GAAG,IAAA,4CAA+B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACzD,MAAM,CAAC,GAAG,IAAA,oCAA2B,GAAE,CAAA;IAGvC,IAAM,SAAS,GAAf,MAAM,SAAS;QAAf;
|
|
1
|
+
{"version":3,"file":"offset-query-args.type.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/query-args/offset-query-args.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAiD;AAEjD,yDAAwC;AACxC,qDAA0D;AAE1D,oDAA4C;AAC5C,iDAAkE;AAClE,oFAAqE;AACrE,gDAA2C;AAC3C,sCAA2F;AAC3F,kDAAqD;AACrD,2CAAgD;AAKhD,SAAgB,qBAAqB,CACnC,QAAoB,EACpB,OAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,MAAM,EAAE;IAEvG,MAAM,CAAC,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,IAAA,kCAAmB,EAAC,QAAQ,CAAC,CAAA;IACvC,MAAM,CAAC,GAAG,IAAA,4CAA+B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACzD,MAAM,CAAC,GAAG,IAAA,oCAA2B,GAAE,CAAA;IAGvC,IAAM,SAAS,GAAf,MAAM,SAAS;QAAf;YA+BE,WAAM,GAAiB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAA;YAW1E,YAAO,GAAsB,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;QAC9E,CAAC;;IA1CQ,kBAAQ,GAAG,CAAC,AAAJ,CAAI;IAEZ,oBAAU,GAAG,CAAC,AAAJ,CAAI;IAEd,wBAAc,GAAG,CAAC,AAAJ,CAAI;IAElB,kBAAQ,GAAG,CAAC,AAAJ,CAAI;IAYnB;QAVC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE;YACd,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,IAAI,8BAAkB,CAAC,iBAAiB,EAAE;YACvF,WAAW,EAAE,wBAAwB;SACtC,CAAC;QACD,IAAA,gCAAc,GAAE;QAChB,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,EAChC,IAAA,0BAAQ,EAAC,oCAAW,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,IAAI,8BAAkB,CAAC,cAAc,CAAC,CAAC,CAC3F;QACA,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC;;6CACW;IAYzB;QAVC,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EACxB,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE;YACb,YAAY,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,8BAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;YACxG,WAAW,EAAE,yCAAyC;YACtD,QAAQ,EAAE,KAAK;SAChB,CAAC,EACF,IAAA,gCAAc,GAAE,EAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CACd;;6CACyE;IAW1E;QATC,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EACtB,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;YACf,YAAY,EAAE,IAAI,CAAC,WAAW,IAAI,8BAAkB,CAAC,WAAW;YAChE,WAAW,EAAE,0BAA0B;SACxC,CAAC,EACF,IAAA,gCAAc,GAAE,EAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CACd;;8CAC2E;IA1CxE,SAAS;QADd,IAAA,kBAAQ,GAAE;OACL,SAAS,CA2Cd;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAxDD,sDAwDC"}
|