@naturalcycles/db-lib 10.21.0 → 10.22.0

package/dist/commondao/common.dao.d.ts

@@ -175,9 +175,9 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     private static multiGetMapByTableById;
     private static prepareMultiGetOutput;
     /**
-     * Very @experimental.
+     * @experimental.
      */
-    static multiDeleteByIds(inputs: DaoWithIds<AnyDao>[], _opt?: CommonDaoOptions): Promise<NonNegativeInteger>;
+    static multiDelete(inputs: (DaoWithId<AnyDao> | DaoWithIds<AnyDao>)[], opt?: CommonDaoOptions): Promise<NonNegativeInteger>;
     static multiSave(inputs: (DaoWithRows<AnyDao> | DaoWithRow<AnyDao>)[], opt?: CommonDaoSaveBatchOptions<any>): Promise<void>;
     createTransaction(opt?: CommonDBTransactionOptions): Promise<CommonDaoTransaction>;
     runInTransaction<T = void>(fn: CommonDaoTransactionFn<T>, opt?: CommonDBTransactionOptions): Promise<T>;

package/dist/commondao/common.dao.js

@@ -854,17 +854,27 @@ export class CommonDao {
         return bmsByProp;
     }
     /**
-     * Very @experimental.
+     * @experimental.
      */
-    static async multiDeleteByIds(inputs, _opt = {}) {
+    static async multiDelete(inputs, opt = {}) {
         if (!inputs.length)
             return 0;
         const { db } = inputs[0].dao.cfg;
         const idsByTable = {};
-        for (const { dao, ids } of inputs) {
-            idsByTable[dao.cfg.table] = ids;
+        for (const input of inputs) {
+            const { dao } = input;
+            const { table } = dao.cfg;
+            dao.requireWriteAccess();
+            dao.requireObjectMutability(opt);
+            idsByTable[table] ||= [];
+            if ('id' in input) {
+                idsByTable[table].push(input.id);
+            }
+            else {
+                idsByTable[table].push(...input.ids);
+            }
         }
-        return await db.multiDelete(idsByTable);
+        return await db.multiDelete(idsByTable, opt);
     }
     static async multiSave(inputs, opt = {}) {
         if (!inputs.length)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.21.0",
+  "version": "10.22.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"

package/src/commondao/common.dao.ts

@@ -1139,20 +1139,30 @@ export class CommonDao<
   }
 
   /**
-   * Very @experimental.
+   * @experimental.
    */
-  static async multiDeleteByIds(
-    inputs: DaoWithIds<AnyDao>[],
-    _opt: CommonDaoOptions = {},
+  static async multiDelete(
+    inputs: (DaoWithId<AnyDao> | DaoWithIds<AnyDao>)[],
+    opt: CommonDaoOptions = {},
   ): Promise<NonNegativeInteger> {
     if (!inputs.length) return 0
     const { db } = inputs[0]!.dao.cfg
     const idsByTable: StringMap<string[]> = {}
-    for (const { dao, ids } of inputs) {
-      idsByTable[dao.cfg.table] = ids
+    for (const input of inputs) {
+      const { dao } = input
+      const { table } = dao.cfg
+      dao.requireWriteAccess()
+      dao.requireObjectMutability(opt)
+      idsByTable[table] ||= []
+
+      if ('id' in input) {
+        idsByTable[table].push(input.id)
+      } else {
+        idsByTable[table].push(...input.ids)
+      }
     }
 
-    return await db.multiDelete(idsByTable)
+    return await db.multiDelete(idsByTable, opt)
   }
 
   static async multiSave(