@naturalcycles/db-lib 8.40.0 → 8.40.1

package/dist/commondao/common.dao.js

@@ -462,11 +462,16 @@ class CommonDao {
         }
         const op = `save(${dbm.id})`;
         const started = this.logSaveStarted(op, bm, table);
+        const { excludeFromIndexes } = this.cfg;
+        const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
         await this.cfg.db.saveBatch(table, [dbm], {
-            excludeFromIndexes: this.cfg.excludeFromIndexes,
-            assignGeneratedIds: this.cfg.assignGeneratedIds,
+            excludeFromIndexes,
+            assignGeneratedIds,
             ...opt,
         });
+        if (assignGeneratedIds) {
+            bm.id = dbm.id;
+        }
         this.logSaveResult(started, op, table);
         return bm;
     }
@@ -497,25 +502,31 @@ class CommonDao {
         const table = opt.table || this.cfg.table;
         // assigning id in case it misses the id
         // will override/set `updated` field, unless opts.preserveUpdated is set
+        let row = dbm;
         if (!opt.raw) {
             const idWasGenerated = !dbm.id && this.cfg.createId;
             this.assignIdCreatedUpdated(dbm, opt); // mutates
-            dbm = this.anyToDBM(dbm, opt);
+            row = this.anyToDBM(dbm, opt);
             if (opt.ensureUniqueId && idWasGenerated)
-                await this.ensureUniqueId(table, dbm);
+                await this.ensureUniqueId(table, row);
         }
         if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
             opt = { ...opt, saveMethod: 'insert' };
         }
-        const op = `saveAsDBM(${dbm.id})`;
-        const started = this.logSaveStarted(op, dbm, table);
-        await this.cfg.db.saveBatch(table, [dbm], {
-            excludeFromIndexes: this.cfg.excludeFromIndexes,
-            assignGeneratedIds: this.cfg.assignGeneratedIds,
+        const op = `saveAsDBM(${row.id})`;
+        const started = this.logSaveStarted(op, row, table);
+        const { excludeFromIndexes } = this.cfg;
+        const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
+        await this.cfg.db.saveBatch(table, [row], {
+            excludeFromIndexes,
+            assignGeneratedIds,
             ...opt,
         });
+        if (assignGeneratedIds) {
+            dbm.id = row.id;
+        }
         this.logSaveResult(started, op, table);
-        return dbm;
+        return row;
     }
     async saveBatch(bms, opt = {}) {
         this.requireWriteAccess();
@@ -532,38 +543,49 @@ class CommonDao {
             .map(bm => bm.id)
             .join(', '), 50)})`;
         const started = this.logSaveStarted(op, bms, table);
+        const { excludeFromIndexes } = this.cfg;
+        const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
         await this.cfg.db.saveBatch(table, dbms, {
-            excludeFromIndexes: this.cfg.excludeFromIndexes,
-            assignGeneratedIds: this.cfg.assignGeneratedIds,
+            excludeFromIndexes,
+            assignGeneratedIds,
             ...opt,
         });
+        if (assignGeneratedIds) {
+            dbms.forEach((dbm, i) => (bms[i].id = dbm.id));
+        }
         this.logSaveResult(started, op, table);
         return bms;
     }
     async saveBatchAsDBM(dbms, opt = {}) {
         this.requireWriteAccess();
         const table = opt.table || this.cfg.table;
+        let rows = dbms;
         if (!opt.raw) {
             dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)); // mutates
-            dbms = this.anyToDBMs(dbms, opt);
+            rows = this.anyToDBMs(dbms, opt);
             if (opt.ensureUniqueId)
                 throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
         }
         if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
             opt = { ...opt, saveMethod: 'insert' };
         }
-        const op = `saveBatchAsDBM ${dbms.length} row(s) (${(0, js_lib_1._truncate)(dbms
+        const op = `saveBatchAsDBM ${rows.length} row(s) (${(0, js_lib_1._truncate)(rows
             .slice(0, 10)
             .map(bm => bm.id)
             .join(', '), 50)})`;
-        const started = this.logSaveStarted(op, dbms, table);
-        await this.cfg.db.saveBatch(table, dbms, {
-            excludeFromIndexes: this.cfg.excludeFromIndexes,
-            assignGeneratedIds: this.cfg.assignGeneratedIds,
+        const started = this.logSaveStarted(op, rows, table);
+        const { excludeFromIndexes } = this.cfg;
+        const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds;
+        await this.cfg.db.saveBatch(table, rows, {
+            excludeFromIndexes,
+            assignGeneratedIds,
             ...opt,
         });
+        if (assignGeneratedIds) {
+            rows.forEach((row, i) => (dbms[i].id = row.id));
+        }
         this.logSaveResult(started, op, table);
-        return dbms;
+        return rows;
     }
     async deleteById(id, opt = {}) {
         if (!id)

package/package.json

@@ -42,7 +42,7 @@
   "engines": {
     "node": ">=14.15"
   },
-  "version": "8.40.0",
+  "version": "8.40.1",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/commondao/common.dao.ts

@@ -620,12 +620,18 @@ export class CommonDao<
     }
     const op = `save(${dbm.id})`
     const started = this.logSaveStarted(op, bm, table)
+    const { excludeFromIndexes } = this.cfg
+    const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
     await this.cfg.db.saveBatch(table, [dbm], {
-      excludeFromIndexes: this.cfg.excludeFromIndexes,
-      assignGeneratedIds: this.cfg.assignGeneratedIds,
+      excludeFromIndexes,
+      assignGeneratedIds,
       ...opt,
     })
 
+    if (assignGeneratedIds) {
+      bm.id = dbm.id as any
+    }
+
     this.logSaveResult(started, op, table)
     return bm as any
   }
@@ -668,24 +674,32 @@ export class CommonDao<
 
     // assigning id in case it misses the id
     // will override/set `updated` field, unless opts.preserveUpdated is set
+    let row = dbm
     if (!opt.raw) {
       const idWasGenerated = !dbm.id && this.cfg.createId
       this.assignIdCreatedUpdated(dbm, opt) // mutates
-      dbm = this.anyToDBM(dbm, opt)
-      if (opt.ensureUniqueId && idWasGenerated) await this.ensureUniqueId(table, dbm)
+      row = this.anyToDBM(dbm, opt)
+      if (opt.ensureUniqueId && idWasGenerated) await this.ensureUniqueId(table, row)
     }
     if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
       opt = { ...opt, saveMethod: 'insert' }
     }
-    const op = `saveAsDBM(${dbm.id})`
-    const started = this.logSaveStarted(op, dbm, table)
-    await this.cfg.db.saveBatch(table, [dbm], {
-      excludeFromIndexes: this.cfg.excludeFromIndexes,
-      assignGeneratedIds: this.cfg.assignGeneratedIds,
+    const op = `saveAsDBM(${row.id})`
+    const started = this.logSaveStarted(op, row, table)
+    const { excludeFromIndexes } = this.cfg
+    const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
+    await this.cfg.db.saveBatch(table, [row], {
+      excludeFromIndexes,
+      assignGeneratedIds,
       ...opt,
     })
+
+    if (assignGeneratedIds) {
+      dbm.id = row.id
+    }
+
     this.logSaveResult(started, op, table)
-    return dbm
+    return row
   }
 
   async saveBatch(bms: Unsaved<BM>[], opt: CommonDaoSaveOptions<DBM> = {}): Promise<Saved<BM>[]> {
@@ -706,13 +720,19 @@ export class CommonDao<
       50,
     )})`
     const started = this.logSaveStarted(op, bms, table)
+    const { excludeFromIndexes } = this.cfg
+    const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
 
     await this.cfg.db.saveBatch(table, dbms, {
-      excludeFromIndexes: this.cfg.excludeFromIndexes,
-      assignGeneratedIds: this.cfg.assignGeneratedIds,
+      excludeFromIndexes,
+      assignGeneratedIds,
       ...opt,
     })
 
+    if (assignGeneratedIds) {
+      dbms.forEach((dbm, i) => (bms[i]!.id = dbm.id as any))
+    }
+
     this.logSaveResult(started, op, table)
 
     return bms as any[]
@@ -721,31 +741,38 @@ export class CommonDao<
   async saveBatchAsDBM(dbms: DBM[], opt: CommonDaoSaveOptions<DBM> = {}): Promise<DBM[]> {
     this.requireWriteAccess()
     const table = opt.table || this.cfg.table
+    let rows = dbms
     if (!opt.raw) {
       dbms.forEach(dbm => this.assignIdCreatedUpdated(dbm, opt)) // mutates
-      dbms = this.anyToDBMs(dbms, opt)
+      rows = this.anyToDBMs(dbms, opt)
       if (opt.ensureUniqueId) throw new AppError('ensureUniqueId is not supported in saveBatch')
     }
     if (this.cfg.immutable && !opt.allowMutability && !opt.saveMethod) {
       opt = { ...opt, saveMethod: 'insert' }
     }
-    const op = `saveBatchAsDBM ${dbms.length} row(s) (${_truncate(
-      dbms
+    const op = `saveBatchAsDBM ${rows.length} row(s) (${_truncate(
+      rows
         .slice(0, 10)
         .map(bm => bm.id)
         .join(', '),
       50,
     )})`
-    const started = this.logSaveStarted(op, dbms, table)
+    const started = this.logSaveStarted(op, rows, table)
+    const { excludeFromIndexes } = this.cfg
+    const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
 
-    await this.cfg.db.saveBatch(table, dbms, {
-      excludeFromIndexes: this.cfg.excludeFromIndexes,
-      assignGeneratedIds: this.cfg.assignGeneratedIds,
+    await this.cfg.db.saveBatch(table, rows, {
+      excludeFromIndexes,
+      assignGeneratedIds,
       ...opt,
     })
 
+    if (assignGeneratedIds) {
+      rows.forEach((row, i) => (dbms[i]!.id = row.id))
+    }
+
     this.logSaveResult(started, op, table)
-    return dbms
+    return rows
   }
 
   // DELETE