@naturalcycles/db-lib 8.51.1 → 8.52.0

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

@@ -1,4 +1,4 @@
-import { AnyObject, AsyncMapper, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, Saved, Unsaved, ZodSchema } from '@naturalcycles/js-lib';
+import { AnyObject, AsyncMapper, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, Promisable, Saved, Unsaved, ZodSchema } from '@naturalcycles/js-lib';
 import { AjvSchema, ObjectSchemaTyped, ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DBDeleteByIdsOperation, DBModelType, DBOperation, DBPatch, DBSaveBatchOperation, RunQueryResult } from '../db.model';
 import { DBQuery, RunnableDBQuery } from '../query/dbQuery';
@@ -85,9 +85,9 @@ export declare class CommonDao<BM extends Partial<ObjectWithId<ID>>, DBM extends
     assignIdCreatedUpdated(obj: Unsaved<BM>, opt?: CommonDaoOptions): Saved<BM>;
     tx: {
         save: (bm: Unsaved<BM>, opt?: CommonDaoSaveOptions<DBM>) => Promise<DBSaveBatchOperation>;
-        saveBatch: (bms: Unsaved<BM>[], opt?: CommonDaoSaveOptions<DBM>) => Promise<DBSaveBatchOperation>;
-        deleteByIds: (ids: ID[], opt?: CommonDaoOptions) => Promise<DBDeleteByIdsOperation>;
-        deleteById: (id: ID, opt?: CommonDaoOptions) => Promise<DBDeleteByIdsOperation>;
+        saveBatch: (bms: Unsaved<BM>[], opt?: CommonDaoSaveOptions<DBM>) => Promise<DBSaveBatchOperation | undefined>;
+        deleteByIds: (ids: ID[], opt?: CommonDaoOptions) => Promise<DBDeleteByIdsOperation | undefined>;
+        deleteById: (id: ID | null | undefined, opt?: CommonDaoOptions) => Promise<DBDeleteByIdsOperation | undefined>;
     };
     /**
      * Mutates with id, created, updated
@@ -155,7 +155,7 @@ export declare class CommonDao<BM extends Partial<ObjectWithId<ID>>, DBM extends
      * Proxy to this.cfg.db.ping
      */
     ping(): Promise<void>;
-    runInTransaction(ops: Promise<DBOperation>[]): Promise<void>;
+    runInTransaction(ops: Promisable<DBOperation | undefined>[]): Promise<void>;
     protected logResult(started: number, op: string, res: any, table: string): void;
     protected logSaveResult(started: number, op: string, table: string): void;
     protected logStarted(op: string, table: string, force?: boolean): number;

package/dist/commondao/common.dao.js

@@ -34,6 +34,8 @@ class CommonDao {
                 };
             },
             saveBatch: async (bms, opt = {}) => {
+                if (!bms.length)
+                    return;
                 const rows = (await this.saveBatch(bms, { ...opt, tx: true }));
                 return {
                     type: 'saveBatch',
@@ -46,6 +48,8 @@ class CommonDao {
                 };
             },
             deleteByIds: async (ids, opt = {}) => {
+                if (!ids.length)
+                    return;
                 return {
                     type: 'deleteByIds',
                     table: this.cfg.table,
@@ -54,6 +58,8 @@ class CommonDao {
                 };
             },
             deleteById: async (id, opt = {}) => {
+                if (!id)
+                    return;
                 return {
                     type: 'deleteByIds',
                     table: this.cfg.table,
@@ -879,9 +885,9 @@ class CommonDao {
         await this.cfg.db.ping();
     }
     async runInTransaction(ops) {
-        if (!ops.length)
+        const resolvedOps = (await Promise.all(ops)).filter(js_lib_1._isTruthy);
+        if (!resolvedOps.length)
             return;
-        const resolvedOps = await Promise.all(ops);
         await this.cfg.db.commitTransaction(dbTransaction_1.DBTransaction.create(resolvedOps));
     }
     logResult(started, op, res, table) {

package/package.json

@@ -41,7 +41,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "version": "8.51.1",
+  "version": "8.52.0",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/commondao/common.dao.ts

@@ -2,6 +2,7 @@ import {
   _assert,
   _filterNullishValues,
   _filterUndefinedValues,
+  _isTruthy,
   _passthroughPredicate,
   _since,
   _truncate,
@@ -14,6 +15,7 @@ import {
   JsonSchemaRootObject,
   ObjectWithId,
   pMap,
+  Promisable,
   Saved,
   Unsaved,
   ZodSchema,
@@ -633,7 +635,8 @@ export class CommonDao<
     saveBatch: async (
       bms: Unsaved<BM>[],
       opt: CommonDaoSaveOptions<DBM> = {},
-    ): Promise<DBSaveBatchOperation> => {
+    ): Promise<DBSaveBatchOperation | undefined> => {
+      if (!bms.length) return
       const rows: DBM[] = (await this.saveBatch(bms, { ...opt, tx: true })) as any
 
       return {
@@ -646,7 +649,11 @@ export class CommonDao<
         },
       }
     },
-    deleteByIds: async (ids: ID[], opt: CommonDaoOptions = {}): Promise<DBDeleteByIdsOperation> => {
+    deleteByIds: async (
+      ids: ID[],
+      opt: CommonDaoOptions = {},
+    ): Promise<DBDeleteByIdsOperation | undefined> => {
+      if (!ids.length) return
       return {
         type: 'deleteByIds',
         table: this.cfg.table,
@@ -654,7 +661,11 @@ export class CommonDao<
         opt,
       }
     },
-    deleteById: async (id: ID, opt: CommonDaoOptions = {}): Promise<DBDeleteByIdsOperation> => {
+    deleteById: async (
+      id: ID | null | undefined,
+      opt: CommonDaoOptions = {},
+    ): Promise<DBDeleteByIdsOperation | undefined> => {
+      if (!id) return
       return {
         type: 'deleteByIds',
         table: this.cfg.table,
@@ -1164,10 +1175,9 @@ export class CommonDao<
     await this.cfg.db.ping()
   }
 
-  async runInTransaction(ops: Promise<DBOperation>[]): Promise<void> {
-    if (!ops.length) return
-
-    const resolvedOps = await Promise.all(ops)
+  async runInTransaction(ops: Promisable<DBOperation | undefined>[]): Promise<void> {
+    const resolvedOps = (await Promise.all(ops)).filter(_isTruthy)
+    if (!resolvedOps.length) return
 
     await this.cfg.db.commitTransaction(DBTransaction.create(resolvedOps))
   }