joist-orm 1.50.6 → 1.52.0

package/build/src/EntityMetadata.d.ts

@@ -17,7 +17,7 @@ export interface EntityMetadata<T extends Entity> {
     tagName: string;
     fields: Record<string, Field>;
     allFields: Record<string, Field & {
-        alias: string;
+        aliasSuffix: string;
     }>;
     config: ConfigApi<T, any>;
     timestampFields: TimestampFields;

package/build/src/QueryBuilder.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.abbreviation = exports.buildQuery = void 0;
-const joist_utils_1 = require("joist-utils");
-const Entity_1 = require("./Entity");
 const EntityGraphQLFilter_1 = require("./EntityGraphQLFilter");
 const EntityManager_1 = require("./EntityManager");
 const EntityMetadata_1 = require("./EntityMetadata");
@@ -18,115 +16,36 @@ const utils_1 = require("./utils");
 function buildQuery(knex, type, filter) {
     const meta = (0, EntityMetadata_1.getMetadata)(type);
     const { where, orderBy, limit, offset } = filter;
-    const aliases = {};
-    function getAlias(tableName) {
-        const abbrev = abbreviation(tableName);
-        const i = aliases[abbrev] || 0;
-        aliases[abbrev] = i + 1;
-        return i === 0 ? abbrev : `${abbrev}${i}`;
-    }
-    const alias = getAlias(meta.tableName);
-    let query = knex.select(`${alias}.*`).from(`${meta.tableName} AS ${alias}`);
-    // Define a function for recursively adding joins & filters
-    function addClauses(meta, alias, where, orderBy) {
-        // Combine the where and orderBy keys so that we can add them to aliases as that same time
-        // Filter out undefined values as they should be ignored (for now?)
-        const keys = [
-            ...(where ? Object.keys(where).filter((key) => where[key] !== undefined) : []),
-            ...(orderBy ? Object.keys(orderBy).filter((key) => orderBy[key] !== undefined) : []),
-        ];
-        keys.forEach((key) => {
-            const field = meta.allFields[key] ?? (0, utils_1.fail)(`${key} not found`);
-            // We may/may not have a where clause or orderBy for this key, but we should have at least one of them.
-            const clause = where && where[key];
-            const hasClause = where && key in where;
-            const order = orderBy && orderBy[key];
-            const hasOrder = !!order;
-            if (field.kind === "poly") {
-                if (Array.isArray(clause)) {
-                    const ids = clause.map((e) => (0, index_1.maybeResolveReferenceToId)(e));
-                    const idsByConstructor = (0, joist_utils_1.groupBy)(ids, (id) => (0, index_1.getConstructorFromTaggedId)(id).name);
-                    query = query.where((query) => field.serde.columns.reduce((query, { columnName, otherMetadata, mapToDb }) => {
-                        const ids = idsByConstructor[otherMetadata().cstr.name];
-                        return ids && ids.length > 0 ? query.orWhereIn(`${alias}.${columnName}`, ids.map(mapToDb)) : query;
-                    }, query));
-                }
-                else if ((0, Entity_1.isEntity)(clause) || typeof clause === "string") {
-                    query = addPolyClause(query, alias, field, meta, clause);
-                }
-                else if (clause === null) {
-                    query = field.components.reduce((query, component) => addPolyClause(query, alias, field, meta, 
-                    // Not really sure if this is safe, being lazy for now...
-                    (0, index_1.asConcreteCstr)(component.otherMetadata().cstr), clause), query);
-                }
-                else if (typeof clause === "object" && Object.keys(clause).length === 1 && "ne" in clause) {
-                    const { ne: value } = clause;
-                    if ((0, Entity_1.isEntity)(value) || typeof value === "string") {
-                        const column = polyColumnFor(meta, field, value);
-                        query = query.where((query) => query
-                            .whereNot(`${alias}.${column.columnName}`, column.mapToDb(value))
-                            // for some reason whereNot excludes null values, so explicitly include them here
-                            .orWhereNull(`${alias}.${column.columnName}`));
-                    }
-                    else if (value === null) {
-                        query = query.where((b) => field.components.reduce((b, { columnName }) => b.orWhereNotNull(`${alias}.${columnName}`), b));
-                    }
-                }
-            }
-            else if (field.kind === "o2o") {
-                // Add `otherTable.column = ...` clause, unless `key` is not in `where`, i.e. there is only an orderBy for this fk
-                const otherMeta = field.otherMetadata();
-                const otherAlias = getAlias(otherMeta.tableName);
-                const otherColumn = otherMeta.fields[field.otherFieldName];
-                query = query.leftJoin(`${otherMeta.tableName} AS ${otherAlias}`, `${otherAlias}.${otherColumn.serde.columns[0].columnName}`, `${alias}.id`);
-                const [shouldAddClauses, _query] = hasClause
-                    ? addForeignKeyClause(query, otherAlias, otherMeta.fields["id"].serde.columns[0], clause)
-                    : [false, query];
-                query = _query;
-                if (shouldAddClauses || hasOrder) {
-                    addClauses(otherMeta, otherAlias, shouldAddClauses ? clause : undefined, hasOrder ? order : undefined);
-                }
-            }
-            else if (field.kind === "m2o") {
-                const serde = (meta.fields[key] ?? (0, utils_1.fail)(`${key} not found`)).serde;
-                // TODO Currently hardcoded to single-column support; poly is handled above this
-                const column = serde.columns[0];
-                // Add `otherTable.column = ...` clause, unless `key` is not in `where`, i.e. there is only an orderBy for this fk
-                const [whereNeedsJoin, _query] = hasClause ? addForeignKeyClause(query, alias, column, clause) : [false, query];
-                query = _query;
-                if (whereNeedsJoin || hasOrder) {
-                    // Add a join for this column
-                    const otherMeta = field.otherMetadata();
-                    const otherAlias = getAlias(otherMeta.tableName);
-                    query = query.innerJoin(`${otherMeta.tableName} AS ${otherAlias}`, `${alias}.${column.columnName}`, `${otherAlias}.id`);
-                    // Then recurse to add its conditions to the query
-                    addClauses(otherMeta, otherAlias, whereNeedsJoin ? clause : undefined, hasOrder ? order : undefined);
-                }
-            }
-            else {
-                const field = meta.allFields[key] ?? (0, utils_1.fail)(`${key} not found`);
-                const serde = field.serde;
-                // TODO Currently hardcoded to single-column support; poly is handled above this
-                const column = serde.columns[0];
-                // TODO Currently we only support base-type WHEREs if the sub-type is the main `em.find`
-                // const maybeBaseAlias = field.alias;
-                query = hasClause ? addPrimitiveClause(query, alias, column, clause) : query;
-                // This is not a foreign key column, so it'll have the primitive filters/order bys
-                if (order) {
-                    query = query.orderBy(`${alias}.${column.columnName}`, order);
-                }
-            }
+    const parsed = (0, index_1.parseFindQuery)(meta, filter.where, filter.orderBy);
+    const primary = parsed.tables.find((t) => t.join === "primary");
+    let query = knex.from(`${primary.table} AS ${primary.alias}`);
+    parsed.selects.forEach((s) => {
+        query.select(knex.raw(s));
+    });
+    parsed.tables.forEach((t) => {
+        if (t.join === "left") {
+            query.leftOuterJoin(`${t.table} AS ${t.alias}`, t.col1, t.col2);
+        }
+        else if (t.join !== "primary") {
+            query.join(`${t.table} AS ${t.alias}`, t.col1, t.col2);
+        }
+    });
+    parsed.conditions.forEach((c) => {
+        addColumnCondition(query, c);
+    });
+    parsed.complexConditions &&
+        parsed.complexConditions.forEach((c) => {
+            addComplexCondition(query, c);
+        });
+    parsed.orderBys &&
+        parsed.orderBys.forEach(({ alias, column, order }) => {
+            query.orderBy(`${alias}.${column}`, order);
         });
-    }
-    addClauses(meta, alias, where, orderBy);
-    if ((0, index_1.needsClassPerTableJoins)(meta)) {
-        (0, index_1.addTablePerClassJoinsAndClassTag)(knex, meta, query, alias);
-    }
     // Even if they already added orders, add id as the last one to get deterministic output
-    query = query.orderBy(`${alias}.id`);
-    query = query.limit(limit || EntityManager_1.entityLimit);
+    query.orderBy(`${primary.alias}.id`);
+    query.limit(limit || EntityManager_1.entityLimit);
     if (offset) {
-        query = query.offset(offset);
+        query.offset(offset);
     }
     return query;
 }
@@ -138,122 +57,55 @@ function abbreviation(tableName) {
         .join("");
 }
 exports.abbreviation = abbreviation;
-function polyColumnFor(meta, field, value) {
-    const cstr = typeof value === "function" ? value : (0, index_1.maybeGetConstructorFromReference)(value);
-    return (field.serde.columns.find((c) => c.otherMetadata().cstr === cstr) ??
-        (0, utils_1.fail)(`${cstr.name} cannot be used as a filter on ${field.fieldName}`));
-}
-function addPolyClause(query, alias, field, meta, value, clause) {
-    clause = clause === undefined ? value : clause;
-    const column = polyColumnFor(meta, field, value);
-    const [, result] = addForeignKeyClause(query, alias, column, clause);
-    return result;
-}
-function addForeignKeyClause(query, alias, column, clause) {
-    // I.e. this could be { authorFk: authorEntity | null | id | { ...recurse... } }
-    const clauseKeys = typeof clause === "object" && clause !== null
-        ? Object.keys(clause).filter((key) => clause[key] !== undefined)
-        : [];
-    if ((0, Entity_1.isEntity)(clause) || typeof clause === "string" || Array.isArray(clause)) {
-        // I.e. { authorFk: authorEntity | id | id[] }
-        if ((0, Entity_1.isEntity)(clause) && clause.id === undefined) {
-            // The user is filtering on an unsaved entity, which will just never have any rows, so throw in -1
-            return [false, query.where(`${alias}.${column.columnName}`, -1)];
-        }
-        else if (Array.isArray(clause)) {
-            return [
-                false,
-                query.whereIn(`${alias}.${column.columnName}`, clause.map((id) => column.mapToDb(id))),
-            ];
-        }
-        else {
-            return [false, query.where(`${alias}.${column.columnName}`, column.mapToDb(clause))];
-        }
-    }
-    else if (clause === null) {
-        // I.e. { authorFk: null | undefined }
-        return [false, query.whereNull(`${alias}.${column.columnName}`)];
-    }
-    else if (clauseKeys.length === 1 && clauseKeys[0] === "id") {
-        // I.e. { authorFk: { id: string } } || { authorFk: { id: string[] } }
-        // If only querying on the id, we can skip the join
-        return [false, addPrimitiveClause(query, alias, column, clause["id"])];
-    }
-    else if (clauseKeys.length === 1 && clauseKeys[0] === "ne") {
-        // I.e. { authorFk: { ne: string | null | undefined } }
-        const value = clause["ne"];
-        if (value === null || value === undefined) {
-            return [false, query.whereNotNull(`${alias}.${column.columnName}`)];
-        }
-        else if (typeof value === "string") {
-            return [false, query.whereNot(`${alias}.${column.columnName}`, column.mapToDb(value))];
-        }
-        else {
-            throw new Error("Not implemented");
-        }
-    }
-    else {
-        // I.e. { authorFk: { ...authorFilter... } }
-        return [clause !== undefined, query];
-    }
-}
-function addPrimitiveClause(query, alias, column, clause) {
-    if (clause && typeof clause === "object" && EntityGraphQLFilter_1.operators.find((op) => Object.keys(clause).includes(op))) {
-        // I.e. `{ primitiveField: { gt: value } }`
-        return Object.entries(clause).reduce((query, [op, value]) => addPrimitiveOperator(query, alias, column, op, value), query);
-    }
-    else if (clause && typeof clause === "object" && "op" in clause) {
-        // I.e. { primitiveField: { op: "gt", value: 1 } }`
-        return addPrimitiveOperator(query, alias, column, clause.op, clause.value);
-    }
-    else if (Array.isArray(clause)) {
-        // I.e. `{ primitiveField: value[] }`
-        if (column.isArray) {
-            return query.where(`${alias}.${column.columnName}`, "@>", column.mapToDb(clause));
-        }
-        else {
-            return query.whereIn(`${alias}.${column.columnName}`, clause.map((v) => column.mapToDb(v)));
-        }
-    }
-    else if (clause === null) {
-        // I.e. `{ primitiveField: null }`
-        return query.whereNull(`${alias}.${column.columnName}`);
-    }
-    else if (clause === undefined) {
-        // I.e. `{ primitiveField: undefined }`
-        // Currently we treat this like a partial filter, i.e. don't include it. Seems odd
-        // unless this is opt-in, i.e. maybe only do this for `findGql`?
-        return query;
-    }
-    else {
-        // I.e. `{ primitiveField: value }`
-        // TODO In theory could add a addToQuery method to Serde to generalize this to multi-columns fields.
-        return query.where(`${alias}.${column.columnName}`, column.mapToDb(clause));
-    }
+function addComplexCondition(query, complex) {
+    query.where((q) => {
+        const op = complex.op === "and" ? "andWhere" : "orWhere";
+        complex.conditions.forEach((c) => {
+            if ("op" in c) {
+                throw new Error("Not implemented");
+            }
+            else {
+                q[op]((q) => addColumnCondition(q, c));
+            }
+        });
+    });
 }
-function addPrimitiveOperator(query, alias, column, op, value) {
-    const columnName = `${alias}.${column.columnName}`;
-    if (value === null || value === undefined) {
-        if (op === "ne") {
-            return query.whereNotNull(columnName);
-        }
-        else if (op === "eq") {
-            return query.whereNull(columnName);
-        }
-        else {
-            throw new Error("Only ne is supported when the value is undefined or null");
-        }
-    }
-    else if (op === "in") {
-        return query.whereIn(columnName, value.map((v) => column.mapToDb(v)));
-    }
-    else if (op === "between") {
-        const values = value.map((v) => column.mapToDb(v));
-        return query.where(columnName, ">=", values[0]).where(columnName, "<=", values[1]);
-    }
-    else {
-        const fn = EntityGraphQLFilter_1.opToFn[op] ?? (0, utils_1.fail)(`Invalid operator ${op}`);
-        return query.where(columnName, fn, column.mapToDb(value));
+function addColumnCondition(query, cc) {
+    const { alias, column, cond } = cc;
+    const columnName = `${alias}.${column}`;
+    switch (cond.kind) {
+        case "eq":
+        case "ne":
+        case "gte":
+        case "gt":
+        case "lte":
+        case "lt":
+        case "like":
+        case "ilike":
+            const fn = EntityGraphQLFilter_1.opToFn[cond.kind] ?? (0, utils_1.fail)(`Invalid operator ${cond.kind}`);
+            query.where(columnName, fn, cond.value);
+            break;
+        case "is-null":
+            query.whereNull(columnName);
+            break;
+        case "not-null":
+            query.whereNotNull(columnName);
+            break;
+        case "in":
+            query.whereIn(columnName, cond.value);
+            break;
+        case "@>":
+            query.where(columnName, "@>", cond.value);
+            break;
+        case "between":
+            const [min, max] = cond.value;
+            query.where(columnName, ">=", min);
+            query.where(columnName, "<=", max);
+            break;
+        case "pass":
+            break;
+        default:
+            (0, utils_1.assertNever)(cond);
     }
 }
 //# sourceMappingURL=QueryBuilder.js.map

package/build/src/QueryBuilder.js.map

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

package/build/src/QueryParser.d.ts

@@ -1,20 +1,53 @@
-import { ValueFilter } from "./EntityFilter";
+import { OrderBy, ValueFilter } from "./EntityFilter";
 import { EntityMetadata } from "./EntityMetadata";
+export interface ExpressionCondition {
+    op: "and" | "or";
+    conditions: (ExpressionCondition | ColumnCondition)[];
+}
+export interface ColumnCondition {
+    alias: string;
+    column: string;
+    cond: ParsedValueFilter<any>;
+}
+interface PrimaryTable {
+    join: "primary";
+    alias: string;
+    table: string;
+}
+interface JoinTable {
+    join: "m2o" | "o2m" | "o2o" | "left";
+    alias: string;
+    table: string;
+    col1: string;
+    col2: string;
+}
+type ParsedTable = PrimaryTable | JoinTable;
+interface ParsedOrderBy {
+    alias: string;
+    column: string;
+    order: OrderBy;
+}
+/** The result of parsing an `em.find` filter. */
+interface ParsedFindQuery {
+    selects: string[];
+    /** The primary table plus any joins. */
+    tables: ParsedTable[];
+    /** Simple conditions that are ANDd together. */
+    conditions: ColumnCondition[];
+    /** Any optional complex conditions that will be ANDd with the simple conditions. */
+    complexConditions?: ExpressionCondition[];
+    /** Any optional orders to add before the default 'order by id'. */
+    orderBys?: ParsedOrderBy[];
+}
+/** Parses an `em.find` filter into a `ParsedFindQuery` for simpler execution. */
+export declare function parseFindQuery(meta: EntityMetadata<any>, filter: any, orderBy?: any): ParsedFindQuery;
 /** An ADT version of `EntityFilter`. */
-export type ParsedEntityFilter = {
-    kind: "eq";
-    id: number | null;
-} | {
-    kind: "ne";
-    id: number | null;
-} | {
-    kind: "in";
-    ids: number[];
-} | {
+export type ParsedEntityFilter = ParsedValueFilter<string | number> | {
     kind: "join";
-    subFilter: any;
+    subFilter: object;
 };
-export declare function parseEntityFilter(meta: EntityMetadata<any>, filter: any): ParsedEntityFilter;
+/** Parses an entity filter, which could be "just an id", an array of ids, or a nested filter. */
+export declare function parseEntityFilter(filter: any): ParsedEntityFilter;
 /**
  * An ADT version of `ValueFilter`.
  *
@@ -22,10 +55,13 @@ export declare function parseEntityFilter(meta: EntityMetadata<any>, filter: any
  */
 export type ParsedValueFilter<V> = {
     kind: "eq";
-    value: V | null;
+    value: V;
 } | {
     kind: "in";
     value: V[];
+} | {
+    kind: "@>";
+    value: V[];
 } | {
     kind: "gt";
     value: V;
@@ -34,7 +70,11 @@ export type ParsedValueFilter<V> = {
     value: V;
 } | {
     kind: "ne";
-    value: V | null;
+    value: V;
+} | {
+    kind: "is-null";
+} | {
+    kind: "not-null";
 } | {
     kind: "lt";
     value: V;
@@ -54,3 +94,4 @@ export type ParsedValueFilter<V> = {
     value: [V, V];
 };
 export declare function parseValueFilter<V>(filter: ValueFilter<V, any>): ParsedValueFilter<V>;
+export {};