joist-core 2.3.0 → 2.4.0-next.2

package/build/queries/find/QueryParser.pruning.cjs

@@ -0,0 +1,115 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_queries_parsedConditions = require("../parsedConditions.cjs");
+const require_queries_find_QueryParser = require("./QueryParser.cjs");
+const require_utils = require("../../utils.cjs");
+//#region src/queries/find/QueryParser.pruning.ts
+function pruneUnusedJoins(parsed, keepAliases) {
+	const dt = new DependencyTracker();
+	const todo = [...parsed.tables];
+	while (todo.length > 0) {
+		const t = todo.pop();
+		if (t.join === "lateral") {
+			dt.addAlias(t.alias, [t.fromAlias]);
+			todo.push(...t.query.tables);
+		} else if (t.join === "cross") dt.markRequired(t.alias);
+		else if (t.join === "primary") dt.markRequired(t.alias);
+		else if (parsed.ctes?.some((cte) => cte.alias === t.table)) {
+			dt.addAlias(t.alias, joinDependencies(t));
+			dt.markRequired(t.alias);
+		} else dt.addAlias(t.alias, joinDependencies(t));
+	}
+	parsed.selects.forEach((s) => {
+		if (typeof s === "string") markSelectAliases(dt, parsed, s);
+		else if ("aliases" in s) {
+			for (const a of s.aliases) dt.markRequired(a);
+			markSelectAliases(dt, parsed, s.sql);
+		}
+	});
+	parsed.orderBys.forEach((o) => dt.markRequired(o.alias));
+	parsed.groupBys?.forEach((g) => {
+		if ("expression" in g) markSelectAliases(dt, parsed, g.expression);
+		else dt.markRequired(g.alias);
+	});
+	keepAliases.forEach((a) => dt.markRequired(a));
+	const todo2 = [{
+		query: parsed,
+		filterPruneable: true
+	}];
+	while (todo2.length > 0) {
+		const { query, filterPruneable } = todo2.pop();
+		require_queries_parsedConditions.deepFindConditions(query.condition, filterPruneable).forEach((c) => {
+			if (c.kind === "column") dt.markRequired(c.alias);
+			else if (c.kind === "raw") for (const alias of c.aliases) dt.markRequired(alias);
+			else if (c.kind === "exists") for (const alias of c.outerAliases) dt.markRequired(alias);
+			else require_utils.assertNever(c);
+		});
+		todo2.push(...query.tables.filter((t) => t.join === "lateral").map((t) => ({
+			query: t.query,
+			filterPruneable: false
+		})));
+	}
+	parsed.tables = parsed.tables.filter((t) => dt.required.has(t.alias));
+	if (parsed.condition && parsed.condition.op === "and") parsed.condition.conditions = parsed.condition.conditions.filter((c) => {
+		if (c.kind === "column") return !(c.pruneable && !dt.required.has(c.alias));
+		else return c;
+	});
+	if (parsed.condition && parsed.condition.conditions.length === 0) parsed.condition = void 0;
+}
+/** Returns the aliases needed to evaluate a join's ON clause, excluding the joined alias itself. */
+function joinDependencies(t) {
+	return [require_queries_find_QueryParser.parseAlias(t.col1), require_queries_find_QueryParser.parseAlias(t.col2)].filter((alias) => alias !== t.alias);
+}
+/** Marks aliases used by select strings, including generated CTI expressions like `COALESCE(st0.col, st1.col)`. */
+function markSelectAliases(dt, parsed, select) {
+	for (const table of parsed.tables) if (selectReferencesAlias(select, table.alias)) dt.markRequired(table.alias);
+}
+/** Returns true if a raw select expression references `alias.column` or the whole-row `alias`. */
+function selectReferencesAlias(select, alias) {
+	return selectReferencesCandidate(select, `${alias}.`) || selectReferencesCandidate(select, `"${alias}".`) || selectReferencesCandidate(select, alias) || selectReferencesCandidate(select, `"${alias}"`);
+}
+/**
+* Returns true when `candidate` is present at a SQL identifier boundary.
+*
+* Scans the select string for literal candidate matches, then verifies the characters before/after the match are not
+* part of a larger identifier or dotted path. I.e. `row_to_json("ap")` matches, but `foo_"ap"` and `foo.ap` do not.
+*/
+function selectReferencesCandidate(select, candidate) {
+	let index = select.indexOf(candidate);
+	const quoted = candidate.startsWith("\"");
+	while (index !== -1) {
+		const previous = select[index - 1];
+		const next = select[index + candidate.length];
+		if ((index === 0 || previous !== "." && !isSqlIdentifierChar(previous)) && !isSqlIdentifierChar(next) && (quoted || previous !== "\"" && next !== "\"")) return true;
+		index = select.indexOf(candidate, index + candidate.length);
+	}
+	return false;
+}
+/** Returns true for characters that can be part of an unquoted SQL identifier. */
+function isSqlIdentifierChar(char) {
+	return char !== void 0 && /[A-Za-z0-9_]/.test(char);
+}
+/** Track join dependencies for `pruneUnusedJoins`. */
+var DependencyTracker = class {
+	nodes = /* @__PURE__ */ new Map();
+	required = /* @__PURE__ */ new Set();
+	addAlias(alias, dependencies = []) {
+		this.nodes.set(alias, dependencies);
+	}
+	markRequired(alias) {
+		const marked = /* @__PURE__ */ new Set();
+		const todo = [alias];
+		while (todo.length > 0) {
+			const alias = todo.pop();
+			if (!marked.has(alias)) {
+				marked.add(alias);
+				todo.push(...this.nodes.get(alias) || []);
+			}
+		}
+		this.required = /* @__PURE__ */ new Set([...this.required, ...marked]);
+	}
+};
+//#endregion
+exports.pruneUnusedJoins = pruneUnusedJoins;
+exports.selectReferencesAlias = selectReferencesAlias;
+
+//# sourceMappingURL=QueryParser.pruning.cjs.map

package/build/queries/find/QueryParser.pruning.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryParser.pruning.cjs","names":["parseAlias"],"sources":["../../../src/queries/find/QueryParser.pruning.ts"],"sourcesContent":["import { type JoinTable, type ParsedFindQuery, parseAlias } from \"src/queries/find/QueryParser.ts\";\nimport { deepFindConditions } from \"src/queries/parsedConditions.ts\";\nimport { assertNever } from \"src/utils.ts\";\n\n// Remove any joins that are not used in the select or conditions\nexport function pruneUnusedJoins(parsed: ParsedFindQuery, keepAliases: string[]): void {\n  const dt = new DependencyTracker();\n\n  // First setup the alias -> alias dependencies...\n  const todo = [...parsed.tables];\n  while (todo.length > 0) {\n    const t = todo.pop()!;\n    if (t.join === \"lateral\") {\n      dt.addAlias(t.alias, [t.fromAlias]);\n      // Recurse into lateral joins...\n      todo.push(...t.query.tables);\n    } else if (t.join === \"cross\") {\n      dt.markRequired(t.alias);\n    } else if (t.join === \"primary\") {\n      dt.markRequired(t.alias);\n    } else if (parsed.ctes?.some((cte) => cte.alias === t.table)) {\n      dt.addAlias(t.alias, joinDependencies(t));\n      dt.markRequired(t.alias);\n    } else {\n      dt.addAlias(t.alias, joinDependencies(t));\n    }\n  }\n\n  // Mark all terminal usages\n  parsed.selects.forEach((s) => {\n    if (typeof s === \"string\") {\n      markSelectAliases(dt, parsed, s);\n    } else if (\"aliases\" in s) {\n      for (const a of s.aliases) dt.markRequired(a);\n      markSelectAliases(dt, parsed, s.sql);\n    }\n  });\n  parsed.orderBys.forEach((o) => dt.markRequired(o.alias));\n  parsed.groupBys?.forEach((g) => {\n    if (\"expression\" in g) {\n      markSelectAliases(dt, parsed, g.expression);\n    } else {\n      dt.markRequired(g.alias);\n    }\n  });\n  keepAliases.forEach((a) => dt.markRequired(a));\n  // Look recursively into CTE & lateral join conditions\n  const todo2 = [{ query: parsed, filterPruneable: true }];\n  while (todo2.length > 0) {\n    const { query, filterPruneable } = todo2.pop()!;\n    deepFindConditions(query.condition, filterPruneable).forEach((c) => {\n      if (c.kind === \"column\") {\n        dt.markRequired(c.alias);\n      } else if (c.kind === \"raw\") {\n        for (const alias of c.aliases) dt.markRequired(alias);\n      } else if (c.kind === \"exists\") {\n        for (const alias of c.outerAliases) dt.markRequired(alias);\n      } else {\n        assertNever(c);\n      }\n    });\n    todo2.push(\n      ...query.tables.filter((t) => t.join === \"lateral\").map((t) => ({ query: t.query, filterPruneable: false })),\n    );\n  }\n\n  // Now remove any unused joins\n  parsed.tables = parsed.tables.filter((t) => dt.required.has(t.alias));\n\n  // And then remove any inline soft-delete conditions we don't need anymore\n  if (parsed.condition && parsed.condition.op === \"and\") {\n    parsed.condition.conditions = parsed.condition.conditions.filter((c) => {\n      if (c.kind === \"column\") {\n        const prune = c.pruneable && !dt.required.has(c.alias);\n        // if (prune) console.log(`DROPPING`, c);\n        return !prune;\n      } else {\n        return c;\n      }\n    });\n  }\n\n  // Remove any `{ and: [...] }`s that are empty; we should probably do this deeply?\n  if (parsed.condition && parsed.condition.conditions.length === 0) {\n    parsed.condition = undefined;\n  }\n}\n\n/** Returns the aliases needed to evaluate a join's ON clause, excluding the joined alias itself. */\nfunction joinDependencies(t: JoinTable): string[] {\n  return [parseAlias(t.col1), parseAlias(t.col2)].filter((alias) => alias !== t.alias);\n}\n\n/** Marks aliases used by select strings, including generated CTI expressions like `COALESCE(st0.col, st1.col)`. */\nfunction markSelectAliases(dt: DependencyTracker, parsed: ParsedFindQuery, select: string): void {\n  for (const table of parsed.tables) {\n    if (selectReferencesAlias(select, table.alias)) {\n      dt.markRequired(table.alias);\n    }\n  }\n}\n\n/** Returns true if a raw select expression references `alias.column` or the whole-row `alias`. */\nexport function selectReferencesAlias(select: string, alias: string): boolean {\n  // Most selects are simple `a.*`, but CTI adds expressions like\n  // `COALESCE(p_s0.shared_column, p_s1.shared_column) as shared_column`.\n  // Those expressions must keep the subtype joins, but `parseAlias` only sees\n  // the leading function name. Instead of parsing SQL, scan for the only alias\n  // forms Joist generates in selects: `alias.column`, `\"alias\".column`, and whole-row aliases.\n  return (\n    selectReferencesCandidate(select, `${alias}.`) ||\n    selectReferencesCandidate(select, `\"${alias}\".`) ||\n    selectReferencesCandidate(select, alias) ||\n    selectReferencesCandidate(select, `\"${alias}\"`)\n  );\n}\n\n/**\n * Returns true when `candidate` is present at a SQL identifier boundary.\n *\n * Scans the select string for literal candidate matches, then verifies the characters before/after the match are not\n * part of a larger identifier or dotted path. I.e. `row_to_json(\"ap\")` matches, but `foo_\"ap\"` and `foo.ap` do not.\n */\nfunction selectReferencesCandidate(select: string, candidate: string): boolean {\n  let index = select.indexOf(candidate);\n  const quoted = candidate.startsWith('\"');\n  while (index !== -1) {\n    // Each loop inspects one literal occurrence of `candidate`, then either accepts it as a real alias reference or\n    // advances to the next occurrence if the surrounding characters show it is part of a larger token.\n    // Avoid treating `foo.a.id` as a reference to `a`; Joist-generated aliases\n    // appear at the start of an expression or after punctuation/whitespace.\n    const previous = select[index - 1];\n    const next = select[index + candidate.length];\n    if (\n      (index === 0 || (previous !== \".\" && !isSqlIdentifierChar(previous))) &&\n      !isSqlIdentifierChar(next) &&\n      (quoted || (previous !== '\"' && next !== '\"'))\n    ) {\n      return true;\n    }\n    // Continue scanning after the current occurrence; `indexOf` returns -1 once there are no more candidates.\n    index = select.indexOf(candidate, index + candidate.length);\n  }\n  return false;\n}\n\n/** Returns true for characters that can be part of an unquoted SQL identifier. */\nfunction isSqlIdentifierChar(char: string | undefined): boolean {\n  return char !== undefined && /[A-Za-z0-9_]/.test(char);\n}\n\n/** Track join dependencies for `pruneUnusedJoins`. */\nclass DependencyTracker {\n  private nodes: Map<string, string[]> = new Map();\n  required: Set<string> = new Set();\n\n  addAlias(alias: string, dependencies: string[] = []): void {\n    this.nodes.set(alias, dependencies);\n  }\n\n  markRequired(alias: string): void {\n    const marked = new Set<string>();\n    const todo = [alias];\n    while (todo.length > 0) {\n      const alias = todo.pop()!;\n      if (!marked.has(alias)) {\n        marked.add(alias);\n        todo.push(...(this.nodes.get(alias) || []));\n      }\n    }\n    this.required = new Set([...this.required, ...marked]);\n  }\n}\n"],"mappings":"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"}

package/build/queries/find/QueryParser.pruning.d.cts

@@ -0,0 +1,8 @@
+import { ParsedFindQuery } from "./QueryParser.cjs";
+//#region src/queries/find/QueryParser.pruning.d.ts
+declare function pruneUnusedJoins(parsed: ParsedFindQuery, keepAliases: string[]): void;
+/** Returns true if a raw select expression references `alias.column` or the whole-row `alias`. */
+declare function selectReferencesAlias(select: string, alias: string): boolean;
+//#endregion
+export { pruneUnusedJoins, selectReferencesAlias };
+//# sourceMappingURL=QueryParser.pruning.d.cts.map

package/build/queries/find/QueryParser.pruning.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryParser.pruning.d.cts","names":[],"sources":["../../../src/queries/find/QueryParser.pruning.ts"],"mappings":";;iBAKgB,iBAAiB,QAAQ,iBAAiB;;iBAkG1C,sBAAsB,gBAAgB"}

package/build/queries/find/QueryParser.pruning.d.mts

@@ -0,0 +1,8 @@
+import { ParsedFindQuery } from "./QueryParser.mjs";
+//#region src/queries/find/QueryParser.pruning.d.ts
+declare function pruneUnusedJoins(parsed: ParsedFindQuery, keepAliases: string[]): void;
+/** Returns true if a raw select expression references `alias.column` or the whole-row `alias`. */
+declare function selectReferencesAlias(select: string, alias: string): boolean;
+//#endregion
+export { pruneUnusedJoins, selectReferencesAlias };
+//# sourceMappingURL=QueryParser.pruning.d.mts.map

package/build/queries/find/QueryParser.pruning.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryParser.pruning.d.mts","names":[],"sources":["../../../src/queries/find/QueryParser.pruning.ts"],"mappings":";;iBAKgB,iBAAiB,QAAQ,iBAAiB;;iBAkG1C,sBAAsB,gBAAgB"}

package/build/queries/find/QueryParser.pruning.js

@@ -0,0 +1,113 @@
+import { deepFindConditions } from "../parsedConditions.js";
+import { parseAlias } from "./QueryParser.js";
+import { assertNever } from "../../utils.js";
+//#region src/queries/find/QueryParser.pruning.ts
+function pruneUnusedJoins(parsed, keepAliases) {
+	const dt = new DependencyTracker();
+	const todo = [...parsed.tables];
+	while (todo.length > 0) {
+		const t = todo.pop();
+		if (t.join === "lateral") {
+			dt.addAlias(t.alias, [t.fromAlias]);
+			todo.push(...t.query.tables);
+		} else if (t.join === "cross") dt.markRequired(t.alias);
+		else if (t.join === "primary") dt.markRequired(t.alias);
+		else if (parsed.ctes?.some((cte) => cte.alias === t.table)) {
+			dt.addAlias(t.alias, joinDependencies(t));
+			dt.markRequired(t.alias);
+		} else dt.addAlias(t.alias, joinDependencies(t));
+	}
+	parsed.selects.forEach((s) => {
+		if (typeof s === "string") markSelectAliases(dt, parsed, s);
+		else if ("aliases" in s) {
+			for (const a of s.aliases) dt.markRequired(a);
+			markSelectAliases(dt, parsed, s.sql);
+		}
+	});
+	parsed.orderBys.forEach((o) => dt.markRequired(o.alias));
+	parsed.groupBys?.forEach((g) => {
+		if ("expression" in g) markSelectAliases(dt, parsed, g.expression);
+		else dt.markRequired(g.alias);
+	});
+	keepAliases.forEach((a) => dt.markRequired(a));
+	const todo2 = [{
+		query: parsed,
+		filterPruneable: true
+	}];
+	while (todo2.length > 0) {
+		const { query, filterPruneable } = todo2.pop();
+		deepFindConditions(query.condition, filterPruneable).forEach((c) => {
+			if (c.kind === "column") dt.markRequired(c.alias);
+			else if (c.kind === "raw") for (const alias of c.aliases) dt.markRequired(alias);
+			else if (c.kind === "exists") for (const alias of c.outerAliases) dt.markRequired(alias);
+			else assertNever(c);
+		});
+		todo2.push(...query.tables.filter((t) => t.join === "lateral").map((t) => ({
+			query: t.query,
+			filterPruneable: false
+		})));
+	}
+	parsed.tables = parsed.tables.filter((t) => dt.required.has(t.alias));
+	if (parsed.condition && parsed.condition.op === "and") parsed.condition.conditions = parsed.condition.conditions.filter((c) => {
+		if (c.kind === "column") return !(c.pruneable && !dt.required.has(c.alias));
+		else return c;
+	});
+	if (parsed.condition && parsed.condition.conditions.length === 0) parsed.condition = void 0;
+}
+/** Returns the aliases needed to evaluate a join's ON clause, excluding the joined alias itself. */
+function joinDependencies(t) {
+	return [parseAlias(t.col1), parseAlias(t.col2)].filter((alias) => alias !== t.alias);
+}
+/** Marks aliases used by select strings, including generated CTI expressions like `COALESCE(st0.col, st1.col)`. */
+function markSelectAliases(dt, parsed, select) {
+	for (const table of parsed.tables) if (selectReferencesAlias(select, table.alias)) dt.markRequired(table.alias);
+}
+/** Returns true if a raw select expression references `alias.column` or the whole-row `alias`. */
+function selectReferencesAlias(select, alias) {
+	return selectReferencesCandidate(select, `${alias}.`) || selectReferencesCandidate(select, `"${alias}".`) || selectReferencesCandidate(select, alias) || selectReferencesCandidate(select, `"${alias}"`);
+}
+/**
+* Returns true when `candidate` is present at a SQL identifier boundary.
+*
+* Scans the select string for literal candidate matches, then verifies the characters before/after the match are not
+* part of a larger identifier or dotted path. I.e. `row_to_json("ap")` matches, but `foo_"ap"` and `foo.ap` do not.
+*/
+function selectReferencesCandidate(select, candidate) {
+	let index = select.indexOf(candidate);
+	const quoted = candidate.startsWith("\"");
+	while (index !== -1) {
+		const previous = select[index - 1];
+		const next = select[index + candidate.length];
+		if ((index === 0 || previous !== "." && !isSqlIdentifierChar(previous)) && !isSqlIdentifierChar(next) && (quoted || previous !== "\"" && next !== "\"")) return true;
+		index = select.indexOf(candidate, index + candidate.length);
+	}
+	return false;
+}
+/** Returns true for characters that can be part of an unquoted SQL identifier. */
+function isSqlIdentifierChar(char) {
+	return char !== void 0 && /[A-Za-z0-9_]/.test(char);
+}
+/** Track join dependencies for `pruneUnusedJoins`. */
+var DependencyTracker = class {
+	nodes = /* @__PURE__ */ new Map();
+	required = /* @__PURE__ */ new Set();
+	addAlias(alias, dependencies = []) {
+		this.nodes.set(alias, dependencies);
+	}
+	markRequired(alias) {
+		const marked = /* @__PURE__ */ new Set();
+		const todo = [alias];
+		while (todo.length > 0) {
+			const alias = todo.pop();
+			if (!marked.has(alias)) {
+				marked.add(alias);
+				todo.push(...this.nodes.get(alias) || []);
+			}
+		}
+		this.required = /* @__PURE__ */ new Set([...this.required, ...marked]);
+	}
+};
+//#endregion
+export { pruneUnusedJoins, selectReferencesAlias };
+
+//# sourceMappingURL=QueryParser.pruning.js.map

package/build/queries/find/QueryParser.pruning.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryParser.pruning.js","names":[],"sources":["../../../src/queries/find/QueryParser.pruning.ts"],"sourcesContent":["import { type JoinTable, type ParsedFindQuery, parseAlias } from \"src/queries/find/QueryParser.ts\";\nimport { deepFindConditions } from \"src/queries/parsedConditions.ts\";\nimport { assertNever } from \"src/utils.ts\";\n\n// Remove any joins that are not used in the select or conditions\nexport function pruneUnusedJoins(parsed: ParsedFindQuery, keepAliases: string[]): void {\n  const dt = new DependencyTracker();\n\n  // First setup the alias -> alias dependencies...\n  const todo = [...parsed.tables];\n  while (todo.length > 0) {\n    const t = todo.pop()!;\n    if (t.join === \"lateral\") {\n      dt.addAlias(t.alias, [t.fromAlias]);\n      // Recurse into lateral joins...\n      todo.push(...t.query.tables);\n    } else if (t.join === \"cross\") {\n      dt.markRequired(t.alias);\n    } else if (t.join === \"primary\") {\n      dt.markRequired(t.alias);\n    } else if (parsed.ctes?.some((cte) => cte.alias === t.table)) {\n      dt.addAlias(t.alias, joinDependencies(t));\n      dt.markRequired(t.alias);\n    } else {\n      dt.addAlias(t.alias, joinDependencies(t));\n    }\n  }\n\n  // Mark all terminal usages\n  parsed.selects.forEach((s) => {\n    if (typeof s === \"string\") {\n      markSelectAliases(dt, parsed, s);\n    } else if (\"aliases\" in s) {\n      for (const a of s.aliases) dt.markRequired(a);\n      markSelectAliases(dt, parsed, s.sql);\n    }\n  });\n  parsed.orderBys.forEach((o) => dt.markRequired(o.alias));\n  parsed.groupBys?.forEach((g) => {\n    if (\"expression\" in g) {\n      markSelectAliases(dt, parsed, g.expression);\n    } else {\n      dt.markRequired(g.alias);\n    }\n  });\n  keepAliases.forEach((a) => dt.markRequired(a));\n  // Look recursively into CTE & lateral join conditions\n  const todo2 = [{ query: parsed, filterPruneable: true }];\n  while (todo2.length > 0) {\n    const { query, filterPruneable } = todo2.pop()!;\n    deepFindConditions(query.condition, filterPruneable).forEach((c) => {\n      if (c.kind === \"column\") {\n        dt.markRequired(c.alias);\n      } else if (c.kind === \"raw\") {\n        for (const alias of c.aliases) dt.markRequired(alias);\n      } else if (c.kind === \"exists\") {\n        for (const alias of c.outerAliases) dt.markRequired(alias);\n      } else {\n        assertNever(c);\n      }\n    });\n    todo2.push(\n      ...query.tables.filter((t) => t.join === \"lateral\").map((t) => ({ query: t.query, filterPruneable: false })),\n    );\n  }\n\n  // Now remove any unused joins\n  parsed.tables = parsed.tables.filter((t) => dt.required.has(t.alias));\n\n  // And then remove any inline soft-delete conditions we don't need anymore\n  if (parsed.condition && parsed.condition.op === \"and\") {\n    parsed.condition.conditions = parsed.condition.conditions.filter((c) => {\n      if (c.kind === \"column\") {\n        const prune = c.pruneable && !dt.required.has(c.alias);\n        // if (prune) console.log(`DROPPING`, c);\n        return !prune;\n      } else {\n        return c;\n      }\n    });\n  }\n\n  // Remove any `{ and: [...] }`s that are empty; we should probably do this deeply?\n  if (parsed.condition && parsed.condition.conditions.length === 0) {\n    parsed.condition = undefined;\n  }\n}\n\n/** Returns the aliases needed to evaluate a join's ON clause, excluding the joined alias itself. */\nfunction joinDependencies(t: JoinTable): string[] {\n  return [parseAlias(t.col1), parseAlias(t.col2)].filter((alias) => alias !== t.alias);\n}\n\n/** Marks aliases used by select strings, including generated CTI expressions like `COALESCE(st0.col, st1.col)`. */\nfunction markSelectAliases(dt: DependencyTracker, parsed: ParsedFindQuery, select: string): void {\n  for (const table of parsed.tables) {\n    if (selectReferencesAlias(select, table.alias)) {\n      dt.markRequired(table.alias);\n    }\n  }\n}\n\n/** Returns true if a raw select expression references `alias.column` or the whole-row `alias`. */\nexport function selectReferencesAlias(select: string, alias: string): boolean {\n  // Most selects are simple `a.*`, but CTI adds expressions like\n  // `COALESCE(p_s0.shared_column, p_s1.shared_column) as shared_column`.\n  // Those expressions must keep the subtype joins, but `parseAlias` only sees\n  // the leading function name. Instead of parsing SQL, scan for the only alias\n  // forms Joist generates in selects: `alias.column`, `\"alias\".column`, and whole-row aliases.\n  return (\n    selectReferencesCandidate(select, `${alias}.`) ||\n    selectReferencesCandidate(select, `\"${alias}\".`) ||\n    selectReferencesCandidate(select, alias) ||\n    selectReferencesCandidate(select, `\"${alias}\"`)\n  );\n}\n\n/**\n * Returns true when `candidate` is present at a SQL identifier boundary.\n *\n * Scans the select string for literal candidate matches, then verifies the characters before/after the match are not\n * part of a larger identifier or dotted path. I.e. `row_to_json(\"ap\")` matches, but `foo_\"ap\"` and `foo.ap` do not.\n */\nfunction selectReferencesCandidate(select: string, candidate: string): boolean {\n  let index = select.indexOf(candidate);\n  const quoted = candidate.startsWith('\"');\n  while (index !== -1) {\n    // Each loop inspects one literal occurrence of `candidate`, then either accepts it as a real alias reference or\n    // advances to the next occurrence if the surrounding characters show it is part of a larger token.\n    // Avoid treating `foo.a.id` as a reference to `a`; Joist-generated aliases\n    // appear at the start of an expression or after punctuation/whitespace.\n    const previous = select[index - 1];\n    const next = select[index + candidate.length];\n    if (\n      (index === 0 || (previous !== \".\" && !isSqlIdentifierChar(previous))) &&\n      !isSqlIdentifierChar(next) &&\n      (quoted || (previous !== '\"' && next !== '\"'))\n    ) {\n      return true;\n    }\n    // Continue scanning after the current occurrence; `indexOf` returns -1 once there are no more candidates.\n    index = select.indexOf(candidate, index + candidate.length);\n  }\n  return false;\n}\n\n/** Returns true for characters that can be part of an unquoted SQL identifier. */\nfunction isSqlIdentifierChar(char: string | undefined): boolean {\n  return char !== undefined && /[A-Za-z0-9_]/.test(char);\n}\n\n/** Track join dependencies for `pruneUnusedJoins`. */\nclass DependencyTracker {\n  private nodes: Map<string, string[]> = new Map();\n  required: Set<string> = new Set();\n\n  addAlias(alias: string, dependencies: string[] = []): void {\n    this.nodes.set(alias, dependencies);\n  }\n\n  markRequired(alias: string): void {\n    const marked = new Set<string>();\n    const todo = [alias];\n    while (todo.length > 0) {\n      const alias = todo.pop()!;\n      if (!marked.has(alias)) {\n        marked.add(alias);\n        todo.push(...(this.nodes.get(alias) || []));\n      }\n    }\n    this.required = new Set([...this.required, ...marked]);\n  }\n}\n"],"mappings":"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"}

package/build/queries/find/QueryVisitor.cjs

@@ -0,0 +1,77 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_utils = require("../../utils.cjs");
+//#region src/queries/find/QueryVisitor.ts
+/**
+* Visits the nested conditions within `query`.
+*
+* If the visitors return a new condition or expression, the returned expression
+* will replace the original one at that location in the expression.
+*
+* If the visitor returns null, the condition or expression will be removed from the tree.
+*/
+function visitConditions(query, visitor) {
+	const todo = [query];
+	while (todo.length > 0) {
+		const query = todo.pop();
+		if (query.condition) visitFilter(query.condition, visitor);
+		for (const table of query.tables) if (table.join === "lateral") todo.push(table.query);
+		if (query.condition) visitExistsSubqueries(query.condition, todo);
+	}
+}
+/** Returns whether a parsed query contains a condition tree that cannot match any database row. */
+function isQueryProvablyEmpty(query) {
+	return query.condition ? isConditionProvablyFalse(query.condition) : false;
+}
+/** Finds ExistsCondition nodes in a condition tree and pushes their subqueries onto the todo list. */
+function visitExistsSubqueries(condition, todo) {
+	if (condition.kind === "exp") for (const c of condition.conditions) visitExistsSubqueries(c, todo);
+	else if (condition.kind === "exists") todo.push(condition.subquery);
+}
+function visitFilter(pc, visitor) {
+	if (pc.kind === "exp") {
+		const toRemove = /* @__PURE__ */ new Set();
+		pc.conditions.forEach((c, i) => {
+			if (c.kind === "column") {
+				const result = visitor.visitCond(c);
+				if (result === null) toRemove.add(i);
+				else if (result) pc.conditions[i] = result;
+			} else if (c.kind === "exp") {
+				const result = visitor.visitExp?.(c);
+				if (result === null) {
+					toRemove.add(i);
+					return;
+				} else if (result) pc.conditions[i] = result;
+				visitFilter(result ?? c, visitor);
+			} else if (c.kind === "raw") {
+				const result = visitor.visitRaw?.(c);
+				if (result === null) toRemove.add(i);
+				else if (result) pc.conditions[i] = result;
+			} else if (c.kind === "exists") {} else require_utils.assertNever(c);
+		});
+		if (toRemove.size > 0) pc.conditions = pc.conditions.filter((_, i) => !toRemove.has(i));
+	} else if (pc.kind === "column") {
+		const result = visitor.visitCond(pc);
+		if (result || result === null) throw new Error("ParsedExpressionCondition overload not support mutating the condition");
+	} else if (pc.kind === "raw") {
+		const result = visitor.visitRaw?.(pc);
+		if (result || result === null) throw new Error("ParsedExpressionCondition overload not support mutating the condition");
+	} else if (pc.kind === "exists") {} else require_utils.assertNever(pc);
+}
+/** Evaluates only conditions whose false result can be proven without querying the database. */
+function isConditionProvablyFalse(condition) {
+	switch (condition.kind) {
+		case "column": return condition.cond.kind === "in" && condition.cond.value.length === 0;
+		case "exp":
+			if (condition.conditions.length === 0) return false;
+			return condition.op === "and" ? condition.conditions.some(isConditionProvablyFalse) : condition.conditions.every(isConditionProvablyFalse);
+		case "exists": return !condition.negate && isQueryProvablyEmpty(condition.subquery);
+		case "raw": return false;
+		default: return require_utils.assertNever(condition);
+	}
+}
+//#endregion
+exports.isQueryProvablyEmpty = isQueryProvablyEmpty;
+exports.visitConditions = visitConditions;
+exports.visitFilter = visitFilter;
+
+//# sourceMappingURL=QueryVisitor.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryVisitor.cjs","names":["assertNever"],"sources":["../../../src/queries/find/QueryVisitor.ts"],"sourcesContent":["import type { ParsedFindQuery } from \"src/queries/find/QueryParser.ts\";\nimport type {\n  ColumnCondition,\n  ParsedExpressionCondition,\n  ParsedExpressionFilter,\n  RawCondition,\n} from \"src/queries/parsedConditions.ts\";\nimport { assertNever } from \"src/utils.ts\";\n\n/** A generic visitor over the simple & complex conditions of a query. */\ninterface Visitor {\n  visitExp?(c: ParsedExpressionFilter): ParsedExpressionFilter | void;\n  visitRaw?(c: RawCondition): RawCondition | ParsedExpressionFilter | void;\n  visitCond(c: ColumnCondition): ColumnCondition | ParsedExpressionFilter | RawCondition | null | void;\n}\n\n/**\n * Visits the nested conditions within `query`.\n *\n * If the visitors return a new condition or expression, the returned expression\n * will replace the original one at that location in the expression.\n *\n * If the visitor returns null, the condition or expression will be removed from the tree.\n */\nexport function visitConditions(query: ParsedFindQuery, visitor: Visitor): void {\n  const todo = [query];\n  while (todo.length > 0) {\n    const query = todo.pop()!;\n    if (query.condition) visitFilter(query.condition, visitor);\n    // Recurse into lateral subqueries (used by batching/preloading, not EXISTS rewrite)\n    for (const table of query.tables) {\n      if (table.join === \"lateral\") {\n        todo.push(table.query);\n      }\n    }\n    // Recurse into EXISTS subqueries so batching visitors can rewrite conditions inside them\n    if (query.condition) {\n      visitExistsSubqueries(query.condition, todo);\n    }\n  }\n}\n\n/** Returns whether a parsed query contains a condition tree that cannot match any database row. */\nexport function isQueryProvablyEmpty(query: ParsedFindQuery): boolean {\n  return query.condition ? isConditionProvablyFalse(query.condition) : false;\n}\n\n/** Finds ExistsCondition nodes in a condition tree and pushes their subqueries onto the todo list. */\nfunction visitExistsSubqueries(condition: ParsedExpressionCondition, todo: ParsedFindQuery[]): void {\n  if (condition.kind === \"exp\") {\n    for (const c of condition.conditions) {\n      visitExistsSubqueries(c, todo);\n    }\n  } else if (condition.kind === \"exists\") {\n    todo.push(condition.subquery);\n  }\n}\n\nexport function visitFilter(pc: ParsedExpressionCondition, visitor: Visitor) {\n  if (pc.kind === \"exp\") {\n    const toRemove = new Set<number>();\n    pc.conditions.forEach((c, i) => {\n      if (c.kind === \"column\") {\n        const result = visitor.visitCond(c);\n        if (result === null) {\n          toRemove.add(i);\n        } else if (result) {\n          pc.conditions[i] = result;\n        }\n      } else if (c.kind === \"exp\") {\n        const result = visitor.visitExp?.(c);\n        if (result === null) {\n          toRemove.add(i);\n          return;\n        } else if (result) {\n          pc.conditions[i] = result;\n        }\n        visitFilter(result ?? c, visitor);\n      } else if (c.kind === \"raw\") {\n        const result = visitor.visitRaw?.(c);\n        if (result === null) {\n          toRemove.add(i);\n        } else if (result) {\n          pc.conditions[i] = result;\n        }\n      } else if (c.kind === \"exists\") {\n        // EXISTS conditions are visited via visitExistsSubqueries, not inline\n      } else {\n        assertNever(c);\n      }\n    });\n    // do this after visiting the children, so we can do it in one pass and don't mess up the indices\n    if (toRemove.size > 0) pc.conditions = pc.conditions.filter((_, i) => !toRemove.has(i));\n  } else if (pc.kind === \"column\") {\n    const result = visitor.visitCond(pc);\n    if (result || result === null) {\n      throw new Error(\"ParsedExpressionCondition overload not support mutating the condition\");\n    }\n  } else if (pc.kind === \"raw\") {\n    const result = visitor.visitRaw?.(pc);\n    if (result || result === null) {\n      throw new Error(\"ParsedExpressionCondition overload not support mutating the condition\");\n    }\n  } else if (pc.kind === \"exists\") {\n    // EXISTS conditions are handled at the query level\n  } else {\n    assertNever(pc);\n  }\n}\n\n/** Evaluates only conditions whose false result can be proven without querying the database. */\nfunction isConditionProvablyFalse(condition: ParsedExpressionCondition): boolean {\n  switch (condition.kind) {\n    case \"column\":\n      return condition.cond.kind === \"in\" && condition.cond.value.length === 0;\n    case \"exp\":\n      // Pruning can leave an empty group, which buildWhereClause drops as no predicate instead of rendering as FALSE.\n      if (condition.conditions.length === 0) return false;\n      return condition.op === \"and\"\n        ? condition.conditions.some(isConditionProvablyFalse)\n        : condition.conditions.every(isConditionProvablyFalse);\n    case \"exists\":\n      return !condition.negate && isQueryProvablyEmpty(condition.subquery);\n    case \"raw\":\n      return false;\n    default:\n      return assertNever(condition);\n  }\n}\n"],"mappings":";;;;;;;;;;;AAwBA,SAAgB,gBAAgB,OAAwB,SAAwB;CAC9E,MAAM,OAAO,CAAC,KAAK;CACnB,OAAO,KAAK,SAAS,GAAG;EACtB,MAAM,QAAQ,KAAK,IAAI;EACvB,IAAI,MAAM,WAAW,YAAY,MAAM,WAAW,OAAO;EAEzD,KAAK,MAAM,SAAS,MAAM,QACxB,IAAI,MAAM,SAAS,WACjB,KAAK,KAAK,MAAM,KAAK;EAIzB,IAAI,MAAM,WACR,sBAAsB,MAAM,WAAW,IAAI;CAE/C;AACF;;AAGA,SAAgB,qBAAqB,OAAiC;CACpE,OAAO,MAAM,YAAY,yBAAyB,MAAM,SAAS,IAAI;AACvE;;AAGA,SAAS,sBAAsB,WAAsC,MAA+B;CAClG,IAAI,UAAU,SAAS,OACrB,KAAK,MAAM,KAAK,UAAU,YACxB,sBAAsB,GAAG,IAAI;MAE1B,IAAI,UAAU,SAAS,UAC5B,KAAK,KAAK,UAAU,QAAQ;AAEhC;AAEA,SAAgB,YAAY,IAA+B,SAAkB;CAC3E,IAAI,GAAG,SAAS,OAAO;EACrB,MAAM,2BAAW,IAAI,IAAY;EACjC,GAAG,WAAW,SAAS,GAAG,MAAM;GAC9B,IAAI,EAAE,SAAS,UAAU;IACvB,MAAM,SAAS,QAAQ,UAAU,CAAC;IAClC,IAAI,WAAW,MACb,SAAS,IAAI,CAAC;SACT,IAAI,QACT,GAAG,WAAW,KAAK;GAEvB,OAAO,IAAI,EAAE,SAAS,OAAO;IAC3B,MAAM,SAAS,QAAQ,WAAW,CAAC;IACnC,IAAI,WAAW,MAAM;KACnB,SAAS,IAAI,CAAC;KACd;IACF,OAAO,IAAI,QACT,GAAG,WAAW,KAAK;IAErB,YAAY,UAAU,GAAG,OAAO;GAClC,OAAO,IAAI,EAAE,SAAS,OAAO;IAC3B,MAAM,SAAS,QAAQ,WAAW,CAAC;IACnC,IAAI,WAAW,MACb,SAAS,IAAI,CAAC;SACT,IAAI,QACT,GAAG,WAAW,KAAK;GAEvB,OAAO,IAAI,EAAE,SAAS,UAAU,CAEhC,OACE,cAAA,YAAY,CAAC;EAEjB,CAAC;EAED,IAAI,SAAS,OAAO,GAAG,GAAG,aAAa,GAAG,WAAW,QAAQ,GAAG,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;CACxF,OAAO,IAAI,GAAG,SAAS,UAAU;EAC/B,MAAM,SAAS,QAAQ,UAAU,EAAE;EACnC,IAAI,UAAU,WAAW,MACvB,MAAM,IAAI,MAAM,uEAAuE;CAE3F,OAAO,IAAI,GAAG,SAAS,OAAO;EAC5B,MAAM,SAAS,QAAQ,WAAW,EAAE;EACpC,IAAI,UAAU,WAAW,MACvB,MAAM,IAAI,MAAM,uEAAuE;CAE3F,OAAO,IAAI,GAAG,SAAS,UAAU,CAEjC,OACE,cAAA,YAAY,EAAE;AAElB;;AAGA,SAAS,yBAAyB,WAA+C;CAC/E,QAAQ,UAAU,MAAlB;EACE,KAAK,UACH,OAAO,UAAU,KAAK,SAAS,QAAQ,UAAU,KAAK,MAAM,WAAW;EACzE,KAAK;GAEH,IAAI,UAAU,WAAW,WAAW,GAAG,OAAO;GAC9C,OAAO,UAAU,OAAO,QACpB,UAAU,WAAW,KAAK,wBAAwB,IAClD,UAAU,WAAW,MAAM,wBAAwB;EACzD,KAAK,UACH,OAAO,CAAC,UAAU,UAAU,qBAAqB,UAAU,QAAQ;EACrE,KAAK,OACH,OAAO;EACT,SACE,OAAOA,cAAAA,YAAY,SAAS;CAChC;AACF"}

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

@@ -0,0 +1,24 @@
+import { ParsedFindQuery } from "./QueryParser.cjs";
+import { ColumnCondition, ParsedExpressionCondition, ParsedExpressionFilter, RawCondition } from "../parsedConditions.cjs";
+//#region src/queries/find/QueryVisitor.d.ts
+/** A generic visitor over the simple & complex conditions of a query. */
+interface Visitor {
+  visitExp?(c: ParsedExpressionFilter): ParsedExpressionFilter | void;
+  visitRaw?(c: RawCondition): RawCondition | ParsedExpressionFilter | void;
+  visitCond(c: ColumnCondition): ColumnCondition | ParsedExpressionFilter | RawCondition | null | void;
+}
+/**
+ * Visits the nested conditions within `query`.
+ *
+ * If the visitors return a new condition or expression, the returned expression
+ * will replace the original one at that location in the expression.
+ *
+ * If the visitor returns null, the condition or expression will be removed from the tree.
+ */
+declare function visitConditions(query: ParsedFindQuery, visitor: Visitor): void;
+/** Returns whether a parsed query contains a condition tree that cannot match any database row. */
+declare function isQueryProvablyEmpty(query: ParsedFindQuery): boolean;
+declare function visitFilter(pc: ParsedExpressionCondition, visitor: Visitor): void;
+//#endregion
+export { isQueryProvablyEmpty, visitConditions, visitFilter };
+//# sourceMappingURL=QueryVisitor.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryVisitor.d.cts","names":[],"sources":["../../../src/queries/find/QueryVisitor.ts"],"mappings":";;;;UAUU;EACR,UAAU,GAAG,yBAAyB;EACtC,UAAU,GAAG,eAAe,eAAe;EAC3C,UAAU,GAAG,kBAAkB,kBAAkB,yBAAyB;;;;;;;;;;iBAW5D,gBAAgB,OAAO,iBAAiB,SAAS;;iBAmBjD,qBAAqB,OAAO;iBAe5B,YAAY,IAAI,2BAA2B,SAAS"}

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

@@ -0,0 +1,24 @@
+import { ParsedFindQuery } from "./QueryParser.mjs";
+import { ColumnCondition, ParsedExpressionCondition, ParsedExpressionFilter, RawCondition } from "../parsedConditions.mjs";
+//#region src/queries/find/QueryVisitor.d.ts
+/** A generic visitor over the simple & complex conditions of a query. */
+interface Visitor {
+  visitExp?(c: ParsedExpressionFilter): ParsedExpressionFilter | void;
+  visitRaw?(c: RawCondition): RawCondition | ParsedExpressionFilter | void;
+  visitCond(c: ColumnCondition): ColumnCondition | ParsedExpressionFilter | RawCondition | null | void;
+}
+/**
+ * Visits the nested conditions within `query`.
+ *
+ * If the visitors return a new condition or expression, the returned expression
+ * will replace the original one at that location in the expression.
+ *
+ * If the visitor returns null, the condition or expression will be removed from the tree.
+ */
+declare function visitConditions(query: ParsedFindQuery, visitor: Visitor): void;
+/** Returns whether a parsed query contains a condition tree that cannot match any database row. */
+declare function isQueryProvablyEmpty(query: ParsedFindQuery): boolean;
+declare function visitFilter(pc: ParsedExpressionCondition, visitor: Visitor): void;
+//#endregion
+export { isQueryProvablyEmpty, visitConditions, visitFilter };
+//# sourceMappingURL=QueryVisitor.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryVisitor.d.mts","names":[],"sources":["../../../src/queries/find/QueryVisitor.ts"],"mappings":";;;;UAUU;EACR,UAAU,GAAG,yBAAyB;EACtC,UAAU,GAAG,eAAe,eAAe;EAC3C,UAAU,GAAG,kBAAkB,kBAAkB,yBAAyB;;;;;;;;;;iBAW5D,gBAAgB,OAAO,iBAAiB,SAAS;;iBAmBjD,qBAAqB,OAAO;iBAe5B,YAAY,IAAI,2BAA2B,SAAS"}

package/build/queries/find/QueryVisitor.js

@@ -0,0 +1,74 @@
+import { assertNever } from "../../utils.js";
+//#region src/queries/find/QueryVisitor.ts
+/**
+* Visits the nested conditions within `query`.
+*
+* If the visitors return a new condition or expression, the returned expression
+* will replace the original one at that location in the expression.
+*
+* If the visitor returns null, the condition or expression will be removed from the tree.
+*/
+function visitConditions(query, visitor) {
+	const todo = [query];
+	while (todo.length > 0) {
+		const query = todo.pop();
+		if (query.condition) visitFilter(query.condition, visitor);
+		for (const table of query.tables) if (table.join === "lateral") todo.push(table.query);
+		if (query.condition) visitExistsSubqueries(query.condition, todo);
+	}
+}
+/** Returns whether a parsed query contains a condition tree that cannot match any database row. */
+function isQueryProvablyEmpty(query) {
+	return query.condition ? isConditionProvablyFalse(query.condition) : false;
+}
+/** Finds ExistsCondition nodes in a condition tree and pushes their subqueries onto the todo list. */
+function visitExistsSubqueries(condition, todo) {
+	if (condition.kind === "exp") for (const c of condition.conditions) visitExistsSubqueries(c, todo);
+	else if (condition.kind === "exists") todo.push(condition.subquery);
+}
+function visitFilter(pc, visitor) {
+	if (pc.kind === "exp") {
+		const toRemove = /* @__PURE__ */ new Set();
+		pc.conditions.forEach((c, i) => {
+			if (c.kind === "column") {
+				const result = visitor.visitCond(c);
+				if (result === null) toRemove.add(i);
+				else if (result) pc.conditions[i] = result;
+			} else if (c.kind === "exp") {
+				const result = visitor.visitExp?.(c);
+				if (result === null) {
+					toRemove.add(i);
+					return;
+				} else if (result) pc.conditions[i] = result;
+				visitFilter(result ?? c, visitor);
+			} else if (c.kind === "raw") {
+				const result = visitor.visitRaw?.(c);
+				if (result === null) toRemove.add(i);
+				else if (result) pc.conditions[i] = result;
+			} else if (c.kind === "exists") {} else assertNever(c);
+		});
+		if (toRemove.size > 0) pc.conditions = pc.conditions.filter((_, i) => !toRemove.has(i));
+	} else if (pc.kind === "column") {
+		const result = visitor.visitCond(pc);
+		if (result || result === null) throw new Error("ParsedExpressionCondition overload not support mutating the condition");
+	} else if (pc.kind === "raw") {
+		const result = visitor.visitRaw?.(pc);
+		if (result || result === null) throw new Error("ParsedExpressionCondition overload not support mutating the condition");
+	} else if (pc.kind === "exists") {} else assertNever(pc);
+}
+/** Evaluates only conditions whose false result can be proven without querying the database. */
+function isConditionProvablyFalse(condition) {
+	switch (condition.kind) {
+		case "column": return condition.cond.kind === "in" && condition.cond.value.length === 0;
+		case "exp":
+			if (condition.conditions.length === 0) return false;
+			return condition.op === "and" ? condition.conditions.some(isConditionProvablyFalse) : condition.conditions.every(isConditionProvablyFalse);
+		case "exists": return !condition.negate && isQueryProvablyEmpty(condition.subquery);
+		case "raw": return false;
+		default: return assertNever(condition);
+	}
+}
+//#endregion
+export { isQueryProvablyEmpty, visitConditions, visitFilter };
+
+//# sourceMappingURL=QueryVisitor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryVisitor.js","names":[],"sources":["../../../src/queries/find/QueryVisitor.ts"],"sourcesContent":["import type { ParsedFindQuery } from \"src/queries/find/QueryParser.ts\";\nimport type {\n  ColumnCondition,\n  ParsedExpressionCondition,\n  ParsedExpressionFilter,\n  RawCondition,\n} from \"src/queries/parsedConditions.ts\";\nimport { assertNever } from \"src/utils.ts\";\n\n/** A generic visitor over the simple & complex conditions of a query. */\ninterface Visitor {\n  visitExp?(c: ParsedExpressionFilter): ParsedExpressionFilter | void;\n  visitRaw?(c: RawCondition): RawCondition | ParsedExpressionFilter | void;\n  visitCond(c: ColumnCondition): ColumnCondition | ParsedExpressionFilter | RawCondition | null | void;\n}\n\n/**\n * Visits the nested conditions within `query`.\n *\n * If the visitors return a new condition or expression, the returned expression\n * will replace the original one at that location in the expression.\n *\n * If the visitor returns null, the condition or expression will be removed from the tree.\n */\nexport function visitConditions(query: ParsedFindQuery, visitor: Visitor): void {\n  const todo = [query];\n  while (todo.length > 0) {\n    const query = todo.pop()!;\n    if (query.condition) visitFilter(query.condition, visitor);\n    // Recurse into lateral subqueries (used by batching/preloading, not EXISTS rewrite)\n    for (const table of query.tables) {\n      if (table.join === \"lateral\") {\n        todo.push(table.query);\n      }\n    }\n    // Recurse into EXISTS subqueries so batching visitors can rewrite conditions inside them\n    if (query.condition) {\n      visitExistsSubqueries(query.condition, todo);\n    }\n  }\n}\n\n/** Returns whether a parsed query contains a condition tree that cannot match any database row. */\nexport function isQueryProvablyEmpty(query: ParsedFindQuery): boolean {\n  return query.condition ? isConditionProvablyFalse(query.condition) : false;\n}\n\n/** Finds ExistsCondition nodes in a condition tree and pushes their subqueries onto the todo list. */\nfunction visitExistsSubqueries(condition: ParsedExpressionCondition, todo: ParsedFindQuery[]): void {\n  if (condition.kind === \"exp\") {\n    for (const c of condition.conditions) {\n      visitExistsSubqueries(c, todo);\n    }\n  } else if (condition.kind === \"exists\") {\n    todo.push(condition.subquery);\n  }\n}\n\nexport function visitFilter(pc: ParsedExpressionCondition, visitor: Visitor) {\n  if (pc.kind === \"exp\") {\n    const toRemove = new Set<number>();\n    pc.conditions.forEach((c, i) => {\n      if (c.kind === \"column\") {\n        const result = visitor.visitCond(c);\n        if (result === null) {\n          toRemove.add(i);\n        } else if (result) {\n          pc.conditions[i] = result;\n        }\n      } else if (c.kind === \"exp\") {\n        const result = visitor.visitExp?.(c);\n        if (result === null) {\n          toRemove.add(i);\n          return;\n        } else if (result) {\n          pc.conditions[i] = result;\n        }\n        visitFilter(result ?? c, visitor);\n      } else if (c.kind === \"raw\") {\n        const result = visitor.visitRaw?.(c);\n        if (result === null) {\n          toRemove.add(i);\n        } else if (result) {\n          pc.conditions[i] = result;\n        }\n      } else if (c.kind === \"exists\") {\n        // EXISTS conditions are visited via visitExistsSubqueries, not inline\n      } else {\n        assertNever(c);\n      }\n    });\n    // do this after visiting the children, so we can do it in one pass and don't mess up the indices\n    if (toRemove.size > 0) pc.conditions = pc.conditions.filter((_, i) => !toRemove.has(i));\n  } else if (pc.kind === \"column\") {\n    const result = visitor.visitCond(pc);\n    if (result || result === null) {\n      throw new Error(\"ParsedExpressionCondition overload not support mutating the condition\");\n    }\n  } else if (pc.kind === \"raw\") {\n    const result = visitor.visitRaw?.(pc);\n    if (result || result === null) {\n      throw new Error(\"ParsedExpressionCondition overload not support mutating the condition\");\n    }\n  } else if (pc.kind === \"exists\") {\n    // EXISTS conditions are handled at the query level\n  } else {\n    assertNever(pc);\n  }\n}\n\n/** Evaluates only conditions whose false result can be proven without querying the database. */\nfunction isConditionProvablyFalse(condition: ParsedExpressionCondition): boolean {\n  switch (condition.kind) {\n    case \"column\":\n      return condition.cond.kind === \"in\" && condition.cond.value.length === 0;\n    case \"exp\":\n      // Pruning can leave an empty group, which buildWhereClause drops as no predicate instead of rendering as FALSE.\n      if (condition.conditions.length === 0) return false;\n      return condition.op === \"and\"\n        ? condition.conditions.some(isConditionProvablyFalse)\n        : condition.conditions.every(isConditionProvablyFalse);\n    case \"exists\":\n      return !condition.negate && isQueryProvablyEmpty(condition.subquery);\n    case \"raw\":\n      return false;\n    default:\n      return assertNever(condition);\n  }\n}\n"],"mappings":";;;;;;;;;;AAwBA,SAAgB,gBAAgB,OAAwB,SAAwB;CAC9E,MAAM,OAAO,CAAC,KAAK;CACnB,OAAO,KAAK,SAAS,GAAG;EACtB,MAAM,QAAQ,KAAK,IAAI;EACvB,IAAI,MAAM,WAAW,YAAY,MAAM,WAAW,OAAO;EAEzD,KAAK,MAAM,SAAS,MAAM,QACxB,IAAI,MAAM,SAAS,WACjB,KAAK,KAAK,MAAM,KAAK;EAIzB,IAAI,MAAM,WACR,sBAAsB,MAAM,WAAW,IAAI;CAE/C;AACF;;AAGA,SAAgB,qBAAqB,OAAiC;CACpE,OAAO,MAAM,YAAY,yBAAyB,MAAM,SAAS,IAAI;AACvE;;AAGA,SAAS,sBAAsB,WAAsC,MAA+B;CAClG,IAAI,UAAU,SAAS,OACrB,KAAK,MAAM,KAAK,UAAU,YACxB,sBAAsB,GAAG,IAAI;MAE1B,IAAI,UAAU,SAAS,UAC5B,KAAK,KAAK,UAAU,QAAQ;AAEhC;AAEA,SAAgB,YAAY,IAA+B,SAAkB;CAC3E,IAAI,GAAG,SAAS,OAAO;EACrB,MAAM,2BAAW,IAAI,IAAY;EACjC,GAAG,WAAW,SAAS,GAAG,MAAM;GAC9B,IAAI,EAAE,SAAS,UAAU;IACvB,MAAM,SAAS,QAAQ,UAAU,CAAC;IAClC,IAAI,WAAW,MACb,SAAS,IAAI,CAAC;SACT,IAAI,QACT,GAAG,WAAW,KAAK;GAEvB,OAAO,IAAI,EAAE,SAAS,OAAO;IAC3B,MAAM,SAAS,QAAQ,WAAW,CAAC;IACnC,IAAI,WAAW,MAAM;KACnB,SAAS,IAAI,CAAC;KACd;IACF,OAAO,IAAI,QACT,GAAG,WAAW,KAAK;IAErB,YAAY,UAAU,GAAG,OAAO;GAClC,OAAO,IAAI,EAAE,SAAS,OAAO;IAC3B,MAAM,SAAS,QAAQ,WAAW,CAAC;IACnC,IAAI,WAAW,MACb,SAAS,IAAI,CAAC;SACT,IAAI,QACT,GAAG,WAAW,KAAK;GAEvB,OAAO,IAAI,EAAE,SAAS,UAAU,CAEhC,OACE,YAAY,CAAC;EAEjB,CAAC;EAED,IAAI,SAAS,OAAO,GAAG,GAAG,aAAa,GAAG,WAAW,QAAQ,GAAG,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;CACxF,OAAO,IAAI,GAAG,SAAS,UAAU;EAC/B,MAAM,SAAS,QAAQ,UAAU,EAAE;EACnC,IAAI,UAAU,WAAW,MACvB,MAAM,IAAI,MAAM,uEAAuE;CAE3F,OAAO,IAAI,GAAG,SAAS,OAAO;EAC5B,MAAM,SAAS,QAAQ,WAAW,EAAE;EACpC,IAAI,UAAU,WAAW,MACvB,MAAM,IAAI,MAAM,uEAAuE;CAE3F,OAAO,IAAI,GAAG,SAAS,UAAU,CAEjC,OACE,YAAY,EAAE;AAElB;;AAGA,SAAS,yBAAyB,WAA+C;CAC/E,QAAQ,UAAU,MAAlB;EACE,KAAK,UACH,OAAO,UAAU,KAAK,SAAS,QAAQ,UAAU,KAAK,MAAM,WAAW;EACzE,KAAK;GAEH,IAAI,UAAU,WAAW,WAAW,GAAG,OAAO;GAC9C,OAAO,UAAU,OAAO,QACpB,UAAU,WAAW,KAAK,wBAAwB,IAClD,UAAU,WAAW,MAAM,wBAAwB;EACzD,KAAK,UACH,OAAO,CAAC,UAAU,UAAU,qBAAqB,UAAU,QAAQ;EACrE,KAAK,OACH,OAAO;EACT,SACE,OAAO,YAAY,SAAS;CAChC;AACF"}