joist-core 2.3.0 → 2.4.0

package/build/queries/find/buildFindQuery.cjs

@@ -0,0 +1,112 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_queries_sql_keywords = require("../sql/keywords.cjs");
+const require_utils = require("../../utils.cjs");
+const require_queries_renderConditions = require("../renderConditions.cjs");
+//#region src/queries/find/buildFindQuery.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.
+*/
+function buildRawQuery(parsed, settings) {
+	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 += require_queries_sql_keywords.kq(cte.columns[j].columnName);
+				}
+				sql += ")";
+			}
+			if (cte.query.kind === "raw") {
+				sql += ` AS (${require_utils.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 require_utils.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 += `, ${require_queries_sql_keywords.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 ${require_queries_sql_keywords.kq(t.alias)}`;
+		bindings.push(...subB);
+	} else if (t.join === "cross") sql += ` CROSS JOIN ${as(t)}`;
+	else require_utils.assertNever(t.join);
+	if (parsed.condition) {
+		const where = require_queries_renderConditions.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 : require_queries_sql_keywords.kqDot(gb.alias, gb.column)).join(", ");
+	if (parsed.orderBys.length > 0) sql += " ORDER BY " + parsed.orderBys.map((ob) => require_queries_sql_keywords.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) {
+	return `DISTINCT ON (${[...parsed.orderBys.map((ob) => require_queries_sql_keywords.kqDot(ob.alias, ob.column)), require_queries_sql_keywords.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) => require_queries_sql_keywords.kq(c.columnName)).join(", ")})` : "";
+	const prefix = `WITH ${maybeRecursive}${cte.alias}${maybeColumns} AS`;
+	if (cte.query.kind === "raw") return {
+		sql: `${prefix} (${require_utils.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 require_utils.assertNever(cte.query);
+}
+const as = (t) => `${require_queries_sql_keywords.kq(t.table)} AS ${require_queries_sql_keywords.kq(t.alias)}`;
+//#endregion
+exports.buildCteSql = buildCteSql;
+exports.buildRawQuery = buildRawQuery;
+
+//# sourceMappingURL=buildFindQuery.cjs.map

package/build/queries/find/buildFindQuery.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildFindQuery.cjs","names":["kq","cleanSql","kqDot","buildWhereClause"],"sources":["../../../src/queries/find/buildFindQuery.ts"],"sourcesContent":["import type { ParsedCteClause, ParsedFindQuery, ParsedTable } from \"src/queries/find/QueryParser.ts\";\nimport { buildWhereClause } from \"src/queries/renderConditions.ts\";\nimport { kq, kqDot } from \"src/queries/sql/keywords.ts\";\nimport { assertNever, cleanSql } from \"src/utils.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":";;;;;;;;;;;AAaA,SAAgB,cACd,QACA,UAC2C;CAC3C,MAAM,EAAE,OAAO,WAAW;CAE1B,MAAM,UAAU,OAAO,OAAO,MAAM,MAAM,EAAE,SAAS,SAAS;CAG9D,MAAM,gBACJ,OAAO,OAAO,MAAM,MAAM,EAAE,SAAS,WAAW,EAAE,aAAa,KAAK,KAEpE,CAAC,OAAO,QAAQ,MAAM,MAAM,OAAO,MAAM,YAAY,EAAE,WAAW,QAAQ,CAAC;CAE7E,IAAI,MAAM;CACV,MAAM,WAAkB,CAAC;CAEzB,IAAI,OAAO,QAAQ,OAAO,KAAK,SAAS,GAAG;EAEzC,MAAM,iBADe,OAAO,KAAK,MAAM,QAAQ,IAAI,SACjB,IAAI,eAAe;EACrD,OAAO,OAAO;EACd,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,KAAK,QAAQ,KAAK;GAC3C,MAAM,MAAM,OAAO,KAAK;GACxB,OAAO,IAAI,IAAI,OAAO;GACtB,OAAO,IAAI,IAAI;GACf,IAAI,IAAI,SAAS;IACf,OAAO;IACP,KAAK,IAAI,IAAI,GAAG,IAAI,IAAI,QAAQ,QAAQ,KAAK;KAC3C,OAAO,IAAI,IAAI,OAAO;KACtB,OAAOA,6BAAAA,GAAG,IAAI,QAAQ,EAAE,CAAC,UAAU;IACrC;IACA,OAAO;GACT;GACA,IAAI,IAAI,MAAM,SAAS,OAAO;IAC5B,OAAO,QAAQC,cAAAA,SAAS,IAAI,MAAM,GAAG,EAAE;IACvC,SAAS,KAAK,GAAG,IAAI,MAAM,QAAQ;GACrC,OAAO,IAAI,IAAI,MAAM,SAAS,OAAO;IACnC,MAAM,SAAS,cAAc,IAAI,MAAM,OAAO,CAAC,CAAC;IAChD,OAAO,QAAQ,OAAO,IAAI;IAC1B,SAAS,KAAK,GAAG,OAAO,QAAQ;GAClC,OACE,cAAA,YAAY,IAAI,KAAK;EAEzB;EACA,OAAO;CACT;CAEA,OAAO;CACP,MAAM,oBAAoB,MAAuB,cAAc,GAAG,CAAC,CAAC;CAEpE,OAAO,QAAQ,SAAS,GAAG,MAAM;EAC/B,MAAM,gBAAgB,MAAM,KAAK,gBAAgB,gBAAgB,QAAQ,OAAO,IAAI;EACpF,MAAM,aAAa,MAAM,OAAO,QAAQ,SAAS,IAAI,KAAK;EAC1D,IAAI,OAAO,MAAM,UACf,OAAO,gBAAgB,IAAI;OACtB,IAAI,SAAS,GAAG;GACrB,OAAO,gBAAgB,EAAE,MAAM;GAC/B,SAAS,KAAK,GAAG,EAAE,QAAQ;EAC7B;CACF,CAAC;CAGD,IAAI,iBAAiB,OAAO,SAAS,SAAS,GAC5C,KAAK,MAAM,EAAE,OAAO,YAAY,OAAO,UACrC,OAAO,KAAKC,6BAAAA,MAAM,OAAO,MAAM;CAKnC,OAAO,SAAS,GAAG,OAAO;CAG1B,KAAK,MAAM,KAAK,OAAO,QACrB,IAAI,EAAE,SAAS,SACb,OAAO,SAAS,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,KAAK,EAAE;MACrC,IAAI,EAAE,SAAS,SACpB,OAAO,oBAAoB,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,KAAK,EAAE;MAChD,IAAI,EAAE,SAAS,WAAW,CAEjC,OAAO,IAAI,EAAE,SAAS,WAAW;EAC/B,MAAM,EAAE,KAAK,MAAM,UAAU,SAAS,cAAc,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;EAC7E,OAAO,wBAAwB,KAAK,OAAOF,6BAAAA,GAAG,EAAE,KAAK;EACrD,SAAS,KAAK,GAAG,IAAI;CACvB,OAAO,IAAI,EAAE,SAAS,SACpB,OAAO,eAAe,GAAG,CAAC;MAE1B,cAAA,YAAY,EAAE,IAAI;CAItB,IAAI,OAAO,WAAW;EACpB,MAAM,QAAQG,iCAAAA,iBAAiB,OAAO,WAAW,MAAM,gBAAgB;EACvE,IAAI,OAAO;GACT,OAAO,YAAY,MAAM;GACzB,SAAS,KAAK,GAAG,MAAM,EAAE;EAC3B;CACF;CAEA,IAAI,OAAO,YAAY,OAAO,SAAS,SAAS,GAC9C,OACE,eACA,OAAO,SAAS,KAAK,OAAQ,gBAAgB,KAAK,GAAG,aAAaD,6BAAAA,MAAM,GAAG,OAAO,GAAG,MAAM,CAAE,CAAC,CAAC,KAAK,IAAI;CAG5G,IAAI,OAAO,SAAS,SAAS,GAC3B,OAAO,eAAe,OAAO,SAAS,KAAK,OAAOA,6BAAAA,MAAM,GAAG,OAAO,GAAG,MAAM,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,IAAI;CAG1G,IAAI,UAAU,KAAA,GAAW;EACvB,OAAO;EACP,SAAS,KAAK,KAAK;CACrB;CACA,IAAI,WAAW,KAAA,GAAW;EACxB,OAAO;EACP,SAAS,KAAK,MAAM;CACtB;CAEA,OAAO;EAAE;EAAK;CAAS;AACzB;AAEA,SAAS,gBAAgB,QAAyB,SAA8B;CAM9E,OAAO,gBAAgB,CAHrB,GAAG,OAAO,SAAS,KAAK,OAAOA,6BAAAA,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,GACzDA,6BAAAA,MAAM,QAAQ,OAAO,IAAI,CAEE,CAAC,CAAC,KAAK,IAAI,EAAE;AAC5C;;AAGA,SAAgB,YAAY,KAAiE;CAC3F,MAAM,iBAAiB,IAAI,YAAY,eAAe;CACtD,MAAM,eAAe,IAAI,UAAU,KAAK,IAAI,QAAQ,KAAK,MAAMF,6BAAAA,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,KAAK;CACjG,MAAM,SAAS,QAAQ,iBAAiB,IAAI,QAAQ,aAAa;CACjE,IAAI,IAAI,MAAM,SAAS,OACrB,OAAO;EACL,KAAK,GAAG,OAAO,IAAIC,cAAAA,SAAS,IAAI,MAAM,GAAG,EAAE;EAC3C,UAAU,IAAI,MAAM;CACtB;MACK,IAAI,IAAI,MAAM,SAAS,OAAO;EACnC,MAAM,EAAE,KAAK,aAAa,cAAc,IAAI,MAAM,OAAO,CAAC,CAAC;EAC3D,OAAO;GAAE,KAAK,GAAG,OAAO,IAAI,IAAI;GAAI;EAAS;CAC/C,OACE,cAAA,YAAY,IAAI,KAAK;AAEzB;AAEA,MAAM,MAAM,MAAmB,GAAGD,6BAAAA,GAAG,EAAE,KAAK,EAAE,MAAMA,6BAAAA,GAAG,EAAE,KAAK"}

package/build/queries/find/buildFindQuery.d.cts

@@ -0,0 +1,24 @@
+import { ParsedCteClause, ParsedFindQuery } from "./QueryParser.cjs";
+//#region src/queries/find/buildFindQuery.d.ts
+type QuerySettings = {
+  limit?: number;
+  offset?: number;
+};
+/**
+ * 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.
+ */
+declare function buildRawQuery(parsed: ParsedFindQuery, settings: QuerySettings): {
+  sql: string;
+  bindings: readonly any[];
+};
+/** Creates the `WITH alias (...)` SQL for the given `cte`. */
+declare function buildCteSql(cte: ParsedCteClause): {
+  sql: string;
+  bindings: readonly any[];
+};
+//#endregion
+export { buildCteSql, buildRawQuery };
+//# sourceMappingURL=buildFindQuery.d.cts.map

package/build/queries/find/buildFindQuery.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildFindQuery.d.cts","names":[],"sources":["../../../src/queries/find/buildFindQuery.ts"],"mappings":";;KAKK;EAAkB;EAAgB;;;;;;;;iBAQvB,cACd,QAAQ,iBACR,UAAU;EACP;EAAa;;;iBA+HF,YAAY,KAAK;EAAoB;EAAa"}

package/build/queries/find/buildFindQuery.d.mts

@@ -0,0 +1,24 @@
+import { ParsedCteClause, ParsedFindQuery } from "./QueryParser.mjs";
+//#region src/queries/find/buildFindQuery.d.ts
+type QuerySettings = {
+  limit?: number;
+  offset?: number;
+};
+/**
+ * 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.
+ */
+declare function buildRawQuery(parsed: ParsedFindQuery, settings: QuerySettings): {
+  sql: string;
+  bindings: readonly any[];
+};
+/** Creates the `WITH alias (...)` SQL for the given `cte`. */
+declare function buildCteSql(cte: ParsedCteClause): {
+  sql: string;
+  bindings: readonly any[];
+};
+//#endregion
+export { buildCteSql, buildRawQuery };
+//# sourceMappingURL=buildFindQuery.d.mts.map

package/build/queries/find/buildFindQuery.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildFindQuery.d.mts","names":[],"sources":["../../../src/queries/find/buildFindQuery.ts"],"mappings":";;KAKK;EAAkB;EAAgB;;;;;;;;iBAQvB,cACd,QAAQ,iBACR,UAAU;EACP;EAAa;;;iBA+HF,YAAY,KAAK;EAAoB;EAAa"}

package/build/queries/find/buildFindQuery.js

@@ -0,0 +1,110 @@
+import { kq, kqDot } from "../sql/keywords.js";
+import { assertNever, cleanSql } from "../../utils.js";
+import { buildWhereClause } from "../renderConditions.js";
+//#region src/queries/find/buildFindQuery.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.
+*/
+function buildRawQuery(parsed, settings) {
+	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) {
+	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) => 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) => `${kq(t.table)} AS ${kq(t.alias)}`;
+//#endregion
+export { buildCteSql, buildRawQuery };
+
+//# sourceMappingURL=buildFindQuery.js.map

package/build/queries/find/buildFindQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildFindQuery.js","names":[],"sources":["../../../src/queries/find/buildFindQuery.ts"],"sourcesContent":["import type { ParsedCteClause, ParsedFindQuery, ParsedTable } from \"src/queries/find/QueryParser.ts\";\nimport { buildWhereClause } from \"src/queries/renderConditions.ts\";\nimport { kq, kqDot } from \"src/queries/sql/keywords.ts\";\nimport { assertNever, cleanSql } from \"src/utils.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/queries/find/scopes.cjs

@@ -0,0 +1,301 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_configure = require("../../configure.cjs");
+//#region src/queries/find/scopes.ts
+/**
+* Discriminates an {@link AliasFn} result that is a {@link ScopeJoinFilter} from a bare
+* condition / condition array.
+*
+* A `ScopeJoinFilter` is the only `AliasFn` return that carries both `where` and `conditions`
+* keys; `ExpressionFilter` (`and`/`or`), `ColumnCondition`/`RawCondition` (`kind`), and arrays
+* have neither, so the two-key check is unambiguous.
+*/
+function isScopeJoinFilter(result) {
+	return typeof result === "object" && result !== null && !Array.isArray(result) && "where" in result && "conditions" in result;
+}
+const kOps = Symbol("scopeOps");
+const kResolver = Symbol("scopeResolver");
+const kWithScopeOp = Symbol("scopeWithOp");
+const kResolve = Symbol("scopeResolve");
+/** Creates a per-entity, pre-typed scope function. */
+function newScopeFn(entityType) {
+	const resolver = {
+		entityType,
+		maybeGet: () => require_configure.maybeGetMetadataForType(entityType)?.cstr
+	};
+	function scopeFn(arg) {
+		return newScope(resolver, [toOp(arg)]);
+	}
+	scopeFn.fn = function scopeFn(fn) {
+		return (...args) => newScope(resolver, [toOp(fn(...args))]);
+	};
+	return scopeFn;
+}
+/** Returns true if `value` is one of our scope proxies. */
+function isScope(value) {
+	return typeof value === "function" && kOps in value && kResolver in value;
+}
+/** Resolves a scope proxy into ordered filter fragments plus collapsed settings. */
+function resolveScope(scope) {
+	return asScopeInternalApi(scope)[kResolve]();
+}
+/**
+* Returns true for find filters that select every row of the entity type, i.e. an empty `{}` filter
+* or a scope that resolved to no fragments.
+*
+* Used by `em.findCount` and the count dataloader to short-circuit in-memory delete adjustments, which
+* are only safe when the query has no `where`/`conditions` to evaluate created/deleted entities against.
+*/
+function isSelectAllFilter(where, conditions) {
+	if (conditions !== void 0) return false;
+	if (isScope(where)) return resolveScope(where).fragments.length === 0;
+	return Object.keys(where).length === 0;
+}
+/**
+* Creates an immutable scope proxy with `ops` as its current scope fragments.
+*
+* The proxy target is a function so the proxy is callable (for parameterized refs
+* like `Author.adult.named("a")`); unknown property accesses always record a `ref`
+* op, with validation against the entity constructor deferred until `compile` runs.
+*/
+function newScope(resolver, ops) {
+	const terminals = new ScopeTerminals(resolver, ops);
+	function callable() {}
+	Object.defineProperty(callable, kOps, { value: ops });
+	Object.defineProperty(callable, kResolver, { value: resolver });
+	return new Proxy(callable, {
+		get(target, prop) {
+			if (prop === kOps || prop === kResolver) return Reflect.get(target, prop);
+			if (typeof prop === "symbol" || prop in terminals) {
+				const value = Reflect.get(terminals, prop, terminals);
+				return typeof value === "function" ? value.bind(terminals) : value;
+			}
+			if (prop === "then") return void 0;
+			return newScope(resolver, [...ops, {
+				kind: "ref",
+				name: prop
+			}]);
+		},
+		apply(_target, _thisArg, args) {
+			const lastOp = ops[ops.length - 1];
+			if (lastOp?.kind !== "ref") throw new Error(`Scope is not parameterized`);
+			return newScope(resolver, [...ops.slice(0, -1), {
+				...lastOp,
+				args
+			}]);
+		}
+	});
+}
+/**
+* Concrete builder/terminal methods for a scope proxy.
+*
+* The outer proxy handles dynamic named-scope access like `.popular`; this class handles
+* fixed methods like `.where`, `.find`, and `.toFindArgs`.
+*/
+var ScopeTerminals = class {
+	#ops;
+	#resolver;
+	constructor(resolver, ops) {
+		this.#resolver = resolver;
+		this.#ops = ops;
+	}
+	get [kOps]() {
+		return this.#ops;
+	}
+	/** Flattens our recorded ops (resolving named refs, collapsing settings) into a {@link ResolvedScope}. */
+	[kResolve]() {
+		return resolveScopeOps(this.#resolver, this.#ops);
+	}
+	where(arg) {
+		return this[kWithScopeOp](toOp(arg));
+	}
+	orderBy(orderBy) {
+		return this[kWithScopeOp]({
+			kind: "orderBy",
+			orderBy
+		});
+	}
+	limit(limit) {
+		return this[kWithScopeOp]({
+			kind: "limit",
+			limit
+		});
+	}
+	offset(offset) {
+		return this[kWithScopeOp]({
+			kind: "offset",
+			offset
+		});
+	}
+	softDeletes(value) {
+		return this[kWithScopeOp]({
+			kind: "softDeletes",
+			value
+		});
+	}
+	toFindArgs() {
+		return compile(this.#resolver, this.#ops);
+	}
+	find(em, opts) {
+		const args = compile(this.#resolver, this.#ops);
+		return em.find(resolveCstr(this.#resolver), args.where, toFindOptions(args, opts));
+	}
+	findOne(em, opts) {
+		const args = compile(this.#resolver, this.#ops);
+		return em.findOne(resolveCstr(this.#resolver), args.where, toFindOptions(args, opts));
+	}
+	findOneOrFail(em, opts) {
+		const args = compile(this.#resolver, this.#ops);
+		return em.findOneOrFail(resolveCstr(this.#resolver), args.where, toFindOptions(args, opts));
+	}
+	findCount(em) {
+		const args = compile(this.#resolver, this.#ops);
+		return em.findCount(resolveCstr(this.#resolver), args.where, toCountOptions(args));
+	}
+	findIds(em) {
+		const args = compile(this.#resolver, this.#ops);
+		return em.findIds(resolveCstr(this.#resolver), args.where, toCountOptions(args));
+	}
+	/** Returns a new scope with one more recorded operation. */
+	[kWithScopeOp](op) {
+		return newScope(this.#resolver, [...this.#ops, op]);
+	}
+};
+/** Compiles the ordered scope ops into Joist's existing find args shape. */
+function compile(resolver, ops) {
+	const resolved = resolveScopeOps(resolver, ops);
+	return {
+		where: newScope(resolver, resolved.fragments),
+		orderBy: resolved.orderBys.length ? resolved.orderBys : void 0,
+		limit: resolved.limit,
+		offset: resolved.offset,
+		softDeletes: resolved.softDeletes
+	};
+}
+/** Resolves ordered scope ops into filter fragments and root-only settings. */
+function resolveScopeOps(resolver, ops) {
+	const fragments = [];
+	const orderBys = [];
+	const refArgKeys = /* @__PURE__ */ new WeakMap();
+	const nextRefArgKey = { value: 0 };
+	let limit;
+	let offset;
+	let softDeletes;
+	function expand(currentOps, seen) {
+		for (const op of currentOps) switch (op.kind) {
+			case "alias":
+			case "filter":
+				fragments.push(op);
+				break;
+			case "orderBy":
+				if (Array.isArray(op.orderBy)) orderBys.push(...op.orderBy);
+				else orderBys.push(op.orderBy);
+				break;
+			case "limit":
+				limit = op.limit;
+				break;
+			case "offset":
+				offset = op.offset;
+				break;
+			case "softDeletes":
+				softDeletes = op.value;
+				break;
+			case "ref": {
+				const key = scopeRefKey(op, refArgKeys, nextRefArgKey);
+				if (seen.has(key)) break;
+				seen.add(key);
+				expand(scopeOpsForRef(resolver, op), seen);
+				break;
+			}
+		}
+	}
+	expand(ops, /* @__PURE__ */ new Set());
+	return {
+		fragments,
+		orderBys,
+		limit,
+		offset,
+		softDeletes
+	};
+}
+/** Resolves a recorded named-scope ref to its underlying ops. */
+function scopeOpsForRef(resolver, op) {
+	const sibling = resolveCstr(resolver)[op.name];
+	if (op.args) {
+		if (typeof sibling !== "function" || isScope(sibling)) throw new Error(`Scope ${resolver.entityType}.${op.name} is not parameterized`);
+		return scopeOpsFromValue(resolver, op.name, sibling(...op.args));
+	}
+	return scopeOpsFromValue(resolver, op.name, sibling);
+}
+/** Extracts recorded scope ops from a resolved static field. */
+function scopeOpsFromValue(resolver, name, value) {
+	if (isScope(value)) return asScopeInternalApi(value)[kOps];
+	if (value === void 0) throw new Error(`Invalid scope ${resolver.entityType}.${name}`);
+	if (typeof value === "function") throw new Error(`Scope ${resolver.entityType}.${name} requires arguments`);
+	throw new Error(`${resolver.entityType}.${name} is not a scope`);
+}
+/** Creates a cycle key for named-scope refs without serializing arbitrary entities/functions. */
+function scopeRefKey(op, refArgKeys, nextRefArgKey) {
+	return op.args ? `${op.name}(${op.args.map((arg) => scopeRefArgKey(arg, refArgKeys, nextRefArgKey)).join(",")})` : op.name;
+}
+/** Creates a stable per-resolution key for one named-scope argument. */
+function scopeRefArgKey(arg, refArgKeys, nextRefArgKey) {
+	if (typeof arg === "object" && arg !== null || typeof arg === "function") {
+		let key = refArgKeys.get(arg);
+		if (key === void 0) {
+			key = nextRefArgKey.value;
+			nextRefArgKey.value += 1;
+			refArgKeys.set(arg, key);
+		}
+		return `${typeof arg}:${key}`;
+	}
+	return `${typeof arg}:${JSON.stringify(String(arg))}`;
+}
+/** Narrows a known scope proxy to its internal-only (symbol-keyed) API. */
+function asScopeInternalApi(scope) {
+	if (!isScope(scope)) throw new Error("Invalid scope");
+	return scope;
+}
+/** Resolves the lazy entity constructor. */
+function resolveCstr(resolver) {
+	const cstr = resolver.maybeGet();
+	if (cstr === void 0) throw new Error(`Unknown type ${resolver.entityType}`);
+	return cstr;
+}
+/** Converts a scope declaration argument into a recorded op. */
+function toOp(arg) {
+	return typeof arg === "function" ? {
+		kind: "alias",
+		fn: arg
+	} : {
+		kind: "filter",
+		filter: arg
+	};
+}
+/**
+* Pulls the option half of `FilterAndSettings` back out for `em.find`.
+*
+* The scope's recorded settings are the defaults; terminal `opts` (orderBy/limit/offset/conditions/
+* populate) override. The scope itself carries no `conditions` — it compiles to a `where` scope that
+* `em.find` expands — so the only conditions are the caller's, which flow through the `...opts` spread.
+*/
+function toFindOptions(args, opts) {
+	return {
+		orderBy: args.orderBy,
+		limit: args.limit,
+		offset: args.offset,
+		softDeletes: args.softDeletes,
+		...opts
+	};
+}
+/** Like `toFindOptions`, but drops the `orderBy`/`limit`/`offset` that `findCount`/`findIds` ignore. */
+function toCountOptions(args) {
+	return { softDeletes: args.softDeletes };
+}
+//#endregion
+exports.isScope = isScope;
+exports.isScopeJoinFilter = isScopeJoinFilter;
+exports.isSelectAllFilter = isSelectAllFilter;
+exports.newScopeFn = newScopeFn;
+exports.resolveScope = resolveScope;
+
+//# sourceMappingURL=scopes.cjs.map