@ptc-org/nestjs-query-graphql 9.1.0 → 9.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ptc-org/nestjs-query-graphql",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "Nestjs graphql query adapter",
   "keywords": [
     "graphql",
@@ -34,7 +34,7 @@
     "lodash.omit": "^4.5.0",
     "pluralize": "^8.0.0",
     "tslib": "^2.8.1",
-    "@ptc-org/nestjs-query-core": "9.1.0",
+    "@ptc-org/nestjs-query-core": "9.2.0",
     "lodash.merge": "4.6.2",
     "reflect-metadata": "0.2.2"
   },

package/src/auth/authorizer.d.ts

@@ -22,5 +22,5 @@ export interface CustomAuthorizer<DTO> {
 }
 export interface Authorizer<DTO> extends CustomAuthorizer<DTO> {
     authorize(context: any, authorizerContext: AuthorizationContext): Promise<Filter<DTO>>;
-    authorizeRelation(relationName: string, context: any, authorizerContext: AuthorizationContext): Promise<Filter<unknown> | undefined>;
+    authorizeRelation<Relation = unknown>(relationName: string, context: any, authorizerContext: AuthorizationContext): Promise<Filter<Relation> | undefined>;
 }

package/src/index.d.ts

@@ -1,4 +1,4 @@
-export { AuthorizationContext, Authorizer, AuthorizerOptions, CustomAuthorizer, OperationGroup } from './auth';
+export { AuthorizationContext, Authorizer, AuthorizerOptions, CustomAuthorizer, getAuthorizerToken, OperationGroup } from './auth';
 export { DTONamesOpts } from './common';
 export { Authorize, AuthorizerFilter, BeforeCreateMany, BeforeCreateOne, BeforeDeleteMany, BeforeDeleteOne, BeforeFindOne, BeforeQueryMany, BeforeUpdateMany, BeforeUpdateOne, CursorConnection, FilterableCursorConnection, FilterableField, FilterableFieldOptions, FilterableOffsetConnection, FilterableRelation, FilterableUnPagedRelation, HookArgs, IDField, IDFieldOptions, InjectAuthorizer, InjectCustomAuthorizer, InjectPubSub, KeySet, MutationHookArgs, ObjectId, OffsetConnection, QueryOptions, Reference, ReferenceDecoratorOpts, ReferenceTypeFunc, Relation, RelationAuthorizerFilter, RelationOneDecoratorOpts, RelationTypeFunc, ResolverMethodOpts, UnPagedRelation } from './decorators';
 export * from './federation';

package/src/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pubSubToken = exports.NestjsQueryGraphQLModule = exports.HookInterceptor = exports.AuthorizerInterceptor = exports.HookTypes = exports.UnPagedRelation = exports.RelationAuthorizerFilter = exports.Relation = exports.Reference = exports.QueryOptions = exports.OffsetConnection = exports.ObjectId = exports.MutationHookArgs = exports.KeySet = exports.InjectPubSub = exports.InjectCustomAuthorizer = exports.InjectAuthorizer = exports.IDField = exports.HookArgs = exports.FilterableUnPagedRelation = exports.FilterableRelation = exports.FilterableOffsetConnection = exports.FilterableField = exports.FilterableCursorConnection = exports.CursorConnection = exports.BeforeUpdateOne = exports.BeforeUpdateMany = exports.BeforeQueryMany = exports.BeforeFindOne = exports.BeforeDeleteOne = exports.BeforeDeleteMany = exports.BeforeCreateOne = exports.BeforeCreateMany = exports.AuthorizerFilter = exports.Authorize = exports.OperationGroup = void 0;
+exports.pubSubToken = exports.NestjsQueryGraphQLModule = exports.HookInterceptor = exports.AuthorizerInterceptor = exports.HookTypes = exports.UnPagedRelation = exports.RelationAuthorizerFilter = exports.Relation = exports.Reference = exports.QueryOptions = exports.OffsetConnection = exports.ObjectId = exports.MutationHookArgs = exports.KeySet = exports.InjectPubSub = exports.InjectCustomAuthorizer = exports.InjectAuthorizer = exports.IDField = exports.HookArgs = exports.FilterableUnPagedRelation = exports.FilterableRelation = exports.FilterableOffsetConnection = exports.FilterableField = exports.FilterableCursorConnection = exports.CursorConnection = exports.BeforeUpdateOne = exports.BeforeUpdateMany = exports.BeforeQueryMany = exports.BeforeFindOne = exports.BeforeDeleteOne = exports.BeforeDeleteMany = exports.BeforeCreateOne = exports.BeforeCreateMany = exports.AuthorizerFilter = exports.Authorize = exports.OperationGroup = exports.getAuthorizerToken = void 0;
 const tslib_1 = require("tslib");
 var auth_1 = require("./auth");
+Object.defineProperty(exports, "getAuthorizerToken", { enumerable: true, get: function () { return auth_1.getAuthorizerToken; } });
 Object.defineProperty(exports, "OperationGroup", { enumerable: true, get: function () { return auth_1.OperationGroup; } });
 var decorators_1 = require("./decorators");
 Object.defineProperty(exports, "Authorize", { enumerable: true, get: function () { return decorators_1.Authorize; } });

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/query-graphql/src/index.ts"],"names":[],"mappings":";;;;AAAA,+BAA8G;AAA9B,sGAAA,cAAc,OAAA;AAE9F,2CAsCqB;AArCnB,uGAAA,SAAS,OAAA;AACT,8GAAA,gBAAgB,OAAA;AAChB,8GAAA,gBAAgB,OAAA;AAChB,6GAAA,eAAe,OAAA;AACf,8GAAA,gBAAgB,OAAA;AAChB,6GAAA,eAAe,OAAA;AACf,2GAAA,aAAa,OAAA;AACb,6GAAA,eAAe,OAAA;AACf,8GAAA,gBAAgB,OAAA;AAChB,6GAAA,eAAe,OAAA;AACf,8GAAA,gBAAgB,OAAA;AAChB,wHAAA,0BAA0B,OAAA;AAC1B,6GAAA,eAAe,OAAA;AAEf,wHAAA,0BAA0B,OAAA;AAC1B,gHAAA,kBAAkB,OAAA;AAClB,uHAAA,yBAAyB,OAAA;AACzB,sGAAA,QAAQ,OAAA;AACR,qGAAA,OAAO,OAAA;AAEP,8GAAA,gBAAgB,OAAA;AAChB,oHAAA,sBAAsB,OAAA;AACtB,0GAAA,YAAY,OAAA;AACZ,oGAAA,MAAM,OAAA;AACN,8GAAA,gBAAgB,OAAA;AAChB,sGAAA,QAAQ,OAAA;AACR,8GAAA,gBAAgB,OAAA;AAChB,0GAAA,YAAY,OAAA;AACZ,uGAAA,SAAS,OAAA;AAGT,sGAAA,QAAQ,OAAA;AACR,sHAAA,wBAAwB,OAAA;AAIxB,6GAAA,eAAe,OAAA;AAEjB,uDAA4B;AAC5B,iCAWgB;AADd,kGAAA,SAAS,OAAA;AAEX,+CAAuG;AAA3E,qHAAA,qBAAqB,OAAA;AAAe,+GAAA,eAAe,OAAA;AAC/E,mCAAmD;AAA1C,kHAAA,wBAAwB,OAAA;AAEjC,sDAA2B;AAC3B,+CAA2D;AAAnC,2GAAA,WAAW,OAAA;AACnC,kDAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/query-graphql/src/index.ts"],"names":[],"mappings":";;;;AAAA,+BAAkI;AAAlD,0GAAA,kBAAkB,OAAA;AAAE,sGAAA,cAAc,OAAA;AAElH,2CAsCqB;AArCnB,uGAAA,SAAS,OAAA;AACT,8GAAA,gBAAgB,OAAA;AAChB,8GAAA,gBAAgB,OAAA;AAChB,6GAAA,eAAe,OAAA;AACf,8GAAA,gBAAgB,OAAA;AAChB,6GAAA,eAAe,OAAA;AACf,2GAAA,aAAa,OAAA;AACb,6GAAA,eAAe,OAAA;AACf,8GAAA,gBAAgB,OAAA;AAChB,6GAAA,eAAe,OAAA;AACf,8GAAA,gBAAgB,OAAA;AAChB,wHAAA,0BAA0B,OAAA;AAC1B,6GAAA,eAAe,OAAA;AAEf,wHAAA,0BAA0B,OAAA;AAC1B,gHAAA,kBAAkB,OAAA;AAClB,uHAAA,yBAAyB,OAAA;AACzB,sGAAA,QAAQ,OAAA;AACR,qGAAA,OAAO,OAAA;AAEP,8GAAA,gBAAgB,OAAA;AAChB,oHAAA,sBAAsB,OAAA;AACtB,0GAAA,YAAY,OAAA;AACZ,oGAAA,MAAM,OAAA;AACN,8GAAA,gBAAgB,OAAA;AAChB,sGAAA,QAAQ,OAAA;AACR,8GAAA,gBAAgB,OAAA;AAChB,0GAAA,YAAY,OAAA;AACZ,uGAAA,SAAS,OAAA;AAGT,sGAAA,QAAQ,OAAA;AACR,sHAAA,wBAAwB,OAAA;AAIxB,6GAAA,eAAe,OAAA;AAEjB,uDAA4B;AAC5B,iCAWgB;AADd,kGAAA,SAAS,OAAA;AAEX,+CAAuG;AAA3E,qHAAA,qBAAqB,OAAA;AAAe,+GAAA,eAAe,OAAA;AAC/E,mCAAmD;AAA1C,kHAAA,wBAAwB,OAAA;AAEjC,sDAA2B;AAC3B,+CAA2D;AAAnC,2GAAA,WAAW,OAAA;AACnC,kDAAuB"}

package/src/loader/dataloader.factory.js

@@ -18,7 +18,13 @@ class DataLoaderFactory {
         const nestjsQueryLoaders = this.initializeContext(context);
         if (!nestjsQueryLoaders[name]) {
             const handler = createHandler();
-            const dataLoaderOptions = { cacheKeyFn, ...options };
+            const dataLoaderOptions = {
+                cacheKeyFn,
+                // Ensure batching and caching are enabled
+                batch: true,
+                cache: true,
+                ...options
+            };
             // eslint-disable-next-line no-param-reassign
             nestjsQueryLoaders[name] = new dataloader_1.default(handler, dataLoaderOptions);
         }

package/src/loader/dataloader.factory.js.map

@@ -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,UAAU,EAAE,GAAG,OAAO,EAAE,CAAA;YAEpD,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;AA5BD,8CA4BC"}
+{"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

@@ -3,3 +3,4 @@ export * from './count-relations.loader';
 export * from './dataloader.factory';
 export * from './find-relations.loader';
 export * from './query-relations.loader';
+export * from './reference.loader';

package/src/loader/index.js

@@ -6,4 +6,5 @@ tslib_1.__exportStar(require("./count-relations.loader"), exports);
 tslib_1.__exportStar(require("./dataloader.factory"), exports);
 tslib_1.__exportStar(require("./find-relations.loader"), exports);
 tslib_1.__exportStar(require("./query-relations.loader"), exports);
+tslib_1.__exportStar(require("./reference.loader"), exports);
 //# sourceMappingURL=index.js.map

package/src/loader/index.js.map

@@ -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"}
+{"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"}

package/src/loader/reference.loader.d.ts

@@ -0,0 +1,11 @@
+import { Class, QueryService } from '@ptc-org/nestjs-query-core';
+import { NestjsQueryDataloader } from './relations.loader';
+export type ReferenceArgs = {
+    id: string | number;
+};
+export declare class ReferenceLoader<DTO> implements NestjsQueryDataloader<DTO, ReferenceArgs, DTO | undefined | Error> {
+    readonly DTOClass: Class<DTO>;
+    private readonly logger;
+    constructor(DTOClass: Class<DTO>);
+    createLoader(service: QueryService<DTO, unknown, unknown>): (args: ReadonlyArray<ReferenceArgs>) => Promise<(DTO | undefined | Error)[]>;
+}

package/src/loader/reference.loader.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReferenceLoader = void 0;
+const common_1 = require("@nestjs/common");
+class ReferenceLoader {
+    constructor(DTOClass) {
+        this.DTOClass = DTOClass;
+        this.logger = new common_1.Logger(ReferenceLoader.name);
+    }
+    createLoader(service) {
+        return async (args) => {
+            // Deduplicate IDs while preserving original order mapping
+            const uniqueIds = [...new Set(args.map((arg) => arg.id))];
+            try {
+                const filter = { id: { in: uniqueIds } };
+                const entities = await service.query({ filter });
+                // Create entity map for efficient lookup
+                const entityMap = new Map();
+                entities?.forEach((entity) => {
+                    const id = entity.id;
+                    entityMap.set(id, entity);
+                });
+                // Return results in the same order as requested
+                const results = args.map((arg) => {
+                    const entity = entityMap.get(arg.id);
+                    if (!entity) {
+                        this.logger.warn(`Entity not found for ID: ${arg.id} in ${this.DTOClass.name}`);
+                    }
+                    return entity || undefined;
+                });
+                return results;
+            }
+            catch (error) {
+                this.logger.error(`Batch query failed for ${this.DTOClass.name}:`, error);
+                // Return error for each request, let DataLoader handle it
+                return args.map(() => (error instanceof Error ? error : new Error(String(error))));
+            }
+        };
+    }
+}
+exports.ReferenceLoader = ReferenceLoader;
+//# sourceMappingURL=reference.loader.js.map

package/src/loader/reference.loader.js.map

@@ -0,0 +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"}

package/src/resolvers/reference.resolver.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const graphql_1 = require("@nestjs/graphql");
 const common_2 = require("../common");
+const inject_dataloader_config_decorator_1 = require("../decorators/inject-dataloader-config.decorator");
+const loader_1 = require("../loader");
 const resolver_interface_1 = require("./resolver.interface");
 /**
  * @internal
@@ -15,19 +17,47 @@ const Referenceable = (DTOClass, opts) => (BaseClass) => {
         return BaseClass;
     }
     const { key } = opts;
+    const { baseName } = (0, common_2.getDTONames)(DTOClass);
+    const loaderName = `loadReference${baseName}`;
+    const referenceLoader = new loader_1.ReferenceLoader(DTOClass);
     let ResolveReferenceResolverBase = class ResolveReferenceResolverBase extends BaseClass {
-        async resolveReference(representation) {
+        constructor() {
+            super(...arguments);
+            this.logger = new common_1.Logger(`ReferenceResolver<${baseName}>`);
+        }
+        async resolveReference(representation, context, dataLoaderConfig) {
             const id = representation[key];
             if (id === undefined) {
-                throw new common_1.BadRequestException(`Unable to resolve reference, missing required key ${key} for ${(0, common_2.getDTONames)(DTOClass).baseName}`);
+                throw new common_1.BadRequestException(`Unable to resolve reference, missing required key ${key} for ${baseName}`);
+            }
+            // Safety check for service availability
+            if (!this.service) {
+                throw new common_1.BadRequestException(`Service not available for ${baseName} reference resolution`);
+            }
+            // Ensure loader name is unique in Federation scenarios
+            const serviceName = this.service?.constructor?.name || 'UnknownService';
+            const uniqueLoaderName = `${loaderName}_${serviceName}`;
+            const loader = loader_1.DataLoaderFactory.getOrCreateLoader(context, uniqueLoaderName, () => referenceLoader.createLoader(this.service), {
+                // Ensure batching is enabled for performance
+                batch: true,
+                cache: true,
+                maxBatchSize: 1000,
+                ...dataLoaderConfig
+            });
+            const result = await loader.load({ id: id });
+            if (!result) {
+                this.logger.error(`Unable to find ${baseName} with ${key}: ${String(id)}`);
+                throw new common_1.BadRequestException(`Unable to find ${baseName} with ${key}: ${String(id)}`);
             }
-            return this.service.getById(representation[key]);
+            return result;
         }
     };
     tslib_1.__decorate([
         (0, graphql_1.ResolveReference)(),
+        tslib_1.__param(1, (0, graphql_1.Context)()),
+        tslib_1.__param(2, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
         tslib_1.__metadata("design:type", Function),
-        tslib_1.__metadata("design:paramtypes", [Object]),
+        tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
         tslib_1.__metadata("design:returntype", Promise)
     ], ResolveReferenceResolverBase.prototype, "resolveReference", null);
     ResolveReferenceResolverBase = tslib_1.__decorate([

package/src/resolvers/reference.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"reference.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/reference.resolver.ts"],"names":[],"mappings":";;;;AAAA,2CAAoD;AACpD,6CAA4D;AAG5D,sCAAuC;AAEvC,6DAA0F;AAM1F;;;GAGG;AACI,MAAM,aAAa,GACxB,CAAsD,QAAoB,EAAE,IAA2B,EAAE,EAAE,CAC3G,CAA4C,SAAY,EAAK,EAAE;IAC7D,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAGpB,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,SAAS;QAE5C,AAAN,KAAK,CAAC,gBAAgB,CAAC,cAAkC;YACvD,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;YAC9B,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;gBACrB,MAAM,IAAI,4BAAmB,CAC3B,qDAAqD,GAAG,QAAQ,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CACjG,CAAA;YACH,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAoB,CAAC,CAAA;QACrE,CAAC;KACF,CAAA;IATO;QADL,IAAA,0BAAgB,GAAE;;;;wEASlB;IAVG,4BAA4B;QADjC,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;OACzC,4BAA4B,CAWjC;IAED,OAAO,4BAA4B,CAAA;AACrC,CAAC,CAAA;AAvBU,QAAA,aAAa,iBAuBvB;AAEI,MAAM,iBAAiB,GAAG,CAC/B,QAAoB,EACpB,OAA8B,EAAE,EACkB,EAAE,CAAC,IAAA,qBAAa,EAAU,QAAQ,EAAE,IAAI,CAAC,CAAC,wCAAmB,CAAC,CAAA;AAHrG,QAAA,iBAAiB,qBAGoF"}
+{"version":3,"file":"reference.resolver.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/resolvers/reference.resolver.ts"],"names":[],"mappings":"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"}

package/src/resolvers/relations/aggregate-relations.resolver.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregateRelationsResolver = exports.AggregateRelationsMixin = void 0;
 const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
 const graphql_1 = require("@nestjs/graphql");
 const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
 const auth_1 = require("../../auth");
-const common_1 = require("../../common");
+const common_2 = require("../../common");
 const decorators_1 = require("../../decorators");
 const inject_dataloader_config_decorator_1 = require("../../decorators/inject-dataloader-config.decorator");
 const interceptors_1 = require("../../interceptors");
@@ -15,19 +16,21 @@ const helpers_1 = require("../helpers");
 const resolver_interface_1 = require("../resolver.interface");
 const helpers_2 = require("./helpers");
 const AggregateRelationMixin = (DTOClass, relation) => (Base) => {
-    var _a;
+    var _a, _b, _c;
     if (!relation.enableAggregate && !relation.aggregate?.enabled) {
         return Base;
     }
     const commonResolverOpts = relation.aggregate || (0, helpers_2.removeRelationOpts)(relation);
     const relationDTO = relation.DTO;
-    const dtoName = (0, common_1.getDTONames)(DTOClass).baseName;
-    const { baseName, baseNameLower } = (0, common_1.getDTONames)(relationDTO, {
+    const dtoName = (0, common_2.getDTONames)(DTOClass).baseName;
+    const { baseName, baseNameLower } = (0, common_2.getDTONames)(relationDTO, {
         dtoName: relation.dtoName
     });
     const relationName = relation.relationName ?? baseNameLower;
     const aggregateRelationLoaderName = `aggregate${baseName}For${dtoName}`;
     const aggregateLoader = new loader_1.AggregateRelationsLoader(relationDTO, relationName);
+    const authorizerKey = Symbol(`authorizerFor${DTOClass.name}`);
+    const relationAuthorizerKey = Symbol(`authorizerFor${relation.dtoName}`);
     let RelationQA = class RelationQA extends (0, types_1.AggregateArgsType)(relationDTO) {
     };
     RelationQA = tslib_1.__decorate([
@@ -35,16 +38,36 @@ const AggregateRelationMixin = (DTOClass, relation) => (Base) => {
     ], RelationQA);
     const [AR] = (0, types_1.AggregateResponseType)(relationDTO, { prefix: `${dtoName}${baseName}` });
     let AggregateMixin = class AggregateMixin extends Base {
-        async [_a = `aggregate${baseName}`](dto, q, aggregateQuery, context, relationFilter, dataLoaderConfig) {
+        async [(_a = authorizerKey, _b = relationAuthorizerKey, _c = `aggregate${baseName}`)](dto, q, aggregateQuery, context, dataLoaderConfig) {
             const qa = await (0, helpers_1.transformAndValidate)(RelationQA, q);
             const loader = loader_1.DataLoaderFactory.getOrCreateLoader(context, aggregateRelationLoaderName, () => aggregateLoader.createLoader(this.service), dataLoaderConfig);
+            const authContext = {
+                operationName: baseNameLower,
+                operationGroup: auth_1.OperationGroup.AGGREGATE,
+                readonly: true,
+                many: true
+            };
+            const authFilter = relation.auth
+                ? await relation.auth?.authorize(context, authContext)
+                : ((await this[authorizerKey]?.authorizeRelation(baseNameLower, context, authContext)) ??
+                    (await this[relationAuthorizerKey]?.authorize(context, authContext)));
             return loader.load({
                 dto,
-                filter: (0, nestjs_query_core_1.mergeFilter)(qa.filter ?? {}, relationFilter ?? {}),
+                filter: (0, nestjs_query_core_1.mergeFilter)(qa.filter ?? {}, authFilter ?? {}),
                 aggregate: aggregateQuery
             });
         }
     };
+    tslib_1.__decorate([
+        (0, common_1.Optional)(),
+        (0, common_1.Inject)((0, auth_1.getAuthorizerToken)(DTOClass)),
+        tslib_1.__metadata("design:type", Object)
+    ], AggregateMixin.prototype, _a, void 0);
+    tslib_1.__decorate([
+        (0, common_1.Optional)(),
+        (0, common_1.Inject)((0, auth_1.getAuthorizerToken)(relationDTO)),
+        tslib_1.__metadata("design:type", Object)
+    ], AggregateMixin.prototype, _b, void 0);
     tslib_1.__decorate([
         (0, decorators_1.ResolverField)(`${baseNameLower}Aggregate`, () => [AR], {
             description: relation.aggregate?.description
@@ -55,15 +78,11 @@ const AggregateRelationMixin = (DTOClass, relation) => (Base) => {
         tslib_1.__param(1, (0, graphql_1.Args)()),
         tslib_1.__param(2, (0, decorators_1.AggregateQueryParam)()),
         tslib_1.__param(3, (0, graphql_1.Context)()),
-        tslib_1.__param(4, (0, decorators_1.RelationAuthorizerFilter)(baseNameLower, {
-            operationGroup: auth_1.OperationGroup.AGGREGATE,
-            many: true
-        })),
-        tslib_1.__param(5, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
+        tslib_1.__param(4, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
         tslib_1.__metadata("design:type", Function),
-        tslib_1.__metadata("design:paramtypes", [Object, RelationQA, Object, Object, Object, Object]),
+        tslib_1.__metadata("design:paramtypes", [Object, RelationQA, Object, Object, Object]),
         tslib_1.__metadata("design:returntype", Promise)
-    ], AggregateMixin.prototype, _a, null);
+    ], AggregateMixin.prototype, _c, null);
     AggregateMixin = tslib_1.__decorate([
         (0, graphql_1.Resolver)(() => DTOClass, { isAbstract: true })
     ], AggregateMixin);

package/src/resolvers/relations/aggregate-relations.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate-relations.resolver.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/resolvers/relations/aggregate-relations.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aggregate-relations.resolver.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/resolvers/relations/aggregate-relations.resolver.ts"],"names":[],"mappings":"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"}

package/src/resolvers/relations/read-relations.resolver.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReadRelationsResolver = exports.ReadRelationsMixin = void 0;
 const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
 const graphql_1 = require("@nestjs/graphql");
 const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
 const auth_1 = require("../../auth");
-const common_1 = require("../../common");
+const common_2 = require("../../common");
 const decorators_1 = require("../../decorators");
 const inject_dataloader_config_decorator_1 = require("../../decorators/inject-dataloader-config.decorator");
 const interceptors_1 = require("../../interceptors");
@@ -15,18 +16,30 @@ const helpers_1 = require("../helpers");
 const resolver_interface_1 = require("../resolver.interface");
 const helpers_2 = require("./helpers");
 const ReadOneRelationMixin = (DTOClass, relation) => (Base) => {
-    var _a;
+    var _a, _b, _c;
     if (relation.disableRead) {
         return Base;
     }
     const commonResolverOpts = (0, helpers_2.removeRelationOpts)(relation);
     const relationDTO = relation.DTO;
-    const { baseNameLower, baseName } = (0, common_1.getDTONames)(relationDTO, { dtoName: relation.dtoName });
+    const { baseNameLower, baseName } = (0, common_2.getDTONames)(relationDTO, { dtoName: relation.dtoName });
     const relationName = relation.relationName ?? baseNameLower;
     const loaderName = `load${baseName}For${DTOClass.name}`;
+    const authorizerKey = Symbol(`authorizerFor${DTOClass.name}`);
+    const relationAuthorizerKey = Symbol(`authorizerFor${relation.dtoName}`);
     const findLoader = new loader_1.FindRelationsLoader(relationDTO, relationName);
     let ReadOneMixin = class ReadOneMixin extends Base {
-        async [_a = `find${baseName}`](dto, context, authFilter, resolveInfo, dataLoaderConfig) {
+        async [(_a = authorizerKey, _b = relationAuthorizerKey, _c = `find${baseName}`)](dto, context, resolveInfo, dataLoaderConfig) {
+            const authContext = {
+                operationName: baseNameLower,
+                operationGroup: auth_1.OperationGroup.READ,
+                readonly: true,
+                many: false
+            };
+            const authFilter = relation.auth
+                ? await relation.auth?.authorize(context, authContext)
+                : ((await this[authorizerKey]?.authorizeRelation(baseNameLower, context, authContext)) ??
+                    (await this[relationAuthorizerKey]?.authorize(context, authContext)));
             return loader_1.DataLoaderFactory.getOrCreateLoader(context, loaderName, () => findLoader.createLoader(this.service, {
                 resolveInfo: resolveInfo?.info,
                 withDeleted: relation.withDeleted,
@@ -38,6 +51,16 @@ const ReadOneRelationMixin = (DTOClass, relation) => (Base) => {
             });
         }
     };
+    tslib_1.__decorate([
+        (0, common_1.Optional)(),
+        (0, common_1.Inject)((0, auth_1.getAuthorizerToken)(DTOClass)),
+        tslib_1.__metadata("design:type", Object)
+    ], ReadOneMixin.prototype, _a, void 0);
+    tslib_1.__decorate([
+        (0, common_1.Optional)(),
+        (0, common_1.Inject)((0, auth_1.getAuthorizerToken)(relationDTO)),
+        tslib_1.__metadata("design:type", Object)
+    ], ReadOneMixin.prototype, _b, void 0);
     tslib_1.__decorate([
         (0, decorators_1.ResolverField)(baseNameLower, () => relationDTO, {
             nullable: relation.nullable,
@@ -47,33 +70,31 @@ const ReadOneRelationMixin = (DTOClass, relation) => (Base) => {
         }, commonResolverOpts, { interceptors: [(0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }),
         tslib_1.__param(0, (0, graphql_1.Parent)()),
         tslib_1.__param(1, (0, graphql_1.Context)()),
-        tslib_1.__param(2, (0, decorators_1.RelationAuthorizerFilter)(baseNameLower, {
-            operationGroup: auth_1.OperationGroup.READ,
-            many: false
-        })),
-        tslib_1.__param(3, (0, decorators_1.GraphQLResultInfo)(DTOClass)),
-        tslib_1.__param(4, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
+        tslib_1.__param(2, (0, decorators_1.GraphQLResultInfo)(DTOClass)),
+        tslib_1.__param(3, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
         tslib_1.__metadata("design:type", Function),
-        tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object, Object]),
+        tslib_1.__metadata("design:paramtypes", [Object, Object, Object, Object]),
         tslib_1.__metadata("design:returntype", Promise)
-    ], ReadOneMixin.prototype, _a, null);
+    ], ReadOneMixin.prototype, _c, null);
     ReadOneMixin = tslib_1.__decorate([
         (0, graphql_1.Resolver)(() => DTOClass, { isAbstract: true })
     ], ReadOneMixin);
     return ReadOneMixin;
 };
 const ReadManyRelationMixin = (DTOClass, relation) => (Base) => {
-    var _a;
+    var _a, _b, _c;
     if (relation.disableRead) {
         return Base;
     }
     const commonResolverOpts = (0, helpers_2.removeRelationOpts)(relation);
     const relationDTO = relation.DTO;
-    const dtoName = (0, common_1.getDTONames)(DTOClass).baseName;
-    const { baseNameLower, baseName } = (0, common_1.getDTONames)(relationDTO, { dtoName: relation.dtoName });
+    const dtoName = (0, common_2.getDTONames)(DTOClass).baseName;
+    const { baseNameLower, baseName } = (0, common_2.getDTONames)(relationDTO, { dtoName: relation.dtoName });
     const relationName = relation.relationName ?? baseNameLower;
     const relationLoaderName = `load${baseName}For${DTOClass.name}`;
     const countRelationLoaderName = `count${baseName}For${DTOClass.name}`;
+    const authorizerKey = Symbol(`authorizerFor${DTOClass.name}`);
+    const relationAuthorizerKey = Symbol(`authorizerFor${relation.dtoName}`);
     const queryLoader = new loader_1.QueryRelationsLoader(relationDTO, relationName);
     const countLoader = new loader_1.CountRelationsLoader(relationDTO, relationName);
     const connectionName = `${dtoName}${baseName}Connection`;
@@ -89,13 +110,33 @@ const ReadManyRelationMixin = (DTOClass, relation) => (Base) => {
     // disable keyset pagination for relations otherwise recursive paging will not work
     const { ConnectionType: CT } = RelationQA;
     let ReadManyMixin = class ReadManyMixin extends Base {
-        async [_a = `query${baseName}`](dto, q, context, relationFilter, resolveInfo, dataLoaderConfig) {
+        async [(_a = authorizerKey, _b = relationAuthorizerKey, _c = `query${baseName}`)](dto, q, context, resolveInfo, dataLoaderConfig) {
+            const authContext = {
+                operationName: baseNameLower,
+                operationGroup: auth_1.OperationGroup.READ,
+                readonly: true,
+                many: true
+            };
+            const authFilter = relation.auth
+                ? await relation.auth?.authorize(context, authContext)
+                : ((await this[authorizerKey]?.authorizeRelation(baseNameLower, context, authContext)) ??
+                    (await this[relationAuthorizerKey]?.authorize(context, authContext)));
             const relationQuery = await (0, helpers_1.transformAndValidate)(RelationQA, q);
             const relationLoader = loader_1.DataLoaderFactory.getOrCreateLoader(context, relationLoaderName, () => queryLoader.createLoader(this.service, { withDeleted: relation.withDeleted }), dataLoaderConfig);
             const relationCountLoader = loader_1.DataLoaderFactory.getOrCreateLoader(context, countRelationLoaderName, () => countLoader.createLoader(this.service, { withDeleted: relation.withDeleted }), dataLoaderConfig);
-            return CT.createFromPromise((query) => relationLoader.load({ dto, query }), (0, nestjs_query_core_1.mergeQuery)(relationQuery, { filter: relationFilter, relations: resolveInfo?.relations }), (filter) => relationCountLoader.load({ dto, filter }));
+            return CT.createFromPromise((query) => relationLoader.load({ dto, query }), (0, nestjs_query_core_1.mergeQuery)(relationQuery, { filter: authFilter, relations: resolveInfo?.relations }), (filter) => relationCountLoader.load({ dto, filter }));
         }
     };
+    tslib_1.__decorate([
+        (0, common_1.Optional)(),
+        (0, common_1.Inject)((0, auth_1.getAuthorizerToken)(DTOClass)),
+        tslib_1.__metadata("design:type", Object)
+    ], ReadManyMixin.prototype, _a, void 0);
+    tslib_1.__decorate([
+        (0, common_1.Optional)(),
+        (0, common_1.Inject)((0, auth_1.getAuthorizerToken)(relationDTO)),
+        tslib_1.__metadata("design:type", Object)
+    ], ReadManyMixin.prototype, _b, void 0);
     tslib_1.__decorate([
         (0, decorators_1.ResolverField)(baseNameLower, () => CT.resolveType, {
             nullable: relation.nullable,
@@ -106,16 +147,12 @@ const ReadManyRelationMixin = (DTOClass, relation) => (Base) => {
         tslib_1.__param(0, (0, graphql_1.Parent)()),
         tslib_1.__param(1, (0, graphql_1.Args)()),
         tslib_1.__param(2, (0, graphql_1.Context)()),
-        tslib_1.__param(3, (0, decorators_1.RelationAuthorizerFilter)(baseNameLower, {
-            operationGroup: auth_1.OperationGroup.READ,
-            many: true
-        })),
-        tslib_1.__param(4, (0, decorators_1.GraphQLResultInfo)(DTOClass)),
-        tslib_1.__param(5, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
+        tslib_1.__param(3, (0, decorators_1.GraphQLResultInfo)(DTOClass)),
+        tslib_1.__param(4, (0, inject_dataloader_config_decorator_1.InjectDataLoaderConfig)()),
         tslib_1.__metadata("design:type", Function),
-        tslib_1.__metadata("design:paramtypes", [Object, RelationQA, Object, Object, Object, Object]),
+        tslib_1.__metadata("design:paramtypes", [Object, RelationQA, Object, Object, Object]),
         tslib_1.__metadata("design:returntype", Promise)
-    ], ReadManyMixin.prototype, _a, null);
+    ], ReadManyMixin.prototype, _c, null);
     ReadManyMixin = tslib_1.__decorate([
         (0, graphql_1.Resolver)(() => DTOClass, { isAbstract: true })
     ], ReadManyMixin);

package/src/resolvers/relations/read-relations.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-relations.resolver.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/resolvers/relations/read-relations.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read-relations.resolver.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/resolvers/relations/read-relations.resolver.ts"],"names":[],"mappings":";;;;AAAA,2CAAmE;AACnE,6CAA2E;AAC3E,kEAA4E;AAE5E,qCAA2E;AAC3E,yCAA0C;AAC1C,iDAA6F;AAC7F,4GAA4F;AAC5F,qDAA0D;AAC1D,yCAAiH;AAEjH,uCAA2C;AAC3C,wCAAiD;AACjD,8DAA4E;AAC5E,uCAAgE;AAOhE,MAAM,oBAAoB,GACxB,CAAgB,QAAoB,EAAE,QAAoC,EAAE,EAAE,CAC9E,CAA6E,IAAO,EAAK,EAAE;;IACzF,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,kBAAkB,GAAG,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAA;IACvD,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAA;IAChC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAA,oBAAW,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3F,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,IAAI,aAAa,CAAA;IAC3D,MAAM,UAAU,GAAG,OAAO,QAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACvD,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,qBAAqB,GAAG,MAAM,CAAC,gBAAgB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACxE,MAAM,UAAU,GAAG,IAAI,4BAAmB,CAAgB,WAAW,EAAE,YAAY,CAAC,CAAA;IAGpF,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,IAAI;QAiBvB,AAAN,KAAK,CAAC,OAhB6C,aAAa,OAEV,qBAAqB,OAcpE,OAAO,QAAQ,EAAE,EAAC,CACb,GAAQ,EACP,OAAyB,EAEpC,WAAgD,EAEhD,gBAAoC;YAEpC,MAAM,WAAW,GAAG;gBAClB,aAAa,EAAE,aAAa;gBAC5B,cAAc,EAAE,qBAAc,CAAC,IAAI;gBACnC,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,KAAK;aACZ,CAAA;YACD,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI;gBAC9B,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;gBACtD,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;oBACpF,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;YACzE,OAAO,0BAAiB,CAAC,iBAAiB,CACxC,OAAO,EACP,UAAU,EACV,GAAG,EAAE,CACH,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE;gBACpC,WAAW,EAAE,WAAW,EAAE,IAAI;gBAC9B,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,WAAW,EAAE,QAAQ,CAAC,eAAe;aACtC,CAAC,EACJ,gBAAgB,CACjB,CAAC,IAAI,CAAC;gBACL,GAAG;gBACH,MAAM,EAAE,UAAU;gBAClB,SAAS,EAAE,WAAW,EAAE,SAAS;aAClC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;IAlDmD;QAAjD,IAAA,iBAAQ,GAAE;QAAE,IAAA,eAAM,EAAC,IAAA,yBAAkB,EAAC,QAAQ,CAAC,CAAC;;0CAAwC;IAEpC;QAApD,IAAA,iBAAQ,GAAE;QAAE,IAAA,eAAM,EAAC,IAAA,yBAAkB,EAAC,WAAW,CAAC,CAAC;;0CAA+C;IAc7F;QAZL,IAAA,0BAAa,EACZ,aAAa,EACb,GAAG,EAAE,CAAC,WAAW,EACjB;YACE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,WAAW,EAAE,QAAQ,EAAE,WAAW;YAClC,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB;SAC/C,EACD,kBAAkB,EAClB,EAAE,YAAY,EAAE,CAAC,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC,EAAE,CACpD;QAEE,mBAAA,IAAA,gBAAM,GAAE,CAAA;QACR,mBAAA,IAAA,iBAAO,GAAE,CAAA;QACT,mBAAA,IAAA,8BAAiB,EAAC,QAAQ,CAAC,CAAA;QAE3B,mBAAA,IAAA,2DAAsB,GAAE,CAAA;;;;wCA4B1B;IAlDG,YAAY;QADjB,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;OACzC,YAAY,CAmDjB;IAED,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAEH,MAAM,qBAAqB,GACzB,CAAgB,QAAoB,EAAE,QAAoC,EAAE,EAAE,CAC9E,CAA6E,IAAO,EAAK,EAAE;;IACzF,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,kBAAkB,GAAG,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAA;IACvD,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAA;IAChC,MAAM,OAAO,GAAG,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAA;IAC9C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAA,oBAAW,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3F,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,IAAI,aAAa,CAAA;IAC3D,MAAM,kBAAkB,GAAG,OAAO,QAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC/D,MAAM,uBAAuB,GAAG,QAAQ,QAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACrE,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,qBAAqB,GAAG,MAAM,CAAC,gBAAgB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACxE,MAAM,WAAW,GAAG,IAAI,6BAAoB,CAAgB,WAAW,EAAE,YAAY,CAAC,CAAA;IACtF,MAAM,WAAW,GAAG,IAAI,6BAAoB,CAAgB,WAAW,EAAE,YAAY,CAAC,CAAA;IACtF,MAAM,cAAc,GAAG,GAAG,OAAO,GAAG,QAAQ,YAAY,CAAA;IAGxD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,qBAAa,EAAC,WAAW,EAAE;QAClD,GAAG,QAAQ;QACX,cAAc;QACd,uBAAuB,EAAE,IAAI;KAC9B,CAAC;KAAG,CAAA;IAJC,UAAU;QADf,IAAA,kBAAQ,GAAE;OACL,UAAU,CAIX;IAEL,mFAAmF;IACnF,MAAM,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,UAAU,CAAA;IAGzC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,IAAI;QAiBxB,AAAN,KAAK,CAAC,OAhB6C,aAAa,OAEV,qBAAqB,OAcpE,QAAQ,QAAQ,EAAE,EAAC,CACd,GAAQ,EACV,CAAa,EACV,OAAyB,EAEpC,WAAgD,EAEhD,gBAAoC;YAEpC,MAAM,WAAW,GAAG;gBAClB,aAAa,EAAE,aAAa;gBAC5B,cAAc,EAAE,qBAAc,CAAC,IAAI;gBACnC,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,IAAI;aACX,CAAA;YACD,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI;gBAC9B,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;gBACtD,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;oBACpF,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;YACzE,MAAM,aAAa,GAAG,MAAM,IAAA,8BAAoB,EAAC,UAAU,EAAE,CAAC,CAAC,CAAA;YAC/D,MAAM,cAAc,GAAG,0BAAiB,CAAC,iBAAiB,CACxD,OAAO,EACP,kBAAkB,EAClB,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,EACnF,gBAAgB,CACjB,CAAA;YAED,MAAM,mBAAmB,GAAG,0BAAiB,CAAC,iBAAiB,CAC7D,OAAO,EACP,uBAAuB,EACvB,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,EACnF,gBAAgB,CACjB,CAAA;YAED,OAAO,EAAE,CAAC,iBAAiB,CACzB,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAC9C,IAAA,8BAAU,EAAC,aAAa,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,EACpF,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CACtD,CAAA;QACH,CAAC;KACF,CAAA;IAxDmD;QAAjD,IAAA,iBAAQ,GAAE;QAAE,IAAA,eAAM,EAAC,IAAA,yBAAkB,EAAC,QAAQ,CAAC,CAAC;;2CAAwC;IAEpC;QAApD,IAAA,iBAAQ,GAAE;QAAE,IAAA,eAAM,EAAC,IAAA,yBAAkB,EAAC,WAAW,CAAC,CAAC;;2CAA+C;IAc7F;QAZL,IAAA,0BAAa,EACZ,aAAa,EACb,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW,EACpB;YACE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,WAAW,EAAE,QAAQ,EAAE,WAAW;YAClC,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB;SAC/C,EACD,kBAAkB,EAClB,EAAE,YAAY,EAAE,CAAC,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC,EAAE,CACpD;QAEE,mBAAA,IAAA,gBAAM,GAAE,CAAA;QACR,mBAAA,IAAA,cAAI,GAAE,CAAA;QACN,mBAAA,IAAA,iBAAO,GAAE,CAAA;QACT,mBAAA,IAAA,8BAAiB,EAAC,QAAQ,CAAC,CAAA;QAE3B,mBAAA,IAAA,2DAAsB,GAAE,CAAA;;yDAJd,UAAU;;yCAqCtB;IAxDG,aAAa;QADlB,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;OACzC,aAAa,CAyDlB;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAEI,MAAM,kBAAkB,GAC7B,CAAM,QAAoB,EAAE,SAAoC,EAAE,EAAE,CACpE,CAA6E,IAAO,EAAK,EAAE;IACzF,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,SAAS,CAAA;IACjD,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC,IAAI,IAAI,EAAE,CAAC,CAAA;IAClD,MAAM,YAAY,GAAG,IAAA,0BAAgB,EAAC,GAAG,IAAI,EAAE,CAAC,CAAA;IAChD,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;IACvH,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;AACxF,CAAC,CAAA;AARU,QAAA,kBAAkB,sBAQ5B;AAEI,MAAM,qBAAqB,GAAG,CACnC,QAAoB,EACpB,SAAoC,EACH,EAAE,CAAC,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,wCAAmB,CAAC,CAAA;AAHrF,QAAA,qBAAqB,yBAGgE"}

package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.js

@@ -24,18 +24,23 @@ class LimitOffsetPagerStrategy {
         if (includeExtraNode && (!this.enableFetchAllWithNegative || opts.limit !== -1)) {
             // Add 1 to the limit so we will fetch an additional node
             paging.limit += 1;
-            // if paging backwards remove one from the offset to check for a previous page.
+            // if paging backwards, remove one from the offset to check for a previous page.
             if (isBackward) {
                 paging.offset -= 1;
             }
             if (paging.offset < 0) {
-                // if the offset is < 0 it means we underflowed and that we cant have an extra page.
+                // if the offset is < 0, it means we underflow and that we can't have an extra page.
                 paging.offset = 0;
                 paging.limit = opts.limit;
             }
         }
-        if (this.enableFetchAllWithNegative && paging.limit === -1)
+        if (this.enableFetchAllWithNegative && paging.limit === -1) {
             delete paging.limit;
+            // Delete the offset if it is 0.
+            if (paging.offset === 0) {
+                delete paging.offset;
+            }
+        }
         return { ...query, paging };
     }
     checkForExtraNode(nodes, opts) {

package/src/types/connection/cursor/pager/strategies/limit-offset.pager-strategy.js.map

@@ -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":"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"}
+{"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,gFAAgF;YAChF,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,IAAI,CAAC,CAAA;YACpB,CAAC;YACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,oFAAoF;gBACpF,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;gBACjB,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;YAC3B,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,0BAA0B,IAAI,MAAM,CAAC,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3D,OAAO,MAAM,CAAC,KAAK,CAAA;YAEnB,gCAAgC;YAChC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC,MAAM,CAAA;YACtB,CAAC;QACH,CAAC;QAED,OAAO,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,CAAA;IAC7B,CAAC;IAED,iBAAiB,CAAC,KAAY,EAAE,IAAsB;QACpD,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,6EAA6E;YAC7E,OAAO,KAAK,CAAA;QACd,CAAC;QACD,MAAM,WAAW,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;QAC9B,sCAAsC;QACtC,uDAAuD;QACvD,6DAA6D;QAC7D,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAA;QAC9C,IAAI,YAAY,EAAE,CAAC;YACjB,iEAAiE;YACjE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,WAAW,CAAC,GAAG,EAAE,CAAA;YACnB,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,KAAK,EAAE,CAAA;YACrB,CAAC;QACH,CAAC;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;IAEO,QAAQ,CAAC,MAAwB;QACvC,IAAI,IAAA,0BAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,MAAM,EAAE,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YACnC,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACrF,IAAI,IAAI,CAAC,0BAA0B,IAAI,IAAI,KAAK,CAAC,CAAC;gBAAE,OAAO,gBAAgB,CAAA;YAC3E,MAAM,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAA;YACtC,oEAAoE;YACpE,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;gBACf,4CAA4C;gBAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC,CAAA;YACnC,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,IAAI,CAAC,CAAA;IAC1B,CAAC;IAEO,SAAS,CAAC,MAAwB;QACxC,IAAI,IAAA,0BAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,0BAA0B,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC;gBAAE,OAAO,CAAC,CAAA;YACnE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC/B,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACjF,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YAE7C,oEAAoE;YACpE,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAC5B,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;QACxB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7E,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC5B,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,MAAc;QAC1C,OAAO,IAAA,sBAAY,EAAC,GAAG,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC/D,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,MAAc;QAC1C,OAAO,QAAQ,CAAC,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;IAChF,CAAC;;AA3GH,4DA4GC;AAzGgB,sCAAa,GAAG,kBAAkB,CAAA"}

package/src/types/connection/offset/pager/pager.js

@@ -51,8 +51,13 @@ class OffsetPager {
     createQuery(query, pagingMeta) {
         const { limit, offset } = pagingMeta.opts;
         const paging = { limit: limit + 1, offset };
-        if (this.enableFetchAllWithNegative && limit === -1)
+        if (this.enableFetchAllWithNegative && limit === -1) {
             delete paging.limit;
+            // Delete the offset if it is 0.
+            if (offset === 0) {
+                delete paging.offset;
+            }
+        }
         return { ...query, paging };
     }
     checkForExtraNode(nodes, opts) {

package/src/types/connection/offset/pager/pager.js.map

@@ -1 +1 @@
-{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/pager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../../../../../../../packages/query-graphql/src/types/connection/offset/pager/pager.ts"],"names":[],"mappings":"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"}