@vantreeseba/drizzle-graphql 7.1.0 → 7.3.0

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { is as is8 } from "drizzle-orm";
+import { getColumns as getColumns6, is as is8, Table } from "drizzle-orm";
 import { MySqlDatabase } from "drizzle-orm/mysql-core";
 import { PgAsyncDatabase } from "drizzle-orm/pg-core";
 import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
@@ -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);
         }
@@ -1198,6 +1199,30 @@ var resolveLimitPolicy = (global, table) => {
   }
   return { defaultLimit, maxLimit, clampToMax: table?.clampToMax ?? global?.clampToMax ?? false };
 };
+var excludedColumnRegistry = /* @__PURE__ */ new WeakMap();
+var registerColumnExclusions = (tables, exclude) => {
+  for (const [tableName, table] of Object.entries(tables)) {
+    const hidden = exclude?.columns?.[tableName];
+    if (hidden?.length) {
+      excludedColumnRegistry.set(table, new Set(hidden));
+    } else {
+      excludedColumnRegistry.delete(table);
+    }
+  }
+};
+var hasExcludedColumns = (table) => excludedColumnRegistry.has(table);
+var excludedColumnsKey = (table) => {
+  const hidden = excludedColumnRegistry.get(table);
+  return hidden ? [...hidden].sort().join(",") : "";
+};
+var visibleColumns = (table) => {
+  const columns = getColumns2(table);
+  const hidden = excludedColumnRegistry.get(table);
+  if (!hidden) {
+    return columns;
+  }
+  return Object.fromEntries(Object.entries(columns).filter(([columnName]) => !hidden.has(columnName)));
+};
 var listFieldComplexity = (options, policy) => ({ args, childComplexity }) => {
   const limit = args["limit"];
   const requested = typeof limit === "number" && limit > 0 ? limit : void 0;
@@ -1317,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`."
     }
   }
 });
@@ -1382,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) => {
@@ -1507,17 +1585,20 @@ var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
 };
 var orderMap = /* @__PURE__ */ new WeakMap();
 var generateTableOrderCached = (table) => {
-  if (orderMap.has(table)) {
+  const cacheable = !hasExcludedColumns(table);
+  if (cacheable && orderMap.has(table)) {
     return orderMap.get(table);
   }
   let remapped = {};
   try {
-    const columns = getColumns2(table);
+    const columns = visibleColumns(table);
     const columnEntries = Object.entries(columns);
     remapped = Object.fromEntries(
       columnEntries.map(([columnName, _columnDescription]) => [columnName, { type: innerOrder }])
     );
-    orderMap.set(table, remapped);
+    if (cacheable) {
+      orderMap.set(table, remapped);
+    }
   } catch (_err) {
   }
   return remapped;
@@ -1526,7 +1607,7 @@ var generateTableFilterValuesCached = (table, tableName, cacheCtx) => {
   if (cacheCtx.filterFieldCache.has(table)) {
     return cacheCtx.filterFieldCache.get(table);
   }
-  const columns = getColumns2(table);
+  const columns = visibleColumns(table);
   const columnEntries = Object.entries(columns);
   const remapped = Object.fromEntries(
     columnEntries.map(([columnName, column]) => [
@@ -1547,7 +1628,7 @@ var generateTableSelectTypeFieldsCached = (table, tableName, cacheCtx) => {
   if (cacheCtx.selectFieldCache.has(table)) {
     return cacheCtx.selectFieldCache.get(table);
   }
-  const columns = getColumns2(table);
+  const columns = visibleColumns(table);
   const columnEntries = Object.entries(columns);
   const remapped = Object.fromEntries(
     columnEntries.map(([columnName, column]) => [
@@ -1905,7 +1986,7 @@ var generateTableTypes = (tableName, tables, relationMap, withReturning, relatio
     relationAggregateFactory
   );
   const table = tables[tableName];
-  const columns = getColumns2(table);
+  const columns = visibleColumns(table);
   const columnEntries = Object.entries(columns);
   const relaxedColumns = nestedWrites?.relaxedColumns(tableName);
   const insertFields = Object.fromEntries(
@@ -1976,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) => {
@@ -2010,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)) {
@@ -2019,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,
@@ -2033,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 = "\\";
@@ -2070,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);
@@ -2091,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) {
@@ -2098,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));
@@ -2106,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") {
@@ -2369,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(
@@ -2449,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));
@@ -2580,7 +2799,7 @@ var attachRowCursors = (rows, entries) => {
 };
 var rowCursorResolver = (source) => source?.[ROW_CURSOR_PROP] ?? null;
 var getUniqueColumnSets = (table, getTableConfig4) => {
-  const cols = getColumns2(table);
+  const cols = visibleColumns(table);
   const propNameByColumnName = new Map(Object.entries(cols).map(([propName, col]) => [col.name, propName]));
   const toPropNames = (columnNames) => {
     const propNames = [];
@@ -2620,12 +2839,13 @@ var getUniqueColumnSets = (table, getTableConfig4) => {
 var DISTINCT_RN = "__drizzle_graphql_distinct_rn";
 var columnEnumCache = /* @__PURE__ */ new WeakMap();
 var generateColumnEnum = (table, enumName, description, predicate = () => true) => {
+  const cacheKey = `${enumName}\0${excludedColumnsKey(table)}`;
   let tableCache = columnEnumCache.get(table);
-  const cached = tableCache?.get(enumName);
+  const cached = tableCache?.get(cacheKey);
   if (cached) {
     return cached;
   }
-  const columnNames = Object.entries(getColumns2(table)).filter(([columnName, column]) => predicate(column, columnName)).map(([columnName]) => columnName);
+  const columnNames = Object.entries(visibleColumns(table)).filter(([columnName, column]) => predicate(column, columnName)).map(([columnName]) => columnName);
   if (!columnNames.length) {
     return void 0;
   }
@@ -2638,7 +2858,7 @@ var generateColumnEnum = (table, enumName, description, predicate = () => true)
     tableCache = /* @__PURE__ */ new Map();
     columnEnumCache.set(table, tableCache);
   }
-  tableCache.set(enumName, enumType);
+  tableCache.set(cacheKey, enumType);
   return enumType;
 };
 var generateDistinctEnum = (table, typeName) => generateColumnEnum(table, `${typeName}DistinctColumn`, `Columns of ${typeName} that a query can be made distinct on`);
@@ -3044,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) {
@@ -3088,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,
@@ -3258,7 +3477,7 @@ var classifyAggregateColumns = (table, tableName) => {
   const numeric = {};
   const orderable = {};
   const all = {};
-  for (const [columnName, column] of Object.entries(getColumns3(table))) {
+  for (const [columnName, column] of Object.entries(visibleColumns(table))) {
     all[columnName] = column;
     const converted = drizzleColumnToGraphQLType(column, columnName, tableName, true, false, false);
     const gqlType = converted.type;
@@ -3502,7 +3721,7 @@ var HAVING_OPS = { eq: eq2, ne: ne2, gt: gt2, gte: gte2, lt: lt2, lte: lte2 };
 var groupableColumns = (table, tableName) => {
   const { orderable } = classifyAggregateColumns(table, tableName);
   const groupable = { ...orderable };
-  for (const [columnName, column] of Object.entries(getColumns3(table))) {
+  for (const [columnName, column] of Object.entries(visibleColumns(table))) {
     if (groupable[columnName]) {
       continue;
     }
@@ -3970,7 +4189,8 @@ var generateSchemaData = (db, schema, relations, options) => {
   const { relationsDepthLimit, prefixes, suffixes, typeNameMapper, shouldEagerLoad, features, complexity, limits } = options;
   const rawSchema = schema;
   const schemaEntries = Object.entries(rawSchema);
-  const tableEntries = schemaEntries.filter(([_key, value]) => is4(value, MySqlTable));
+  const excludedTables = new Set(options.exclude?.tables ?? []);
+  const tableEntries = schemaEntries.filter(([key, value]) => is4(value, MySqlTable) && !excludedTables.has(key));
   const tables = Object.fromEntries(tableEntries);
   if (!tableEntries.length) {
     throw new Error(
@@ -3984,7 +4204,11 @@ var generateSchemaData = (db, schema, relations, options) => {
   }
   registerScalarOverrides(tables, options);
   registerEnumConfig(options);
+  registerColumnExclusions(tables, options.exclude);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
+  for (const excluded of excludedTables) {
+    delete namedRelations[excluded];
+  }
   attachTargetPrimaryKeys(namedRelations, tables, mysqlPrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
   const filterCtx = { tables, relationMap: namedRelations };
@@ -4463,7 +4687,7 @@ var createNestedWriteTypes = (params) => {
     }
     const omitted = plan.fkSide === "child" ? plan.foreignColPropName : void 0;
     const fields = Object.fromEntries(
-      Object.entries(getColumns4(plan.targetTable)).filter(([columnName]) => columnName !== omitted).map(([columnName, column]) => [
+      Object.entries(visibleColumns(plan.targetTable)).filter(([columnName]) => columnName !== omitted).map(([columnName, column]) => [
         columnName,
         drizzleColumnToGraphQLType(column, columnName, plan.targetTableName, false, true, true)
       ])
@@ -4789,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) {
@@ -4841,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) {
@@ -4907,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));
         }
@@ -5341,7 +5564,8 @@ function generateSchemaData2(db, schema, relations, options) {
     limits
   } = options;
   const schemaEntries = Object.entries(schema);
-  const tableEntries = schemaEntries.filter(([_key, value]) => is6(value, PgTable));
+  const excludedTables = new Set(options.exclude?.tables ?? []);
+  const tableEntries = schemaEntries.filter(([key, value]) => is6(value, PgTable) && !excludedTables.has(key));
   const tables = Object.fromEntries(tableEntries);
   if (!tableEntries.length) {
     throw new Error(
@@ -5350,7 +5574,11 @@ function generateSchemaData2(db, schema, relations, options) {
   }
   registerScalarOverrides(tables, options);
   registerEnumConfig(options);
+  registerColumnExclusions(tables, options.exclude);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
+  for (const excluded of excludedTables) {
+    delete namedRelations[excluded];
+  }
   attachTargetPrimaryKeys(namedRelations, tables, pgPrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
   const filterCtx = { tables, relationMap: namedRelations };
@@ -6358,7 +6586,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
   } = options;
   const rawSchema = schema;
   const schemaEntries = Object.entries(rawSchema);
-  const tableEntries = schemaEntries.filter(([_key, value]) => is7(value, SQLiteTable));
+  const excludedTables = new Set(options.exclude?.tables ?? []);
+  const tableEntries = schemaEntries.filter(([key, value]) => is7(value, SQLiteTable) && !excludedTables.has(key));
   const tables = Object.fromEntries(tableEntries);
   if (!tableEntries.length) {
     throw new Error(
@@ -6367,7 +6596,11 @@ var generateSchemaData3 = (db, schema, relations, options) => {
   }
   registerScalarOverrides(tables, options);
   registerEnumConfig(options);
+  registerColumnExclusions(tables, options.exclude);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
+  for (const excluded of excludedTables) {
+    delete namedRelations[excluded];
+  }
   attachTargetPrimaryKeys(namedRelations, tables, sqlitePrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
   const filterCtx = { tables, relationMap: namedRelations };
@@ -6914,6 +7147,49 @@ var buildSchema = (db, config) => {
     limitPolicyCache.set(tableName, resolved);
     return resolved;
   } : void 0;
+  const exclude = config?.exclude;
+  if (exclude) {
+    const tableNames = new Set(
+      Object.entries(schema).filter(([, value]) => is8(value, Table)).map(([key]) => key)
+    );
+    const excludedTables = new Set(exclude.tables ?? []);
+    for (const tableName of excludedTables) {
+      if (!tableNames.has(tableName)) {
+        throw new Error(
+          `Drizzle-GraphQL Error: config.exclude.tables names '${tableName}', which is not a table in the Drizzle schema.`
+        );
+      }
+    }
+    if (excludedTables.size >= tableNames.size) {
+      throw new Error(
+        "Drizzle-GraphQL Error: config.exclude.tables excludes every table in the schema, leaving nothing to generate."
+      );
+    }
+    for (const [tableName, columnNames] of Object.entries(exclude.columns ?? {})) {
+      if (!tableNames.has(tableName)) {
+        throw new Error(
+          `Drizzle-GraphQL Error: config.exclude.columns names table '${tableName}', which is not a table in the Drizzle schema.`
+        );
+      }
+      if (excludedTables.has(tableName)) {
+        continue;
+      }
+      const columns = getColumns6(schema[tableName]);
+      for (const columnName of columnNames) {
+        const column = columns[columnName];
+        if (!column) {
+          throw new Error(
+            `Drizzle-GraphQL Error: config.exclude.columns names '${tableName}.${columnName}', which is not a column of that table.`
+          );
+        }
+        if (column.notNull && !column.hasDefault && !column.defaultFn) {
+          console.warn(
+            `Drizzle-GraphQL Warning: excluded column '${tableName}.${columnName}' is NOT NULL with no default, so generated inserts for '${tableName}' can never succeed.`
+          );
+        }
+      }
+    }
+  }
   const eagerOpt = config?.eagerLoadRelations;
   const shouldEagerLoad = eagerOpt === void 0 || eagerOpt === true ? () => true : eagerOpt === false ? () => false : eagerOpt;
   if (!typeNameMapper && suffixes.list === suffixes.single) {
@@ -6947,6 +7223,7 @@ var buildSchema = (db, config) => {
     enumNameMapper: config?.enumNameMapper,
     transactions,
     limits,
+    exclude,
     docs: {
       describeColumn: config?.describeColumn,
       describeTable: config?.describeTable,