joist-orm 1.144.10 → 1.145.0

package/build/Aliases.d.ts

@@ -1,7 +1,7 @@
 import { Entity } from "./Entity";
 import { FieldsOf, IdOf, MaybeAbstractEntityConstructor, TaggedId } from "./EntityManager";
-import { EntityMetadata, Field, PolymorphicField } from "./EntityMetadata";
-import { ColumnCondition } from "./QueryParser";
+import { EntityMetadata, PolymorphicField } from "./EntityMetadata";
+import { ColumnCondition, RawCondition } from "./QueryParser";
 import { ExpressionFilter } from "./index";
 /** Creates an alias for complex filtering against `T`. */
 export declare function alias<T extends Entity>(cstr: MaybeAbstractEntityConstructor<T>): Alias<T>;
@@ -23,13 +23,13 @@ export type Alias<T extends Entity> = {
     } ? PolyReferenceAlias<U> : never;
 };
 export interface PrimitiveAlias<V, N extends null | never> {
-    eq(value: V | N | undefined): ColumnCondition;
-    ne(value: V | N | undefined): ColumnCondition;
+    eq(value: V | N | undefined | PrimitiveAlias<V, any>): ColumnCondition | RawCondition;
+    ne(value: V | N | undefined | PrimitiveAlias<V, any>): ColumnCondition | RawCondition;
     in(values: V[] | undefined): ColumnCondition;
-    gt(value: V | undefined): ColumnCondition;
-    gte(value: V | undefined): ColumnCondition;
-    lt(value: V | undefined): ColumnCondition;
-    lte(value: V | undefined): ColumnCondition;
+    gt(value: V | undefined | PrimitiveAlias<V, any>): ColumnCondition | RawCondition;
+    gte(value: V | undefined | PrimitiveAlias<V, any>): ColumnCondition | RawCondition;
+    lt(value: V | undefined | PrimitiveAlias<V, any>): ColumnCondition | RawCondition;
+    lte(value: V | undefined | PrimitiveAlias<V, any>): ColumnCondition | RawCondition;
     like(value: V | undefined): ColumnCondition;
     ilike(value: V | undefined): ColumnCondition;
     search(value: V | undefined): ColumnCondition;
@@ -46,20 +46,17 @@ export interface AliasMgmt {
     tableName: string;
     setAlias(meta: EntityMetadata, alias: string): void;
 }
-type ConditionAndAlias = {
-    cond: ColumnCondition;
-    field: Field & {
-        aliasSuffix: string;
-    };
-};
+/** Called when `em.find` binds a pre-created `alias(...)` to a concrete join-tree location. */
+type BindCallback = (newMeta: EntityMetadata, newAlias: string) => void;
 export declare function newAliasProxy<T extends Entity>(cstr: MaybeAbstractEntityConstructor<T>): Alias<T>;
 export declare function isAlias(obj: any): obj is Alias<any> & {
     [aliasMgmt]: AliasMgmt;
 };
 declare class PolyReferenceAlias<T extends Entity> {
-    private conditions;
+    private meta;
+    private callbacks;
     private field;
-    constructor(conditions: ConditionAndAlias[], field: PolymorphicField & {
+    constructor(meta: EntityMetadata, callbacks: BindCallback[], field: PolymorphicField & {
         aliasSuffix: string;
     });
     eq(value: T | TaggedId | null | undefined): ExpressionFilter | ColumnCondition;

package/build/Aliases.d.ts.map

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

package/build/Aliases.js

@@ -19,27 +19,16 @@ exports.aliases = aliases;
 exports.aliasMgmt = Symbol("aliasMgmt");
 function newAliasProxy(cstr) {
     const meta = (0, EntityMetadata_1.getMetadata)(cstr);
-    // Keeps a list of conditions we've created for this specific proxy, so that parseFindQuery
+    // Keeps a list of callbacks we've created for this specific proxy, so that parseFindQuery
     // can tell us, after we've been creating via the `const a = alias(Author)` command, which
     // alias we're actually bound to in the join literal.
-    const conditions = [];
+    const callbacks = [];
     // Give QueryBuilder a hook to assign our actual alias
     const mgmt = {
         tableName: meta.tableName,
         setAlias(newMeta, newAlias) {
-            conditions.forEach(({ cond, field }) => {
-                // Do we have mismatched `em.find(ChildMeta)` with a `alias(BaseMeta)`? If so, the
-                // usual `${field.aliasSuffix}` won't know it should have a suffix, so we need to calc it.
-                if (newMeta !== meta) {
-                    const bases = (0, EntityMetadata_1.getBaseAndSelfMetas)(newMeta);
-                    const fieldIsFromBase = bases.includes(newMeta);
-                    if (fieldIsFromBase) {
-                        cond.alias = `${newAlias}_b0`;
-                        return;
-                    }
-                }
-                cond.alias = `${newAlias}${field.aliasSuffix}`;
-            });
+            for (const callback of callbacks)
+                callback(newMeta, newAlias);
         },
     };
     return new Proxy(cstr, {
@@ -53,11 +42,11 @@ function newAliasProxy(cstr) {
                 case "primaryKey":
                 case "primitive":
                 case "enum":
-                    return new PrimitiveAliasImpl(field, conditions, field.serde.columns[0]);
+                    return new PrimitiveAliasImpl(meta, field, callbacks, field.serde.columns[0]);
                 case "m2o":
-                    return new EntityAliasImpl(field, conditions, field.serde.columns[0]);
+                    return new EntityAliasImpl(meta, field, callbacks, field.serde.columns[0]);
                 case "poly":
-                    return new PolyReferenceAlias(conditions, field);
+                    return new PolyReferenceAlias(meta, callbacks, field);
                 default:
                     throw new Error(`Unsupported alias field kind ${field.kind}`);
             }
@@ -70,30 +59,80 @@ function isAlias(obj) {
     return obj && typeof obj === "function" && obj[exports.aliasMgmt] !== undefined;
 }
 exports.isAlias = isAlias;
-class PrimitiveAliasImpl {
+class AbstractAliasColumn {
+    meta;
     field;
-    conditions;
+    callbacks;
     column;
-    constructor(field, conditions, column) {
+    constructor(meta, field, callbacks, column) {
+        this.meta = meta;
         this.field = field;
-        this.conditions = conditions;
+        this.callbacks = callbacks;
         this.column = column;
     }
+    addCondition(value) {
+        const cond = {
+            kind: "column",
+            alias: "unset",
+            column: this.column.columnName,
+            dbType: this.column.dbType,
+            cond: (0, QueryParser_1.mapToDb)(this.column, value),
+        };
+        this.callbacks.push((newMeta, newAlias) => {
+            cond.alias = getMaybeCtiAlias(this.meta, this.field, newMeta, newAlias);
+        });
+        return cond;
+    }
+    addCrossColumnRawCondition(otherColumn, op) {
+        const cond = {
+            kind: "raw",
+            aliases: [],
+            condition: `unset1.${this.column.columnName} ${op} unset2.${otherColumn.column.columnName}`,
+            pruneable: false,
+            bindings: [],
+        };
+        // Update `unset1` placeholder when we're bound
+        this.callbacks.push((newMeta, newAlias) => {
+            // Add a base-table/sub-table alias if needed
+            const alias = getMaybeCtiAlias(this.meta, this.field, newMeta, newAlias);
+            if (!cond.aliases.includes(alias))
+                cond.aliases.push(alias);
+            cond.condition = cond.condition.replace("unset1", alias);
+        });
+        // Update `unset2` placeholder when we're bound
+        otherColumn.callbacks.push((newMeta, newAlias) => {
+            // Add a base-table/sub-table alias if needed
+            const alias = getMaybeCtiAlias(otherColumn.meta, otherColumn.field, newMeta, newAlias);
+            // Kinda weird, we can get bound a few times
+            if (!cond.aliases.includes(alias))
+                cond.aliases.push(alias);
+            cond.condition = cond.condition.replace("unset2", alias);
+        });
+        return cond;
+    }
+}
+class PrimitiveAliasImpl extends AbstractAliasColumn {
     eq(value) {
         if (value === undefined) {
             return QueryParser_1.skipCondition;
         }
+        else if (value instanceof PrimitiveAliasImpl) {
+            return this.addCrossColumnRawCondition(value, "=");
+        }
         else if (value === null) {
             return this.addCondition({ kind: "is-null" });
         }
         else {
-            return this.addCondition({ kind: "eq", value });
+            return this.addCondition({ kind: "eq", value: value });
         }
     }
     ne(value) {
         if (value === undefined) {
             return QueryParser_1.skipCondition;
         }
+        else if (value instanceof PrimitiveAliasImpl) {
+            return this.addCrossColumnRawCondition(value, "!=");
+        }
         else if (value === null) {
             return this.addCondition({ kind: "not-null" });
         }
@@ -102,24 +141,48 @@ class PrimitiveAliasImpl {
         }
     }
     gt(value) {
-        if (value === undefined)
+        if (value === undefined) {
             return QueryParser_1.skipCondition;
-        return this.addCondition({ kind: "gt", value });
+        }
+        else if (value instanceof PrimitiveAliasImpl) {
+            return this.addCrossColumnRawCondition(value, ">");
+        }
+        else {
+            return this.addCondition({ kind: "gt", value });
+        }
     }
     gte(value) {
-        if (value === undefined)
+        if (value === undefined) {
             return QueryParser_1.skipCondition;
-        return this.addCondition({ kind: "gte", value });
+        }
+        else if (value instanceof PrimitiveAliasImpl) {
+            return this.addCrossColumnRawCondition(value, ">=");
+        }
+        else {
+            return this.addCondition({ kind: "gte", value });
+        }
     }
     lt(value) {
-        if (value === undefined)
+        if (value === undefined) {
             return QueryParser_1.skipCondition;
-        return this.addCondition({ kind: "lt", value });
+        }
+        else if (value instanceof PrimitiveAliasImpl) {
+            return this.addCrossColumnRawCondition(value, "<");
+        }
+        else {
+            return this.addCondition({ kind: "lt", value });
+        }
     }
     lte(value) {
-        if (value === undefined)
+        if (value === undefined) {
             return QueryParser_1.skipCondition;
-        return this.addCondition({ kind: "lte", value });
+        }
+        else if (value instanceof PrimitiveAliasImpl) {
+            return this.addCrossColumnRawCondition(value, "<=");
+        }
+        else {
+            return this.addCondition({ kind: "lte", value });
+        }
     }
     between(v1, v2) {
         if (v1 === undefined || v2 === undefined)
@@ -146,26 +209,8 @@ class PrimitiveAliasImpl {
             return QueryParser_1.skipCondition;
         return this.addCondition({ kind: "in", value: values });
     }
-    addCondition(value) {
-        const cond = {
-            alias: "unset",
-            column: this.column.columnName,
-            dbType: this.column.dbType,
-            cond: (0, QueryParser_1.mapToDb)(this.column, value),
-        };
-        this.conditions.push({ cond, field: this.field });
-        return cond;
-    }
 }
-class EntityAliasImpl {
-    field;
-    conditions;
-    column;
-    constructor(field, conditions, column) {
-        this.field = field;
-        this.conditions = conditions;
-        this.column = column;
-    }
+class EntityAliasImpl extends AbstractAliasColumn {
     eq(value) {
         if (value === undefined) {
             return QueryParser_1.skipCondition;
@@ -174,7 +219,7 @@ class EntityAliasImpl {
             return this.addCondition({ kind: "is-null" });
         }
         else {
-            return this.addCondition({ kind: "eq", value });
+            return this.addCondition({ kind: "eq", value: value });
         }
     }
     ne(value) {
@@ -185,7 +230,7 @@ class EntityAliasImpl {
             return this.addCondition({ kind: "not-null" });
         }
         else {
-            return this.addCondition({ kind: "ne", value });
+            return this.addCondition({ kind: "ne", value: value });
         }
     }
     in(values) {
@@ -193,22 +238,14 @@ class EntityAliasImpl {
             return QueryParser_1.skipCondition;
         return this.addCondition({ kind: "in", value: values });
     }
-    addCondition(value) {
-        const cond = {
-            alias: "unset",
-            column: this.column.columnName,
-            dbType: this.column.dbType,
-            cond: (0, QueryParser_1.mapToDb)(this.column, value),
-        };
-        this.conditions.push({ cond, field: this.field });
-        return cond;
-    }
 }
 class PolyReferenceAlias {
-    conditions;
+    meta;
+    callbacks;
     field;
-    constructor(conditions, field) {
-        this.conditions = conditions;
+    constructor(meta, callbacks, field) {
+        this.meta = meta;
+        this.callbacks = callbacks;
         this.field = field;
     }
     eq(value) {
@@ -252,13 +289,32 @@ class PolyReferenceAlias {
     addCondition(comp, value) {
         const column = this.field.serde.columns.find((c) => c.columnName === comp.columnName) ?? (0, utils_1.fail)("Missing column");
         const cond = {
+            kind: "column",
             alias: "unset",
             column: comp.columnName,
             dbType: this.field.serde.columns[0].dbType,
             cond: (0, QueryParser_1.mapToDb)(column, value),
         };
-        this.conditions.push({ cond, field: this.field });
+        this.callbacks.push((newMeta, newAlias) => {
+            cond.alias = getMaybeCtiAlias(this.meta, this.field, newMeta, newAlias);
+        });
         return cond;
     }
 }
+/**
+ * Given an alias created for `meta`, adjusts the alias if it's bound to a potentially
+ * different parent-/sub-meta in the join tree.
+ */
+function getMaybeCtiAlias(meta, field, newMeta, newAlias) {
+    // Do we have mismatched `em.find(ChildMeta)` with a `alias(BaseMeta)`? If so, the
+    // usual `${field.aliasSuffix}` won't know it should have a suffix, so we need to calc it.
+    if (newMeta !== meta) {
+        const bases = (0, EntityMetadata_1.getBaseAndSelfMetas)(newMeta);
+        const fieldIsFromBase = bases.includes(newMeta);
+        if (fieldIsFromBase) {
+            return `${newAlias}_b0`;
+        }
+    }
+    return `${newAlias}${field.aliasSuffix}`;
+}
 //# sourceMappingURL=Aliases.js.map

package/build/Aliases.js.map

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

package/build/EntityFilter.d.ts

@@ -1,7 +1,7 @@
 import { Alias } from "./Aliases";
 import { Entity } from "./Entity";
 import { FieldsOf, FilterOf, IdOf, OrderOf } from "./EntityManager";
-import { ColumnCondition } from "./QueryParser";
+import { ColumnCondition, RawCondition } from "./QueryParser";
 /** Combines a `where` filter with optional `orderBy`, `limit`, and `offset` settings. */
 export type FilterAndSettings<T extends Entity> = {
     where: FilterWithAlias<T>;
@@ -81,12 +81,16 @@ export type ValueFilter<V, N> = V | readonly V[] | N | undefined | {
 } | {
     between: [V, V] | undefined;
 };
-/** Filters against complex expressions of filters. */
+/**
+ * Filters against complex expressions of filters.
+ *
+ * This is the user-facing DSL that internally will be converted to `ParsedExpressionFilter.
+ */
 export type ExpressionFilter = ({
-    and: Array<ExpressionFilter | ColumnCondition | undefined>;
+    and: Array<ExpressionFilter | ColumnCondition | RawCondition | undefined>;
     or?: never;
 } | {
-    or: Array<ExpressionFilter | ColumnCondition | undefined>;
+    or: Array<ExpressionFilter | ColumnCondition | RawCondition | undefined>;
     and?: never;
 }) & {
     pruneIfUndefined?: "any" | "all";

package/build/EntityFilter.d.ts.map

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

package/build/QueryParser.d.ts

@@ -1,11 +1,14 @@
 import { ExpressionFilter, OrderBy, ValueFilter } from "./EntityFilter";
 import { EntityMetadata } from "./EntityMetadata";
 import { Column } from "./index";
+/** A tree of ANDs/ORs with conditions or nested conditions. */
 export interface ParsedExpressionFilter {
+    kind: "exp";
     op: "and" | "or";
-    conditions: (ParsedExpressionFilter | ColumnCondition)[];
+    conditions: (ParsedExpressionFilter | ColumnCondition | RawCondition)[];
 }
 export interface ColumnCondition {
+    kind: "column";
     alias: string;
     column: string;
     dbType: string;
@@ -16,6 +19,18 @@ export interface ColumnCondition {
      */
     pruneable?: boolean;
 }
+/** A user-provided condition like `SUM(${alias}.amount) > 1000` or `a1.last_name = b1.title`. */
+export interface RawCondition {
+    kind: "raw";
+    /** The aliases, i.e. `[a, b]`, used within the condition, to ensure we don't prune them. */
+    aliases: string[];
+    /** The condition itself, i.e. `SUM(a.age) DESC`. */
+    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;
+}
 /** A marker condition for alias methods to indicate they should be skipped/pruned. */
 export declare const skipCondition: ColumnCondition;
 export interface PrimaryTable {

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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"}