@naturalcycles/db-lib 10.13.0 → 10.15.0

package/dist/inmemory/inMemory.db.js

@@ -77,7 +77,7 @@ export class InMemoryDB {
     async saveBatch(_table, rows, opt = {}) {
         const table = this.cfg.tablesPrefix + _table;
         this.data[table] ||= {};
-        rows.forEach(r => {
+        for (const r of rows) {
             if (!r.id) {
                 this.cfg.logger.warn({ rows });
                 throw new Error(`InMemoryDB doesn't support id auto-generation in saveBatch, row without id was given`);
@@ -92,7 +92,7 @@ export class InMemoryDB {
             // 1. Not store values "by reference" (avoid mutation bugs)
             // 2. Simulate real DB that would do something like that in a transport layer anyway
             this.data[table][r.id] = JSON.parse(JSON.stringify(r), bufferReviver);
-        });
+        }
     }
     async deleteByQuery(q, _opt) {
         const table = this.cfg.tablesPrefix + q.table;
@@ -106,12 +106,12 @@ export class InMemoryDB {
         if (!this.data[table])
             return 0;
         let count = 0;
-        ids.forEach(id => {
+        for (const id of ids) {
             if (!this.data[table][id])
-                return;
+                continue;
             delete this.data[table][id];
             count++;
-        });
+        }
         return count;
     }
     async patchByQuery(q, patch) {
@@ -119,7 +119,9 @@ export class InMemoryDB {
             return 0;
         const table = this.cfg.tablesPrefix + q.table;
         const rows = queryInMemory(q, Object.values(this.data[table] || {}));
-        rows.forEach(row => Object.assign(row, patch));
+        for (const row of rows) {
+            Object.assign(row, patch);
+        }
         return rows.length;
     }
     async runQuery(q, _opt) {

package/dist/inmemory/inMemoryKeyValueDB.js

@@ -14,7 +14,9 @@ export class InMemoryKeyValueDB {
     async createTable(_table, _opt) { }
     async deleteByIds(table, ids) {
         this.data[table] ||= {};
-        ids.forEach(id => delete this.data[table][id]);
+        for (const id of ids) {
+            delete this.data[table][id];
+        }
     }
     async getByIds(table, ids) {
         this.data[table] ||= {};
@@ -22,7 +24,9 @@ export class InMemoryKeyValueDB {
     }
     async saveBatch(table, entries) {
         this.data[table] ||= {};
-        entries.forEach(([id, v]) => (this.data[table][id] = v));
+        for (const [id, v] of entries) {
+            this.data[table][id] = v;
+        }
     }
     streamIds(table, limit) {
         return Readable.from(Object.keys(this.data[table] || {}).slice(0, limit));

package/dist/testing/test.model.js

@@ -1,5 +1,5 @@
 import { _range } from '@naturalcycles/js-lib/array/range.js';
-import { jsonSchema } from '@naturalcycles/js-lib/json-schema';
+import { j } from '@naturalcycles/js-lib/json-schema';
 import { baseDBEntitySchema, binarySchema, booleanSchema, numberSchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
 const MOCK_TS_2018_06_21 = 1529539200;
 export const TEST_TABLE = 'TEST_TABLE';
@@ -17,17 +17,17 @@ export const testItemTMSchema = objectSchema({
     k1: stringSchema,
     even: booleanSchema.optional(),
 });
-export const testItemBMJsonSchema = jsonSchema
+export const testItemBMJsonSchema = j
     .rootObject({
     // todo: figure out how to not copy-paste these 3 fields
-    id: jsonSchema.string(), // todo: not strictly needed here
-    created: jsonSchema.unixTimestamp(),
-    updated: jsonSchema.unixTimestamp(),
-    k1: jsonSchema.string(),
-    k2: jsonSchema.oneOf([jsonSchema.string(), jsonSchema.null()]).optional(),
-    k3: jsonSchema.number().optional(),
-    even: jsonSchema.boolean().optional(),
-    b1: jsonSchema.buffer().optional(),
+    id: j.string(), // todo: not strictly needed here
+    created: j.unixTimestamp(),
+    updated: j.unixTimestamp(),
+    k1: j.string(),
+    k2: j.oneOf([j.string(), j.null()]).optional(),
+    k3: j.number().optional(),
+    even: j.boolean().optional(),
+    b1: j.buffer().optional(),
 })
     .baseDBEntity()
     .build();

package/package.json

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

package/src/inmemory/inMemory.db.ts

@@ -153,7 +153,7 @@ export class InMemoryDB implements CommonDB {
     const table = this.cfg.tablesPrefix + _table
     this.data[table] ||= {}
 
-    rows.forEach(r => {
+    for (const r of rows) {
       if (!r.id) {
         this.cfg.logger!.warn({ rows })
         throw new Error(
@@ -161,19 +161,19 @@ export class InMemoryDB implements CommonDB {
         )
       }
 
-      if (opt.saveMethod === 'insert' && this.data[table]![r.id]) {
+      if (opt.saveMethod === 'insert' && this.data[table][r.id]) {
         throw new Error(`InMemoryDB: INSERT failed, entity exists: ${table}.${r.id}`)
       }
 
-      if (opt.saveMethod === 'update' && !this.data[table]![r.id]) {
+      if (opt.saveMethod === 'update' && !this.data[table][r.id]) {
         throw new Error(`InMemoryDB: UPDATE failed, entity doesn't exist: ${table}.${r.id}`)
       }
 
       // JSON parse/stringify (deep clone) is to:
       // 1. Not store values "by reference" (avoid mutation bugs)
       // 2. Simulate real DB that would do something like that in a transport layer anyway
-      this.data[table]![r.id] = JSON.parse(JSON.stringify(r), bufferReviver)
-    })
+      this.data[table][r.id] = JSON.parse(JSON.stringify(r), bufferReviver)
+    }
   }
 
   async deleteByQuery<ROW extends ObjectWithId>(
@@ -191,11 +191,11 @@ export class InMemoryDB implements CommonDB {
     if (!this.data[table]) return 0
 
     let count = 0
-    ids.forEach(id => {
-      if (!this.data[table]![id]) return
-      delete this.data[table]![id]
+    for (const id of ids) {
+      if (!this.data[table][id]) continue
+      delete this.data[table][id]
       count++
-    })
+    }
 
     return count
   }
@@ -207,7 +207,9 @@ export class InMemoryDB implements CommonDB {
     if (_isEmptyObject(patch)) return 0
     const table = this.cfg.tablesPrefix + q.table
     const rows = queryInMemory(q, Object.values(this.data[table] || {}) as ROW[])
-    rows.forEach(row => Object.assign(row, patch))
+    for (const row of rows) {
+      Object.assign(row, patch)
+    }
     return rows.length
   }
 

package/src/inmemory/inMemoryKeyValueDB.ts

@@ -23,7 +23,9 @@ export class InMemoryKeyValueDB implements CommonKeyValueDB {
 
   async deleteByIds(table: string, ids: string[]): Promise<void> {
     this.data[table] ||= {}
-    ids.forEach(id => delete this.data[table]![id])
+    for (const id of ids) {
+      delete this.data[table][id]
+    }
   }
 
   async getByIds(table: string, ids: string[]): Promise<KeyValueDBTuple[]> {
@@ -33,7 +35,9 @@ export class InMemoryKeyValueDB implements CommonKeyValueDB {
 
   async saveBatch(table: string, entries: KeyValueDBTuple[]): Promise<void> {
     this.data[table] ||= {}
-    entries.forEach(([id, v]) => (this.data[table]![id] = v))
+    for (const [id, v] of entries) {
+      this.data[table][id] = v
+    }
   }
 
   streamIds(table: string, limit?: number): ReadableTyped<string> {

package/src/testing/test.model.ts

@@ -1,6 +1,6 @@
 import { _range } from '@naturalcycles/js-lib/array/range.js'
 import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema'
-import { jsonSchema } from '@naturalcycles/js-lib/json-schema'
+import { j } from '@naturalcycles/js-lib/json-schema'
 import type { BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib/types'
 import {
   baseDBEntitySchema,
@@ -50,17 +50,17 @@ export const testItemTMSchema: ObjectSchema<TestItemTM> = objectSchema<TestItemT
   even: booleanSchema.optional(),
 })
 
-export const testItemBMJsonSchema: JsonSchemaObject<TestItemBM> = jsonSchema
+export const testItemBMJsonSchema: JsonSchemaObject<TestItemBM> = j
   .rootObject<TestItemBM>({
     // todo: figure out how to not copy-paste these 3 fields
-    id: jsonSchema.string(), // todo: not strictly needed here
-    created: jsonSchema.unixTimestamp(),
-    updated: jsonSchema.unixTimestamp(),
-    k1: jsonSchema.string(),
-    k2: jsonSchema.oneOf<string | null>([jsonSchema.string(), jsonSchema.null()]).optional(),
-    k3: jsonSchema.number().optional(),
-    even: jsonSchema.boolean().optional(),
-    b1: jsonSchema.buffer().optional(),
+    id: j.string(), // todo: not strictly needed here
+    created: j.unixTimestamp(),
+    updated: j.unixTimestamp(),
+    k1: j.string(),
+    k2: j.oneOf<string | null>([j.string(), j.null()]).optional(),
+    k3: j.number().optional(),
+    even: j.boolean().optional(),
+    b1: j.buffer().optional(),
   })
   .baseDBEntity()
   .build()