joist-core 2.3.0-next.7 → 2.3.0-next.71

package/build/drivers/buildRawQuery.js

@@ -1,153 +1,111 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRawQuery = buildRawQuery;
-exports.buildCteSql = buildCteSql;
-const keywords_1 = require("../keywords");
-const utils_1 = require("../utils");
-const buildUtils_1 = require("./buildUtils");
+import { kq, kqDot } from "../keywords.js";
+import { assertNever, cleanSql } from "../utils.js";
+import { buildWhereClause } from "./buildUtils.js";
+import "../QueryParser.js";
+//#region src/drivers/buildRawQuery.ts
 /**
- * Transforms `ParsedFindQuery` into a raw SQL string.
- *
- * In theory this should be implemented within each Driver, but the logic will be largely
- * the same for different dbs.
- */
+* Transforms `ParsedFindQuery` into a raw SQL string.
+*
+* In theory this should be implemented within each Driver, but the logic will be largely
+* the same for different dbs.
+*/
 function buildRawQuery(parsed, settings) {
-    const { limit, offset } = settings;
-    const primary = parsed.tables.find((t) => t.join === "primary");
-    // If we're doing o2m joins, add a `DISTINCT` clause to avoid duplicates
-    const needsDistinct = parsed.tables.some((t) => t.join === "outer" && t.distinct !== false) &&
-        // If this is a `findCount`, it will rewrite the `select` to have its own distinct
-        !parsed.selects.find((s) => typeof s === "string" && s.startsWith("count("));
-    let sql = "";
-    const bindings = [];
-    if (parsed.ctes && parsed.ctes.length > 0) {
-        const hasRecursive = parsed.ctes.some((cte) => cte.recursive);
-        const maybeRecursive = hasRecursive ? " RECURSIVE" : "";
-        sql += `WITH${maybeRecursive}`;
-        for (let i = 0; i < parsed.ctes.length; i++) {
-            const cte = parsed.ctes[i];
-            sql += i > 0 ? ", " : "";
-            sql += ` ${cte.alias}`;
-            if (cte.columns) {
-                sql += " (";
-                for (let j = 0; j < cte.columns.length; j++) {
-                    sql += j > 0 ? ", " : "";
-                    sql += (0, keywords_1.kq)(cte.columns[j].columnName);
-                }
-                sql += ")";
-            }
-            if (cte.query.kind === "raw") {
-                sql += ` AS (${(0, utils_1.cleanSql)(cte.query.sql)})`;
-                bindings.push(...cte.query.bindings);
-            }
-            else if (cte.query.kind === "ast") {
-                const nested = buildRawQuery(cte.query.query, {});
-                sql += ` AS (${nested.sql})`;
-                bindings.push(...nested.bindings);
-            }
-            else {
-                (0, utils_1.assertNever)(cte.query);
-            }
-        }
-        sql += " ";
-    }
-    sql += "SELECT ";
-    const subqueryRenderer = (q) => buildRawQuery(q, {});
-    parsed.selects.forEach((s, i) => {
-        const maybeDistinct = i === 0 && needsDistinct ? buildDistinctOn(parsed, primary) : "";
-        const maybeComma = i === parsed.selects.length - 1 ? "" : ", ";
-        if (typeof s === "string") {
-            sql += maybeDistinct + s + maybeComma;
-        }
-        else if ("sql" in s) {
-            sql += maybeDistinct + s.sql + maybeComma;
-            bindings.push(...s.bindings);
-        }
-    });
-    // If we're doing "select distinct" for o2m joins, then all order bys must be selects
-    if (needsDistinct && parsed.orderBys.length > 0) {
-        for (const { alias, column } of parsed.orderBys) {
-            sql += `, ${(0, keywords_1.kqDot)(alias, column)}`;
-        }
-    }
-    // Make sure the primary is first
-    sql += ` FROM ${as(primary)}`;
-    // Then the joins
-    for (const t of parsed.tables) {
-        if (t.join === "inner") {
-            sql += ` JOIN ${as(t)} ON ${t.col1} = ${t.col2}`;
-        }
-        else if (t.join === "outer") {
-            sql += ` LEFT OUTER JOIN ${as(t)} ON ${t.col1} = ${t.col2}`;
-        }
-        else if (t.join === "primary") {
-            // handled above
-        }
-        else if (t.join === "lateral") {
-            const { sql: subQ, bindings: subB } = buildRawQuery(t.query, t.settings ?? {});
-            sql += ` CROSS JOIN LATERAL (${subQ}) AS ${(0, keywords_1.kq)(t.alias)}`;
-            bindings.push(...subB);
-        }
-        else if (t.join === "cross") {
-            sql += ` CROSS JOIN ${as(t)}`;
-        }
-        else {
-            (0, utils_1.assertNever)(t.join);
-        }
-    }
-    if (parsed.condition) {
-        const where = (0, buildUtils_1.buildWhereClause)(parsed.condition, true, subqueryRenderer);
-        if (where) {
-            sql += " WHERE " + where[0];
-            bindings.push(...where[1]);
-        }
-    }
-    if (parsed.groupBys && parsed.groupBys.length > 0) {
-        sql +=
-            " GROUP BY " +
-                parsed.groupBys
-                    .map((gb) => ("expression" in gb ? gb.expression : (0, keywords_1.kqDot)(gb.alias, gb.column)))
-                    .join(", ");
-    }
-    if (parsed.orderBys.length > 0) {
-        sql += " ORDER BY " + parsed.orderBys.map((ob) => (0, keywords_1.kqDot)(ob.alias, ob.column) + " " + ob.order).join(", ");
-    }
-    if (limit !== undefined) {
-        sql += ` LIMIT ?`;
-        bindings.push(limit);
-    }
-    if (offset !== undefined) {
-        sql += ` OFFSET ?`;
-        bindings.push(offset);
-    }
-    return { sql, bindings };
+	const { limit, offset } = settings;
+	const primary = parsed.tables.find((t) => t.join === "primary");
+	const needsDistinct = parsed.tables.some((t) => t.join === "outer" && t.distinct !== false) && !parsed.selects.find((s) => typeof s === "string" && s.startsWith("count("));
+	let sql = "";
+	const bindings = [];
+	if (parsed.ctes && parsed.ctes.length > 0) {
+		const maybeRecursive = parsed.ctes.some((cte) => cte.recursive) ? " RECURSIVE" : "";
+		sql += `WITH${maybeRecursive}`;
+		for (let i = 0; i < parsed.ctes.length; i++) {
+			const cte = parsed.ctes[i];
+			sql += i > 0 ? ", " : "";
+			sql += ` ${cte.alias}`;
+			if (cte.columns) {
+				sql += " (";
+				for (let j = 0; j < cte.columns.length; j++) {
+					sql += j > 0 ? ", " : "";
+					sql += kq(cte.columns[j].columnName);
+				}
+				sql += ")";
+			}
+			if (cte.query.kind === "raw") {
+				sql += ` AS (${cleanSql(cte.query.sql)})`;
+				bindings.push(...cte.query.bindings);
+			} else if (cte.query.kind === "ast") {
+				const nested = buildRawQuery(cte.query.query, {});
+				sql += ` AS (${nested.sql})`;
+				bindings.push(...nested.bindings);
+			} else assertNever(cte.query);
+		}
+		sql += " ";
+	}
+	sql += "SELECT ";
+	const subqueryRenderer = (q) => buildRawQuery(q, {});
+	parsed.selects.forEach((s, i) => {
+		const maybeDistinct = i === 0 && needsDistinct ? buildDistinctOn(parsed, primary) : "";
+		const maybeComma = i === parsed.selects.length - 1 ? "" : ", ";
+		if (typeof s === "string") sql += maybeDistinct + s + maybeComma;
+		else if ("sql" in s) {
+			sql += maybeDistinct + s.sql + maybeComma;
+			bindings.push(...s.bindings);
+		}
+	});
+	if (needsDistinct && parsed.orderBys.length > 0) for (const { alias, column } of parsed.orderBys) sql += `, ${kqDot(alias, column)}`;
+	sql += ` FROM ${as(primary)}`;
+	for (const t of parsed.tables) if (t.join === "inner") sql += ` JOIN ${as(t)} ON ${t.col1} = ${t.col2}`;
+	else if (t.join === "outer") sql += ` LEFT OUTER JOIN ${as(t)} ON ${t.col1} = ${t.col2}`;
+	else if (t.join === "primary") {} else if (t.join === "lateral") {
+		const { sql: subQ, bindings: subB } = buildRawQuery(t.query, t.settings ?? {});
+		sql += ` CROSS JOIN LATERAL (${subQ}) AS ${kq(t.alias)}`;
+		bindings.push(...subB);
+	} else if (t.join === "cross") sql += ` CROSS JOIN ${as(t)}`;
+	else assertNever(t.join);
+	if (parsed.condition) {
+		const where = buildWhereClause(parsed.condition, true, subqueryRenderer);
+		if (where) {
+			sql += " WHERE " + where[0];
+			bindings.push(...where[1]);
+		}
+	}
+	if (parsed.groupBys && parsed.groupBys.length > 0) sql += " GROUP BY " + parsed.groupBys.map((gb) => "expression" in gb ? gb.expression : kqDot(gb.alias, gb.column)).join(", ");
+	if (parsed.orderBys.length > 0) sql += " ORDER BY " + parsed.orderBys.map((ob) => kqDot(ob.alias, ob.column) + " " + ob.order).join(", ");
+	if (limit !== void 0) {
+		sql += ` LIMIT ?`;
+		bindings.push(limit);
+	}
+	if (offset !== void 0) {
+		sql += ` OFFSET ?`;
+		bindings.push(offset);
+	}
+	return {
+		sql,
+		bindings
+	};
 }
 function buildDistinctOn(parsed, primary) {
-    const columns = [
-        // If we have an order by, it needs to be included in the DISTINCT ON
-        ...parsed.orderBys.map((ob) => (0, keywords_1.kqDot)(ob.alias, ob.column)),
-        (0, keywords_1.kqDot)(primary.alias, "id"),
-    ];
-    return `DISTINCT ON (${columns.join(", ")}) `;
+	return `DISTINCT ON (${[...parsed.orderBys.map((ob) => kqDot(ob.alias, ob.column)), kqDot(primary.alias, "id")].join(", ")}) `;
 }
 /** Creates the `WITH alias (...)` SQL for the given `cte`. */
 function buildCteSql(cte) {
-    const maybeRecursive = cte.recursive ? "RECURSIVE " : "";
-    const maybeColumns = cte.columns ? ` (${cte.columns.map((c) => (0, keywords_1.kq)(c.columnName)).join(", ")})` : "";
-    const prefix = `WITH ${maybeRecursive}${cte.alias}${maybeColumns} AS`;
-    if (cte.query.kind === "raw") {
-        return {
-            sql: `${prefix} (${(0, utils_1.cleanSql)(cte.query.sql)} )`,
-            bindings: cte.query.bindings,
-        };
-    }
-    else if (cte.query.kind === "ast") {
-        const { sql, bindings } = buildRawQuery(cte.query.query, {});
-        return { sql: `${prefix} (${sql})`, bindings };
-    }
-    else {
-        (0, utils_1.assertNever)(cte.query);
-    }
+	const maybeRecursive = cte.recursive ? "RECURSIVE " : "";
+	const maybeColumns = cte.columns ? ` (${cte.columns.map((c) => kq(c.columnName)).join(", ")})` : "";
+	const prefix = `WITH ${maybeRecursive}${cte.alias}${maybeColumns} AS`;
+	if (cte.query.kind === "raw") return {
+		sql: `${prefix} (${cleanSql(cte.query.sql)} )`,
+		bindings: cte.query.bindings
+	};
+	else if (cte.query.kind === "ast") {
+		const { sql, bindings } = buildRawQuery(cte.query.query, {});
+		return {
+			sql: `${prefix} (${sql})`,
+			bindings
+		};
+	} else assertNever(cte.query);
 }
-const as = (t) => `${(0, keywords_1.kq)(t.table)} AS ${(0, keywords_1.kq)(t.alias)}`;
+const as = (t) => `${kq(t.table)} AS ${kq(t.alias)}`;
+//#endregion
+export { buildCteSql, buildRawQuery };
+
 //# sourceMappingURL=buildRawQuery.js.map

package/build/drivers/buildRawQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildRawQuery.js","sourceRoot":"","sources":["../../src/drivers/buildRawQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildRawQuery.js","names":[],"sources":["../../src/drivers/buildRawQuery.ts"],"sourcesContent":["import { kq, kqDot } from \"../keywords.ts\";\nimport { type ParsedCteClause, type ParsedFindQuery, type ParsedTable } from \"../QueryParser.ts\";\nimport { assertNever, cleanSql } from \"../utils.ts\";\nimport { buildWhereClause } from \"./buildUtils.ts\";\n\ntype QuerySettings = { limit?: number; offset?: number };\n\n/**\n * Transforms `ParsedFindQuery` into a raw SQL string.\n *\n * In theory this should be implemented within each Driver, but the logic will be largely\n * the same for different dbs.\n */\nexport function buildRawQuery(\n  parsed: ParsedFindQuery,\n  settings: QuerySettings,\n): { sql: string; bindings: readonly any[] } {\n  const { limit, offset } = settings;\n\n  const primary = parsed.tables.find((t) => t.join === \"primary\")!;\n\n  // If we're doing o2m joins, add a `DISTINCT` clause to avoid duplicates\n  const needsDistinct =\n    parsed.tables.some((t) => t.join === \"outer\" && t.distinct !== false) &&\n    // If this is a `findCount`, it will rewrite the `select` to have its own distinct\n    !parsed.selects.find((s) => typeof s === \"string\" && s.startsWith(\"count(\"));\n\n  let sql = \"\";\n  const bindings: any[] = [];\n\n  if (parsed.ctes && parsed.ctes.length > 0) {\n    const hasRecursive = parsed.ctes.some((cte) => cte.recursive);\n    const maybeRecursive = hasRecursive ? \" RECURSIVE\" : \"\";\n    sql += `WITH${maybeRecursive}`;\n    for (let i = 0; i < parsed.ctes.length; i++) {\n      const cte = parsed.ctes[i];\n      sql += i > 0 ? \", \" : \"\";\n      sql += ` ${cte.alias}`;\n      if (cte.columns) {\n        sql += \" (\";\n        for (let j = 0; j < cte.columns.length; j++) {\n          sql += j > 0 ? \", \" : \"\";\n          sql += kq(cte.columns[j].columnName);\n        }\n        sql += \")\";\n      }\n      if (cte.query.kind === \"raw\") {\n        sql += ` AS (${cleanSql(cte.query.sql)})`;\n        bindings.push(...cte.query.bindings);\n      } else if (cte.query.kind === \"ast\") {\n        const nested = buildRawQuery(cte.query.query, {});\n        sql += ` AS (${nested.sql})`;\n        bindings.push(...nested.bindings);\n      } else {\n        assertNever(cte.query);\n      }\n    }\n    sql += \" \";\n  }\n\n  sql += \"SELECT \";\n  const subqueryRenderer = (q: ParsedFindQuery) => buildRawQuery(q, {});\n\n  parsed.selects.forEach((s, i) => {\n    const maybeDistinct = i === 0 && needsDistinct ? buildDistinctOn(parsed, primary) : \"\";\n    const maybeComma = i === parsed.selects.length - 1 ? \"\" : \", \";\n    if (typeof s === \"string\") {\n      sql += maybeDistinct + s + maybeComma;\n    } else if (\"sql\" in s) {\n      sql += maybeDistinct + s.sql + maybeComma;\n      bindings.push(...s.bindings);\n    }\n  });\n\n  // If we're doing \"select distinct\" for o2m joins, then all order bys must be selects\n  if (needsDistinct && parsed.orderBys.length > 0) {\n    for (const { alias, column } of parsed.orderBys) {\n      sql += `, ${kqDot(alias, column)}`;\n    }\n  }\n\n  // Make sure the primary is first\n  sql += ` FROM ${as(primary)}`;\n\n  // Then the joins\n  for (const t of parsed.tables) {\n    if (t.join === \"inner\") {\n      sql += ` JOIN ${as(t)} ON ${t.col1} = ${t.col2}`;\n    } else if (t.join === \"outer\") {\n      sql += ` LEFT OUTER JOIN ${as(t)} ON ${t.col1} = ${t.col2}`;\n    } else if (t.join === \"primary\") {\n      // handled above\n    } else if (t.join === \"lateral\") {\n      const { sql: subQ, bindings: subB } = buildRawQuery(t.query, t.settings ?? {});\n      sql += ` CROSS JOIN LATERAL (${subQ}) AS ${kq(t.alias)}`;\n      bindings.push(...subB);\n    } else if (t.join === \"cross\") {\n      sql += ` CROSS JOIN ${as(t)}`;\n    } else {\n      assertNever(t.join);\n    }\n  }\n\n  if (parsed.condition) {\n    const where = buildWhereClause(parsed.condition, true, subqueryRenderer);\n    if (where) {\n      sql += \" WHERE \" + where[0];\n      bindings.push(...where[1]);\n    }\n  }\n\n  if (parsed.groupBys && parsed.groupBys.length > 0) {\n    sql +=\n      \" GROUP BY \" +\n      parsed.groupBys.map((gb) => (\"expression\" in gb ? gb.expression : kqDot(gb.alias, gb.column))).join(\", \");\n  }\n\n  if (parsed.orderBys.length > 0) {\n    sql += \" ORDER BY \" + parsed.orderBys.map((ob) => kqDot(ob.alias, ob.column) + \" \" + ob.order).join(\", \");\n  }\n\n  if (limit !== undefined) {\n    sql += ` LIMIT ?`;\n    bindings.push(limit);\n  }\n  if (offset !== undefined) {\n    sql += ` OFFSET ?`;\n    bindings.push(offset);\n  }\n\n  return { sql, bindings };\n}\n\nfunction buildDistinctOn(parsed: ParsedFindQuery, primary: ParsedTable): string {\n  const columns = [\n    // If we have an order by, it needs to be included in the DISTINCT ON\n    ...parsed.orderBys.map((ob) => kqDot(ob.alias, ob.column)),\n    kqDot(primary.alias, \"id\"),\n  ];\n  return `DISTINCT ON (${columns.join(\", \")}) `;\n}\n\n/** Creates the `WITH alias (...)` SQL for the given `cte`. */\nexport function buildCteSql(cte: ParsedCteClause): { sql: string; bindings: readonly any[] } {\n  const maybeRecursive = cte.recursive ? \"RECURSIVE \" : \"\";\n  const maybeColumns = cte.columns ? ` (${cte.columns.map((c) => kq(c.columnName)).join(\", \")})` : \"\";\n  const prefix = `WITH ${maybeRecursive}${cte.alias}${maybeColumns} AS`;\n  if (cte.query.kind === \"raw\") {\n    return {\n      sql: `${prefix} (${cleanSql(cte.query.sql)} )`,\n      bindings: cte.query.bindings,\n    };\n  } else if (cte.query.kind === \"ast\") {\n    const { sql, bindings } = buildRawQuery(cte.query.query, {});\n    return { sql: `${prefix} (${sql})`, bindings };\n  } else {\n    assertNever(cte.query);\n  }\n}\n\nconst as = (t: ParsedTable) => `${kq(t.table)} AS ${kq(t.alias)}`;\n"],"mappings":"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"}

package/build/drivers/buildUtils.cjs

@@ -0,0 +1,67 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_EntityGraphQLFilter = require("../EntityGraphQLFilter.cjs");
+const require_keywords = require("../keywords.cjs");
+const require_utils = require("../utils.cjs");
+const require_EntityManager = require("../EntityManager.cjs");
+require("../QueryParser.cjs");
+//#region src/drivers/buildUtils.ts
+/** Returns a tuple of `["cond AND (cond OR cond)", bindings]`. */
+function buildWhereClause(exp, topLevel = false, renderSubquery) {
+	const tuples = exp.conditions.map((c) => {
+		return c.kind === "exp" ? buildWhereClause(c, false, renderSubquery) : c.kind === "column" ? buildCondition(c) : c.kind === "raw" ? buildRawCondition(c) : c.kind === "exists" ? buildExistsCondition(c, renderSubquery) : require_utils.fail(`Invalid condition ${c}`);
+	}).filter(require_EntityManager.isDefined);
+	if (tuples.length === 0) return void 0;
+	let sql = tuples.map(([sql]) => sql).join(` ${exp.op.toUpperCase()} `);
+	if (!topLevel) sql = `(${sql})`;
+	return [sql, tuples.flatMap(([, bindings]) => bindings)];
+}
+function buildRawCondition(raw) {
+	return [raw.condition, raw.bindings];
+}
+/** Returns a tuple of `["column op ?"`, bindings]`. */
+function buildCondition(cc) {
+	const { alias, column, cond } = cc;
+	return buildValueCondition(require_keywords.kqDot(alias, column), cond);
+}
+/** Renders an encoded value filter against a SQL column expression. */
+function buildValueCondition(columnName, cond) {
+	switch (cond.kind) {
+		case "eq":
+		case "ne":
+		case "gte":
+		case "gt":
+		case "lte":
+		case "lt":
+		case "like":
+		case "nlike":
+		case "ilike":
+		case "nilike":
+		case "regex":
+		case "nregex":
+		case "iregex":
+		case "niregex":
+		case "jsonPathExists":
+		case "jsonPathPredicate":
+		case "contains":
+		case "containedBy":
+		case "overlaps": return [`${columnName} ${require_EntityGraphQLFilter.opToFn[cond.kind] ?? require_utils.fail(`Invalid operator ${cond.kind}`)} ?`, [cond.value]];
+		case "noverlaps":
+		case "ncontains": return [`NOT (${columnName} ${require_EntityGraphQLFilter.opToFn[cond.kind.substring(1)] ?? require_utils.fail(`Invalid operator ${cond.kind}`)} ?)`, [cond.value]];
+		case "is-null": return [`${columnName} IS NULL`, []];
+		case "not-null": return [`${columnName} IS NOT NULL`, []];
+		case "in": return [`${columnName} = ANY(?)`, [cond.value]];
+		case "nin": return [`${columnName} != ALL(?)`, [cond.value]];
+		case "between": return [`${columnName} BETWEEN ? AND ?`, cond.value];
+		default: require_utils.assertNever(cond);
+	}
+}
+function buildExistsCondition(c, renderSubquery) {
+	if (!renderSubquery) throw new Error("EXISTS condition requires a subquery renderer");
+	const { sql, bindings } = renderSubquery(c.subquery);
+	return [`${c.negate ? "NOT EXISTS" : "EXISTS"} (${sql})`, [...bindings]];
+}
+//#endregion
+exports.buildValueCondition = buildValueCondition;
+exports.buildWhereClause = buildWhereClause;
+
+//# sourceMappingURL=buildUtils.cjs.map

package/build/drivers/buildUtils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildUtils.cjs","names":["fail","isDefined","kqDot","opToFn"],"sources":["../../src/drivers/buildUtils.ts"],"sourcesContent":["import { opToFn } from \"../EntityGraphQLFilter.ts\";\nimport { isDefined } from \"../EntityManager.ts\";\nimport { kqDot } from \"../keywords.ts\";\nimport {\n  type ColumnCondition,\n  type ExistsCondition,\n  type ParsedExpressionFilter,\n  type ParsedFindQuery,\n  type ParsedValueFilter,\n  type RawCondition,\n} from \"../QueryParser.ts\";\nimport { assertNever, fail } from \"../utils.ts\";\n\n/** Renders a ParsedFindQuery subquery to SQL — passed in to avoid circular imports with buildRawQuery. */\nexport type SubqueryRenderer = (q: ParsedFindQuery) => { sql: string; bindings: readonly any[] };\n\n/** Returns a tuple of `[\"cond AND (cond OR cond)\", bindings]`. */\nexport function buildWhereClause(\n  exp: ParsedExpressionFilter,\n  topLevel = false,\n  renderSubquery?: SubqueryRenderer,\n): [string, any[]] | undefined {\n  const tuples = exp.conditions\n    .map((c) => {\n      return c.kind === \"exp\"\n        ? buildWhereClause(c, false, renderSubquery)\n        : c.kind === \"column\"\n          ? buildCondition(c)\n          : c.kind === \"raw\"\n            ? buildRawCondition(c)\n            : c.kind === \"exists\"\n              ? buildExistsCondition(c, renderSubquery)\n              : fail(`Invalid condition ${c}`);\n    })\n    .filter(isDefined);\n  // If we don't have any conditions to combine, just return undefined;\n  if (tuples.length === 0) return undefined;\n  // Wrap/join the sql strings together first, and then flatten the bindings.\n  let sql = tuples.map(([sql]) => sql).join(` ${exp.op.toUpperCase()} `);\n  if (!topLevel) sql = `(${sql})`;\n  return [sql, tuples.flatMap(([, bindings]) => bindings)];\n}\n\nfunction buildRawCondition(raw: RawCondition): [string, readonly any[]] {\n  return [raw.condition, raw.bindings];\n}\n\n/** Returns a tuple of `[\"column op ?\"`, bindings]`. */\nfunction buildCondition(cc: ColumnCondition): [string, any[]] {\n  const { alias, column, cond } = cc;\n  return buildValueCondition(kqDot(alias, column), cond);\n}\n\n/** Renders an encoded value filter against a SQL column expression. */\nexport function buildValueCondition(columnName: string, cond: ParsedValueFilter<unknown>): [string, any[]] {\n  switch (cond.kind) {\n    case \"eq\":\n    case \"ne\":\n    case \"gte\":\n    case \"gt\":\n    case \"lte\":\n    case \"lt\":\n    case \"like\":\n    case \"nlike\":\n    case \"ilike\":\n    case \"nilike\":\n    case \"regex\":\n    case \"nregex\":\n    case \"iregex\":\n    case \"niregex\":\n    case \"jsonPathExists\":\n    case \"jsonPathPredicate\":\n    case \"contains\":\n    case \"containedBy\":\n    case \"overlaps\": {\n      const fn = opToFn[cond.kind] ?? fail(`Invalid operator ${cond.kind}`);\n      return [`${columnName} ${fn} ?`, [cond.value]];\n    }\n    case \"noverlaps\":\n    case \"ncontains\": {\n      const fn = (opToFn as any)[cond.kind.substring(1)] ?? fail(`Invalid operator ${cond.kind}`);\n      return [`NOT (${columnName} ${fn} ?)`, [cond.value]];\n    }\n    case \"is-null\":\n      return [`${columnName} IS NULL`, []];\n    case \"not-null\":\n      return [`${columnName} IS NOT NULL`, []];\n    case \"in\":\n      return [`${columnName} = ANY(?)`, [cond.value]];\n    case \"nin\":\n      return [`${columnName} != ALL(?)`, [cond.value]];\n    case \"between\":\n      return [`${columnName} BETWEEN ? AND ?`, cond.value];\n    default:\n      assertNever(cond);\n  }\n}\n\nfunction buildExistsCondition(c: ExistsCondition, renderSubquery?: SubqueryRenderer): [string, any[]] {\n  if (!renderSubquery) throw new Error(\"EXISTS condition requires a subquery renderer\");\n  const { sql, bindings } = renderSubquery(c.subquery);\n  const prefix = c.negate ? \"NOT EXISTS\" : \"EXISTS\";\n  return [`${prefix} (${sql})`, [...bindings]];\n}\n"],"mappings":";;;;;;;;AAiBA,SAAgB,iBACd,KACA,WAAW,OACX,gBAC6B;CAC7B,MAAM,SAAS,IAAI,WAChB,KAAK,MAAM;EACV,OAAO,EAAE,SAAS,QACd,iBAAiB,GAAG,OAAO,cAAc,IACzC,EAAE,SAAS,WACT,eAAe,CAAC,IAChB,EAAE,SAAS,QACT,kBAAkB,CAAC,IACnB,EAAE,SAAS,WACT,qBAAqB,GAAG,cAAc,IACtCA,cAAAA,KAAK,qBAAqB,GAAG;CACzC,CAAC,CAAC,CACD,OAAOC,sBAAAA,SAAS;CAEnB,IAAI,OAAO,WAAW,GAAG,OAAO,KAAA;CAEhC,IAAI,MAAM,OAAO,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,KAAK,IAAI,IAAI,GAAG,YAAY,EAAE,EAAE;CACrE,IAAI,CAAC,UAAU,MAAM,IAAI,IAAI;CAC7B,OAAO,CAAC,KAAK,OAAO,SAAS,GAAG,cAAc,QAAQ,CAAC;AACzD;AAEA,SAAS,kBAAkB,KAA6C;CACtE,OAAO,CAAC,IAAI,WAAW,IAAI,QAAQ;AACrC;;AAGA,SAAS,eAAe,IAAsC;CAC5D,MAAM,EAAE,OAAO,QAAQ,SAAS;CAChC,OAAO,oBAAoBC,iBAAAA,MAAM,OAAO,MAAM,GAAG,IAAI;AACvD;;AAGA,SAAgB,oBAAoB,YAAoB,MAAmD;CACzG,QAAQ,KAAK,MAAb;EACE,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK,YAEH,OAAO,CAAC,GAAG,WAAW,GADXC,4BAAAA,OAAO,KAAK,SAASH,cAAAA,KAAK,oBAAoB,KAAK,MAAM,EACxC,KAAK,CAAC,KAAK,KAAK,CAAC;EAE/C,KAAK;EACL,KAAK,aAEH,OAAO,CAAC,QAAQ,WAAW,GADfG,4BAAAA,OAAe,KAAK,KAAK,UAAU,CAAC,MAAMH,cAAAA,KAAK,oBAAoB,KAAK,MAAM,EACzD,MAAM,CAAC,KAAK,KAAK,CAAC;EAErD,KAAK,WACH,OAAO,CAAC,GAAG,WAAW,WAAW,CAAC,CAAC;EACrC,KAAK,YACH,OAAO,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC;EACzC,KAAK,MACH,OAAO,CAAC,GAAG,WAAW,YAAY,CAAC,KAAK,KAAK,CAAC;EAChD,KAAK,OACH,OAAO,CAAC,GAAG,WAAW,aAAa,CAAC,KAAK,KAAK,CAAC;EACjD,KAAK,WACH,OAAO,CAAC,GAAG,WAAW,mBAAmB,KAAK,KAAK;EACrD,SACE,cAAA,YAAY,IAAI;CACpB;AACF;AAEA,SAAS,qBAAqB,GAAoB,gBAAoD;CACpG,IAAI,CAAC,gBAAgB,MAAM,IAAI,MAAM,+CAA+C;CACpF,MAAM,EAAE,KAAK,aAAa,eAAe,EAAE,QAAQ;CAEnD,OAAO,CAAC,GADO,EAAE,SAAS,eAAe,SACvB,IAAI,IAAI,IAAI,CAAC,GAAG,QAAQ,CAAC;AAC7C"}

package/build/drivers/buildUtils.d.cts

@@ -0,0 +1,14 @@
+import { ParsedExpressionFilter, ParsedFindQuery, ParsedValueFilter } from "../QueryParser.cjs";
+//#region src/drivers/buildUtils.d.ts
+/** Renders a ParsedFindQuery subquery to SQL — passed in to avoid circular imports with buildRawQuery. */
+type SubqueryRenderer = (q: ParsedFindQuery) => {
+  sql: string;
+  bindings: readonly any[];
+};
+/** Returns a tuple of `["cond AND (cond OR cond)", bindings]`. */
+declare function buildWhereClause(exp: ParsedExpressionFilter, topLevel?: boolean, renderSubquery?: SubqueryRenderer): [string, any[]] | undefined;
+/** Renders an encoded value filter against a SQL column expression. */
+declare function buildValueCondition(columnName: string, cond: ParsedValueFilter<unknown>): [string, any[]];
+//#endregion
+export { SubqueryRenderer, buildValueCondition, buildWhereClause };
+//# sourceMappingURL=buildUtils.d.cts.map

package/build/drivers/buildUtils.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildUtils.d.cts","names":[],"sources":["../../src/drivers/buildUtils.ts"],"mappings":";;;KAcY,oBAAoB,GAAG;EAAsB;EAAa;;;iBAGtD,iBACd,KAAK,wBACL,oBACA,iBAAiB;;iBAkCH,oBAAoB,oBAAoB,MAAM"}

package/build/drivers/buildUtils.d.mts

@@ -0,0 +1,14 @@
+import { ParsedExpressionFilter, ParsedFindQuery, ParsedValueFilter } from "../QueryParser.mjs";
+//#region src/drivers/buildUtils.d.ts
+/** Renders a ParsedFindQuery subquery to SQL — passed in to avoid circular imports with buildRawQuery. */
+type SubqueryRenderer = (q: ParsedFindQuery) => {
+  sql: string;
+  bindings: readonly any[];
+};
+/** Returns a tuple of `["cond AND (cond OR cond)", bindings]`. */
+declare function buildWhereClause(exp: ParsedExpressionFilter, topLevel?: boolean, renderSubquery?: SubqueryRenderer): [string, any[]] | undefined;
+/** Renders an encoded value filter against a SQL column expression. */
+declare function buildValueCondition(columnName: string, cond: ParsedValueFilter<unknown>): [string, any[]];
+//#endregion
+export { SubqueryRenderer, buildValueCondition, buildWhereClause };
+//# sourceMappingURL=buildUtils.d.mts.map

package/build/drivers/buildUtils.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildUtils.d.mts","names":[],"sources":["../../src/drivers/buildUtils.ts"],"mappings":";;;KAcY,oBAAoB,GAAG;EAAsB;EAAa;;;iBAGtD,iBACd,KAAK,wBACL,oBACA,iBAAiB;;iBAkCH,oBAAoB,oBAAoB,MAAM"}

package/build/drivers/buildUtils.js

@@ -1,88 +1,65 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildWhereClause = buildWhereClause;
-const EntityGraphQLFilter_1 = require("../EntityGraphQLFilter");
-const EntityManager_1 = require("../EntityManager");
-const keywords_1 = require("../keywords");
-const utils_1 = require("../utils");
+import { opToFn } from "../EntityGraphQLFilter.js";
+import { kqDot } from "../keywords.js";
+import { assertNever, fail } from "../utils.js";
+import { isDefined } from "../EntityManager.js";
+import "../QueryParser.js";
+//#region src/drivers/buildUtils.ts
 /** Returns a tuple of `["cond AND (cond OR cond)", bindings]`. */
 function buildWhereClause(exp, topLevel = false, renderSubquery) {
-    const tuples = exp.conditions
-        .map((c) => {
-        return c.kind === "exp"
-            ? buildWhereClause(c, false, renderSubquery)
-            : c.kind === "column"
-                ? buildCondition(c)
-                : c.kind === "raw"
-                    ? buildRawCondition(c)
-                    : c.kind === "exists"
-                        ? buildExistsCondition(c, renderSubquery)
-                        : (0, utils_1.fail)(`Invalid condition ${c}`);
-    })
-        .filter(EntityManager_1.isDefined);
-    // If we don't have any conditions to combine, just return undefined;
-    if (tuples.length === 0)
-        return undefined;
-    // Wrap/join the sql strings together first, and then flatten the bindings.
-    let sql = tuples.map(([sql]) => sql).join(` ${exp.op.toUpperCase()} `);
-    if (!topLevel)
-        sql = `(${sql})`;
-    return [sql, tuples.flatMap(([, bindings]) => bindings)];
+	const tuples = exp.conditions.map((c) => {
+		return c.kind === "exp" ? buildWhereClause(c, false, renderSubquery) : c.kind === "column" ? buildCondition(c) : c.kind === "raw" ? buildRawCondition(c) : c.kind === "exists" ? buildExistsCondition(c, renderSubquery) : fail(`Invalid condition ${c}`);
+	}).filter(isDefined);
+	if (tuples.length === 0) return void 0;
+	let sql = tuples.map(([sql]) => sql).join(` ${exp.op.toUpperCase()} `);
+	if (!topLevel) sql = `(${sql})`;
+	return [sql, tuples.flatMap(([, bindings]) => bindings)];
 }
 function buildRawCondition(raw) {
-    return [raw.condition, raw.bindings];
+	return [raw.condition, raw.bindings];
 }
 /** Returns a tuple of `["column op ?"`, bindings]`. */
 function buildCondition(cc) {
-    const { alias, column, cond } = cc;
-    const columnName = (0, keywords_1.kqDot)(alias, column);
-    switch (cond.kind) {
-        case "eq":
-        case "ne":
-        case "gte":
-        case "gt":
-        case "lte":
-        case "lt":
-        case "like":
-        case "nlike":
-        case "ilike":
-        case "nilike":
-        case "regex":
-        case "nregex":
-        case "iregex":
-        case "niregex":
-        case "jsonPathExists":
-        case "jsonPathPredicate":
-        case "contains":
-        case "containedBy":
-        case "overlaps": {
-            const fn = EntityGraphQLFilter_1.opToFn[cond.kind] ?? (0, utils_1.fail)(`Invalid operator ${cond.kind}`);
-            return [`${columnName} ${fn} ?`, [cond.value]];
-        }
-        case "noverlaps":
-        case "ncontains": {
-            const fn = EntityGraphQLFilter_1.opToFn[cond.kind.substring(1)] ?? (0, utils_1.fail)(`Invalid operator ${cond.kind}`);
-            return [`NOT (${columnName} ${fn} ?)`, [cond.value]];
-        }
-        case "is-null":
-            return [`${columnName} IS NULL`, []];
-        case "not-null":
-            return [`${columnName} IS NOT NULL`, []];
-        case "in":
-            return [`${columnName} = ANY(?)`, [cond.value]];
-        case "nin":
-            return [`${columnName} != ALL(?)`, [cond.value]];
-        case "between":
-            return [`${columnName} BETWEEN ? AND ?`, cond.value];
-        default:
-            (0, utils_1.assertNever)(cond);
-    }
+	const { alias, column, cond } = cc;
+	return buildValueCondition(kqDot(alias, column), cond);
+}
+/** Renders an encoded value filter against a SQL column expression. */
+function buildValueCondition(columnName, cond) {
+	switch (cond.kind) {
+		case "eq":
+		case "ne":
+		case "gte":
+		case "gt":
+		case "lte":
+		case "lt":
+		case "like":
+		case "nlike":
+		case "ilike":
+		case "nilike":
+		case "regex":
+		case "nregex":
+		case "iregex":
+		case "niregex":
+		case "jsonPathExists":
+		case "jsonPathPredicate":
+		case "contains":
+		case "containedBy":
+		case "overlaps": return [`${columnName} ${opToFn[cond.kind] ?? fail(`Invalid operator ${cond.kind}`)} ?`, [cond.value]];
+		case "noverlaps":
+		case "ncontains": return [`NOT (${columnName} ${opToFn[cond.kind.substring(1)] ?? fail(`Invalid operator ${cond.kind}`)} ?)`, [cond.value]];
+		case "is-null": return [`${columnName} IS NULL`, []];
+		case "not-null": return [`${columnName} IS NOT NULL`, []];
+		case "in": return [`${columnName} = ANY(?)`, [cond.value]];
+		case "nin": return [`${columnName} != ALL(?)`, [cond.value]];
+		case "between": return [`${columnName} BETWEEN ? AND ?`, cond.value];
+		default: assertNever(cond);
+	}
 }
 function buildExistsCondition(c, renderSubquery) {
-    if (!renderSubquery)
-        throw new Error("EXISTS condition requires a subquery renderer");
-    const { sql, bindings } = renderSubquery(c.subquery);
-    const prefix = c.negate ? "NOT EXISTS" : "EXISTS";
-    return [`${prefix} (${sql})`, [...bindings]];
+	if (!renderSubquery) throw new Error("EXISTS condition requires a subquery renderer");
+	const { sql, bindings } = renderSubquery(c.subquery);
+	return [`${c.negate ? "NOT EXISTS" : "EXISTS"} (${sql})`, [...bindings]];
 }
+//#endregion
+export { buildValueCondition, buildWhereClause };
+
 //# sourceMappingURL=buildUtils.js.map