@vantreeseba/drizzle-graphql 7.2.0 → 7.3.0

package/dist/index.d.cts

@@ -188,6 +188,12 @@ type OrderByArgs<TTable extends Table> = {
          * emulated with an extra `IS NULL` sort key on MySQL.
          */
         nulls?: 'first' | 'last';
+        /**
+         * Sort by the column's position in the `inArray` list the same request's `where` gives
+         * it, rather than by the column's own value. Requires that `inArray` filter; cannot be
+         * combined with `after` or `distinct`.
+         */
+        matchFilterOrder?: boolean;
     };
 };
 
@@ -262,10 +268,13 @@ type LimitPolicyFor = (tableName: string) => ResolvedLimitPolicy | undefined;
  * across relation boundaries. Each entry may also carry `nulls: first | last`
  * (see {@link orderExpressions} for how MySQL emulates it).
  *
+ * An entry may instead set `matchFilterOrder`, which sorts by the column's position in the
+ * `inArray` list the same request's `where` gives it — `whereArgs` is that `where`.
+ *
  * `ctx` supplies the tables and relation map that relation ordering needs; callers whose
  * inputs cannot contain relation keys may omit it.
  */
-declare const extractOrderBy: <TTable extends Table, TArgs extends OrderByArgs<any> = OrderByArgs<TTable>>(table: TTable, orderArgs: TArgs, ctx?: RelationFilterContext) => SQL[];
+declare const extractOrderBy: <TTable extends Table, TArgs extends OrderByArgs<any> = OrderByArgs<TTable>>(table: TTable, orderArgs: TArgs, ctx?: RelationFilterContext, whereArgs?: Record<string, any>) => SQL[];
 /**
  * Everything `extractFilters` needs to turn a relation key in a `where` argument into a
  * correlated subquery. Omitted by callers that don't generate relation filters, in which case

package/dist/index.d.ts

@@ -188,6 +188,12 @@ type OrderByArgs<TTable extends Table> = {
          * emulated with an extra `IS NULL` sort key on MySQL.
          */
         nulls?: 'first' | 'last';
+        /**
+         * Sort by the column's position in the `inArray` list the same request's `where` gives
+         * it, rather than by the column's own value. Requires that `inArray` filter; cannot be
+         * combined with `after` or `distinct`.
+         */
+        matchFilterOrder?: boolean;
     };
 };
 
@@ -262,10 +268,13 @@ type LimitPolicyFor = (tableName: string) => ResolvedLimitPolicy | undefined;
  * across relation boundaries. Each entry may also carry `nulls: first | last`
  * (see {@link orderExpressions} for how MySQL emulates it).
  *
+ * An entry may instead set `matchFilterOrder`, which sorts by the column's position in the
+ * `inArray` list the same request's `where` gives it — `whereArgs` is that `where`.
+ *
  * `ctx` supplies the tables and relation map that relation ordering needs; callers whose
  * inputs cannot contain relation keys may omit it.
  */
-declare const extractOrderBy: <TTable extends Table, TArgs extends OrderByArgs<any> = OrderByArgs<TTable>>(table: TTable, orderArgs: TArgs, ctx?: RelationFilterContext) => SQL[];
+declare const extractOrderBy: <TTable extends Table, TArgs extends OrderByArgs<any> = OrderByArgs<TTable>>(table: TTable, orderArgs: TArgs, ctx?: RelationFilterContext, whereArgs?: Record<string, any>) => SQL[];
 /**
  * Everything `extractFilters` needs to turn a relation key in a `where` argument into a
  * correlated subquery. Omitted by callers that don't generate relation filters, in which case

package/dist/index.js

@@ -1012,10 +1012,10 @@ var runMutation = async (db, context, info, txCtx, body) => {
   }
   return runOnSharedTx(state, body);
 };
-var batchedPaginatedRelationQuery = async (db, targetTable, foreignCol, whereCondition, orderByArg, limit, offset, pkNames, orderCtx) => {
+var batchedPaginatedRelationQuery = async (db, targetTable, foreignCol, whereCondition, orderByArg, limit, offset, pkNames, orderCtx, whereArgs) => {
   const cols = getColumns2(targetTable);
   const orderExprs = [
-    ...orderByArg ? extractOrderBy(targetTable, orderByArg, orderCtx) : [],
+    ...orderByArg ? extractOrderBy(targetTable, orderByArg, orderCtx, whereArgs) : [],
     ...primaryKeyOrderExprs(targetTable, pkNames)
   ];
   const orderClause = orderExprs.length ? sql2` order by ${sql2.join(orderExprs, sql2`, `)}` : sql2``;
@@ -1126,11 +1126,12 @@ var createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limits
           limit ?? null,
           offset ?? null,
           targetPkNames,
-          relationFilterCtx(filterCtx, targetTableName)
+          relationFilterCtx(filterCtx, targetTableName),
+          whereArg
         );
       } else {
         let q = executor.select().from(targetTable).where(whereCondition);
-        const orderExprs = cursorEntries ? cursorOrderExprs(targetTable, cursorEntries) : orderByArg ? extractOrderBy(targetTable, orderByArg, relationFilterCtx(filterCtx, targetTableName)) : [];
+        const orderExprs = cursorEntries ? cursorOrderExprs(targetTable, cursorEntries) : orderByArg ? extractOrderBy(targetTable, orderByArg, relationFilterCtx(filterCtx, targetTableName), whereArg) : [];
         if (orderExprs.length) {
           q = q.orderBy(...orderExprs);
         }
@@ -1341,6 +1342,10 @@ var innerOrder = new GraphQLInputObjectType3({
     nulls: {
       type: orderNulls,
       description: "Where NULL values sort. Defaults to the database's own rule (PostgreSQL: last on asc, first on desc; MySQL/SQLite: first on asc, last on desc)"
+    },
+    matchFilterOrder: {
+      type: GraphQLBoolean2,
+      description: "Sort by this column's position in the `inArray` list the same request's `where` gives it, rather than by the column's own value \u2014 `direction: asc` keeps the list's order, `desc` reverses it. Requires an `inArray` filter on the same column at the top level of `where`, and cannot be combined with `after` or `distinct`."
     }
   }
 });
@@ -1406,10 +1411,59 @@ var jsonFilterFields = (column, colType) => {
         description: "Value structurally contains this JSON (Postgres `@>` / MySQL JSON_CONTAINS)"
       }
     } : {},
+    path: {
+      type: new GraphQLList3(new GraphQLNonNull3(jsonPathFilter)),
+      description: "Compares the value at one path inside the document. Several entries are ANDed; a single object may be passed without the list brackets."
+    },
     isNull: { type: GraphQLBoolean2 },
     isNotNull: { type: GraphQLBoolean2 }
   };
 };
+var jsonPathCast = new GraphQLEnumType2({
+  name: "JSONPathCast",
+  description: "How to read the value at a JSON path before comparing it",
+  values: {
+    TEXT: { value: "text", description: "Compare as text (lexicographic ordering)" },
+    NUMBER: { value: "number", description: "Compare as a number; a non-numeric value never matches" },
+    BOOLEAN: { value: "boolean", description: "Compare as a boolean" }
+  }
+});
+var jsonPathFilter = new GraphQLInputObjectType3({
+  name: "JSONPathFilter",
+  fields: {
+    path: {
+      type: new GraphQLNonNull3(new GraphQLList3(new GraphQLNonNull3(GraphQLString2))),
+      description: 'Keys to walk from the document root, e.g. `["profile", "level"]`. An all-digits key indexes an array.'
+    },
+    as: { type: jsonPathCast, description: "Overrides how the value is read before comparing" },
+    eq: { type: GraphQLJSON, description: "Equal to" },
+    ne: { type: GraphQLJSON, description: "Not equal to" },
+    lt: { type: GraphQLJSON, description: "Less than" },
+    lte: { type: GraphQLJSON, description: "Less than or equal to" },
+    gt: { type: GraphQLJSON, description: "Greater than" },
+    gte: { type: GraphQLJSON, description: "Greater than or equal to" },
+    startsWith: {
+      type: GraphQLString2,
+      description: "Extracted value starts with this string. `%`, `_` and `\\` are matched literally."
+    },
+    endsWith: {
+      type: GraphQLString2,
+      description: "Extracted value ends with this string. `%`, `_` and `\\` are matched literally."
+    },
+    contains: {
+      type: GraphQLString2,
+      description: "Extracted value contains this string. `%`, `_` and `\\` are matched literally."
+    },
+    iStartsWith: { type: GraphQLString2, description: "Case-insensitive `startsWith`." },
+    iEndsWith: { type: GraphQLString2, description: "Case-insensitive `endsWith`." },
+    iContains: { type: GraphQLString2, description: "Case-insensitive `contains`." },
+    isNull: {
+      type: GraphQLBoolean2,
+      description: "When true, matches rows where the path is missing or holds JSON null"
+    },
+    isNotNull: { type: GraphQLBoolean2, description: "When true, matches rows where the path holds a value" }
+  }
+});
 var IN_ARRAY_DESCRIPTION = "Matches any one of these values (SQL `IN`)";
 var NOT_IN_ARRAY_DESCRIPTION = "Matches none of these values (SQL `NOT IN`)";
 var arrayFilterFields = (colType, colArr) => {
@@ -2003,6 +2057,9 @@ var orderByEntries = (orderArgs) => Object.entries(orderArgs).sort((a, b) => (b[
   if (typeof config === "object" && config.direction === void 0) {
     throw new GraphQLError4(`ORDER BY ${column}: ordering through a relation is not supported in this query`);
   }
+  if (config.matchFilterOrder) {
+    throw new GraphQLError4(`ORDER BY ${column}: 'matchFilterOrder' is not supported in this query`);
+  }
   return [column, config.direction, config.nulls ?? void 0];
 });
 var orderExpressions = (expr, direction, nulls, dialectColumn) => {
@@ -2037,7 +2094,22 @@ var extendRelationOrderChain = (parentTable, relationName, relEntry, ctx, chain)
     table: aliasedTarget
   };
 };
-var collectOrderEntries = (table, tableKey, orderArgs, ctx, chain, out) => {
+var filterOrderExpression = (column, columnName, whereArgs) => {
+  const values = whereArgs?.[columnName]?.inArray;
+  if (!Array.isArray(values)) {
+    throw new GraphQLError4(
+      `ORDER BY ${columnName}: 'matchFilterOrder' needs an 'inArray' filter on the same column in this query's 'where'`
+    );
+  }
+  if (!values.length) {
+    return sql2`0`;
+  }
+  const branches = values.map(
+    (value, index) => sql2`when ${column} = ${remapFromGraphQLCore(value, column, columnName)} then ${sql2.raw(String(index))}`
+  );
+  return sql2`case ${sql2.join(branches, sql2` `)} else ${sql2.raw(String(values.length))} end`;
+};
+var collectOrderEntries = (table, tableKey, orderArgs, ctx, chain, out, whereArgs) => {
   const columns = getColumns2(table);
   const relations = ctx?.relationMap[tableKey];
   for (const [key, config] of Object.entries(orderArgs)) {
@@ -2046,8 +2118,11 @@ var collectOrderEntries = (table, tableKey, orderArgs, ctx, chain, out) => {
     }
     const column = columns[key];
     if (column) {
+      if (config.matchFilterOrder && chain) {
+        throw new GraphQLError4(`ORDER BY ${key}: 'matchFilterOrder' is not supported through a relation`);
+      }
       out.push({
-        expression: chain ? sql2`(select ${column} from ${sql2.join(chain.fromParts, sql2`, `)} where ${and(...chain.conditions)})` : column,
+        expression: config.matchFilterOrder ? filterOrderExpression(column, key, whereArgs) : chain ? sql2`(select ${column} from ${sql2.join(chain.fromParts, sql2`, `)} where ${and(...chain.conditions)})` : column,
         column,
         direction: config.direction,
         nulls: config.nulls ?? void 0,
@@ -2060,12 +2135,12 @@ var collectOrderEntries = (table, tableKey, orderArgs, ctx, chain, out) => {
       throw new GraphQLError4(`ORDER BY ${key}: Unknown column or relation`);
     }
     const nextChain = extendRelationOrderChain(chain?.table ?? table, key, relEntry, ctx, chain);
-    collectOrderEntries(nextChain.table, relEntry.targetTableName, config, ctx, nextChain, out);
+    collectOrderEntries(nextChain.table, relEntry.targetTableName, config, ctx, nextChain, out, void 0);
   }
 };
-var extractOrderBy = (table, orderArgs, ctx) => {
+var extractOrderBy = (table, orderArgs, ctx, whereArgs) => {
   const entries = [];
-  collectOrderEntries(table, ctx?.tableKey ?? "", orderArgs, ctx, void 0, entries);
+  collectOrderEntries(table, ctx?.tableKey ?? "", orderArgs, ctx, void 0, entries, whereArgs);
   return entries.sort((a, b) => b.priority - a.priority).flatMap((entry) => orderExpressions(entry.expression, entry.direction, entry.nulls, entry.column));
 };
 var LIKE_ESCAPE_CHAR = "\\";
@@ -2097,6 +2172,105 @@ var jsonContains = (column, columnName, value) => {
       throw new GraphQLError4(`WHERE ${columnName}: Operator 'contains' is not supported for this dialect!`);
   }
 };
+var sqlFalse = () => sql2`1 = 0`;
+var sqlTrue = () => sql2`1 = 1`;
+var jsonPathString = (path) => `$${path.map((part) => /^\d+$/.test(part) ? `[${part}]` : `."${part.replace(/(["\\])/g, "\\$1")}"`).join("")}`;
+var NUMERIC_TEXT_PATTERN = "^\\s*-?(\\d+\\.?\\d*|\\.\\d+)([eE][-+]?\\d+)?\\s*$";
+var jsonPathExprs = (column, path) => {
+  switch (columnDialect(column)) {
+    case "pg": {
+      const pathArray = sql2`array[${sql2.join(
+        path.map((part) => sql2`${part}`),
+        sql2`, `
+      )}]::text[]`;
+      const text = sql2`(${column} #>> ${pathArray})`;
+      return {
+        text,
+        number: sql2`(case when ${text} ~ ${NUMERIC_TEXT_PATTERN} then ${text}::numeric end)`,
+        boolean: text,
+        encodeBoolean: (value) => String(value)
+      };
+    }
+    case "mysql": {
+      const extracted = sql2`json_extract(${column}, ${jsonPathString(path)})`;
+      const text = sql2`(case when json_type(${extracted}) = 'NULL' then null else json_unquote(${extracted}) end)`;
+      return {
+        text,
+        number: sql2`(case when ${text} regexp ${NUMERIC_TEXT_PATTERN} then cast(${text} as decimal(65, 30)) end)`,
+        boolean: text,
+        encodeBoolean: (value) => String(value)
+      };
+    }
+    default: {
+      const extracted = sql2`json_extract(${column}, ${jsonPathString(path)})`;
+      return {
+        text: sql2`cast(${extracted} as text)`,
+        number: sql2`(case when typeof(${extracted}) in ('integer', 'real') then ${extracted} end)`,
+        // SQLite has no boolean type: a JSON `true` comes back as the integer 1.
+        boolean: extracted,
+        encodeBoolean: (value) => value ? 1 : 0
+      };
+    }
+  }
+};
+var JSON_PATH_COMPARISONS = {
+  eq: "=",
+  ne: "<>",
+  lt: "<",
+  lte: "<=",
+  gt: ">",
+  gte: ">="
+};
+var inferJsonPathCast = (value) => typeof value === "number" ? "number" : typeof value === "boolean" ? "boolean" : "text";
+var jsonPathCondition = (column, columnName, filter) => {
+  const { path, as: castOverride, ...operators } = filter;
+  const locator = `${columnName}.path`;
+  if (!Array.isArray(path) || !path.length) {
+    throw new GraphQLError4(`WHERE ${locator}: 'path' must name at least one key`);
+  }
+  const exprs = jsonPathExprs(column, path);
+  const variants = [];
+  for (const [operatorName, operatorValue] of Object.entries(operators)) {
+    if (operatorValue === null || operatorValue === void 0) {
+      continue;
+    }
+    if (operatorName === "isNull" || operatorName === "isNotNull") {
+      if (operatorValue === false) {
+        continue;
+      }
+      variants.push(operatorName === "isNull" ? sql2`${exprs.text} is null` : sql2`${exprs.text} is not null`);
+      continue;
+    }
+    if (operatorName in safeLikeOps) {
+      const { buildPattern, insensitive } = safeLikeOps[operatorName];
+      if (typeof operatorValue !== "string") {
+        throw new GraphQLError4(`WHERE ${locator}: operator '${operatorName}' takes a string`);
+      }
+      variants.push(safeLikeCondition(exprs.text, buildPattern(operatorValue), insensitive));
+      continue;
+    }
+    const comparison = JSON_PATH_COMPARISONS[operatorName];
+    if (!comparison) {
+      throw new GraphQLError4(`WHERE ${locator}: Unknown operator: ${operatorName}`);
+    }
+    const cast = castOverride ?? inferJsonPathCast(operatorValue);
+    if (cast === "number") {
+      const numeric = Number(operatorValue);
+      if (Number.isNaN(numeric)) {
+        throw new GraphQLError4(
+          `WHERE ${locator}: operator '${operatorName}' compares as a number, so its value must be one`
+        );
+      }
+      variants.push(sql2`${exprs.number} ${sql2.raw(comparison)} ${numeric}`);
+    } else if (cast === "boolean") {
+      const truthy = operatorValue === true || operatorValue === "true";
+      variants.push(sql2`${exprs.boolean} ${sql2.raw(comparison)} ${exprs.encodeBoolean(truthy)}`);
+    } else {
+      variants.push(sql2`${exprs.text} ${sql2.raw(comparison)} ${String(operatorValue)}`);
+    }
+  }
+  return variants.length ? variants.length > 1 ? and(...variants) : variants[0] : void 0;
+};
 var extractFiltersColumn = (column, columnName, operators) => {
   const { OR, AND, NOT, ...restOperators } = operators;
   const entries = Object.entries(restOperators);
@@ -2118,6 +2292,13 @@ 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 === "path" && isJsonColumn2(column)) {
+      for (const pathFilter of operatorValue) {
+        const extracted = jsonPathCondition(column, columnName, pathFilter);
+        if (extracted) {
+          variants.push(extracted);
+        }
+      }
     } else if (operatorName === "contains" && isJsonColumn2(column)) {
       variants.push(jsonContains(column, columnName, operatorValue));
     } else if (operatorName in safeLikeOps) {
@@ -2125,7 +2306,8 @@ var extractFiltersColumn = (column, columnName, operators) => {
       variants.push(safeLikeCondition(column, buildPattern(operatorValue), insensitive));
     } else if (operatorName in arrayValueOps) {
       if (!operatorValue.length) {
-        throw new GraphQLError4(`WHERE ${columnName}: Unable to use operator ${operatorName} with an empty array!`);
+        variants.push(operatorName === "inArray" ? sqlFalse() : sqlTrue());
+        continue;
       }
       const arrayValue = operatorValue.map((val) => remapFromGraphQLCore(val, column, columnName));
       variants.push(arrayValueOps[operatorName](column, arrayValue));
@@ -2133,7 +2315,8 @@ var extractFiltersColumn = (column, columnName, operators) => {
       variants.push(arrayContains(column, [operatorValue]));
     } else if (operatorName in arrayMembershipOps) {
       if (!operatorValue.length) {
-        throw new GraphQLError4(`WHERE ${columnName}: Unable to use operator ${operatorName} with an empty array!`);
+        variants.push(operatorName === "hasSome" ? sqlFalse() : sqlTrue());
+        continue;
       }
       variants.push(arrayMembershipOps[operatorName](column, operatorValue));
     } else if (operatorName === "isEmpty") {
@@ -2396,7 +2579,7 @@ var extractRelationsParamsInner = (relationMap, tables, tableName, typeName, ori
     } : void 0;
     const hasPagination = offset != null || limit != null;
     const pkNames = targetPkNames ?? [];
-    thisRecord.orderBy = relationArgs?.orderBy ? (aliasedTable2) => extractOrderBy(aliasedTable2, relationArgs.orderBy, relationFilterCtx(filterCtx, targetTableName)) : hasPagination && pkNames.length ? (aliasedTable2) => primaryKeyOrderExprs(aliasedTable2, pkNames) : void 0;
+    thisRecord.orderBy = relationArgs?.orderBy ? (aliasedTable2) => extractOrderBy(aliasedTable2, relationArgs.orderBy, relationFilterCtx(filterCtx, targetTableName), relWhere) : hasPagination && pkNames.length ? (aliasedTable2) => primaryKeyOrderExprs(aliasedTable2, pkNames) : void 0;
     thisRecord.offset = offset;
     thisRecord.limit = limit;
     const relWith = relationField ? extractRelationsParamsInner(
@@ -2476,6 +2659,15 @@ var primaryKeyOrderExprs = (table, pkNames) => {
 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 orderByCursorObstacle = (orderBy) => {
+  if (orderByHasRelationEntry(orderBy)) {
+    return "'after' cannot be combined with an orderBy that orders through a relation \u2014 a related row's value cannot be encoded into a cursor.";
+  }
+  if (orderBy && Object.values(orderBy).some((config) => config && typeof config === "object" && config.matchFilterOrder)) {
+    return "'after' cannot be combined with 'matchFilterOrder' \u2014 a row's position in the request's own filter list is not a value of the row, so it cannot be encoded into a cursor.";
+  }
+  return void 0;
+};
 var cursorOrderingEntries = (orderBy, pkNames) => {
   const entries = orderBy ? orderByEntries(orderBy) : [];
   const seen = new Set(entries.map(([column]) => column));
@@ -3072,11 +3264,10 @@ var runRelationalSelect = async (opts) => {
     if (after != null && distinct) {
       throw new GraphQLError4("'after' cannot be combined with 'distinct'.");
     }
-    if (orderByHasRelationEntry(orderBy)) {
+    const cursorObstacle = orderByCursorObstacle(orderBy);
+    if (cursorObstacle) {
       if (after != null) {
-        throw new GraphQLError4(
-          "'after' cannot be combined with an orderBy that orders through a relation \u2014 a related row's value cannot be encoded into a cursor."
-        );
+        throw new GraphQLError4(cursorObstacle);
       }
     } else if (!pkNames?.length) {
       if (after != null) {
@@ -3116,13 +3307,13 @@ var runRelationalSelect = async (opts) => {
     // drizzle-orm v1 RQB calls orderBy/where with the aliased table proxy — use it
     // directly so column refs match the CTE alias.
     orderBy: distinctKeys ? (aliasedTable2) => [
-      ...orderBy ? extractOrderBy(aliasedTable2, orderBy, relationFilterCtx(filterCtx, tableName)) : [],
+      ...orderBy ? extractOrderBy(aliasedTable2, orderBy, relationFilterCtx(filterCtx, tableName), where) : [],
       ...primaryKeyOrderExprs(aliasedTable2, pkNames)
     ] : 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,
+    ) : orderBy ? (aliasedTable2) => extractOrderBy(aliasedTable2, orderBy, relationFilterCtx(filterCtx, tableName), where) : 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,
@@ -4822,11 +5013,10 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
           if (after != null && distinct?.length) {
             throw new GraphQLError8("'after' cannot be combined with 'distinct'.");
           }
-          if (orderByHasRelationEntry(orderBy)) {
+          const cursorObstacle = orderByCursorObstacle(orderBy);
+          if (cursorObstacle) {
             if (after != null) {
-              throw new GraphQLError8(
-                "'after' cannot be combined with an orderBy that orders through a relation \u2014 a related row's value cannot be encoded into a cursor."
-              );
+              throw new GraphQLError8(cursorObstacle);
             }
           } else if (!pkNames.length) {
             if (after != null) {
@@ -4874,7 +5064,7 @@ var generateSelectArray2 = (db, tableName, tables, relationMap, orderArgs, filte
           q = q.orderBy(...cursorOrderExprs(table, cursorEntries));
         } else if (orderBy) {
           q = q.orderBy(
-            ...extractOrderBy(table, orderBy, relationFilterCtx(filterCtx, tableName)),
+            ...extractOrderBy(table, orderBy, relationFilterCtx(filterCtx, tableName), where),
             ...distinctKeys ? primaryKeyOrderExprs(table, pkNames) : []
           );
         } else if ((distinctKeys || offset != null || limit != null) && pkNames.length) {
@@ -4940,7 +5130,7 @@ var generateSelectSingle2 = (db, tableName, tables, relationMap, orderArgs, filt
           q = q.where(extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)));
         }
         if (orderBy) {
-          q = q.orderBy(...extractOrderBy(table, orderBy, relationFilterCtx(filterCtx, tableName)));
+          q = q.orderBy(...extractOrderBy(table, orderBy, relationFilterCtx(filterCtx, tableName), where));
         } else if (pkNames.length) {
           q = q.orderBy(...primaryKeyOrderExprs(table, pkNames));
         }