@naturalcycles/db-lib 10.0.0 → 10.0.2

package/dist/testing/keyValueDaoTest.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommonKeyValueDaoTest = runCommonKeyValueDaoTest;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const vitest_1 = require("vitest");
 const commonKeyValueDao_1 = require("../kv/commonKeyValueDao");
 const test_model_1 = require("./test.model");
 const testItems = (0, test_model_1.createTestItemsBM)(4);
 const testIds = testItems.map(e => e.id);
 const testEntries = testItems.map(e => [e.id, Buffer.from(`${e.id}value`)]);
-function runCommonKeyValueDaoTest(db) {
+async function runCommonKeyValueDaoTest(db) {
+    const { afterAll, beforeAll, expect, test } = await import('vitest');
     const dao = new commonKeyValueDao_1.CommonKeyValueDao({
         db,
         table: test_model_1.TEST_TABLE,
         // todo: make this test support "deflatedJson" transformer
     });
     const { support } = db;
-    (0, vitest_1.beforeAll)(async () => {
+    beforeAll(async () => {
         // Tests in this suite are not isolated,
         // and failing tests can leave the DB in an unexpected state for other tests,
         // including the following test run.
@@ -23,92 +23,92 @@ function runCommonKeyValueDaoTest(db) {
         const ids = await dao.streamIds().toArray();
         await dao.deleteByIds(ids);
     });
-    (0, vitest_1.afterAll)(async () => {
+    afterAll(async () => {
         const ids = await dao.streamIds().toArray();
         await dao.deleteByIds(ids);
     });
-    (0, vitest_1.test)('ping', async () => {
+    test('ping', async () => {
         await dao.ping();
     });
-    (0, vitest_1.test)('createTable', async () => {
+    test('createTable', async () => {
         await dao.createTable({ dropIfExists: true });
     });
-    (0, vitest_1.test)('deleteByIds non existing', async () => {
+    test('deleteByIds non existing', async () => {
         await dao.deleteByIds(testIds);
     });
-    (0, vitest_1.test)('getByIds should return empty', async () => {
+    test('getByIds should return empty', async () => {
         const results = await dao.getByIds(testIds);
-        (0, vitest_1.expect)(results).toEqual([]);
+        expect(results).toEqual([]);
     });
-    (0, vitest_1.test)('saveBatch, then getByIds', async () => {
+    test('saveBatch, then getByIds', async () => {
         await dao.saveBatch(testEntries);
         const entries = await dao.getByIds(testIds);
         // console.log(typeof entries[0]![1], entries[0]![1])
         (0, js_lib_1._sortBy)(entries, e => e[0], true);
-        (0, vitest_1.expect)(entries).toEqual(testEntries); // Jest doesn't allow to compare Buffers directly
+        expect(entries).toEqual(testEntries); // Jest doesn't allow to compare Buffers directly
         // expect(entries.map(e => e[0])).toEqual(testEntries.map(e => e[0]))
         // expect(entries.map(e => e[1].toString())).toEqual(testEntries.map(e => e[1].toString()))
     });
-    (0, vitest_1.test)('streamIds', async () => {
+    test('streamIds', async () => {
         const ids = await dao.streamIds().toArray();
         ids.sort();
-        (0, vitest_1.expect)(ids).toEqual(testIds);
+        expect(ids).toEqual(testIds);
     });
-    (0, vitest_1.test)('streamIds limited', async () => {
+    test('streamIds limited', async () => {
         const idsLimited = await dao.streamIds(2).toArray();
         // Order is non-deterministic, so, cannot compare values
         // idsLimited.sort()
         // expect(idsLimited).toEqual(testIds.slice(0, 2))
-        (0, vitest_1.expect)(idsLimited.length).toBe(2);
+        expect(idsLimited.length).toBe(2);
     });
-    (0, vitest_1.test)('streamValues', async () => {
+    test('streamValues', async () => {
         const values = await dao.streamValues().toArray();
         values.sort();
-        (0, vitest_1.expect)(values).toEqual(testEntries.map(e => e[1]));
+        expect(values).toEqual(testEntries.map(e => e[1]));
     });
-    (0, vitest_1.test)('streamValues limited', async () => {
+    test('streamValues limited', async () => {
         const valuesLimited = await dao.streamValues(2).toArray();
         // valuesLimited.sort()
         // expect(valuesLimited).toEqual(testEntries.map(e => e[1]).slice(0, 2))
-        (0, vitest_1.expect)(valuesLimited.length).toBe(2);
+        expect(valuesLimited.length).toBe(2);
     });
-    (0, vitest_1.test)('streamEntries', async () => {
+    test('streamEntries', async () => {
         const entries = await dao.streamEntries().toArray();
         entries.sort();
-        (0, vitest_1.expect)(entries).toEqual(testEntries);
+        expect(entries).toEqual(testEntries);
     });
-    (0, vitest_1.test)('streamEntries limited', async () => {
+    test('streamEntries limited', async () => {
         const entriesLimited = await dao.streamEntries(2).toArray();
         // entriesLimited.sort()
         // expect(entriesLimited).toEqual(testEntries.slice(0, 2))
-        (0, vitest_1.expect)(entriesLimited.length).toBe(2);
+        expect(entriesLimited.length).toBe(2);
     });
-    (0, vitest_1.test)('deleteByIds should clear', async () => {
+    test('deleteByIds should clear', async () => {
         await dao.deleteByIds(testIds);
         const results = await dao.getByIds(testIds);
-        (0, vitest_1.expect)(results).toEqual([]);
+        expect(results).toEqual([]);
     });
     if (support.increment) {
         const id = 'nonExistingField';
         const id2 = 'nonExistingField2';
-        (0, vitest_1.test)('increment on a non-existing field should set the value to 1', async () => {
+        test('increment on a non-existing field should set the value to 1', async () => {
             const result = await dao.increment(id);
-            (0, vitest_1.expect)(result).toBe(1);
+            expect(result).toBe(1);
         });
-        (0, vitest_1.test)('increment on a existing field should increase the value by one', async () => {
+        test('increment on a existing field should increase the value by one', async () => {
             const result = await dao.increment(id);
-            (0, vitest_1.expect)(result).toBe(2);
+            expect(result).toBe(2);
         });
-        (0, vitest_1.test)('increment should increase the value by the specified amount', async () => {
+        test('increment should increase the value by the specified amount', async () => {
             const result = await dao.increment(id, 2);
-            (0, vitest_1.expect)(result).toBe(4);
+            expect(result).toBe(4);
         });
-        (0, vitest_1.test)('increment 2 ids at the same time', async () => {
+        test('increment 2 ids at the same time', async () => {
             const result = await dao.incrementBatch([
                 [id, 1],
                 [id2, 2],
             ]);
-            (0, vitest_1.expect)(Object.fromEntries(result)).toEqual({
+            expect(Object.fromEntries(result)).toEqual({
                 [id]: 5,
                 [id2]: 2,
             });

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

@@ -1,4 +1,4 @@
-import { BaseDBEntity, JsonSchemaObject } from '@naturalcycles/js-lib';
+import type { BaseDBEntity, JsonSchemaObject } from '@naturalcycles/js-lib';
 export declare const TEST_TABLE = "TEST_TABLE";
 export interface TestItemBM extends BaseDBEntity {
     k1: string;

package/dist/testing/timeSeriesTest.util.d.ts

@@ -1,2 +1,2 @@
-import { TimeSeriesDataPoint } from '../timeseries/timeSeries.model';
+import type { TimeSeriesDataPoint } from '../timeseries/timeSeries.model';
 export declare function createTestTimeSeries(count?: number): TimeSeriesDataPoint[];

package/dist/timeseries/commonTimeSeriesDao.d.ts

@@ -1,4 +1,4 @@
-import { CommonTimeSeriesDaoCfg, TimeSeriesDataPoint, TimeSeriesQuery, TimeSeriesSaveBatchOp } from './timeSeries.model';
+import type { CommonTimeSeriesDaoCfg, TimeSeriesDataPoint, TimeSeriesQuery, TimeSeriesSaveBatchOp } from './timeSeries.model';
 /**
  * TimeSeries DB implementation based on provided CommonDB database.
  * Turns any CommonDB database into TimeSeries DB. Kind of.

package/dist/timeseries/commonTimeSeriesDao.js

@@ -11,6 +11,7 @@ const _TIMESERIES_RAW = '_TIMESERIES_RAW';
  * @experimental
  */
 class CommonTimeSeriesDao {
+    cfg;
     constructor(cfg) {
         this.cfg = cfg;
     }

package/dist/timeseries/timeSeries.model.d.ts

@@ -1,4 +1,4 @@
-import { CommonDB } from '../common.db';
+import type { CommonDB } from '../common.db';
 export interface CommonTimeSeriesDaoCfg {
     db: CommonDB;
 }

package/dist/transaction/dbTransaction.util.d.ts

@@ -1,6 +1,6 @@
-import { ObjectWithId } from '@naturalcycles/js-lib';
+import type { ObjectWithId } from '@naturalcycles/js-lib';
 import type { CommonDB } from '../common.db';
-import { CommonDBOptions, CommonDBSaveOptions, DBTransaction } from '../db.model';
+import type { CommonDBOptions, CommonDBSaveOptions, DBTransaction } from '../db.model';
 /**
  * Optimizes the Transaction (list of DBOperations) to do less operations.
  * E.g if you save id1 first and then delete it - this function will turn it into a no-op (self-eliminate).

package/dist/transaction/dbTransaction.util.js

@@ -91,6 +91,7 @@ export function mergeDBOperations(ops: DBOperation[]): DBOperation[] {
  * which executes all operations instantly, without any Transaction involved.
  */
 class FakeDBTransaction {
+    db;
     constructor(db) {
         this.db = db;
     }

package/dist/validation/index.d.ts

@@ -1,5 +1,5 @@
-import { CommonDBOptions, CommonDBSaveOptions } from '../db.model';
-import { DBQuery, DBQueryFilter, DBQueryFilterOperator, DBQueryOrder } from '../query/dbQuery';
+import type { CommonDBOptions, CommonDBSaveOptions } from '../db.model';
+import type { 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").StringSchema<DBQueryFilterOperator>;

package/package.json

@@ -14,9 +14,10 @@
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^3",
-    "@naturalcycles/dev-lib": "^16",
+    "@naturalcycles/dev-lib": "^17",
     "@types/node": "^22",
     "@vitest/coverage-v8": "^3",
+    "tsx": "^4",
     "vitest": "^3"
   },
   "files": [
@@ -46,7 +47,7 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "version": "10.0.0",
+  "version": "10.0.2",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

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

@@ -1,6 +1,6 @@
-import { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
-import { CommonDB } from '../../common.db'
-import {
+import type { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
+import type { CommonDB } from '../../common.db'
+import type {
   CommonDBCreateOptions,
   CommonDBOptions,
   CommonDBSaveOptions,

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

@@ -1,17 +1,18 @@
 import { Readable } from 'node:stream'
-import {
-  _isTruthy,
+import type {
   JsonSchemaObject,
   JsonSchemaRootObject,
   ObjectWithId,
   StringMap,
 } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { _isTruthy } from '@naturalcycles/js-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { BaseCommonDB } from '../../base.common.db'
-import { CommonDB, commonDBFullSupport, CommonDBSupport } from '../../common.db'
-import { RunQueryResult } from '../../db.model'
-import { DBQuery } from '../../query/dbQuery'
-import {
+import type { CommonDB, CommonDBSupport } from '../../common.db'
+import { commonDBFullSupport } from '../../common.db'
+import type { RunQueryResult } from '../../db.model'
+import type { DBQuery } from '../../query/dbQuery'
+import type {
   CacheDBCfg,
   CacheDBCreateOptions,
   CacheDBOptions,

package/src/adapter/cachedb/index.ts

@@ -1,5 +1,5 @@
 import { CacheDB } from './cache.db'
-import {
+import type {
   CacheDBCfg,
   CacheDBCreateOptions,
   CacheDBOptions,

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

@@ -1,5 +1,5 @@
-import { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
-import { DBSaveBatchOperation } from '../../db.model'
+import type { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
+import type { DBSaveBatchOperation } from '../../db.model'
 import type { DBQueryOrder } from '../../query/dbQuery'
 
 export interface FileDBPersistencePlugin {

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

@@ -1,3 +1,4 @@
+import type { JsonSchemaRootObject, ObjectWithId, UnixTimestampMillis } from '@naturalcycles/js-lib'
 import {
   _assert,
   _by,
@@ -8,28 +9,21 @@ import {
   _sortObjectDeep,
   _stringMapValues,
   generateJsonSchemaFromData,
-  JsonSchemaRootObject,
   localTime,
-  ObjectWithId,
-  UnixTimestampMillis,
 } from '@naturalcycles/js-lib'
-import { dimGrey, readableCreate, ReadableTyped } from '@naturalcycles/nodejs-lib'
-import {
-  BaseCommonDB,
-  commonDBFullSupport,
-  CommonDBSupport,
-  DBSaveBatchOperation,
-  queryInMemory,
-} from '../..'
-import { CommonDB } from '../../common.db'
-import {
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { dimGrey, readableCreate } from '@naturalcycles/nodejs-lib'
+import type { CommonDBSupport, DBSaveBatchOperation } from '../..'
+import { BaseCommonDB, commonDBFullSupport, queryInMemory } from '../..'
+import type { CommonDB } from '../../common.db'
+import type {
   CommonDBOptions,
   CommonDBSaveOptions,
   CommonDBStreamOptions,
   RunQueryResult,
 } from '../../db.model'
-import { DBQuery } from '../../query/dbQuery'
-import { FileDBCfg } from './file.db.model'
+import type { DBQuery } from '../../query/dbQuery'
+import type { FileDBCfg } from './file.db.model'
 
 /**
  * Provides barebone implementation for "whole file" based CommonDB.

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

@@ -1,6 +1,7 @@
-import { _by, ObjectWithId, StringMap } from '@naturalcycles/js-lib'
-import { DBSaveBatchOperation } from '../../db.model'
-import { FileDBPersistencePlugin } from './file.db.model'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib'
+import { _by } from '@naturalcycles/js-lib'
+import type { DBSaveBatchOperation } from '../../db.model'
+import type { FileDBPersistencePlugin } from './file.db.model'
 
 /**
  * Mostly useful for testing.

package/src/adapter/file/index.ts

@@ -1,5 +1,5 @@
 import { FileDB } from './file.db'
-import { FileDBCfg, FileDBPersistencePlugin } from './file.db.model'
+import type { FileDBCfg, FileDBPersistencePlugin } from './file.db.model'
 import { LocalFilePersistencePlugin } from './localFile.persistence.plugin'
 
 export type { FileDBCfg, FileDBPersistencePlugin }

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

@@ -1,8 +1,9 @@
 import { Readable } from 'node:stream'
-import { ObjectWithId, pMap } from '@naturalcycles/js-lib'
+import type { ObjectWithId } from '@naturalcycles/js-lib'
+import { pMap } from '@naturalcycles/js-lib'
 import { _pipeline, fs2 } from '@naturalcycles/nodejs-lib'
-import { DBSaveBatchOperation } from '../../db.model'
-import { FileDBPersistencePlugin } from './file.db.model'
+import type { DBSaveBatchOperation } from '../../db.model'
+import type { FileDBPersistencePlugin } from './file.db.model'
 
 export interface LocalFilePersistencePluginCfg {
   /**

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

@@ -1,6 +1,6 @@
-import { ObjectWithId } from '@naturalcycles/js-lib'
-import { DBSaveBatchOperation } from '../../db.model'
-import { FileDBPersistencePlugin } from './file.db.model'
+import type { ObjectWithId } from '@naturalcycles/js-lib'
+import type { DBSaveBatchOperation } from '../../db.model'
+import type { FileDBPersistencePlugin } from './file.db.model'
 
 export class NoopPersistencePlugin implements FileDBPersistencePlugin {
   async ping(): Promise<void> {}

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

@@ -1,4 +1,12 @@
 import { Readable } from 'node:stream'
+import type {
+  AnyObjectWithId,
+  CommonLogger,
+  JsonSchemaObject,
+  JsonSchemaRootObject,
+  ObjectWithId,
+  StringMap,
+} from '@naturalcycles/js-lib'
 import {
   _assert,
   _by,
@@ -8,42 +16,28 @@ import {
   _sortObjectDeep,
   _stringMapEntries,
   _stringMapValues,
-  AnyObjectWithId,
-  CommonLogger,
   generateJsonSchemaFromData,
-  JsonSchemaObject,
-  JsonSchemaRootObject,
   localTime,
-  ObjectWithId,
   pMap,
-  StringMap,
 } from '@naturalcycles/js-lib'
-import {
-  _pipeline,
-  bufferReviver,
-  dimGrey,
-  fs2,
-  ReadableTyped,
-  yellow,
-} from '@naturalcycles/nodejs-lib'
-import {
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { _pipeline, bufferReviver, dimGrey, fs2, yellow } from '@naturalcycles/nodejs-lib'
+import type {
   CommonDB,
-  commonDBFullSupport,
   CommonDBSupport,
   CommonDBTransactionOptions,
-  CommonDBType,
   DBOperation,
   DBTransactionFn,
-  queryInMemory,
 } from '../..'
-import {
+import { commonDBFullSupport, CommonDBType, queryInMemory } from '../..'
+import type {
   CommonDBCreateOptions,
   CommonDBOptions,
   CommonDBSaveOptions,
   DBTransaction,
   RunQueryResult,
 } from '../../db.model'
-import { DBQuery } from '../../query/dbQuery'
+import type { DBQuery } from '../../query/dbQuery'
 
 export interface InMemoryDBCfg {
   /**

package/src/adapter/inmemory/inMemoryKeyValueDB.ts

@@ -1,13 +1,9 @@
 import { Readable } from 'node:stream'
-import { StringMap } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { CommonDBCreateOptions } from '../../db.model'
-import {
-  CommonKeyValueDB,
-  commonKeyValueDBFullSupport,
-  IncrementTuple,
-  KeyValueDBTuple,
-} from '../../kv/commonKeyValueDB'
+import type { StringMap } from '@naturalcycles/js-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { CommonDBCreateOptions } from '../../db.model'
+import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '../../kv/commonKeyValueDB'
+import { commonKeyValueDBFullSupport } from '../../kv/commonKeyValueDB'
 
 export interface InMemoryKeyValueDBCfg {}
 

package/src/adapter/inmemory/queryInMemory.ts

@@ -1,5 +1,6 @@
-import { _get, _pick, ObjectWithId } from '@naturalcycles/js-lib'
-import { DBQuery, DBQueryFilterOperator } from '../../query/dbQuery'
+import type { ObjectWithId } from '@naturalcycles/js-lib'
+import { _get, _pick } from '@naturalcycles/js-lib'
+import type { DBQuery, DBQueryFilterOperator } from '../../query/dbQuery'
 
 type FilterFn = (v: any, val: any) => boolean
 const FILTER_FNS: Record<DBQueryFilterOperator, FilterFn> = {

package/src/base.common.db.ts

@@ -1,19 +1,20 @@
-import {
+import type {
   JsonSchemaObject,
   JsonSchemaRootObject,
   ObjectWithId,
   StringMap,
 } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { CommonDB, CommonDBSupport, CommonDBType } from './common.db'
-import {
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { CommonDB, CommonDBSupport } from './common.db'
+import { CommonDBType } from './common.db'
+import type {
   CommonDBOptions,
   CommonDBSaveOptions,
   CommonDBTransactionOptions,
   DBTransactionFn,
   RunQueryResult,
 } from './db.model'
-import { DBQuery } from './query/dbQuery'
+import type { DBQuery } from './query/dbQuery'
 import { FakeDBTransaction } from './transaction/dbTransaction.util'
 
 /**

package/src/common.db.ts

@@ -1,11 +1,11 @@
-import {
+import type {
   JsonSchemaObject,
   JsonSchemaRootObject,
   ObjectWithId,
   StringMap,
 } from '@naturalcycles/js-lib'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import {
+import type {
   CommonDBCreateOptions,
   CommonDBOptions,
   CommonDBReadOptions,
@@ -15,7 +15,7 @@ import {
   DBTransactionFn,
   RunQueryResult,
 } from './db.model'
-import { DBQuery } from './query/dbQuery'
+import type { DBQuery } from './query/dbQuery'
 
 export enum CommonDBType {
   'document' = 'document',

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

@@ -1,14 +1,13 @@
-import {
+import type {
   BaseDBEntity,
   CommonLogger,
   ErrorMode,
   NumberOfMilliseconds,
   Promisable,
   UnixTimestamp,
-  ZodError,
-  ZodSchema,
 } from '@naturalcycles/js-lib'
-import {
+import type { ZodError, ZodSchema } from '@naturalcycles/js-lib/dist/zod/index.js'
+import type {
   AjvSchema,
   AjvValidationError,
   JoiValidationError,
@@ -16,8 +15,8 @@ import {
   TransformLogProgressOptions,
   TransformMapOptions,
 } from '@naturalcycles/nodejs-lib'
-import { CommonDB } from '../common.db'
-import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model'
+import type { CommonDB } from '../common.db'
+import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model'
 
 export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntity, ID = BM['id']> {
   /**

package/src/commondao/common.dao.ts

@@ -1,4 +1,15 @@
-import { Transform } from 'node:stream'
+import type { Transform } from 'node:stream'
+import type {
+  AsyncMapper,
+  BaseDBEntity,
+  CommonLogger,
+  JsonSchemaObject,
+  JsonSchemaRootObject,
+  ObjectWithId,
+  StringMap,
+  UnixTimestampMillis,
+  Unsaved,
+} from '@naturalcycles/js-lib'
 import {
   _assert,
   _deepCopy,
@@ -12,31 +23,23 @@ import {
   _typeCast,
   _uniqBy,
   AppError,
-  AsyncMapper,
-  BaseDBEntity,
-  CommonLogger,
   ErrorMode,
-  JsonSchemaObject,
-  JsonSchemaRootObject,
   localTime,
-  ObjectWithId,
   pMap,
   SKIP,
-  StringMap,
-  UnixTimestampMillis,
-  Unsaved,
-  ZodSchema,
-  ZodValidationError,
-  zSafeValidate,
 } from '@naturalcycles/js-lib'
-import {
-  _pipeline,
-  AjvSchema,
+import type { ZodValidationError } from '@naturalcycles/js-lib/dist/zod/index.js'
+import { ZodSchema, zSafeValidate } from '@naturalcycles/js-lib/dist/zod/index.js'
+import type {
   AjvValidationError,
-  getValidationResult,
   JoiValidationError,
   ObjectSchema,
   ReadableTyped,
+} from '@naturalcycles/nodejs-lib'
+import {
+  _pipeline,
+  AjvSchema,
+  getValidationResult,
   stringId,
   transformChunk,
   transformLogProgress,
@@ -45,13 +48,13 @@ import {
   writableVoid,
 } from '@naturalcycles/nodejs-lib'
 import { DBLibError } from '../cnst'
-import { CommonDBTransactionOptions, DBTransaction, RunQueryResult } from '../db.model'
-import { DBQuery, RunnableDBQuery } from '../query/dbQuery'
-import {
+import type { CommonDBTransactionOptions, DBTransaction, RunQueryResult } from '../db.model'
+import type { DBQuery } from '../query/dbQuery'
+import { RunnableDBQuery } from '../query/dbQuery'
+import type {
   CommonDaoCfg,
   CommonDaoCreateOptions,
   CommonDaoHooks,
-  CommonDaoLogLevel,
   CommonDaoOptions,
   CommonDaoPatchByIdOptions,
   CommonDaoPatchOptions,
@@ -63,6 +66,7 @@ import {
   CommonDaoStreamOptions,
   CommonDaoStreamSaveOptions,
 } from './common.dao.model'
+import { CommonDaoLogLevel } from './common.dao.model'
 
 const isGAE = !!process.env['GAE_INSTANCE']
 const isCI = !!process.env['CI']

package/src/db.model.ts

@@ -1,5 +1,5 @@
-import { ObjectWithId, UnixTimestamp } from '@naturalcycles/js-lib'
-import { CommonDB } from './common.db'
+import type { ObjectWithId, UnixTimestamp } from '@naturalcycles/js-lib'
+import type { CommonDB } from './common.db'
 
 /**
  * Similar to SQL INSERT, UPDATE.

package/src/kv/commonKeyValueDB.ts

@@ -1,6 +1,6 @@
-import { Integer, UnixTimestamp } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { CommonDBCreateOptions } from '../db.model'
+import type { Integer, UnixTimestamp } from '@naturalcycles/js-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { CommonDBCreateOptions } from '../db.model'
 
 /**
  * Common interface for Key-Value database implementations.