@vantreeseba/drizzle-graphql 5.1.0 → 5.3.0

package/dist/index.d.cts

@@ -57,12 +57,24 @@ type FilterColumnOperatorsCore<TColumn extends Column, TColType = GetColumnGqlDa
     notIlike: string;
     startsWith: string;
     endsWith: string;
-    contains: string;
+    /**
+     * String columns: safe substring match (`%`, `_` and `\` matched literally).
+     * JSON columns: structural containment (Postgres `@>` / MySQL JSON_CONTAINS).
+     */
+    contains: string | TColType;
     iStartsWith: string;
     iEndsWith: string;
     iContains: string;
     inArray: Array<TColType>;
     notInArray: Array<TColType>;
+    /** Array columns only: the array contains this element. */
+    has: TColType extends Array<infer TElement> ? TElement : never;
+    /** Array columns only: the array overlaps these elements (`&&`). */
+    hasSome: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: the array contains all of these elements (`@>`). */
+    hasEvery: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: when true, matches arrays with no elements. */
+    isEmpty: boolean;
     isNull: boolean;
     isNotNull: boolean;
 }>;

package/dist/index.d.ts

@@ -57,12 +57,24 @@ type FilterColumnOperatorsCore<TColumn extends Column, TColType = GetColumnGqlDa
     notIlike: string;
     startsWith: string;
     endsWith: string;
-    contains: string;
+    /**
+     * String columns: safe substring match (`%`, `_` and `\` matched literally).
+     * JSON columns: structural containment (Postgres `@>` / MySQL JSON_CONTAINS).
+     */
+    contains: string | TColType;
     iStartsWith: string;
     iEndsWith: string;
     iContains: string;
     inArray: Array<TColType>;
     notInArray: Array<TColType>;
+    /** Array columns only: the array contains this element. */
+    has: TColType extends Array<infer TElement> ? TElement : never;
+    /** Array columns only: the array overlaps these elements (`&&`). */
+    hasSome: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: the array contains all of these elements (`@>`). */
+    hasEvery: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: when true, matches arrays with no elements. */
+    isEmpty: boolean;
     isNull: boolean;
     isNotNull: boolean;
 }>;

package/dist/index.js

@@ -12,6 +12,8 @@ import {
 import {
   aliasedTable,
   and,
+  arrayContains,
+  arrayOverlaps,
   asc,
   desc,
   eq,
@@ -416,6 +418,21 @@ var geoXyInputType = new GraphQLInputObjectType({
   }
 });
 var columnToGraphQLCore = (column, columnName, tableName, isInput) => {
+  const dimensions = column.dimensions;
+  if (dimensions !== void 0 && dimensions > 0) {
+    const inner = columnBaseToGraphQLCore(column, columnName, tableName, isInput);
+    const innerDesc = inner.description ?? inner.type.name;
+    let type = inner.type;
+    let description = innerDesc;
+    for (let i = 0; i < dimensions; i++) {
+      type = new GraphQLList(new GraphQLNonNull(type));
+      description = `Array<${description}>`;
+    }
+    return { type, description };
+  }
+  return columnBaseToGraphQLCore(column, columnName, tableName, isInput);
+};
+var columnBaseToGraphQLCore = (column, columnName, tableName, isInput) => {
   const { type: baseType, constraint } = extractExtendedColumnType(column);
   switch (baseType) {
     case "boolean":
@@ -447,28 +464,10 @@ var columnToGraphQLCore = (column, columnName, tableName, isInput) => {
       if (column instanceof PgDateString) {
         return isInput ? { type: GraphQLString, description: "Date" } : { type: GraphQLDate, description: "Date" };
       }
-      {
-        const dims = column.dimensions;
-        if (dims !== void 0 && dims > 0) {
-          return {
-            type: new GraphQLList(new GraphQLNonNull(GraphQLString)),
-            description: "Array<String>"
-          };
-        }
-      }
       return { type: GraphQLString, description: "String" };
     case "bigint":
       return { type: GraphQLBigIntString, description: "BigInt" };
     case "number": {
-      const dims = column.dimensions;
-      if (dims !== void 0 && dims > 0) {
-        const baseDesc = is2(column, PgInteger) || is2(column, PgSerial) ? "Integer" : "Float";
-        const baseType2 = baseDesc === "Integer" ? GraphQLInt : GraphQLFloat;
-        return {
-          type: new GraphQLList(new GraphQLNonNull(baseType2)),
-          description: `Array<${baseDesc}>`
-        };
-      }
       return is2(column, PgInteger) || is2(column, PgSerial) || is2(column, MySqlInt) || is2(column, MySqlSerial) || is2(column, SQLiteInteger) ? { type: GraphQLInt, description: "Integer" } : { type: GraphQLFloat, description: "Float" };
     }
     case "array": {
@@ -813,52 +812,95 @@ var innerOrder = new GraphQLInputObjectType2({
     }
   }
 });
-var resolveGenericFilterName = (column, columnGraphQLType) => {
+var columnDialect = (column) => {
+  const ct = column.columnType ?? "";
+  if (ct.startsWith("Pg")) {
+    return "pg";
+  }
+  if (ct.startsWith("MySql")) {
+    return "mysql";
+  }
+  if (ct.startsWith("SQLite")) {
+    return "sqlite";
+  }
+  return void 0;
+};
+var resolveGenericFilterDescriptor = (column, columnGraphQLType) => {
+  if (columnGraphQLType.type === GraphQLJSON) {
+    return { name: "JSON", kind: "json" };
+  }
+  if (columnGraphQLType.type instanceof GraphQLList2) {
+    let element = columnGraphQLType.type.ofType;
+    if (element instanceof GraphQLNonNull2) {
+      element = element.ofType;
+    }
+    return { name: `${element.name}Array`, kind: "array" };
+  }
   if (columnGraphQLType.type === GraphQLUUID) {
-    return "Id";
+    return { name: "Id", kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLBoolean2) {
-    return "Boolean";
+    return { name: "Boolean", kind: "scalar" };
   }
   if (columnGraphQLType.type instanceof GraphQLEnumType2) {
-    return columnGraphQLType.type.name;
+    return { name: columnGraphQLType.type.name, kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLBigIntString) {
-    return "BigInt";
+    return { name: "BigInt", kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLDecimalString) {
-    return "Decimal";
-  }
-  if (columnGraphQLType.type instanceof GraphQLList2) {
-    const desc2 = columnGraphQLType.description ?? "";
-    let inner = columnGraphQLType.type.ofType;
-    if (inner instanceof GraphQLNonNull2) {
-      inner = inner.ofType;
-    }
-    if (desc2.includes("Integer") || inner === GraphQLInt2) {
-      return "IntArray";
-    }
-    if (desc2.includes("Float") || inner === GraphQLFloat2) {
-      return "FloatArray";
-    }
-    return "StringArray";
+    return { name: "Decimal", kind: "scalar" };
   }
   const ct = column.columnType ?? "";
   if (ct === "PgTimestamp" || ct === "PgTimestampString" || ct === "PgDate") {
-    return "DateTime";
+    return { name: "DateTime", kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLInt2) {
-    return "Int";
+    return { name: "Int", kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLFloat2) {
-    return "Float";
+    return { name: "Float", kind: "scalar" };
   }
-  return "String";
+  return { name: "String", kind: "scalar" };
+};
+var jsonFilterFields = (column, colType) => {
+  const dialect = columnDialect(column);
+  return {
+    eq: { type: colType, description: "JSON equality on the whole value" },
+    ne: { type: colType, description: "JSON inequality on the whole value" },
+    ...dialect === "pg" || dialect === "mysql" ? {
+      contains: {
+        type: colType,
+        description: "Value structurally contains this JSON (Postgres `@>` / MySQL JSON_CONTAINS)"
+      }
+    } : {},
+    isNull: { type: GraphQLBoolean2 },
+    isNotNull: { type: GraphQLBoolean2 }
+  };
+};
+var arrayFilterFields = (colType, colArr, colDesc) => {
+  let element = colType.ofType;
+  if (element instanceof GraphQLNonNull2) {
+    element = element.ofType;
+  }
+  const elementList = new GraphQLList2(new GraphQLNonNull2(element));
+  return {
+    eq: { type: colType, description: colDesc },
+    ne: { type: colType, description: colDesc },
+    has: { type: element, description: "Array contains this element" },
+    hasSome: { type: elementList, description: "Array contains at least one of these elements (overlap, `&&`)" },
+    hasEvery: { type: elementList, description: "Array contains every one of these elements (containment, `@>`)" },
+    isEmpty: { type: GraphQLBoolean2, description: "When true, matches arrays with no elements" },
+    inArray: { type: colArr, description: `Array<${colDesc}>` },
+    notInArray: { type: colArr, description: `Array<${colDesc}>` },
+    isNull: { type: GraphQLBoolean2 },
+    isNotNull: { type: GraphQLBoolean2 }
+  };
 };
 var FILTERS_WITHOUT_STRING_OPS = /* @__PURE__ */ new Set(["Id", "Int", "Float", "BigInt", "Decimal"]);
 var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const columnGraphQLType = drizzleColumnToGraphQLType(column, columnName, tableName, true, false, true);
-  const genericName = resolveGenericFilterName(column, columnGraphQLType);
+  const { name: genericName, kind } = resolveGenericFilterDescriptor(column, columnGraphQLType);
   const cached = cacheCtx.genericFilterCache.get(genericName);
   if (cached) {
     return cached;
@@ -867,7 +909,7 @@ var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const colDesc = columnGraphQLType.description;
   const colArr = new GraphQLList2(new GraphQLNonNull2(colType));
   const omitStringOps = FILTERS_WITHOUT_STRING_OPS.has(genericName);
-  const baseFields = {
+  const baseFields = kind === "json" ? jsonFilterFields(column, colType) : kind === "array" ? arrayFilterFields(colType, colArr, colDesc) : {
     eq: { type: colType, description: colDesc },
     ne: { type: colType, description: colDesc },
     lt: { type: colType, description: colDesc },
@@ -978,6 +1020,13 @@ var generateTableSelectTypeFieldsCached = (table, tableName) => {
       drizzleColumnToGraphQLType(columnDescription, columnName, tableName)
     ])
   );
+  if (!remapped[CURSOR_FIELD_NAME]) {
+    remapped[CURSOR_FIELD_NAME] = {
+      type: GraphQLString2,
+      description: "Opaque cursor of this row's position in the query's ordering. Pass it as `after` to resume from here. Only set on rows returned by a list query.",
+      resolve: rowCursorResolver
+    };
+  }
   fieldMap.set(table, remapped);
   return remapped;
 };
@@ -1440,12 +1489,28 @@ var safeLikeCondition = (column, pattern, insensitive) => {
   const isPg = (column.columnType ?? "").startsWith("Pg");
   return isPg ? sql`${column} ilike ${pattern} escape ${LIKE_ESCAPE_CHAR}` : sql`lower(${column}) like ${pattern.toLowerCase()} escape ${LIKE_ESCAPE_CHAR}`;
 };
+var isJsonColumn2 = (column) => (column.columnType ?? "").includes("Json");
+var jsonContains = (column, columnName, value) => {
+  const serialized = JSON.stringify(value);
+  switch (columnDialect(column)) {
+    case "pg":
+      return column.columnType === "PgJson" ? sql`${column}::jsonb @> ${serialized}::jsonb` : sql`${column} @> ${serialized}::jsonb`;
+    case "mysql":
+      return sql`json_contains(${column}, ${serialized})`;
+    default:
+      throw new GraphQLError3(`WHERE ${columnName}: Operator 'contains' is not supported for this dialect!`);
+  }
+};
 var extractFiltersColumn = (column, columnName, operators) => {
   const { OR, AND, NOT, ...restOperators } = operators;
   const entries = Object.entries(restOperators);
   const singleValueOps = { eq, ne, gt, gte, lt, lte };
   const stringValueOps = { like, notLike, ilike, notIlike };
   const arrayValueOps = { inArray, notInArray };
+  const arrayMembershipOps = {
+    hasSome: arrayOverlaps,
+    hasEvery: arrayContains
+  };
   const nullableOps = { isNull, isNotNull };
   const variants = [];
   for (const [operatorName, operatorValue] of entries) {
@@ -1457,6 +1522,8 @@ var extractFiltersColumn = (column, columnName, operators) => {
       variants.push(singleValueOps[operatorName](column, singleValue));
     } else if (operatorName in stringValueOps) {
       variants.push(stringValueOps[operatorName](column, operatorValue));
+    } else if (operatorName === "contains" && isJsonColumn2(column)) {
+      variants.push(jsonContains(column, columnName, operatorValue));
     } else if (operatorName in safeLikeOps) {
       const { buildPattern, insensitive } = safeLikeOps[operatorName];
       variants.push(safeLikeCondition(column, buildPattern(operatorValue), insensitive));
@@ -1466,6 +1533,15 @@ var extractFiltersColumn = (column, columnName, operators) => {
       }
       const arrayValue = operatorValue.map((val) => remapFromGraphQLCore(val, column, columnName));
       variants.push(arrayValueOps[operatorName](column, arrayValue));
+    } else if (operatorName === "has") {
+      variants.push(arrayContains(column, [operatorValue]));
+    } else if (operatorName in arrayMembershipOps) {
+      if (!operatorValue.length) {
+        throw new GraphQLError3(`WHERE ${columnName}: Unable to use operator ${operatorName} with an empty array!`);
+      }
+      variants.push(arrayMembershipOps[operatorName](column, operatorValue));
+    } else if (operatorName === "isEmpty") {
+      variants.push(sql`cardinality(${column}) = 0`);
     } else if (operatorName in nullableOps) {
       variants.push(nullableOps[operatorName](column));
     } else {
@@ -1778,6 +1854,117 @@ var primaryKeyOrderExprs = (table, pkNames) => {
   const cols = getColumns(table);
   return pkNames.map((n) => cols[n]).filter(Boolean).map((col) => asc(col));
 };
+var CURSOR_FIELD_NAME = "cursor";
+var ROW_CURSOR_PROP = "__drizzle_graphql_cursor";
+var orderByHasRelationEntry = (orderBy) => !!orderBy && Object.values(orderBy).some((config) => config && typeof config === "object" && config.direction === void 0);
+var cursorOrderingEntries = (orderBy, pkNames) => {
+  const entries = orderBy ? orderByEntries(orderBy) : [];
+  const seen = new Set(entries.map(([column]) => column));
+  for (const pk of pkNames) {
+    if (!seen.has(pk)) {
+      entries.push([pk, "asc"]);
+    }
+  }
+  return entries;
+};
+var cursorOrderExprs = (table, entries) => {
+  const cols = getColumns(table);
+  return entries.flatMap(
+    ([column, direction, nulls]) => orderExpressions(cols[column], direction, nulls ?? void 0, cols[column])
+  );
+};
+var encodeCursorValue = (value) => {
+  if (value instanceof Date) {
+    return { $type: "date", value: value.toISOString() };
+  }
+  if (typeof value === "bigint") {
+    return { $type: "bigint", value: value.toString() };
+  }
+  return value;
+};
+var decodeCursorValue = (value) => {
+  if (value && typeof value === "object" && typeof value.$type === "string") {
+    if (value.$type === "date") {
+      return new Date(value.value);
+    }
+    if (value.$type === "bigint") {
+      return BigInt(value.value);
+    }
+  }
+  return value;
+};
+var encodeCursor = (entries, row) => {
+  const payload = {
+    o: entries,
+    v: entries.map(([column]) => encodeCursorValue(row[column] ?? null))
+  };
+  return Buffer.from(JSON.stringify(payload), "utf8").toString("base64url");
+};
+var decodeCursor = (after, entries) => {
+  let payload;
+  try {
+    payload = JSON.parse(Buffer.from(after, "base64url").toString("utf8"));
+  } catch (_e) {
+    throw new GraphQLError3("Invalid cursor: unable to decode it. Pass a cursor returned by a previous page.");
+  }
+  if (!payload || typeof payload !== "object" || !Array.isArray(payload.o) || !Array.isArray(payload.v) || payload.o.length !== payload.v.length) {
+    throw new GraphQLError3("Invalid cursor: malformed payload. Pass a cursor returned by a previous page.");
+  }
+  const matchesOrdering = payload.o.length === entries.length && payload.o.every(
+    (entry, i) => Array.isArray(entry) && entry[0] === entries[i][0] && entry[1] === entries[i][1] && // The nulls override changes where NULLs sort, so it is part of the ordering identity.
+    // JSON round-trips undefined as null — compare the normalized forms.
+    (entry[2] ?? null) === (entries[i][2] ?? null)
+  );
+  if (!matchesOrdering) {
+    throw new GraphQLError3(
+      "Invalid cursor: it was issued for a different ordering. Pass the same orderBy the cursor's page used."
+    );
+  }
+  return payload.v.map(decodeCursorValue);
+};
+var buildCursorCondition = (table, entries, values, nullOrdering) => {
+  const cols = getColumns(table);
+  const disjuncts = [];
+  const equalities = [];
+  entries.forEach(([column, direction, nulls], i) => {
+    const col = cols[column];
+    if (!col) {
+      throw new GraphQLError3(`Invalid cursor: unknown column '${column}'.`);
+    }
+    const value = values[i];
+    const nullsSortLast = nulls != null ? nulls === "last" : direction === "asc" === (nullOrdering === "nulls-largest");
+    let strictlyAfter;
+    if (value === null || value === void 0) {
+      strictlyAfter = nullsSortLast ? void 0 : isNotNull(col);
+    } else {
+      const comparison = direction === "asc" ? gt(col, value) : lt(col, value);
+      strictlyAfter = nullsSortLast ? or(comparison, isNull(col)) : comparison;
+    }
+    if (strictlyAfter) {
+      disjuncts.push(equalities.length ? and(...equalities, strictlyAfter) : strictlyAfter);
+    }
+    equalities.push(value === null || value === void 0 ? isNull(col) : eq(col, value));
+  });
+  if (!disjuncts.length) {
+    return sql`1 = 0`;
+  }
+  return disjuncts.length > 1 ? or(...disjuncts) : disjuncts[0];
+};
+var isCursorFieldSelected = (tree, table) => {
+  if (!tree) {
+    return false;
+  }
+  if (getColumns(table)[CURSOR_FIELD_NAME]) {
+    return false;
+  }
+  return Object.values(tree).some((field) => field.name === CURSOR_FIELD_NAME);
+};
+var attachRowCursors = (rows, entries) => {
+  for (const row of rows) {
+    row[ROW_CURSOR_PROP] = encodeCursor(entries, row);
+  }
+};
+var rowCursorResolver = (source) => source?.[ROW_CURSOR_PROP] ?? null;
 var getUniqueColumnSets = (table, getTableConfig4) => {
   const cols = getColumns(table);
   const propNameByColumnName = new Map(Object.entries(cols).map(([propName, col]) => [col.name, propName]));
@@ -2102,6 +2289,10 @@ var selectArrayArgs = (orderArgs, filterArgs, distinctEnum) => ({
   limit: { type: GraphQLInt2 },
   orderBy: { type: orderArgs },
   where: { type: filterArgs },
+  after: {
+    type: GraphQLString2,
+    description: "Keyset pagination: only return rows strictly after this cursor (a row's `cursor` field from a previous page, under the same orderBy)."
+  },
   ...distinctEnum ? { distinct: { type: new GraphQLList2(new GraphQLNonNull2(distinctEnum)) } } : {}
 });
 var selectSingleArgs = (orderArgs, filterArgs) => ({
@@ -2124,9 +2315,31 @@ var runRelationalSelect = async (opts) => {
     where,
     single,
     filterCtx,
-    pkNames
+    pkNames,
+    after
   } = opts;
   const distinct = opts.distinct?.length ? opts.distinct : void 0;
+  const cursorSelected = !single && isCursorFieldSelected(parsedInfo.fieldsByTypeName[typeName], table);
+  let cursorEntries;
+  if (!single && (after != null || cursorSelected)) {
+    if (after != null && distinct) {
+      throw new GraphQLError3("'after' cannot be combined with 'distinct'.");
+    }
+    if (orderByHasRelationEntry(orderBy)) {
+      if (after != null) {
+        throw new GraphQLError3(
+          "'after' cannot be combined with an orderBy that orders through a relation \u2014 a related row's value cannot be encoded into a cursor."
+        );
+      }
+    } else if (!pkNames?.length) {
+      if (after != null) {
+        throw new GraphQLError3(`Table ${tableName} has no primary key, so cursor pagination cannot be used on it.`);
+      }
+    } else {
+      cursorEntries = cursorOrderingEntries(orderBy, pkNames);
+    }
+  }
+  const cursorValues = after != null && cursorEntries ? decodeCursor(after, cursorEntries) : void 0;
   const needsDefaultOrder = single || offset != null || opts.limit != null;
   let distinctKeys;
   if (distinct) {
@@ -2157,9 +2370,21 @@ var runRelationalSelect = async (opts) => {
     orderBy: distinctKeys ? (aliasedTable2) => [
       ...orderBy ? extractOrderBy(aliasedTable2, orderBy, relationFilterCtx(filterCtx, tableName)) : [],
       ...primaryKeyOrderExprs(aliasedTable2, pkNames)
-    ] : orderBy ? (aliasedTable2) => extractOrderBy(aliasedTable2, orderBy, relationFilterCtx(filterCtx, tableName)) : needsDefaultOrder && pkNames?.length ? (aliasedTable2) => primaryKeyOrderExprs(aliasedTable2, pkNames) : void 0,
-    where: distinctKeys ? { RAW: (aliasedTable2) => primaryKeyRestriction(aliasedTable2, pkNames, distinctKeys) } : where ? {
-      RAW: (aliasedTable2) => extractFilters(aliasedTable2, tableName, where, relationFilterCtx(filterCtx, tableName))
+    ] : cursorEntries ? (
+      // Cursor pagination needs a total order: the request's orderBy plus the PK tiebreak,
+      // exactly the ordering the cursor encodes and the keyset predicate compares against.
+      (aliasedTable2) => cursorOrderExprs(aliasedTable2, cursorEntries)
+    ) : orderBy ? (aliasedTable2) => extractOrderBy(aliasedTable2, orderBy, relationFilterCtx(filterCtx, tableName)) : needsDefaultOrder && pkNames?.length ? (aliasedTable2) => primaryKeyOrderExprs(aliasedTable2, pkNames) : void 0,
+    where: distinctKeys ? { RAW: (aliasedTable2) => primaryKeyRestriction(aliasedTable2, pkNames, distinctKeys) } : where || cursorValues ? {
+      RAW: (aliasedTable2) => and(
+        where ? extractFilters(aliasedTable2, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0,
+        cursorValues ? buildCursorCondition(
+          aliasedTable2,
+          cursorEntries,
+          cursorValues,
+          opts.nullOrdering ?? "nulls-smallest"
+        ) : void 0
+      )
     } : void 0,
     with: relationMap[tableName] ? extractRelationsParams(relationMap, tables, tableName, parsedInfo, typeName, typeNameMapper, filterCtx) : void 0
   };
@@ -2167,8 +2392,16 @@ var runRelationalSelect = async (opts) => {
     const result2 = await queryBase.findFirst(params);
     return result2 ? remapToGraphQLSingleOutput(result2, tableName, table, relationMap) : void 0;
   }
+  if (cursorEntries && cursorSelected) {
+    for (const [column] of cursorEntries) {
+      params.columns[column] = true;
+    }
+  }
   params.limit = distinctKeys ? void 0 : opts.limit;
   const result = await queryBase.findMany(params);
+  if (cursorEntries && cursorSelected) {
+    attachRowCursors(result, cursorEntries);
+  }
   return remapToGraphQLArrayOutput(result, tableName, table, relationMap);
 };
 var eagerLoadMutationRelations = async (db, tableName, rows, pkNames, withParams) => {
@@ -2747,7 +2980,9 @@ var generateSelectArray = (db, tableName, tables, relationMap, orderArgs, filter
           single: false,
           filterCtx,
           pkNames,
-          db: executor
+          db: executor,
+          // MySQL sorts NULLs as the smallest values (first in ASC).
+          nullOrdering: "nulls-smallest"
         });
       } catch (e) {
         throw toGraphQLError(e);
@@ -3212,7 +3447,7 @@ var generateSchemaData = (db, schema, relations, options) => {
 };
 
 // src/util/builders/pg.ts
-import { is as is5, One as One4 } from "drizzle-orm";
+import { and as and3, getColumns as getColumns3, is as is5, One as One4 } from "drizzle-orm";
 import { getTableConfig as getTableConfig2, PgTable } from "drizzle-orm/pg-core";
 import {
   GraphQLError as GraphQLError6,
@@ -3249,16 +3484,48 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
             single: false,
             filterCtx,
             pkNames,
-            db: executor
+            db: executor,
+            // PostgreSQL sorts NULLs as the largest values (last in ASC).
+            nullOrdering: "nulls-largest"
           });
         }
-        const { offset, limit, orderBy, where, distinct } = args;
+        const { offset, limit, orderBy, where, distinct, after } = args;
         const selectedColumnsSql = extractSelectedColumnsFromTreeSQLFormat(
           parsedInfo.fieldsByTypeName[typeName],
           table,
           { tableName, relationMap, tables }
         );
-        const whereSql = where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0;
+        const cursorSelected = isCursorFieldSelected(parsedInfo.fieldsByTypeName[typeName], table);
+        let cursorEntries;
+        if (after != null || cursorSelected) {
+          if (after != null && distinct?.length) {
+            throw new GraphQLError6("'after' cannot be combined with 'distinct'.");
+          }
+          if (orderByHasRelationEntry(orderBy)) {
+            if (after != null) {
+              throw new GraphQLError6(
+                "'after' cannot be combined with an orderBy that orders through a relation \u2014 a related row's value cannot be encoded into a cursor."
+              );
+            }
+          } else if (!pkNames.length) {
+            if (after != null) {
+              throw new GraphQLError6(
+                `Table ${tableName} has no primary key, so cursor pagination cannot be used on it.`
+              );
+            }
+          } else {
+            cursorEntries = cursorOrderingEntries(orderBy, pkNames);
+            if (cursorSelected) {
+              const allColumns = getColumns3(table);
+              for (const [column] of cursorEntries) {
+                selectedColumnsSql[column] ??= allColumns[column];
+              }
+            }
+          }
+        }
+        const cursorCondition = after != null && cursorEntries ? buildCursorCondition(table, cursorEntries, decodeCursor(after, cursorEntries), "nulls-largest") : void 0;
+        const baseWhereSql = where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0;
+        const whereSql = cursorCondition ? and3(baseWhereSql, cursorCondition) : baseWhereSql;
         let distinctKeys;
         if (distinct?.length) {
           distinctKeys = await selectDistinctKeys({
@@ -3282,7 +3549,9 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
         } else if (whereSql) {
           q = q.where(whereSql);
         }
-        if (orderBy) {
+        if (cursorEntries && !distinctKeys) {
+          q = q.orderBy(...cursorOrderExprs(table, cursorEntries));
+        } else if (orderBy) {
           q = q.orderBy(
             ...extractOrderBy(table, orderBy, relationFilterCtx(filterCtx, tableName)),
             ...distinctKeys ? primaryKeyOrderExprs(table, pkNames) : []
@@ -3298,7 +3567,11 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
             q = q.limit(limit);
           }
         }
-        return remapToGraphQLArrayOutput(await q, tableName, table, relationMap);
+        const rows = await q;
+        if (cursorEntries && cursorSelected) {
+          attachRowCursors(rows, cursorEntries);
+        }
+        return remapToGraphQLArrayOutput(rows, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4014,7 +4287,9 @@ var generateSelectArray3 = (db, tableName, tables, relationMap, orderArgs, filte
           single: false,
           filterCtx,
           pkNames,
-          db: executor
+          db: executor,
+          // SQLite sorts NULLs as the smallest values (first in ASC).
+          nullOrdering: "nulls-smallest"
         });
       } catch (e) {
         throw toGraphQLError(e);