prisma-sql 1.37.0 → 1.39.0

package/dist/generator.cjs

@@ -56,7 +56,7 @@ var require_package = __commonJS({
   "package.json"(exports$1, module) {
     module.exports = {
       name: "prisma-sql",
-      version: "1.37.0",
+      version: "1.39.0",
       description: "Convert Prisma queries to optimized SQL with type safety. 2-7x faster than Prisma Client.",
       main: "dist/index.cjs",
       module: "dist/index.js",
@@ -129,7 +129,6 @@ var require_package = __commonJS({
         "@faker-js/faker": "^10.2.0",
         "@prisma/adapter-better-sqlite3": "^7.2.0",
         "@prisma/adapter-pg": "^7.2.0",
-        "@prisma/client": "7.2.0",
         "@types/better-sqlite3": "^7.6.13",
         "@types/node": "^25.0.10",
         "@vitest/coverage-v8": "4.0.18",
@@ -137,11 +136,12 @@ var require_package = __commonJS({
         "drizzle-kit": "^0.31.8",
         "drizzle-orm": "^0.45.1",
         postgres: "^3.4.8",
-        prisma: "7.2.0",
         tsup: "^8.5.1",
         tsx: "^4.21.0",
         typescript: "^5.9.3",
-        vitest: "^4.0.18"
+        vitest: "^4.0.18",
+        "@prisma/client": "7.2.0",
+        prisma: "7.2.0"
       },
       engines: {
         node: ">=16.0.0"
@@ -150,6 +150,148 @@ var require_package = __commonJS({
   }
 });
 
+// src/builder/shared/constants.ts
+var SQL_SEPARATORS = Object.freeze({
+  FIELD_LIST: ", ",
+  CONDITION_AND: " AND ",
+  CONDITION_OR: " OR ",
+  ORDER_BY: ", "
+});
+var SQL_RESERVED_WORDS = /* @__PURE__ */ new Set([
+  "select",
+  "from",
+  "where",
+  "and",
+  "or",
+  "not",
+  "in",
+  "like",
+  "between",
+  "order",
+  "by",
+  "group",
+  "having",
+  "limit",
+  "offset",
+  "join",
+  "inner",
+  "left",
+  "right",
+  "outer",
+  "on",
+  "as",
+  "table",
+  "column",
+  "index",
+  "user",
+  "users",
+  "values",
+  "update",
+  "insert",
+  "delete",
+  "create",
+  "drop",
+  "alter",
+  "truncate",
+  "grant",
+  "revoke",
+  "exec",
+  "execute",
+  "union",
+  "intersect",
+  "except",
+  "case",
+  "when",
+  "then",
+  "else",
+  "end",
+  "null",
+  "true",
+  "false",
+  "is",
+  "exists",
+  "all",
+  "any",
+  "some"
+]);
+var SQL_KEYWORDS = SQL_RESERVED_WORDS;
+var DEFAULT_WHERE_CLAUSE = "1=1";
+var SPECIAL_FIELDS = Object.freeze({
+  ID: "id"
+});
+var SQL_TEMPLATES = Object.freeze({
+  PUBLIC_SCHEMA: "public",
+  WHERE: "WHERE",
+  SELECT: "SELECT",
+  FROM: "FROM",
+  ORDER_BY: "ORDER BY",
+  GROUP_BY: "GROUP BY",
+  HAVING: "HAVING",
+  LIMIT: "LIMIT",
+  OFFSET: "OFFSET",
+  COUNT_ALL: "COUNT(*)",
+  AS: "AS",
+  DISTINCT_ON: "DISTINCT ON",
+  IS_NULL: "IS NULL",
+  IS_NOT_NULL: "IS NOT NULL",
+  LIKE: "LIKE",
+  AND: "AND",
+  OR: "OR",
+  NOT: "NOT"
+});
+var SCHEMA_PREFIXES = Object.freeze({
+  INTERNAL: "@",
+  COMMENT: "//"
+});
+var Ops = Object.freeze({
+  EQUALS: "equals",
+  NOT: "not",
+  GT: "gt",
+  GTE: "gte",
+  LT: "lt",
+  LTE: "lte",
+  IN: "in",
+  NOT_IN: "notIn",
+  CONTAINS: "contains",
+  STARTS_WITH: "startsWith",
+  ENDS_WITH: "endsWith",
+  HAS: "has",
+  HAS_SOME: "hasSome",
+  HAS_EVERY: "hasEvery",
+  IS_EMPTY: "isEmpty",
+  PATH: "path",
+  STRING_CONTAINS: "string_contains",
+  STRING_STARTS_WITH: "string_starts_with",
+  STRING_ENDS_WITH: "string_ends_with"
+});
+var LogicalOps = Object.freeze({
+  AND: "AND",
+  OR: "OR",
+  NOT: "NOT"
+});
+var RelationFilters = Object.freeze({
+  SOME: "some",
+  EVERY: "every",
+  NONE: "none"
+});
+var Modes = Object.freeze({
+  INSENSITIVE: "insensitive",
+  DEFAULT: "default"
+});
+var Wildcards = Object.freeze({
+  [Ops.CONTAINS]: (v) => `%${v}%`,
+  [Ops.STARTS_WITH]: (v) => `${v}%`,
+  [Ops.ENDS_WITH]: (v) => `%${v}`
+});
+var REGEX_CACHE = {
+  VALID_IDENTIFIER: /^[a-z_][a-z0-9_]*$/
+};
+var LIMITS = Object.freeze({
+  MAX_QUERY_DEPTH: 50,
+  MAX_ARRAY_SIZE: 1e4,
+  MAX_STRING_LENGTH: 1e4
+});
+
 // src/sql-builder-dialect.ts
 var globalDialect = "postgres";
 function setGlobalDialect(dialect) {
@@ -304,7 +446,7 @@ function getArrayType(prismaType, dialect) {
     case "DateTime":
       return "timestamptz[]";
     default:
-      return "text[]";
+      return `"${baseType}"[]`;
   }
 }
 function jsonAgg(content, dialect) {
@@ -331,148 +473,6 @@ function prepareArrayParam(value, dialect) {
   return JSON.stringify(value);
 }
 
-// src/builder/shared/constants.ts
-var SQL_SEPARATORS = Object.freeze({
-  FIELD_LIST: ", ",
-  CONDITION_AND: " AND ",
-  CONDITION_OR: " OR ",
-  ORDER_BY: ", "
-});
-var SQL_RESERVED_WORDS = /* @__PURE__ */ new Set([
-  "select",
-  "from",
-  "where",
-  "and",
-  "or",
-  "not",
-  "in",
-  "like",
-  "between",
-  "order",
-  "by",
-  "group",
-  "having",
-  "limit",
-  "offset",
-  "join",
-  "inner",
-  "left",
-  "right",
-  "outer",
-  "on",
-  "as",
-  "table",
-  "column",
-  "index",
-  "user",
-  "users",
-  "values",
-  "update",
-  "insert",
-  "delete",
-  "create",
-  "drop",
-  "alter",
-  "truncate",
-  "grant",
-  "revoke",
-  "exec",
-  "execute",
-  "union",
-  "intersect",
-  "except",
-  "case",
-  "when",
-  "then",
-  "else",
-  "end",
-  "null",
-  "true",
-  "false",
-  "is",
-  "exists",
-  "all",
-  "any",
-  "some"
-]);
-var SQL_KEYWORDS = SQL_RESERVED_WORDS;
-var DEFAULT_WHERE_CLAUSE = "1=1";
-var SPECIAL_FIELDS = Object.freeze({
-  ID: "id"
-});
-var SQL_TEMPLATES = Object.freeze({
-  PUBLIC_SCHEMA: "public",
-  WHERE: "WHERE",
-  SELECT: "SELECT",
-  FROM: "FROM",
-  ORDER_BY: "ORDER BY",
-  GROUP_BY: "GROUP BY",
-  HAVING: "HAVING",
-  LIMIT: "LIMIT",
-  OFFSET: "OFFSET",
-  COUNT_ALL: "COUNT(*)",
-  AS: "AS",
-  DISTINCT_ON: "DISTINCT ON",
-  IS_NULL: "IS NULL",
-  IS_NOT_NULL: "IS NOT NULL",
-  LIKE: "LIKE",
-  AND: "AND",
-  OR: "OR",
-  NOT: "NOT"
-});
-var SCHEMA_PREFIXES = Object.freeze({
-  INTERNAL: "@",
-  COMMENT: "//"
-});
-var Ops = Object.freeze({
-  EQUALS: "equals",
-  NOT: "not",
-  GT: "gt",
-  GTE: "gte",
-  LT: "lt",
-  LTE: "lte",
-  IN: "in",
-  NOT_IN: "notIn",
-  CONTAINS: "contains",
-  STARTS_WITH: "startsWith",
-  ENDS_WITH: "endsWith",
-  HAS: "has",
-  HAS_SOME: "hasSome",
-  HAS_EVERY: "hasEvery",
-  IS_EMPTY: "isEmpty",
-  PATH: "path",
-  STRING_CONTAINS: "string_contains",
-  STRING_STARTS_WITH: "string_starts_with",
-  STRING_ENDS_WITH: "string_ends_with"
-});
-var LogicalOps = Object.freeze({
-  AND: "AND",
-  OR: "OR",
-  NOT: "NOT"
-});
-var RelationFilters = Object.freeze({
-  SOME: "some",
-  EVERY: "every",
-  NONE: "none"
-});
-var Modes = Object.freeze({
-  INSENSITIVE: "insensitive",
-  DEFAULT: "default"
-});
-var Wildcards = Object.freeze({
-  [Ops.CONTAINS]: (v) => `%${v}%`,
-  [Ops.STARTS_WITH]: (v) => `${v}%`,
-  [Ops.ENDS_WITH]: (v) => `%${v}`
-});
-var REGEX_CACHE = {
-  VALID_IDENTIFIER: /^[a-z_][a-z0-9_]*$/
-};
-var LIMITS = Object.freeze({
-  MAX_QUERY_DEPTH: 50,
-  MAX_ARRAY_SIZE: 1e4,
-  MAX_STRING_LENGTH: 1e4
-});
-
 // src/builder/shared/validators/type-guards.ts
 function isNotNullish(value) {
   return value !== null && value !== void 0;
@@ -558,6 +558,19 @@ function getRelationFieldSet(model) {
   RELATION_SET_CACHE.set(model, s);
   return s;
 }
+var COLUMN_MAP_CACHE = /* @__PURE__ */ new WeakMap();
+function getColumnMap(model) {
+  const cached = COLUMN_MAP_CACHE.get(model);
+  if (cached) return cached;
+  const map = /* @__PURE__ */ new Map();
+  for (const f of model.fields) {
+    if (!f.isRelation) {
+      map.set(f.name, f.dbName || f.name);
+    }
+  }
+  COLUMN_MAP_CACHE.set(model, map);
+  return map;
+}
 
 // src/builder/shared/validators/sql-validators.ts
 function isValidWhereClause(clause) {
@@ -945,27 +958,10 @@ function quote(id) {
   }
   return id;
 }
-function pickDbFieldName(field) {
-  const candidates = [
-    field == null ? void 0 : field.dbName,
-    field == null ? void 0 : field.columnName,
-    field == null ? void 0 : field.databaseName,
-    field == null ? void 0 : field.mappedName
-  ];
-  for (const c of candidates) {
-    if (typeof c === "string") {
-      const s = c.trim();
-      if (s.length > 0) return s;
-    }
-  }
-  return void 0;
-}
 function resolveColumnName(model, fieldName) {
-  var _a;
   if (!model) return fieldName;
-  const f = model.fields.find((x) => (x == null ? void 0 : x.name) === fieldName);
-  if (!f) return fieldName;
-  return (_a = pickDbFieldName(f)) != null ? _a : fieldName;
+  const columnMap = getColumnMap(model);
+  return columnMap.get(fieldName) || fieldName;
 }
 function quoteColumn(model, fieldName) {
   return quote(resolveColumnName(model, fieldName));
@@ -1123,1570 +1119,1570 @@ function joinCondition(field, parentModel, childModel, parentAlias, childAlias)
 function getModelByName(schemas, name) {
   return schemas.find((m) => m.name === name);
 }
-function buildNotComposite(expr, val, params, dialect, buildOp, separator) {
-  const entries = Object.entries(val).filter(
-    ([k, v]) => k !== "mode" && v !== void 0
-  );
-  if (entries.length === 0) return "";
-  const clauses = [];
-  for (const [subOp, subVal] of entries) {
-    const sub = buildOp(expr, subOp, subVal, params, dialect);
-    if (sub && sub.trim().length > 0) clauses.push(`(${sub})`);
-  }
-  if (clauses.length === 0) return "";
-  if (clauses.length === 1) return `${SQL_TEMPLATES.NOT} ${clauses[0]}`;
-  return `${SQL_TEMPLATES.NOT} (${clauses.join(separator)})`;
-}
-function buildScalarOperator(expr, op, val, params, mode, fieldType, dialect) {
-  if (val === void 0) return "";
-  if (val === null) {
-    return handleNullValue(expr, op);
-  }
-  if (op === Ops.NOT && isPlainObject(val)) {
-    return handleNotOperator(expr, val, params, mode, fieldType, dialect);
-  }
-  if (op === Ops.NOT) {
-    const placeholder = params.addAuto(val);
-    return `${expr} <> ${placeholder}`;
+function normalizeIntLike(name, v, opts = {}) {
+  var _a, _b;
+  if (!isNotNullish(v)) return void 0;
+  if (schemaParser.isDynamicParameter(v)) return v;
+  if (typeof v !== "number" || !Number.isFinite(v) || !Number.isInteger(v)) {
+    throw new Error(`${name} must be an integer`);
   }
-  if (op === Ops.EQUALS && mode === Modes.INSENSITIVE && isNotNullish(dialect)) {
-    const placeholder = params.addAuto(val);
-    return caseInsensitiveEquals(expr, placeholder);
+  const min = (_a = opts.min) != null ? _a : 0;
+  const allowZero = (_b = opts.allowZero) != null ? _b : true;
+  if (!allowZero && v === 0) {
+    throw new Error(`${name} must be > 0`);
   }
-  const STRING_LIKE_OPS = /* @__PURE__ */ new Set([
-    Ops.CONTAINS,
-    Ops.STARTS_WITH,
-    Ops.ENDS_WITH
-  ]);
-  if (STRING_LIKE_OPS.has(op)) {
-    if (!isNotNullish(dialect)) {
-      throw createError(`Like operators require a SQL dialect`, {
-        operator: op
-      });
-    }
-    return handleLikeOperator(expr, op, val, params, mode, dialect);
+  if (v < min) {
+    throw new Error(`${name} must be >= ${min}`);
   }
-  if (op === Ops.IN || op === Ops.NOT_IN) {
-    if (!isNotNullish(dialect)) {
-      throw createError(`IN operators require a SQL dialect`, { operator: op });
-    }
-    return handleInOperator(expr, op, val, params, dialect);
+  if (typeof opts.max === "number" && v > opts.max) {
+    throw new Error(`${name} must be <= ${opts.max}`);
   }
-  return handleComparisonOperator(expr, op, val, params);
-}
-function handleNullValue(expr, op) {
-  if (op === Ops.EQUALS) return `${expr} ${SQL_TEMPLATES.IS_NULL}`;
-  if (op === Ops.NOT) return `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
-  throw createError(`Operator '${op}' doesn't support null`, { operator: op });
-}
-function normalizeMode(v) {
-  if (v === Modes.INSENSITIVE) return Modes.INSENSITIVE;
-  if (v === Modes.DEFAULT) return Modes.DEFAULT;
-  return void 0;
+  return v;
 }
-function handleNotOperator(expr, val, params, outerMode, fieldType, dialect) {
-  const innerMode = normalizeMode(val.mode);
-  const effectiveMode = innerMode != null ? innerMode : outerMode;
-  return buildNotComposite(
-    expr,
-    val,
-    params,
-    dialect,
-    (e, subOp, subVal, p, d) => buildScalarOperator(e, subOp, subVal, p, effectiveMode, fieldType, d),
-    ` ${SQL_TEMPLATES.AND} `
-  );
+function scopeName(scope, dynamicName) {
+  const s = String(scope).trim();
+  const dn = String(dynamicName).trim();
+  if (s.length === 0) return dn;
+  return `${s}:${dn}`;
 }
-function buildDynamicLikePattern(op, placeholder, dialect) {
-  if (dialect === "postgres") {
-    switch (op) {
-      case Ops.CONTAINS:
-        return `('%' || ${placeholder} || '%')`;
-      case Ops.STARTS_WITH:
-        return `(${placeholder} || '%')`;
-      case Ops.ENDS_WITH:
-        return `('%' || ${placeholder})`;
-      default:
-        return placeholder;
-    }
-  }
-  switch (op) {
-    case Ops.CONTAINS:
-      return `('%' || ${placeholder} || '%')`;
-    case Ops.STARTS_WITH:
-      return `(${placeholder} || '%')`;
-    case Ops.ENDS_WITH:
-      return `('%' || ${placeholder})`;
-    default:
-      return placeholder;
+function addAutoScoped(params, value, scope) {
+  if (schemaParser.isDynamicParameter(value)) {
+    const dn = schemaParser.extractDynamicName(value);
+    return params.add(void 0, scopeName(scope, dn));
   }
+  return params.add(value);
 }
-function handleLikeOperator(expr, op, val, params, mode, dialect) {
-  if (val === void 0) return "";
-  if (schemaParser.isDynamicParameter(val)) {
-    const placeholder2 = params.addAuto(val);
-    const patternExpr = buildDynamicLikePattern(op, placeholder2, dialect);
-    if (mode === Modes.INSENSITIVE) {
-      return caseInsensitiveLike(expr, patternExpr, dialect);
-    }
-    return `${expr} ${SQL_TEMPLATES.LIKE} ${patternExpr}`;
+
+// src/builder/shared/order-by-utils.ts
+var flipNulls = (v) => {
+  const s = String(v).toLowerCase();
+  if (s === "first") return "last";
+  if (s === "last") return "first";
+  return v;
+};
+var flipSortString = (v) => {
+  if (typeof v !== "string") return v;
+  const s = v.toLowerCase();
+  if (s === "asc") return "desc";
+  if (s === "desc") return "asc";
+  return v;
+};
+var getNextSort = (sortRaw) => {
+  if (typeof sortRaw !== "string") return sortRaw;
+  const s = sortRaw.toLowerCase();
+  if (s === "asc") return "desc";
+  if (s === "desc") return "asc";
+  return sortRaw;
+};
+var flipObjectSort = (obj) => {
+  const sortRaw = obj.sort;
+  const out = __spreadProps(__spreadValues({}, obj), { sort: getNextSort(sortRaw) });
+  const nullsRaw = obj.nulls;
+  if (typeof nullsRaw === "string") {
+    out.nulls = flipNulls(nullsRaw);
   }
-  const placeholder = params.add(Wildcards[op](String(val)));
-  if (mode === Modes.INSENSITIVE) {
-    return caseInsensitiveLike(expr, placeholder, dialect);
+  return out;
+};
+var flipValue = (v) => {
+  if (typeof v === "string") return flipSortString(v);
+  if (isPlainObject(v)) return flipObjectSort(v);
+  return v;
+};
+var assertSingleFieldObject = (item) => {
+  if (!isPlainObject(item)) {
+    throw new Error("orderBy array entries must be objects");
   }
-  return `${expr} ${SQL_TEMPLATES.LIKE} ${placeholder}`;
-}
-function handleInOperator(expr, op, val, params, dialect) {
-  if (val === void 0) return "";
-  if (schemaParser.isDynamicParameter(val)) {
-    const placeholder2 = params.addAuto(val);
-    return op === Ops.IN ? inArray(expr, placeholder2, dialect) : notInArray(expr, placeholder2, dialect);
+  const entries = Object.entries(item);
+  if (entries.length !== 1) {
+    throw new Error("orderBy array entries must have exactly one field");
   }
-  if (!Array.isArray(val)) {
-    throw createError(`IN operators require array value`, {
-      operator: op,
-      value: val
-    });
+  return entries[0];
+};
+var flipOrderByArray = (orderBy) => {
+  return orderBy.map((item) => {
+    const [k, v] = assertSingleFieldObject(item);
+    return { [k]: flipValue(v) };
+  });
+};
+var flipOrderByObject = (orderBy) => {
+  const out = {};
+  for (const [k, v] of Object.entries(orderBy)) {
+    out[k] = flipValue(v);
   }
-  if (val.length === 0) {
-    return op === Ops.IN ? "0=1" : "1=1";
+  return out;
+};
+function reverseOrderByInput(orderBy) {
+  if (!isNotNullish(orderBy)) return orderBy;
+  if (Array.isArray(orderBy)) {
+    return flipOrderByArray(orderBy);
   }
-  const paramValue = prepareArrayParam(val, dialect);
-  const placeholder = params.add(paramValue);
-  return op === Ops.IN ? inArray(expr, placeholder, dialect) : notInArray(expr, placeholder, dialect);
+  if (isPlainObject(orderBy)) {
+    return flipOrderByObject(orderBy);
+  }
+  throw new Error("orderBy must be an object or array of objects");
 }
-function handleComparisonOperator(expr, op, val, params) {
-  if (val === void 0) return "";
-  const COMPARISON_OPS2 = {
-    [Ops.EQUALS]: "=",
-    [Ops.GT]: ">",
-    [Ops.GTE]: ">=",
-    [Ops.LT]: "<",
-    [Ops.LTE]: "<="
-  };
-  const sqlOp = COMPARISON_OPS2[op];
-  if (!sqlOp) {
-    throw createError(`Unsupported scalar operator: ${op}`, { operator: op });
-  }
-  const placeholder = params.addAuto(val);
-  return `${expr} ${sqlOp} ${placeholder}`;
-}
-function buildArrayParam(val, params, dialect) {
-  if (schemaParser.isDynamicParameter(val)) {
-    return params.addAuto(val);
+var normalizePairs = (pairs, parseValue) => {
+  return pairs.map(([field, rawValue]) => {
+    const parsed = parseValue(rawValue, field);
+    return {
+      [field]: parsed.nulls !== void 0 ? { sort: parsed.direction, nulls: parsed.nulls } : parsed.direction
+    };
+  });
+};
+function normalizeOrderByInput(orderBy, parseValue) {
+  if (!isNotNullish(orderBy)) return [];
+  if (Array.isArray(orderBy)) {
+    const pairs = orderBy.map(assertSingleFieldObject);
+    return normalizePairs(pairs, parseValue);
   }
-  if (!Array.isArray(val)) {
-    throw createError(`Array operation requires array value`, { value: val });
+  if (isPlainObject(orderBy)) {
+    return normalizePairs(Object.entries(orderBy), parseValue);
   }
-  const paramValue = prepareArrayParam(val, dialect);
-  return params.add(paramValue);
+  throw new Error("orderBy must be an object or array of objects");
 }
-function buildArrayOperator(expr, op, val, params, fieldType, dialect) {
-  if (val === void 0) return "";
-  if (val === null) {
-    if (op === Ops.EQUALS) return `${expr} ${SQL_TEMPLATES.IS_NULL}`;
-    if (op === Ops.NOT) return `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
-  }
-  const cast = getArrayType(fieldType, dialect);
-  if (op === Ops.EQUALS) {
-    return handleArrayEquals(expr, val, params, cast, dialect);
-  }
-  if (op === Ops.NOT) {
-    return handleArrayNot(expr, val, params, cast, dialect);
-  }
-  switch (op) {
-    case Ops.HAS:
-      return handleArrayHas(expr, val, params, cast, dialect);
-    case Ops.HAS_SOME:
-      return handleArrayHasSome(expr, val, params, cast, dialect);
-    case Ops.HAS_EVERY:
-      return handleArrayHasEvery(expr, val, params, cast, dialect);
-    case Ops.IS_EMPTY:
-      return handleArrayIsEmpty(expr, val, dialect);
-    default:
-      throw createError(`Unknown array operator: ${op}`, { operator: op });
-  }
+
+// src/builder/pagination.ts
+var MAX_LIMIT_OFFSET = 2147483647;
+function parseDirectionRaw(raw, errorLabel) {
+  const s = String(raw).toLowerCase();
+  if (s === "asc" || s === "desc") return s;
+  throw new Error(`Invalid ${errorLabel}: ${raw}`);
 }
-function handleArrayEquals(expr, val, params, cast, dialect) {
-  if (val === void 0) return "";
-  if (isEmptyArray(val)) {
-    return arrayIsEmpty(expr, dialect);
+function parseNullsRaw(raw, errorLabel) {
+  if (!isNotNullish(raw)) return void 0;
+  const s = String(raw).toLowerCase();
+  if (s === "first" || s === "last") return s;
+  throw new Error(`Invalid ${errorLabel}: ${raw}`);
+}
+function requireOrderByObject(v, errorPrefix) {
+  if (!isPlainObject(v) || !("sort" in v)) {
+    throw new Error(`${errorPrefix} must be 'asc' | 'desc' or { sort, nulls? }`);
   }
-  const placeholder = buildArrayParam(val, params, dialect);
-  return arrayEquals(expr, placeholder, cast, dialect);
+  return v;
 }
-function handleArrayNot(expr, val, params, cast, dialect) {
-  if (val === void 0) return "";
-  let target = val;
-  if (isPlainObject(val)) {
-    const entries = Object.entries(val).filter(([, v]) => v !== void 0);
-    if (entries.length === 1 && entries[0][0] === Ops.EQUALS) {
-      target = entries[0][1];
-    } else {
-      throw createError(`Array NOT only supports { equals: ... } shape`, {
-        operator: Ops.NOT,
-        value: val
-      });
+function assertAllowedOrderByKeys(obj, fieldName) {
+  const allowed = /* @__PURE__ */ new Set(["sort", "nulls"]);
+  for (const k of Object.keys(obj)) {
+    if (!allowed.has(k)) {
+      throw new Error(
+        fieldName ? `Unsupported orderBy key '${k}' for field '${fieldName}'` : `Unsupported orderBy key '${k}'`
+      );
     }
   }
-  if (target === null) {
-    return `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
-  }
-  if (isEmptyArray(target)) {
-    return arrayIsNotEmpty(expr, dialect);
-  }
-  const placeholder = buildArrayParam(target, params, dialect);
-  return `${SQL_TEMPLATES.NOT} (${arrayEquals(expr, placeholder, cast, dialect)})`;
 }
-function handleArrayHas(expr, val, params, cast, dialect) {
-  if (val === void 0) return "";
-  if (val === null) {
-    throw createError(`has requires scalar value`, {
-      operator: Ops.HAS,
-      value: val
-    });
-  }
-  if (!schemaParser.isDynamicParameter(val) && Array.isArray(val)) {
-    throw createError(`has requires scalar value (single element), not array`, {
-      operator: Ops.HAS,
-      value: val
-    });
-  }
-  if (isPlainObject(val)) {
-    throw createError(`has requires scalar value`, {
-      operator: Ops.HAS,
-      value: val
-    });
+function parseOrderByValue(v, fieldName) {
+  const errorPrefix = fieldName ? `orderBy for '${fieldName}'` : "orderBy value";
+  if (typeof v === "string") {
+    return { direction: parseDirectionRaw(v, `${errorPrefix} direction`) };
   }
-  const placeholder = params.addAuto(val);
-  return arrayContains(expr, placeholder, cast, dialect);
+  const obj = requireOrderByObject(v, errorPrefix);
+  const direction = parseDirectionRaw(obj.sort, `${errorPrefix}.sort`);
+  const nulls = parseNullsRaw(obj.nulls, `${errorPrefix}.nulls`);
+  assertAllowedOrderByKeys(obj, fieldName);
+  return { direction, nulls };
 }
-function handleArrayHasSome(expr, val, params, cast, dialect) {
-  if (val === void 0) return "";
-  if (schemaParser.isDynamicParameter(val)) {
-    const placeholder2 = params.addAuto(val);
-    return arrayOverlaps(expr, placeholder2, cast, dialect);
+function normalizeFiniteInteger(name, v) {
+  if (typeof v !== "number" || !Number.isFinite(v) || !Number.isInteger(v)) {
+    throw new Error(`${name} must be an integer`);
   }
-  if (!Array.isArray(val)) {
-    throw createError(`hasSome requires array value`, {
-      operator: Ops.HAS_SOME,
-      value: val
-    });
+  return v;
+}
+function normalizeNonNegativeInt(name, v) {
+  if (schemaParser.isDynamicParameter(v)) return v;
+  const n = normalizeFiniteInteger(name, v);
+  if (n < 0) {
+    throw new Error(`${name} must be >= 0`);
   }
-  if (val.length > LIMITS.MAX_ARRAY_SIZE) {
-    throw createError(
-      `Array too large (${val.length} elements, max ${LIMITS.MAX_ARRAY_SIZE})`,
-      { operator: Ops.HAS_SOME, value: `[${val.length} items]` }
-    );
+  if (n > MAX_LIMIT_OFFSET) {
+    throw new Error(`${name} must be <= ${MAX_LIMIT_OFFSET}`);
   }
-  if (val.length === 0) return "0=1";
-  const paramValue = prepareArrayParam(val, dialect);
-  const placeholder = params.add(paramValue);
-  return arrayOverlaps(expr, placeholder, cast, dialect);
+  return n;
 }
-function handleArrayHasEvery(expr, val, params, cast, dialect) {
-  if (val === void 0) return "";
-  const placeholder = buildArrayParam(val, params, dialect);
-  return arrayContainsAll(expr, placeholder, cast, dialect);
+function hasNonNullishProp(v, key) {
+  return isPlainObject(v) && key in v && isNotNullish(v[key]);
 }
-function handleArrayIsEmpty(expr, val, dialect) {
-  if (typeof val !== "boolean") {
-    throw createError(`isEmpty requires boolean value`, {
-      operator: Ops.IS_EMPTY,
-      value: val
-    });
+function normalizeIntegerOrDynamic(name, v) {
+  if (schemaParser.isDynamicParameter(v)) return v;
+  return normalizeFiniteInteger(name, v);
+}
+function readSkipTake(relArgs) {
+  const hasSkip = hasNonNullishProp(relArgs, "skip");
+  const hasTake = hasNonNullishProp(relArgs, "take");
+  if (!hasSkip && !hasTake) {
+    return {
+      hasSkip: false,
+      hasTake: false,
+      skipVal: void 0,
+      takeVal: void 0
+    };
   }
-  return val === true ? arrayIsEmpty(expr, dialect) : arrayIsNotEmpty(expr, dialect);
+  const obj = relArgs;
+  const skipVal = hasSkip ? normalizeNonNegativeInt("skip", obj.skip) : void 0;
+  const takeVal = hasTake ? normalizeIntegerOrDynamic("take", obj.take) : void 0;
+  return { hasSkip, hasTake, skipVal, takeVal };
 }
-
-// src/builder/where/operators-json.ts
-var SAFE_JSON_PATH_SEGMENT = /^[a-zA-Z_]\w*$/;
-function validateJsonPathSegments(segments) {
-  for (const segment of segments) {
-    if (typeof segment !== "string") {
-      throw createError("JSON path segments must be strings", {
-        operator: Ops.PATH,
-        value: segment
-      });
+function buildOrderByFragment(entries, alias, dialect, model) {
+  if (entries.length === 0) return "";
+  const out = [];
+  for (const e of entries) {
+    const dir = e.direction.toUpperCase();
+    const c = col(alias, e.field, model);
+    if (dialect === "postgres") {
+      const nulls = isNotNullish(e.nulls) ? ` NULLS ${e.nulls.toUpperCase()}` : "";
+      out.push(`${c} ${dir}${nulls}`);
+      continue;
     }
-    if (!SAFE_JSON_PATH_SEGMENT.test(segment)) {
-      throw createError(
-        `Invalid JSON path segment: '${segment}'. Must be alphanumeric with underscores, starting with letter or underscore.`,
-        { operator: Ops.PATH, value: segment }
-      );
+    if (isNotNullish(e.nulls)) {
+      const isNullExpr = `(${c} IS NULL)`;
+      const nullRankDir = e.nulls === "first" ? "DESC" : "ASC";
+      out.push(`${isNullExpr} ${nullRankDir}`);
+      out.push(`${c} ${dir}`);
+      continue;
     }
+    out.push(`${c} ${dir}`);
   }
+  return out.join(SQL_SEPARATORS.ORDER_BY);
 }
-function buildJsonOperator(expr, op, val, params, dialect) {
-  if (val === void 0) return "";
-  if (op === Ops.PATH && isPlainObject(val) && "path" in val) {
-    return handleJsonPath(expr, val, params, dialect);
-  }
-  const jsonWildcards = {
-    [Ops.STRING_CONTAINS]: (v) => `%${v}%`,
-    [Ops.STRING_STARTS_WITH]: (v) => `${v}%`,
-    [Ops.STRING_ENDS_WITH]: (v) => `%${v}`
-  };
-  if (op in jsonWildcards) {
-    return handleJsonWildcard(expr, op, val, params, jsonWildcards, dialect);
+function defaultNullsFor(dialect, direction) {
+  if (dialect === "postgres") {
+    return direction === "asc" ? "last" : "first";
   }
-  throw createError(`Unsupported JSON operator: ${op}`, { operator: op });
+  return direction === "asc" ? "first" : "last";
 }
-function handleJsonPath(expr, val, params, dialect) {
-  const v = val;
-  if (!Array.isArray(v.path)) {
-    throw createError("JSON path must be an array", { operator: Ops.PATH });
-  }
-  if (v.path.length === 0) {
-    throw createError("JSON path cannot be empty", { operator: Ops.PATH });
+function ensureCursorFieldsInOrder(orderEntries, cursorEntries) {
+  const existing = /* @__PURE__ */ new Map();
+  for (const e of orderEntries) existing.set(e.field, e);
+  const out = [...orderEntries];
+  for (const [field] of cursorEntries) {
+    if (!existing.has(field)) {
+      out.push({ field, direction: "asc" });
+      existing.set(field, out[out.length - 1]);
+    }
   }
-  validateJsonPathSegments(v.path);
-  const pathExpr = dialect === "sqlite" ? params.add(`$.${v.path.join(".")}`) : params.add(v.path);
-  const rawOps = [
-    ["=", v.equals],
-    [">", v.gt],
-    [">=", v.gte],
-    ["<", v.lt],
-    ["<=", v.lte]
-  ];
-  const ops = rawOps.filter(
-    ([, value]) => value !== void 0
-  );
-  if (ops.length === 0) {
-    throw createError("JSON path query missing comparison operator", {
-      operator: Ops.PATH
-    });
+  return out;
+}
+function buildCursorFilterParts(cursor, cursorAlias, params, model) {
+  const entries = Object.entries(cursor);
+  if (entries.length === 0) {
+    throw new Error("cursor must have at least one field");
   }
+  const placeholdersByField = /* @__PURE__ */ new Map();
   const parts = [];
-  for (const [sqlOp, value] of ops) {
+  for (const [field, value] of entries) {
+    const c = `${cursorAlias}.${quote(field)}`;
     if (value === null) {
-      const base2 = jsonExtractText(expr, pathExpr, dialect);
-      parts.push(`${base2} ${SQL_TEMPLATES.IS_NULL}`);
+      parts.push(`${c} IS NULL`);
       continue;
     }
-    const valPh = params.add(value);
-    const base = typeof value === "number" ? jsonExtractNumeric(expr, pathExpr, dialect) : jsonExtractText(expr, pathExpr, dialect);
-    parts.push(`${base} ${sqlOp} ${valPh}`);
-  }
-  return parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`;
-}
-function handleJsonWildcard(expr, op, val, params, wildcards, dialect) {
-  if (!isNotNullish(val)) {
-    throw createError(`JSON string operator requires non-null value`, {
-      operator: op,
-      value: val
-    });
-  }
-  if (isPlainObject(val) || Array.isArray(val)) {
-    throw createError(`JSON string operator requires scalar value`, {
-      operator: op,
-      value: val
-    });
-  }
-  const strVal = String(val);
-  if (strVal.length > LIMITS.MAX_STRING_LENGTH) {
-    throw createError(
-      `String too long (${strVal.length} chars, max ${LIMITS.MAX_STRING_LENGTH})`,
-      { operator: op }
-    );
+    const ph = addAutoScoped(params, value, `cursor.filter.${field}`);
+    placeholdersByField.set(field, ph);
+    parts.push(`${c} = ${ph}`);
   }
-  const placeholder = params.add(wildcards[op](strVal));
-  const jsonText = jsonToText(expr, dialect);
-  return caseInsensitiveLike(jsonText, placeholder, dialect);
+  return {
+    whereSql: parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`,
+    placeholdersByField
+  };
 }
-
-// src/builder/where/relations.ts
-var NO_JOINS = Object.freeze([]);
-function isListRelation(fieldType) {
-  return typeof fieldType === "string" && fieldType.endsWith("[]");
+function cursorValueExpr(tableName, cursorAlias, cursorWhereSql, field, model) {
+  const colName = quote(field);
+  return `(SELECT ${cursorAlias}.${colName} ${SQL_TEMPLATES.FROM} ${tableName} ${cursorAlias} ${SQL_TEMPLATES.WHERE} ${cursorWhereSql} ${SQL_TEMPLATES.LIMIT} 1)`;
 }
-function buildToOneNullCheck(field, parentAlias, relTable, relAlias, join3, wantNull) {
-  const isLocal = field.isForeignKeyLocal === true;
-  const fkFields = normalizeKeyList(field.foreignKey);
-  if (isLocal) {
-    if (fkFields.length === 0) {
-      throw createError(`Relation '${field.name}' is missing foreignKey`, {
-        field: field.name
-      });
-    }
-    const parts = fkFields.map((fk) => {
-      const safe = fk.replace(/"/g, '""');
-      const expr = `${parentAlias}."${safe}"`;
-      return wantNull ? `${expr} ${SQL_TEMPLATES.IS_NULL}` : `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
-    });
-    if (parts.length === 1) return parts[0];
-    return wantNull ? `(${parts.join(" OR ")})` : `(${parts.join(" AND ")})`;
-  }
-  const existsSql = `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias} ${SQL_TEMPLATES.WHERE} ${join3})`;
-  return wantNull ? `${SQL_TEMPLATES.NOT} ${existsSql}` : existsSql;
+function buildCursorRowExistsExpr(tableName, cursorAlias, cursorWhereSql) {
+  return `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${tableName} ${cursorAlias} ${SQL_TEMPLATES.WHERE} ${cursorWhereSql} ${SQL_TEMPLATES.LIMIT} 1)`;
 }
-function buildToOneExistsMatch(relTable, relAlias, join3, sub) {
-  const joins = sub.joins.length > 0 ? ` ${sub.joins.join(" ")}` : "";
-  return `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${joins} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${sub.clause})`;
+function buildCursorEqualityExpr(columnExpr, valueExpr) {
+  return `((${valueExpr} IS NULL AND ${columnExpr} IS NULL) OR (${valueExpr} IS NOT NULL AND ${columnExpr} = ${valueExpr}))`;
 }
-function buildToOneNotExistsMatch(relTable, relAlias, join3, sub) {
-  const joins = sub.joins.length > 0 ? ` ${sub.joins.join(" ")}` : "";
-  return `${SQL_TEMPLATES.NOT} EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${joins} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${sub.clause})`;
+function buildCursorInequalityExpr(columnExpr, direction, nulls, valueExpr) {
+  const op = direction === "asc" ? ">" : "<";
+  if (nulls === "first") {
+    return `(CASE WHEN ${valueExpr} IS NULL THEN (${columnExpr} IS NOT NULL) ELSE (${columnExpr} ${op} ${valueExpr}) END)`;
+  }
+  return `(CASE WHEN ${valueExpr} IS NULL THEN 0=1 ELSE ((${columnExpr} ${op} ${valueExpr}) OR (${columnExpr} IS NULL)) END)`;
 }
-function buildListRelationFilters(args) {
-  const {
-    fieldName,
-    value,
-    ctx,
-    whereBuilder,
-    relModel,
-    relTable,
-    relAlias,
-    join: join3
-  } = args;
-  const noneValue = value[RelationFilters.NONE];
-  if (noneValue !== void 0 && noneValue !== null) {
-    const sub = whereBuilder.build(noneValue, __spreadProps(__spreadValues({}, ctx), {
-      alias: relAlias,
-      model: relModel,
-      path: [...ctx.path, fieldName, RelationFilters.NONE],
-      isSubquery: true,
-      depth: ctx.depth + 1
-    }));
-    const isEmptyFilter = isPlainObject(noneValue) && Object.keys(noneValue).length === 0;
-    const canOptimize = !ctx.isSubquery && isEmptyFilter && sub.clause === DEFAULT_WHERE_CLAUSE && sub.joins.length === 0;
-    if (canOptimize) {
-      const checkField = relModel.fields.find(
-        (f) => !f.isRelation && f.isRequired && f.name !== "id"
-      ) || relModel.fields.find((f) => !f.isRelation && f.name === "id");
-      if (checkField) {
-        const leftJoinSql = `LEFT JOIN ${relTable} ${relAlias} ON ${join3}`;
-        const whereClause = `${relAlias}.${quote(checkField.name)} IS NULL`;
-        return Object.freeze({
-          clause: whereClause,
-          joins: [leftJoinSql]
-        });
-      }
+function buildOuterCursorMatch(cursor, outerAlias, placeholdersByField, params, model) {
+  const parts = [];
+  for (const [field, value] of Object.entries(cursor)) {
+    const c = col(outerAlias, field, model);
+    if (value === null) {
+      parts.push(`${c} IS NULL`);
+      continue;
+    }
+    const existing = placeholdersByField.get(field);
+    if (typeof existing === "string" && existing.length > 0) {
+      parts.push(`${c} = ${existing}`);
+      continue;
     }
+    const ph = addAutoScoped(params, value, `cursor.outerMatch.${field}`);
+    parts.push(`${c} = ${ph}`);
   }
-  const filters = [
-    {
-      key: RelationFilters.SOME,
-      wrap: (c, j) => `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${j} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${c})`
-    },
-    {
-      key: RelationFilters.EVERY,
-      wrap: (c, j) => `${SQL_TEMPLATES.NOT} EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${j} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${SQL_TEMPLATES.NOT} (${c}))`
-    },
-    {
-      key: RelationFilters.NONE,
-      wrap: (c, j) => {
-        const condition = c === DEFAULT_WHERE_CLAUSE ? "" : ` ${SQL_TEMPLATES.AND} ${c}`;
-        return `${SQL_TEMPLATES.NOT} EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${j} ${SQL_TEMPLATES.WHERE} ${join3}${condition})`;
+  return parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`;
+}
+function buildOrderEntries(orderBy) {
+  const normalized = normalizeOrderByInput(orderBy, parseOrderByValue);
+  const entries = [];
+  for (const item of normalized) {
+    for (const [field, value] of Object.entries(item)) {
+      if (typeof value === "string") {
+        entries.push({ field, direction: value });
+      } else {
+        entries.push({
+          field,
+          direction: value.sort,
+          nulls: value.nulls
+        });
       }
     }
-  ];
-  const clauses = [];
-  for (const { key, wrap } of filters) {
-    const raw = value[key];
-    if (raw === void 0 || raw === null) continue;
-    const sub = whereBuilder.build(raw, __spreadProps(__spreadValues({}, ctx), {
-      alias: relAlias,
-      model: relModel,
-      path: [...ctx.path, fieldName, key],
-      isSubquery: true,
-      depth: ctx.depth + 1
-    }));
-    const j = sub.joins.length > 0 ? ` ${sub.joins.join(" ")}` : "";
-    clauses.push(wrap(sub.clause, j));
-  }
-  if (clauses.length === 0) {
-    throw createError(
-      `List relation '${fieldName}' requires one of { some, every, none }`,
-      { field: fieldName, path: ctx.path, modelName: ctx.model.name }
-    );
   }
-  return Object.freeze({
-    clause: clauses.join(SQL_SEPARATORS.CONDITION_AND),
-    joins: NO_JOINS
-  });
+  return entries;
 }
-function buildToOneRelationFilters(args) {
-  const {
-    fieldName,
-    value,
-    ctx,
-    whereBuilder,
-    field,
-    relModel,
-    relTable,
-    relAlias,
-    join: join3
-  } = args;
-  const hasSomeEveryNone = isNotNullish(value[RelationFilters.SOME]) || isNotNullish(value[RelationFilters.EVERY]) || isNotNullish(value[RelationFilters.NONE]);
-  if (hasSomeEveryNone) {
-    throw createError(
-      `To-one relation '${fieldName}' does not support { some, every, none }; use { is, isNot }`,
-      { field: fieldName, path: ctx.path, modelName: ctx.model.name }
-    );
-  }
-  const hasIs = Object.prototype.hasOwnProperty.call(value, "is");
-  const hasIsNot = Object.prototype.hasOwnProperty.call(value, "isNot");
-  let filterKey;
-  let filterVal;
-  if (hasIs) {
-    filterKey = "is";
-    filterVal = value.is;
-  } else if (hasIsNot) {
-    filterKey = "isNot";
-    filterVal = value.isNot;
-  } else {
-    filterKey = "is";
-    filterVal = value;
+function buildCursorCondition(cursor, orderBy, tableName, alias, params, dialect, model) {
+  var _a;
+  const d = dialect != null ? dialect : getGlobalDialect();
+  const cursorEntries = Object.entries(cursor);
+  if (cursorEntries.length === 0) {
+    throw new Error("cursor must have at least one field");
   }
-  if (filterVal === void 0) {
-    return Object.freeze({
-      clause: DEFAULT_WHERE_CLAUSE,
-      joins: NO_JOINS
-    });
-  }
-  if (filterVal === null) {
-    const wantNull = filterKey === "is";
-    const clause2 = buildToOneNullCheck(
+  const cursorAlias = "__tp_cursor_src";
+  const { whereSql: cursorWhereSql, placeholdersByField } = buildCursorFilterParts(cursor, cursorAlias, params);
+  let orderEntries = buildOrderEntries(orderBy);
+  if (orderEntries.length === 0) {
+    orderEntries = cursorEntries.map(([field]) => ({
       field,
-      ctx.alias,
-      relTable,
-      relAlias,
-      join3,
-      wantNull
-    );
-    return Object.freeze({
-      clause: clause2,
-      joins: NO_JOINS
-    });
+      direction: "asc"
+    }));
+  } else {
+    orderEntries = ensureCursorFieldsInOrder(orderEntries, cursorEntries);
   }
-  if (!isPlainObject(filterVal)) {
-    throw createError(
-      `Relation '${fieldName}' filter must be an object or null`,
-      {
-        field: fieldName,
-        path: ctx.path,
-        modelName: ctx.model.name,
-        value: filterVal
-      }
-    );
+  const existsExpr = buildCursorRowExistsExpr(
+    tableName,
+    cursorAlias,
+    cursorWhereSql
+  );
+  const outerCursorMatch = buildOuterCursorMatch(
+    cursor,
+    alias,
+    placeholdersByField,
+    params,
+    model
+  );
+  const orClauses = [];
+  for (let level = 0; level < orderEntries.length; level++) {
+    const andParts = [];
+    for (let i = 0; i < level; i++) {
+      const e2 = orderEntries[i];
+      const c2 = col(alias, e2.field, model);
+      const v2 = cursorValueExpr(
+        tableName,
+        cursorAlias,
+        cursorWhereSql,
+        e2.field);
+      andParts.push(buildCursorEqualityExpr(c2, v2));
+    }
+    const e = orderEntries[level];
+    const c = col(alias, e.field, model);
+    const v = cursorValueExpr(
+      tableName,
+      cursorAlias,
+      cursorWhereSql,
+      e.field);
+    const nulls = (_a = e.nulls) != null ? _a : defaultNullsFor(d, e.direction);
+    andParts.push(buildCursorInequalityExpr(c, e.direction, nulls, v));
+    orClauses.push(`(${andParts.join(SQL_SEPARATORS.CONDITION_AND)})`);
   }
-  const sub = whereBuilder.build(filterVal, __spreadProps(__spreadValues({}, ctx), {
-    alias: relAlias,
-    model: relModel,
-    path: [...ctx.path, fieldName, filterKey],
-    isSubquery: true,
-    depth: ctx.depth + 1
-  }));
-  const clause = filterKey === "is" ? buildToOneExistsMatch(relTable, relAlias, join3, sub) : buildToOneNotExistsMatch(relTable, relAlias, join3, sub);
-  return Object.freeze({
-    clause,
-    joins: NO_JOINS
-  });
+  const exclusive = orClauses.join(SQL_SEPARATORS.CONDITION_OR);
+  return `(${existsExpr} ${SQL_SEPARATORS.CONDITION_AND} ((${exclusive})${SQL_SEPARATORS.CONDITION_OR}(${outerCursorMatch})))`;
 }
-function ensureRelationFilterObject(fieldName, value, ctx) {
-  if (!isPlainObject(value)) {
-    throw createError(`Relation filter '${fieldName}' must be an object`, {
-      path: [...ctx.path, fieldName],
-      field: fieldName,
-      modelName: ctx.model.name,
-      value
-    });
-  }
+function buildOrderBy(orderBy, alias, dialect, model) {
+  const entries = buildOrderEntries(orderBy);
+  if (entries.length === 0) return "";
+  const d = dialect != null ? dialect : getGlobalDialect();
+  return buildOrderByFragment(entries, alias, d, model);
 }
-function buildRelation(fieldName, value, ctx, whereBuilder) {
-  const field = ctx.model.fields.find((f) => f.name === fieldName);
-  if (!isValidRelationField(field)) {
-    throw createError(`Invalid relation '${fieldName}'`, {
-      field: fieldName,
-      path: ctx.path,
-      modelName: ctx.model.name
-    });
-  }
-  const relModel = ctx.schemaModels.find((m) => m.name === field.relatedModel);
-  if (!isNotNullish(relModel)) {
-    throw createError(
-      `Related model '${field.relatedModel}' not found in schema. Available models: ${ctx.schemaModels.map((m) => m.name).join(", ")}`,
-      {
-        field: fieldName,
-        path: ctx.path,
-        modelName: ctx.model.name
-      }
+function buildOrderByClause(args, alias, dialect, model) {
+  if (!isNotNullish(args.orderBy)) return "";
+  const result = buildOrderBy(args.orderBy, alias, dialect, model);
+  if (!isNonEmptyString(result)) {
+    throw new Error(
+      "buildOrderByClause: orderBy specified but produced empty result"
     );
   }
-  const relTable = buildTableReference(
-    SQL_TEMPLATES.PUBLIC_SCHEMA,
-    relModel.tableName,
-    ctx.dialect
-  );
-  const relAlias = ctx.aliasGen.next(fieldName);
-  const join3 = joinCondition(field, ctx.model, relModel, ctx.alias, relAlias);
-  const args = {
-    fieldName,
-    value,
-    ctx,
-    whereBuilder,
-    field,
-    relModel,
-    relTable,
-    relAlias,
-    join: join3
-  };
-  if (isListRelation(field.type)) return buildListRelationFilters(args);
-  return buildToOneRelationFilters(args);
+  return result;
 }
-function buildTopLevelRelation(fieldName, value, ctx, whereBuilder) {
-  ensureRelationFilterObject(fieldName, value, ctx);
-  return buildRelation(fieldName, value, ctx, whereBuilder);
+function normalizeTakeLike(v) {
+  const n = normalizeIntLike("take", v, {
+    min: Number.MIN_SAFE_INTEGER,
+    max: MAX_LIMIT_OFFSET,
+    allowZero: true
+  });
+  if (typeof n === "number") {
+    if (n === 0) return 0;
+  }
+  return n;
 }
-function buildNestedRelation(fieldName, value, ctx, whereBuilder) {
-  return buildTopLevelRelation(fieldName, value, ctx, whereBuilder);
+function normalizeSkipLike(v) {
+  return normalizeIntLike("skip", v, {
+    min: 0,
+    max: MAX_LIMIT_OFFSET,
+    allowZero: true
+  });
 }
-
-// src/builder/shared/validators/field-validators.ts
-function assertFieldExists(name, model, path) {
-  const field = model.fields.find((f) => f.name === name);
-  if (!isNotNullish(field)) {
-    throw createError(`Field '${name}' does not exist on '${model.name}'`, {
-      field: name,
-      path,
-      modelName: model.name,
-      availableFields: model.fields.map((f) => f.name)
-    });
+function getPaginationParams(method, args) {
+  if (method === "findMany") {
+    return {
+      take: normalizeTakeLike(args.take),
+      skip: normalizeSkipLike(args.skip),
+      cursor: args.cursor
+    };
   }
-  return field;
-}
-function assertValidOperator(fieldName, op, fieldType, path, modelName) {
-  if (!isNotNullish(fieldType)) return;
-  const ARRAY_OPS = /* @__PURE__ */ new Set([
-    Ops.HAS,
-    Ops.HAS_SOME,
-    Ops.HAS_EVERY,
-    Ops.IS_EMPTY
-  ]);
-  const JSON_OPS = /* @__PURE__ */ new Set([
-    Ops.PATH,
-    Ops.STRING_CONTAINS,
-    Ops.STRING_STARTS_WITH,
-    Ops.STRING_ENDS_WITH
-  ]);
-  const isArrayOp = ARRAY_OPS.has(op);
-  const isFieldArray = isArrayType(fieldType);
-  const arrayOpMismatch = isArrayOp && !isFieldArray;
-  if (arrayOpMismatch) {
-    throw createError(`'${op}' requires array field, got '${fieldType}'`, {
-      operator: op,
-      field: fieldName,
-      path,
-      modelName
-    });
+  if (method === "findFirst") {
+    const skip = normalizeSkipLike(args.skip);
+    return { take: 1, skip: skip != null ? skip : 0 };
   }
-  const isJsonOp = JSON_OPS.has(op);
-  const isFieldJson = isJsonType(fieldType);
-  const jsonOpMismatch = isJsonOp && !isFieldJson;
-  if (jsonOpMismatch) {
-    throw createError(`'${op}' requires JSON field, got '${fieldType}'`, {
-      operator: op,
-      field: fieldName,
-      path,
-      modelName
-    });
+  if (method === "findUnique") {
+    return { take: 1, skip: 0 };
   }
+  return {};
 }
-
-// src/builder/where/builder.ts
-var WhereBuilder = class {
-  build(where, ctx) {
-    if (!isPlainObject(where)) {
-      throw createError("where must be an object", {
-        path: ctx.path,
-        modelName: ctx.model.name
-      });
-    }
-    return buildWhereInternal(where, ctx, this);
+function buildNotComposite(expr, val, params, dialect, buildOp, separator) {
+  const entries = Object.entries(val).filter(
+    ([k, v]) => k !== "mode" && v !== void 0
+  );
+  if (entries.length === 0) return "";
+  const clauses = [];
+  for (const [subOp, subVal] of entries) {
+    const sub = buildOp(expr, subOp, subVal, params, dialect);
+    if (sub && sub.trim().length > 0) clauses.push(`(${sub})`);
   }
-};
-var MAX_QUERY_DEPTH = 50;
-var EMPTY_JOINS = Object.freeze([]);
-var whereBuilderInstance = new WhereBuilder();
-function freezeResult(clause, joins = EMPTY_JOINS) {
-  return Object.freeze({ clause, joins });
+  if (clauses.length === 0) return "";
+  if (clauses.length === 1) return `${SQL_TEMPLATES.NOT} ${clauses[0]}`;
+  return `${SQL_TEMPLATES.NOT} (${clauses.join(separator)})`;
 }
-function dedupePreserveOrder(items) {
-  if (items.length <= 1) return Object.freeze([...items]);
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const s of items) {
-    if (!seen.has(s)) {
-      seen.add(s);
-      out.push(s);
+function buildScalarOperator(expr, op, val, params, mode, fieldType, dialect) {
+  if (val === void 0) return "";
+  if (val === null) {
+    return handleNullValue(expr, op);
+  }
+  if (op === Ops.NOT && isPlainObject(val)) {
+    return handleNotOperator(expr, val, params, mode, fieldType, dialect);
+  }
+  if (op === Ops.NOT) {
+    const placeholder = params.addAuto(val);
+    return `${expr} <> ${placeholder}`;
+  }
+  if (op === Ops.EQUALS && mode === Modes.INSENSITIVE && isNotNullish(dialect)) {
+    const placeholder = params.addAuto(val);
+    return caseInsensitiveEquals(expr, placeholder);
+  }
+  const STRING_LIKE_OPS = /* @__PURE__ */ new Set([
+    Ops.CONTAINS,
+    Ops.STARTS_WITH,
+    Ops.ENDS_WITH
+  ]);
+  if (STRING_LIKE_OPS.has(op)) {
+    if (!isNotNullish(dialect)) {
+      throw createError(`Like operators require a SQL dialect`, {
+        operator: op
+      });
     }
+    return handleLikeOperator(expr, op, val, params, mode, dialect);
   }
-  return Object.freeze(out);
+  if (op === Ops.IN || op === Ops.NOT_IN) {
+    if (!isNotNullish(dialect)) {
+      throw createError(`IN operators require a SQL dialect`, { operator: op });
+    }
+    return handleInOperator(expr, op, val, params, dialect);
+  }
+  return handleComparisonOperator(expr, op, val, params);
 }
-function appendResult(result, clauses, allJoins) {
-  if (isValidWhereClause(result.clause)) clauses.push(result.clause);
-  if (isNonEmptyArray(result.joins)) allJoins.push(...result.joins);
+function handleNullValue(expr, op) {
+  if (op === Ops.EQUALS) return `${expr} ${SQL_TEMPLATES.IS_NULL}`;
+  if (op === Ops.NOT) return `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
+  throw createError(`Operator '${op}' doesn't support null`, { operator: op });
 }
-function asLogicalOperator(key) {
-  if (key === LogicalOps.AND) return "AND";
-  if (key === LogicalOps.OR) return "OR";
-  if (key === LogicalOps.NOT) return "NOT";
-  return null;
+function normalizeMode(v) {
+  if (v === Modes.INSENSITIVE) return Modes.INSENSITIVE;
+  if (v === Modes.DEFAULT) return Modes.DEFAULT;
+  return void 0;
 }
-function nextContext(ctx) {
-  return __spreadProps(__spreadValues({}, ctx), { depth: ctx.depth + 1 });
+function handleNotOperator(expr, val, params, outerMode, fieldType, dialect) {
+  const innerMode = normalizeMode(val.mode);
+  const effectiveMode = innerMode != null ? innerMode : outerMode;
+  return buildNotComposite(
+    expr,
+    val,
+    params,
+    dialect,
+    (e, subOp, subVal, p, d) => buildScalarOperator(e, subOp, subVal, p, effectiveMode, fieldType, d),
+    ` ${SQL_TEMPLATES.AND} `
+  );
 }
-function buildRelationFilter(fieldName, value, ctx, builder) {
-  const ctx2 = nextContext(ctx);
-  if (ctx.isSubquery) {
-    return buildNestedRelation(fieldName, value, ctx2, builder);
+function buildDynamicLikePattern(op, placeholder, dialect) {
+  if (dialect === "postgres") {
+    switch (op) {
+      case Ops.CONTAINS:
+        return `('%' || ${placeholder} || '%')`;
+      case Ops.STARTS_WITH:
+        return `(${placeholder} || '%')`;
+      case Ops.ENDS_WITH:
+        return `('%' || ${placeholder})`;
+      default:
+        return placeholder;
+    }
+  }
+  switch (op) {
+    case Ops.CONTAINS:
+      return `('%' || ${placeholder} || '%')`;
+    case Ops.STARTS_WITH:
+      return `(${placeholder} || '%')`;
+    case Ops.ENDS_WITH:
+      return `('%' || ${placeholder})`;
+    default:
+      return placeholder;
   }
-  return buildTopLevelRelation(fieldName, value, ctx2, builder);
 }
-function buildWhereEntry(key, value, ctx, builder) {
-  const op = asLogicalOperator(key);
-  if (op) return buildLogical(op, value, ctx, builder);
-  if (isRelationField(key, ctx.model)) {
-    if (!isPlainObject(value)) {
-      throw createError(`Relation filter '${key}' must be an object`, {
-        path: [...ctx.path, key],
-        field: key,
-        modelName: ctx.model.name,
-        value
-      });
+function handleLikeOperator(expr, op, val, params, mode, dialect) {
+  if (val === void 0) return "";
+  if (schemaParser.isDynamicParameter(val)) {
+    const placeholder2 = params.addAuto(val);
+    const patternExpr = buildDynamicLikePattern(op, placeholder2, dialect);
+    if (mode === Modes.INSENSITIVE) {
+      return caseInsensitiveLike(expr, patternExpr, dialect);
     }
-    return buildRelationFilter(key, value, ctx, builder);
+    return `${expr} ${SQL_TEMPLATES.LIKE} ${patternExpr}`;
   }
-  return buildScalarField(key, value, ctx);
+  const placeholder = params.add(Wildcards[op](String(val)));
+  if (mode === Modes.INSENSITIVE) {
+    return caseInsensitiveLike(expr, placeholder, dialect);
+  }
+  return `${expr} ${SQL_TEMPLATES.LIKE} ${placeholder}`;
 }
-function buildWhereInternal(where, ctx, builder) {
-  if (ctx.depth > MAX_QUERY_DEPTH) {
-    throw createError(
-      `Query nesting too deep (max ${MAX_QUERY_DEPTH} levels). This usually indicates a circular reference.`,
-      { path: ctx.path, modelName: ctx.model.name }
-    );
+function handleInOperator(expr, op, val, params, dialect) {
+  if (val === void 0) return "";
+  if (schemaParser.isDynamicParameter(val)) {
+    const placeholder2 = params.addAuto(val);
+    return op === Ops.IN ? inArray(expr, placeholder2, dialect) : notInArray(expr, placeholder2, dialect);
   }
-  if (isEmptyWhere(where)) {
-    return freezeResult(DEFAULT_WHERE_CLAUSE, EMPTY_JOINS);
+  if (!Array.isArray(val)) {
+    throw createError(`IN operators require array value`, {
+      operator: op,
+      value: val
+    });
   }
-  const allJoins = [];
-  const clauses = [];
-  for (const [key, value] of Object.entries(where)) {
-    if (value === void 0) continue;
-    const result = buildWhereEntry(key, value, ctx, builder);
-    appendResult(result, clauses, allJoins);
+  if (val.length === 0) {
+    return op === Ops.IN ? "0=1" : "1=1";
   }
-  const finalClause = clauses.length > 0 ? clauses.join(SQL_SEPARATORS.CONDITION_AND) : DEFAULT_WHERE_CLAUSE;
-  return freezeResult(finalClause, dedupePreserveOrder(allJoins));
+  const paramValue = prepareArrayParam(val, dialect);
+  const placeholder = params.add(paramValue);
+  return op === Ops.IN ? inArray(expr, placeholder, dialect) : notInArray(expr, placeholder, dialect);
 }
-function normalizeLogicalValue(operator, value, ctx) {
-  if (Array.isArray(value)) {
-    const out = [];
-    for (let i = 0; i < value.length; i++) {
-      const v = value[i];
-      if (v === void 0) continue;
-      if (!isPlainObject(v)) {
-        throw createError(`${operator} entries must be objects`, {
-          path: [...ctx.path, operator, String(i)],
-          modelName: ctx.model.name,
-          value: v
-        });
-      }
-      out.push(v);
-    }
-    return out;
-  }
-  if (isPlainObject(value)) {
-    return [value];
+function handleComparisonOperator(expr, op, val, params) {
+  if (val === void 0) return "";
+  const COMPARISON_OPS2 = {
+    [Ops.EQUALS]: "=",
+    [Ops.GT]: ">",
+    [Ops.GTE]: ">=",
+    [Ops.LT]: "<",
+    [Ops.LTE]: "<="
+  };
+  const sqlOp = COMPARISON_OPS2[op];
+  if (!sqlOp) {
+    throw createError(`Unsupported scalar operator: ${op}`, { operator: op });
   }
-  throw createError(`${operator} must be an object or array of objects`, {
-    path: [...ctx.path, operator],
-    modelName: ctx.model.name,
-    value
-  });
+  const placeholder = params.addAuto(val);
+  return `${expr} ${sqlOp} ${placeholder}`;
 }
-function collectLogicalParts(operator, conditions, ctx, builder) {
-  const allJoins = [];
-  const clauses = [];
-  for (let i = 0; i < conditions.length; i++) {
-    const result = builder.build(conditions[i], __spreadProps(__spreadValues({}, ctx), {
-      path: [...ctx.path, operator, String(i)],
-      depth: ctx.depth + 1
-    }));
-    if (isNonEmptyArray(result.joins)) allJoins.push(...result.joins);
-    if (result.clause && result.clause !== DEFAULT_WHERE_CLAUSE) {
-      clauses.push(`(${result.clause})`);
-    }
+function buildArrayParam(val, params, dialect) {
+  if (schemaParser.isDynamicParameter(val)) {
+    return params.addAuto(val);
   }
-  return {
-    joins: dedupePreserveOrder(allJoins),
-    clauses: Object.freeze(clauses)
-  };
-}
-function buildLogicalClause(operator, clauses) {
-  if (clauses.length === 0) return DEFAULT_WHERE_CLAUSE;
-  if (operator === "NOT") {
-    if (clauses.length === 1) return `${SQL_TEMPLATES.NOT} ${clauses[0]}`;
-    return `${SQL_TEMPLATES.NOT} (${clauses.join(SQL_SEPARATORS.CONDITION_AND)})`;
+  if (!Array.isArray(val)) {
+    throw createError(`Array operation requires array value`, { value: val });
   }
-  return clauses.join(` ${operator} `);
+  const paramValue = prepareArrayParam(val, dialect);
+  return params.add(paramValue);
 }
-function buildLogical(operator, value, ctx, builder) {
-  const conditions = normalizeLogicalValue(operator, value, ctx);
-  if (conditions.length === 0) {
-    const clause2 = operator === "OR" ? "0=1" : DEFAULT_WHERE_CLAUSE;
-    return freezeResult(clause2, EMPTY_JOINS);
+function buildArrayOperator(expr, op, val, params, fieldType, dialect) {
+  if (val === void 0) return "";
+  if (val === null) {
+    if (op === Ops.EQUALS) return `${expr} ${SQL_TEMPLATES.IS_NULL}`;
+    if (op === Ops.NOT) return `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
   }
-  const { joins, clauses } = collectLogicalParts(
-    operator,
-    conditions,
-    ctx,
-    builder
-  );
-  const clause = buildLogicalClause(operator, clauses);
-  return freezeResult(clause, joins);
-}
-function buildScalarField(fieldName, value, ctx) {
-  const field = assertFieldExists(fieldName, ctx.model, ctx.path);
-  const expr = col(ctx.alias, fieldName);
-  if (value === null) {
-    return freezeResult(`${expr} ${SQL_TEMPLATES.IS_NULL}`, EMPTY_JOINS);
+  const cast = getArrayType(fieldType, dialect);
+  if (op === Ops.EQUALS) {
+    return handleArrayEquals(expr, val, params, cast, dialect);
   }
-  if (isPlainObject(value)) {
-    const mode = value.mode;
-    const ops = Object.entries(value).filter(
-      ([k, v]) => k !== "mode" && v !== void 0
-    );
-    if (ops.length === 0) {
-      return freezeResult(DEFAULT_WHERE_CLAUSE, EMPTY_JOINS);
-    }
-    const parts = [];
-    for (const [op, val] of ops) {
-      assertValidOperator(fieldName, op, field.type, ctx.path, ctx.model.name);
-      const clause3 = buildOperator(expr, op, val, ctx, mode, field.type);
-      if (isValidWhereClause(clause3)) parts.push(clause3);
-    }
-    const clause2 = parts.length > 0 ? parts.join(SQL_SEPARATORS.CONDITION_AND) : DEFAULT_WHERE_CLAUSE;
-    return freezeResult(clause2, EMPTY_JOINS);
-  }
-  const clause = buildOperator(
-    expr,
-    Ops.EQUALS,
-    value,
-    ctx,
-    void 0,
-    field.type
-  );
-  return freezeResult(clause || DEFAULT_WHERE_CLAUSE, EMPTY_JOINS);
-}
-function buildOperator(expr, op, val, ctx, mode, fieldType) {
-  if (fieldType && isArrayType(fieldType)) {
-    return buildArrayOperator(expr, op, val, ctx.params, fieldType, ctx.dialect);
+  if (op === Ops.NOT) {
+    return handleArrayNot(expr, val, params, cast, dialect);
   }
-  if (fieldType && isJsonType(fieldType)) {
-    const JSON_OPS = /* @__PURE__ */ new Set([
-      Ops.PATH,
-      Ops.STRING_CONTAINS,
-      Ops.STRING_STARTS_WITH,
-      Ops.STRING_ENDS_WITH
-    ]);
-    if (JSON_OPS.has(op)) {
-      return buildJsonOperator(expr, op, val, ctx.params, ctx.dialect);
-    }
+  switch (op) {
+    case Ops.HAS:
+      return handleArrayHas(expr, val, params, cast, dialect);
+    case Ops.HAS_SOME:
+      return handleArrayHasSome(expr, val, params, cast, dialect);
+    case Ops.HAS_EVERY:
+      return handleArrayHasEvery(expr, val, params, cast, dialect);
+    case Ops.IS_EMPTY:
+      return handleArrayIsEmpty(expr, val, dialect);
+    default:
+      throw createError(`Unknown array operator: ${op}`, { operator: op });
   }
-  return buildScalarOperator(
-    expr,
-    op,
-    val,
-    ctx.params,
-    mode,
-    fieldType,
-    ctx.dialect
-  );
 }
-
-// src/builder/shared/alias-generator.ts
-function toSafeSqlIdentifier(input) {
-  const raw = String(input);
-  const cleaned = raw.replace(/\W/g, "_");
-  const startsOk = /^[a-zA-Z_]/.test(cleaned);
-  const base = startsOk ? cleaned : `_${cleaned}`;
-  const fallback = base.length > 0 ? base : "_t";
-  const lowered = fallback.toLowerCase();
-  return SQL_KEYWORDS.has(lowered) ? `_${lowered}` : lowered;
+function handleArrayEquals(expr, val, params, cast, dialect) {
+  if (val === void 0) return "";
+  if (isEmptyArray(val)) {
+    return arrayIsEmpty(expr, dialect);
+  }
+  const placeholder = buildArrayParam(val, params, dialect);
+  return arrayEquals(expr, placeholder, cast, dialect);
 }
-function createAliasGenerator(maxAliases = 1e4) {
-  let counter = 0;
-  const usedAliases = /* @__PURE__ */ new Set();
-  return {
-    next(baseName) {
-      if (usedAliases.size >= maxAliases) {
-        throw new Error(
-          `Alias generator exceeded maximum of ${maxAliases} aliases. This indicates a query complexity issue or potential infinite loop.`
-        );
-      }
-      const base = toSafeSqlIdentifier(baseName);
-      const suffix = `_${counter}`;
-      const maxLen = 63;
-      const baseMax = Math.max(1, maxLen - suffix.length);
-      const trimmedBase = base.length > baseMax ? base.slice(0, baseMax) : base;
-      const alias = `${trimmedBase}${suffix}`;
-      counter += 1;
-      if (usedAliases.has(alias)) {
-        throw new Error(
-          `CRITICAL: Duplicate alias '${alias}' at counter=${counter}. This indicates a bug in alias generation logic.`
-        );
-      }
-      usedAliases.add(alias);
-      return alias;
+function handleArrayNot(expr, val, params, cast, dialect) {
+  if (val === void 0) return "";
+  let target = val;
+  if (isPlainObject(val)) {
+    const entries = Object.entries(val).filter(([, v]) => v !== void 0);
+    if (entries.length === 1 && entries[0][0] === Ops.EQUALS) {
+      target = entries[0][1];
+    } else {
+      throw createError(`Array NOT only supports { equals: ... } shape`, {
+        operator: Ops.NOT,
+        value: val
+      });
     }
-  };
-}
-var MAX_PARAM_INDEX = Number.MAX_SAFE_INTEGER - 1e3;
-function assertSameLength(params, mappings) {
-  if (params.length !== mappings.length) {
-    throw new Error(
-      `CRITICAL: State corruption - params=${params.length}, mappings=${mappings.length}`
-    );
   }
-}
-function assertValidNextIndex(index) {
-  if (!Number.isInteger(index) || index < 1) {
-    throw new Error(`CRITICAL: Index must be integer >= 1, got ${index}`);
+  if (target === null) {
+    return `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
   }
-}
-function assertNextIndexMatches(mappingsLength, nextIndex) {
-  const expected = mappingsLength + 1;
-  if (nextIndex !== expected) {
-    throw new Error(
-      `CRITICAL: Next index mismatch - expected ${expected}, got ${nextIndex}`
-    );
+  if (isEmptyArray(target)) {
+    return arrayIsNotEmpty(expr, dialect);
   }
+  const placeholder = buildArrayParam(target, params, dialect);
+  return `${SQL_TEMPLATES.NOT} (${arrayEquals(expr, placeholder, cast, dialect)})`;
 }
-function assertSequentialIndex(actual, expected) {
-  if (actual !== expected) {
-    throw new Error(
-      `CRITICAL: Indices must be sequential from 1..N. Expected ${expected}, got ${actual}`
-    );
+function handleArrayHas(expr, val, params, cast, dialect) {
+  if (val === void 0) return "";
+  if (val === null) {
+    throw createError(`has requires scalar value`, {
+      operator: Ops.HAS,
+      value: val
+    });
   }
-}
-function assertExactlyOneOfDynamicOrValue(m) {
-  const hasDynamic = typeof m.dynamicName === "string";
-  const hasStatic = m.value !== void 0;
-  if (hasDynamic === hasStatic) {
-    throw new Error(
-      `CRITICAL: ParamMap ${m.index} must have exactly one of dynamicName or value`
-    );
+  if (!schemaParser.isDynamicParameter(val) && Array.isArray(val)) {
+    throw createError(`has requires scalar value (single element), not array`, {
+      operator: Ops.HAS,
+      value: val
+    });
   }
-}
-function normalizeDynamicNameOrThrow(dynamicName, index) {
-  const dn = dynamicName.trim();
-  if (dn.length === 0) {
-    throw new Error(`CRITICAL: dynamicName cannot be empty (index=${index})`);
+  if (isPlainObject(val)) {
+    throw createError(`has requires scalar value`, {
+      operator: Ops.HAS,
+      value: val
+    });
   }
-  return dn;
+  const placeholder = params.addAuto(val);
+  return arrayContains(expr, placeholder, cast, dialect);
 }
-function assertUniqueDynamicName(dn, seen) {
-  if (seen.has(dn)) {
-    throw new Error(`CRITICAL: Duplicate dynamic param name in mappings: ${dn}`);
+function handleArrayHasSome(expr, val, params, cast, dialect) {
+  if (val === void 0) return "";
+  if (schemaParser.isDynamicParameter(val)) {
+    const placeholder2 = params.addAuto(val);
+    return arrayOverlaps(expr, placeholder2, cast, dialect);
   }
-  seen.add(dn);
-}
-function validateMappingEntry(m, expectedIndex, seenDynamic) {
-  assertSequentialIndex(m.index, expectedIndex);
-  assertExactlyOneOfDynamicOrValue(m);
-  if (typeof m.dynamicName === "string") {
-    const dn = normalizeDynamicNameOrThrow(m.dynamicName, m.index);
-    assertUniqueDynamicName(dn, seenDynamic);
+  if (!Array.isArray(val)) {
+    throw createError(`hasSome requires array value`, {
+      operator: Ops.HAS_SOME,
+      value: val
+    });
   }
-}
-function validateMappings(mappings) {
-  const seenDynamic = /* @__PURE__ */ new Set();
-  for (let i = 0; i < mappings.length; i++) {
-    validateMappingEntry(mappings[i], i + 1, seenDynamic);
+  if (val.length > LIMITS.MAX_ARRAY_SIZE) {
+    throw createError(
+      `Array too large (${val.length} elements, max ${LIMITS.MAX_ARRAY_SIZE})`,
+      { operator: Ops.HAS_SOME, value: `[${val.length} items]` }
+    );
   }
+  if (val.length === 0) return "0=1";
+  const paramValue = prepareArrayParam(val, dialect);
+  const placeholder = params.add(paramValue);
+  return arrayOverlaps(expr, placeholder, cast, dialect);
 }
-function validateState(params, mappings, index) {
-  assertSameLength(params, mappings);
-  assertValidNextIndex(index);
-  if (mappings.length === 0) return;
-  validateMappings(mappings);
-  assertNextIndexMatches(mappings.length, index);
+function handleArrayHasEvery(expr, val, params, cast, dialect) {
+  if (val === void 0) return "";
+  const placeholder = buildArrayParam(val, params, dialect);
+  return arrayContainsAll(expr, placeholder, cast, dialect);
 }
-function normalizeValue(value) {
-  if (value instanceof Date) {
-    return value.toISOString();
+function handleArrayIsEmpty(expr, val, dialect) {
+  if (typeof val !== "boolean") {
+    throw createError(`isEmpty requires boolean value`, {
+      operator: Ops.IS_EMPTY,
+      value: val
+    });
   }
-  return value;
+  return val === true ? arrayIsEmpty(expr, dialect) : arrayIsNotEmpty(expr, dialect);
 }
-function createStoreInternal(startIndex, initialParams = [], initialMappings = []) {
-  let index = startIndex;
-  const params = [...initialParams];
-  const mappings = [...initialMappings];
-  const dynamicNameToIndex = /* @__PURE__ */ new Map();
-  for (const m of initialMappings) {
-    if (typeof m.dynamicName === "string") {
-      dynamicNameToIndex.set(m.dynamicName.trim(), m.index);
+
+// src/builder/where/operators-json.ts
+var SAFE_JSON_PATH_SEGMENT = /^[a-zA-Z_]\w*$/;
+function validateJsonPathSegments(segments) {
+  for (const segment of segments) {
+    if (typeof segment !== "string") {
+      throw createError("JSON path segments must be strings", {
+        operator: Ops.PATH,
+        value: segment
+      });
     }
-  }
-  function assertCanAdd() {
-    if (index > MAX_PARAM_INDEX) {
-      throw new Error(
-        `CRITICAL: Cannot add param - would overflow MAX_SAFE_INTEGER. Current index: ${index}`
+    if (!SAFE_JSON_PATH_SEGMENT.test(segment)) {
+      throw createError(
+        `Invalid JSON path segment: '${segment}'. Must be alphanumeric with underscores, starting with letter or underscore.`,
+        { operator: Ops.PATH, value: segment }
       );
     }
   }
-  function normalizeDynamicName(dynamicName) {
-    const dn = dynamicName.trim();
-    if (dn.length === 0) {
-      throw new Error("CRITICAL: dynamicName cannot be empty");
-    }
-    return dn;
+}
+function buildJsonOperator(expr, op, val, params, dialect) {
+  if (val === void 0) return "";
+  if (op === Ops.PATH && isPlainObject(val) && "path" in val) {
+    return handleJsonPath(expr, val, params, dialect);
   }
-  function format(position) {
-    return `$${position}`;
+  const jsonWildcards = {
+    [Ops.STRING_CONTAINS]: (v) => `%${v}%`,
+    [Ops.STRING_STARTS_WITH]: (v) => `${v}%`,
+    [Ops.STRING_ENDS_WITH]: (v) => `%${v}`
+  };
+  if (op in jsonWildcards) {
+    return handleJsonWildcard(expr, op, val, params, jsonWildcards, dialect);
   }
-  function addDynamic(dynamicName) {
-    const dn = normalizeDynamicName(dynamicName);
-    const existing = dynamicNameToIndex.get(dn);
-    if (existing !== void 0) {
-      return format(existing);
-    }
-    const position = index;
-    dynamicNameToIndex.set(dn, position);
-    params.push(void 0);
-    mappings.push({ index: position, dynamicName: dn });
-    index++;
-    return format(position);
+  throw createError(`Unsupported JSON operator: ${op}`, { operator: op });
+}
+function handleJsonPath(expr, val, params, dialect) {
+  const v = val;
+  if (!Array.isArray(v.path)) {
+    throw createError("JSON path must be an array", { operator: Ops.PATH });
   }
-  function addStatic(value) {
-    const position = index;
-    const normalizedValue = normalizeValue(value);
-    params.push(normalizedValue);
-    mappings.push({ index: position, value: normalizedValue });
-    index++;
-    return format(position);
+  if (v.path.length === 0) {
+    throw createError("JSON path cannot be empty", { operator: Ops.PATH });
   }
-  function add(value, dynamicName) {
-    assertCanAdd();
-    return dynamicName === void 0 ? addStatic(value) : addDynamic(dynamicName);
+  validateJsonPathSegments(v.path);
+  const pathExpr = dialect === "sqlite" ? params.add(`$.${v.path.join(".")}`) : params.add(v.path);
+  const rawOps = [
+    ["=", v.equals],
+    [">", v.gt],
+    [">=", v.gte],
+    ["<", v.lt],
+    ["<=", v.lte]
+  ];
+  const ops = rawOps.filter(
+    ([, value]) => value !== void 0
+  );
+  if (ops.length === 0) {
+    throw createError("JSON path query missing comparison operator", {
+      operator: Ops.PATH
+    });
   }
-  function addAuto(value) {
-    if (schemaParser.isDynamicParameter(value)) {
-      const dynamicName = schemaParser.extractDynamicName(value);
-      return add(void 0, dynamicName);
+  const parts = [];
+  for (const [sqlOp, value] of ops) {
+    if (value === null) {
+      const base2 = jsonExtractText(expr, pathExpr, dialect);
+      parts.push(`${base2} ${SQL_TEMPLATES.IS_NULL}`);
+      continue;
     }
-    return add(value);
+    const valPh = params.add(value);
+    const base = typeof value === "number" ? jsonExtractNumeric(expr, pathExpr, dialect) : jsonExtractText(expr, pathExpr, dialect);
+    parts.push(`${base} ${sqlOp} ${valPh}`);
   }
-  function snapshot() {
-    return Object.freeze({
-      index,
-      params: Object.freeze([...params]),
-      mappings: Object.freeze([...mappings])
+  return parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`;
+}
+function handleJsonWildcard(expr, op, val, params, wildcards, dialect) {
+  if (!isNotNullish(val)) {
+    throw createError(`JSON string operator requires non-null value`, {
+      operator: op,
+      value: val
     });
   }
-  return {
-    add,
-    addAuto,
-    snapshot,
-    get index() {
-      return index;
-    }
-  };
-}
-function createParamStore(startIndex = 1) {
-  if (!Number.isInteger(startIndex) || startIndex < 1) {
-    throw new Error(`Start index must be integer >= 1, got ${startIndex}`);
+  if (isPlainObject(val) || Array.isArray(val)) {
+    throw createError(`JSON string operator requires scalar value`, {
+      operator: op,
+      value: val
+    });
   }
-  if (startIndex > MAX_PARAM_INDEX) {
-    throw new Error(
-      `Start index too high (${startIndex}), risk of overflow at MAX_SAFE_INTEGER`
+  const strVal = String(val);
+  if (strVal.length > LIMITS.MAX_STRING_LENGTH) {
+    throw createError(
+      `String too long (${strVal.length} chars, max ${LIMITS.MAX_STRING_LENGTH})`,
+      { operator: op }
     );
   }
-  return createStoreInternal(startIndex);
-}
-function createParamStoreFrom(existingParams, existingMappings, nextIndex) {
-  validateState([...existingParams], [...existingMappings], nextIndex);
-  return createStoreInternal(
-    nextIndex,
-    [...existingParams],
-    [...existingMappings]
-  );
+  const placeholder = params.add(wildcards[op](strVal));
+  const jsonText = jsonToText(expr, dialect);
+  return caseInsensitiveLike(jsonText, placeholder, dialect);
 }
 
-// src/builder/shared/state.ts
-function toPublicResult(clause, joins, params) {
-  const snapshot = params.snapshot();
+// src/builder/where/relations.ts
+var NO_JOINS = Object.freeze([]);
+function isListRelation(fieldType) {
+  return typeof fieldType === "string" && fieldType.endsWith("[]");
+}
+function buildToOneNullCheck(field, parentAlias, relTable, relAlias, join3, wantNull) {
+  const isLocal = field.isForeignKeyLocal === true;
+  const fkFields = normalizeKeyList(field.foreignKey);
+  if (isLocal) {
+    if (fkFields.length === 0) {
+      throw createError(`Relation '${field.name}' is missing foreignKey`, {
+        field: field.name
+      });
+    }
+    const parts = fkFields.map((fk) => {
+      const safe = fk.replace(/"/g, '""');
+      const expr = `${parentAlias}."${safe}"`;
+      return wantNull ? `${expr} ${SQL_TEMPLATES.IS_NULL}` : `${expr} ${SQL_TEMPLATES.IS_NOT_NULL}`;
+    });
+    if (parts.length === 1) return parts[0];
+    return wantNull ? `(${parts.join(" OR ")})` : `(${parts.join(" AND ")})`;
+  }
+  const existsSql = `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias} ${SQL_TEMPLATES.WHERE} ${join3})`;
+  return wantNull ? `${SQL_TEMPLATES.NOT} ${existsSql}` : existsSql;
+}
+function buildToOneExistsMatch(relTable, relAlias, join3, sub) {
+  const joins = sub.joins.length > 0 ? ` ${sub.joins.join(" ")}` : "";
+  return `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${joins} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${sub.clause})`;
+}
+function buildToOneNotExistsMatch(relTable, relAlias, join3, sub) {
+  const joins = sub.joins.length > 0 ? ` ${sub.joins.join(" ")}` : "";
+  return `${SQL_TEMPLATES.NOT} EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${joins} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${sub.clause})`;
+}
+function buildListRelationFilters(args) {
+  const {
+    fieldName,
+    value,
+    ctx,
+    whereBuilder,
+    relModel,
+    relTable,
+    relAlias,
+    join: join3
+  } = args;
+  const noneValue = value[RelationFilters.NONE];
+  if (noneValue !== void 0 && noneValue !== null) {
+    const sub = whereBuilder.build(noneValue, __spreadProps(__spreadValues({}, ctx), {
+      alias: relAlias,
+      model: relModel,
+      path: [...ctx.path, fieldName, RelationFilters.NONE],
+      isSubquery: true,
+      depth: ctx.depth + 1
+    }));
+    const isEmptyFilter = isPlainObject(noneValue) && Object.keys(noneValue).length === 0;
+    const canOptimize = !ctx.isSubquery && isEmptyFilter && sub.clause === DEFAULT_WHERE_CLAUSE && sub.joins.length === 0;
+    if (canOptimize) {
+      const checkField = relModel.fields.find(
+        (f) => !f.isRelation && f.isRequired && f.name !== "id"
+      ) || relModel.fields.find((f) => !f.isRelation && f.name === "id");
+      if (checkField) {
+        const leftJoinSql = `LEFT JOIN ${relTable} ${relAlias} ON ${join3}`;
+        const whereClause = `${relAlias}.${quote(checkField.name)} IS NULL`;
+        return Object.freeze({
+          clause: whereClause,
+          joins: [leftJoinSql]
+        });
+      }
+    }
+  }
+  const filters = [
+    {
+      key: RelationFilters.SOME,
+      wrap: (c, j) => `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${j} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${c})`
+    },
+    {
+      key: RelationFilters.EVERY,
+      wrap: (c, j) => `${SQL_TEMPLATES.NOT} EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${j} ${SQL_TEMPLATES.WHERE} ${join3} ${SQL_TEMPLATES.AND} ${SQL_TEMPLATES.NOT} (${c}))`
+    },
+    {
+      key: RelationFilters.NONE,
+      wrap: (c, j) => {
+        const condition = c === DEFAULT_WHERE_CLAUSE ? "" : ` ${SQL_TEMPLATES.AND} ${c}`;
+        return `${SQL_TEMPLATES.NOT} EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${relTable} ${relAlias}${j} ${SQL_TEMPLATES.WHERE} ${join3}${condition})`;
+      }
+    }
+  ];
+  const clauses = [];
+  for (const { key, wrap } of filters) {
+    const raw = value[key];
+    if (raw === void 0 || raw === null) continue;
+    const sub = whereBuilder.build(raw, __spreadProps(__spreadValues({}, ctx), {
+      alias: relAlias,
+      model: relModel,
+      path: [...ctx.path, fieldName, key],
+      isSubquery: true,
+      depth: ctx.depth + 1
+    }));
+    const j = sub.joins.length > 0 ? ` ${sub.joins.join(" ")}` : "";
+    clauses.push(wrap(sub.clause, j));
+  }
+  if (clauses.length === 0) {
+    throw createError(
+      `List relation '${fieldName}' requires one of { some, every, none }`,
+      { field: fieldName, path: ctx.path, modelName: ctx.model.name }
+    );
+  }
   return Object.freeze({
-    clause: clause || DEFAULT_WHERE_CLAUSE,
-    joins: Object.freeze([...joins]),
-    params: snapshot.params,
-    paramMappings: snapshot.mappings,
-    nextParamIndex: snapshot.index
+    clause: clauses.join(SQL_SEPARATORS.CONDITION_AND),
+    joins: NO_JOINS
   });
 }
-
-// src/builder/where.ts
-function buildWhereClause(where, options) {
-  var _a, _b, _c, _d, _e;
-  const dialect = options.dialect || getGlobalDialect();
-  const params = (_a = options.params) != null ? _a : createParamStore();
-  const ctx = {
-    alias: options.alias,
-    model: options.model,
-    schemaModels: (_b = options.schemaModels) != null ? _b : [],
-    path: (_c = options.path) != null ? _c : [],
-    isSubquery: (_d = options.isSubquery) != null ? _d : false,
-    aliasGen: (_e = options.aliasGen) != null ? _e : createAliasGenerator(),
-    dialect,
-    params,
-    depth: 0
-  };
-  const result = whereBuilderInstance.build(where, ctx);
-  const publicResult = toPublicResult(result.clause, result.joins, params);
-  if (!options.isSubquery) {
-    const nums = [...publicResult.clause.matchAll(/\$(\d+)/g)].map(
-      (m) => parseInt(m[1], 10)
+function buildToOneRelationFilters(args) {
+  const {
+    fieldName,
+    value,
+    ctx,
+    whereBuilder,
+    field,
+    relModel,
+    relTable,
+    relAlias,
+    join: join3
+  } = args;
+  const hasSomeEveryNone = isNotNullish(value[RelationFilters.SOME]) || isNotNullish(value[RelationFilters.EVERY]) || isNotNullish(value[RelationFilters.NONE]);
+  if (hasSomeEveryNone) {
+    throw createError(
+      `To-one relation '${fieldName}' does not support { some, every, none }; use { is, isNot }`,
+      { field: fieldName, path: ctx.path, modelName: ctx.model.name }
     );
-    if (nums.length > 0) {
-      const min = Math.min(...nums);
-      if (min === 1) {
-        validateParamConsistency(publicResult.clause, publicResult.params);
-      } else {
-        validateParamConsistencyFragment(
-          publicResult.clause,
-          publicResult.params
-        );
+  }
+  const hasIs = Object.prototype.hasOwnProperty.call(value, "is");
+  const hasIsNot = Object.prototype.hasOwnProperty.call(value, "isNot");
+  let filterKey;
+  let filterVal;
+  if (hasIs) {
+    filterKey = "is";
+    filterVal = value.is;
+  } else if (hasIsNot) {
+    filterKey = "isNot";
+    filterVal = value.isNot;
+  } else {
+    filterKey = "is";
+    filterVal = value;
+  }
+  if (filterVal === void 0) {
+    return Object.freeze({
+      clause: DEFAULT_WHERE_CLAUSE,
+      joins: NO_JOINS
+    });
+  }
+  if (filterVal === null) {
+    const wantNull = filterKey === "is";
+    const clause2 = buildToOneNullCheck(
+      field,
+      ctx.alias,
+      relTable,
+      relAlias,
+      join3,
+      wantNull
+    );
+    return Object.freeze({
+      clause: clause2,
+      joins: NO_JOINS
+    });
+  }
+  if (!isPlainObject(filterVal)) {
+    throw createError(
+      `Relation '${fieldName}' filter must be an object or null`,
+      {
+        field: fieldName,
+        path: ctx.path,
+        modelName: ctx.model.name,
+        value: filterVal
+      }
+    );
+  }
+  const sub = whereBuilder.build(filterVal, __spreadProps(__spreadValues({}, ctx), {
+    alias: relAlias,
+    model: relModel,
+    path: [...ctx.path, fieldName, filterKey],
+    isSubquery: true,
+    depth: ctx.depth + 1
+  }));
+  const clause = filterKey === "is" ? buildToOneExistsMatch(relTable, relAlias, join3, sub) : buildToOneNotExistsMatch(relTable, relAlias, join3, sub);
+  return Object.freeze({
+    clause,
+    joins: NO_JOINS
+  });
+}
+function ensureRelationFilterObject(fieldName, value, ctx) {
+  if (!isPlainObject(value)) {
+    throw createError(`Relation filter '${fieldName}' must be an object`, {
+      path: [...ctx.path, fieldName],
+      field: fieldName,
+      modelName: ctx.model.name,
+      value
+    });
+  }
+}
+function buildRelation(fieldName, value, ctx, whereBuilder) {
+  const field = ctx.model.fields.find((f) => f.name === fieldName);
+  if (!isValidRelationField(field)) {
+    throw createError(`Invalid relation '${fieldName}'`, {
+      field: fieldName,
+      path: ctx.path,
+      modelName: ctx.model.name
+    });
+  }
+  const relModel = ctx.schemaModels.find((m) => m.name === field.relatedModel);
+  if (!isNotNullish(relModel)) {
+    throw createError(
+      `Related model '${field.relatedModel}' not found in schema. Available models: ${ctx.schemaModels.map((m) => m.name).join(", ")}`,
+      {
+        field: fieldName,
+        path: ctx.path,
+        modelName: ctx.model.name
       }
+    );
+  }
+  const relTable = buildTableReference(
+    SQL_TEMPLATES.PUBLIC_SCHEMA,
+    relModel.tableName,
+    ctx.dialect
+  );
+  const relAlias = ctx.aliasGen.next(fieldName);
+  const join3 = joinCondition(field, ctx.model, relModel, ctx.alias, relAlias);
+  const args = {
+    fieldName,
+    value,
+    ctx,
+    whereBuilder,
+    field,
+    relModel,
+    relTable,
+    relAlias,
+    join: join3
+  };
+  if (isListRelation(field.type)) return buildListRelationFilters(args);
+  return buildToOneRelationFilters(args);
+}
+function buildTopLevelRelation(fieldName, value, ctx, whereBuilder) {
+  ensureRelationFilterObject(fieldName, value, ctx);
+  return buildRelation(fieldName, value, ctx, whereBuilder);
+}
+function buildNestedRelation(fieldName, value, ctx, whereBuilder) {
+  return buildTopLevelRelation(fieldName, value, ctx, whereBuilder);
+}
+
+// src/builder/shared/validators/field-validators.ts
+function assertFieldExists(name, model, path) {
+  const field = model.fields.find((f) => f.name === name);
+  if (!isNotNullish(field)) {
+    throw createError(`Field '${name}' does not exist on '${model.name}'`, {
+      field: name,
+      path,
+      modelName: model.name,
+      availableFields: model.fields.map((f) => f.name)
+    });
+  }
+  return field;
+}
+function assertValidOperator(fieldName, op, fieldType, path, modelName) {
+  if (!isNotNullish(fieldType)) return;
+  const ARRAY_OPS = /* @__PURE__ */ new Set([
+    Ops.HAS,
+    Ops.HAS_SOME,
+    Ops.HAS_EVERY,
+    Ops.IS_EMPTY
+  ]);
+  const JSON_OPS = /* @__PURE__ */ new Set([
+    Ops.PATH,
+    Ops.STRING_CONTAINS,
+    Ops.STRING_STARTS_WITH,
+    Ops.STRING_ENDS_WITH
+  ]);
+  const isArrayOp = ARRAY_OPS.has(op);
+  const isFieldArray = isArrayType(fieldType);
+  const arrayOpMismatch = isArrayOp && !isFieldArray;
+  if (arrayOpMismatch) {
+    throw createError(`'${op}' requires array field, got '${fieldType}'`, {
+      operator: op,
+      field: fieldName,
+      path,
+      modelName
+    });
+  }
+  const isJsonOp = JSON_OPS.has(op);
+  const isFieldJson = isJsonType(fieldType);
+  const jsonOpMismatch = isJsonOp && !isFieldJson;
+  if (jsonOpMismatch) {
+    throw createError(`'${op}' requires JSON field, got '${fieldType}'`, {
+      operator: op,
+      field: fieldName,
+      path,
+      modelName
+    });
+  }
+}
+
+// src/builder/where/builder.ts
+var WhereBuilder = class {
+  build(where, ctx) {
+    if (!isPlainObject(where)) {
+      throw createError("where must be an object", {
+        path: ctx.path,
+        modelName: ctx.model.name
+      });
+    }
+    return buildWhereInternal(where, ctx, this);
+  }
+};
+var MAX_QUERY_DEPTH = 50;
+var EMPTY_JOINS = Object.freeze([]);
+var whereBuilderInstance = new WhereBuilder();
+function freezeResult(clause, joins = EMPTY_JOINS) {
+  return Object.freeze({ clause, joins });
+}
+function dedupePreserveOrder(items) {
+  if (items.length <= 1) return Object.freeze([...items]);
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const s of items) {
+    if (!seen.has(s)) {
+      seen.add(s);
+      out.push(s);
+    }
+  }
+  return Object.freeze(out);
+}
+function appendResult(result, clauses, allJoins) {
+  if (isValidWhereClause(result.clause)) clauses.push(result.clause);
+  if (isNonEmptyArray(result.joins)) allJoins.push(...result.joins);
+}
+function asLogicalOperator(key) {
+  if (key === LogicalOps.AND) return "AND";
+  if (key === LogicalOps.OR) return "OR";
+  if (key === LogicalOps.NOT) return "NOT";
+  return null;
+}
+function nextContext(ctx) {
+  return __spreadProps(__spreadValues({}, ctx), { depth: ctx.depth + 1 });
+}
+function buildRelationFilter(fieldName, value, ctx, builder) {
+  const ctx2 = nextContext(ctx);
+  if (ctx.isSubquery) {
+    return buildNestedRelation(fieldName, value, ctx2, builder);
+  }
+  return buildTopLevelRelation(fieldName, value, ctx2, builder);
+}
+function buildWhereEntry(key, value, ctx, builder) {
+  const op = asLogicalOperator(key);
+  if (op) return buildLogical(op, value, ctx, builder);
+  if (isRelationField(key, ctx.model)) {
+    if (!isPlainObject(value)) {
+      throw createError(`Relation filter '${key}' must be an object`, {
+        path: [...ctx.path, key],
+        field: key,
+        modelName: ctx.model.name,
+        value
+      });
     }
+    return buildRelationFilter(key, value, ctx, builder);
   }
-  return publicResult;
+  return buildScalarField(key, value, ctx);
 }
-function normalizeIntLike(name, v, opts = {}) {
-  var _a, _b;
-  if (!isNotNullish(v)) return void 0;
-  if (schemaParser.isDynamicParameter(v)) return v;
-  if (typeof v !== "number" || !Number.isFinite(v) || !Number.isInteger(v)) {
-    throw new Error(`${name} must be an integer`);
-  }
-  const min = (_a = opts.min) != null ? _a : 0;
-  const allowZero = (_b = opts.allowZero) != null ? _b : true;
-  if (!allowZero && v === 0) {
-    throw new Error(`${name} must be > 0`);
-  }
-  if (v < min) {
-    throw new Error(`${name} must be >= ${min}`);
+function buildWhereInternal(where, ctx, builder) {
+  if (ctx.depth > MAX_QUERY_DEPTH) {
+    throw createError(
+      `Query nesting too deep (max ${MAX_QUERY_DEPTH} levels). This usually indicates a circular reference.`,
+      { path: ctx.path, modelName: ctx.model.name }
+    );
   }
-  if (typeof opts.max === "number" && v > opts.max) {
-    throw new Error(`${name} must be <= ${opts.max}`);
+  if (isEmptyWhere(where)) {
+    return freezeResult(DEFAULT_WHERE_CLAUSE, EMPTY_JOINS);
   }
-  return v;
-}
-function scopeName(scope, dynamicName) {
-  const s = String(scope).trim();
-  const dn = String(dynamicName).trim();
-  if (s.length === 0) return dn;
-  return `${s}:${dn}`;
-}
-function addAutoScoped(params, value, scope) {
-  if (schemaParser.isDynamicParameter(value)) {
-    const dn = schemaParser.extractDynamicName(value);
-    return params.add(void 0, scopeName(scope, dn));
+  const allJoins = [];
+  const clauses = [];
+  for (const [key, value] of Object.entries(where)) {
+    if (value === void 0) continue;
+    const result = buildWhereEntry(key, value, ctx, builder);
+    appendResult(result, clauses, allJoins);
   }
-  return params.add(value);
+  const finalClause = clauses.length > 0 ? clauses.join(SQL_SEPARATORS.CONDITION_AND) : DEFAULT_WHERE_CLAUSE;
+  return freezeResult(finalClause, dedupePreserveOrder(allJoins));
 }
-
-// src/builder/shared/order-by-utils.ts
-var flipNulls = (v) => {
-  const s = String(v).toLowerCase();
-  if (s === "first") return "last";
-  if (s === "last") return "first";
-  return v;
-};
-var flipSortString = (v) => {
-  if (typeof v !== "string") return v;
-  const s = v.toLowerCase();
-  if (s === "asc") return "desc";
-  if (s === "desc") return "asc";
-  return v;
-};
-var getNextSort = (sortRaw) => {
-  if (typeof sortRaw !== "string") return sortRaw;
-  const s = sortRaw.toLowerCase();
-  if (s === "asc") return "desc";
-  if (s === "desc") return "asc";
-  return sortRaw;
-};
-var flipObjectSort = (obj) => {
-  const sortRaw = obj.sort;
-  const out = __spreadProps(__spreadValues({}, obj), { sort: getNextSort(sortRaw) });
-  const nullsRaw = obj.nulls;
-  if (typeof nullsRaw === "string") {
-    out.nulls = flipNulls(nullsRaw);
-  }
-  return out;
-};
-var flipValue = (v) => {
-  if (typeof v === "string") return flipSortString(v);
-  if (isPlainObject(v)) return flipObjectSort(v);
-  return v;
-};
-var assertSingleFieldObject = (item) => {
-  if (!isPlainObject(item)) {
-    throw new Error("orderBy array entries must be objects");
+function normalizeLogicalValue(operator, value, ctx) {
+  if (Array.isArray(value)) {
+    const out = [];
+    for (let i = 0; i < value.length; i++) {
+      const v = value[i];
+      if (v === void 0) continue;
+      if (!isPlainObject(v)) {
+        throw createError(`${operator} entries must be objects`, {
+          path: [...ctx.path, operator, String(i)],
+          modelName: ctx.model.name,
+          value: v
+        });
+      }
+      out.push(v);
+    }
+    return out;
   }
-  const entries = Object.entries(item);
-  if (entries.length !== 1) {
-    throw new Error("orderBy array entries must have exactly one field");
+  if (isPlainObject(value)) {
+    return [value];
   }
-  return entries[0];
-};
-var flipOrderByArray = (orderBy) => {
-  return orderBy.map((item) => {
-    const [k, v] = assertSingleFieldObject(item);
-    return { [k]: flipValue(v) };
+  throw createError(`${operator} must be an object or array of objects`, {
+    path: [...ctx.path, operator],
+    modelName: ctx.model.name,
+    value
   });
-};
-var flipOrderByObject = (orderBy) => {
-  const out = {};
-  for (const [k, v] of Object.entries(orderBy)) {
-    out[k] = flipValue(v);
+}
+function collectLogicalParts(operator, conditions, ctx, builder) {
+  const allJoins = [];
+  const clauses = [];
+  for (let i = 0; i < conditions.length; i++) {
+    const result = builder.build(conditions[i], __spreadProps(__spreadValues({}, ctx), {
+      path: [...ctx.path, operator, String(i)],
+      depth: ctx.depth + 1
+    }));
+    if (isNonEmptyArray(result.joins)) allJoins.push(...result.joins);
+    if (result.clause && result.clause !== DEFAULT_WHERE_CLAUSE) {
+      clauses.push(`(${result.clause})`);
+    }
   }
-  return out;
-};
-function reverseOrderByInput(orderBy) {
-  if (!isNotNullish(orderBy)) return orderBy;
-  if (Array.isArray(orderBy)) {
-    return flipOrderByArray(orderBy);
+  return {
+    joins: dedupePreserveOrder(allJoins),
+    clauses: Object.freeze(clauses)
+  };
+}
+function buildLogicalClause(operator, clauses) {
+  if (clauses.length === 0) return DEFAULT_WHERE_CLAUSE;
+  if (operator === "NOT") {
+    if (clauses.length === 1) return `${SQL_TEMPLATES.NOT} ${clauses[0]}`;
+    return `${SQL_TEMPLATES.NOT} (${clauses.join(SQL_SEPARATORS.CONDITION_AND)})`;
   }
-  if (isPlainObject(orderBy)) {
-    return flipOrderByObject(orderBy);
+  return clauses.join(` ${operator} `);
+}
+function buildLogical(operator, value, ctx, builder) {
+  const conditions = normalizeLogicalValue(operator, value, ctx);
+  if (conditions.length === 0) {
+    const clause2 = operator === "OR" ? "0=1" : DEFAULT_WHERE_CLAUSE;
+    return freezeResult(clause2, EMPTY_JOINS);
   }
-  throw new Error("orderBy must be an object or array of objects");
+  const { joins, clauses } = collectLogicalParts(
+    operator,
+    conditions,
+    ctx,
+    builder
+  );
+  const clause = buildLogicalClause(operator, clauses);
+  return freezeResult(clause, joins);
 }
-var normalizePairs = (pairs, parseValue) => {
-  return pairs.map(([field, rawValue]) => {
-    const parsed = parseValue(rawValue, field);
-    return {
-      [field]: parsed.nulls !== void 0 ? { sort: parsed.direction, nulls: parsed.nulls } : parsed.direction
-    };
-  });
-};
-function normalizeOrderByInput(orderBy, parseValue) {
-  if (!isNotNullish(orderBy)) return [];
-  if (Array.isArray(orderBy)) {
-    const pairs = orderBy.map(assertSingleFieldObject);
-    return normalizePairs(pairs, parseValue);
+function buildScalarField(fieldName, value, ctx) {
+  const field = assertFieldExists(fieldName, ctx.model, ctx.path);
+  const expr = col(ctx.alias, fieldName, ctx.model);
+  if (value === null) {
+    return freezeResult(`${expr} ${SQL_TEMPLATES.IS_NULL}`, EMPTY_JOINS);
   }
-  if (isPlainObject(orderBy)) {
-    return normalizePairs(Object.entries(orderBy), parseValue);
+  if (isPlainObject(value)) {
+    const mode = value.mode;
+    const ops = Object.entries(value).filter(
+      ([k, v]) => k !== "mode" && v !== void 0
+    );
+    if (ops.length === 0) {
+      return freezeResult(DEFAULT_WHERE_CLAUSE, EMPTY_JOINS);
+    }
+    const parts = [];
+    for (const [op, val] of ops) {
+      assertValidOperator(fieldName, op, field.type, ctx.path, ctx.model.name);
+      const clause3 = buildOperator(expr, op, val, ctx, mode, field.type);
+      if (isValidWhereClause(clause3)) parts.push(clause3);
+    }
+    const clause2 = parts.length > 0 ? parts.join(SQL_SEPARATORS.CONDITION_AND) : DEFAULT_WHERE_CLAUSE;
+    return freezeResult(clause2, EMPTY_JOINS);
   }
-  throw new Error("orderBy must be an object or array of objects");
-}
-
-// src/builder/pagination.ts
-var MAX_LIMIT_OFFSET = 2147483647;
-function parseDirectionRaw(raw, errorLabel) {
-  const s = String(raw).toLowerCase();
-  if (s === "asc" || s === "desc") return s;
-  throw new Error(`Invalid ${errorLabel}: ${raw}`);
-}
-function parseNullsRaw(raw, errorLabel) {
-  if (!isNotNullish(raw)) return void 0;
-  const s = String(raw).toLowerCase();
-  if (s === "first" || s === "last") return s;
-  throw new Error(`Invalid ${errorLabel}: ${raw}`);
+  const clause = buildOperator(
+    expr,
+    Ops.EQUALS,
+    value,
+    ctx,
+    void 0,
+    field.type
+  );
+  return freezeResult(clause || DEFAULT_WHERE_CLAUSE, EMPTY_JOINS);
 }
-function requireOrderByObject(v, errorPrefix) {
-  if (!isPlainObject(v) || !("sort" in v)) {
-    throw new Error(`${errorPrefix} must be 'asc' | 'desc' or { sort, nulls? }`);
+function buildOperator(expr, op, val, ctx, mode, fieldType) {
+  if (fieldType && isArrayType(fieldType)) {
+    return buildArrayOperator(expr, op, val, ctx.params, fieldType, ctx.dialect);
   }
-  return v;
-}
-function assertAllowedOrderByKeys(obj, fieldName) {
-  const allowed = /* @__PURE__ */ new Set(["sort", "nulls"]);
-  for (const k of Object.keys(obj)) {
-    if (!allowed.has(k)) {
-      throw new Error(
-        fieldName ? `Unsupported orderBy key '${k}' for field '${fieldName}'` : `Unsupported orderBy key '${k}'`
-      );
+  if (fieldType && isJsonType(fieldType)) {
+    const JSON_OPS = /* @__PURE__ */ new Set([
+      Ops.PATH,
+      Ops.STRING_CONTAINS,
+      Ops.STRING_STARTS_WITH,
+      Ops.STRING_ENDS_WITH
+    ]);
+    if (JSON_OPS.has(op)) {
+      return buildJsonOperator(expr, op, val, ctx.params, ctx.dialect);
     }
   }
+  return buildScalarOperator(
+    expr,
+    op,
+    val,
+    ctx.params,
+    mode,
+    fieldType,
+    ctx.dialect
+  );
 }
-function parseOrderByValue(v, fieldName) {
-  const errorPrefix = fieldName ? `orderBy for '${fieldName}'` : "orderBy value";
-  if (typeof v === "string") {
-    return { direction: parseDirectionRaw(v, `${errorPrefix} direction`) };
-  }
-  const obj = requireOrderByObject(v, errorPrefix);
-  const direction = parseDirectionRaw(obj.sort, `${errorPrefix}.sort`);
-  const nulls = parseNullsRaw(obj.nulls, `${errorPrefix}.nulls`);
-  assertAllowedOrderByKeys(obj, fieldName);
-  return { direction, nulls };
+
+// src/builder/shared/alias-generator.ts
+function toSafeSqlIdentifier(input) {
+  const raw = String(input);
+  const cleaned = raw.replace(/\W/g, "_");
+  const startsOk = /^[a-zA-Z_]/.test(cleaned);
+  const base = startsOk ? cleaned : `_${cleaned}`;
+  const fallback = base.length > 0 ? base : "_t";
+  const lowered = fallback.toLowerCase();
+  return SQL_KEYWORDS.has(lowered) ? `_${lowered}` : lowered;
 }
-function normalizeFiniteInteger(name, v) {
-  if (typeof v !== "number" || !Number.isFinite(v) || !Number.isInteger(v)) {
-    throw new Error(`${name} must be an integer`);
-  }
-  return v;
+function createAliasGenerator(maxAliases = 1e4) {
+  let counter = 0;
+  const usedAliases = /* @__PURE__ */ new Set();
+  return {
+    next(baseName) {
+      if (usedAliases.size >= maxAliases) {
+        throw new Error(
+          `Alias generator exceeded maximum of ${maxAliases} aliases. This indicates a query complexity issue or potential infinite loop.`
+        );
+      }
+      const base = toSafeSqlIdentifier(baseName);
+      const suffix = `_${counter}`;
+      const maxLen = 63;
+      const baseMax = Math.max(1, maxLen - suffix.length);
+      const trimmedBase = base.length > baseMax ? base.slice(0, baseMax) : base;
+      const alias = `${trimmedBase}${suffix}`;
+      counter += 1;
+      if (usedAliases.has(alias)) {
+        throw new Error(
+          `CRITICAL: Duplicate alias '${alias}' at counter=${counter}. This indicates a bug in alias generation logic.`
+        );
+      }
+      usedAliases.add(alias);
+      return alias;
+    }
+  };
 }
-function normalizeNonNegativeInt(name, v) {
-  if (schemaParser.isDynamicParameter(v)) return v;
-  const n = normalizeFiniteInteger(name, v);
-  if (n < 0) {
-    throw new Error(`${name} must be >= 0`);
-  }
-  if (n > MAX_LIMIT_OFFSET) {
-    throw new Error(`${name} must be <= ${MAX_LIMIT_OFFSET}`);
+var MAX_PARAM_INDEX = Number.MAX_SAFE_INTEGER - 1e3;
+function assertSameLength(params, mappings) {
+  if (params.length !== mappings.length) {
+    throw new Error(
+      `CRITICAL: State corruption - params=${params.length}, mappings=${mappings.length}`
+    );
   }
-  return n;
-}
-function hasNonNullishProp(v, key) {
-  return isPlainObject(v) && key in v && isNotNullish(v[key]);
-}
-function normalizeIntegerOrDynamic(name, v) {
-  if (schemaParser.isDynamicParameter(v)) return v;
-  return normalizeFiniteInteger(name, v);
 }
-function readSkipTake(relArgs) {
-  const hasSkip = hasNonNullishProp(relArgs, "skip");
-  const hasTake = hasNonNullishProp(relArgs, "take");
-  if (!hasSkip && !hasTake) {
-    return {
-      hasSkip: false,
-      hasTake: false,
-      skipVal: void 0,
-      takeVal: void 0
-    };
+function assertValidNextIndex(index) {
+  if (!Number.isInteger(index) || index < 1) {
+    throw new Error(`CRITICAL: Index must be integer >= 1, got ${index}`);
   }
-  const obj = relArgs;
-  const skipVal = hasSkip ? normalizeNonNegativeInt("skip", obj.skip) : void 0;
-  const takeVal = hasTake ? normalizeIntegerOrDynamic("take", obj.take) : void 0;
-  return { hasSkip, hasTake, skipVal, takeVal };
 }
-function buildOrderByFragment(entries, alias, dialect, model) {
-  if (entries.length === 0) return "";
-  const out = [];
-  for (const e of entries) {
-    const dir = e.direction.toUpperCase();
-    const c = col(alias, e.field, model);
-    if (dialect === "postgres") {
-      const nulls = isNotNullish(e.nulls) ? ` NULLS ${e.nulls.toUpperCase()}` : "";
-      out.push(`${c} ${dir}${nulls}`);
-      continue;
-    }
-    if (isNotNullish(e.nulls)) {
-      const isNullExpr = `(${c} IS NULL)`;
-      const nullRankDir = e.nulls === "first" ? "DESC" : "ASC";
-      out.push(`${isNullExpr} ${nullRankDir}`);
-      out.push(`${c} ${dir}`);
-      continue;
-    }
-    out.push(`${c} ${dir}`);
+function assertNextIndexMatches(mappingsLength, nextIndex) {
+  const expected = mappingsLength + 1;
+  if (nextIndex !== expected) {
+    throw new Error(
+      `CRITICAL: Next index mismatch - expected ${expected}, got ${nextIndex}`
+    );
   }
-  return out.join(SQL_SEPARATORS.ORDER_BY);
 }
-function defaultNullsFor(dialect, direction) {
-  if (dialect === "postgres") {
-    return direction === "asc" ? "last" : "first";
+function assertSequentialIndex(actual, expected) {
+  if (actual !== expected) {
+    throw new Error(
+      `CRITICAL: Indices must be sequential from 1..N. Expected ${expected}, got ${actual}`
+    );
   }
-  return direction === "asc" ? "first" : "last";
 }
-function ensureCursorFieldsInOrder(orderEntries, cursorEntries) {
-  const existing = /* @__PURE__ */ new Map();
-  for (const e of orderEntries) existing.set(e.field, e);
-  const out = [...orderEntries];
-  for (const [field] of cursorEntries) {
-    if (!existing.has(field)) {
-      out.push({ field, direction: "asc" });
-      existing.set(field, out[out.length - 1]);
-    }
+function assertExactlyOneOfDynamicOrValue(m) {
+  const hasDynamic = typeof m.dynamicName === "string";
+  const hasStatic = m.value !== void 0;
+  if (hasDynamic === hasStatic) {
+    throw new Error(
+      `CRITICAL: ParamMap ${m.index} must have exactly one of dynamicName or value`
+    );
   }
-  return out;
 }
-function buildCursorFilterParts(cursor, cursorAlias, params, model) {
-  const entries = Object.entries(cursor);
-  if (entries.length === 0) {
-    throw new Error("cursor must have at least one field");
+function normalizeDynamicNameOrThrow(dynamicName, index) {
+  const dn = dynamicName.trim();
+  if (dn.length === 0) {
+    throw new Error(`CRITICAL: dynamicName cannot be empty (index=${index})`);
   }
-  const placeholdersByField = /* @__PURE__ */ new Map();
-  const parts = [];
-  for (const [field, value] of entries) {
-    const c = `${cursorAlias}.${quote(field)}`;
-    if (value === null) {
-      parts.push(`${c} IS NULL`);
-      continue;
-    }
-    const ph = addAutoScoped(params, value, `cursor.filter.${field}`);
-    placeholdersByField.set(field, ph);
-    parts.push(`${c} = ${ph}`);
+  return dn;
+}
+function assertUniqueDynamicName(dn, seen) {
+  if (seen.has(dn)) {
+    throw new Error(`CRITICAL: Duplicate dynamic param name in mappings: ${dn}`);
   }
-  return {
-    whereSql: parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`,
-    placeholdersByField
-  };
+  seen.add(dn);
 }
-function cursorValueExpr(tableName, cursorAlias, cursorWhereSql, field, model) {
-  const colName = quote(field);
-  return `(SELECT ${cursorAlias}.${colName} ${SQL_TEMPLATES.FROM} ${tableName} ${cursorAlias} ${SQL_TEMPLATES.WHERE} ${cursorWhereSql} ${SQL_TEMPLATES.LIMIT} 1)`;
+function validateMappingEntry(m, expectedIndex, seenDynamic) {
+  assertSequentialIndex(m.index, expectedIndex);
+  assertExactlyOneOfDynamicOrValue(m);
+  if (typeof m.dynamicName === "string") {
+    const dn = normalizeDynamicNameOrThrow(m.dynamicName, m.index);
+    assertUniqueDynamicName(dn, seenDynamic);
+  }
 }
-function buildCursorRowExistsExpr(tableName, cursorAlias, cursorWhereSql) {
-  return `EXISTS (${SQL_TEMPLATES.SELECT} 1 ${SQL_TEMPLATES.FROM} ${tableName} ${cursorAlias} ${SQL_TEMPLATES.WHERE} ${cursorWhereSql} ${SQL_TEMPLATES.LIMIT} 1)`;
+function validateMappings(mappings) {
+  const seenDynamic = /* @__PURE__ */ new Set();
+  for (let i = 0; i < mappings.length; i++) {
+    validateMappingEntry(mappings[i], i + 1, seenDynamic);
+  }
 }
-function buildCursorEqualityExpr(columnExpr, valueExpr) {
-  return `((${valueExpr} IS NULL AND ${columnExpr} IS NULL) OR (${valueExpr} IS NOT NULL AND ${columnExpr} = ${valueExpr}))`;
+function validateState(params, mappings, index) {
+  assertSameLength(params, mappings);
+  assertValidNextIndex(index);
+  if (mappings.length === 0) return;
+  validateMappings(mappings);
+  assertNextIndexMatches(mappings.length, index);
 }
-function buildCursorInequalityExpr(columnExpr, direction, nulls, valueExpr) {
-  const op = direction === "asc" ? ">" : "<";
-  if (nulls === "first") {
-    return `(CASE WHEN ${valueExpr} IS NULL THEN (${columnExpr} IS NOT NULL) ELSE (${columnExpr} ${op} ${valueExpr}) END)`;
+function normalizeValue(value) {
+  if (value instanceof Date) {
+    return value.toISOString();
   }
-  return `(CASE WHEN ${valueExpr} IS NULL THEN 0=1 ELSE ((${columnExpr} ${op} ${valueExpr}) OR (${columnExpr} IS NULL)) END)`;
+  return value;
 }
-function buildOuterCursorMatch(cursor, outerAlias, placeholdersByField, params, model) {
-  const parts = [];
-  for (const [field, value] of Object.entries(cursor)) {
-    const c = col(outerAlias, field, model);
-    if (value === null) {
-      parts.push(`${c} IS NULL`);
-      continue;
-    }
-    const existing = placeholdersByField.get(field);
-    if (typeof existing === "string" && existing.length > 0) {
-      parts.push(`${c} = ${existing}`);
-      continue;
+function createStoreInternal(startIndex, initialParams = [], initialMappings = []) {
+  let index = startIndex;
+  const params = [...initialParams];
+  const mappings = [...initialMappings];
+  const dynamicNameToIndex = /* @__PURE__ */ new Map();
+  for (const m of initialMappings) {
+    if (typeof m.dynamicName === "string") {
+      dynamicNameToIndex.set(m.dynamicName.trim(), m.index);
     }
-    const ph = addAutoScoped(params, value, `cursor.outerMatch.${field}`);
-    parts.push(`${c} = ${ph}`);
   }
-  return parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`;
-}
-function buildOrderEntries(orderBy) {
-  const normalized = normalizeOrderByInput(orderBy, parseOrderByValue);
-  const entries = [];
-  for (const item of normalized) {
-    for (const [field, value] of Object.entries(item)) {
-      if (typeof value === "string") {
-        entries.push({ field, direction: value });
-      } else {
-        entries.push({
-          field,
-          direction: value.sort,
-          nulls: value.nulls
-        });
-      }
+  function assertCanAdd() {
+    if (index > MAX_PARAM_INDEX) {
+      throw new Error(
+        `CRITICAL: Cannot add param - would overflow MAX_SAFE_INTEGER. Current index: ${index}`
+      );
     }
   }
-  return entries;
-}
-function buildCursorCondition(cursor, orderBy, tableName, alias, params, dialect, model) {
-  var _a;
-  const d = dialect != null ? dialect : getGlobalDialect();
-  const cursorEntries = Object.entries(cursor);
-  if (cursorEntries.length === 0) {
-    throw new Error("cursor must have at least one field");
+  function normalizeDynamicName(dynamicName) {
+    const dn = dynamicName.trim();
+    if (dn.length === 0) {
+      throw new Error("CRITICAL: dynamicName cannot be empty");
+    }
+    return dn;
   }
-  const cursorAlias = "__tp_cursor_src";
-  const { whereSql: cursorWhereSql, placeholdersByField } = buildCursorFilterParts(cursor, cursorAlias, params);
-  let orderEntries = buildOrderEntries(orderBy);
-  if (orderEntries.length === 0) {
-    orderEntries = cursorEntries.map(([field]) => ({
-      field,
-      direction: "asc"
-    }));
-  } else {
-    orderEntries = ensureCursorFieldsInOrder(orderEntries, cursorEntries);
+  function format(position) {
+    return `$${position}`;
   }
-  const existsExpr = buildCursorRowExistsExpr(
-    tableName,
-    cursorAlias,
-    cursorWhereSql
-  );
-  const outerCursorMatch = buildOuterCursorMatch(
-    cursor,
-    alias,
-    placeholdersByField,
-    params,
-    model
-  );
-  const orClauses = [];
-  for (let level = 0; level < orderEntries.length; level++) {
-    const andParts = [];
-    for (let i = 0; i < level; i++) {
-      const e2 = orderEntries[i];
-      const c2 = col(alias, e2.field, model);
-      const v2 = cursorValueExpr(
-        tableName,
-        cursorAlias,
-        cursorWhereSql,
-        e2.field);
-      andParts.push(buildCursorEqualityExpr(c2, v2));
+  function addDynamic(dynamicName) {
+    const dn = normalizeDynamicName(dynamicName);
+    const existing = dynamicNameToIndex.get(dn);
+    if (existing !== void 0) {
+      return format(existing);
     }
-    const e = orderEntries[level];
-    const c = col(alias, e.field, model);
-    const v = cursorValueExpr(
-      tableName,
-      cursorAlias,
-      cursorWhereSql,
-      e.field);
-    const nulls = (_a = e.nulls) != null ? _a : defaultNullsFor(d, e.direction);
-    andParts.push(buildCursorInequalityExpr(c, e.direction, nulls, v));
-    orClauses.push(`(${andParts.join(SQL_SEPARATORS.CONDITION_AND)})`);
+    const position = index;
+    dynamicNameToIndex.set(dn, position);
+    params.push(void 0);
+    mappings.push({ index: position, dynamicName: dn });
+    index++;
+    return format(position);
   }
-  const exclusive = orClauses.join(SQL_SEPARATORS.CONDITION_OR);
-  return `(${existsExpr} ${SQL_SEPARATORS.CONDITION_AND} ((${exclusive})${SQL_SEPARATORS.CONDITION_OR}(${outerCursorMatch})))`;
-}
-function buildOrderBy(orderBy, alias, dialect, model) {
-  const entries = buildOrderEntries(orderBy);
-  if (entries.length === 0) return "";
-  const d = dialect != null ? dialect : getGlobalDialect();
-  return buildOrderByFragment(entries, alias, d, model);
+  function addStatic(value) {
+    const position = index;
+    const normalizedValue = normalizeValue(value);
+    params.push(normalizedValue);
+    mappings.push({ index: position, value: normalizedValue });
+    index++;
+    return format(position);
+  }
+  function add(value, dynamicName) {
+    assertCanAdd();
+    return dynamicName === void 0 ? addStatic(value) : addDynamic(dynamicName);
+  }
+  function addAuto(value) {
+    if (schemaParser.isDynamicParameter(value)) {
+      const dynamicName = schemaParser.extractDynamicName(value);
+      return add(void 0, dynamicName);
+    }
+    return add(value);
+  }
+  function snapshot() {
+    return Object.freeze({
+      index,
+      params: Object.freeze([...params]),
+      mappings: Object.freeze([...mappings])
+    });
+  }
+  return {
+    add,
+    addAuto,
+    snapshot,
+    get index() {
+      return index;
+    }
+  };
 }
-function buildOrderByClause(args, alias, dialect, model) {
-  if (!isNotNullish(args.orderBy)) return "";
-  const result = buildOrderBy(args.orderBy, alias, dialect, model);
-  if (!isNonEmptyString(result)) {
+function createParamStore(startIndex = 1) {
+  if (!Number.isInteger(startIndex) || startIndex < 1) {
+    throw new Error(`Start index must be integer >= 1, got ${startIndex}`);
+  }
+  if (startIndex > MAX_PARAM_INDEX) {
     throw new Error(
-      "buildOrderByClause: orderBy specified but produced empty result"
+      `Start index too high (${startIndex}), risk of overflow at MAX_SAFE_INTEGER`
     );
   }
-  return result;
+  return createStoreInternal(startIndex);
 }
-function normalizeTakeLike(v) {
-  const n = normalizeIntLike("take", v, {
-    min: Number.MIN_SAFE_INTEGER,
-    max: MAX_LIMIT_OFFSET,
-    allowZero: true
-  });
-  if (typeof n === "number") {
-    if (n === 0) return 0;
-  }
-  return n;
+function createParamStoreFrom(existingParams, existingMappings, nextIndex) {
+  validateState([...existingParams], [...existingMappings], nextIndex);
+  return createStoreInternal(
+    nextIndex,
+    [...existingParams],
+    [...existingMappings]
+  );
 }
-function normalizeSkipLike(v) {
-  return normalizeIntLike("skip", v, {
-    min: 0,
-    max: MAX_LIMIT_OFFSET,
-    allowZero: true
+
+// src/builder/shared/state.ts
+function toPublicResult(clause, joins, params) {
+  const snapshot = params.snapshot();
+  return Object.freeze({
+    clause: clause || DEFAULT_WHERE_CLAUSE,
+    joins: Object.freeze([...joins]),
+    params: snapshot.params,
+    paramMappings: snapshot.mappings,
+    nextParamIndex: snapshot.index
   });
 }
-function getPaginationParams(method, args) {
-  if (method === "findMany") {
-    return {
-      take: normalizeTakeLike(args.take),
-      skip: normalizeSkipLike(args.skip),
-      cursor: args.cursor
-    };
-  }
-  if (method === "findFirst") {
-    const skip = normalizeSkipLike(args.skip);
-    return { take: 1, skip: skip != null ? skip : 0 };
-  }
-  if (method === "findUnique") {
-    return { take: 1, skip: 0 };
+
+// src/builder/where.ts
+function buildWhereClause(where, options) {
+  var _a, _b, _c, _d, _e;
+  const dialect = options.dialect || getGlobalDialect();
+  const params = (_a = options.params) != null ? _a : createParamStore();
+  const ctx = {
+    alias: options.alias,
+    model: options.model,
+    schemaModels: (_b = options.schemaModels) != null ? _b : [],
+    path: (_c = options.path) != null ? _c : [],
+    isSubquery: (_d = options.isSubquery) != null ? _d : false,
+    aliasGen: (_e = options.aliasGen) != null ? _e : createAliasGenerator(),
+    dialect,
+    params,
+    depth: 0
+  };
+  const result = whereBuilderInstance.build(where, ctx);
+  const publicResult = toPublicResult(result.clause, result.joins, params);
+  if (!options.isSubquery) {
+    const nums = [...publicResult.clause.matchAll(/\$(\d+)/g)].map(
+      (m) => parseInt(m[1], 10)
+    );
+    if (nums.length > 0) {
+      const min = Math.min(...nums);
+      if (min === 1) {
+        validateParamConsistency(publicResult.clause, publicResult.params);
+      } else {
+        validateParamConsistencyFragment(
+          publicResult.clause,
+          publicResult.params
+        );
+      }
+    }
   }
-  return {};
+  return publicResult;
 }
 
 // src/builder/select/fields.ts
@@ -3437,8 +3433,8 @@ function replaceOrderByAlias(orderBy, fromAlias, outerAlias) {
   const replacement = `${outerAlias}.`;
   return orderBy.split(needle).join(replacement);
 }
-function buildDistinctColumns(distinct, fromAlias) {
-  return distinct.map((f) => col(fromAlias, f)).join(SQL_SEPARATORS.FIELD_LIST);
+function buildDistinctColumns(distinct, fromAlias, model) {
+  return distinct.map((f) => col(fromAlias, f, model)).join(SQL_SEPARATORS.FIELD_LIST);
 }
 function buildOutputColumns(scalarNames, includeNames, hasCount) {
   const outputCols = [...scalarNames, ...includeNames];
@@ -3452,13 +3448,13 @@ function buildOutputColumns(scalarNames, includeNames, hasCount) {
   return formatted;
 }
 function buildWindowOrder(args) {
-  const { baseOrder, idField, fromAlias } = args;
+  const { baseOrder, idField, fromAlias, model } = args;
   const orderFields = baseOrder.split(SQL_SEPARATORS.ORDER_BY).map((s) => s.trim().toLowerCase());
   const hasIdInOrder = orderFields.some(
     (f) => f.startsWith(`${fromAlias}.id `) || f.startsWith(`${fromAlias}."id" `)
   );
   if (hasIdInOrder) return baseOrder;
-  const idTiebreaker = idField ? `, ${col(fromAlias, "id")} ASC` : "";
+  const idTiebreaker = idField ? `, ${col(fromAlias, "id", model)} ASC` : "";
   return `${baseOrder}${idTiebreaker}`;
 }
 function buildSqliteDistinctQuery(spec, selectWithIncludes, countJoins) {
@@ -3475,14 +3471,17 @@ function buildSqliteDistinctQuery(spec, selectWithIncludes, countJoins) {
     includeNames,
     hasCount
   );
-  const distinctCols = buildDistinctColumns([...distinct], from.alias);
-  const fallbackOrder = [...distinct].map((f) => `${col(from.alias, f)} ASC`).join(SQL_SEPARATORS.FIELD_LIST);
-  const idField = model.fields.find((f) => f.name === "id" && !f.isRelation);
+  const distinctCols = buildDistinctColumns([...distinct], from.alias, model);
+  const fallbackOrder = [...distinct].map((f) => `${col(from.alias, f, model)} ASC`).join(SQL_SEPARATORS.FIELD_LIST);
+  const idField = model.fields.find(
+    (f) => f.name === "id" && !f.isRelation
+  );
   const baseOrder = isNonEmptyString(orderBy) ? orderBy : fallbackOrder;
   const windowOrder = buildWindowOrder({
     baseOrder,
     idField,
-    fromAlias: from.alias
+    fromAlias: from.alias,
+    model
   });
   const outerOrder = isNonEmptyString(orderBy) ? replaceOrderByAlias(orderBy, from.alias, `"__tp_distinct"`) : replaceOrderByAlias(fallbackOrder, from.alias, `"__tp_distinct"`);
   const joins = buildJoinsSql(whereJoins, countJoins);
@@ -3593,9 +3592,9 @@ function withCountJoins(spec, countJoins, whereJoins) {
     whereJoins: [...whereJoins || [], ...countJoins || []]
   });
 }
-function buildPostgresDistinctOnClause(fromAlias, distinct) {
+function buildPostgresDistinctOnClause(fromAlias, distinct, model) {
   if (!isNonEmptyArray(distinct)) return null;
-  const distinctCols = buildDistinctColumns([...distinct], fromAlias);
+  const distinctCols = buildDistinctColumns([...distinct], fromAlias, model);
   return `${SQL_TEMPLATES.DISTINCT_ON} (${distinctCols})`;
 }
 function pushJoinGroups(parts, ...groups) {
@@ -3625,7 +3624,8 @@ function constructFinalSql(spec) {
     method,
     cursorClause,
     params,
-    dialect
+    dialect,
+    model
   } = spec;
   const useWindowDistinct = hasWindowDistinct(spec);
   assertDistinctAllowed(method, useWindowDistinct);
@@ -3639,7 +3639,7 @@ function constructFinalSql(spec) {
     return finalizeSql(sql2, params);
   }
   const parts = [SQL_TEMPLATES.SELECT];
-  const distinctOn = dialect === "postgres" ? buildPostgresDistinctOnClause(from.alias, distinct) : null;
+  const distinctOn = dialect === "postgres" ? buildPostgresDistinctOnClause(from.alias, distinct, model) : null;
   if (distinctOn) parts.push(distinctOn);
   const baseSelect = (select != null ? select : "").trim();
   const fullSelectList = buildSelectList(baseSelect, includeCols);
@@ -3899,17 +3899,17 @@ function getModelFieldMap(model) {
 function isTruthySelection(v) {
   return v === true;
 }
-function aggExprForField(aggKey, field, alias) {
+function aggExprForField(aggKey, field, alias, model) {
   if (aggKey === "_count") {
-    return field === "_all" ? `COUNT(*)` : `COUNT(${col(alias, field)})`;
+    return field === "_all" ? `COUNT(*)` : `COUNT(${col(alias, field, model)})`;
   }
   if (field === "_all") {
     throw new Error(`'${aggKey}' does not support '_all'`);
   }
-  if (aggKey === "_sum") return `SUM(${col(alias, field)})`;
-  if (aggKey === "_avg") return `AVG(${col(alias, field)})`;
-  if (aggKey === "_min") return `MIN(${col(alias, field)})`;
-  return `MAX(${col(alias, field)})`;
+  if (aggKey === "_sum") return `SUM(${col(alias, field, model)})`;
+  if (aggKey === "_avg") return `AVG(${col(alias, field, model)})`;
+  if (aggKey === "_min") return `MIN(${col(alias, field, model)})`;
+  return `MAX(${col(alias, field, model)})`;
 }
 function buildComparisonOp(op) {
   const sqlOp = COMPARISON_OPS[op];
@@ -4090,7 +4090,7 @@ function buildHavingForAggregateFirstShape(aggKey, target, alias, params, dialec
   for (const [field, filter] of Object.entries(target)) {
     assertHavingAggTarget(aggKey, field, model);
     if (!isPlainObject(filter) || Object.keys(filter).length === 0) continue;
-    const expr = aggExprForField(aggKey, field, alias);
+    const expr = aggExprForField(aggKey, field, alias, model);
     out.push(...buildHavingOpsForExpr(expr, filter, params, dialect));
   }
   return out;
@@ -4107,7 +4107,7 @@ function buildHavingForFieldFirstShape(fieldName, target, alias, params, dialect
     assertAggregateFieldType(aggKey, field.type, field.name, model.name);
     const entries = Object.entries(aggFilter);
     if (entries.length === 0) continue;
-    const expr = aggExprForField(aggKey, fieldName, alias);
+    const expr = aggExprForField(aggKey, fieldName, alias, model);
     for (const [op, val] of entries) {
       if (op === "mode") continue;
       const built = buildSimpleComparison(expr, op, val, params, dialect);
@@ -4146,10 +4146,10 @@ function assertCountableScalarField(fieldMap, model, fieldName) {
     );
   }
 }
-function pushCountField(fields, alias, fieldName) {
+function pushCountField(fields, alias, fieldName, model) {
   const outAlias = `_count.${fieldName}`;
   fields.push(
-    `COUNT(${col(alias, fieldName)}) ${SQL_TEMPLATES.AS} ${quote(outAlias)}`
+    `COUNT(${col(alias, fieldName, model)}) ${SQL_TEMPLATES.AS} ${quote(outAlias)}`
   );
 }
 function addCountFields(fields, countArg, alias, model, fieldMap) {
@@ -4167,7 +4167,7 @@ function addCountFields(fields, countArg, alias, model, fieldMap) {
   );
   for (const [f] of selected) {
     assertCountableScalarField(fieldMap, model, f);
-    pushCountField(fields, alias, f);
+    pushCountField(fields, alias, f, model);
   }
 }
 function getAggregateSelectionObject(args, agg) {
@@ -4188,10 +4188,10 @@ function assertAggregatableScalarField(fieldMap, model, agg, fieldName) {
   }
   return field;
 }
-function pushAggregateFieldSql(fields, aggFn, alias, agg, fieldName) {
+function pushAggregateFieldSql(fields, aggFn, alias, agg, fieldName, model) {
   const outAlias = `${agg}.${fieldName}`;
   fields.push(
-    `${aggFn}(${col(alias, fieldName)}) ${SQL_TEMPLATES.AS} ${quote(outAlias)}`
+    `${aggFn}(${col(alias, fieldName, model)}) ${SQL_TEMPLATES.AS} ${quote(outAlias)}`
   );
 }
 function addAggregateFields(fields, args, alias, model, fieldMap) {
@@ -4209,7 +4209,7 @@ function addAggregateFields(fields, args, alias, model, fieldMap) {
         fieldName
       );
       assertAggregateFieldType(agg, field.type, fieldName, model.name);
-      pushAggregateFieldSql(fields, aggFn, alias, agg, fieldName);
+      pushAggregateFieldSql(fields, aggFn, alias, agg, fieldName, model);
     }
   }
 }
@@ -4272,7 +4272,7 @@ function assertGroupByBy(args, model) {
   return byFields;
 }
 function buildGroupBySelectParts(args, alias, model, byFields) {
-  const groupCols = byFields.map((f) => col(alias, f));
+  const groupCols = byFields.map((f) => col(alias, f, model));
   const groupFields = groupCols.join(SQL_SEPARATORS.FIELD_LIST);
   const aggFields = buildAggregateFields(args, alias, model);
   const selectFields = isNonEmptyArray(aggFields) ? groupCols.concat(aggFields).join(SQL_SEPARATORS.FIELD_LIST) : groupCols.join(SQL_SEPARATORS.FIELD_LIST);
@@ -4565,6 +4565,29 @@ function generateSQL2(directive) {
 }
 
 // src/code-emitter.ts
+function extractEnumMappings(datamodel) {
+  const mappings = {};
+  const fieldTypes = {};
+  for (const enumDef of datamodel.enums) {
+    const enumMapping = {};
+    for (const value of enumDef.values) {
+      enumMapping[value.name] = value.dbName || value.name;
+    }
+    if (Object.keys(enumMapping).length > 0) {
+      mappings[enumDef.name] = enumMapping;
+    }
+  }
+  for (const model of datamodel.models) {
+    fieldTypes[model.name] = {};
+    for (const field of model.fields) {
+      const baseType = field.type.replace(/\[\]|\?/g, "");
+      if (mappings[baseType]) {
+        fieldTypes[model.name][field.name] = baseType;
+      }
+    }
+  }
+  return { mappings, fieldTypes };
+}
 function generateClient(options) {
   return __async(this, null, function* () {
     const { datamodel, outputDir, config } = options;
@@ -4606,7 +4629,7 @@ function generateClient(options) {
     }
     const absoluteOutputDir = path.resolve(process.cwd(), outputDir);
     yield promises.mkdir(absoluteOutputDir, { recursive: true });
-    const code = generateCode(models, queries, config.dialect);
+    const code = generateCode(models, queries, config.dialect, datamodel);
     const outputPath = path.join(absoluteOutputDir, "index.ts");
     yield promises.writeFile(outputPath, code);
     const totalQueries = Array.from(queries.values()).reduce(
@@ -4634,15 +4657,20 @@ function createQueryKey(processedQuery) {
     return value;
   });
 }
-function generateCode(models, queries, dialect) {
+function generateCode(models, queries, dialect, datamodel) {
   const cleanModels = models.map((model) => __spreadProps(__spreadValues({}, model), {
     fields: model.fields.filter((f) => f !== void 0 && f !== null)
   }));
+  const { mappings, fieldTypes } = extractEnumMappings(datamodel);
   return `// Generated by @prisma-sql/generator - DO NOT EDIT
 import { buildSQL, transformQueryResults, type PrismaMethod, type Model } from 'prisma-sql'
 
 export const MODELS: Model[] = ${JSON.stringify(cleanModels, null, 2)}
 
+const ENUM_MAPPINGS: Record<string, Record<string, string>> = ${JSON.stringify(mappings, null, 2)}
+
+const ENUM_FIELDS: Record<string, Record<string, string>> = ${JSON.stringify(fieldTypes, null, 2)}
+
 const QUERIES: Record<string, Record<string, Record<string, {
   sql: string
   params: unknown[]
@@ -4656,6 +4684,79 @@ function isDynamicParam(key: string): boolean {
   return key === 'skip' || key === 'take' || key === 'cursor'
 }
 
+function transformEnumInValue(value: unknown, enumType: string | undefined): unknown {
+  if (!enumType || value === null || value === undefined) {
+    return value
+  }
+
+  const mapping = ENUM_MAPPINGS[enumType]
+  if (!mapping) {
+    return value
+  }
+
+  // Handle array of enum values
+  if (Array.isArray(value)) {
+    return value.map(v => {
+      if (typeof v === 'string' && mapping[v] !== undefined) {
+        return mapping[v]
+      }
+      return v
+    })
+  }
+
+  // Handle single enum value
+  if (typeof value === 'string' && mapping[value] !== undefined) {
+    return mapping[value]
+  }
+
+  return value
+}
+
+function transformEnumValues(modelName: string, obj: any, currentPath: string[] = []): any {
+  if (obj === null || obj === undefined) {
+    return obj
+  }
+  
+  if (Array.isArray(obj)) {
+    return obj.map(item => transformEnumValues(modelName, item, currentPath))
+  }
+  
+  if (typeof obj === 'object') {
+    const transformed: any = {}
+    const modelFields = ENUM_FIELDS[modelName] || {}
+    
+    for (const [key, value] of Object.entries(obj)) {
+      const newPath = [...currentPath, key]
+      
+      // Check if current key is an enum field at root level
+      const enumType = modelFields[key]
+      
+      if (enumType) {
+        // This is an enum field - check if value is direct or has operators
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+          // Has operators like { equals: "ACTIVE" }, { in: ["ACTIVE"] }, etc.
+          const transformedOperators: any = {}
+          for (const [op, opValue] of Object.entries(value)) {
+            transformedOperators[op] = transformEnumInValue(opValue, enumType)
+          }
+          transformed[key] = transformedOperators
+        } else {
+          // Direct value like { status: "ACTIVE" }
+          transformed[key] = transformEnumInValue(value, enumType)
+        }
+      } else if (typeof value === 'object' && value !== null) {
+        // Recursively transform nested objects (relations, logical operators, etc)
+        transformed[key] = transformEnumValues(modelName, value, newPath)
+      } else {
+        transformed[key] = value
+      }
+    }
+    return transformed
+  }
+  
+  return obj
+}
+
 function normalizeQuery(args: any): string {
   if (!args) return '{}'
   
@@ -4771,7 +4872,10 @@ export function speedExtension(config: {
       const modelName = this?.name || this?.$name
       const startTime = Date.now()
 
-      const queryKey = normalizeQuery(args)
+      // Transform enum values before processing
+      const transformedArgs = transformEnumValues(modelName, args || {})
+
+      const queryKey = normalizeQuery(transformedArgs)
       const prebakedQuery = QUERIES[modelName]?.[method]?.[queryKey]
 
       let sql: string
@@ -4780,7 +4884,7 @@ export function speedExtension(config: {
 
       if (prebakedQuery) {
         sql = prebakedQuery.sql
-        params = [...prebakedQuery.params, ...extractDynamicParams(args, prebakedQuery.dynamicKeys)]
+        params = [...prebakedQuery.params, ...extractDynamicParams(transformedArgs, prebakedQuery.dynamicKeys)]
         prebaked = true
       } else {
         const model = MODELS.find((m) => m.name === modelName)
@@ -4789,7 +4893,7 @@ export function speedExtension(config: {
           return this.$parent[modelName][method](args)
         }
 
-        const result = buildSQL(model, MODELS, method, args || {}, DIALECT)
+        const result = buildSQL(model, MODELS, method, transformedArgs, DIALECT)
         sql = result.sql
         params = result.params
       }