@naturalcycles/db-lib 8.43.5 → 8.45.0

package/dist/adapter/inmemory/inMemory.db.js

@@ -58,25 +58,22 @@ class InMemoryDB {
         };
     }
     async createTable(_table, _schema, opt = {}) {
-        var _a;
         const table = this.cfg.tablesPrefix + _table;
         if (opt.dropIfExists) {
             this.data[table] = {};
         }
         else {
-            (_a = this.data)[table] || (_a[table] = {});
+            this.data[table] ||= {};
         }
     }
     async getByIds(_table, ids, _opt) {
-        var _a;
         const table = this.cfg.tablesPrefix + _table;
-        (_a = this.data)[table] || (_a[table] = {});
+        this.data[table] ||= {};
         return ids.map(id => this.data[table][id]).filter(Boolean);
     }
     async saveBatch(_table, rows, opt = {}) {
-        var _a;
         const table = this.cfg.tablesPrefix + _table;
-        (_a = this.data)[table] || (_a[table] = {});
+        this.data[table] ||= {};
         rows.forEach(r => {
             if (!r.id) {
                 this.cfg.logger.warn({ rows });

package/dist/adapter/inmemory/inMemoryKeyValueDB.js

@@ -11,18 +11,15 @@ class InMemoryKeyValueDB {
     async ping() { }
     async createTable(_table, _opt) { }
     async deleteByIds(table, ids) {
-        var _a;
-        (_a = this.data)[table] || (_a[table] = {});
+        this.data[table] ||= {};
         ids.forEach(id => delete this.data[table][id]);
     }
     async getByIds(table, ids) {
-        var _a;
-        (_a = this.data)[table] || (_a[table] = {});
+        this.data[table] ||= {};
         return ids.map(id => [id, this.data[table][id]]).filter(e => e[1]);
     }
     async saveBatch(table, entries) {
-        var _a;
-        (_a = this.data)[table] || (_a[table] = {});
+        this.data[table] ||= {};
         entries.forEach(([id, buf]) => (this.data[table][id] = buf));
     }
     streamIds(table, limit) {
@@ -35,8 +32,7 @@ class InMemoryKeyValueDB {
         return node_stream_1.Readable.from(Object.entries(this.data[table] || {}).slice(0, limit));
     }
     async count(table) {
-        var _a;
-        (_a = this.data)[table] || (_a[table] = {});
+        this.data[table] ||= {};
         return Object.keys(this.data[table]).length;
     }
 }

package/dist/commondao/common.dao.js

@@ -20,7 +20,6 @@ const isCI = !!process.env['CI'];
  */
 class CommonDao {
     constructor(cfg) {
-        var _a;
         this.cfg = cfg;
         this.tx = {
             save: async (bm, opt = {}) => {
@@ -91,10 +90,10 @@ class CommonDao {
         };
         if (this.cfg.createId) {
             (0, js_lib_1._assert)(this.cfg.idType === 'string', 'db-lib: automatic generation of non-string ids is not supported');
-            (_a = this.cfg.hooks).createId || (_a.createId = () => (0, nodejs_lib_1.stringId)());
+            this.cfg.hooks.createRandomId ||= () => (0, nodejs_lib_1.stringId)();
         }
         else {
-            delete this.cfg.hooks.createId;
+            delete this.cfg.hooks.createRandomId;
         }
     }
     // CREATE
@@ -333,7 +332,7 @@ class CommonDao {
         q.table = opt.table || q.table;
         opt.skipValidation = opt.skipValidation !== false; // default true
         opt.skipConversion = opt.skipConversion !== false; // default true
-        opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
+        opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const partialQuery = !!q._selectedFieldNames;
         const op = `streamQueryForEach(${q.pretty()})`;
         const started = this.logStarted(op, q.table, true);
@@ -367,7 +366,7 @@ class CommonDao {
         q.table = opt.table || q.table;
         opt.skipValidation = opt.skipValidation !== false; // default true
         opt.skipConversion = opt.skipConversion !== false; // default true
-        opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
+        opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const partialQuery = !!q._selectedFieldNames;
         const op = `streamQueryAsDBMForEach(${q.pretty()})`;
         const started = this.logStarted(op, q.table, true);
@@ -402,7 +401,7 @@ class CommonDao {
         q.table = opt.table || q.table;
         opt.skipValidation = opt.skipValidation !== false; // default true
         opt.skipConversion = opt.skipConversion !== false; // default true
-        opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
+        opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const partialQuery = !!q._selectedFieldNames;
         const stream = this.cfg.db.streamQuery(q, opt);
         if (partialQuery || opt.raw)
@@ -426,7 +425,7 @@ class CommonDao {
         q.table = opt.table || q.table;
         opt.skipValidation = opt.skipValidation !== false; // default true
         opt.skipConversion = opt.skipConversion !== false; // default true
-        opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
+        opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const stream = this.cfg.db.streamQuery(q, opt);
         const partialQuery = !!q._selectedFieldNames;
         if (partialQuery || opt.raw)
@@ -451,7 +450,7 @@ class CommonDao {
     }
     streamQueryIds(q, opt = {}) {
         q.table = opt.table || q.table;
-        opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
+        opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const stream = this.cfg.db
             .streamQuery(q.select(['id']), opt)
             .on('error', err => stream.emit('error', err))
@@ -462,7 +461,7 @@ class CommonDao {
     }
     async streamQueryIdsForEach(q, mapper, opt = {}) {
         q.table = opt.table || q.table;
-        opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
+        opt.errorMode ||= js_lib_1.ErrorMode.SUPPRESS;
         const op = `streamQueryIdsForEach(${q.pretty()})`;
         const started = this.logStarted(op, q.table, true);
         let count = 0;
@@ -486,18 +485,19 @@ class CommonDao {
         }
     }
     assignIdCreatedUpdated(obj, opt = {}) {
-        var _a;
         const now = Math.floor(Date.now() / 1000);
-        obj.id || (obj.id = this.cfg.hooks.createId?.(obj));
         if (this.cfg.created) {
             ;
-            (_a = obj)['created'] || (_a['created'] = obj['updated'] || now);
+            obj['created'] ||= obj['updated'] || now;
         }
         if (this.cfg.updated) {
             ;
             obj['updated'] =
                 opt.preserveUpdatedCreated && obj['updated'] ? obj['updated'] : now;
         }
+        if (this.cfg.createId) {
+            obj.id ||= this.cfg.hooks.createNaturalId?.(obj) || this.cfg.hooks.createRandomId();
+        }
         return obj;
     }
     // SAVE

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

@@ -3,7 +3,12 @@ import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchemaTyped, T
 import { CommonDB } from '../common.db';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model';
 export interface CommonDaoHooks<BM extends Partial<ObjectWithId<ID>>, DBM extends ObjectWithId<ID>, TM, ID extends string | number> {
-    createId: (obj: DBM | BM) => ID;
+    createRandomId: () => ID;
+    /**
+     * createNaturalId hook is called (tried) first.
+     * If it doesn't exist - createRandomId is called.
+     */
+    createNaturalId: (obj: DBM | BM) => ID;
     parseNaturalId: (id: ID) => Partial<DBM>;
     beforeCreate: (bm: Partial<BM>) => Partial<BM>;
     beforeDBMValidate: (dbm: Partial<DBM>) => Partial<DBM>;

package/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@naturalcycles/js-lib": "^14.0.0",
     "@naturalcycles/nodejs-lib": "^12.0.0",
-    "fs-extra": "^10.0.0"
+    "fs-extra": "^11.1.0"
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^1.0.0",
@@ -41,7 +41,7 @@
   "engines": {
     "node": ">=14.15"
   },
-  "version": "8.43.5",
+  "version": "8.45.0",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/commondao/common.dao.model.ts

@@ -16,7 +16,12 @@ export interface CommonDaoHooks<
   TM,
   ID extends string | number,
 > {
-  createId: (obj: DBM | BM) => ID
+  createRandomId: () => ID
+  /**
+   * createNaturalId hook is called (tried) first.
+   * If it doesn't exist - createRandomId is called.
+   */
+  createNaturalId: (obj: DBM | BM) => ID
   parseNaturalId: (id: ID) => Partial<DBM>
   beforeCreate: (bm: Partial<BM>) => Partial<BM>
   beforeDBMValidate: (dbm: Partial<DBM>) => Partial<DBM>

package/src/commondao/common.dao.ts

@@ -106,9 +106,9 @@ export class CommonDao<
         'db-lib: automatic generation of non-string ids is not supported',
       )
 
-      this.cfg.hooks!.createId ||= () => stringId() as ID
+      this.cfg.hooks!.createRandomId ||= () => stringId() as ID
     } else {
-      delete this.cfg.hooks!.createId
+      delete this.cfg.hooks!.createRandomId
     }
   }
 
@@ -608,8 +608,6 @@ export class CommonDao<
   assignIdCreatedUpdated(obj: DBM | BM | Unsaved<BM>, opt: CommonDaoOptions = {}): DBM | Saved<BM> {
     const now = Math.floor(Date.now() / 1000)
 
-    obj.id ||= this.cfg.hooks!.createId?.(obj as BM)
-
     if (this.cfg.created) {
       ;(obj as any)['created'] ||= (obj as any)['updated'] || now
     }
@@ -619,6 +617,10 @@ export class CommonDao<
         opt.preserveUpdatedCreated && (obj as any)['updated'] ? (obj as any)['updated'] : now
     }
 
+    if (this.cfg.createId) {
+      obj.id ||= this.cfg.hooks!.createNaturalId?.(obj as BM) || this.cfg.hooks!.createRandomId!()
+    }
+
     return obj as any
   }