@naturalcycles/db-lib 10.27.0 → 10.28.0

package/dist/adapter/cachedb/cache.db.js

@@ -103,7 +103,7 @@ export class CacheDB extends BaseCommonDB {
                 this.cfg.logger?.log(`${q.table}.runQuery ${rows.length} rows from downstream`);
             }
             // Don't save to cache if it was a projection query
-            if (!opt.skipCache && !opt.skipCache && !q._selectedFieldNames) {
+            if (!opt.skipCache && !this.cfg.skipCache && !q._selectedFieldNames) {
                 const cacheResult = this.cfg.cacheDB.saveBatch(q.table, rows, opt);
                 if (this.cfg.awaitCache)
                     await cacheResult;

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

@@ -152,7 +152,7 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Load rows (by their ids) from Multiple tables at once.
      * An optimized way to load data, minimizing DB round-trips.
      *
-     * @experimental.
+     * @experimental
      */
     static multiGet<MAP extends Record<string, DaoWithIds<AnyDao> | DaoWithId<AnyDao>>>(inputMap: MAP, opt?: CommonDaoReadOptions): Promise<{
         [K in keyof MAP]: MAP[K] extends DaoWithIds<any> ? InferBM<MAP[K]['dao']>[] : InferBM<MAP[K]['dao']> | null;
@@ -161,7 +161,7 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     private static multiGetMapByTableById;
     private static prepareMultiGetOutput;
     /**
-     * @experimental.
+     * @experimental
      */
     static multiDelete(inputs: (DaoWithId<AnyDao> | DaoWithIds<AnyDao>)[], opt?: CommonDaoOptions): Promise<NonNegativeInteger>;
     static multiSave(inputs: (DaoWithRows<AnyDao> | DaoWithRow<AnyDao>)[], opt?: CommonDaoSaveBatchOptions<any>): Promise<void>;

package/dist/commondao/common.dao.js

@@ -5,11 +5,9 @@ import { _assert, ErrorMode } from '@naturalcycles/js-lib/error';
 import { _deepJsonEquals } from '@naturalcycles/js-lib/object/deepEquals.js';
 import { _filterUndefinedValues, _objectAssignExact, } from '@naturalcycles/js-lib/object/object.util.js';
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
-import { _stringMapEntries, _stringMapValues, } from '@naturalcycles/js-lib/types';
-import { _passthroughPredicate, _typeCast } from '@naturalcycles/js-lib/types';
+import { _passthroughPredicate, _stringMapEntries, _stringMapValues, _typeCast, } from '@naturalcycles/js-lib/types';
 import { stringId } from '@naturalcycles/nodejs-lib';
-import { transformFlatten } from '@naturalcycles/nodejs-lib/stream';
-import { transformChunk, transformLogProgress, transformMap, } from '@naturalcycles/nodejs-lib/stream';
+import { transformChunk, transformFlatten, transformLogProgress, transformMap, } from '@naturalcycles/nodejs-lib/stream';
 import { DBLibError } from '../cnst.js';
 import { RunnableDBQuery } from '../query/dbQuery.js';
 import { CommonDaoTransaction } from './commonDaoTransaction.js';
@@ -648,7 +646,7 @@ export class CommonDao {
      * Load rows (by their ids) from Multiple tables at once.
      * An optimized way to load data, minimizing DB round-trips.
      *
-     * @experimental.
+     * @experimental
      */
     static async multiGet(inputMap, opt = {}) {
         const db = Object.values(inputMap)[0]?.dao.cfg.db;
@@ -718,7 +716,7 @@ export class CommonDao {
         return bmsByProp;
     }
     /**
-     * @experimental.
+     * @experimental
      */
     static async multiDelete(inputs, opt = {}) {
         if (!inputs.length)

package/dist/inmemory/queryInMemory.js

@@ -15,7 +15,7 @@ const FILTER_FNS = {
 // But should be careful here..
 export function queryInMemory(q, rows = []) {
     // .filter
-    // eslint-disable-next-line unicorn/no-array-reduce
+    // oxlint-disable-next-line unicorn/no-array-reduce
     rows = q._filters.reduce((rows, filter) => {
         return rows.filter(row => {
             const value = _get(row, filter.name);
@@ -31,7 +31,7 @@ export function queryInMemory(q, rows = []) {
     if (order) {
         const { name, descending } = order;
         rows = rows.sort((a, b) => {
-            // biome-ignore lint/suspicious/noDoubleEquals: ok
+            // oxlint-disable-next-line eqeqeq
             if (a[name] == b[name])
                 return 0;
             if (descending) {

package/dist/pipeline/dbPipelineRestore.d.ts

@@ -1,7 +1,6 @@
 import { ErrorMode } from '@naturalcycles/js-lib/error/errorMode.js';
 import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib/types';
-import { type TransformLogProgressOptions, type TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
-import { NDJsonStats } from '@naturalcycles/nodejs-lib/stream';
+import { NDJsonStats, type TransformLogProgressOptions, type TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDB } from '../commondb/common.db.js';
 import type { CommonDBSaveOptions } from '../db.model.js';
 export interface DBPipelineRestoreOptions extends TransformLogProgressOptions {

package/dist/pipeline/dbPipelineRestore.js

@@ -6,8 +6,7 @@ import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { _passthroughMapper } from '@naturalcycles/js-lib/types';
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
-import { Pipeline, } from '@naturalcycles/nodejs-lib/stream';
-import { NDJsonStats } from '@naturalcycles/nodejs-lib/stream';
+import { NDJsonStats, Pipeline, } from '@naturalcycles/nodejs-lib/stream';
 /**
  * Pipeline from NDJSON files in a folder (optionally gzipped) to CommonDB.
  * Allows to define a mapper and a predicate to map/filter objects between input and output.

package/dist/testing/commonDBTest.js

@@ -258,8 +258,8 @@ export async function runCommonDBTest(db, quirks = {}) {
                     await tx.saveBatch(TEST_TABLE, [{ ...items[0], k1: 5, id: null }]);
                 });
             }
-            catch (err_) {
-                err = err_;
+            catch (err2) {
+                err = err2;
             }
             expect(err).toBeDefined();
             const { rows } = await db.runQuery(queryAll());

package/dist/testing/commonDaoTest.js

@@ -309,8 +309,8 @@ export async function runCommonDaoTest(db, quirks = {}) {
                     await tx.save(dao, { ...items[0], k1: 5 }); // it should fail here
                 });
             }
-            catch (err_) {
-                err = err_;
+            catch (err2) {
+                err = err2;
             }
             expect(err).toBeDefined();
             expect(err).toBeInstanceOf(Error);
@@ -327,8 +327,8 @@ export async function runCommonDaoTest(db, quirks = {}) {
                     await tx.save(dao, { ...items[0], k1: 5 }); // it should fail here
                     await tx.commit();
                 }
-                catch (err_) {
-                    err = err_;
+                catch (err2) {
+                    err = err2;
                 }
                 expect(err).toBeDefined();
                 expect(err).toBeInstanceOf(Error);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "19.37.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "files": [
     "dist",

package/src/adapter/cachedb/cache.db.ts

@@ -162,7 +162,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
       }
 
       // Don't save to cache if it was a projection query
-      if (!opt.skipCache && !opt.skipCache && !q._selectedFieldNames) {
+      if (!opt.skipCache && !this.cfg.skipCache && !q._selectedFieldNames) {
         const cacheResult = this.cfg.cacheDB.saveBatch(q.table, rows as any, opt)
         if (this.cfg.awaitCache) await cacheResult
       }

package/src/commondao/common.dao.ts

@@ -11,19 +11,21 @@ import {
 } from '@naturalcycles/js-lib/object/object.util.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import {
+  _passthroughPredicate,
   _stringMapEntries,
   _stringMapValues,
+  _typeCast,
   type BaseDBEntity,
   type NonNegativeInteger,
   type ObjectWithId,
   type StringMap,
   type Unsaved,
 } from '@naturalcycles/js-lib/types'
-import { _passthroughPredicate, _typeCast } from '@naturalcycles/js-lib/types'
 import { stringId } from '@naturalcycles/nodejs-lib'
-import { type Pipeline, transformFlatten } from '@naturalcycles/nodejs-lib/stream'
 import {
+  type Pipeline,
   transformChunk,
+  transformFlatten,
   transformLogProgress,
   transformMap,
 } from '@naturalcycles/nodejs-lib/stream'
@@ -857,7 +859,7 @@ export class CommonDao<
    * Load rows (by their ids) from Multiple tables at once.
    * An optimized way to load data, minimizing DB round-trips.
    *
-   * @experimental.
+   * @experimental
    */
   static async multiGet<MAP extends Record<string, DaoWithIds<AnyDao> | DaoWithId<AnyDao>>>(
     inputMap: MAP,
@@ -953,7 +955,7 @@ export class CommonDao<
   }
 
   /**
-   * @experimental.
+   * @experimental
    */
   static async multiDelete(
     inputs: (DaoWithId<AnyDao> | DaoWithIds<AnyDao>)[],

package/src/inmemory/queryInMemory.ts

@@ -21,7 +21,7 @@ const FILTER_FNS: Record<DBQueryFilterOperator, FilterFn> = {
 // But should be careful here..
 export function queryInMemory<ROW extends ObjectWithId>(q: DBQuery<ROW>, rows: ROW[] = []): ROW[] {
   // .filter
-  // eslint-disable-next-line unicorn/no-array-reduce
+  // oxlint-disable-next-line unicorn/no-array-reduce
   rows = q._filters.reduce((rows, filter) => {
     return rows.filter(row => {
       const value = _get(row, filter.name as string)
@@ -39,7 +39,7 @@ export function queryInMemory<ROW extends ObjectWithId>(q: DBQuery<ROW>, rows: R
   if (order) {
     const { name, descending } = order
     rows = rows.sort((a, b) => {
-      // biome-ignore lint/suspicious/noDoubleEquals: ok
+      // oxlint-disable-next-line eqeqeq
       if (a[name] == b[name]) return 0
 
       if (descending) {

package/src/pipeline/dbPipelineRestore.ts

@@ -9,11 +9,11 @@ import { _passthroughMapper } from '@naturalcycles/js-lib/types'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import {
+  NDJsonStats,
   Pipeline,
   type TransformLogProgressOptions,
   type TransformMapOptions,
 } from '@naturalcycles/nodejs-lib/stream'
-import { NDJsonStats } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDB } from '../commondb/common.db.js'
 import type { CommonDBSaveOptions } from '../db.model.js'
 

package/src/testing/commonDBTest.ts

@@ -354,8 +354,8 @@ export async function runCommonDBTest(
           // It should fail on id == null
           await tx.saveBatch(TEST_TABLE, [{ ...items[0]!, k1: 5, id: null as any }])
         })
-      } catch (err_) {
-        err = err_
+      } catch (err2) {
+        err = err2
       }
 
       expect(err).toBeDefined()

package/src/testing/commonDaoTest.ts

@@ -412,8 +412,8 @@ export async function runCommonDaoTest(
           await tx.deleteById(dao, items[2]!.id)
           await tx.save(dao, { ...items[0]!, k1: 5 as any }) // it should fail here
         })
-      } catch (err_) {
-        err = err_
+      } catch (err2) {
+        err = err2
       }
 
       expect(err).toBeDefined()
@@ -433,8 +433,8 @@ export async function runCommonDaoTest(
           await tx.deleteById(dao, items[2]!.id)
           await tx.save(dao, { ...items[0]!, k1: 5 as any }) // it should fail here
           await tx.commit()
-        } catch (err_) {
-          err = err_
+        } catch (err2) {
+          err = err2
         }
 
         expect(err).toBeDefined()

package/src/testing/test.model.ts

@@ -58,7 +58,7 @@ export const testItemBMJsonSchema: JsonSchemaObject<TestItemBM> = j
     created: j.unixTimestamp(),
     updated: j.unixTimestamp(),
     k1: j.string(),
-    k2: j.oneOf<string | null>([j.string(), j.null()]).optional(),
+    k2: j.oneOf([j.string(), j.null()]).optional(),
     k3: j.number().optional(),
     even: j.boolean().optional(),
     b1: j.buffer().optional(),