@vantreeseba/drizzle-graphql 5.5.0 → 5.6.0

package/dist/index.js

@@ -17,6 +17,7 @@ import {
   asc,
   desc,
   eq,
+  extractExtendedColumnType as extractExtendedColumnType2,
   getColumns,
   getTableAsAliasSQL,
   gt,
@@ -104,200 +105,29 @@ var uncapitalize = (input) => input?.length ? `${input[0].toLocaleLowerCase()}${
 var capitalize = (input) => input?.length ? `${input[0].toLocaleUpperCase()}${input.length > 1 ? input.slice(1, input.length) : ""}` : input;
 
 // src/util/data-mappers/index.ts
-import { getTableColumns, is, One } from "drizzle-orm";
-import { GraphQLError } from "graphql";
-var isJsonColumn = (column) => (column.dataType ?? "").includes("json") && column.columnType !== "PgGeometryObject";
-var remapToGraphQLCore = (key, value, tableName, column, relationMap) => {
-  if (Array.isArray(value)) {
-    const relations = relationMap?.[tableName];
-    if (relations?.[key]) {
-      const rel = relations[key];
-      return remapToGraphQLArrayOutput(
-        value,
-        rel.targetTableName,
-        rel.relation?.targetTable ?? rel.relation?.referencedTable,
-        relationMap
-      );
-    }
-  }
-  if (typeof value === "object" && value !== null) {
-    const relations = relationMap?.[tableName];
-    if (relations?.[key]) {
-      const rel = relations[key];
-      const remapped = remapToGraphQLSingleOutput(
-        value,
-        rel.targetTableName,
-        rel.relation?.targetTable ?? rel.relation?.referencedTable,
-        relationMap
-      );
-      return remapped;
-    }
-  }
-  if (!column) {
-    return value;
-  }
-  if (isJsonColumn(column)) {
-    return value;
-  }
-  if (value instanceof Date) {
-    return value.toISOString();
-  }
-  if (value instanceof Buffer) {
-    return Array.from(value);
-  }
-  if (typeof value === "bigint") {
-    return value.toString();
-  }
-  if (Array.isArray(value)) {
-    if (column.columnType === "PgGeometry" || column.columnType === "PgVector") {
-      return value;
-    }
-    return value.map((arrVal) => remapToGraphQLCore(key, arrVal, tableName, column, relationMap));
-  }
-  if (typeof value === "object" && value !== null) {
-    if (column.columnType === "PgGeometryObject") {
-      return value;
-    }
-    return JSON.stringify(value);
-  }
-  return value;
-};
-var remapToGraphQLSingleOutput = (queryOutput, tableName, table, relationMap) => {
-  for (const [key, value] of Object.entries(queryOutput)) {
-    if (value === void 0 || value === null) {
-      const relEntry = value === null ? relationMap?.[tableName]?.[key] : void 0;
-      if (relEntry && is(relEntry.relation, One)) {
-        queryOutput[key] = null;
-        continue;
-      }
-      delete queryOutput[key];
-      continue;
-    }
-    const column = table[key];
-    if (value === 0n && column && column.columnType === "SQLiteBigInt" && !column.notNull) {
-      delete queryOutput[key];
-      continue;
-    }
-    queryOutput[key] = remapToGraphQLCore(key, value, tableName, column, relationMap);
-  }
-  return queryOutput;
-};
-var remapToGraphQLArrayOutput = (queryOutput, tableName, table, relationMap) => {
-  for (const entry of queryOutput) {
-    remapToGraphQLSingleOutput(entry, tableName, table, relationMap);
-  }
-  return queryOutput;
-};
-var remapFromGraphQLCore = (value, column, columnName) => {
-  const dataType = column.dataType ?? "";
-  const columnType = column.columnType ?? "";
-  const isTimestampColumn = columnType === "SQLiteTimestamp" || columnType === "SQLiteTimestampMs" || columnType === "MySqlTimestamp" || columnType === "MySqlDateTime" || columnType === "PgTimestamp" || columnType === "PgTimestampString";
-  if (isTimestampColumn) {
-    const formatted = new Date(value);
-    if (Number.isNaN(formatted.getTime())) {
-      throw new GraphQLError(`Field '${columnName}' is not a valid date!`);
-    }
-    return formatted;
-  }
-  const isDateOnlyColumn = columnType === "MySqlDate" || columnType === "PgDate";
-  if (isDateOnlyColumn && typeof value === "string") {
-    const dateOnly = value.includes("T") ? value.split("T")[0] : value;
-    const check = new Date(dateOnly);
-    if (Number.isNaN(check.getTime())) {
-      throw new GraphQLError(`Field '${columnName}' is not a valid date!`);
-    }
-    return dateOnly;
-  }
-  if (dataType.includes("bigint")) {
-    try {
-      return BigInt(value);
-    } catch {
-      throw new GraphQLError(`Field '${columnName}' is not a BigInt!`);
-    }
-  }
-  if (dataType.includes("json") && column.columnType !== "PgGeometryObject") {
-    return value;
-  }
-  switch (dataType) {
-    case "date": {
-      const formatted = new Date(value);
-      if (Number.isNaN(formatted.getTime())) {
-        throw new GraphQLError(`Field '${columnName}' is not a valid date!`);
-      }
-      return formatted;
-    }
-    case "buffer": {
-      if (!Array.isArray(value)) {
-        throw new GraphQLError(`Field '${columnName}' is not an array!`);
-      }
-      return Buffer.from(value);
-    }
-    case "json": {
-      if (column.columnType === "PgGeometryObject") {
-        return value;
-      }
-      try {
-        return JSON.parse(value);
-      } catch (e) {
-        throw new GraphQLError(
-          `Invalid JSON in field '${columnName}':
-${e instanceof Error ? e.message : "Unknown error"}`
-        );
-      }
-    }
-    case "array": {
-      if (!Array.isArray(value)) {
-        throw new GraphQLError(`Field '${columnName}' is not an array!`);
-      }
-      if (column.columnType === "PgGeometry" && value.length !== 2) {
-        throw new GraphQLError(
-          `Invalid float tuple in field '${columnName}': expected array with length of 2, received ${value.length}`
-        );
-      }
-      return value;
-    }
-    case "bigint": {
-      try {
-        return BigInt(value);
-      } catch (_error) {
-        throw new GraphQLError(`Field '${columnName}' is not a BigInt!`);
-      }
-    }
-    default: {
-      if (typeof value === "object" && value !== null && Object.getPrototypeOf(value) === null) {
-        return Object.assign({}, value);
-      }
-      return value;
-    }
-  }
-};
-var remapFromGraphQLSingleInput = (queryInput, table) => {
-  for (const [key, value] of Object.entries(queryInput)) {
-    if (value === void 0) {
-      delete queryInput[key];
-    } else {
-      const column = getTableColumns(table)[key];
-      if (!column) {
-        throw new GraphQLError(`Unknown column: ${key}`);
-      }
-      if (value === null && column.notNull) {
-        delete queryInput[key];
-        continue;
-      }
-      queryInput[key] = remapFromGraphQLCore(value, column, key);
-    }
-  }
-  return queryInput;
-};
-var remapFromGraphQLArrayInput = (queryInput, table) => {
-  for (const entry of queryInput) {
-    remapFromGraphQLSingleInput(entry, table);
-  }
-  return queryInput;
-};
+import { getTableColumns as getTableColumns2, is as is2, One } from "drizzle-orm";
+import { GraphQLError as GraphQLError2 } from "graphql";
+
+// src/util/type-converter/index.ts
+import { extractExtendedColumnType, getTableColumns, is } from "drizzle-orm";
+import { MySqlInt, MySqlSerial } from "drizzle-orm/mysql-core";
+import { PgDate, PgDateString, PgInteger, PgSerial, PgTimestamp, PgTimestampString, PgUUID } from "drizzle-orm/pg-core";
+import { SQLiteInteger } from "drizzle-orm/sqlite-core";
+import {
+  GraphQLBoolean,
+  GraphQLEnumType,
+  GraphQLFloat,
+  GraphQLInputObjectType,
+  GraphQLInt,
+  GraphQLList,
+  GraphQLNonNull,
+  GraphQLObjectType,
+  GraphQLScalarType as GraphQLScalarType2,
+  GraphQLString
+} from "graphql";
 
 // src/util/scalars/index.ts
-import { GraphQLError as GraphQLError2, GraphQLScalarType, Kind } from "graphql";
+import { GraphQLError, GraphQLScalarType, Kind } from "graphql";
 import { GraphQLDate, GraphQLDateTime, GraphQLJSON, GraphQLUUID } from "graphql-scalars";
 var asDecimalString = (value) => {
   if (typeof value === "bigint") {
@@ -305,10 +135,10 @@ var asDecimalString = (value) => {
   }
   if (typeof value === "number") {
     if (!Number.isInteger(value)) {
-      throw new GraphQLError2(`BigInt cannot represent non-integer value: ${value}`);
+      throw new GraphQLError(`BigInt cannot represent non-integer value: ${value}`);
     }
     if (!Number.isSafeInteger(value)) {
-      throw new GraphQLError2(
+      throw new GraphQLError(
         `BigInt cannot represent the number ${value} without precision loss \u2014 pass it as a string instead`
       );
     }
@@ -316,11 +146,11 @@ var asDecimalString = (value) => {
   }
   if (typeof value === "string") {
     if (!/^-?\d+$/.test(value)) {
-      throw new GraphQLError2(`BigInt cannot represent non-integer value: "${value}"`);
+      throw new GraphQLError(`BigInt cannot represent non-integer value: "${value}"`);
     }
     return value;
   }
-  throw new GraphQLError2(`BigInt cannot represent value: ${JSON.stringify(value)}`);
+  throw new GraphQLError(`BigInt cannot represent value: ${JSON.stringify(value)}`);
 };
 var GraphQLBigIntString = new GraphQLScalarType({
   name: "BigInt",
@@ -329,7 +159,7 @@ var GraphQLBigIntString = new GraphQLScalarType({
   parseValue: asDecimalString,
   parseLiteral: (ast) => {
     if (ast.kind !== Kind.STRING && ast.kind !== Kind.INT) {
-      throw new GraphQLError2(`BigInt cannot represent a ${ast.kind}`, { nodes: ast });
+      throw new GraphQLError(`BigInt cannot represent a ${ast.kind}`, { nodes: ast });
     }
     return asDecimalString(ast.value);
   }
@@ -341,17 +171,17 @@ var asNumericString = (value) => {
   }
   if (typeof value === "number") {
     if (!Number.isFinite(value)) {
-      throw new GraphQLError2(`Decimal cannot represent non-finite value: ${value}`);
+      throw new GraphQLError(`Decimal cannot represent non-finite value: ${value}`);
     }
     return String(value);
   }
   if (typeof value === "string") {
     if (!numericStringPattern.test(value)) {
-      throw new GraphQLError2(`Decimal cannot represent non-numeric value: "${value}"`);
+      throw new GraphQLError(`Decimal cannot represent non-numeric value: "${value}"`);
     }
     return value;
   }
-  throw new GraphQLError2(`Decimal cannot represent value: ${JSON.stringify(value)}`);
+  throw new GraphQLError(`Decimal cannot represent value: ${JSON.stringify(value)}`);
 };
 var GraphQLDecimalString = new GraphQLScalarType({
   name: "Decimal",
@@ -360,28 +190,13 @@ var GraphQLDecimalString = new GraphQLScalarType({
   parseValue: asNumericString,
   parseLiteral: (ast) => {
     if (ast.kind !== Kind.STRING && ast.kind !== Kind.INT && ast.kind !== Kind.FLOAT) {
-      throw new GraphQLError2(`Decimal cannot represent a ${ast.kind}`, { nodes: ast });
+      throw new GraphQLError(`Decimal cannot represent a ${ast.kind}`, { nodes: ast });
     }
     return asNumericString(ast.value);
   }
 });
 
 // src/util/type-converter/index.ts
-import { extractExtendedColumnType, is as is2 } from "drizzle-orm";
-import { MySqlInt, MySqlSerial } from "drizzle-orm/mysql-core";
-import { PgDate, PgDateString, PgInteger, PgSerial, PgTimestamp, PgTimestampString, PgUUID } from "drizzle-orm/pg-core";
-import { SQLiteInteger } from "drizzle-orm/sqlite-core";
-import {
-  GraphQLBoolean,
-  GraphQLEnumType,
-  GraphQLFloat,
-  GraphQLInputObjectType,
-  GraphQLInt,
-  GraphQLList,
-  GraphQLNonNull,
-  GraphQLObjectType,
-  GraphQLString
-} from "graphql";
 var allowedNameChars = /^[a-zA-Z0-9_]+$/;
 var enumMap = /* @__PURE__ */ new WeakMap();
 var generateEnumCached = (column, columnName, tableName) => {
@@ -468,7 +283,7 @@ var columnBaseToGraphQLCore = (column, columnName, tableName, isInput) => {
     case "bigint":
       return { type: GraphQLBigIntString, description: "BigInt" };
     case "number": {
-      return is2(column, PgInteger) || is2(column, PgSerial) || is2(column, MySqlInt) || is2(column, MySqlSerial) || is2(column, SQLiteInteger) ? { type: GraphQLInt, description: "Integer" } : { type: GraphQLFloat, description: "Float" };
+      return is(column, PgInteger) || is(column, PgSerial) || is(column, MySqlInt) || is(column, MySqlSerial) || is(column, SQLiteInteger) ? { type: GraphQLInt, description: "Integer" } : { type: GraphQLFloat, description: "Float" };
     }
     case "array": {
       if (column.columnType === "PgVector") {
@@ -498,12 +313,65 @@ var columnBaseToGraphQLCore = (column, columnName, tableName, isInput) => {
       throw new Error(`Drizzle-GraphQL Error: Type ${column.dataType} is not implemented!`);
   }
 };
+var columnScalarOverrides = /* @__PURE__ */ new WeakMap();
+var getColumnScalarOverride = (column, isInput) => {
+  const override = columnScalarOverrides.get(column);
+  return override ? isInput ? override.input : override.output : void 0;
+};
+var normalizeScalarOverride = (override, tableName, columnName) => {
+  const pair = override instanceof GraphQLScalarType2 ? { output: override, input: override } : { output: override.output, input: override.input };
+  for (const scalar of [pair.output, pair.input]) {
+    if (scalar !== void 0 && !(scalar instanceof GraphQLScalarType2)) {
+      throw new Error(
+        `Drizzle-GraphQL Error: Scalar override for column '${tableName}.${columnName}' must be a GraphQLScalarType!`
+      );
+    }
+  }
+  return pair;
+};
+var registerScalarOverrides = (tables, config) => {
+  for (const [tableName, table] of Object.entries(tables)) {
+    for (const [columnName, column] of Object.entries(getTableColumns(table))) {
+      const declared = config.scalars?.[tableName]?.[columnName];
+      let resolved;
+      if (declared !== void 0) {
+        resolved = normalizeScalarOverride(declared, tableName, columnName);
+      } else if (config.mapColumnType) {
+        let defaultType;
+        let defaultInputType;
+        try {
+          defaultType = columnToGraphQLCore(column, columnName, tableName, false).type;
+        } catch {
+        }
+        try {
+          defaultInputType = columnToGraphQLCore(column, columnName, tableName, true).type;
+        } catch {
+        }
+        const mapped = config.mapColumnType(column, { tableName, columnName, defaultType, defaultInputType });
+        if (mapped !== void 0) {
+          resolved = normalizeScalarOverride(mapped, tableName, columnName);
+        }
+      }
+      if (resolved && (resolved.output !== void 0 || resolved.input !== void 0)) {
+        columnScalarOverrides.set(column, resolved);
+      } else {
+        columnScalarOverrides.delete(column);
+      }
+    }
+  }
+};
 var drizzleColumnToGraphQLType = (column, columnName, tableName, forceNullable = false, defaultIsNullable = false, isInput = false) => {
-  const typeDesc = columnToGraphQLCore(column, columnName, tableName, isInput);
-  const noDesc = ["string", "boolean", "number"];
-  const { type: baseType } = extractExtendedColumnType(column);
-  if (noDesc.find((e) => e === baseType)) {
-    delete typeDesc.description;
+  const override = getColumnScalarOverride(column, isInput);
+  let typeDesc;
+  if (override) {
+    typeDesc = { type: override, description: override.name };
+  } else {
+    typeDesc = columnToGraphQLCore(column, columnName, tableName, isInput);
+    const noDesc = ["string", "boolean", "number"];
+    const { type: baseType } = extractExtendedColumnType(column);
+    if (noDesc.find((e) => e === baseType)) {
+      delete typeDesc.description;
+    }
   }
   if (forceNullable) {
     return typeDesc;
@@ -517,6 +385,206 @@ var drizzleColumnToGraphQLType = (column, columnName, tableName, forceNullable =
   return typeDesc;
 };
 
+// src/util/data-mappers/index.ts
+var isJsonColumn = (column) => (column.dataType ?? "").includes("json") && column.columnType !== "PgGeometryObject";
+var remapToGraphQLCore = (key, value, tableName, column, relationMap) => {
+  if (Array.isArray(value)) {
+    const relations = relationMap?.[tableName];
+    if (relations?.[key]) {
+      const rel = relations[key];
+      return remapToGraphQLArrayOutput(
+        value,
+        rel.targetTableName,
+        rel.relation?.targetTable ?? rel.relation?.referencedTable,
+        relationMap
+      );
+    }
+  }
+  if (typeof value === "object" && value !== null) {
+    const relations = relationMap?.[tableName];
+    if (relations?.[key]) {
+      const rel = relations[key];
+      const remapped = remapToGraphQLSingleOutput(
+        value,
+        rel.targetTableName,
+        rel.relation?.targetTable ?? rel.relation?.referencedTable,
+        relationMap
+      );
+      return remapped;
+    }
+  }
+  if (!column) {
+    return value;
+  }
+  if (getColumnScalarOverride(column, false)) {
+    return value;
+  }
+  if (isJsonColumn(column)) {
+    return value;
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  if (value instanceof Buffer) {
+    return Array.from(value);
+  }
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+  if (Array.isArray(value)) {
+    if (column.columnType === "PgGeometry" || column.columnType === "PgVector") {
+      return value;
+    }
+    return value.map((arrVal) => remapToGraphQLCore(key, arrVal, tableName, column, relationMap));
+  }
+  if (typeof value === "object" && value !== null) {
+    if (column.columnType === "PgGeometryObject") {
+      return value;
+    }
+    return JSON.stringify(value);
+  }
+  return value;
+};
+var remapToGraphQLSingleOutput = (queryOutput, tableName, table, relationMap) => {
+  for (const [key, value] of Object.entries(queryOutput)) {
+    if (value === void 0 || value === null) {
+      const relEntry = value === null ? relationMap?.[tableName]?.[key] : void 0;
+      if (relEntry && is2(relEntry.relation, One)) {
+        queryOutput[key] = null;
+        continue;
+      }
+      delete queryOutput[key];
+      continue;
+    }
+    const column = table[key];
+    if (value === 0n && column && column.columnType === "SQLiteBigInt" && !column.notNull) {
+      delete queryOutput[key];
+      continue;
+    }
+    queryOutput[key] = remapToGraphQLCore(key, value, tableName, column, relationMap);
+  }
+  return queryOutput;
+};
+var remapToGraphQLArrayOutput = (queryOutput, tableName, table, relationMap) => {
+  for (const entry of queryOutput) {
+    remapToGraphQLSingleOutput(entry, tableName, table, relationMap);
+  }
+  return queryOutput;
+};
+var remapFromGraphQLCore = (value, column, columnName) => {
+  if (getColumnScalarOverride(column, true)) {
+    if (typeof value === "object" && value !== null && Object.getPrototypeOf(value) === null) {
+      return Object.assign({}, value);
+    }
+    return value;
+  }
+  const dataType = column.dataType ?? "";
+  const columnType = column.columnType ?? "";
+  const isTimestampColumn = columnType === "SQLiteTimestamp" || columnType === "SQLiteTimestampMs" || columnType === "MySqlTimestamp" || columnType === "MySqlDateTime" || columnType === "PgTimestamp" || columnType === "PgTimestampString";
+  if (isTimestampColumn) {
+    const formatted = new Date(value);
+    if (Number.isNaN(formatted.getTime())) {
+      throw new GraphQLError2(`Field '${columnName}' is not a valid date!`);
+    }
+    return formatted;
+  }
+  const isDateOnlyColumn = columnType === "MySqlDate" || columnType === "PgDate";
+  if (isDateOnlyColumn && typeof value === "string") {
+    const dateOnly = value.includes("T") ? value.split("T")[0] : value;
+    const check = new Date(dateOnly);
+    if (Number.isNaN(check.getTime())) {
+      throw new GraphQLError2(`Field '${columnName}' is not a valid date!`);
+    }
+    return dateOnly;
+  }
+  if (dataType.includes("bigint")) {
+    try {
+      return BigInt(value);
+    } catch {
+      throw new GraphQLError2(`Field '${columnName}' is not a BigInt!`);
+    }
+  }
+  if (dataType.includes("json") && column.columnType !== "PgGeometryObject") {
+    return value;
+  }
+  switch (dataType) {
+    case "date": {
+      const formatted = new Date(value);
+      if (Number.isNaN(formatted.getTime())) {
+        throw new GraphQLError2(`Field '${columnName}' is not a valid date!`);
+      }
+      return formatted;
+    }
+    case "buffer": {
+      if (!Array.isArray(value)) {
+        throw new GraphQLError2(`Field '${columnName}' is not an array!`);
+      }
+      return Buffer.from(value);
+    }
+    case "json": {
+      if (column.columnType === "PgGeometryObject") {
+        return value;
+      }
+      try {
+        return JSON.parse(value);
+      } catch (e) {
+        throw new GraphQLError2(
+          `Invalid JSON in field '${columnName}':
+${e instanceof Error ? e.message : "Unknown error"}`
+        );
+      }
+    }
+    case "array": {
+      if (!Array.isArray(value)) {
+        throw new GraphQLError2(`Field '${columnName}' is not an array!`);
+      }
+      if (column.columnType === "PgGeometry" && value.length !== 2) {
+        throw new GraphQLError2(
+          `Invalid float tuple in field '${columnName}': expected array with length of 2, received ${value.length}`
+        );
+      }
+      return value;
+    }
+    case "bigint": {
+      try {
+        return BigInt(value);
+      } catch (_error) {
+        throw new GraphQLError2(`Field '${columnName}' is not a BigInt!`);
+      }
+    }
+    default: {
+      if (typeof value === "object" && value !== null && Object.getPrototypeOf(value) === null) {
+        return Object.assign({}, value);
+      }
+      return value;
+    }
+  }
+};
+var remapFromGraphQLSingleInput = (queryInput, table) => {
+  for (const [key, value] of Object.entries(queryInput)) {
+    if (value === void 0) {
+      delete queryInput[key];
+    } else {
+      const column = getTableColumns2(table)[key];
+      if (!column) {
+        throw new GraphQLError2(`Unknown column: ${key}`);
+      }
+      if (value === null && column.notNull) {
+        delete queryInput[key];
+        continue;
+      }
+      queryInput[key] = remapFromGraphQLCore(value, column, key);
+    }
+  }
+  return queryInput;
+};
+var remapFromGraphQLArrayInput = (queryInput, table) => {
+  for (const entry of queryInput) {
+    remapFromGraphQLSingleInput(entry, table);
+  }
+  return queryInput;
+};
+
 // src/util/builders/common.ts
 var rqbCrashTypes = ["SQLiteBigInt", "SQLiteBlobJson", "SQLiteBlobBuffer"];
 var resolveTypeName = (name, typeNameMapper) => {
@@ -1095,9 +1163,31 @@ var arrayFilterFields = (colType, colArr, colDesc) => {
   };
 };
 var FILTERS_WITHOUT_STRING_OPS = /* @__PURE__ */ new Set(["Id", "Int", "Float", "BigInt", "Decimal"]);
+var BUILTIN_FILTER_SCALARS = /* @__PURE__ */ new Set([
+  GraphQLString2,
+  GraphQLInt2,
+  GraphQLFloat2,
+  GraphQLBoolean2,
+  GraphQLBigIntString,
+  GraphQLDecimalString,
+  GraphQLUUID,
+  GraphQLJSON,
+  GraphQLDate,
+  GraphQLDateTime
+]);
+var resolveOverrideFilterDescriptor = (scalar) => {
+  if (scalar === GraphQLJSON) {
+    return { name: "JSON", kind: "json" };
+  }
+  if (scalar === GraphQLUUID) {
+    return { name: "Id", kind: "scalar" };
+  }
+  return { name: scalar.name, kind: "scalar" };
+};
 var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const columnGraphQLType = drizzleColumnToGraphQLType(column, columnName, tableName, true, false, true);
-  const { name: genericName, kind } = resolveGenericFilterDescriptor(column, columnGraphQLType);
+  const inputOverride = getColumnScalarOverride(column, true);
+  const { name: genericName, kind } = inputOverride ? resolveOverrideFilterDescriptor(inputOverride) : resolveGenericFilterDescriptor(column, columnGraphQLType);
   const cached = cacheCtx.genericFilterCache.get(genericName);
   if (cached) {
     return cached;
@@ -1105,7 +1195,9 @@ var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const colType = columnGraphQLType.type;
   const colDesc = columnGraphQLType.description;
   const colArr = new GraphQLList2(new GraphQLNonNull2(colType));
-  const omitStringOps = FILTERS_WITHOUT_STRING_OPS.has(genericName);
+  const customOverrideFilter = inputOverride !== void 0 && !BUILTIN_FILTER_SCALARS.has(inputOverride);
+  const underlying = extractExtendedColumnType2(column);
+  const omitStringOps = customOverrideFilter ? underlying.type !== "string" || underlying.constraint === "numeric" : FILTERS_WITHOUT_STRING_OPS.has(genericName);
   const baseFields = kind === "json" ? jsonFilterFields(column, colType) : kind === "array" ? arrayFilterFields(colType, colArr, colDesc) : {
     eq: { type: colType, description: colDesc },
     ne: { type: colType, description: colDesc },
@@ -1186,10 +1278,9 @@ var generateTableOrderCached = (table) => {
   }
   return remapped;
 };
-var filterMap = /* @__PURE__ */ new WeakMap();
 var generateTableFilterValuesCached = (table, tableName, cacheCtx) => {
-  if (filterMap.has(table)) {
-    return filterMap.get(table);
+  if (cacheCtx.filterFieldCache.has(table)) {
+    return cacheCtx.filterFieldCache.get(table);
   }
   const columns = getColumns(table);
   const columnEntries = Object.entries(columns);
@@ -1201,13 +1292,12 @@ var generateTableFilterValuesCached = (table, tableName, cacheCtx) => {
       }
     ])
   );
-  filterMap.set(table, remapped);
+  cacheCtx.filterFieldCache.set(table, remapped);
   return remapped;
 };
-var fieldMap = /* @__PURE__ */ new WeakMap();
-var generateTableSelectTypeFieldsCached = (table, tableName) => {
-  if (fieldMap.has(table)) {
-    return fieldMap.get(table);
+var generateTableSelectTypeFieldsCached = (table, tableName, cacheCtx) => {
+  if (cacheCtx.selectFieldCache.has(table)) {
+    return cacheCtx.selectFieldCache.get(table);
   }
   const columns = getColumns(table);
   const columnEntries = Object.entries(columns);
@@ -1224,7 +1314,7 @@ var generateTableSelectTypeFieldsCached = (table, tableName) => {
       resolve: rowCursorResolver
     };
   }
-  fieldMap.set(table, remapped);
+  cacheCtx.selectFieldCache.set(table, remapped);
   return remapped;
 };
 var isFilterableRelation = (relation) => !relation.through;
@@ -1374,7 +1464,7 @@ var generateSelectFields = (tables, tableName, relationMap, fromTableName, fromR
   const table = tables[tableName];
   const order = withOrder ? generateTableOrderTypeCached(table, tableName, typeNameMapper, cacheCtx, relationMap, tables) : void 0;
   const filters = generateTableFilterTypeCached(table, tableName, cacheCtx, typeNameMapper, relationMap, tables);
-  const tableFields = generateTableSelectTypeFieldsCached(table, tableName);
+  const tableFields = generateTableSelectTypeFieldsCached(table, tableName, cacheCtx);
   const relationsForTable = relationMap[tableName];
   const relationEntries = relationsForTable ? Object.entries(relationsForTable) : [];
   if (relationsDepthLimit !== void 0 && currentDepth >= relationsDepthLimit) {
@@ -1443,7 +1533,7 @@ var generateSelectFields = (tables, tableName, relationMap, fromTableName, fromR
       let relType = cacheCtx.objectTypeCache.get(targetTableName);
       if (!relType) {
         const targetTable = tables[targetTableName];
-        const targetTableFields = generateTableSelectTypeFieldsCached(targetTable, targetTableName);
+        const targetTableFields = generateTableSelectTypeFieldsCached(targetTable, targetTableName, cacheCtx);
         let targetContainer = cacheCtx.relationFieldContainers.get(targetTableName);
         if (!targetContainer) {
           targetContainer = { fields: {} };
@@ -2706,7 +2796,7 @@ import {
   count,
   countDistinct,
   eq as eq2,
-  extractExtendedColumnType as extractExtendedColumnType2,
+  extractExtendedColumnType as extractExtendedColumnType3,
   getColumns as getColumns2,
   gt as gt2,
   gte as gte2,
@@ -2750,7 +2840,7 @@ var classifyAggregateColumns = (table, tableName) => {
     if (gqlType instanceof GraphQLList3 || gqlType instanceof GraphQLObjectType3) {
       continue;
     }
-    const { type: dataType, constraint } = extractExtendedColumnType2(column);
+    const { type: dataType, constraint } = extractExtendedColumnType3(column);
     if (dataType === "boolean" || dataType === "array" || dataType === "custom") {
       continue;
     }
@@ -2991,7 +3081,7 @@ var groupableColumns = (table, tableName) => {
     if (groupable[columnName]) {
       continue;
     }
-    const { type: dataType } = extractExtendedColumnType2(column);
+    const { type: dataType } = extractExtendedColumnType3(column);
     if (dataType !== "boolean") {
       continue;
     }
@@ -3458,6 +3548,7 @@ var generateSchemaData = (db, schema, relations, options) => {
       "Drizzle-GraphQL Error: No tables detected in Drizzle-ORM's database instance. Did you forget to pass schema to drizzle constructor?"
     );
   }
+  registerScalarOverrides(tables, options);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
   attachTargetPrimaryKeys(namedRelations, tables, mysqlPrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
@@ -3469,6 +3560,8 @@ var generateSchemaData = (db, schema, relations, options) => {
     relationFieldContainers: /* @__PURE__ */ new Map(),
     fullyBuiltTables: /* @__PURE__ */ new Set(),
     relationTypeCache: /* @__PURE__ */ new Map(),
+    selectFieldCache: /* @__PURE__ */ new WeakMap(),
+    filterFieldCache: /* @__PURE__ */ new WeakMap(),
     orderTypeCache: /* @__PURE__ */ new WeakMap(),
     filterTypeCache: /* @__PURE__ */ new WeakMap(),
     listRelationFilterCache: /* @__PURE__ */ new Map(),
@@ -4297,6 +4390,7 @@ function generateSchemaData2(db, schema, relations, options) {
       "Drizzle-GraphQL Error: No tables detected in Drizzle-ORM's database instance. Did you forget to pass schema to drizzle constructor?"
     );
   }
+  registerScalarOverrides(tables, options);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
   attachTargetPrimaryKeys(namedRelations, tables, pgPrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
@@ -4308,6 +4402,8 @@ function generateSchemaData2(db, schema, relations, options) {
     relationFieldContainers: /* @__PURE__ */ new Map(),
     fullyBuiltTables: /* @__PURE__ */ new Set(),
     relationTypeCache: /* @__PURE__ */ new Map(),
+    selectFieldCache: /* @__PURE__ */ new WeakMap(),
+    filterFieldCache: /* @__PURE__ */ new WeakMap(),
     orderTypeCache: /* @__PURE__ */ new WeakMap(),
     filterTypeCache: /* @__PURE__ */ new WeakMap(),
     listRelationFilterCache: /* @__PURE__ */ new Map(),
@@ -5128,6 +5224,7 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       "Drizzle-GraphQL Error: No tables detected in Drizzle-ORM's database instance. Did you forget to pass schema to drizzle constructor?"
     );
   }
+  registerScalarOverrides(tables, options);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
   attachTargetPrimaryKeys(namedRelations, tables, sqlitePrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
@@ -5139,6 +5236,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
     relationFieldContainers: /* @__PURE__ */ new Map(),
     fullyBuiltTables: /* @__PURE__ */ new Set(),
     relationTypeCache: /* @__PURE__ */ new Map(),
+    selectFieldCache: /* @__PURE__ */ new WeakMap(),
+    filterFieldCache: /* @__PURE__ */ new WeakMap(),
     orderTypeCache: /* @__PURE__ */ new WeakMap(),
     filterTypeCache: /* @__PURE__ */ new WeakMap(),
     listRelationFilterCache: /* @__PURE__ */ new Map(),
@@ -5584,6 +5683,8 @@ var buildSchema = (db, config) => {
     shouldEagerLoad,
     features,
     complexity,
+    scalars: config?.scalars,
+    mapColumnType: config?.mapColumnType,
     transactions
   };
   let generatorOutput;