joist-graphql-resolver-utils 2.3.0-next.70 → 2.3.0-next.72

package/build/cursorPagination.cjs

@@ -1,16 +1,20 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./paginationUtils.cjs");
+const require_paginationUtils = require("./paginationUtils.cjs");
 require("joist-core");
 //#region src/cursorPagination.ts
-/** Returns a cursor connection shape for a generated query resolver. */
 async function paginateCursor(ctx, type, args) {
 	const limit = args.first ?? args.last ?? 100;
 	const baseFilter = args.filter ?? {};
 	const filter = withCursorFilter(baseFilter, args);
 	const orderBy = { id: args.last ? "DESC" : "ASC" };
-	const nodes = await ctx.em.findGql(type, filter, {
+	const nodes = typeof type === "function" ? await ctx.em.findGql(type, filter, {
 		limit,
 		orderBy
+	}) : await require_paginationUtils.queryEntities(ctx, {
+		...withCursorQuery(type, args),
+		orderBy: [args.last ? { desc: type.select.id } : { asc: type.select.id }],
+		limit,
+		offset: void 0
 	});
 	const orderedNodes = args.last ? [...nodes].reverse() : nodes;
 	const edges = orderedNodes.map((node) => ({
@@ -20,7 +24,10 @@ async function paginateCursor(ctx, type, args) {
 	return {
 		edges,
 		nodes: orderedNodes,
-		pageInfo: new CursorPageInfo(ctx, type, baseFilter, edges)
+		pageInfo: new CursorPageInfo(ctx, typeof type === "function" ? type : {
+			...type,
+			orderBy: void 0
+		}, baseFilter, edges)
 	};
 }
 /** Lazily computes cursor page fields. */
@@ -51,15 +58,27 @@ var CursorPageInfo = class {
 		return this.#hasPreviousPagePromise ??= this.#countPastCursor("before", this.startCursor);
 	}
 	get totalCount() {
-		return this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter);
+		return this.#totalCountPromise ??= typeof this.#type === "function" ? this.#ctx.em.findCount(this.#type, this.#filter) : require_paginationUtils.countQuery(this.#ctx, this.#type);
 	}
 	/** Counts rows past a cursor only when the field is requested. */
 	async #countPastCursor(direction, cursor) {
 		if (!cursor) return false;
+		if (typeof this.#type !== "function") return await require_paginationUtils.countQuery(this.#ctx, withCursorQuery(this.#type, { [direction]: cursor })) > 0;
 		const filter = withCursorFilter(this.#filter, { [direction]: cursor });
 		return await this.#ctx.em.findCount(this.#type, filter) > 0;
 	}
 };
+/** Adds both cursor bounds without replacing the query's existing conditions. */
+function withCursorQuery(base, args) {
+	return {
+		...base,
+		where: { and: [
+			base.where,
+			args.after ? base.select.id.gt(decodeCursor(args.after)) : void 0,
+			args.before ? base.select.id.lt(decodeCursor(args.before)) : void 0
+		] }
+	};
+}
 /** Adds cursor bounds to a filter. */
 function withCursorFilter(filter, args) {
 	const cursor = args.after ?? args.before;

package/build/cursorPagination.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cursorPagination.cjs","names":["#ctx","#type","#filter","#edges","#hasNextPagePromise","#countPastCursor","#hasPreviousPagePromise","#totalCountPromise"],"sources":["../src/cursorPagination.ts"],"sourcesContent":["import {\n  type Entity,\n  type FindGqlFilterOptions,\n  type MaybeAbstractEntityConstructor,\n  type ValueGraphQLFilter,\n} from \"joist-core\";\n\nimport { type ContextWithEm, type PaginationFilter, defaultLimit } from \"./paginationUtils.ts\";\n\ntype CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  first?: number | null;\n  after?: string | null;\n  last?: number | null;\n  before?: string | null;\n};\n\n/** Returns a cursor connection shape for a generated query resolver. */\nexport async function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: CursorArgs<T, F>,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }> {\n  const limit = args.first ?? args.last ?? defaultLimit;\n  const baseFilter = (args.filter ?? {}) as PaginationFilter<T>;\n  const filter = withCursorFilter(baseFilter, args);\n  const orderBy = { id: args.last ? \"DESC\" : \"ASC\" } as FindGqlFilterOptions<T>[\"orderBy\"];\n  const nodes = await ctx.em.findGql(type, filter, { limit, orderBy });\n  const orderedNodes = args.last ? [...nodes].reverse() : nodes;\n  const edges = orderedNodes.map((node) => ({ node, cursor: encodeCursor(String(node.id)) }));\n  return {\n    edges,\n    nodes: orderedNodes,\n    pageInfo: new CursorPageInfo(ctx, type, baseFilter, edges),\n  };\n}\n\n/** Lazily computes cursor page fields. */\nexport class CursorPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #edges: { node: T; cursor: string }[];\n  #filter: PaginationFilter<T>;\n  #hasNextPagePromise: Promise<boolean> | undefined;\n  #hasPreviousPagePromise: Promise<boolean> | undefined;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T>;\n\n  constructor(\n    ctx: ContextWithEm,\n    type: MaybeAbstractEntityConstructor<T>,\n    filter: PaginationFilter<T>,\n    edges: { node: T; cursor: string }[],\n  ) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#edges = edges;\n  }\n\n  get startCursor(): string | undefined {\n    return this.#edges[0]?.cursor;\n  }\n\n  get endCursor(): string | undefined {\n    return this.#edges[this.#edges.length - 1]?.cursor;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return (this.#hasNextPagePromise ??= this.#countPastCursor(\"after\", this.endCursor));\n  }\n\n  get hasPreviousPage(): Promise<boolean> {\n    return (this.#hasPreviousPagePromise ??= this.#countPastCursor(\"before\", this.startCursor));\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter));\n  }\n\n  /** Counts rows past a cursor only when the field is requested. */\n  async #countPastCursor(direction: \"after\" | \"before\", cursor: string | undefined): Promise<boolean> {\n    if (!cursor) return false;\n    const filter = withCursorFilter(this.#filter, { [direction]: cursor });\n    return (await this.#ctx.em.findCount(this.#type, filter)) > 0;\n  }\n}\n\n/** Adds cursor bounds to a filter. */\nfunction withCursorFilter<T extends Entity>(\n  filter: PaginationFilter<T>,\n  args: { after?: string | null; before?: string | null },\n): PaginationFilter<T> {\n  const cursor = args.after ?? args.before;\n  if (!cursor) return filter;\n  const op = args.after ? \"gt\" : \"lt\";\n  return { ...filter, id: { [op]: decodeCursor(cursor) } as ValueGraphQLFilter<string> } as PaginationFilter<T>;\n}\n\n/** Encodes an entity id as an opaque cursor. */\nfunction encodeCursor(id: string): string {\n  return Buffer.from(id).toString(\"base64\");\n}\n\n/** Decodes an opaque cursor back into an entity id. */\nfunction decodeCursor(cursor: string): string {\n  return Buffer.from(cursor, \"base64\").toString(\"utf8\");\n}\n"],"mappings":";;;;;AAkBA,eAAsB,eACpB,KACA,MACA,MAC4F;CAC5F,MAAM,QAAQ,KAAK,SAAS,KAAK,QAAA;CACjC,MAAM,aAAc,KAAK,UAAU,CAAC;CACpC,MAAM,SAAS,iBAAiB,YAAY,IAAI;CAChD,MAAM,UAAU,EAAE,IAAI,KAAK,OAAO,SAAS,MAAM;CACjD,MAAM,QAAQ,MAAM,IAAI,GAAG,QAAQ,MAAM,QAAQ;EAAE;EAAO;CAAQ,CAAC;CACnE,MAAM,eAAe,KAAK,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,QAAQ,IAAI;CACxD,MAAM,QAAQ,aAAa,KAAK,UAAU;EAAE;EAAM,QAAQ,aAAa,OAAO,KAAK,EAAE,CAAC;CAAE,EAAE;CAC1F,OAAO;EACL;EACA,OAAO;EACP,UAAU,IAAI,eAAe,KAAK,MAAM,YAAY,KAAK;CAC3D;AACF;;AAGA,IAAa,iBAAb,MAAuD;CACrD;CACA;CACA;CACA;CACA;CACA;CACA;CAEA,YACE,KACA,MACA,QACA,OACA;EACA,KAAKA,OAAO;EACZ,KAAKC,QAAQ;EACb,KAAKC,UAAU;EACf,KAAKC,SAAS;CAChB;CAEA,IAAI,cAAkC;EACpC,OAAO,KAAKA,OAAO,EAAE,EAAE;CACzB;CAEA,IAAI,YAAgC;EAClC,OAAO,KAAKA,OAAO,KAAKA,OAAO,SAAS,EAAE,EAAE;CAC9C;CAEA,IAAI,cAAgC;EAClC,OAAQ,KAAKC,wBAAwB,KAAKC,iBAAiB,SAAS,KAAK,SAAS;CACpF;CAEA,IAAI,kBAAoC;EACtC,OAAQ,KAAKC,4BAA4B,KAAKD,iBAAiB,UAAU,KAAK,WAAW;CAC3F;CAEA,IAAI,aAA8B;EAChC,OAAQ,KAAKE,uBAAuB,KAAKP,KAAK,GAAG,UAAU,KAAKC,OAAO,KAAKC,OAAO;CACrF;;CAGA,MAAMG,iBAAiB,WAA+B,QAA8C;EAClG,IAAI,CAAC,QAAQ,OAAO;EACpB,MAAM,SAAS,iBAAiB,KAAKH,SAAS,GAAG,YAAY,OAAO,CAAC;EACrE,OAAQ,MAAM,KAAKF,KAAK,GAAG,UAAU,KAAKC,OAAO,MAAM,IAAK;CAC9D;AACF;;AAGA,SAAS,iBACP,QACA,MACqB;CACrB,MAAM,SAAS,KAAK,SAAS,KAAK;CAClC,IAAI,CAAC,QAAQ,OAAO;CACpB,MAAM,KAAK,KAAK,QAAQ,OAAO;CAC/B,OAAO;EAAE,GAAG;EAAQ,IAAI,GAAG,KAAK,aAAa,MAAM,EAAE;CAAgC;AACvF;;AAGA,SAAS,aAAa,IAAoB;CACxC,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,SAAS,QAAQ;AAC1C;;AAGA,SAAS,aAAa,QAAwB;CAC5C,OAAO,OAAO,KAAK,QAAQ,QAAQ,CAAC,CAAC,SAAS,MAAM;AACtD"}
+{"version":3,"file":"cursorPagination.cjs","names":["queryEntities","#ctx","#type","#filter","#edges","#hasNextPagePromise","#countPastCursor","#hasPreviousPagePromise","#totalCountPromise","countQuery"],"sources":["../src/cursorPagination.ts"],"sourcesContent":["import {\n  type Entity,\n  type FindGqlFilterOptions,\n  type IdOf,\n  type MaybeAbstractEntityConstructor,\n  type ValueGraphQLFilter,\n} from \"joist-core\";\n\nimport {\n  type ContextWithEm,\n  type PaginationFilter,\n  type PaginationQuery,\n  countQuery,\n  defaultLimit,\n  queryEntities,\n} from \"./paginationUtils.ts\";\n\ntype CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  first?: number | null;\n  after?: string | null;\n  last?: number | null;\n  before?: string | null;\n};\n\n/** Returns an ID-ordered cursor connection for a resolver, replacing the entity query's ordering. */\nexport function paginateCursor<T extends Entity>(\n  ctx: ContextWithEm,\n  query: PaginationQuery<T>,\n  args: Omit<CursorArgs<T>, \"filter\">,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }>;\nexport function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: CursorArgs<T, F>,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }>;\nexport async function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n  args: CursorArgs<T, F>,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }> {\n  const limit = args.first ?? args.last ?? defaultLimit;\n  const baseFilter = (args.filter ?? {}) as PaginationFilter<T>;\n  const filter = withCursorFilter(baseFilter, args);\n  const orderBy = { id: args.last ? \"DESC\" : \"ASC\" } as FindGqlFilterOptions<T>[\"orderBy\"];\n  const nodes =\n    typeof type === \"function\"\n      ? await ctx.em.findGql(type, filter, { limit, orderBy })\n      : await queryEntities(ctx, {\n          ...withCursorQuery(type, args),\n          orderBy: [args.last ? { desc: type.select.id } : { asc: type.select.id }],\n          limit,\n          offset: undefined,\n        });\n  const orderedNodes = args.last ? [...nodes].reverse() : nodes;\n  const edges = orderedNodes.map((node) => ({ node, cursor: encodeCursor(String(node.id)) }));\n  return {\n    edges,\n    nodes: orderedNodes,\n    pageInfo: new CursorPageInfo(\n      ctx,\n      typeof type === \"function\" ? type : { ...type, orderBy: undefined },\n      baseFilter,\n      edges,\n    ),\n  };\n}\n\n/** Lazily computes cursor page fields. */\nexport class CursorPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #edges: { node: T; cursor: string }[];\n  #filter: PaginationFilter<T>;\n  #hasNextPagePromise: Promise<boolean> | undefined;\n  #hasPreviousPagePromise: Promise<boolean> | undefined;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>;\n\n  constructor(\n    ctx: ContextWithEm,\n    type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n    filter: PaginationFilter<T>,\n    edges: { node: T; cursor: string }[],\n  ) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#edges = edges;\n  }\n\n  get startCursor(): string | undefined {\n    return this.#edges[0]?.cursor;\n  }\n\n  get endCursor(): string | undefined {\n    return this.#edges[this.#edges.length - 1]?.cursor;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return (this.#hasNextPagePromise ??= this.#countPastCursor(\"after\", this.endCursor));\n  }\n\n  get hasPreviousPage(): Promise<boolean> {\n    return (this.#hasPreviousPagePromise ??= this.#countPastCursor(\"before\", this.startCursor));\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??=\n      typeof this.#type === \"function\"\n        ? this.#ctx.em.findCount(this.#type, this.#filter)\n        : countQuery(this.#ctx, this.#type));\n  }\n\n  /** Counts rows past a cursor only when the field is requested. */\n  async #countPastCursor(direction: \"after\" | \"before\", cursor: string | undefined): Promise<boolean> {\n    if (!cursor) return false;\n    if (typeof this.#type !== \"function\") {\n      return (await countQuery(this.#ctx, withCursorQuery(this.#type, { [direction]: cursor }))) > 0;\n    }\n    const filter = withCursorFilter(this.#filter, { [direction]: cursor });\n    return (await this.#ctx.em.findCount(this.#type, filter)) > 0;\n  }\n}\n\n/** Adds both cursor bounds without replacing the query's existing conditions. */\nfunction withCursorQuery<T extends Entity>(\n  base: PaginationQuery<T>,\n  args: { after?: string | null; before?: string | null },\n): PaginationQuery<T> {\n  return {\n    ...base,\n    where: {\n      and: [\n        base.where,\n        args.after ? base.select.id.gt(decodeCursor(args.after) as IdOf<T>) : undefined,\n        args.before ? base.select.id.lt(decodeCursor(args.before) as IdOf<T>) : undefined,\n      ],\n    },\n  };\n}\n\n/** Adds cursor bounds to a filter. */\nfunction withCursorFilter<T extends Entity>(\n  filter: PaginationFilter<T>,\n  args: { after?: string | null; before?: string | null },\n): PaginationFilter<T> {\n  const cursor = args.after ?? args.before;\n  if (!cursor) return filter;\n  const op = args.after ? \"gt\" : \"lt\";\n  return { ...filter, id: { [op]: decodeCursor(cursor) } as ValueGraphQLFilter<string> } as PaginationFilter<T>;\n}\n\n/** Encodes an entity id as an opaque cursor. */\nfunction encodeCursor(id: string): string {\n  return Buffer.from(id).toString(\"base64\");\n}\n\n/** Decodes an opaque cursor back into an entity id. */\nfunction decodeCursor(cursor: string): string {\n  return Buffer.from(cursor, \"base64\").toString(\"utf8\");\n}\n"],"mappings":"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"}

package/build/cursorPagination.d.cts

@@ -1,4 +1,4 @@
-import { ContextWithEm, PaginationFilter } from "./paginationUtils.cjs";
+import { ContextWithEm, PaginationFilter, PaginationQuery } from "./paginationUtils.cjs";
 import { Entity, MaybeAbstractEntityConstructor } from "joist-core";
 //#region src/cursorPagination.d.ts
 type CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {
@@ -8,7 +8,15 @@ type CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {
   last?: number | null;
   before?: string | null;
 };
-/** Returns a cursor connection shape for a generated query resolver. */
+/** Returns an ID-ordered cursor connection for a resolver, replacing the entity query's ordering. */
+declare function paginateCursor<T extends Entity>(ctx: ContextWithEm, query: PaginationQuery<T>, args: Omit<CursorArgs<T>, "filter">): Promise<{
+  edges: {
+    node: T;
+    cursor: string;
+  }[];
+  nodes: T[];
+  pageInfo: CursorPageInfo<T>;
+}>;
 declare function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, args: CursorArgs<T, F>): Promise<{
   edges: {
     node: T;
@@ -20,7 +28,7 @@ declare function paginateCursor<T extends Entity, F extends object = PaginationF
 /** Lazily computes cursor page fields. */
 declare class CursorPageInfo<T extends Entity = Entity> {
   #private;
-  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, filter: PaginationFilter<T>, edges: {
+  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>, filter: PaginationFilter<T>, edges: {
     node: T;
     cursor: string;
   }[]);

package/build/cursorPagination.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"cursorPagination.d.cts","names":[],"sources":["../src/cursorPagination.ts"],"mappings":";;;KASK,WAAW,UAAU,QAAQ,mBAAmB,iBAAiB;EACpE,SAAS;EACT;EACA;EACA;EACA;;;iBAIoB,eAAe,UAAU,QAAQ,mBAAmB,iBAAiB,IACzF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,WAAW,GAAG,KACnB;EAAU;IAAS,MAAM;IAAG;;EAAoB,OAAO;EAAK,UAAU,eAAe;;;cAgB3E,eAAe,UAAU,SAAS;;EAS7C,YACE,KAAK,eACL,MAAM,+BAA+B,IACrC,QAAQ,iBAAiB,IACzB;IAAS,MAAM;IAAG;;MAQhB;MAIA;MAIA,eAAe;MAIf,mBAAmB;MAInB,cAAc"}
+{"version":3,"file":"cursorPagination.d.cts","names":[],"sources":["../src/cursorPagination.ts"],"mappings":";;;KAiBK,WAAW,UAAU,QAAQ,mBAAmB,iBAAiB;EACpE,SAAS;EACT;EACA;EACA;EACA;;;iBAIc,eAAe,UAAU,QACvC,KAAK,eACL,OAAO,gBAAgB,IACvB,MAAM,KAAK,WAAW,gBACrB;EAAU;IAAS,MAAM;IAAG;;EAAoB,OAAO;EAAK,UAAU,eAAe;;iBACxE,eAAe,UAAU,QAAQ,mBAAmB,iBAAiB,IACnF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,WAAW,GAAG,KACnB;EAAU;IAAS,MAAM;IAAG;;EAAoB,OAAO;EAAK,UAAU,eAAe;;;cAkC3E,eAAe,UAAU,SAAS;;EAS7C,YACE,KAAK,eACL,MAAM,+BAA+B,KAAK,gBAAgB,IAC1D,QAAQ,iBAAiB,IACzB;IAAS,MAAM;IAAG;;MAQhB;MAIA;MAIA,eAAe;MAIf,mBAAmB;MAInB,cAAc"}

package/build/cursorPagination.d.mts

@@ -1,4 +1,4 @@
-import { ContextWithEm, PaginationFilter } from "./paginationUtils.mjs";
+import { ContextWithEm, PaginationFilter, PaginationQuery } from "./paginationUtils.mjs";
 import { Entity, MaybeAbstractEntityConstructor } from "joist-core";
 //#region src/cursorPagination.d.ts
 type CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {
@@ -8,7 +8,15 @@ type CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {
   last?: number | null;
   before?: string | null;
 };
-/** Returns a cursor connection shape for a generated query resolver. */
+/** Returns an ID-ordered cursor connection for a resolver, replacing the entity query's ordering. */
+declare function paginateCursor<T extends Entity>(ctx: ContextWithEm, query: PaginationQuery<T>, args: Omit<CursorArgs<T>, "filter">): Promise<{
+  edges: {
+    node: T;
+    cursor: string;
+  }[];
+  nodes: T[];
+  pageInfo: CursorPageInfo<T>;
+}>;
 declare function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, args: CursorArgs<T, F>): Promise<{
   edges: {
     node: T;
@@ -20,7 +28,7 @@ declare function paginateCursor<T extends Entity, F extends object = PaginationF
 /** Lazily computes cursor page fields. */
 declare class CursorPageInfo<T extends Entity = Entity> {
   #private;
-  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, filter: PaginationFilter<T>, edges: {
+  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>, filter: PaginationFilter<T>, edges: {
     node: T;
     cursor: string;
   }[]);

package/build/cursorPagination.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"cursorPagination.d.mts","names":[],"sources":["../src/cursorPagination.ts"],"mappings":";;;KASK,WAAW,UAAU,QAAQ,mBAAmB,iBAAiB;EACpE,SAAS;EACT;EACA;EACA;EACA;;;iBAIoB,eAAe,UAAU,QAAQ,mBAAmB,iBAAiB,IACzF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,WAAW,GAAG,KACnB;EAAU;IAAS,MAAM;IAAG;;EAAoB,OAAO;EAAK,UAAU,eAAe;;;cAgB3E,eAAe,UAAU,SAAS;;EAS7C,YACE,KAAK,eACL,MAAM,+BAA+B,IACrC,QAAQ,iBAAiB,IACzB;IAAS,MAAM;IAAG;;MAQhB;MAIA;MAIA,eAAe;MAIf,mBAAmB;MAInB,cAAc"}
+{"version":3,"file":"cursorPagination.d.mts","names":[],"sources":["../src/cursorPagination.ts"],"mappings":";;;KAiBK,WAAW,UAAU,QAAQ,mBAAmB,iBAAiB;EACpE,SAAS;EACT;EACA;EACA;EACA;;;iBAIc,eAAe,UAAU,QACvC,KAAK,eACL,OAAO,gBAAgB,IACvB,MAAM,KAAK,WAAW,gBACrB;EAAU;IAAS,MAAM;IAAG;;EAAoB,OAAO;EAAK,UAAU,eAAe;;iBACxE,eAAe,UAAU,QAAQ,mBAAmB,iBAAiB,IACnF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,WAAW,GAAG,KACnB;EAAU;IAAS,MAAM;IAAG;;EAAoB,OAAO;EAAK,UAAU,eAAe;;;cAkC3E,eAAe,UAAU,SAAS;;EAS7C,YACE,KAAK,eACL,MAAM,+BAA+B,KAAK,gBAAgB,IAC1D,QAAQ,iBAAiB,IACzB;IAAS,MAAM;IAAG;;MAQhB;MAIA;MAIA,eAAe;MAIf,mBAAmB;MAInB,cAAc"}

package/build/cursorPagination.js

@@ -1,15 +1,19 @@
-import "./paginationUtils.js";
+import { countQuery, queryEntities } from "./paginationUtils.js";
 import "joist-core";
 //#region src/cursorPagination.ts
-/** Returns a cursor connection shape for a generated query resolver. */
 async function paginateCursor(ctx, type, args) {
 	const limit = args.first ?? args.last ?? 100;
 	const baseFilter = args.filter ?? {};
 	const filter = withCursorFilter(baseFilter, args);
 	const orderBy = { id: args.last ? "DESC" : "ASC" };
-	const nodes = await ctx.em.findGql(type, filter, {
+	const nodes = typeof type === "function" ? await ctx.em.findGql(type, filter, {
 		limit,
 		orderBy
+	}) : await queryEntities(ctx, {
+		...withCursorQuery(type, args),
+		orderBy: [args.last ? { desc: type.select.id } : { asc: type.select.id }],
+		limit,
+		offset: void 0
 	});
 	const orderedNodes = args.last ? [...nodes].reverse() : nodes;
 	const edges = orderedNodes.map((node) => ({
@@ -19,7 +23,10 @@ async function paginateCursor(ctx, type, args) {
 	return {
 		edges,
 		nodes: orderedNodes,
-		pageInfo: new CursorPageInfo(ctx, type, baseFilter, edges)
+		pageInfo: new CursorPageInfo(ctx, typeof type === "function" ? type : {
+			...type,
+			orderBy: void 0
+		}, baseFilter, edges)
 	};
 }
 /** Lazily computes cursor page fields. */
@@ -50,15 +57,27 @@ var CursorPageInfo = class {
 		return this.#hasPreviousPagePromise ??= this.#countPastCursor("before", this.startCursor);
 	}
 	get totalCount() {
-		return this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter);
+		return this.#totalCountPromise ??= typeof this.#type === "function" ? this.#ctx.em.findCount(this.#type, this.#filter) : countQuery(this.#ctx, this.#type);
 	}
 	/** Counts rows past a cursor only when the field is requested. */
 	async #countPastCursor(direction, cursor) {
 		if (!cursor) return false;
+		if (typeof this.#type !== "function") return await countQuery(this.#ctx, withCursorQuery(this.#type, { [direction]: cursor })) > 0;
 		const filter = withCursorFilter(this.#filter, { [direction]: cursor });
 		return await this.#ctx.em.findCount(this.#type, filter) > 0;
 	}
 };
+/** Adds both cursor bounds without replacing the query's existing conditions. */
+function withCursorQuery(base, args) {
+	return {
+		...base,
+		where: { and: [
+			base.where,
+			args.after ? base.select.id.gt(decodeCursor(args.after)) : void 0,
+			args.before ? base.select.id.lt(decodeCursor(args.before)) : void 0
+		] }
+	};
+}
 /** Adds cursor bounds to a filter. */
 function withCursorFilter(filter, args) {
 	const cursor = args.after ?? args.before;

package/build/cursorPagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"cursorPagination.js","names":["#ctx","#type","#filter","#edges","#hasNextPagePromise","#countPastCursor","#hasPreviousPagePromise","#totalCountPromise"],"sources":["../src/cursorPagination.ts"],"sourcesContent":["import {\n  type Entity,\n  type FindGqlFilterOptions,\n  type MaybeAbstractEntityConstructor,\n  type ValueGraphQLFilter,\n} from \"joist-core\";\n\nimport { type ContextWithEm, type PaginationFilter, defaultLimit } from \"./paginationUtils.ts\";\n\ntype CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  first?: number | null;\n  after?: string | null;\n  last?: number | null;\n  before?: string | null;\n};\n\n/** Returns a cursor connection shape for a generated query resolver. */\nexport async function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: CursorArgs<T, F>,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }> {\n  const limit = args.first ?? args.last ?? defaultLimit;\n  const baseFilter = (args.filter ?? {}) as PaginationFilter<T>;\n  const filter = withCursorFilter(baseFilter, args);\n  const orderBy = { id: args.last ? \"DESC\" : \"ASC\" } as FindGqlFilterOptions<T>[\"orderBy\"];\n  const nodes = await ctx.em.findGql(type, filter, { limit, orderBy });\n  const orderedNodes = args.last ? [...nodes].reverse() : nodes;\n  const edges = orderedNodes.map((node) => ({ node, cursor: encodeCursor(String(node.id)) }));\n  return {\n    edges,\n    nodes: orderedNodes,\n    pageInfo: new CursorPageInfo(ctx, type, baseFilter, edges),\n  };\n}\n\n/** Lazily computes cursor page fields. */\nexport class CursorPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #edges: { node: T; cursor: string }[];\n  #filter: PaginationFilter<T>;\n  #hasNextPagePromise: Promise<boolean> | undefined;\n  #hasPreviousPagePromise: Promise<boolean> | undefined;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T>;\n\n  constructor(\n    ctx: ContextWithEm,\n    type: MaybeAbstractEntityConstructor<T>,\n    filter: PaginationFilter<T>,\n    edges: { node: T; cursor: string }[],\n  ) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#edges = edges;\n  }\n\n  get startCursor(): string | undefined {\n    return this.#edges[0]?.cursor;\n  }\n\n  get endCursor(): string | undefined {\n    return this.#edges[this.#edges.length - 1]?.cursor;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return (this.#hasNextPagePromise ??= this.#countPastCursor(\"after\", this.endCursor));\n  }\n\n  get hasPreviousPage(): Promise<boolean> {\n    return (this.#hasPreviousPagePromise ??= this.#countPastCursor(\"before\", this.startCursor));\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter));\n  }\n\n  /** Counts rows past a cursor only when the field is requested. */\n  async #countPastCursor(direction: \"after\" | \"before\", cursor: string | undefined): Promise<boolean> {\n    if (!cursor) return false;\n    const filter = withCursorFilter(this.#filter, { [direction]: cursor });\n    return (await this.#ctx.em.findCount(this.#type, filter)) > 0;\n  }\n}\n\n/** Adds cursor bounds to a filter. */\nfunction withCursorFilter<T extends Entity>(\n  filter: PaginationFilter<T>,\n  args: { after?: string | null; before?: string | null },\n): PaginationFilter<T> {\n  const cursor = args.after ?? args.before;\n  if (!cursor) return filter;\n  const op = args.after ? \"gt\" : \"lt\";\n  return { ...filter, id: { [op]: decodeCursor(cursor) } as ValueGraphQLFilter<string> } as PaginationFilter<T>;\n}\n\n/** Encodes an entity id as an opaque cursor. */\nfunction encodeCursor(id: string): string {\n  return Buffer.from(id).toString(\"base64\");\n}\n\n/** Decodes an opaque cursor back into an entity id. */\nfunction decodeCursor(cursor: string): string {\n  return Buffer.from(cursor, \"base64\").toString(\"utf8\");\n}\n"],"mappings":";;;;AAkBA,eAAsB,eACpB,KACA,MACA,MAC4F;CAC5F,MAAM,QAAQ,KAAK,SAAS,KAAK,QAAA;CACjC,MAAM,aAAc,KAAK,UAAU,CAAC;CACpC,MAAM,SAAS,iBAAiB,YAAY,IAAI;CAChD,MAAM,UAAU,EAAE,IAAI,KAAK,OAAO,SAAS,MAAM;CACjD,MAAM,QAAQ,MAAM,IAAI,GAAG,QAAQ,MAAM,QAAQ;EAAE;EAAO;CAAQ,CAAC;CACnE,MAAM,eAAe,KAAK,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,QAAQ,IAAI;CACxD,MAAM,QAAQ,aAAa,KAAK,UAAU;EAAE;EAAM,QAAQ,aAAa,OAAO,KAAK,EAAE,CAAC;CAAE,EAAE;CAC1F,OAAO;EACL;EACA,OAAO;EACP,UAAU,IAAI,eAAe,KAAK,MAAM,YAAY,KAAK;CAC3D;AACF;;AAGA,IAAa,iBAAb,MAAuD;CACrD;CACA;CACA;CACA;CACA;CACA;CACA;CAEA,YACE,KACA,MACA,QACA,OACA;EACA,KAAKA,OAAO;EACZ,KAAKC,QAAQ;EACb,KAAKC,UAAU;EACf,KAAKC,SAAS;CAChB;CAEA,IAAI,cAAkC;EACpC,OAAO,KAAKA,OAAO,EAAE,EAAE;CACzB;CAEA,IAAI,YAAgC;EAClC,OAAO,KAAKA,OAAO,KAAKA,OAAO,SAAS,EAAE,EAAE;CAC9C;CAEA,IAAI,cAAgC;EAClC,OAAQ,KAAKC,wBAAwB,KAAKC,iBAAiB,SAAS,KAAK,SAAS;CACpF;CAEA,IAAI,kBAAoC;EACtC,OAAQ,KAAKC,4BAA4B,KAAKD,iBAAiB,UAAU,KAAK,WAAW;CAC3F;CAEA,IAAI,aAA8B;EAChC,OAAQ,KAAKE,uBAAuB,KAAKP,KAAK,GAAG,UAAU,KAAKC,OAAO,KAAKC,OAAO;CACrF;;CAGA,MAAMG,iBAAiB,WAA+B,QAA8C;EAClG,IAAI,CAAC,QAAQ,OAAO;EACpB,MAAM,SAAS,iBAAiB,KAAKH,SAAS,GAAG,YAAY,OAAO,CAAC;EACrE,OAAQ,MAAM,KAAKF,KAAK,GAAG,UAAU,KAAKC,OAAO,MAAM,IAAK;CAC9D;AACF;;AAGA,SAAS,iBACP,QACA,MACqB;CACrB,MAAM,SAAS,KAAK,SAAS,KAAK;CAClC,IAAI,CAAC,QAAQ,OAAO;CACpB,MAAM,KAAK,KAAK,QAAQ,OAAO;CAC/B,OAAO;EAAE,GAAG;EAAQ,IAAI,GAAG,KAAK,aAAa,MAAM,EAAE;CAAgC;AACvF;;AAGA,SAAS,aAAa,IAAoB;CACxC,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,SAAS,QAAQ;AAC1C;;AAGA,SAAS,aAAa,QAAwB;CAC5C,OAAO,OAAO,KAAK,QAAQ,QAAQ,CAAC,CAAC,SAAS,MAAM;AACtD"}
+{"version":3,"file":"cursorPagination.js","names":["#ctx","#type","#filter","#edges","#hasNextPagePromise","#countPastCursor","#hasPreviousPagePromise","#totalCountPromise"],"sources":["../src/cursorPagination.ts"],"sourcesContent":["import {\n  type Entity,\n  type FindGqlFilterOptions,\n  type IdOf,\n  type MaybeAbstractEntityConstructor,\n  type ValueGraphQLFilter,\n} from \"joist-core\";\n\nimport {\n  type ContextWithEm,\n  type PaginationFilter,\n  type PaginationQuery,\n  countQuery,\n  defaultLimit,\n  queryEntities,\n} from \"./paginationUtils.ts\";\n\ntype CursorArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  first?: number | null;\n  after?: string | null;\n  last?: number | null;\n  before?: string | null;\n};\n\n/** Returns an ID-ordered cursor connection for a resolver, replacing the entity query's ordering. */\nexport function paginateCursor<T extends Entity>(\n  ctx: ContextWithEm,\n  query: PaginationQuery<T>,\n  args: Omit<CursorArgs<T>, \"filter\">,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }>;\nexport function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: CursorArgs<T, F>,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }>;\nexport async function paginateCursor<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n  args: CursorArgs<T, F>,\n): Promise<{ edges: { node: T; cursor: string }[]; nodes: T[]; pageInfo: CursorPageInfo<T> }> {\n  const limit = args.first ?? args.last ?? defaultLimit;\n  const baseFilter = (args.filter ?? {}) as PaginationFilter<T>;\n  const filter = withCursorFilter(baseFilter, args);\n  const orderBy = { id: args.last ? \"DESC\" : \"ASC\" } as FindGqlFilterOptions<T>[\"orderBy\"];\n  const nodes =\n    typeof type === \"function\"\n      ? await ctx.em.findGql(type, filter, { limit, orderBy })\n      : await queryEntities(ctx, {\n          ...withCursorQuery(type, args),\n          orderBy: [args.last ? { desc: type.select.id } : { asc: type.select.id }],\n          limit,\n          offset: undefined,\n        });\n  const orderedNodes = args.last ? [...nodes].reverse() : nodes;\n  const edges = orderedNodes.map((node) => ({ node, cursor: encodeCursor(String(node.id)) }));\n  return {\n    edges,\n    nodes: orderedNodes,\n    pageInfo: new CursorPageInfo(\n      ctx,\n      typeof type === \"function\" ? type : { ...type, orderBy: undefined },\n      baseFilter,\n      edges,\n    ),\n  };\n}\n\n/** Lazily computes cursor page fields. */\nexport class CursorPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #edges: { node: T; cursor: string }[];\n  #filter: PaginationFilter<T>;\n  #hasNextPagePromise: Promise<boolean> | undefined;\n  #hasPreviousPagePromise: Promise<boolean> | undefined;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>;\n\n  constructor(\n    ctx: ContextWithEm,\n    type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n    filter: PaginationFilter<T>,\n    edges: { node: T; cursor: string }[],\n  ) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#edges = edges;\n  }\n\n  get startCursor(): string | undefined {\n    return this.#edges[0]?.cursor;\n  }\n\n  get endCursor(): string | undefined {\n    return this.#edges[this.#edges.length - 1]?.cursor;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return (this.#hasNextPagePromise ??= this.#countPastCursor(\"after\", this.endCursor));\n  }\n\n  get hasPreviousPage(): Promise<boolean> {\n    return (this.#hasPreviousPagePromise ??= this.#countPastCursor(\"before\", this.startCursor));\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??=\n      typeof this.#type === \"function\"\n        ? this.#ctx.em.findCount(this.#type, this.#filter)\n        : countQuery(this.#ctx, this.#type));\n  }\n\n  /** Counts rows past a cursor only when the field is requested. */\n  async #countPastCursor(direction: \"after\" | \"before\", cursor: string | undefined): Promise<boolean> {\n    if (!cursor) return false;\n    if (typeof this.#type !== \"function\") {\n      return (await countQuery(this.#ctx, withCursorQuery(this.#type, { [direction]: cursor }))) > 0;\n    }\n    const filter = withCursorFilter(this.#filter, { [direction]: cursor });\n    return (await this.#ctx.em.findCount(this.#type, filter)) > 0;\n  }\n}\n\n/** Adds both cursor bounds without replacing the query's existing conditions. */\nfunction withCursorQuery<T extends Entity>(\n  base: PaginationQuery<T>,\n  args: { after?: string | null; before?: string | null },\n): PaginationQuery<T> {\n  return {\n    ...base,\n    where: {\n      and: [\n        base.where,\n        args.after ? base.select.id.gt(decodeCursor(args.after) as IdOf<T>) : undefined,\n        args.before ? base.select.id.lt(decodeCursor(args.before) as IdOf<T>) : undefined,\n      ],\n    },\n  };\n}\n\n/** Adds cursor bounds to a filter. */\nfunction withCursorFilter<T extends Entity>(\n  filter: PaginationFilter<T>,\n  args: { after?: string | null; before?: string | null },\n): PaginationFilter<T> {\n  const cursor = args.after ?? args.before;\n  if (!cursor) return filter;\n  const op = args.after ? \"gt\" : \"lt\";\n  return { ...filter, id: { [op]: decodeCursor(cursor) } as ValueGraphQLFilter<string> } as PaginationFilter<T>;\n}\n\n/** Encodes an entity id as an opaque cursor. */\nfunction encodeCursor(id: string): string {\n  return Buffer.from(id).toString(\"base64\");\n}\n\n/** Decodes an opaque cursor back into an entity id. */\nfunction decodeCursor(cursor: string): string {\n  return Buffer.from(cursor, \"base64\").toString(\"utf8\");\n}\n"],"mappings":"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"}

package/build/limitPagination.cjs

@@ -1,14 +1,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./paginationUtils.cjs");
+const require_paginationUtils = require("./paginationUtils.cjs");
 require("joist-core");
 //#region src/limitPagination.ts
-/** Returns a limit/offset page shape for a generated query resolver. */
 async function paginateLimit(ctx, type, args) {
 	const limit = args.limit ?? 100;
 	const offset = args.offset ?? 0;
 	const filter = args.filter ?? {};
 	return {
-		entities: await ctx.em.findGql(type, filter, {
+		entities: typeof type === "function" ? await ctx.em.findGql(type, filter, {
+			limit,
+			offset
+		}) : await require_paginationUtils.queryEntities(ctx, {
+			...type,
 			limit,
 			offset
 		}),
@@ -38,7 +41,7 @@ var LimitPageInfo = class {
 		return this.#page.offset > 0;
 	}
 	get totalCount() {
-		return this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter);
+		return this.#totalCountPromise ??= typeof this.#type === "function" ? this.#ctx.em.findCount(this.#type, this.#filter) : require_paginationUtils.countQuery(this.#ctx, this.#type);
 	}
 	get nextPage() {
 		return this.#nextPage();

package/build/limitPagination.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"limitPagination.cjs","names":["#ctx","#type","#filter","#page","#hasNextPage","#totalCountPromise","#nextPage"],"sources":["../src/limitPagination.ts"],"sourcesContent":["import { type Entity, type MaybeAbstractEntityConstructor } from \"joist-core\";\n\nimport { type ContextWithEm, type PaginationFilter, defaultLimit } from \"./paginationUtils.ts\";\n\ntype LimitArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  limit?: number | null;\n  offset?: number | null;\n};\ntype Page = { offset: number; limit: number };\n\n/** Returns a limit/offset page shape for a generated query resolver. */\nexport async function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: LimitArgs<T, F>,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }> {\n  const limit = args.limit ?? defaultLimit;\n  const offset = args.offset ?? 0;\n  const filter = (args.filter ?? {}) as PaginationFilter<T>;\n  const entities = await ctx.em.findGql(type, filter, { limit, offset });\n  return { entities, pageInfo: new LimitPageInfo(ctx, type, filter, { limit, offset }) };\n}\n\n/** Lazily computes limit/offset page fields. */\nexport class LimitPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #filter: PaginationFilter<T>;\n  #page: Page;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T>;\n\n  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, filter: PaginationFilter<T>, page: Page) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#page = page;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return this.#hasNextPage();\n  }\n\n  get hasPreviousPage(): boolean {\n    return this.#page.offset > 0;\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter));\n  }\n\n  get nextPage(): Promise<number | undefined> {\n    return this.#nextPage();\n  }\n\n  get currentPage(): number {\n    return Math.floor(this.#page.offset / this.#page.limit) + 1;\n  }\n\n  /** Returns whether another page exists after this page. */\n  async #hasNextPage(): Promise<boolean> {\n    const total = await this.totalCount;\n    const { offset, limit } = this.#page;\n    return offset + limit < total;\n  }\n\n  /** Returns the next limit/offset page if there is one. */\n  async #nextPage(): Promise<number | undefined> {\n    if (!(await this.hasNextPage)) return undefined;\n    return this.currentPage + 1;\n  }\n}\n"],"mappings":";;;;;AAYA,eAAsB,cACpB,KACA,MACA,MACwD;CACxD,MAAM,QAAQ,KAAK,SAAA;CACnB,MAAM,SAAS,KAAK,UAAU;CAC9B,MAAM,SAAU,KAAK,UAAU,CAAC;CAEhC,OAAO;EAAE,UAAA,MADc,IAAI,GAAG,QAAQ,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC;EAClD,UAAU,IAAI,cAAc,KAAK,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC;CAAE;AACvF;;AAGA,IAAa,gBAAb,MAAsD;CACpD;CACA;CACA;CACA;CACA;CAEA,YAAY,KAAoB,MAAyC,QAA6B,MAAY;EAChH,KAAKA,OAAO;EACZ,KAAKC,QAAQ;EACb,KAAKC,UAAU;EACf,KAAKC,QAAQ;CACf;CAEA,IAAI,cAAgC;EAClC,OAAO,KAAKC,aAAa;CAC3B;CAEA,IAAI,kBAA2B;EAC7B,OAAO,KAAKD,MAAM,SAAS;CAC7B;CAEA,IAAI,aAA8B;EAChC,OAAQ,KAAKE,uBAAuB,KAAKL,KAAK,GAAG,UAAU,KAAKC,OAAO,KAAKC,OAAO;CACrF;CAEA,IAAI,WAAwC;EAC1C,OAAO,KAAKI,UAAU;CACxB;CAEA,IAAI,cAAsB;EACxB,OAAO,KAAK,MAAM,KAAKH,MAAM,SAAS,KAAKA,MAAM,KAAK,IAAI;CAC5D;;CAGA,MAAMC,eAAiC;EACrC,MAAM,QAAQ,MAAM,KAAK;EACzB,MAAM,EAAE,QAAQ,UAAU,KAAKD;EAC/B,OAAO,SAAS,QAAQ;CAC1B;;CAGA,MAAMG,YAAyC;EAC7C,IAAI,CAAE,MAAM,KAAK,aAAc,OAAO,KAAA;EACtC,OAAO,KAAK,cAAc;CAC5B;AACF"}
+{"version":3,"file":"limitPagination.cjs","names":["queryEntities","#ctx","#type","#filter","#page","#hasNextPage","#totalCountPromise","countQuery","#nextPage"],"sources":["../src/limitPagination.ts"],"sourcesContent":["import { type Entity, type MaybeAbstractEntityConstructor } from \"joist-core\";\n\nimport {\n  type ContextWithEm,\n  type PaginationFilter,\n  type PaginationQuery,\n  countQuery,\n  defaultLimit,\n  queryEntities,\n} from \"./paginationUtils.ts\";\n\ntype LimitArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  limit?: number | null;\n  offset?: number | null;\n};\ntype Page = { offset: number; limit: number };\n\n/** Returns a limit/offset page shape for a resolver, preserving the entity query's ordering. */\nexport function paginateLimit<T extends Entity>(\n  ctx: ContextWithEm,\n  query: PaginationQuery<T>,\n  args: Omit<LimitArgs<T>, \"filter\">,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }>;\nexport function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: LimitArgs<T, F>,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }>;\nexport async function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n  args: LimitArgs<T, F>,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }> {\n  const limit = args.limit ?? defaultLimit;\n  const offset = args.offset ?? 0;\n  const filter = (args.filter ?? {}) as PaginationFilter<T>;\n  const entities =\n    typeof type === \"function\"\n      ? await ctx.em.findGql(type, filter, { limit, offset })\n      : await queryEntities<T>(ctx, { ...type, limit, offset });\n  return { entities, pageInfo: new LimitPageInfo(ctx, type, filter, { limit, offset }) };\n}\n\n/** Lazily computes limit/offset page fields. */\nexport class LimitPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #filter: PaginationFilter<T>;\n  #page: Page;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>;\n\n  constructor(\n    ctx: ContextWithEm,\n    type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n    filter: PaginationFilter<T>,\n    page: Page,\n  ) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#page = page;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return this.#hasNextPage();\n  }\n\n  get hasPreviousPage(): boolean {\n    return this.#page.offset > 0;\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??=\n      typeof this.#type === \"function\"\n        ? this.#ctx.em.findCount(this.#type, this.#filter)\n        : countQuery(this.#ctx, this.#type));\n  }\n\n  get nextPage(): Promise<number | undefined> {\n    return this.#nextPage();\n  }\n\n  get currentPage(): number {\n    return Math.floor(this.#page.offset / this.#page.limit) + 1;\n  }\n\n  /** Returns whether another page exists after this page. */\n  async #hasNextPage(): Promise<boolean> {\n    const total = await this.totalCount;\n    const { offset, limit } = this.#page;\n    return offset + limit < total;\n  }\n\n  /** Returns the next limit/offset page if there is one. */\n  async #nextPage(): Promise<number | undefined> {\n    if (!(await this.hasNextPage)) return undefined;\n    return this.currentPage + 1;\n  }\n}\n"],"mappings":";;;;AA6BA,eAAsB,cACpB,KACA,MACA,MACwD;CACxD,MAAM,QAAQ,KAAK,SAAA;CACnB,MAAM,SAAS,KAAK,UAAU;CAC9B,MAAM,SAAU,KAAK,UAAU,CAAC;CAKhC,OAAO;EAAE,UAHP,OAAO,SAAS,aACZ,MAAM,IAAI,GAAG,QAAQ,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC,IACpD,MAAMA,wBAAAA,cAAiB,KAAK;GAAE,GAAG;GAAM;GAAO;EAAO,CAAC;EACzC,UAAU,IAAI,cAAc,KAAK,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC;CAAE;AACvF;;AAGA,IAAa,gBAAb,MAAsD;CACpD;CACA;CACA;CACA;CACA;CAEA,YACE,KACA,MACA,QACA,MACA;EACA,KAAKC,OAAO;EACZ,KAAKC,QAAQ;EACb,KAAKC,UAAU;EACf,KAAKC,QAAQ;CACf;CAEA,IAAI,cAAgC;EAClC,OAAO,KAAKC,aAAa;CAC3B;CAEA,IAAI,kBAA2B;EAC7B,OAAO,KAAKD,MAAM,SAAS;CAC7B;CAEA,IAAI,aAA8B;EAChC,OAAQ,KAAKE,uBACX,OAAO,KAAKJ,UAAU,aAClB,KAAKD,KAAK,GAAG,UAAU,KAAKC,OAAO,KAAKC,OAAO,IAC/CI,wBAAAA,WAAW,KAAKN,MAAM,KAAKC,KAAK;CACxC;CAEA,IAAI,WAAwC;EAC1C,OAAO,KAAKM,UAAU;CACxB;CAEA,IAAI,cAAsB;EACxB,OAAO,KAAK,MAAM,KAAKJ,MAAM,SAAS,KAAKA,MAAM,KAAK,IAAI;CAC5D;;CAGA,MAAMC,eAAiC;EACrC,MAAM,QAAQ,MAAM,KAAK;EACzB,MAAM,EAAE,QAAQ,UAAU,KAAKD;EAC/B,OAAO,SAAS,QAAQ;CAC1B;;CAGA,MAAMI,YAAyC;EAC7C,IAAI,CAAE,MAAM,KAAK,aAAc,OAAO,KAAA;EACtC,OAAO,KAAK,cAAc;CAC5B;AACF"}

package/build/limitPagination.d.cts

@@ -1,4 +1,4 @@
-import { ContextWithEm, PaginationFilter } from "./paginationUtils.cjs";
+import { ContextWithEm, PaginationFilter, PaginationQuery } from "./paginationUtils.cjs";
 import { Entity, MaybeAbstractEntityConstructor } from "joist-core";
 //#region src/limitPagination.d.ts
 type LimitArgs<T extends Entity, F extends object = PaginationFilter<T>> = {
@@ -10,7 +10,11 @@ type Page = {
   offset: number;
   limit: number;
 };
-/** Returns a limit/offset page shape for a generated query resolver. */
+/** Returns a limit/offset page shape for a resolver, preserving the entity query's ordering. */
+declare function paginateLimit<T extends Entity>(ctx: ContextWithEm, query: PaginationQuery<T>, args: Omit<LimitArgs<T>, "filter">): Promise<{
+  entities: T[];
+  pageInfo: LimitPageInfo<T>;
+}>;
 declare function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, args: LimitArgs<T, F>): Promise<{
   entities: T[];
   pageInfo: LimitPageInfo<T>;
@@ -18,7 +22,7 @@ declare function paginateLimit<T extends Entity, F extends object = PaginationFi
 /** Lazily computes limit/offset page fields. */
 declare class LimitPageInfo<T extends Entity = Entity> {
   #private;
-  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, filter: PaginationFilter<T>, page: Page);
+  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>, filter: PaginationFilter<T>, page: Page);
   get hasNextPage(): Promise<boolean>;
   get hasPreviousPage(): boolean;
   get totalCount(): Promise<number>;

package/build/limitPagination.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"limitPagination.d.cts","names":[],"sources":["../src/limitPagination.ts"],"mappings":";;;KAIK,UAAU,UAAU,QAAQ,mBAAmB,iBAAiB;EACnE,SAAS;EACT;EACA;;KAEG;EAAS;EAAgB;;;iBAGR,cAAc,UAAU,QAAQ,mBAAmB,iBAAiB,IACxF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,UAAU,GAAG,KAClB;EAAU,UAAU;EAAK,UAAU,cAAc;;;cASvC,cAAc,UAAU,SAAS;;EAO5C,YAAY,KAAK,eAAe,MAAM,+BAA+B,IAAI,QAAQ,iBAAiB,IAAI,MAAM;MAOxG,eAAe;MAIf;MAIA,cAAc;MAId,YAAY;MAIZ"}
+{"version":3,"file":"limitPagination.d.cts","names":[],"sources":["../src/limitPagination.ts"],"mappings":";;;KAWK,UAAU,UAAU,QAAQ,mBAAmB,iBAAiB;EACnE,SAAS;EACT;EACA;;KAEG;EAAS;EAAgB;;;iBAGd,cAAc,UAAU,QACtC,KAAK,eACL,OAAO,gBAAgB,IACvB,MAAM,KAAK,UAAU,gBACpB;EAAU,UAAU;EAAK,UAAU,cAAc;;iBACpC,cAAc,UAAU,QAAQ,mBAAmB,iBAAiB,IAClF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,UAAU,GAAG,KAClB;EAAU,UAAU;EAAK,UAAU,cAAc;;;cAiBvC,cAAc,UAAU,SAAS;;EAO5C,YACE,KAAK,eACL,MAAM,+BAA+B,KAAK,gBAAgB,IAC1D,QAAQ,iBAAiB,IACzB,MAAM;MAQJ,eAAe;MAIf;MAIA,cAAc;MAOd,YAAY;MAIZ"}

package/build/limitPagination.d.mts

@@ -1,4 +1,4 @@
-import { ContextWithEm, PaginationFilter } from "./paginationUtils.mjs";
+import { ContextWithEm, PaginationFilter, PaginationQuery } from "./paginationUtils.mjs";
 import { Entity, MaybeAbstractEntityConstructor } from "joist-core";
 //#region src/limitPagination.d.ts
 type LimitArgs<T extends Entity, F extends object = PaginationFilter<T>> = {
@@ -10,7 +10,11 @@ type Page = {
   offset: number;
   limit: number;
 };
-/** Returns a limit/offset page shape for a generated query resolver. */
+/** Returns a limit/offset page shape for a resolver, preserving the entity query's ordering. */
+declare function paginateLimit<T extends Entity>(ctx: ContextWithEm, query: PaginationQuery<T>, args: Omit<LimitArgs<T>, "filter">): Promise<{
+  entities: T[];
+  pageInfo: LimitPageInfo<T>;
+}>;
 declare function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, args: LimitArgs<T, F>): Promise<{
   entities: T[];
   pageInfo: LimitPageInfo<T>;
@@ -18,7 +22,7 @@ declare function paginateLimit<T extends Entity, F extends object = PaginationFi
 /** Lazily computes limit/offset page fields. */
 declare class LimitPageInfo<T extends Entity = Entity> {
   #private;
-  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, filter: PaginationFilter<T>, page: Page);
+  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>, filter: PaginationFilter<T>, page: Page);
   get hasNextPage(): Promise<boolean>;
   get hasPreviousPage(): boolean;
   get totalCount(): Promise<number>;

package/build/limitPagination.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"limitPagination.d.mts","names":[],"sources":["../src/limitPagination.ts"],"mappings":";;;KAIK,UAAU,UAAU,QAAQ,mBAAmB,iBAAiB;EACnE,SAAS;EACT;EACA;;KAEG;EAAS;EAAgB;;;iBAGR,cAAc,UAAU,QAAQ,mBAAmB,iBAAiB,IACxF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,UAAU,GAAG,KAClB;EAAU,UAAU;EAAK,UAAU,cAAc;;;cASvC,cAAc,UAAU,SAAS;;EAO5C,YAAY,KAAK,eAAe,MAAM,+BAA+B,IAAI,QAAQ,iBAAiB,IAAI,MAAM;MAOxG,eAAe;MAIf;MAIA,cAAc;MAId,YAAY;MAIZ"}
+{"version":3,"file":"limitPagination.d.mts","names":[],"sources":["../src/limitPagination.ts"],"mappings":";;;KAWK,UAAU,UAAU,QAAQ,mBAAmB,iBAAiB;EACnE,SAAS;EACT;EACA;;KAEG;EAAS;EAAgB;;;iBAGd,cAAc,UAAU,QACtC,KAAK,eACL,OAAO,gBAAgB,IACvB,MAAM,KAAK,UAAU,gBACpB;EAAU,UAAU;EAAK,UAAU,cAAc;;iBACpC,cAAc,UAAU,QAAQ,mBAAmB,iBAAiB,IAClF,KAAK,eACL,MAAM,+BAA+B,IACrC,MAAM,UAAU,GAAG,KAClB;EAAU,UAAU;EAAK,UAAU,cAAc;;;cAiBvC,cAAc,UAAU,SAAS;;EAO5C,YACE,KAAK,eACL,MAAM,+BAA+B,KAAK,gBAAgB,IAC1D,QAAQ,iBAAiB,IACzB,MAAM;MAQJ,eAAe;MAIf;MAIA,cAAc;MAOd,YAAY;MAIZ"}

package/build/limitPagination.js

@@ -1,13 +1,16 @@
-import "./paginationUtils.js";
+import { countQuery, queryEntities } from "./paginationUtils.js";
 import "joist-core";
 //#region src/limitPagination.ts
-/** Returns a limit/offset page shape for a generated query resolver. */
 async function paginateLimit(ctx, type, args) {
 	const limit = args.limit ?? 100;
 	const offset = args.offset ?? 0;
 	const filter = args.filter ?? {};
 	return {
-		entities: await ctx.em.findGql(type, filter, {
+		entities: typeof type === "function" ? await ctx.em.findGql(type, filter, {
+			limit,
+			offset
+		}) : await queryEntities(ctx, {
+			...type,
 			limit,
 			offset
 		}),
@@ -37,7 +40,7 @@ var LimitPageInfo = class {
 		return this.#page.offset > 0;
 	}
 	get totalCount() {
-		return this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter);
+		return this.#totalCountPromise ??= typeof this.#type === "function" ? this.#ctx.em.findCount(this.#type, this.#filter) : countQuery(this.#ctx, this.#type);
 	}
 	get nextPage() {
 		return this.#nextPage();

package/build/limitPagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"limitPagination.js","names":["#ctx","#type","#filter","#page","#hasNextPage","#totalCountPromise","#nextPage"],"sources":["../src/limitPagination.ts"],"sourcesContent":["import { type Entity, type MaybeAbstractEntityConstructor } from \"joist-core\";\n\nimport { type ContextWithEm, type PaginationFilter, defaultLimit } from \"./paginationUtils.ts\";\n\ntype LimitArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  limit?: number | null;\n  offset?: number | null;\n};\ntype Page = { offset: number; limit: number };\n\n/** Returns a limit/offset page shape for a generated query resolver. */\nexport async function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: LimitArgs<T, F>,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }> {\n  const limit = args.limit ?? defaultLimit;\n  const offset = args.offset ?? 0;\n  const filter = (args.filter ?? {}) as PaginationFilter<T>;\n  const entities = await ctx.em.findGql(type, filter, { limit, offset });\n  return { entities, pageInfo: new LimitPageInfo(ctx, type, filter, { limit, offset }) };\n}\n\n/** Lazily computes limit/offset page fields. */\nexport class LimitPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #filter: PaginationFilter<T>;\n  #page: Page;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T>;\n\n  constructor(ctx: ContextWithEm, type: MaybeAbstractEntityConstructor<T>, filter: PaginationFilter<T>, page: Page) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#page = page;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return this.#hasNextPage();\n  }\n\n  get hasPreviousPage(): boolean {\n    return this.#page.offset > 0;\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??= this.#ctx.em.findCount(this.#type, this.#filter));\n  }\n\n  get nextPage(): Promise<number | undefined> {\n    return this.#nextPage();\n  }\n\n  get currentPage(): number {\n    return Math.floor(this.#page.offset / this.#page.limit) + 1;\n  }\n\n  /** Returns whether another page exists after this page. */\n  async #hasNextPage(): Promise<boolean> {\n    const total = await this.totalCount;\n    const { offset, limit } = this.#page;\n    return offset + limit < total;\n  }\n\n  /** Returns the next limit/offset page if there is one. */\n  async #nextPage(): Promise<number | undefined> {\n    if (!(await this.hasNextPage)) return undefined;\n    return this.currentPage + 1;\n  }\n}\n"],"mappings":";;;;AAYA,eAAsB,cACpB,KACA,MACA,MACwD;CACxD,MAAM,QAAQ,KAAK,SAAA;CACnB,MAAM,SAAS,KAAK,UAAU;CAC9B,MAAM,SAAU,KAAK,UAAU,CAAC;CAEhC,OAAO;EAAE,UAAA,MADc,IAAI,GAAG,QAAQ,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC;EAClD,UAAU,IAAI,cAAc,KAAK,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC;CAAE;AACvF;;AAGA,IAAa,gBAAb,MAAsD;CACpD;CACA;CACA;CACA;CACA;CAEA,YAAY,KAAoB,MAAyC,QAA6B,MAAY;EAChH,KAAKA,OAAO;EACZ,KAAKC,QAAQ;EACb,KAAKC,UAAU;EACf,KAAKC,QAAQ;CACf;CAEA,IAAI,cAAgC;EAClC,OAAO,KAAKC,aAAa;CAC3B;CAEA,IAAI,kBAA2B;EAC7B,OAAO,KAAKD,MAAM,SAAS;CAC7B;CAEA,IAAI,aAA8B;EAChC,OAAQ,KAAKE,uBAAuB,KAAKL,KAAK,GAAG,UAAU,KAAKC,OAAO,KAAKC,OAAO;CACrF;CAEA,IAAI,WAAwC;EAC1C,OAAO,KAAKI,UAAU;CACxB;CAEA,IAAI,cAAsB;EACxB,OAAO,KAAK,MAAM,KAAKH,MAAM,SAAS,KAAKA,MAAM,KAAK,IAAI;CAC5D;;CAGA,MAAMC,eAAiC;EACrC,MAAM,QAAQ,MAAM,KAAK;EACzB,MAAM,EAAE,QAAQ,UAAU,KAAKD;EAC/B,OAAO,SAAS,QAAQ;CAC1B;;CAGA,MAAMG,YAAyC;EAC7C,IAAI,CAAE,MAAM,KAAK,aAAc,OAAO,KAAA;EACtC,OAAO,KAAK,cAAc;CAC5B;AACF"}
+{"version":3,"file":"limitPagination.js","names":["#ctx","#type","#filter","#page","#hasNextPage","#totalCountPromise","#nextPage"],"sources":["../src/limitPagination.ts"],"sourcesContent":["import { type Entity, type MaybeAbstractEntityConstructor } from \"joist-core\";\n\nimport {\n  type ContextWithEm,\n  type PaginationFilter,\n  type PaginationQuery,\n  countQuery,\n  defaultLimit,\n  queryEntities,\n} from \"./paginationUtils.ts\";\n\ntype LimitArgs<T extends Entity, F extends object = PaginationFilter<T>> = {\n  filter?: F | null;\n  limit?: number | null;\n  offset?: number | null;\n};\ntype Page = { offset: number; limit: number };\n\n/** Returns a limit/offset page shape for a resolver, preserving the entity query's ordering. */\nexport function paginateLimit<T extends Entity>(\n  ctx: ContextWithEm,\n  query: PaginationQuery<T>,\n  args: Omit<LimitArgs<T>, \"filter\">,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }>;\nexport function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T>,\n  args: LimitArgs<T, F>,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }>;\nexport async function paginateLimit<T extends Entity, F extends object = PaginationFilter<T>>(\n  ctx: ContextWithEm,\n  type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n  args: LimitArgs<T, F>,\n): Promise<{ entities: T[]; pageInfo: LimitPageInfo<T> }> {\n  const limit = args.limit ?? defaultLimit;\n  const offset = args.offset ?? 0;\n  const filter = (args.filter ?? {}) as PaginationFilter<T>;\n  const entities =\n    typeof type === \"function\"\n      ? await ctx.em.findGql(type, filter, { limit, offset })\n      : await queryEntities<T>(ctx, { ...type, limit, offset });\n  return { entities, pageInfo: new LimitPageInfo(ctx, type, filter, { limit, offset }) };\n}\n\n/** Lazily computes limit/offset page fields. */\nexport class LimitPageInfo<T extends Entity = Entity> {\n  #ctx: ContextWithEm;\n  #filter: PaginationFilter<T>;\n  #page: Page;\n  #totalCountPromise: Promise<number> | undefined;\n  #type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>;\n\n  constructor(\n    ctx: ContextWithEm,\n    type: MaybeAbstractEntityConstructor<T> | PaginationQuery<T>,\n    filter: PaginationFilter<T>,\n    page: Page,\n  ) {\n    this.#ctx = ctx;\n    this.#type = type;\n    this.#filter = filter;\n    this.#page = page;\n  }\n\n  get hasNextPage(): Promise<boolean> {\n    return this.#hasNextPage();\n  }\n\n  get hasPreviousPage(): boolean {\n    return this.#page.offset > 0;\n  }\n\n  get totalCount(): Promise<number> {\n    return (this.#totalCountPromise ??=\n      typeof this.#type === \"function\"\n        ? this.#ctx.em.findCount(this.#type, this.#filter)\n        : countQuery(this.#ctx, this.#type));\n  }\n\n  get nextPage(): Promise<number | undefined> {\n    return this.#nextPage();\n  }\n\n  get currentPage(): number {\n    return Math.floor(this.#page.offset / this.#page.limit) + 1;\n  }\n\n  /** Returns whether another page exists after this page. */\n  async #hasNextPage(): Promise<boolean> {\n    const total = await this.totalCount;\n    const { offset, limit } = this.#page;\n    return offset + limit < total;\n  }\n\n  /** Returns the next limit/offset page if there is one. */\n  async #nextPage(): Promise<number | undefined> {\n    if (!(await this.hasNextPage)) return undefined;\n    return this.currentPage + 1;\n  }\n}\n"],"mappings":";;;AA6BA,eAAsB,cACpB,KACA,MACA,MACwD;CACxD,MAAM,QAAQ,KAAK,SAAA;CACnB,MAAM,SAAS,KAAK,UAAU;CAC9B,MAAM,SAAU,KAAK,UAAU,CAAC;CAKhC,OAAO;EAAE,UAHP,OAAO,SAAS,aACZ,MAAM,IAAI,GAAG,QAAQ,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC,IACpD,MAAM,cAAiB,KAAK;GAAE,GAAG;GAAM;GAAO;EAAO,CAAC;EACzC,UAAU,IAAI,cAAc,KAAK,MAAM,QAAQ;GAAE;GAAO;EAAO,CAAC;CAAE;AACvF;;AAGA,IAAa,gBAAb,MAAsD;CACpD;CACA;CACA;CACA;CACA;CAEA,YACE,KACA,MACA,QACA,MACA;EACA,KAAKA,OAAO;EACZ,KAAKC,QAAQ;EACb,KAAKC,UAAU;EACf,KAAKC,QAAQ;CACf;CAEA,IAAI,cAAgC;EAClC,OAAO,KAAKC,aAAa;CAC3B;CAEA,IAAI,kBAA2B;EAC7B,OAAO,KAAKD,MAAM,SAAS;CAC7B;CAEA,IAAI,aAA8B;EAChC,OAAQ,KAAKE,uBACX,OAAO,KAAKJ,UAAU,aAClB,KAAKD,KAAK,GAAG,UAAU,KAAKC,OAAO,KAAKC,OAAO,IAC/C,WAAW,KAAKF,MAAM,KAAKC,KAAK;CACxC;CAEA,IAAI,WAAwC;EAC1C,OAAO,KAAKK,UAAU;CACxB;CAEA,IAAI,cAAsB;EACxB,OAAO,KAAK,MAAM,KAAKH,MAAM,SAAS,KAAKA,MAAM,KAAK,IAAI;CAC5D;;CAGA,MAAMC,eAAiC;EACrC,MAAM,QAAQ,MAAM,KAAK;EACzB,MAAM,EAAE,QAAQ,UAAU,KAAKD;EAC/B,OAAO,SAAS,QAAQ;CAC1B;;CAGA,MAAMG,YAAyC;EAC7C,IAAI,CAAE,MAAM,KAAK,aAAc,OAAO,KAAA;EACtC,OAAO,KAAK,cAAc;CAC5B;AACF"}

package/build/paginationUtils.cjs

@@ -1,8 +1,34 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("joist-core");
+let joist_core = require("joist-core");
 //#region src/paginationUtils.ts
 const defaultLimit = 100;
+/** Executes an entity selection after pagination has been applied. */
+function queryEntities(ctx, base) {
+	return ctx.em.query(base);
+}
+/** Counts the unpaginated rows, preserving distinct, grouping, and join semantics. */
+async function countQuery(ctx, base) {
+	const select = { id: base.select.id };
+	if (Array.isArray(base.orderBy)) for (const [index, order] of base.orderBy.entries()) {
+		const expression = order?.asc ?? order?.desc;
+		if (expression) select[`order${index}`] = expression;
+	}
+	const rows = (0, joist_core.query)({
+		...base,
+		select,
+		orderBy: void 0,
+		limit: void 0,
+		offset: void 0
+	});
+	const [result] = await ctx.em.query({
+		from: rows,
+		select: { count: rows.id.count() }
+	});
+	return result.count;
+}
 //#endregion
+exports.countQuery = countQuery;
 exports.defaultLimit = defaultLimit;
+exports.queryEntities = queryEntities;
 
 //# sourceMappingURL=paginationUtils.cjs.map

package/build/paginationUtils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"paginationUtils.cjs","names":[],"sources":["../src/paginationUtils.ts"],"sourcesContent":["import { type Entity, type EntityManager, type GraphQLFilterWithAlias } from \"joist-core\";\n\nexport type ContextWithEm = { em: EntityManager };\nexport type PaginationFilter<T extends Entity> = GraphQLFilterWithAlias<T>;\n\nexport const defaultLimit = 100;\n"],"mappings":";;;AAKA,MAAa,eAAe"}
+{"version":3,"file":"paginationUtils.cjs","names":["query"],"sources":["../src/paginationUtils.ts"],"sourcesContent":["import {\n  type Entity,\n  type EntityColumn,\n  type EntityManager,\n  type ExprLike,\n  type GraphQLFilterWithAlias,\n  type Query,\n  type TableFor,\n  query,\n} from \"joist-core\";\n\nexport type ContextWithEm = { em: EntityManager };\nexport type PaginationFilter<T extends Entity> = GraphQLFilterWithAlias<T>;\nexport type PaginationQuery<T extends Entity> = Query<TableFor<T> & { readonly id: EntityColumn<T, never, string> }>;\n\nexport const defaultLimit = 100;\n\n/** Executes an entity selection after pagination has been applied. */\nexport function queryEntities<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<T[]> {\n  // Widen the phantom entity type so em.query can resolve its conditional scope checks.\n  return ctx.em.query(base as PaginationQuery<Entity>) as Promise<T[]>;\n}\n\n/** Counts the unpaginated rows, preserving distinct, grouping, and join semantics. */\nexport async function countQuery<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<number> {\n  const select: { id: EntityColumn<T, never, string> } & Record<string, ExprLike<unknown>> = { id: base.select.id };\n  // Keep references from expression ordering so removing ORDER BY does not prune a join.\n  // I.e. ordering Authors by Book title must still count the joined Author/Book rows.\n  if (Array.isArray(base.orderBy)) {\n    for (const [index, order] of base.orderBy.entries()) {\n      const expression = order?.asc ?? order?.desc;\n      if (expression) select[`order${index}`] = expression;\n    }\n  }\n  const rows = query({ ...base, select, orderBy: undefined, limit: undefined, offset: undefined });\n  const [result] = await ctx.em.query({ from: rows, select: { count: rows.id.count() } });\n  return result.count;\n}\n"],"mappings":";;;AAeA,MAAa,eAAe;;AAG5B,SAAgB,cAAgC,KAAoB,MAAwC;CAE1G,OAAO,IAAI,GAAG,MAAM,IAA+B;AACrD;;AAGA,eAAsB,WAA6B,KAAoB,MAA2C;CAChH,MAAM,SAAqF,EAAE,IAAI,KAAK,OAAO,GAAG;CAGhH,IAAI,MAAM,QAAQ,KAAK,OAAO,GAC5B,KAAK,MAAM,CAAC,OAAO,UAAU,KAAK,QAAQ,QAAQ,GAAG;EACnD,MAAM,aAAa,OAAO,OAAO,OAAO;EACxC,IAAI,YAAY,OAAO,QAAQ,WAAW;CAC5C;CAEF,MAAM,QAAA,GAAOA,WAAAA,MAAAA,CAAM;EAAE,GAAG;EAAM;EAAQ,SAAS,KAAA;EAAW,OAAO,KAAA;EAAW,QAAQ,KAAA;CAAU,CAAC;CAC/F,MAAM,CAAC,UAAU,MAAM,IAAI,GAAG,MAAM;EAAE,MAAM;EAAM,QAAQ,EAAE,OAAO,KAAK,GAAG,MAAM,EAAE;CAAE,CAAC;CACtF,OAAO,OAAO;AAChB"}

package/build/paginationUtils.d.cts

@@ -1,10 +1,17 @@
-import { Entity, EntityManager, GraphQLFilterWithAlias } from "joist-core";
+import { Entity, EntityColumn, EntityManager, GraphQLFilterWithAlias, Query, TableFor } from "joist-core";
 //#region src/paginationUtils.d.ts
 type ContextWithEm = {
   em: EntityManager;
 };
 type PaginationFilter<T extends Entity> = GraphQLFilterWithAlias<T>;
+type PaginationQuery<T extends Entity> = Query<TableFor<T> & {
+  readonly id: EntityColumn<T, never, string>;
+}>;
 declare const defaultLimit = 100;
+/** Executes an entity selection after pagination has been applied. */
+declare function queryEntities<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<T[]>;
+/** Counts the unpaginated rows, preserving distinct, grouping, and join semantics. */
+declare function countQuery<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<number>;
 //#endregion
-export { ContextWithEm, PaginationFilter, defaultLimit };
+export { ContextWithEm, PaginationFilter, PaginationQuery, countQuery, defaultLimit, queryEntities };
 //# sourceMappingURL=paginationUtils.d.cts.map

package/build/paginationUtils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"paginationUtils.d.cts","names":[],"sources":["../src/paginationUtils.ts"],"mappings":";;KAEY;EAAkB,IAAI;;KACtB,iBAAiB,UAAU,UAAU,uBAAuB;cAE3D"}
+{"version":3,"file":"paginationUtils.d.cts","names":[],"sources":["../src/paginationUtils.ts"],"mappings":";;KAWY;EAAkB,IAAI;;KACtB,iBAAiB,UAAU,UAAU,uBAAuB;KAC5D,gBAAgB,UAAU,UAAU,MAAM,SAAS;WAAgB,IAAI,aAAa;;cAEnF;;iBAGG,cAAc,UAAU,QAAQ,KAAK,eAAe,MAAM,gBAAgB,KAAK,QAAQ;;iBAMjF,WAAW,UAAU,QAAQ,KAAK,eAAe,MAAM,gBAAgB,KAAK"}

package/build/paginationUtils.d.mts

@@ -1,10 +1,17 @@
-import { Entity, EntityManager, GraphQLFilterWithAlias } from "joist-core";
+import { Entity, EntityColumn, EntityManager, GraphQLFilterWithAlias, Query, TableFor } from "joist-core";
 //#region src/paginationUtils.d.ts
 type ContextWithEm = {
   em: EntityManager;
 };
 type PaginationFilter<T extends Entity> = GraphQLFilterWithAlias<T>;
+type PaginationQuery<T extends Entity> = Query<TableFor<T> & {
+  readonly id: EntityColumn<T, never, string>;
+}>;
 declare const defaultLimit = 100;
+/** Executes an entity selection after pagination has been applied. */
+declare function queryEntities<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<T[]>;
+/** Counts the unpaginated rows, preserving distinct, grouping, and join semantics. */
+declare function countQuery<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<number>;
 //#endregion
-export { ContextWithEm, PaginationFilter, defaultLimit };
+export { ContextWithEm, PaginationFilter, PaginationQuery, countQuery, defaultLimit, queryEntities };
 //# sourceMappingURL=paginationUtils.d.mts.map

package/build/paginationUtils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"paginationUtils.d.mts","names":[],"sources":["../src/paginationUtils.ts"],"mappings":";;KAEY;EAAkB,IAAI;;KACtB,iBAAiB,UAAU,UAAU,uBAAuB;cAE3D"}
+{"version":3,"file":"paginationUtils.d.mts","names":[],"sources":["../src/paginationUtils.ts"],"mappings":";;KAWY;EAAkB,IAAI;;KACtB,iBAAiB,UAAU,UAAU,uBAAuB;KAC5D,gBAAgB,UAAU,UAAU,MAAM,SAAS;WAAgB,IAAI,aAAa;;cAEnF;;iBAGG,cAAc,UAAU,QAAQ,KAAK,eAAe,MAAM,gBAAgB,KAAK,QAAQ;;iBAMjF,WAAW,UAAU,QAAQ,KAAK,eAAe,MAAM,gBAAgB,KAAK"}

package/build/paginationUtils.js

@@ -1,7 +1,31 @@
-import "joist-core";
+import { query } from "joist-core";
 //#region src/paginationUtils.ts
 const defaultLimit = 100;
+/** Executes an entity selection after pagination has been applied. */
+function queryEntities(ctx, base) {
+	return ctx.em.query(base);
+}
+/** Counts the unpaginated rows, preserving distinct, grouping, and join semantics. */
+async function countQuery(ctx, base) {
+	const select = { id: base.select.id };
+	if (Array.isArray(base.orderBy)) for (const [index, order] of base.orderBy.entries()) {
+		const expression = order?.asc ?? order?.desc;
+		if (expression) select[`order${index}`] = expression;
+	}
+	const rows = query({
+		...base,
+		select,
+		orderBy: void 0,
+		limit: void 0,
+		offset: void 0
+	});
+	const [result] = await ctx.em.query({
+		from: rows,
+		select: { count: rows.id.count() }
+	});
+	return result.count;
+}
 //#endregion
-export { defaultLimit };
+export { countQuery, defaultLimit, queryEntities };
 
 //# sourceMappingURL=paginationUtils.js.map

package/build/paginationUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"paginationUtils.js","names":[],"sources":["../src/paginationUtils.ts"],"sourcesContent":["import { type Entity, type EntityManager, type GraphQLFilterWithAlias } from \"joist-core\";\n\nexport type ContextWithEm = { em: EntityManager };\nexport type PaginationFilter<T extends Entity> = GraphQLFilterWithAlias<T>;\n\nexport const defaultLimit = 100;\n"],"mappings":";;AAKA,MAAa,eAAe"}
+{"version":3,"file":"paginationUtils.js","names":[],"sources":["../src/paginationUtils.ts"],"sourcesContent":["import {\n  type Entity,\n  type EntityColumn,\n  type EntityManager,\n  type ExprLike,\n  type GraphQLFilterWithAlias,\n  type Query,\n  type TableFor,\n  query,\n} from \"joist-core\";\n\nexport type ContextWithEm = { em: EntityManager };\nexport type PaginationFilter<T extends Entity> = GraphQLFilterWithAlias<T>;\nexport type PaginationQuery<T extends Entity> = Query<TableFor<T> & { readonly id: EntityColumn<T, never, string> }>;\n\nexport const defaultLimit = 100;\n\n/** Executes an entity selection after pagination has been applied. */\nexport function queryEntities<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<T[]> {\n  // Widen the phantom entity type so em.query can resolve its conditional scope checks.\n  return ctx.em.query(base as PaginationQuery<Entity>) as Promise<T[]>;\n}\n\n/** Counts the unpaginated rows, preserving distinct, grouping, and join semantics. */\nexport async function countQuery<T extends Entity>(ctx: ContextWithEm, base: PaginationQuery<T>): Promise<number> {\n  const select: { id: EntityColumn<T, never, string> } & Record<string, ExprLike<unknown>> = { id: base.select.id };\n  // Keep references from expression ordering so removing ORDER BY does not prune a join.\n  // I.e. ordering Authors by Book title must still count the joined Author/Book rows.\n  if (Array.isArray(base.orderBy)) {\n    for (const [index, order] of base.orderBy.entries()) {\n      const expression = order?.asc ?? order?.desc;\n      if (expression) select[`order${index}`] = expression;\n    }\n  }\n  const rows = query({ ...base, select, orderBy: undefined, limit: undefined, offset: undefined });\n  const [result] = await ctx.em.query({ from: rows, select: { count: rows.id.count() } });\n  return result.count;\n}\n"],"mappings":";;AAeA,MAAa,eAAe;;AAG5B,SAAgB,cAAgC,KAAoB,MAAwC;CAE1G,OAAO,IAAI,GAAG,MAAM,IAA+B;AACrD;;AAGA,eAAsB,WAA6B,KAAoB,MAA2C;CAChH,MAAM,SAAqF,EAAE,IAAI,KAAK,OAAO,GAAG;CAGhH,IAAI,MAAM,QAAQ,KAAK,OAAO,GAC5B,KAAK,MAAM,CAAC,OAAO,UAAU,KAAK,QAAQ,QAAQ,GAAG;EACnD,MAAM,aAAa,OAAO,OAAO,OAAO;EACxC,IAAI,YAAY,OAAO,QAAQ,WAAW;CAC5C;CAEF,MAAM,OAAO,MAAM;EAAE,GAAG;EAAM;EAAQ,SAAS,KAAA;EAAW,OAAO,KAAA;EAAW,QAAQ,KAAA;CAAU,CAAC;CAC/F,MAAM,CAAC,UAAU,MAAM,IAAI,GAAG,MAAM;EAAE,MAAM;EAAM,QAAQ,EAAE,OAAO,KAAK,GAAG,MAAM,EAAE;CAAE,CAAC;CACtF,OAAO,OAAO;AAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joist-graphql-resolver-utils",
-  "version": "2.3.0-next.70",
+  "version": "2.3.0-next.72",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -84,8 +84,8 @@
     "build"
   ],
   "peerDependencies": {
-    "joist-core": "2.3.0-next.70",
-    "joist-test-utils": "2.3.0-next.70"
+    "joist-core": "2.3.0-next.72",
+    "joist-test-utils": "2.3.0-next.72"
   },
   "dependencies": {
     "graphql": "^17.0.2"