@ptc-org/nestjs-query-graphql 9.1.0 → 9.2.1
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/loader/dataloader.factory.js +7 -1
- package/src/loader/dataloader.factory.js.map +1 -1
- package/src/loader/index.d.ts +1 -0
- package/src/loader/index.js +1 -0
- package/src/loader/index.js.map +1 -1
- package/src/loader/reference.loader.d.ts +11 -0
- package/src/loader/reference.loader.js +42 -0
- package/src/loader/reference.loader.js.map +1 -0
- package/src/resolvers/reference.resolver.js +34 -4
- package/src/resolvers/reference.resolver.js.map +1 -1
- package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.js +8 -3
- package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.js.map +1 -1
- package/src/types/connection/offset/pager/pager.js +6 -1
- package/src/types/connection/offset/pager/pager.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-graphql",
|
|
3
|
-
"version": "9.1
|
|
3
|
+
"version": "9.2.1",
|
|
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.8.1",
|
|
37
|
-
"@ptc-org/nestjs-query-core": "9.1
|
|
37
|
+
"@ptc-org/nestjs-query-core": "9.2.1",
|
|
38
38
|
"lodash.merge": "4.6.2",
|
|
39
39
|
"reflect-metadata": "0.2.2"
|
|
40
40
|
},
|
|
@@ -18,7 +18,13 @@ class DataLoaderFactory {
|
|
|
18
18
|
const nestjsQueryLoaders = this.initializeContext(context);
|
|
19
19
|
if (!nestjsQueryLoaders[name]) {
|
|
20
20
|
const handler = createHandler();
|
|
21
|
-
const dataLoaderOptions = {
|
|
21
|
+
const dataLoaderOptions = {
|
|
22
|
+
cacheKeyFn,
|
|
23
|
+
// Ensure batching and caching are enabled
|
|
24
|
+
batch: true,
|
|
25
|
+
cache: true,
|
|
26
|
+
...options
|
|
27
|
+
};
|
|
22
28
|
// eslint-disable-next-line no-param-reassign
|
|
23
29
|
nestjsQueryLoaders[name] = new dataloader_1.default(handler, dataLoaderOptions);
|
|
24
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataloader.factory.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/loader/dataloader.factory.ts"],"names":[],"mappings":";;;;AACA,oEAAmC;AAInC,MAAM,UAAU,GAAG,CAAI,GAAM,EAAU,EAAE;AACvC,+DAA+D;AAC/D,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAM3E,MAAa,iBAAiB;IACpB,MAAM,CAAC,iBAAiB,CAAC,OAAoC;QACnE,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChC,6CAA6C;YAC7C,OAAO,CAAC,kBAAkB,GAAG,EAAE,CAAA;QACjC,CAAC;QAED,OAAO,OAAO,CAAC,kBAAkB,CAAA;IACnC,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,OAAoC,EACpC,IAAY,EACZ,aAAiD,EACjD,OAA2B;QAE3B,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;QAE1D,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAA;YAC/B,MAAM,iBAAiB,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"dataloader.factory.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/loader/dataloader.factory.ts"],"names":[],"mappings":";;;;AACA,oEAAmC;AAInC,MAAM,UAAU,GAAG,CAAI,GAAM,EAAU,EAAE;AACvC,+DAA+D;AAC/D,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAM3E,MAAa,iBAAiB;IACpB,MAAM,CAAC,iBAAiB,CAAC,OAAoC;QACnE,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChC,6CAA6C;YAC7C,OAAO,CAAC,kBAAkB,GAAG,EAAE,CAAA;QACjC,CAAC;QAED,OAAO,OAAO,CAAC,kBAAkB,CAAA;IACnC,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,OAAoC,EACpC,IAAY,EACZ,aAAiD,EACjD,OAA2B;QAE3B,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;QAE1D,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAA;YAC/B,MAAM,iBAAiB,GAAG;gBACxB,UAAU;gBACV,0CAA0C;gBAC1C,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,IAAI;gBACX,GAAG,OAAO;aACX,CAAA;YAED,6CAA6C;YAC7C,kBAAkB,CAAC,IAAI,CAAC,GAAG,IAAI,oBAAU,CAAe,OAAO,EAAE,iBAAiB,CAAC,CAAA;QACrF,CAAC;QAED,OAAO,kBAAkB,CAAC,IAAI,CAAqB,CAAA;IACrD,CAAC;CACF;AAlCD,8CAkCC"}
|
package/src/loader/index.d.ts
CHANGED
package/src/loader/index.js
CHANGED
|
@@ -6,4 +6,5 @@ tslib_1.__exportStar(require("./count-relations.loader"), exports);
|
|
|
6
6
|
tslib_1.__exportStar(require("./dataloader.factory"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./find-relations.loader"), exports);
|
|
8
8
|
tslib_1.__exportStar(require("./query-relations.loader"), exports);
|
|
9
|
+
tslib_1.__exportStar(require("./reference.loader"), exports);
|
|
9
10
|
//# sourceMappingURL=index.js.map
|
package/src/loader/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/loader/index.ts"],"names":[],"mappings":";;;AAAA,uEAA4C;AAC5C,mEAAwC;AACxC,+DAAoC;AACpC,kEAAuC;AACvC,mEAAwC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/loader/index.ts"],"names":[],"mappings":";;;AAAA,uEAA4C;AAC5C,mEAAwC;AACxC,+DAAoC;AACpC,kEAAuC;AACvC,mEAAwC;AACxC,6DAAkC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Class, QueryService } from '@ptc-org/nestjs-query-core';
|
|
2
|
+
import { NestjsQueryDataloader } from './relations.loader';
|
|
3
|
+
export type ReferenceArgs = {
|
|
4
|
+
id: string | number;
|
|
5
|
+
};
|
|
6
|
+
export declare class ReferenceLoader<DTO> implements NestjsQueryDataloader<DTO, ReferenceArgs, DTO | undefined | Error> {
|
|
7
|
+
readonly DTOClass: Class<DTO>;
|
|
8
|
+
private readonly logger;
|
|
9
|
+
constructor(DTOClass: Class<DTO>);
|
|
10
|
+
createLoader(service: QueryService<DTO, unknown, unknown>): (args: ReadonlyArray<ReferenceArgs>) => Promise<(DTO | undefined | Error)[]>;
|
|
11
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ReferenceLoader = void 0;
|
|
4
|
+
const common_1 = require("@nestjs/common");
|
|
5
|
+
class ReferenceLoader {
|
|
6
|
+
constructor(DTOClass) {
|
|
7
|
+
this.DTOClass = DTOClass;
|
|
8
|
+
this.logger = new common_1.Logger(ReferenceLoader.name);
|
|
9
|
+
}
|
|
10
|
+
createLoader(service) {
|
|
11
|
+
return async (args) => {
|
|
12
|
+
// Deduplicate IDs while preserving original order mapping
|
|
13
|
+
const uniqueIds = [...new Set(args.map((arg) => arg.id))];
|
|
14
|
+
try {
|
|
15
|
+
const filter = { id: { in: uniqueIds } };
|
|
16
|
+
const entities = await service.query({ filter });
|
|
17
|
+
// Create entity map for efficient lookup
|
|
18
|
+
const entityMap = new Map();
|
|
19
|
+
entities?.forEach((entity) => {
|
|
20
|
+
const id = entity.id;
|
|
21
|
+
entityMap.set(id, entity);
|
|
22
|
+
});
|
|
23
|
+
// Return results in the same order as requested
|
|
24
|
+
const results = args.map((arg) => {
|
|
25
|
+
const entity = entityMap.get(arg.id);
|
|
26
|
+
if (!entity) {
|
|
27
|
+
this.logger.warn(`Entity not found for ID: ${arg.id} in ${this.DTOClass.name}`);
|
|
28
|
+
}
|
|
29
|
+
return entity || undefined;
|
|
30
|
+
});
|
|
31
|
+
return results;
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
this.logger.error(`Batch query failed for ${this.DTOClass.name}:`, error);
|
|
35
|
+
// Return error for each request, let DataLoader handle it
|
|
36
|
+
return args.map(() => (error instanceof Error ? error : new Error(String(error))));
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.ReferenceLoader = ReferenceLoader;
|
|
42
|
+
//# sourceMappingURL=reference.loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reference.loader.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/loader/reference.loader.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AASvC,MAAa,eAAe;IAG1B,YAAqB,QAAoB;QAApB,aAAQ,GAAR,QAAQ,CAAY;QAFxB,WAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAEd,CAAC;IAEtC,YAAY,CAAC,OAA4C;QAC9D,OAAO,KAAK,EAAE,IAAkC,EAAwC,EAAE;YACxF,0DAA0D;YAC1D,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAEzD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAA4B,CAAA;gBAClE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;gBAEhD,yCAAyC;gBACzC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAwB,CAAA;gBACjD,QAAQ,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC3B,MAAM,EAAE,GAAI,MAAkC,CAAC,EAAqB,CAAA;oBACpE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;gBAC3B,CAAC,CAAC,CAAA;gBAEF,gDAAgD;gBAChD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC/B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;oBACpC,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;oBACjF,CAAC;oBACD,OAAO,MAAM,IAAI,SAAS,CAAA;gBAC5B,CAAC,CAAC,CAAA;gBAEF,OAAO,OAAO,CAAA;YAChB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAA;gBACzE,0DAA0D;gBAC1D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACpF,CAAC;QACH,CAAC,CAAA;IACH,CAAC;CACF;AAtCD,0CAsCC"}
|
|
@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const common_1 = require("@nestjs/common");
|
|
6
6
|
const graphql_1 = require("@nestjs/graphql");
|
|
7
7
|
const common_2 = require("../common");
|
|
8
|
+
const inject_dataloader_config_decorator_1 = require("../decorators/inject-dataloader-config.decorator");
|
|
9
|
+
const loader_1 = require("../loader");
|
|
8
10
|
const resolver_interface_1 = require("./resolver.interface");
|
|
9
11
|
/**
|
|
10
12
|
* @internal
|
|
@@ -15,19 +17,47 @@ const Referenceable = (DTOClass, opts) => (BaseClass) => {
|
|
|
15
17
|
return BaseClass;
|
|
16
18
|
}
|
|
17
19
|
const { key } = opts;
|
|
20
|
+
const { baseName } = (0, common_2.getDTONames)(DTOClass);
|
|
21
|
+
const loaderName = `loadReference${baseName}`;
|
|
22
|
+
const referenceLoader = new loader_1.ReferenceLoader(DTOClass);
|
|
18
23
|
let ResolveReferenceResolverBase = class ResolveReferenceResolverBase extends BaseClass {
|
|
19
|
-
|
|
24
|
+
constructor() {
|
|
25
|
+
super(...arguments);
|
|
26
|
+
this.logger = new common_1.Logger(`ReferenceResolver<${baseName}>`);
|
|
27
|
+
}
|
|
28
|
+
async resolveReference(representation, context, dataLoaderConfig) {
|
|
20
29
|
const id = representation[key];
|
|
21
30
|
if (id === undefined) {
|
|
22
|
-
throw new common_1.BadRequestException(`Unable to resolve reference, missing required key ${key} for ${
|
|
31
|
+
throw new common_1.BadRequestException(`Unable to resolve reference, missing required key ${key} for ${baseName}`);
|
|
32
|
+
}
|
|
33
|
+
// Safety check for service availability
|
|
34
|
+
if (!this.service) {
|
|
35
|
+
throw new common_1.BadRequestException(`Service not available for ${baseName} reference resolution`);
|
|
36
|
+
}
|
|
37
|
+
// Ensure loader name is unique in Federation scenarios
|
|
38
|
+
const serviceName = this.service?.constructor?.name || 'UnknownService';
|
|
39
|
+
const uniqueLoaderName = `${loaderName}_${serviceName}`;
|
|
40
|
+
const loader = loader_1.DataLoaderFactory.getOrCreateLoader(context, uniqueLoaderName, () => referenceLoader.createLoader(this.service), {
|
|
41
|
+
// Ensure batching is enabled for performance
|
|
42
|
+
batch: true,
|
|
43
|
+
cache: true,
|
|
44
|
+
maxBatchSize: 1000,
|
|
45
|
+
...dataLoaderConfig
|
|
46
|
+
});
|
|
47
|
+
const result = await loader.load({ id: id });
|
|
48
|
+
if (!result) {
|
|
49
|
+
this.logger.error(`Unable to find ${baseName} with ${key}: ${String(id)}`);
|
|
50
|
+
throw new common_1.BadRequestException(`Unable to find ${baseName} with ${key}: ${String(id)}`);
|
|
23
51
|
}
|
|
24
|
-
return
|
|
52
|
+
return result;
|
|
25
53
|
}
|
|
26
54
|
};
|
|
27
55
|
tslib_1.__decorate([
|
|
28
56
|
(0, graphql_1.ResolveReference)(),
|
|
57
|
+
tslib_1.__param(1, (0, graphql_1.Context)()),
|
|
58
|
+
tslib_1.__param(2, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
|
|
29
59
|
tslib_1.__metadata("design:type", Function),
|
|
30
|
-
tslib_1.__metadata("design:paramtypes", [Object]),
|
|
60
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
|
|
31
61
|
tslib_1.__metadata("design:returntype", Promise)
|
|
32
62
|
], ResolveReferenceResolverBase.prototype, "resolveReference", null);
|
|
33
63
|
ResolveReferenceResolverBase = tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/reference.resolver.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"reference.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/reference.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,18 +24,23 @@ class LimitOffsetPagerStrategy {
|
|
|
24
24
|
if (includeExtraNode && (!this.enableFetchAllWithNegative || opts.limit !== -1)) {
|
|
25
25
|
// Add 1 to the limit so we will fetch an additional node
|
|
26
26
|
paging.limit += 1;
|
|
27
|
-
// if paging backwards remove one from the offset to check for a previous page.
|
|
27
|
+
// if paging backwards, remove one from the offset to check for a previous page.
|
|
28
28
|
if (isBackward) {
|
|
29
29
|
paging.offset -= 1;
|
|
30
30
|
}
|
|
31
31
|
if (paging.offset < 0) {
|
|
32
|
-
// if the offset is < 0 it means we
|
|
32
|
+
// if the offset is < 0, it means we underflow and that we can't have an extra page.
|
|
33
33
|
paging.offset = 0;
|
|
34
34
|
paging.limit = opts.limit;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
if (this.enableFetchAllWithNegative && paging.limit === -1)
|
|
37
|
+
if (this.enableFetchAllWithNegative && paging.limit === -1) {
|
|
38
38
|
delete paging.limit;
|
|
39
|
+
// Delete the offset if it is 0.
|
|
40
|
+
if (paging.offset === 0) {
|
|
41
|
+
delete paging.offset;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
39
44
|
return { ...query, paging };
|
|
40
45
|
}
|
|
41
46
|
checkForExtraNode(nodes, opts) {
|
|
@@ -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;IACnC,YAA6B,0BAAoC;QAApC,+BAA0B,GAA1B,0BAA0B,CAAU;IAAG,CAAC;IAIrE,QAAQ,CAAC,GAAQ,EAAE,KAAa,EAAE,UAA4B;QAC5D,OAAO,wBAAwB,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;IAC3E,CAAC;IAED,cAAc,CAAC,MAAwB;QACrC,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,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAA;IAC3G,CAAC;IAED,aAAa,CAAC,IAAsB;QAClC,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,WAAW,CAAuB,KAAQ,EAAE,IAAsB,EAAE,gBAAyB;QAC3F,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAC3B,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAA;QACzD,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;YACjB
|
|
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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"}
|
|
@@ -51,8 +51,13 @@ class OffsetPager {
|
|
|
51
51
|
createQuery(query, pagingMeta) {
|
|
52
52
|
const { limit, offset } = pagingMeta.opts;
|
|
53
53
|
const paging = { limit: limit + 1, offset };
|
|
54
|
-
if (this.enableFetchAllWithNegative && limit === -1)
|
|
54
|
+
if (this.enableFetchAllWithNegative && limit === -1) {
|
|
55
55
|
delete paging.limit;
|
|
56
|
+
// Delete the offset if it is 0.
|
|
57
|
+
if (offset === 0) {
|
|
58
|
+
delete paging.offset;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
56
61
|
return { ...query, paging };
|
|
57
62
|
}
|
|
58
63
|
checkForExtraNode(nodes, opts) {
|
|
@@ -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,YAA6B,0BAAoC;QAApC,+BAA0B,GAA1B,0BAA0B,CAAU;IAAG,CAAC;IAErE,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,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAEO,KAAK,CAAC,QAAQ,CACpB,SAA4B,EAC5B,KAAQ,EACR,UAAiC;QAEjC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QACzD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC,CAAA;QAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;QAClE,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAA;QACxD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA;IAC7C,CAAC;IAEO,WAAW,CAAC,KAA+B;QACjD,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAA;QACpD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAA;QACnC,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,CAAA;IAC3C,CAAC;IAEO,kBAAkB,CACxB,OAA0B,EAC1B,UAAiC,EACjC,UAAiC;QAEjC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;QACvC,MAAM,QAAQ,GAAG;YACf,WAAW,EAAE,YAAY;YACzB,4EAA4E;YAC5E,eAAe,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;SAC5C,CAAA;QAED,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;IACxC,CAAC;IAEO,WAAW,CAAqC,KAAQ,EAAE,UAAiC;QACjG,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,CAAA;QACzC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/pager.ts"],"names":[],"mappings":"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"}
|