@naturalcycles/db-lib 8.54.0 → 8.54.2

package/dist/adapter/file/localFile.persistence.plugin.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalFilePersistencePlugin = void 0;
+const fs = require("node:fs");
 const node_stream_1 = require("node:stream");
+const fsp = require("node:fs/promises");
 const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const fs = require("fs-extra");
 /**
  * Persists in local filesystem as ndjson.
  */
@@ -19,15 +20,15 @@ class LocalFilePersistencePlugin {
     }
     async ping() { }
     async getTables() {
-        return (await fs.readdir(this.cfg.storagePath))
+        return (await fsp.readdir(this.cfg.storagePath))
             .filter(f => f.includes('.ndjson'))
             .map(f => f.split('.ndjson')[0]);
     }
     async loadFile(table) {
-        await fs.ensureDir(this.cfg.storagePath);
+        await (0, nodejs_lib_1._ensureDir)(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        if (!(await fs.pathExists(filePath)))
+        if (!(await (0, nodejs_lib_1._pathExists)(filePath)))
             return [];
         const transformUnzip = this.cfg.gzip ? [(0, node_zlib_1.createUnzip)()] : [];
         const rows = [];
@@ -44,7 +45,7 @@ class LocalFilePersistencePlugin {
         await (0, js_lib_1.pMap)(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 16 });
     }
     async saveFile(table, rows) {
-        await fs.ensureDir(this.cfg.storagePath);
+        await (0, nodejs_lib_1._ensureDir)(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
         const transformZip = this.cfg.gzip ? [(0, node_zlib_1.createGzip)()] : [];

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryDB = void 0;
+const fs = require("node:fs");
+const fsp = require("node:fs/promises");
 const node_stream_1 = require("node:stream");
 const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const fs = require("fs-extra");
 const __1 = require("../..");
 const dbQuery_1 = require("../../query/dbQuery");
 class InMemoryDB {
@@ -166,7 +167,7 @@ class InMemoryDB {
         (0, js_lib_1._assert)(this.cfg.persistenceEnabled, 'flushToDisk() called but persistenceEnabled=false');
         const { persistentStoragePath, persistZip } = this.cfg;
         const started = Date.now();
-        await fs.emptyDir(persistentStoragePath);
+        await (0, nodejs_lib_1._emptyDir)(persistentStoragePath);
         const transformZip = persistZip ? [(0, node_zlib_1.createGzip)()] : [];
         let tables = 0;
         // infinite concurrency for now
@@ -192,9 +193,9 @@ class InMemoryDB {
         (0, js_lib_1._assert)(this.cfg.persistenceEnabled, 'restoreFromDisk() called but persistenceEnabled=false');
         const { persistentStoragePath } = this.cfg;
         const started = Date.now();
-        await fs.ensureDir(persistentStoragePath);
+        await (0, nodejs_lib_1._ensureDir)(persistentStoragePath);
         this.data = {}; // empty it in the beginning!
-        const files = (await fs.readdir(persistentStoragePath)).filter(f => f.includes('.ndjson'));
+        const files = (await fsp.readdir(persistentStoragePath)).filter(f => f.includes('.ndjson'));
         // infinite concurrency for now
         await (0, js_lib_1.pMap)(files, async (file) => {
             const fname = `${persistentStoragePath}/${file}`;

package/dist/cnst.js

@@ -7,4 +7,4 @@ var DBLibError;
     DBLibError["DAO_IS_READ_ONLY"] = "DAO_IS_READ_ONLY";
     DBLibError["NON_UNIQUE_ID"] = "NON_UNIQUE_ID";
     DBLibError["OBJECT_IS_IMMUTABLE"] = "OBJECT_IS_IMMUTABLE";
-})(DBLibError = exports.DBLibError || (exports.DBLibError = {}));
+})(DBLibError || (exports.DBLibError = DBLibError = {}));

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

@@ -1,5 +1,5 @@
 import { AnyObject, AsyncMapper, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, Promisable, Saved, UnixTimestampMillisNumber, Unsaved, ZodSchema } from '@naturalcycles/js-lib';
-import { AjvSchema, ObjectSchemaTyped, ReadableTyped } from '@naturalcycles/nodejs-lib';
+import { AjvSchema, ObjectSchema, ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DBDeleteByIdsOperation, DBModelType, DBOperation, DBPatch, DBSaveBatchOperation, RunQueryResult } from '../db.model';
 import { DBQuery, RunnableDBQuery } from '../query/dbQuery';
 import { CommonDaoCfg, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from './common.dao.model';
@@ -145,7 +145,7 @@ export declare class CommonDao<BM extends Partial<ObjectWithId<ID>>, DBM extends
      *
      * Does NOT mutate the object.
      */
-    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): OUT;
+    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchema<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): OUT;
     getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
     createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**

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

@@ -1,5 +1,5 @@
 import { CommonLogger, ErrorMode, ObjectWithId, Promisable, Saved, ZodError, ZodSchema } from '@naturalcycles/js-lib';
-import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchemaTyped, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
+import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchema, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 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> {
@@ -110,9 +110,9 @@ export interface CommonDaoCfg<BM extends Partial<ObjectWithId<ID>>, DBM extends
     /**
      * Joi, AjvSchema or ZodSchema is supported.
      */
-    dbmSchema?: ObjectSchemaTyped<DBM> | AjvSchema<DBM> | ZodSchema<DBM>;
-    bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM> | ZodSchema<BM>;
-    tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM> | ZodSchema<TM>;
+    dbmSchema?: ObjectSchema<DBM> | AjvSchema<DBM> | ZodSchema<DBM>;
+    bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>;
+    tmSchema?: ObjectSchema<TM> | AjvSchema<TM> | ZodSchema<TM>;
     excludeFromIndexes?: (keyof DBM)[];
     /**
      * Defaults to false.

package/dist/commondao/common.dao.model.js

@@ -19,4 +19,4 @@ var CommonDaoLogLevel;
      * Log EVERYTHING - all data passing in and out (max 10 rows). Very verbose!
      */
     CommonDaoLogLevel[CommonDaoLogLevel["DATA_FULL"] = 30] = "DATA_FULL";
-})(CommonDaoLogLevel = exports.CommonDaoLogLevel || (exports.CommonDaoLogLevel = {}));
+})(CommonDaoLogLevel || (exports.CommonDaoLogLevel = CommonDaoLogLevel = {}));

package/dist/db.model.js

@@ -5,13 +5,13 @@ var DBRelation;
 (function (DBRelation) {
     DBRelation["ONE_TO_ONE"] = "ONE_TO_ONE";
     DBRelation["ONE_TO_MANY"] = "ONE_TO_MANY";
-})(DBRelation = exports.DBRelation || (exports.DBRelation = {}));
+})(DBRelation || (exports.DBRelation = DBRelation = {}));
 var DBModelType;
 (function (DBModelType) {
     DBModelType["DBM"] = "DBM";
     DBModelType["BM"] = "BM";
     DBModelType["TM"] = "TM";
-})(DBModelType = exports.DBModelType || (exports.DBModelType = {}));
+})(DBModelType || (exports.DBModelType = DBModelType = {}));
 /**
  * Allows to construct a query similar to:
  *

package/dist/pipeline/dbPipelineBackup.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbPipelineBackup = void 0;
+const fs = require("node:fs");
+const fsp = require("node:fs/promises");
 const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const fs = require("fs-extra");
 const index_1 = require("../index");
 /**
  * Pipeline from input stream(s) to a NDJSON file (optionally gzipped).
@@ -23,7 +24,7 @@ async function dbPipelineBackup(opt) {
     let { tables } = opt;
     const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
     console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineBackup')} started in ${(0, colors_1.grey)(outputDirPath)}...${sinceUpdatedStr}`);
-    fs.ensureDirSync(outputDirPath);
+    (0, nodejs_lib_1._ensureDirSync)(outputDirPath);
     tables ||= await db.getTables();
     console.log(`${(0, colors_1.yellow)(tables.length)} ${(0, colors_1.boldWhite)('table(s)')}:\n` + tables.join('\n'));
     const statsPerTable = {};
@@ -34,16 +35,16 @@ async function dbPipelineBackup(opt) {
         }
         const filePath = `${outputDirPath}/${table}.ndjson` + (gzip ? '.gz' : '');
         const schemaFilePath = `${outputDirPath}/${table}.schema.json`;
-        if (protectFromOverwrite && (await fs.pathExists(filePath))) {
+        if (protectFromOverwrite && (0, nodejs_lib_1._pathExistsSync)(filePath)) {
             throw new js_lib_1.AppError(`dbPipelineBackup: output file exists: ${filePath}`);
         }
         const started = Date.now();
         let rows = 0;
-        await fs.ensureFile(filePath);
+        (0, nodejs_lib_1._ensureFileSync)(filePath);
         console.log(`>> ${(0, colors_1.grey)(filePath)} started...`);
         if (emitSchemaFromDB) {
             const schema = await db.getTableSchema(table);
-            await fs.writeJson(schemaFilePath, schema, { spaces: 2 });
+            await (0, nodejs_lib_1._writeJsonFile)(schemaFilePath, schema, { spaces: 2 });
             console.log(`>> ${(0, colors_1.grey)(schemaFilePath)} saved (generated from DB)`);
         }
         await (0, nodejs_lib_1._pipeline)([
@@ -66,7 +67,7 @@ async function dbPipelineBackup(opt) {
             ...(gzip ? [(0, node_zlib_1.createGzip)(zlibOptions)] : []),
             fs.createWriteStream(filePath),
         ]);
-        const { size: sizeBytes } = await fs.stat(filePath);
+        const { size: sizeBytes } = await fsp.stat(filePath);
         const stats = nodejs_lib_1.NDJsonStats.create({
             tookMillis: Date.now() - started,
             rows,

package/dist/pipeline/dbPipelineRestore.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbPipelineRestore = void 0;
+const fs = require("node:fs");
 const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const fs = require("fs-extra");
 /**
  * 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.
@@ -19,7 +19,7 @@ async function dbPipelineRestore(opt) {
     const onlyTables = opt.tables && new Set(opt.tables);
     const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
     console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineRestore')} started in ${(0, colors_1.grey)(inputDirPath)}...${sinceUpdatedStr}`);
-    fs.ensureDirSync(inputDirPath);
+    (0, nodejs_lib_1._ensureDirSync)(inputDirPath);
     const tablesToGzip = new Set();
     const sizeByTable = {};
     const statsPerTable = {};
@@ -54,7 +54,7 @@ async function dbPipelineRestore(opt) {
                 console.warn(`${schemaFilePath} does not exist!`);
                 return;
             }
-            const schema = await fs.readJson(schemaFilePath);
+            const schema = await (0, nodejs_lib_1._readJsonFile)(schemaFilePath);
             await db.createTable(table, schema, { dropIfExists: true });
         });
     }

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

@@ -15,9 +15,9 @@ export interface TestItemTM {
     k1: string;
     even?: boolean;
 }
-export declare const testItemBMSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<TestItemBM, TestItemBM>;
-export declare const testItemDBMSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<TestItemDBM, TestItemDBM>;
-export declare const testItemTMSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<TestItemTM, TestItemTM>;
+export declare const testItemBMSchema: import("joi").ObjectSchema<TestItemBM>;
+export declare const testItemDBMSchema: import("joi").ObjectSchema<TestItemDBM>;
+export declare const testItemTMSchema: import("joi").ObjectSchema<TestItemTM>;
 export declare const testItemBMJsonSchema: JsonSchemaObject<TestItemBM>;
 export declare const testItemDBMJsonSchema: JsonSchemaObject<TestItemDBM>;
 export declare function createTestItemDBM(num?: number): TestItemDBM;

package/dist/timeseries/commonTimeSeriesDao.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonTimeSeriesDao = void 0;
+const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("..");
 const dbQuery_1 = require("../query/dbQuery");
 const _TIMESERIES_RAW = '_TIMESERIES_RAW';
@@ -20,7 +21,7 @@ class CommonTimeSeriesDao {
     async getSeries() {
         return (await this.cfg.db.getTables())
             .map(t => /^(.*)_TIMESERIES_RAW$/.exec(t)?.[1])
-            .filter(Boolean);
+            .filter(js_lib_1._isTruthy);
     }
     // convenience method
     async save(series, tsMillis, value) {

package/dist/validation/index.d.ts

@@ -1,8 +1,8 @@
 import { CommonDBOptions, CommonDBSaveOptions } from '../db.model';
-import { DBQuery, DBQueryFilter, DBQueryOrder } from '../query/dbQuery';
-export declare const commonDBOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBOptions, CommonDBOptions>;
-export declare const commonDBSaveOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBSaveOptions<any>, CommonDBSaveOptions<any>>;
-export declare const dbQueryFilterOperatorSchema: import("@naturalcycles/nodejs-lib/dist/validation/joi/string.extensions").ExtendedStringSchema;
-export declare const dbQueryFilterSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>, DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
-export declare const dbQueryOrderSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>, DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
-export declare const dbQuerySchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQuery<any>, DBQuery<any>>;
+import { DBQuery, DBQueryFilter, DBQueryFilterOperator, DBQueryOrder } from '../query/dbQuery';
+export declare const commonDBOptionsSchema: import("joi").ObjectSchema<CommonDBOptions>;
+export declare const commonDBSaveOptionsSchema: import("joi").ObjectSchema<CommonDBSaveOptions<any>>;
+export declare const dbQueryFilterOperatorSchema: import("@naturalcycles/nodejs-lib/dist/validation/joi/string.extensions").StringSchema<DBQueryFilterOperator>;
+export declare const dbQueryFilterSchema: import("joi").ObjectSchema<DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
+export declare const dbQueryOrderSchema: import("joi").ObjectSchema<DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
+export declare const dbQuerySchema: import("joi").ObjectSchema<DBQuery<any>>;

package/dist/validation/index.js

@@ -10,7 +10,7 @@ exports.commonDBOptionsSchema = (0, nodejs_lib_1.objectSchema)({
 exports.commonDBSaveOptionsSchema = (0, nodejs_lib_1.objectSchema)({
     excludeFromIndexes: (0, nodejs_lib_1.arraySchema)(nodejs_lib_1.stringSchema).optional(),
 }).concat(exports.commonDBOptionsSchema);
-exports.dbQueryFilterOperatorSchema = nodejs_lib_1.stringSchema.valid(...dbQuery_1.dbQueryFilterOperatorValues);
+exports.dbQueryFilterOperatorSchema = nodejs_lib_1.Joi.string().valid(...dbQuery_1.dbQueryFilterOperatorValues);
 exports.dbQueryFilterSchema = (0, nodejs_lib_1.objectSchema)({
     name: nodejs_lib_1.stringSchema,
     op: exports.dbQueryFilterOperatorSchema,

package/package.json

@@ -5,13 +5,12 @@
   },
   "dependencies": {
     "@naturalcycles/js-lib": "^14.116.0",
-    "@naturalcycles/nodejs-lib": "^12.0.0",
-    "fs-extra": "^11.1.0"
+    "@naturalcycles/nodejs-lib": "^12.0.0"
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^1.0.0",
     "@naturalcycles/dev-lib": "^13.0.0",
-    "@types/node": "^18.0.3",
+    "@types/node": "^20.2.1",
     "jest": "^29.0.0"
   },
   "files": [
@@ -41,7 +40,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "version": "8.54.0",
+  "version": "8.54.2",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/readme.md

@@ -5,7 +5,7 @@
 [![npm](https://img.shields.io/npm/v/@naturalcycles/db-lib/latest.svg)](https://www.npmjs.com/package/@naturalcycles/db-lib)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 [![loc](https://badgen.net/codeclimate/loc/NaturalCycles/db-lib)](https://github.com/NaturalCycles/db-lib)
-[![Actions](https://github.com/NaturalCycles/db-lib/workflows/default/badge.svg)](https://github.com/NaturalCycles/db-lib/actions)
+[![Actions](https://github.com/NaturalCycles/db-lib/workflows/ci/badge.svg)](https://github.com/NaturalCycles/db-lib/actions)
 
 Defines 3 things:
 

package/src/adapter/file/file.db.ts

@@ -52,7 +52,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  public cfg!: FileDBCfg
+  cfg!: FileDBCfg
 
   override async ping(): Promise<void> {
     await this.cfg.plugin.ping()

package/src/adapter/file/localFile.persistence.plugin.ts

@@ -1,4 +1,6 @@
+import * as fs from 'node:fs'
 import { Readable } from 'node:stream'
+import * as fsp from 'node:fs/promises'
 import { createGzip, createUnzip } from 'node:zlib'
 import { pMap, ObjectWithId } from '@naturalcycles/js-lib'
 import {
@@ -7,8 +9,9 @@ import {
   transformToNDJson,
   writablePushToArray,
   _pipeline,
+  _ensureDir,
+  _pathExists,
 } from '@naturalcycles/nodejs-lib'
-import * as fs from 'fs-extra'
 import { DBSaveBatchOperation } from '../../db.model'
 import { FileDBPersistencePlugin } from './file.db.model'
 
@@ -36,22 +39,22 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
     }
   }
 
-  public cfg!: LocalFilePersistencePluginCfg
+  cfg!: LocalFilePersistencePluginCfg
 
   async ping(): Promise<void> {}
 
   async getTables(): Promise<string[]> {
-    return (await fs.readdir(this.cfg.storagePath))
+    return (await fsp.readdir(this.cfg.storagePath))
       .filter(f => f.includes('.ndjson'))
       .map(f => f.split('.ndjson')[0]!)
   }
 
   async loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]> {
-    await fs.ensureDir(this.cfg.storagePath)
+    await _ensureDir(this.cfg.storagePath)
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`
 
-    if (!(await fs.pathExists(filePath))) return []
+    if (!(await _pathExists(filePath))) return []
 
     const transformUnzip = this.cfg.gzip ? [createUnzip()] : []
 
@@ -73,7 +76,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
   }
 
   async saveFile<ROW extends ObjectWithId>(table: string, rows: ROW[]): Promise<void> {
-    await fs.ensureDir(this.cfg.storagePath)
+    await _ensureDir(this.cfg.storagePath)
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`
     const transformZip = this.cfg.gzip ? [createGzip()] : []

package/src/adapter/inmemory/inMemory.db.ts

@@ -1,3 +1,5 @@
+import * as fs from 'node:fs'
+import * as fsp from 'node:fs/promises'
 import { Readable } from 'node:stream'
 import { createGzip, createUnzip } from 'node:zlib'
 import {
@@ -23,9 +25,10 @@ import {
   transformToNDJson,
   writablePushToArray,
   _pipeline,
+  _emptyDir,
+  _ensureDir,
 } from '@naturalcycles/nodejs-lib'
 import { dimGrey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import * as fs from 'fs-extra'
 import { CommonDB, DBIncrement, DBPatch, DBTransaction, queryInMemory } from '../..'
 import {
   CommonDBCreateOptions,
@@ -279,7 +282,7 @@ export class InMemoryDB implements CommonDB {
 
     const started = Date.now()
 
-    await fs.emptyDir(persistentStoragePath)
+    await _emptyDir(persistentStoragePath)
 
     const transformZip = persistZip ? [createGzip()] : []
     let tables = 0
@@ -314,11 +317,11 @@ export class InMemoryDB implements CommonDB {
 
     const started = Date.now()
 
-    await fs.ensureDir(persistentStoragePath)
+    await _ensureDir(persistentStoragePath)
 
     this.data = {} // empty it in the beginning!
 
-    const files = (await fs.readdir(persistentStoragePath)).filter(f => f.includes('.ndjson'))
+    const files = (await fsp.readdir(persistentStoragePath)).filter(f => f.includes('.ndjson'))
 
     // infinite concurrency for now
     await pMap(files, async file => {

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

@@ -11,7 +11,7 @@ import {
   AjvSchema,
   AjvValidationError,
   JoiValidationError,
-  ObjectSchemaTyped,
+  ObjectSchema,
   TransformLogProgressOptions,
   TransformMapOptions,
 } from '@naturalcycles/nodejs-lib'
@@ -148,9 +148,9 @@ export interface CommonDaoCfg<
   /**
    * Joi, AjvSchema or ZodSchema is supported.
    */
-  dbmSchema?: ObjectSchemaTyped<DBM> | AjvSchema<DBM> | ZodSchema<DBM>
-  bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM> | ZodSchema<BM>
-  tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM> | ZodSchema<TM>
+  dbmSchema?: ObjectSchema<DBM> | AjvSchema<DBM> | ZodSchema<DBM>
+  bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>
+  tmSchema?: ObjectSchema<TM> | AjvSchema<TM> | ZodSchema<TM>
 
   excludeFromIndexes?: (keyof DBM)[]
 

package/src/commondao/common.dao.ts

@@ -30,7 +30,7 @@ import {
   AjvValidationError,
   getValidationResult,
   JoiValidationError,
-  ObjectSchemaTyped,
+  ObjectSchema,
   ReadableTyped,
   stringId,
   transformBuffer,
@@ -453,7 +453,7 @@ export class CommonDao<
           if (partialQuery || opt.raw) return dbm as any
 
           if (this.cfg.hooks!.afterLoad) {
-            dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+            dbm = (await this.cfg.hooks!.afterLoad(dbm))!
             if (dbm === null) return SKIP
           }
 
@@ -503,7 +503,7 @@ export class CommonDao<
           if (partialQuery || opt.raw) return dbm
 
           if (this.cfg.hooks!.afterLoad) {
-            dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+            dbm = (await this.cfg.hooks!.afterLoad(dbm))!
             if (dbm === null) return SKIP
           }
 
@@ -550,7 +550,7 @@ export class CommonDao<
         transformMap<any, DBM>(
           async dbm => {
             if (this.cfg.hooks!.afterLoad) {
-              dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+              dbm = (await this.cfg.hooks!.afterLoad(dbm))!
               if (dbm === null) return SKIP
             }
 
@@ -592,7 +592,7 @@ export class CommonDao<
           transformMap<DBM, Saved<BM>>(
             async dbm => {
               if (this.cfg.hooks!.afterLoad) {
-                dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+                dbm = (await this.cfg.hooks!.afterLoad(dbm))!
                 if (dbm === null) return SKIP
               }
 
@@ -765,7 +765,7 @@ export class CommonDao<
     let dbm = await this.bmToDBM(bm as BM, opt)
 
     if (this.cfg.hooks!.beforeSave) {
-      dbm = (await this.cfg.hooks!.beforeSave(dbm)) as DBM
+      dbm = (await this.cfg.hooks!.beforeSave(dbm))!
       if (dbm === null && !opt.tx) return bm as any
     }
 
@@ -852,7 +852,7 @@ export class CommonDao<
     const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
 
     if (this.cfg.hooks!.beforeSave) {
-      row = (await this.cfg.hooks!.beforeSave(row)) as DBM
+      row = (await this.cfg.hooks!.beforeSave(row))!
       if (row === null) return dbm
     }
 
@@ -1178,7 +1178,7 @@ export class CommonDao<
    */
   validateAndConvert<IN, OUT = IN>(
     obj: Partial<IN>,
-    schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined,
+    schema: ObjectSchema<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined,
     modelType: DBModelType,
     opt: CommonDaoOptions = {},
   ): OUT {
@@ -1231,7 +1231,7 @@ export class CommonDao<
       })
     } else {
       // Joi
-      const vr = getValidationResult<IN, OUT>(obj as IN, schema, objectName)
+      const vr = getValidationResult(obj, schema, objectName)
       error = vr.error
       convertedValue = vr.value
     }

package/src/pipeline/dbPipelineBackup.ts

@@ -1,3 +1,5 @@
+import * as fs from 'node:fs'
+import * as fsp from 'node:fs/promises'
 import { createGzip, ZlibOptions } from 'node:zlib'
 import {
   AppError,
@@ -16,9 +18,12 @@ import {
   transformTap,
   transformToNDJson,
   _pipeline,
+  _ensureDirSync,
+  _pathExistsSync,
+  _ensureFileSync,
+  _writeJsonFile,
 } from '@naturalcycles/nodejs-lib'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import * as fs from 'fs-extra'
 import { CommonDB } from '../common.db'
 import { DBQuery } from '../index'
 
@@ -156,7 +161,7 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
     `>> ${dimWhite('dbPipelineBackup')} started in ${grey(outputDirPath)}...${sinceUpdatedStr}`,
   )
 
-  fs.ensureDirSync(outputDirPath)
+  _ensureDirSync(outputDirPath)
 
   tables ||= await db.getTables()
 
@@ -176,20 +181,20 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
       const filePath = `${outputDirPath}/${table}.ndjson` + (gzip ? '.gz' : '')
       const schemaFilePath = `${outputDirPath}/${table}.schema.json`
 
-      if (protectFromOverwrite && (await fs.pathExists(filePath))) {
+      if (protectFromOverwrite && _pathExistsSync(filePath)) {
         throw new AppError(`dbPipelineBackup: output file exists: ${filePath}`)
       }
 
       const started = Date.now()
       let rows = 0
 
-      await fs.ensureFile(filePath)
+      _ensureFileSync(filePath)
 
       console.log(`>> ${grey(filePath)} started...`)
 
       if (emitSchemaFromDB) {
         const schema = await db.getTableSchema(table)
-        await fs.writeJson(schemaFilePath, schema, { spaces: 2 })
+        await _writeJsonFile(schemaFilePath, schema, { spaces: 2 })
         console.log(`>> ${grey(schemaFilePath)} saved (generated from DB)`)
       }
 
@@ -214,7 +219,7 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
         fs.createWriteStream(filePath),
       ])
 
-      const { size: sizeBytes } = await fs.stat(filePath)
+      const { size: sizeBytes } = await fsp.stat(filePath)
 
       const stats = NDJsonStats.create({
         tookMillis: Date.now() - started,

package/src/pipeline/dbPipelineRestore.ts

@@ -1,3 +1,4 @@
+import * as fs from 'node:fs'
 import { createUnzip } from 'node:zlib'
 import {
   AsyncMapper,
@@ -8,6 +9,7 @@ import {
   _passthroughMapper,
   SavedDBEntity,
   localTime,
+  JsonSchemaObject,
 } from '@naturalcycles/js-lib'
 import {
   NDJsonStats,
@@ -23,9 +25,10 @@ import {
   transformTap,
   writableForEach,
   _pipeline,
+  _ensureDirSync,
+  _readJsonFile,
 } from '@naturalcycles/nodejs-lib'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
-import * as fs from 'fs-extra'
 import { CommonDB } from '../common.db'
 import { CommonDBSaveOptions } from '../index'
 
@@ -139,7 +142,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
     `>> ${dimWhite('dbPipelineRestore')} started in ${grey(inputDirPath)}...${sinceUpdatedStr}`,
   )
 
-  fs.ensureDirSync(inputDirPath)
+  _ensureDirSync(inputDirPath)
 
   const tablesToGzip = new Set<string>()
   const sizeByTable: Record<string, number> = {}
@@ -179,7 +182,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
         return
       }
 
-      const schema = await fs.readJson(schemaFilePath)
+      const schema = await _readJsonFile<JsonSchemaObject<any>>(schemaFilePath)
       await db.createTable(table, schema, { dropIfExists: true })
     })
   }

package/src/query/dbQuery.ts

@@ -244,7 +244,10 @@ export class RunnableDBQuery<
   /**
    * Pass `table` to override table.
    */
-  constructor(public dao: CommonDao<BM, DBM, TM, ID>, table?: string) {
+  constructor(
+    public dao: CommonDao<BM, DBM, TM, ID>,
+    table?: string,
+  ) {
     super(table || dao.cfg.table)
   }
 

package/src/testing/dbTest.ts

@@ -112,7 +112,7 @@ export function runCommonDBTest(
   deepFreeze(items)
   const item1 = items[0]!
 
-  const queryAll = () => DBQuery.create<TestItemDBM>(TEST_TABLE)
+  const queryAll = (): DBQuery<TestItemDBM> => DBQuery.create<TestItemDBM>(TEST_TABLE)
 
   test('ping', async () => {
     await db.ping()

package/src/testing/test.model.ts

@@ -35,7 +35,7 @@ export const testItemBMSchema = objectSchema<TestItemBM>({
   k3: numberSchema.optional(),
   even: booleanSchema.optional(),
   b1: binarySchema.optional(),
-}).concat(baseDBEntitySchema)
+}).concat(baseDBEntitySchema as any)
 
 export const testItemDBMSchema = objectSchema<TestItemDBM>({
   k1: stringSchema,
@@ -43,7 +43,7 @@ export const testItemDBMSchema = objectSchema<TestItemDBM>({
   k3: numberSchema.optional(),
   even: booleanSchema.optional(),
   b1: binarySchema.optional(),
-}).concat(savedDBEntitySchema)
+}).concat(savedDBEntitySchema as any)
 
 export const testItemTMSchema = objectSchema<TestItemTM>({
   k1: stringSchema,

package/src/timeseries/commonTimeSeriesDao.ts

@@ -1,4 +1,4 @@
-import { ObjectWithId } from '@naturalcycles/js-lib'
+import { _isTruthy, ObjectWithId } from '@naturalcycles/js-lib'
 import { DBTransaction } from '..'
 import { DBQuery } from '../query/dbQuery'
 import {
@@ -26,8 +26,8 @@ export class CommonTimeSeriesDao {
 
   async getSeries(): Promise<string[]> {
     return (await this.cfg.db.getTables())
-      .map(t => /^(.*)_TIMESERIES_RAW$/.exec(t)?.[1] as string)
-      .filter(Boolean)
+      .map(t => /^(.*)_TIMESERIES_RAW$/.exec(t)?.[1])
+      .filter(_isTruthy)
   }
 
   // convenience method

package/src/validation/index.ts

@@ -3,11 +3,18 @@ import {
   arraySchema,
   booleanSchema,
   integerSchema,
+  Joi,
   objectSchema,
   stringSchema,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDBOptions, CommonDBSaveOptions } from '../db.model'
-import { DBQuery, DBQueryFilter, dbQueryFilterOperatorValues, DBQueryOrder } from '../query/dbQuery'
+import {
+  DBQuery,
+  DBQueryFilter,
+  DBQueryFilterOperator,
+  dbQueryFilterOperatorValues,
+  DBQueryOrder,
+} from '../query/dbQuery'
 
 export const commonDBOptionsSchema = objectSchema<CommonDBOptions>({
   onlyCache: booleanSchema.optional(),
@@ -18,7 +25,9 @@ export const commonDBSaveOptionsSchema = objectSchema<CommonDBSaveOptions>({
   excludeFromIndexes: arraySchema(stringSchema).optional(),
 }).concat(commonDBOptionsSchema)
 
-export const dbQueryFilterOperatorSchema = stringSchema.valid(...dbQueryFilterOperatorValues)
+export const dbQueryFilterOperatorSchema = Joi.string<DBQueryFilterOperator>().valid(
+  ...dbQueryFilterOperatorValues,
+)
 
 export const dbQueryFilterSchema = objectSchema<DBQueryFilter>({
   name: stringSchema,