@ptc-org/nestjs-query-graphql 8.0.0 → 8.0.2
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/resolvers/crud.resolver.js +3 -3
- package/src/resolvers/crud.resolver.js.map +1 -1
- package/src/resolvers/update.resolver.d.ts +1 -1
- package/src/resolvers/update.resolver.js +4 -4
- package/src/resolvers/update.resolver.js.map +1 -1
- package/src/types/connection/cursor/pager/pager.d.ts +9 -0
- package/src/types/connection/cursor/pager/pager.js +10 -6
- package/src/types/connection/cursor/pager/pager.js.map +1 -1
- package/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.d.ts +4 -0
- package/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.js +4 -1
- package/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-graphql",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.2",
|
|
4
4
|
"description": "Nestjs graphql query adapter",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"graphql",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"lodash.omit": "^4.5.0",
|
|
35
35
|
"pluralize": "^8.0.0",
|
|
36
36
|
"tslib": "^2.6.3",
|
|
37
|
-
"@ptc-org/nestjs-query-core": "8.0.
|
|
37
|
+
"@ptc-org/nestjs-query-core": "8.0.2",
|
|
38
38
|
"lodash.merge": "4.6.2",
|
|
39
39
|
"reflect-metadata": "0.2.2"
|
|
40
40
|
},
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"class-transformer": "^0.5",
|
|
47
47
|
"class-validator": "^0.14.0",
|
|
48
48
|
"graphql": "^16.0.0",
|
|
49
|
-
"graphql-subscriptions": "^
|
|
49
|
+
"graphql-subscriptions": "^3.0.0",
|
|
50
50
|
"ts-morph": "^19.0.0"
|
|
51
51
|
},
|
|
52
52
|
"publishConfig": {
|
|
@@ -55,14 +55,14 @@ function extractDeleteResolverOpts(opts) {
|
|
|
55
55
|
*/
|
|
56
56
|
// eslint-disable-next-line @typescript-eslint/no-redeclare -- intentional
|
|
57
57
|
const CRUDResolver = (DTOClass, opts = {}) => {
|
|
58
|
-
const
|
|
58
|
+
const referenceable = (0, reference_resolver_1.Referenceable)(DTOClass, opts.referenceBy ?? {});
|
|
59
59
|
const relatable = (0, relations_1.Relatable)(DTOClass, extractRelatableOpts(opts));
|
|
60
60
|
const aggregateable = (0, aggregate_resolver_1.Aggregateable)(DTOClass, extractAggregateResolverOpts(opts));
|
|
61
61
|
const creatable = (0, create_resolver_1.Creatable)(DTOClass, extractCreateResolverOpts(opts));
|
|
62
62
|
const readable = (0, read_resolver_1.Readable)(DTOClass, extractReadResolverOpts(opts));
|
|
63
|
-
const updatable = (0, update_resolver_1.
|
|
63
|
+
const updatable = (0, update_resolver_1.Updatable)(DTOClass, extractUpdateResolverOpts(opts));
|
|
64
64
|
const deleteResolver = (0, delete_resolver_1.DeleteResolver)(DTOClass, extractDeleteResolverOpts(opts));
|
|
65
|
-
return
|
|
65
|
+
return referenceable(relatable(aggregateable(creatable(readable(updatable(deleteResolver))))));
|
|
66
66
|
};
|
|
67
67
|
exports.CRUDResolver = CRUDResolver;
|
|
68
68
|
//# sourceMappingURL=crud.resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/crud.resolver.ts"],"names":[],"mappings":";;;AAEA,sCAAiD;AAGjD,6DAA8F;AAC9F,uDAAiF;AACjF,uDAAsE;AACtE,mDAAkF;AAClF,6DAA2E;AAC3E,2CAAuC;AAGvC,
|
|
1
|
+
{"version":3,"file":"crud.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/crud.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,5 @@ export interface UpdateResolver<DTO, U, QS extends QueryService<DTO, unknown, U>
|
|
|
19
19
|
* @internal
|
|
20
20
|
* Mixin to add `update` graphql endpoints.
|
|
21
21
|
*/
|
|
22
|
-
export declare const
|
|
22
|
+
export declare const Updatable: <DTO, U, QS extends QueryService<DTO, unknown, U>>(DTOClass: Class<DTO>, opts: UpdateResolverOpts<DTO, U>) => <B extends Class<ServiceResolver<DTO, QS>>>(BaseClass: B) => Class<UpdateResolver<DTO, U, QS>> & B;
|
|
23
23
|
export declare const UpdateResolver: <DTO, U = DeepPartial<DTO>, QS extends QueryService<DTO, unknown, U> = QueryService<DTO, unknown, U>>(DTOClass: Class<DTO>, opts?: UpdateResolverOpts<DTO, U>) => ResolverClass<DTO, QS, UpdateResolver<DTO, U, QS>>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.UpdateResolver = exports.
|
|
3
|
+
exports.UpdateResolver = exports.Updatable = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// eslint-disable-next-line max-classes-per-file
|
|
6
6
|
const graphql_1 = require("@nestjs/graphql");
|
|
@@ -53,7 +53,7 @@ const defaultUpdateManyInput = (dtoNames, DTOClass, UpdateDTO) => {
|
|
|
53
53
|
* @internal
|
|
54
54
|
* Mixin to add `update` graphql endpoints.
|
|
55
55
|
*/
|
|
56
|
-
const
|
|
56
|
+
const Updatable = (DTOClass, opts) => (BaseClass) => {
|
|
57
57
|
const dtoNames = (0, common_1.getDTONames)(DTOClass, opts);
|
|
58
58
|
const { baseName, pluralBaseName } = dtoNames;
|
|
59
59
|
const UMR = (0, types_1.UpdateManyResponseType)();
|
|
@@ -188,8 +188,8 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
|
|
|
188
188
|
], UpdateResolverBase);
|
|
189
189
|
return UpdateResolverBase;
|
|
190
190
|
};
|
|
191
|
-
exports.
|
|
191
|
+
exports.Updatable = Updatable;
|
|
192
192
|
// eslint-disable-next-line @typescript-eslint/no-redeclare -- intentional
|
|
193
|
-
const UpdateResolver = (DTOClass, opts = {}) => (0, exports.
|
|
193
|
+
const UpdateResolver = (DTOClass, opts = {}) => (0, exports.Updatable)(DTOClass, opts)(resolver_interface_1.BaseServiceResolver);
|
|
194
194
|
exports.UpdateResolver = UpdateResolver;
|
|
195
195
|
//# sourceMappingURL=update.resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/update.resolver.ts"],"names":[],"mappings":";;;;AAAA,gDAAgD;AAChD,6CAAkF;AAClF,kEAQmC;AACnC,sEAA8B;AAE9B,kCAAwC;AACxC,sCAAiD;AACjD,8CAA0G;AAC1G,oCAAoC;AACpC,kDAAwE;AACxE,kDAA4D;AAC5D,oCAOiB;AACjB,uCAA8E;AAC9E,6DAAoH;AAoBpH,gBAAgB;AAChB,MAAM,kBAAkB,GAAG,CAAS,QAAkB,EAAE,QAAoB,EAAY,EAAE;IAIxF,IAAM,UAAU;IAFhB,6DAA6D;IAC7D,aAAa;IACb,MAAM,UAAW,SAAQ,IAAA,qBAAW,EAAC,QAAQ,EAAE,mBAAS,CAAC;KAAG,CAAA;IAAtD,UAAU;QAHf,IAAA,mBAAS,EAAC,SAAS,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACxC,6DAA6D;QAC7D,aAAa;OACP,UAAU,CAA4C;IAE5D,OAAO,UAAsB,CAAA;AAC/B,CAAC,CAAA;AAED,gBAAgB;AAChB,MAAM,qBAAqB,GAAG,CAC5B,QAAkB,EAClB,QAAoB,EACpB,SAAmB,EACW,EAAE;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;IAG7B,IAAM,EAAE,GAAR,MAAM,EAAG,SAAQ,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC;KAAG,CAAA;IAArD,EAAE;QADP,IAAA,mBAAS,EAAC,YAAY,QAAQ,OAAO,CAAC;OACjC,EAAE,CAAmD;IAE3D,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,gBAAgB;AAChB,MAAM,sBAAsB,GAAG,CAC7B,QAAkB,EAClB,QAAoB,EACpB,SAAmB,EACiB,EAAE;IACtC,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAA;IAGnC,IAAM,EAAE,GAAR,MAAM,EAAG,SAAQ,IAAA,2BAAmB,EAAC,QAAQ,EAAE,SAAS,CAAC;KAAG,CAAA;IAAtD,EAAE;QADP,IAAA,mBAAS,EAAC,aAAa,cAAc,OAAO,CAAC;OACxC,EAAE,CAAoD;IAE5D,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED;;;GAGG;AACI,MAAM,
|
|
1
|
+
{"version":3,"file":"update.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/update.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,14 @@ export declare class CursorPager<DTO> implements Pager<DTO, CursorPagerResult<DT
|
|
|
12
12
|
private getPageMeta;
|
|
13
13
|
private createPagingResult;
|
|
14
14
|
private hasPreviousPage;
|
|
15
|
+
/**
|
|
16
|
+
* @description
|
|
17
|
+
* It is an empty page if:
|
|
18
|
+
*
|
|
19
|
+
* 1. We don't have an extra node.
|
|
20
|
+
* 2. There were no nodes returned.
|
|
21
|
+
* 3. We're paging forward.
|
|
22
|
+
* 4. And we don't have an offset.
|
|
23
|
+
*/
|
|
15
24
|
private isEmptyPage;
|
|
16
25
|
}
|
|
@@ -63,7 +63,7 @@ class CursorPager {
|
|
|
63
63
|
const pageInfo = {
|
|
64
64
|
startCursor: edges[0]?.cursor,
|
|
65
65
|
endCursor: edges[edges.length - 1]?.cursor,
|
|
66
|
-
// if we
|
|
66
|
+
// if we re paging forward and have an extra node we have more pages to load. Or there we know that we have a before cursor, thus we have next page
|
|
67
67
|
hasNextPage: isForward ? hasExtraNode : hasBefore,
|
|
68
68
|
// we have a previous page if we are going backwards and have an extra node.
|
|
69
69
|
hasPreviousPage: this.hasPreviousPage(results, pagingMeta)
|
|
@@ -75,12 +75,16 @@ class CursorPager {
|
|
|
75
75
|
const { opts } = pagingMeta;
|
|
76
76
|
return opts.isBackward ? hasExtraNode : !this.strategy.isEmptyCursor(opts);
|
|
77
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* @description
|
|
80
|
+
* It is an empty page if:
|
|
81
|
+
*
|
|
82
|
+
* 1. We don't have an extra node.
|
|
83
|
+
* 2. There were no nodes returned.
|
|
84
|
+
* 3. We're paging forward.
|
|
85
|
+
* 4. And we don't have an offset.
|
|
86
|
+
*/
|
|
78
87
|
isEmptyPage(results, pagingMeta) {
|
|
79
|
-
// it is an empty page if
|
|
80
|
-
// 1. we dont have an extra node
|
|
81
|
-
// 2. there were no nodes returned
|
|
82
|
-
// 3. we're paging forward
|
|
83
|
-
// 4. and we dont have an offset
|
|
84
88
|
const { opts } = pagingMeta;
|
|
85
89
|
const isEmpty = !results.hasExtraNode && !results.nodes.length && pagingMeta.opts.isForward;
|
|
86
90
|
return isEmpty && this.strategy.isEmptyCursor(opts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/pager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/cursor/pager/pager.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,10 @@ export declare class KeysetPagerStrategy<DTO> implements PagerStrategy<DTO> {
|
|
|
15
15
|
private encodeCursor;
|
|
16
16
|
private decodeCursor;
|
|
17
17
|
private createFieldsFilter;
|
|
18
|
+
/**
|
|
19
|
+
* @description
|
|
20
|
+
* Strip the default sorting criteria if it is set by the client.
|
|
21
|
+
*/
|
|
18
22
|
private getSortFields;
|
|
19
23
|
private createKeySetPayload;
|
|
20
24
|
}
|
|
@@ -42,7 +42,6 @@ class KeysetPagerStrategy {
|
|
|
42
42
|
paging.limit += 1;
|
|
43
43
|
}
|
|
44
44
|
const { payload } = opts;
|
|
45
|
-
// Add 1 to the limit so we will fetch an additional node with the current node
|
|
46
45
|
const sorting = this.getSortFields(query, opts);
|
|
47
46
|
const filter = (0, nestjs_query_core_1.mergeFilter)(query.filter ?? {}, this.createFieldsFilter(sorting, payload));
|
|
48
47
|
const createdQuery = { ...query, filter, sorting, paging };
|
|
@@ -107,6 +106,10 @@ class KeysetPagerStrategy {
|
|
|
107
106
|
}, []);
|
|
108
107
|
return { or: oredFilter };
|
|
109
108
|
}
|
|
109
|
+
/**
|
|
110
|
+
* @description
|
|
111
|
+
* Strip the default sorting criteria if it is set by the client.
|
|
112
|
+
*/
|
|
110
113
|
getSortFields(query, opts) {
|
|
111
114
|
const { sorting = [] } = query;
|
|
112
115
|
const defaultSort = opts.defaultSort.filter((dsf) => !sorting.some((sf) => dsf.field === sf.field));
|
|
@@ -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,EACjB,0BAAoC;QAF5C,aAAQ,GAAR,QAAQ,CAAY;QACpB,eAAU,GAAV,UAAU,CAAe;QACjB,+BAA0B,GAA1B,0BAA0B,CAAU;IACpD,CAAC;IAEJ,cAAc,CAAC,MAAwB;QACrC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;QAC5B,MAAM,SAAS,GAAG,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAA;QACzC,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAA;QACzC,IAAI,OAAiC,CAAA;QACrC,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,IAAI,IAAA,yBAAe,EAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACpE,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC,CAAA;QAC3B,CAAC;QACD,IAAI,IAAA,0BAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACtE,KAAK,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA;IAC1E,CAAC;IAED,QAAQ,CAAC,GAAQ,EAAE,KAAa,EAAE,IAA2B,EAAE,KAAiB;QAC9E,MAAM,YAAY,GAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;QACtH,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,aAAa,CAAC,IAA2B;QACvC,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAA;IACrD,CAAC;IAED,WAAW,CAAuB,KAAQ,EAAE,IAA2B,EAAE,gBAAyB;QAChG,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;QACpC,IAAI,gBAAgB,IAAI,CAAC,CAAC,IAAI,CAAC,0BAA0B,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,yDAAyD;YACzD,MAAM,CAAC,KAAK,IAAI,CAAC,CAAA;QACnB,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QACxB
|
|
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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"}
|