@avytrix/nestjs-drizzle-crud 3.5.1 → 3.7.0

package/dist/core/abstract/sql-base-crud.service.js

@@ -66,6 +66,10 @@ class SqlBaseCrudService {
             return result.rowsAffected > 0;
         if (typeof result.affectedRows === "number")
             return result.affectedRows > 0;
+        if (typeof result.changes === "number")
+            return result.changes > 0;
+        if (typeof result.meta?.changes === "number")
+            return result.meta.changes > 0;
         return false;
     }
     buildWhereConditionsFromPartial(where) {
@@ -196,6 +200,18 @@ class SqlBaseCrudService {
             return [];
         return Object.entries(values).map(([key, value]) => value === null ? (0, drizzle_orm_1.isNull)(table[key]) : (0, drizzle_orm_1.eq)(table[key], value));
     }
+    relatedRowScope(target, options) {
+        const out = this.relatedScopeConditions(target, options);
+        const softDeleted = this.softDeleteCondition(target);
+        if (softDeleted)
+            out.push(softDeleted);
+        return out;
+    }
+    relatedScopeConditions(target, options) {
+        return Object.entries(this.resolveScope(options) ?? {})
+            .filter(([key]) => this.columnOf(target, key))
+            .map(([key, value]) => value === null ? (0, drizzle_orm_1.isNull)(target[key]) : (0, drizzle_orm_1.eq)(target[key], value));
+    }
     applyScopeToRow(row, options) {
         const values = this.resolveScope(options);
         if (values)
@@ -497,7 +513,7 @@ class SqlBaseCrudService {
         }
         return Object.keys(fields).length > 0 ? fields : undefined;
     }
-    async loadRelations(db, hosts, nodes, select = { base: [], relations: {} }, hostTable = this.config.table) {
+    async loadRelations(db, hosts, nodes, select = { base: [], relations: {} }, hostTable = this.config.table, options) {
         if (!nodes.length || !Array.isArray(hosts))
             return;
         const rows = hosts.filter((row) => row && typeof row === "object");
@@ -508,13 +524,13 @@ class SqlBaseCrudService {
             if (!node.joined) {
                 switch (this.relationType(node.config)) {
                     case "hasMany":
-                        await this.loadHasMany(db, rows, node, childSelect, hostTable);
+                        await this.loadHasMany(db, rows, node, childSelect, hostTable, options);
                         break;
                     case "manyToMany":
-                        await this.loadManyToMany(db, rows, node, childSelect, hostTable);
+                        await this.loadManyToMany(db, rows, node, childSelect, hostTable, options);
                         break;
                     default:
-                        await this.loadBelongsTo(db, rows, node, childSelect);
+                        await this.loadBelongsTo(db, rows, node, childSelect, options);
                 }
             }
             if (node.children.length === 0)
@@ -522,10 +538,10 @@ class SqlBaseCrudService {
             const nextHosts = this.isCollection(node.config)
                 ? rows.flatMap((row) => row[node.name] ?? [])
                 : rows.map((row) => row[node.name]);
-            await this.loadRelations(db, nextHosts, node.children, childSelect, node.config.table);
+            await this.loadRelations(db, nextHosts, node.children, childSelect, node.config.table, options);
         }));
     }
-    async loadBelongsTo(db, hosts, node, select) {
+    async loadBelongsTo(db, hosts, node, select, options) {
         const { localKey, references } = node.config;
         if (!localKey)
             return;
@@ -545,9 +561,7 @@ class SqlBaseCrudService {
             ...this.keysForChildren(node.children, target),
         ]);
         const conditions = [(0, drizzle_orm_1.inArray)(referenced, ids)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         const related = await (fields ? db.select(fields) : db.select())
             .from(target)
             .where((0, drizzle_orm_1.and)(...conditions));
@@ -558,7 +572,7 @@ class SqlBaseCrudService {
             host[node.name] = byKey.get(host[localKey]) ?? null;
         }
     }
-    async loadHasMany(db, hosts, node, select, hostTable = this.config.table) {
+    async loadHasMany(db, hosts, node, select, hostTable = this.config.table, options) {
         const { foreignKey } = node.config;
         if (!foreignKey)
             return;
@@ -578,9 +592,7 @@ class SqlBaseCrudService {
             ...this.keysForChildren(node.children, target),
         ]);
         const conditions = [(0, drizzle_orm_1.inArray)(foreign, ids)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         let query = (fields ? db.select(fields) : db.select())
             .from(target)
             .where((0, drizzle_orm_1.and)(...conditions));
@@ -590,7 +602,7 @@ class SqlBaseCrudService {
         const children = await query;
         this.groupCollection(hosts, node.name, parentKey, children, foreignKey);
     }
-    async loadManyToMany(db, hosts, node, select, hostTable = this.config.table) {
+    async loadManyToMany(db, hosts, node, select, hostTable = this.config.table, options) {
         const { through, throughLocalKey, throughForeignKey, references } = node.config;
         if (!through || !throughLocalKey || !throughForeignKey)
             return;
@@ -618,9 +630,7 @@ class SqlBaseCrudService {
                 fields[name] = columns[name];
         }
         const conditions = [(0, drizzle_orm_1.inArray)(joinLocal, ids)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         let query = db
             .select(fields)
             .from(through)
@@ -650,7 +660,7 @@ class SqlBaseCrudService {
             host[name] = grouped.get(host[parentKey]) ?? [];
         }
     }
-    applyJoins(query, relationNames) {
+    applyJoins(query, relationNames, options) {
         const configured = this.config.relations || {};
         let q = query;
         for (const name of relationNames) {
@@ -658,8 +668,7 @@ class SqlBaseCrudService {
             if (!rel?.localKey || this.isCollection(rel))
                 continue;
             const on = (0, drizzle_orm_1.eq)(this.config.table[rel.localKey], rel.table[rel.references ?? "id"]);
-            const softDeleted = this.softDeleteCondition(rel.table);
-            q = q.leftJoin(rel.table, softDeleted ? (0, drizzle_orm_1.and)(on, softDeleted) : on);
+            q = q.leftJoin(rel.table, (0, drizzle_orm_1.and)(on, ...this.relatedRowScope(rel.table, options)));
         }
         return q;
     }
@@ -681,13 +690,13 @@ class SqlBaseCrudService {
             return out;
         });
     }
-    buildOrderBy(sortBy, sortOrder = "desc") {
+    buildOrderBy(sortBy, sortOrder = "asc") {
         return this.resolveSort(sortBy, sortOrder).map((spec) => this.orderOf(spec));
     }
     orderOf(spec) {
         return spec.order === "desc" ? (0, drizzle_orm_1.desc)(spec.column) : (0, drizzle_orm_1.asc)(spec.column);
     }
-    resolveSort(sortBy, sortOrder = "desc", options) {
+    resolveSort(sortBy, sortOrder = "asc", options) {
         if (sortOrder !== "asc" && sortOrder !== "desc") {
             throw new common_1.BadRequestException(`Invalid sortOrder: ${sortOrder} (expected 'asc' or 'desc')`);
         }
@@ -800,14 +809,37 @@ class SqlBaseCrudService {
     }
     isUniqueViolation(error) {
         const code = error?.code ?? error?.cause?.code;
-        return code === "23505";
+        const errno = error?.errno ?? error?.cause?.errno;
+        const sqlite = this.sqliteConstraint(error);
+        return (code === "23505" ||
+            code === "ER_DUP_ENTRY" ||
+            errno === 1062 ||
+            sqlite === "UNIQUE" ||
+            sqlite === "PRIMARYKEY");
+    }
+    sqliteConstraint(error) {
+        if (this.config.dialect !== "sqlite")
+            return undefined;
+        for (const e of [error, error?.cause]) {
+            const code = e?.extendedCode ?? e?.code;
+            if (typeof code === "string" && code.startsWith("SQLITE_CONSTRAINT_")) {
+                return code.slice("SQLITE_CONSTRAINT_".length);
+            }
+        }
+        const message = `${error?.cause?.message ?? ""} ${error?.message ?? ""}`;
+        const m = message.match(/(UNIQUE|PRIMARY KEY|FOREIGN KEY|NOT NULL|CHECK) constraint failed/);
+        return m?.[1]?.replace(" ", "");
     }
     toDuplicateException(error) {
         const detail = error?.detail ?? error?.cause?.detail ?? "";
-        const m = detail.match(/Key \((?<field>.+?)\)=\((?<value>.+?)\)/);
+        const message = error?.cause?.message ?? error?.message ?? "";
+        const m = detail.match(/Key \((?<field>.+?)\)=\((?<value>.+?)\)/) ??
+            message.match(/Duplicate entry '(?<value>.*)' for key '(?:[^']*\.)?(?<field>[^']+)'/) ??
+            message.match(/UNIQUE constraint failed: (?:[^.,\s]+\.)?(?<field>[^,\s]+)/);
         return new crud_exceptions_1.DuplicateEntityException(this.getEntityName(), m?.groups?.field ?? "unique field", m?.groups?.value ?? "");
     }
     static DATA_ERRORS = {
+        "23502": "a required value is missing",
         "22001": "a value is too long for its column",
         "23514": "a value violates a column check constraint",
         "22003": "a numeric value is out of range",
@@ -816,13 +848,54 @@ class SqlBaseCrudService {
         "22008": "a date or time value is out of range",
         "21000": "the same key appears more than once in one upsert",
     };
-    isDataException(error) {
+    static MYSQL_DATA_ERRORS = {
+        1048: "a required value is missing",
+        1364: "a required value is missing",
+        1406: "a value is too long for its column",
+        3819: "a value violates a column check constraint",
+        1264: "a numeric value is out of range",
+        1265: "a value does not match its column type",
+        1366: "a value does not match its column type",
+        1292: "a date or time value has an invalid format",
+    };
+    static SQLITE_DATA_ERRORS = {
+        NOTNULL: "a required value is missing",
+        CHECK: "a value violates a column check constraint",
+    };
+    dataErrorMessage(error) {
         const code = error?.code ?? error?.cause?.code;
-        return Object.hasOwn(SqlBaseCrudService.DATA_ERRORS, code ?? "");
+        if (Object.hasOwn(SqlBaseCrudService.DATA_ERRORS, code ?? "")) {
+            return SqlBaseCrudService.DATA_ERRORS[code];
+        }
+        if (this.config.dialect === "mysql") {
+            const errno = error?.errno ?? error?.cause?.errno;
+            return Object.hasOwn(SqlBaseCrudService.MYSQL_DATA_ERRORS, errno ?? "")
+                ? SqlBaseCrudService.MYSQL_DATA_ERRORS[errno]
+                : undefined;
+        }
+        const sqlite = this.sqliteConstraint(error) ?? "";
+        return Object.hasOwn(SqlBaseCrudService.SQLITE_DATA_ERRORS, sqlite)
+            ? SqlBaseCrudService.SQLITE_DATA_ERRORS[sqlite]
+            : undefined;
+    }
+    isDataException(error) {
+        return this.dataErrorMessage(error) !== undefined;
     }
     toDataException(error) {
-        const code = error?.code ?? error?.cause?.code;
-        return new crud_exceptions_1.ValidationFailedException(SqlBaseCrudService.DATA_ERRORS[code] ?? "invalid value");
+        const message = this.dataErrorMessage(error) ?? "invalid value";
+        const cause = error?.cause ?? error;
+        const text = String(cause?.message ?? "");
+        const column = error?.column ??
+            cause?.column ??
+            error?.column_name ??
+            cause?.column_name ??
+            (this.config.dialect === "mysql"
+                ? text.match(/column '([^']+)'/i)?.[1]
+                : undefined) ??
+            (this.config.dialect === "sqlite"
+                ? text.match(/NOT NULL constraint failed: (?:[^.\s]+\.)?(\S+)/)?.[1]
+                : undefined);
+        return new crud_exceptions_1.ValidationFailedException(column ? `${message}: ${column}` : message);
     }
     toClientError(error, operation = "write") {
         if (this.isUniqueViolation(error))
@@ -846,7 +919,11 @@ class SqlBaseCrudService {
     }
     isForeignKeyViolation(error) {
         const code = error?.code ?? error?.cause?.code;
-        return code === "23503";
+        const errno = error?.errno ?? error?.cause?.errno;
+        return (code === "23503" ||
+            errno === 1451 ||
+            errno === 1452 ||
+            this.sqliteConstraint(error) === "FOREIGNKEY");
     }
     toForeignKeyException(error) {
         const detail = error?.detail ?? error?.cause?.detail ?? "";
@@ -854,14 +931,37 @@ class SqlBaseCrudService {
         return new crud_exceptions_1.ForeignKeyViolationException(this.getEntityName(), m?.groups?.field ?? "reference");
     }
     applyLock(query, options) {
-        if (this.config.dialect !== "postgresql")
+        const strength = options?.forNoKeyUpdate
+            ? "no key update"
+            : options?.lock && options.lock !== "none"
+                ? options.lock
+                : undefined;
+        if (!strength)
             return query;
-        const of = { of: this.config.table };
-        if (options?.forNoKeyUpdate)
-            return query.for("no key update", of);
-        if (options?.lock && options.lock !== "none")
-            return query.for(options.lock, of);
-        return query;
+        if (this.config.dialect === "postgresql") {
+            return query.for(strength, { of: this.config.table });
+        }
+        if (this.config.dialect === "mysql") {
+            return query.for(strength === "share" ? "share" : "update");
+        }
+        throw new common_1.BadRequestException(`Row locks (lock, forNoKeyUpdate) are not supported on ${this.config.dialect}`);
+    }
+    textSearchConfig(language = "english") {
+        if (typeof language !== "string" ||
+            !/^[A-Za-z_][A-Za-z0-9_]{0,62}(\.[A-Za-z_][A-Za-z0-9_]{0,62})?$/.test(language)) {
+            throw new common_1.BadRequestException(`Invalid full-text search language: ${String(language)}`);
+        }
+        return drizzle_orm_1.sql.raw(`'${language}'`);
+    }
+    fullTextParts(columns, term, options = {}) {
+        const config = this.textSearchConfig(options.language);
+        const mode = options.queryMode ?? "plain";
+        if (mode !== "plain" && mode !== "websearch") {
+            throw new common_1.BadRequestException(`Invalid full-text query mode: ${String(mode)} (expected 'plain' or 'websearch')`);
+        }
+        const parse = drizzle_orm_1.sql.raw(mode === "websearch" ? "websearch_to_tsquery" : "plainto_tsquery");
+        const vector = drizzle_orm_1.sql.join(columns.map((column) => (0, drizzle_orm_1.sql) `to_tsvector(${config}, ${column})`), (0, drizzle_orm_1.sql) ` || `);
+        return { vector, query: (0, drizzle_orm_1.sql) `${parse}(${config}, ${term})` };
     }
     buildSearchCondition(search) {
         if (!search?.term || !search.columns?.length)
@@ -876,20 +976,24 @@ class SqlBaseCrudService {
             return undefined;
         if (search.mode === "fullText") {
             if (this.config.dialect !== "postgresql") {
-                throw new Error("Full-text search only supported in PostgreSQL");
+                throw new common_1.BadRequestException("Full-text search only supported in PostgreSQL");
             }
-            const tsVector = drizzle_orm_1.sql.join(columns.map((column) => (0, drizzle_orm_1.sql) `to_tsvector('english', ${column})`), (0, drizzle_orm_1.sql) ` || `);
-            const tsQuery = (0, drizzle_orm_1.sql) `plainto_tsquery('english', ${term})`;
-            return (0, drizzle_orm_1.sql) `${tsVector} @@ ${tsQuery}`;
+            const { vector, query } = this.fullTextParts(columns, term, search);
+            return (0, drizzle_orm_1.sql) `${vector} @@ ${query}`;
         }
         const pattern = `%${term.replace(/[\\%_]/g, "\\$&")}%`;
         const conditions = columns.map((column) => this.caseInsensitiveLike(column, pattern));
         return conditions.length === 1 ? conditions[0] : (0, drizzle_orm_1.or)(...conditions);
     }
     caseInsensitiveLike(column, pattern) {
-        return this.config.dialect === "mysql"
-            ? (0, drizzle_orm_1.like)(column, pattern)
-            : (0, drizzle_orm_1.ilike)(column, pattern);
+        if (this.config.dialect === "postgresql")
+            return (0, drizzle_orm_1.ilike)(column, pattern);
+        return this.likePattern(column, pattern);
+    }
+    likePattern(column, pattern) {
+        return this.config.dialect === "sqlite"
+            ? (0, drizzle_orm_1.sql) `${column} like ${pattern} escape '\\'`
+            : (0, drizzle_orm_1.like)(column, pattern);
     }
     parseQuery(query, options = {}) {
         const config = this.config;
@@ -1008,14 +1112,14 @@ class SqlBaseCrudService {
         const baseSelect = this.withCountKeys(this.withRequiredKeys(selection.base, nodes), options?.counts);
         conditions.push(...this.rowScope(options));
         let query = this.startSelect(db, baseSelect, joined, false, selection);
-        query = this.applyJoins(query, joined.map((node) => node.name))
+        query = this.applyJoins(query, joined.map((node) => node.name), options)
             .where((0, drizzle_orm_1.and)(...conditions))
             .limit(1);
         query = this.applyLock(query, options);
         const result = await this.runRead(query);
         const rows = this.normalizeRelations(result, joined.map((node) => node.name));
         await Promise.all([
-            this.loadRelations(db, rows, nodes, selection),
+            this.loadRelations(db, rows, nodes, selection, undefined, options),
             this.loadCounts(db, rows, options?.counts, options),
         ]);
         return rows[0] || null;
@@ -1055,22 +1159,22 @@ class SqlBaseCrudService {
         built.conditions.push(...this.rowScope(options));
         return built;
     }
-    buildCountQuery(db, conditions, filterRelations) {
+    buildCountQuery(db, conditions, filterRelations, options) {
         let query = db
             .select({ count: (0, drizzle_orm_1.sql) `count(*)` })
             .from(this.config.table);
-        query = this.applyJoins(query, filterRelations);
+        query = this.applyJoins(query, filterRelations, options);
         if (conditions.length > 0)
             query = query.where((0, drizzle_orm_1.and)(...conditions));
         return query;
     }
     async findAll(filters, pagination, options) {
-        const { sortBy, sortOrder = "desc" } = pagination || {};
+        const { sortBy, sortOrder = "asc" } = pagination || {};
         const withCount = pagination?.withCount !== false;
         const { page, limit: safeLimit, offset, } = this.resolvePagination(pagination?.page, pagination?.limit);
         const plan = this.planList(filters, sortBy, sortOrder, options);
         let dataQuery = this.startSelect(plan.db, plan.baseSelect, plan.joined, plan.joinRelations.length > 0, plan.selection);
-        dataQuery = this.applyJoins(dataQuery, plan.joinRelations);
+        dataQuery = this.applyJoins(dataQuery, plan.joinRelations, options);
         if (plan.conditions.length > 0) {
             dataQuery = dataQuery.where((0, drizzle_orm_1.and)(...plan.conditions));
         }
@@ -1082,13 +1186,13 @@ class SqlBaseCrudService {
             .offset(offset);
         dataQuery = this.applyLock(dataQuery, options);
         const countQuery = withCount
-            ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations)
+            ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations, options)
             : Promise.resolve(undefined);
         const [fetched, totalResult] = await this.runRead(Promise.all([dataQuery, countQuery]));
         const data = fetched.slice(0, safeLimit);
         const rows = this.normalizeRelations(data, plan.joined.map((node) => node.name));
         await Promise.all([
-            this.loadRelations(plan.db, rows, plan.nodes, plan.selection),
+            this.loadRelations(plan.db, rows, plan.nodes, plan.selection, undefined, options),
             this.loadCounts(plan.db, rows, options?.counts, options),
         ]);
         if (!withCount) {
@@ -1108,7 +1212,7 @@ class SqlBaseCrudService {
         };
     }
     async findByCursor(filters, pagination, options) {
-        const { sortBy, sortOrder = "desc", count = false } = pagination || {};
+        const { sortBy, sortOrder = "asc", count = false } = pagination || {};
         const { limit } = this.resolvePagination(1, pagination?.limit);
         const plan = this.planList(filters, sortBy, sortOrder, options);
         const signature = plan.sort
@@ -1128,7 +1232,7 @@ class SqlBaseCrudService {
             fields[`${CURSOR_KEY}${i}`] = this.cursorField(spec.column);
         });
         let dataQuery = plan.db.select(fields).from(this.config.table);
-        dataQuery = this.applyJoins(dataQuery, plan.joinRelations);
+        dataQuery = this.applyJoins(dataQuery, plan.joinRelations, options);
         if (conditions.length > 0)
             dataQuery = dataQuery.where((0, drizzle_orm_1.and)(...conditions));
         dataQuery = dataQuery
@@ -1138,7 +1242,7 @@ class SqlBaseCrudService {
         const [data, totalResult] = await this.runRead(Promise.all([
             dataQuery,
             count
-                ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations)
+                ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations, options)
                 : Promise.resolve(undefined),
         ]));
         const page = data.slice(0, limit);
@@ -1153,7 +1257,7 @@ class SqlBaseCrudService {
         }
         const rows = this.normalizeRelations(page, plan.joined.map((node) => node.name));
         await Promise.all([
-            this.loadRelations(plan.db, rows, plan.nodes, plan.selection),
+            this.loadRelations(plan.db, rows, plan.nodes, plan.selection, undefined, options),
             this.loadCounts(plan.db, rows, options?.counts, options),
         ]);
         const out = { data: rows, limit, nextCursor };
@@ -1195,7 +1299,7 @@ class SqlBaseCrudService {
         return branches.length > 0 ? (0, drizzle_orm_1.or)(...branches) : (0, drizzle_orm_1.sql) `false`;
     }
     afterCursor(spec, value) {
-        const postgres = this.config.dialect !== "mysql";
+        const postgres = this.config.dialect === "postgresql";
         const nullsFirst = postgres ? spec.order === "desc" : spec.order === "asc";
         if (value === null) {
             return nullsFirst ? (0, drizzle_orm_1.isNotNull)(spec.column) : undefined;
@@ -1229,7 +1333,7 @@ class SqlBaseCrudService {
         }
         const hosts = rows.filter(Boolean);
         await Promise.all([
-            this.loadRelations(db, hosts, nodes),
+            this.loadRelations(db, hosts, nodes, undefined, undefined, options),
             this.loadCounts(db, hosts, options?.counts, options),
         ]);
     }
@@ -1391,8 +1495,13 @@ class SqlBaseCrudService {
     relatedRow(table, value, options) {
         const out = {};
         for (const [key, item] of Object.entries(value)) {
-            if (item !== undefined && this.columnOf(table, key))
-                out[key] = item;
+            const column = this.columnOf(table, key);
+            if (item === undefined ||
+                !column ||
+                (column.primary && column.hasDefault)) {
+                continue;
+            }
+            out[key] = item;
         }
         const softDelete = this.config.softDelete;
         if (softDelete?.enabled)
@@ -1421,14 +1530,7 @@ class SqlBaseCrudService {
         const local = through[relation.throughLocalKey];
         const foreign = through[relation.throughForeignKey];
         const conditions = [(0, drizzle_orm_1.inArray)(referenced, wanted)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
-        for (const [key, value] of Object.entries(this.resolveScope(options) ?? {})) {
-            if (!this.columnOf(target, key))
-                continue;
-            conditions.push(value === null ? (0, drizzle_orm_1.isNull)(target[key]) : (0, drizzle_orm_1.eq)(target[key], value));
-        }
+        conditions.push(...this.relatedRowScope(target, options));
         const found = await tx
             .select({ id: referenced })
             .from(target)
@@ -1636,7 +1738,7 @@ class SqlBaseCrudService {
     }
     async softDelete(id, options) {
         if (!this.config.softDelete?.enabled) {
-            throw new Error("Soft delete is not enabled for this entity");
+            throw new common_1.BadRequestException("Soft delete is not enabled for this entity");
         }
         const { transaction, hooks = {} } = options || {};
         const existing = await this.findForGuard(id, {
@@ -1678,18 +1780,16 @@ class SqlBaseCrudService {
     }
     async restore(id, options) {
         if (!this.config.softDelete?.enabled) {
-            throw new Error("Soft delete is not enabled for this entity");
+            throw new common_1.BadRequestException("Soft delete is not enabled for this entity");
         }
         const { transaction, hooks = {} } = options || {};
-        if (options?.expectedVersion != null && this.config.versionColumn) {
-            const existing = await this.findForGuard(id, {
-                ...options,
-                withDeleted: true,
-                onlyDeleted: false,
-            });
-            if (!existing)
-                throw new crud_exceptions_1.EntityNotFoundException(this.getEntityName(), id);
-        }
+        const existing = await this.findForGuard(id, {
+            ...options,
+            withDeleted: false,
+            onlyDeleted: true,
+        });
+        if (!existing)
+            throw new crud_exceptions_1.EntityNotFoundException(this.getEntityName(), id);
         if (!hooks.skipBefore)
             await this.beforeRestore(id);
         await this.emitEvent("before", "restore", false, { ids: [id], transaction }, options);
@@ -1769,6 +1869,7 @@ class SqlBaseCrudService {
     }
     async massUpsert(data, upsert = {}, options) {
         this.checkReadOptions(options);
+        this.assertBatchSize(this.insertParameters(data));
         const message = "Mass upsert errors";
         return this.executeSqlTransaction(async (tx) => {
             const opts = { ...options, transaction: tx };
@@ -1873,21 +1974,25 @@ class SqlBaseCrudService {
             statement = insert.onDuplicateKeyUpdate({ set });
         }
         else {
-            const scoped = this.scopeConditions(options);
+            const guard = [
+                ...this.scopeConditions(options),
+                ...[this.softDeleteCondition(table)].filter(Boolean),
+            ];
             statement = insert.onConflictDoUpdate({
                 target: targets.length === 1 ? targets[0] : targets,
                 set,
-                ...(scoped.length > 0 && { where: (0, drizzle_orm_1.and)(...scoped) }),
+                ...(guard.length > 0 && { where: (0, drizzle_orm_1.and)(...guard) }),
             });
         }
         if (!readBack)
             return statement.returning();
         await statement;
         const match = rows.map((row) => (0, drizzle_orm_1.and)(...targetKeys.map((key, i) => (0, drizzle_orm_1.eq)(targets[i], row[key]))));
+        const softDeleted = this.softDeleteCondition(table);
         return db
             .select()
             .from(table)
-            .where(match.length === 1 ? match[0] : (0, drizzle_orm_1.or)(...match));
+            .where((0, drizzle_orm_1.and)(match.length === 1 ? match[0] : (0, drizzle_orm_1.or)(...match), ...this.scopeConditions(options), ...(softDeleted ? [softDeleted] : [])));
     }
     excludedValue(column) {
         return this.config.dialect === "mysql"
@@ -1899,6 +2004,7 @@ class SqlBaseCrudService {
             return this.massCreatePerItem(data, options);
         }
         this.checkReadOptions(options);
+        this.assertBatchSize(this.insertParameters(data));
         return this.executeSqlTransaction(async (tx) => {
             const opts = { ...options, transaction: tx };
             const rows = await this.eachItem(data.map((item, index) => ({
@@ -1957,6 +2063,7 @@ class SqlBaseCrudService {
         if (options?.bulkMode === "perItem") {
             return this.massUpdatePerItem(ids, data, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         this.checkReadOptions(options);
         const message = "Mass update errors";
         return this.executeSqlTransaction(async (tx) => {
@@ -2020,10 +2127,11 @@ class SqlBaseCrudService {
     }
     async massSoftDelete(ids, options) {
         if (!this.config.softDelete?.enabled)
-            throw new Error("Soft delete not enabled");
+            throw new common_1.BadRequestException("Soft delete not enabled");
         if (options?.bulkMode === "perItem") {
             return this.massSoftDeletePerItem(ids, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         const message = "Mass soft delete errors";
         return this.executeSqlTransaction(async (tx) => {
             const opts = {
@@ -2063,10 +2171,11 @@ class SqlBaseCrudService {
     }
     async massRestore(ids, options) {
         if (!this.config.softDelete?.enabled)
-            throw new Error("Soft delete not enabled");
+            throw new common_1.BadRequestException("Soft delete not enabled");
         if (options?.bulkMode === "perItem") {
             return this.massRestorePerItem(ids, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         this.checkReadOptions(options);
         const message = "Mass restore errors";
         return this.executeSqlTransaction(async (tx) => {
@@ -2104,6 +2213,7 @@ class SqlBaseCrudService {
         if (options?.bulkMode === "perItem") {
             return this.massDeletePerItem(ids, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         const message = "Mass delete errors";
         return this.executeSqlTransaction(async (tx) => {
             const opts = { ...options, transaction: tx };
@@ -2295,7 +2405,7 @@ class SqlBaseCrudService {
         this.checkReadOptions(options);
         const db = options?.transaction || this.config.db;
         const { conditions, relations: filterRelations } = this.listConditions(filters, db, options);
-        const result = await this.runRead(this.buildCountQuery(db, conditions, filterRelations));
+        const result = await this.runRead(this.buildCountQuery(db, conditions, filterRelations, options));
         return parseInt(result[0]?.count?.toString() || "0", 10);
     }
     async countBy(column, filters, options) {
@@ -2308,7 +2418,7 @@ class SqlBaseCrudService {
         let query = db
             .select({ value: spec.column, count: total })
             .from(this.config.table);
-        query = this.applyJoins(query, joins);
+        query = this.applyJoins(query, joins, options);
         if (conditions.length > 0)
             query = query.where((0, drizzle_orm_1.and)(...conditions));
         query = query.groupBy(spec.column).orderBy((0, drizzle_orm_1.desc)(total), (0, drizzle_orm_1.asc)(spec.column));
@@ -2418,9 +2528,7 @@ class SqlBaseCrudService {
                 root: false,
             }, filter, db, new Set(), options));
         }
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         const total = (0, drizzle_orm_1.sql) `count(*)`;
         if (this.relationType(relation) === "manyToMany") {
             const joinLocal = relation.through[relation.throughLocalKey];
@@ -2442,6 +2550,7 @@ class SqlBaseCrudService {
     }
     pushColumnCondition(conditions, column, value, caseInsensitive = this.config.sql?.caseSensitive === false) {
         if (Array.isArray(value)) {
+            this.assertBatchSize(value.length);
             conditions.push((0, drizzle_orm_1.inArray)(column, value.map((item) => this.coerceFilterValue(column, item))));
         }
         else if ((0, merge_config_1.isPlainObject)(value)) {
@@ -2463,9 +2572,9 @@ class SqlBaseCrudService {
         const targetConditions = this.compileFilterAt(this.relationHost(relation, relation.table, name), value, db, new Set(), options);
         if (targetConditions.length === 0)
             return undefined;
-        return this.collectionCondition(relation, targetConditions, db, this.rootHost());
+        return this.collectionCondition(relation, targetConditions, db, this.rootHost(), options);
     }
-    collectionCondition(relation, targetConditions, db, host) {
+    collectionCondition(relation, targetConditions, db, host, options) {
         const target = relation.table;
         const manyToMany = this.relationType(relation) === "manyToMany";
         const joinLocal = manyToMany
@@ -2475,9 +2584,7 @@ class SqlBaseCrudService {
         if (!key)
             return undefined;
         const conditions = [...targetConditions];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         let subquery;
         if (manyToMany) {
             const referenced = target[relation.references ?? "id"];
@@ -2506,9 +2613,7 @@ class SqlBaseCrudService {
             return undefined;
         const parentKey = this.parentKeyOf(relation, host.source);
         const conditions = [];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         if (compiled.length > 0) {
             const matched = (0, drizzle_orm_1.and)(...compiled);
             conditions.push(quantifier === "every"
@@ -2537,11 +2642,10 @@ class SqlBaseCrudService {
         const compiled = this.compileFilterAt(this.relationHost(relation, target, name), inner, db, new Set(), options);
         if (compiled.length === 0)
             return undefined;
-        const softDeleted = this.softDeleteCondition(target);
         return (0, drizzle_orm_1.exists)(db
             .select({ one: (0, drizzle_orm_1.sql) `1` })
             .from(target)
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(target[relation.references ?? "id"], host.table[relation.localKey]), ...compiled, ...(softDeleted ? [softDeleted] : []))));
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(target[relation.references ?? "id"], host.table[relation.localKey]), ...compiled, ...this.relatedRowScope(target, options))));
     }
     rootHost() {
         return {
@@ -2562,6 +2666,7 @@ class SqlBaseCrudService {
         };
     }
     buildFilterConditions(filters, db = this.config.db, options) {
+        (0, query_parser_1.assertFilterDepth)(filters);
         const joins = new Set();
         const conditions = this.compileFilterAt(this.rootHost(), filters, db, joins, options);
         return { conditions, relations: Array.from(joins) };
@@ -2638,7 +2743,7 @@ class SqlBaseCrudService {
                 const compiled = this.compileFilterAt(this.relationHost(relation, relation.table, path), inner, db, new Set(), options);
                 if (compiled.length === 0 && !quantified)
                     continue;
-                const condition = this.collectionCondition(relation, compiled, db, host);
+                const condition = this.collectionCondition(relation, compiled, db, host, options);
                 if (condition)
                     parts.push(condition);
             }
@@ -2694,8 +2799,24 @@ class SqlBaseCrudService {
         if (!Array.isArray(raw)) {
             throw new common_1.BadRequestException(`Filter operator "${op}" expects an array`);
         }
+        this.assertBatchSize(raw.length);
         return raw;
     }
+    static MAX_BATCH_PARAMETERS = 60_000;
+    assertBatchSize(parameters) {
+        const max = SqlBaseCrudService.MAX_BATCH_PARAMETERS;
+        if (parameters > max) {
+            throw new common_1.BadRequestException(`Too many values in one call (${parameters}); the limit is ${max}. Split the batch.`);
+        }
+    }
+    insertParameters(rows) {
+        let widest = 0;
+        for (const row of rows) {
+            if ((0, merge_config_1.isPlainObject)(row))
+                widest = Math.max(widest, Object.keys(row).length);
+        }
+        return rows.length * (widest + 4);
+    }
     requirePostgres(op) {
         if (this.config.dialect !== "postgresql") {
             throw new common_1.BadRequestException(`Filter operator "${op}" is only supported on PostgreSQL`);
@@ -2718,7 +2839,7 @@ class SqlBaseCrudService {
                 : `%${escaped}%`;
         return insensitive || this.config.sql?.caseSensitive === false
             ? this.caseInsensitiveLike(column, pattern)
-            : (0, drizzle_orm_1.like)(column, pattern);
+            : this.likePattern(column, pattern);
     }
     applyComplexFilter(conditions, column, filterObj) {
         const coerce = (value) => this.coerceFilterValue(column, value);
@@ -2750,7 +2871,7 @@ class SqlBaseCrudService {
                     conditions.push((0, drizzle_orm_1.ne)(column, coerce(raw)));
                     break;
                 case "like":
-                    conditions.push((0, drizzle_orm_1.like)(column, raw));
+                    conditions.push(this.likePattern(column, raw));
                     break;
                 case "ilike":
                     conditions.push(this.caseInsensitiveLike(column, raw));
@@ -2808,10 +2929,22 @@ class SqlBaseCrudService {
         }
     }
     async executeSqlTransaction(operation, existingTransaction) {
+        this.assertTransactions(existingTransaction ?? this.config.db);
         if (existingTransaction)
             return operation(existingTransaction);
         return this.config.db.transaction(operation);
     }
+    assertTransactions(db) {
+        if (this.config.dialect !== "sqlite")
+            return;
+        const kind = db?.constructor?.[drizzle_orm_1.entityKind];
+        if (kind === "D1Database" || kind === "D1Transaction") {
+            throw new crud_exceptions_1.TransactionException("Cloudflare D1 has no interactive transactions, so mass writes, nested writes and attach/detach/sync are not available on it. Use the single-row methods, or db.batch() yourself.");
+        }
+        if (db?.resultKind === "sync") {
+            throw new crud_exceptions_1.TransactionException("This SQLite driver is synchronous (better-sqlite3, bun:sqlite, sql.js), and its transactions cannot wait for async work, so mass writes, nested writes and attach/detach/sync are not available on it. Use an async driver such as libSQL (@libsql/client).");
+        }
+    }
     getEntityName() {
         try {
             return (0, drizzle_orm_1.getTableName)(this.config.table) || "Entity";
@@ -2822,7 +2955,7 @@ class SqlBaseCrudService {
     }
     async fullTextSearch(searchTerm, searchColumns, pagination, options) {
         if (this.config.dialect !== "postgresql") {
-            throw new Error("Full-text search only supported in PostgreSQL");
+            throw new common_1.BadRequestException("Full-text search only supported in PostgreSQL");
         }
         if (!Array.isArray(searchColumns) || searchColumns.length === 0) {
             throw new common_1.BadRequestException("Full-text search needs at least one column");
@@ -2835,31 +2968,37 @@ class SqlBaseCrudService {
             this.assertAllowed("searchableColumns", name, options);
             return column;
         });
-        const { transaction } = options || {};
-        const db = transaction || this.config.db;
-        const tsVector = drizzle_orm_1.sql.join(columns.map((column) => (0, drizzle_orm_1.sql) `to_tsvector('english', ${column})`), (0, drizzle_orm_1.sql) ` || `);
-        const tsQuery = (0, drizzle_orm_1.sql) `plainto_tsquery('english', ${searchTerm})`;
-        const matchExpr = (0, drizzle_orm_1.sql) `${tsVector} @@ ${tsQuery}`;
-        const whereExpr = (0, drizzle_orm_1.and)(matchExpr, ...this.rowScope(options));
+        const { filters, language, queryMode, ...readOptions } = options ?? {};
+        const { vector, query } = this.fullTextParts(columns, searchTerm, {
+            language,
+            queryMode,
+        });
         const { page, limit, offset } = this.resolvePagination(pagination?.page, pagination?.limit);
+        const plan = this.planList(filters, undefined, "asc", readOptions);
+        const conditions = [(0, drizzle_orm_1.sql) `${vector} @@ ${query}`, ...plan.conditions];
+        const joins = Array.from(new Set([
+            ...plan.joined.map((node) => node.name),
+            ...plan.filterRelations,
+        ]));
         const pk = this.columnOf(this.config.table, this.config.primaryKey);
-        const orderBy = [(0, drizzle_orm_1.sql) `ts_rank(${tsVector}, ${tsQuery}) DESC`];
+        const orderBy = [(0, drizzle_orm_1.sql) `ts_rank(${vector}, ${query}) DESC`];
         if (pk)
             orderBy.push((0, drizzle_orm_1.asc)(pk));
-        const dataQuery = db
-            .select()
-            .from(this.config.table)
-            .where(whereExpr)
+        let dataQuery = this.startSelect(plan.db, plan.baseSelect, plan.joined, joins.length > 0, plan.selection);
+        dataQuery = this.applyJoins(dataQuery, joins, readOptions)
+            .where((0, drizzle_orm_1.and)(...conditions))
             .orderBy(...orderBy)
             .limit(limit)
             .offset(offset);
-        const countQuery = db
-            .select({ count: (0, drizzle_orm_1.sql) `count(*)` })
-            .from(this.config.table)
-            .where(whereExpr);
-        const [data, totalResult] = await this.runRead(Promise.all([dataQuery, countQuery]));
+        const countQuery = this.buildCountQuery(plan.db, conditions, plan.filterRelations, readOptions);
+        const [fetched, totalResult] = await this.runRead(Promise.all([dataQuery, countQuery]));
         const total = parseInt(totalResult[0]?.count?.toString() || "0", 10);
-        return { data, total, page, limit };
+        const rows = this.normalizeRelations(fetched, plan.joined.map((node) => node.name));
+        await Promise.all([
+            this.loadRelations(plan.db, rows, plan.nodes, plan.selection, undefined, readOptions),
+            this.loadCounts(plan.db, rows, readOptions.counts, readOptions),
+        ]);
+        return { data: rows, total, page, limit };
     }
 }
 exports.SqlBaseCrudService = SqlBaseCrudService;