joist-orm 1.245.1 → 1.246.0

package/build/ConditionBuilder.d.ts

@@ -0,0 +1,50 @@
+import { ExpressionFilter } from "./EntityFilter";
+import { ColumnCondition, ParsedExpressionFilter, ParsedValueFilter, RawCondition } from "./QueryParser";
+import { Column } from "./serde";
+type PartialSome<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+/** Converts domain-level values like string ids/enums into their db equivalent. */
+export declare class ConditionBuilder {
+    /** Simple, single-column conditions, which will be AND-d together. */
+    private conditions;
+    /** Complex expressions, which will also be AND-d together with `conditions`. */
+    private expressions;
+    /** Accepts a raw user-facing DSL filter, and parses it into a `ParsedExpressionFilter`. */
+    maybeAddExpression(expression: ExpressionFilter): void;
+    /** Adds an already-db-level condition to the simple conditions list. */
+    addSimpleCondition(condition: ColumnCondition): void;
+    /** Adds an already-db-level condition to the simple conditions list. */
+    addRawCondition(condition: PartialSome<RawCondition, "kind" | "bindings">): void;
+    /** Adds an already-db-level expression to the expressions list. */
+    addParsedExpression(parsed: ParsedExpressionFilter): void;
+    /**
+     * Adds a user-facing `ParsedValueFilter` to the inline conditions.
+     *
+     * Unless it's something like `in: [a1, null]`, in which case we split it into two `is-null` and `in` conditions.
+     */
+    addValueFilter(alias: string, column: Column, filter: ParsedValueFilter<any>): void;
+    /** Combines our collected `conditions` & `expressions` into a single `ParsedExpressionFilter`. */
+    toExpressionFilter(): ParsedExpressionFilter | undefined;
+    /**
+     * Finds `child.column.eq(...)` complex conditions that need pushed down into each lateral join.
+     *
+     * Once we find something like `{ column: "first_name", cond: { eq: "a1" } }`, we return it to the
+     * caller (for injection into the lateral join's `SELECT` clause), and replace it with a boolean
+     * expression that is basically "did any of my children match this condition?".
+     *
+     * We also assume that `findAndRewrite` is only called on the top-level/user-facing `ParsedFindQuery`,
+     * and not any intermediate `CteJoinTable` queries (which are allowed to have their own
+     * `ConditionBuilder`s for building their internal query, but it's not exposed to the user,
+     * so won't have any truly-complex conditions that should need rewritten).
+     *
+     * @param topLevelLateralJoin the outermost lateral join alias, as that will be the only alias
+     *   that is visible to the rewritten condition, i.e. `_alias._whatever_condition_`.
+     * @param alias the alias being "hidden" in a lateral join, and so its columns/data won't be
+     *   available for the top-level condition to directly AND/OR against.
+     */
+    findAndRewrite(topLevelLateralJoin: string, alias: string): {
+        cond: ColumnCondition;
+        as: string;
+    }[];
+}
+export {};
+//# sourceMappingURL=ConditionBuilder.d.ts.map

package/build/ConditionBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../src/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EACL,eAAe,EAGf,sBAAsB,EACtB,iBAAiB,EACjB,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,KAAK,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE1E,mFAAmF;AACnF,qBAAa,gBAAgB;IAC3B,sEAAsE;IACtE,OAAO,CAAC,UAAU,CAA0C;IAC5D,gFAAgF;IAChF,OAAO,CAAC,WAAW,CAAgC;IAEnD,2FAA2F;IAC3F,kBAAkB,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI;IAKtD,wEAAwE;IACxE,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAIpD,wEAAwE;IACxE,eAAe,CAAC,SAAS,EAAE,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU,CAAC,GAAG,IAAI;IAQhF,mEAAmE;IACnE,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAIzD;;;;OAIG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,GAAG,CAAC,GAAG,IAAI;IAoCnF,kGAAkG;IAClG,kBAAkB,IAAI,sBAAsB,GAAG,SAAS;IAexD;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,CAAC,mBAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE;CA4CpG"}

package/build/ConditionBuilder.js

@@ -0,0 +1,178 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConditionBuilder = void 0;
+const EntityManager_1 = require("./EntityManager");
+const QueryParser_1 = require("./QueryParser");
+const utils_1 = require("./utils");
+/** Converts domain-level values like string ids/enums into their db equivalent. */
+class ConditionBuilder {
+    /** Simple, single-column conditions, which will be AND-d together. */
+    conditions = [];
+    /** Complex expressions, which will also be AND-d together with `conditions`. */
+    expressions = [];
+    /** Accepts a raw user-facing DSL filter, and parses it into a `ParsedExpressionFilter`. */
+    maybeAddExpression(expression) {
+        const parsed = parseExpression(expression);
+        if (parsed)
+            this.expressions.push(parsed);
+    }
+    /** Adds an already-db-level condition to the simple conditions list. */
+    addSimpleCondition(condition) {
+        this.conditions.push(condition);
+    }
+    /** Adds an already-db-level condition to the simple conditions list. */
+    addRawCondition(condition) {
+        this.conditions.push({
+            kind: "raw",
+            bindings: [],
+            ...condition,
+        });
+    }
+    /** Adds an already-db-level expression to the expressions list. */
+    addParsedExpression(parsed) {
+        this.expressions.push(parsed);
+    }
+    /**
+     * Adds a user-facing `ParsedValueFilter` to the inline conditions.
+     *
+     * Unless it's something like `in: [a1, null]`, in which case we split it into two `is-null` and `in` conditions.
+     */
+    addValueFilter(alias, column, filter) {
+        if (filter.kind === "in" && filter.value.includes(null)) {
+            // If the filter contains a null, we need to split it into an `is-null` and `in` condition
+            const isNull = {
+                kind: "column",
+                alias,
+                column: column.columnName,
+                dbType: column.dbType,
+                cond: { kind: "is-null" },
+            };
+            const inValues = {
+                kind: "column",
+                alias,
+                column: column.columnName,
+                dbType: column.dbType,
+                cond: {
+                    kind: "in",
+                    // Filter out the nulls from the in condition
+                    value: filter.value.filter((v) => v !== null).map((v) => column.mapToDb(v)),
+                },
+            };
+            // Now OR them back together
+            this.expressions.push({ kind: "exp", op: "or", conditions: [isNull, inValues] });
+        }
+        else {
+            const cond = {
+                kind: "column",
+                alias,
+                column: column.columnName,
+                dbType: column.dbType,
+                // Rewrite the user-facing domain values to db values
+                cond: (0, QueryParser_1.mapToDb)(column, filter),
+            };
+            this.conditions.push(cond);
+        }
+    }
+    /** Combines our collected `conditions` & `expressions` into a single `ParsedExpressionFilter`. */
+    toExpressionFilter() {
+        const { expressions, conditions } = this;
+        if (conditions.length === 0 && expressions.length === 1) {
+            // If no inline conditions, and just 1 opt expression, just use that
+            return expressions[0];
+        }
+        else if (expressions.length === 1 && expressions[0].op === "and") {
+            // Merge the 1 `AND` expression with the other simple conditions
+            return { kind: "exp", op: "and", conditions: [...conditions, ...expressions[0].conditions] };
+        }
+        else if (conditions.length > 0 || expressions.length > 0) {
+            // Combine the conditions within the `em.find` join literal & the `conditions` as ANDs
+            return { kind: "exp", op: "and", conditions: [...conditions, ...expressions] };
+        }
+        return undefined;
+    }
+    /**
+     * Finds `child.column.eq(...)` complex conditions that need pushed down into each lateral join.
+     *
+     * Once we find something like `{ column: "first_name", cond: { eq: "a1" } }`, we return it to the
+     * caller (for injection into the lateral join's `SELECT` clause), and replace it with a boolean
+     * expression that is basically "did any of my children match this condition?".
+     *
+     * We also assume that `findAndRewrite` is only called on the top-level/user-facing `ParsedFindQuery`,
+     * and not any intermediate `CteJoinTable` queries (which are allowed to have their own
+     * `ConditionBuilder`s for building their internal query, but it's not exposed to the user,
+     * so won't have any truly-complex conditions that should need rewritten).
+     *
+     * @param topLevelLateralJoin the outermost lateral join alias, as that will be the only alias
+     *   that is visible to the rewritten condition, i.e. `_alias._whatever_condition_`.
+     * @param alias the alias being "hidden" in a lateral join, and so its columns/data won't be
+     *   available for the top-level condition to directly AND/OR against.
+     */
+    findAndRewrite(topLevelLateralJoin, alias) {
+        let j = 0;
+        const found = [];
+        const todo = [this.conditions];
+        for (const exp of this.expressions)
+            todo.push(exp.conditions);
+        while (todo.length > 0) {
+            const array = todo.pop();
+            array.forEach((cond, i) => {
+                if (cond.kind === "column") {
+                    // Use startsWith to look for `_b0` / `_s0` base/subtype conditions
+                    if (cond.alias === alias || cond.alias.startsWith(`${alias}_`)) {
+                        if (cond.column === "_")
+                            return; // Hack to skip rewriting `alias._ > 0`
+                        const as = `_${alias}_${cond.column}_${j++}`;
+                        array[i] = {
+                            kind: "raw",
+                            aliases: [topLevelLateralJoin],
+                            condition: `${topLevelLateralJoin}.${as}`,
+                            bindings: [],
+                            pruneable: false,
+                            ...{ rewritten: true },
+                        };
+                        found.push({ cond, as });
+                    }
+                }
+                else if (cond.kind === "exp") {
+                    todo.push(cond.conditions);
+                }
+                else if (cond.kind === "raw") {
+                    // what would we do here?
+                    if (cond.aliases.includes(alias)) {
+                        // Look for a hacky hint that this is our own already-rewritten query; this is likely
+                        // because `findAndRewrite` is mutating condition expressions that get passed into
+                        // `parseFindQuery` multiple times, i.e. while batching/dataloading.
+                        //
+                        // ...although in theory parseExpression should already be making a copy of any user-facing
+                        // `em.find` conditions. :thinking:
+                        if ("rewritten" in cond)
+                            return;
+                        throw new Error("Joist doesn't support raw conditions in lateral joins yet");
+                    }
+                }
+                else {
+                    (0, utils_1.assertNever)(cond);
+                }
+            });
+        }
+        return found;
+    }
+}
+exports.ConditionBuilder = ConditionBuilder;
+/** Parses user-facing `{ and: ... }` or `{ or: ... }` into a `ParsedExpressionFilter`. */
+function parseExpression(expression) {
+    // Look for `{ and: [...] }` or `{ or: [...] }`
+    const [op, expressions] = "and" in expression && expression.and
+        ? ["and", expression.and]
+        : "or" in expression && expression.or
+            ? ["or", expression.or]
+            : fail(`Invalid expression ${expression}`);
+    // Potentially recurse into nested expressions
+    const conditions = expressions.map((exp) => (exp && ("and" in exp || "or" in exp) ? parseExpression(exp) : exp));
+    const [skip, valid] = (0, utils_1.partition)(conditions, (cond) => cond === undefined || cond === QueryParser_1.skipCondition);
+    if ((skip.length > 0 && expression.pruneIfUndefined === "any") || valid.length === 0) {
+        return undefined;
+    }
+    return { kind: "exp", op, conditions: valid.filter(EntityManager_1.isDefined) };
+}
+//# sourceMappingURL=ConditionBuilder.js.map

package/build/ConditionBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../src/ConditionBuilder.ts"],"names":[],"mappings":"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"}

package/build/QueryParser.d.ts

@@ -30,8 +30,8 @@ export interface RawCondition {
     condition: string;
     /** The bindings within `condition`, i.e. `SUM(${alias}.amount) > ?`. */
     bindings: any[];
-    /** We assume raw conditions are never system-added, so can't be pruned. */
-    pruneable: false;
+    /** Used to mark system-added conditions (like `LATERAL JOIN` conditions), which can be ignored when pruning unused joins. */
+    pruneable: boolean;
 }
 /** A marker condition for alias methods to indicate they should be skipped/pruned. */
 export declare const skipCondition: ColumnCondition;
@@ -48,15 +48,40 @@ export interface JoinTable {
     col2: string;
     distinct?: boolean;
 }
-export type ParsedTable = PrimaryTable | JoinTable;
+export interface CrossJoinTable {
+    join: "cross";
+    alias: string;
+    table: string;
+}
+export interface LateralJoinTable {
+    join: "lateral";
+    alias: string;
+    /** Used for join dependency tracking. */
+    fromAlias: string;
+    /** Used more for bookkeeping/consistency with other join tables than the query itself. */
+    table: string;
+    /** The subquery that will look for/roll-up N children. */
+    query: ParsedFindQuery;
+}
+export type ParsedTable = PrimaryTable | JoinTable | CrossJoinTable | LateralJoinTable;
 export interface ParsedOrderBy {
     alias: string;
     column: string;
     order: OrderBy;
 }
+export interface ParsedGroupBy {
+    alias: string;
+    column: string;
+}
+type ParsedSelect = string | ParsedSelectWithBindings;
+type ParsedSelectWithBindings = {
+    sql: string;
+    bindings: any[];
+    aliases: string[];
+};
 /** The result of parsing an `em.find` filter. */
 export interface ParsedFindQuery {
-    selects: string[];
+    selects: ParsedSelect[];
     /** The primary table plus any joins. */
     tables: ParsedTable[];
     /** Any cross lateral joins, where the `joins: string[]` has the full join as raw SQL; currently only for preloading. */
@@ -66,6 +91,8 @@ export interface ParsedFindQuery {
     };
     /** The query's conditions. */
     condition?: ParsedExpressionFilter;
+    /** Extremely optional group bys; we generally don't support adhoc/aggregate queries, but the auto-batching infra uses these. */
+    groupBys?: ParsedGroupBy[];
     /** Any optional orders to add before the default 'order by id'. */
     orderBys: ParsedOrderBy[];
     /** Optional CTE to prefix to the query, i.e. for recursive relations. */
@@ -74,7 +101,7 @@ export interface ParsedFindQuery {
         bindings: readonly any[];
     };
 }
-/** Parses an `em.find` filter into a `ParsedFindQuery` for simpler execution. */
+/** Parses an `em.find` filter into a `ParsedFindQuery` AST for simpler execution. */
 export declare function parseFindQuery(meta: EntityMetadata, filter: any, opts?: {
     conditions?: ExpressionFilter;
     orderBy?: any;
@@ -82,6 +109,8 @@ export declare function parseFindQuery(meta: EntityMetadata, filter: any, opts?:
     keepAliases?: string[];
     softDeletes?: "include" | "exclude";
 }): ParsedFindQuery;
+/** Returns the `a` from `"a".*`. */
+export declare function parseAlias(alias: string): string;
 /** An ADT version of `EntityFilter`. */
 export type ParsedEntityFilter = ParsedValueFilter<string | number> | {
     kind: "join";
@@ -173,36 +202,13 @@ export type ParsedValueFilter<V> = {
  */
 export declare function parseValueFilter<V>(filter: ValueFilter<V, any>): ParsedValueFilter<V>[];
 /** Converts domain-level values like string ids/enums into their db equivalent. */
-export declare class ConditionBuilder {
-    /** Simple, single-column conditions, which will be AND-d together. */
-    private conditions;
-    /** Complex expressions, which will also be AND-d together with `conditions`. */
-    private expressions;
-    /** Accepts a raw user-facing DSL filter, and parses it into a `ParsedExpressionFilter`. */
-    maybeAddExpression(expression: ExpressionFilter): void;
-    /** Adds an already-db-level condition to the simple conditions list. */
-    addSimpleCondition(condition: ColumnCondition): void;
-    /** Adds an already-db-level expression to the expressions list. */
-    addParsedExpression(parsed: ParsedExpressionFilter): void;
-    /**
-     * Adds a user-facing `ParsedValueFilter` to the inline conditions.
-     *
-     * Unless it's something like `in: [a1, null]`, in which case we split it into two `is-null` and `in` conditions.
-     */
-    addValueFilter(alias: string, column: Column, filter: ParsedValueFilter<any>): void;
-    /** Combines our collected `conditions` & `expressions` into a single `ParsedExpressionFilter`. */
-    toExpressionFilter(): ParsedExpressionFilter | undefined;
-}
-/** Converts domain-level values like string ids/enums into their db equivalent. */
 export declare function mapToDb(column: Column, filter: ParsedValueFilter<any>): ParsedValueFilter<any>;
 /** Adds any user-configured default order, plus an "always order by id" for determinism. */
 export declare function maybeAddOrderBy(query: ParsedFindQuery, meta: EntityMetadata, alias: string): void;
 export declare function addTablePerClassJoinsAndClassTag(query: ParsedFindQuery, meta: EntityMetadata, alias: string, isPrimary: boolean): void;
 export declare function maybeAddNotSoftDeleted(conditions: ColumnCondition[], meta: EntityMetadata, alias: string, softDeletes: "include" | "exclude"): void;
-export declare function getTables(query: ParsedFindQuery): [PrimaryTable, JoinTable[]];
-export declare function joinKeywords(join: JoinTable): string;
-export declare function joinClause(join: JoinTable): string;
-export declare function joinClauses(joins: ParsedTable[]): string[];
+export declare function getTables(query: ParsedFindQuery): [PrimaryTable, JoinTable[], LateralJoinTable[], CrossJoinTable[]];
 /** Converts a search term like `foo bar` into a SQL `like` pattern like `%foo%bar%`. */
 export declare function makeLike(search: any | undefined): any;
+export {};
 //# sourceMappingURL=QueryParser.d.ts.map

package/build/QueryParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryParser.d.ts","sourceRoot":"","sources":["../src/QueryParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryParser.d.ts","sourceRoot":"","sources":["../src/QueryParser.ts"],"names":[],"mappings":"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"}

package/build/QueryParser.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionBuilder = exports.skipCondition = void 0;
+exports.skipCondition = void 0;
 exports.parseFindQuery = parseFindQuery;
+exports.parseAlias = parseAlias;
 exports.parseEntityFilter = parseEntityFilter;
 exports.parseValueFilter = parseValueFilter;
 exports.mapToDb = mapToDb;
@@ -9,14 +10,12 @@ exports.maybeAddOrderBy = maybeAddOrderBy;
 exports.addTablePerClassJoinsAndClassTag = addTablePerClassJoinsAndClassTag;
 exports.maybeAddNotSoftDeleted = maybeAddNotSoftDeleted;
 exports.getTables = getTables;
-exports.joinKeywords = joinKeywords;
-exports.joinClause = joinClause;
-exports.joinClauses = joinClauses;
 exports.makeLike = makeLike;
 const joist_utils_1 = require("joist-utils");
 const Aliases_1 = require("./Aliases");
 const Entity_1 = require("./Entity");
 const EntityMetadata_1 = require("./EntityMetadata");
+const QueryParser_pruning_1 = require("./QueryParser.pruning");
 const QueryVisitor_1 = require("./QueryVisitor");
 const configure_1 = require("./configure");
 const index_1 = require("./index");
@@ -30,14 +29,14 @@ exports.skipCondition = {
     dbType: "skip",
     cond: undefined,
 };
-/** Parses an `em.find` filter into a `ParsedFindQuery` for simpler execution. */
+/** Parses an `em.find` filter into a `ParsedFindQuery` AST for simpler execution. */
 function parseFindQuery(meta, filter, opts = {}) {
     const selects = [];
     const tables = [];
     const orderBys = [];
     const query = { selects, tables, orderBys };
     const { orderBy = undefined, conditions: optsExpression = undefined, softDeletes = "exclude", pruneJoins = true, keepAliases = [], } = opts;
-    const cb = new ConditionBuilder();
+    const cb = new index_1.ConditionBuilder();
     const aliases = {};
     function getAlias(tableName) {
         const abbrev = (0, utils_1.abbreviation)(tableName);
@@ -92,6 +91,9 @@ function parseFindQuery(meta, filter, opts = {}) {
                 });
             });
         }
+        else if (join === "lateral" || join === "cross") {
+            (0, utils_1.fail)("Unexpected lateral join");
+        }
         else {
             tables.push({ alias, table: meta.tableName, join, col1, col2 });
             // Maybe only do this if we're the primary, or have a field that needs it?
@@ -376,7 +378,7 @@ function parseFindQuery(meta, filter, opts = {}) {
     }
     maybeAddOrderBy(query, meta, alias);
     if (pruneJoins) {
-        pruneUnusedJoins(query, keepAliases);
+        (0, QueryParser_pruning_1.pruneUnusedJoins)(query, keepAliases);
     }
     return query;
 }
@@ -421,75 +423,6 @@ function maybeAddIdNotNulls(query) {
         },
     });
 }
-// Remove any joins that are not used in the select or conditions
-function pruneUnusedJoins(parsed, keepAliases) {
-    // Mark all terminal usages
-    const used = new Set();
-    parsed.selects.forEach((s) => used.add(parseAlias(s)));
-    parsed.orderBys.forEach((o) => used.add(o.alias));
-    keepAliases.forEach((a) => used.add(a));
-    deepFindConditions(parsed.condition)
-        .filter((c) => !c.pruneable)
-        .forEach((c) => {
-        switch (c.kind) {
-            case "column":
-                used.add(c.alias);
-                break;
-            case "raw":
-                for (const alias of c.aliases) {
-                    used.add(alias);
-                }
-                break;
-            default:
-                (0, utils_1.assertNever)(c);
-        }
-    });
-    // Mark all usages via joins
-    for (let i = 0; i < parsed.tables.length; i++) {
-        const t = parsed.tables[i];
-        if (t.join !== "primary") {
-            // If alias (col2) is required, ensure the col1 alias is also required
-            const a2 = t.alias;
-            const a1 = parseAlias(t.col1);
-            if (used.has(a2) && !used.has(a1)) {
-                used.add(a1);
-                // Restart at zero to find dependencies before us
-                i = 0;
-            }
-        }
-    }
-    // Now remove any unused joins
-    parsed.tables = parsed.tables.filter((t) => used.has(t.alias));
-    // And then remove any inline soft-delete conditions we don't need anymore
-    if (parsed.condition && parsed.condition.op === "and") {
-        parsed.condition.conditions = parsed.condition.conditions.filter((c) => {
-            if (c.kind === "column") {
-                const prune = c.pruneable && !parsed.tables.some((t) => t.alias === c.alias);
-                return !prune;
-            }
-            else {
-                return c;
-            }
-        });
-    }
-}
-/** Pulls out a flat list of all `ColumnCondition`s from a `ParsedExpressionFilter` tree. */
-function deepFindConditions(condition) {
-    const todo = condition ? [condition] : [];
-    const result = [];
-    while (todo.length !== 0) {
-        const cc = todo.pop();
-        for (const c of cc.conditions) {
-            if (c.kind === "exp") {
-                todo.push(c);
-            }
-            else {
-                result.push(c);
-            }
-        }
-    }
-    return result;
-}
 /** Returns the `a` from `"a".*`. */
 function parseAlias(alias) {
     return alias.split(".")[0].replaceAll(`"`, "");
@@ -705,82 +638,6 @@ function parseValueFilter(filter) {
     }
 }
 /** Converts domain-level values like string ids/enums into their db equivalent. */
-class ConditionBuilder {
-    /** Simple, single-column conditions, which will be AND-d together. */
-    conditions = [];
-    /** Complex expressions, which will also be AND-d together with `conditions`. */
-    expressions = [];
-    /** Accepts a raw user-facing DSL filter, and parses it into a `ParsedExpressionFilter`. */
-    maybeAddExpression(expression) {
-        const parsed = parseExpression(expression);
-        if (parsed)
-            this.expressions.push(parsed);
-    }
-    /** Adds an already-db-level condition to the simple conditions list. */
-    addSimpleCondition(condition) {
-        this.conditions.push(condition);
-    }
-    /** Adds an already-db-level expression to the expressions list. */
-    addParsedExpression(parsed) {
-        this.expressions.push(parsed);
-    }
-    /**
-     * Adds a user-facing `ParsedValueFilter` to the inline conditions.
-     *
-     * Unless it's something like `in: [a1, null]`, in which case we split it into two `is-null` and `in` conditions.
-     */
-    addValueFilter(alias, column, filter) {
-        if (filter.kind === "in" && filter.value.includes(null)) {
-            // If the filter contains a null, we need to split it into an `is-null` and `in` condition
-            const isNull = {
-                kind: "column",
-                alias,
-                column: column.columnName,
-                dbType: column.dbType,
-                cond: { kind: "is-null" },
-            };
-            const inValues = {
-                kind: "column",
-                alias,
-                column: column.columnName,
-                dbType: column.dbType,
-                cond: {
-                    kind: "in",
-                    // Filter out the nulls from the in condition
-                    value: filter.value.filter((v) => v !== null).map((v) => column.mapToDb(v)),
-                },
-            };
-            // Now OR them back together
-            this.expressions.push({ kind: "exp", op: "or", conditions: [isNull, inValues] });
-        }
-        else {
-            const cond = {
-                kind: "column",
-                alias,
-                column: column.columnName,
-                dbType: column.dbType,
-                // Rewrite the user-facing domain values to db values
-                cond: mapToDb(column, filter),
-            };
-            this.conditions.push(cond);
-        }
-    }
-    /** Combines our collected `conditions` & `expressions` into a single `ParsedExpressionFilter`. */
-    toExpressionFilter() {
-        const { expressions, conditions } = this;
-        if (conditions.length === 0 && expressions.length === 1) {
-            // If no inline conditions, and just 1 opt expression, just use that
-            return expressions[0];
-        }
-        else if (conditions.length > 0 || expressions.length > 0) {
-            // Combine the conditions within the `em.find` join literal & the `conditions` as ANDs
-            return { kind: "exp", op: "and", conditions: [...conditions, ...expressions] };
-        }
-        return undefined;
-    }
-}
-exports.ConditionBuilder = ConditionBuilder;
-/** Converts domain-level values like string ids/enums into their db equivalent. */
 function mapToDb(column, filter) {
     // ...to teach this `mapToDb` function to handle/rewrite `in: [1, null]` handling, we'd need to:
     // 1. return a maybe-simple/maybe-nested condition, so basically a `ParsedExpressionCondition`, because
@@ -938,40 +795,26 @@ function filterSoftDeletes(meta, softDeletes) {
         // We don't support CTI subtype soft-delete filtering yet
         (meta.inheritanceType !== "cti" || meta.baseTypes.length === 0));
 }
-function parseExpression(expression) {
-    const [op, expressions] = "and" in expression && expression.and
-        ? ["and", expression.and]
-        : "or" in expression && expression.or
-            ? ["or", expression.or]
-            : (0, utils_1.fail)(`Invalid expression ${expression}`);
-    const conditions = expressions.map((exp) => (exp && ("and" in exp || "or" in exp) ? parseExpression(exp) : exp));
-    const [skip, valid] = (0, utils_1.partition)(conditions, (cond) => cond === undefined || cond === exports.skipCondition);
-    if ((skip.length > 0 && expression.pruneIfUndefined === "any") || valid.length === 0) {
-        return undefined;
-    }
-    return { kind: "exp", op, conditions: valid.filter(index_1.isDefined) };
-}
 function getTables(query) {
     let primary;
     const joins = [];
+    const laterals = [];
+    const crosses = [];
     for (const table of query.tables) {
         if (table.join === "primary") {
             primary = table;
         }
+        else if (table.join === "lateral") {
+            laterals.push(table);
+        }
+        else if (table.join === "cross") {
+            crosses.push(table);
+        }
         else {
             joins.push(table);
         }
     }
-    return [primary, joins];
-}
-function joinKeywords(join) {
-    return join.join === "inner" ? "JOIN" : "LEFT OUTER JOIN";
-}
-function joinClause(join) {
-    return `${joinKeywords(join)} ${(0, keywords_1.kq)(join.table)} ${(0, keywords_1.kq)(join.alias)} ON ${join.col1} = ${join.col2}`;
-}
-function joinClauses(joins) {
-    return joins.map((t) => (t.join !== "primary" ? joinClause(t) : ""));
+    return [primary, joins, laterals, crosses];
 }
 function needsClassPerTableJoins(meta) {
     return meta.inheritanceType === "cti" && (meta.subTypes.length > 0 || meta.baseTypes.length > 0);