@naturalcycles/db-lib 9.26.3 → 9.28.0

package/dist/adapter/inmemory/queryInMemory.js

@@ -20,7 +20,10 @@ function queryInMemory(q, rows = []) {
     // .filter
     // eslint-disable-next-line unicorn/no-array-reduce
     rows = q._filters.reduce((rows, filter) => {
-        return rows.filter(row => FILTER_FNS[filter.op](row[filter.name], filter.val));
+        return rows.filter(row => {
+            const value = (0, js_lib_1._get)(row, filter.name);
+            return FILTER_FNS[filter.op](value, filter.val);
+        });
     }, rows);
     // .select(fieldNames)
     if (q._selectedFieldNames) {

package/dist/commondao/common.dao.js

@@ -509,7 +509,7 @@ class CommonDao {
         }
         else {
             const table = opt.table || this.cfg.table;
-            (0, js_lib_1._assert)(!opt.requireToExist, `${table}.patchById row is required, but missing`, {
+            (0, js_lib_1._assert)(opt.createIfMissing, `DB row required, but not found in ${table}`, {
                 id,
                 table,
             });
@@ -550,26 +550,21 @@ class CommonDao {
             Object.assign(bm, patch);
         }
         else {
-            const loaded = await this.getById(bm.id, {
+            const loaded = await this.requireById(bm.id, {
                 // Skipping validation here for performance reasons.
                 // Validation is going to happen on save anyway, just down below.
                 skipValidation: true,
                 ...opt,
             });
-            if (loaded) {
-                const loadedWithPatch = {
-                    ...loaded,
-                    ...patch,
-                };
-                // Make `bm` exactly the same as `loadedWithPatch`
-                (0, js_lib_1._objectAssignExact)(bm, loadedWithPatch);
-                if ((0, js_lib_1._deepJsonEquals)(loaded, loadedWithPatch)) {
-                    // Skipping the save operation, as data is the same
-                    return bm;
-                }
-            }
-            else {
-                Object.assign(bm, patch);
+            const loadedWithPatch = {
+                ...loaded,
+                ...patch,
+            };
+            // Make `bm` exactly the same as `loadedWithPatch`
+            (0, js_lib_1._objectAssignExact)(bm, loadedWithPatch);
+            if ((0, js_lib_1._deepJsonEquals)(loaded, loadedWithPatch)) {
+                // Skipping the save operation, as data is the same
+                return bm;
             }
         }
         return await this.save(bm, opt);

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

@@ -227,16 +227,18 @@ export interface CommonDaoSaveOptions<BM extends BaseDBEntity, DBM extends BaseD
 export interface CommonDaoPatchByIdOptions<DBM extends BaseDBEntity> extends CommonDaoSaveBatchOptions<DBM> {
     /**
      * Defaults to false.
-     * With false, if the row doesn't exist - it will be auto-created with `dao.create`.
-     * With true, if the row doesn't exist - it will throw an error.
+     * With false, if the row doesn't exist - it will throw an error.
+     * With true, if the row doesn't exist - it will be auto-created with `dao.create`.
      *
      * Use true when you expect the row to exist and it would be an error if it doesn't.
      */
-    requireToExist?: boolean;
+    createIfMissing?: boolean;
 }
 export interface CommonDaoPatchOptions<DBM extends BaseDBEntity> extends CommonDaoSaveBatchOptions<DBM> {
     /**
      * If true - patch will skip loading from DB, and will just optimistically patch passed object.
+     *
+     * Consequently, when the row doesn't exist - it will be auto-created with `dao.create`.
      */
     skipDBRead?: boolean;
 }

package/dist/testing/daoTest.js

@@ -151,6 +151,14 @@ function runCommonDaoTest(db, quirks = {}) {
                 rows = (0, js_lib_1._sortBy)(rows, r => r.id);
                 (0, dbTest_1.expectMatch)(expectedItems.filter(i => i.even), rows, quirks);
             });
+            test('query nested property', async () => {
+                let rows = await dao
+                    .query()
+                    .filter('nested.foo', '==', 1)
+                    .runQuery();
+                rows = (0, js_lib_1._sortBy)(rows, r => r.id);
+                (0, dbTest_1.expectMatch)(expectedItems.filter(i => i.nested?.foo === 1), rows, quirks);
+            });
         }
         if (support.dbQueryOrder) {
             test('query order by k1 desc', async () => {

package/dist/testing/test.model.d.ts

@@ -6,6 +6,9 @@ export interface TestItemBM extends BaseDBEntity {
     k3?: number;
     even?: boolean;
     b1?: Buffer;
+    nested?: {
+        foo: number;
+    };
 }
 export interface TestItemDBM extends TestItemBM {
 }

package/dist/testing/test.model.js

@@ -15,6 +15,9 @@ exports.testItemBMSchema = (0, nodejs_lib_1.objectSchema)({
     k3: nodejs_lib_1.numberSchema.optional(),
     even: nodejs_lib_1.booleanSchema.optional(),
     b1: nodejs_lib_1.binarySchema.optional(),
+    nested: (0, nodejs_lib_1.objectSchema)({
+        foo: nodejs_lib_1.numberSchema,
+    }).optional(),
 }).concat(nodejs_lib_1.baseDBEntitySchema);
 exports.testItemTMSchema = (0, nodejs_lib_1.objectSchema)({
     k1: nodejs_lib_1.stringSchema,
@@ -41,6 +44,7 @@ function createTestItemDBM(num = 1) {
         k2: `v${num * 2}`,
         k3: num,
         even: num % 2 === 0,
+        nested: { foo: num },
         created: MOCK_TS_2018_06_21,
         updated: MOCK_TS_2018_06_21,
     };

package/package.json

@@ -45,7 +45,7 @@
   "engines": {
     "node": ">=22.10.0"
   },
-  "version": "9.26.3",
+  "version": "9.28.0",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/adapter/inmemory/queryInMemory.ts

@@ -1,4 +1,4 @@
-import { _pick, ObjectWithId } from '@naturalcycles/js-lib'
+import { _get, _pick, ObjectWithId } from '@naturalcycles/js-lib'
 import { DBQuery, DBQueryFilterOperator } from '../../query/dbQuery'
 
 type FilterFn = (v: any, val: any) => boolean
@@ -22,7 +22,10 @@ export function queryInMemory<ROW extends ObjectWithId>(q: DBQuery<ROW>, rows: R
   // .filter
   // eslint-disable-next-line unicorn/no-array-reduce
   rows = q._filters.reduce((rows, filter) => {
-    return rows.filter(row => FILTER_FNS[filter.op](row[filter.name], filter.val))
+    return rows.filter(row => {
+      const value = _get(row, filter.name as string)
+      return FILTER_FNS[filter.op](value, filter.val)
+    })
   }, rows)
 
   // .select(fieldNames)

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

@@ -285,18 +285,20 @@ export interface CommonDaoPatchByIdOptions<DBM extends BaseDBEntity>
   extends CommonDaoSaveBatchOptions<DBM> {
   /**
    * Defaults to false.
-   * With false, if the row doesn't exist - it will be auto-created with `dao.create`.
-   * With true, if the row doesn't exist - it will throw an error.
+   * With false, if the row doesn't exist - it will throw an error.
+   * With true, if the row doesn't exist - it will be auto-created with `dao.create`.
    *
    * Use true when you expect the row to exist and it would be an error if it doesn't.
    */
-  requireToExist?: boolean
+  createIfMissing?: boolean
 }
 
 export interface CommonDaoPatchOptions<DBM extends BaseDBEntity>
   extends CommonDaoSaveBatchOptions<DBM> {
   /**
    * If true - patch will skip loading from DB, and will just optimistically patch passed object.
+   *
+   * Consequently, when the row doesn't exist - it will be auto-created with `dao.create`.
    */
   skipDBRead?: boolean
 }

package/src/commondao/common.dao.ts

@@ -679,7 +679,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
       }
     } else {
       const table = opt.table || this.cfg.table
-      _assert(!opt.requireToExist, `${table}.patchById row is required, but missing`, {
+      _assert(opt.createIfMissing, `DB row required, but not found in ${table}`, {
         id,
         table,
       })
@@ -728,28 +728,24 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
       }
       Object.assign(bm, patch)
     } else {
-      const loaded = await this.getById(bm.id as ID, {
+      const loaded = await this.requireById(bm.id as ID, {
         // Skipping validation here for performance reasons.
         // Validation is going to happen on save anyway, just down below.
         skipValidation: true,
         ...opt,
       })
 
-      if (loaded) {
-        const loadedWithPatch: BM = {
-          ...loaded,
-          ...patch,
-        }
+      const loadedWithPatch: BM = {
+        ...loaded,
+        ...patch,
+      }
 
-        // Make `bm` exactly the same as `loadedWithPatch`
-        _objectAssignExact(bm, loadedWithPatch)
+      // Make `bm` exactly the same as `loadedWithPatch`
+      _objectAssignExact(bm, loadedWithPatch)
 
-        if (_deepJsonEquals(loaded, loadedWithPatch)) {
-          // Skipping the save operation, as data is the same
-          return bm
-        }
-      } else {
-        Object.assign(bm, patch)
+      if (_deepJsonEquals(loaded, loadedWithPatch)) {
+        // Skipping the save operation, as data is the same
+        return bm
       }
     }
 

package/src/testing/daoTest.ts

@@ -196,6 +196,19 @@ export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQui
           quirks,
         )
       })
+
+      test('query nested property', async () => {
+        let rows = await dao
+          .query()
+          .filter('nested.foo' as any, '==', 1)
+          .runQuery()
+        rows = _sortBy(rows, r => r.id)
+        expectMatch(
+          expectedItems.filter(i => i.nested?.foo === 1),
+          rows,
+          quirks,
+        )
+      })
     }
 
     if (support.dbQueryOrder) {

package/src/testing/test.model.ts

@@ -24,6 +24,9 @@ export interface TestItemBM extends BaseDBEntity {
   k3?: number
   even?: boolean
   b1?: Buffer
+  nested?: {
+    foo: number
+  }
 }
 
 export interface TestItemDBM extends TestItemBM {}
@@ -39,6 +42,9 @@ export const testItemBMSchema = objectSchema<TestItemBM>({
   k3: numberSchema.optional(),
   even: booleanSchema.optional(),
   b1: binarySchema.optional(),
+  nested: objectSchema({
+    foo: numberSchema,
+  }).optional(),
 }).concat(baseDBEntitySchema as any)
 
 export const testItemTMSchema = objectSchema<TestItemTM>({
@@ -68,6 +74,7 @@ export function createTestItemDBM(num = 1): TestItemDBM {
     k2: `v${num * 2}`,
     k3: num,
     even: num % 2 === 0,
+    nested: { foo: num },
     created: MOCK_TS_2018_06_21,
     updated: MOCK_TS_2018_06_21,
   }