@naturalcycles/db-lib 10.5.0 → 10.7.0

package/dist/testing/commonDaoTest.js

@@ -1,5 +1,7 @@
 import { Readable } from 'node:stream';
-import { _deepCopy, _filterObject, _omit, _pick, _sortBy, localTime } from '@naturalcycles/js-lib';
+import { _sortBy } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
+import { _deepCopy, _filterObject, _omit, _pick } from '@naturalcycles/js-lib/object';
 import { _pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { CommonDao } from '../commondao/common.dao.js';
 import { CommonDaoLogLevel } from '../commondao/common.dao.model.js';

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

@@ -1,4 +1,5 @@
-import type { BaseDBEntity, JsonSchemaObject } from '@naturalcycles/js-lib';
+import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema';
+import type { BaseDBEntity } from '@naturalcycles/js-lib/types';
 import { type ObjectSchema } from '@naturalcycles/nodejs-lib/joi';
 export declare const TEST_TABLE = "TEST_TABLE";
 export interface TestItemBM extends BaseDBEntity {

package/dist/testing/test.model.js

@@ -1,4 +1,5 @@
-import { _range, jsonSchema } from '@naturalcycles/js-lib';
+import { _range } from '@naturalcycles/js-lib';
+import { jsonSchema } 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';

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

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

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

@@ -1,5 +1,5 @@
-import type { ObjectWithId } from '@naturalcycles/js-lib';
-import type { CommonDB } from '../common.db.js';
+import type { ObjectWithId } from '@naturalcycles/js-lib/types';
+import type { CommonDB } from '../commondb/common.db.js';
 import type { CommonDBOptions, CommonDBSaveOptions, DBTransaction } from '../db.model.js';
 /**
  * Optimizes the Transaction (list of DBOperations) to do less operations.

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.5.0",
+  "version": "10.7.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "19.5.0"
+    "@naturalcycles/dev-lib": "19.8.0"
   },
   "files": [
     "dist",
@@ -23,8 +23,12 @@
     ".": "./dist/index.js",
     "./testing": "./dist/testing/index.js",
     "./validation": "./dist/validation/index.js",
-    "./adapter/cachedb": "./dist/adapter/cachedb/index.js",
-    "./adapter/file": "./dist/adapter/file/index.js"
+    "./pipeline": "./dist/pipeline/index.js",
+    "./kv": "./dist/kv/index.js",
+    "./dao": "./dist/commondao/index.js",
+    "./cachedb": "./dist/adapter/cachedb/index.js",
+    "./file": "./dist/adapter/file/index.js",
+    "./inmemory": "./dist/inmemory/index.js"
   },
   "publishConfig": {
     "access": "public"

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

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

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

@@ -1,15 +1,11 @@
 import { Readable } from 'node:stream'
-import type {
-  JsonSchemaObject,
-  JsonSchemaRootObject,
-  ObjectWithId,
-  StringMap,
-} from '@naturalcycles/js-lib'
 import { _isTruthy } from '@naturalcycles/js-lib'
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
-import { BaseCommonDB } from '../../base.common.db.js'
-import type { CommonDB, CommonDBSupport } from '../../common.db.js'
-import { commonDBFullSupport } from '../../common.db.js'
+import { BaseCommonDB } from '../../commondb/base.common.db.js'
+import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js'
+import { commonDBFullSupport } from '../../commondb/common.db.js'
 import type { RunQueryResult } from '../../db.model.js'
 import type { DBQuery } from '../../query/dbQuery.js'
 import type {

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

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

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

@@ -1,22 +1,20 @@
-import type { JsonSchemaRootObject, ObjectWithId, UnixTimestampMillis } from '@naturalcycles/js-lib'
+import { _by, _sortBy } from '@naturalcycles/js-lib'
+import { _since, localTime } from '@naturalcycles/js-lib/datetime'
+import { _assert } from '@naturalcycles/js-lib/error'
+import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema'
+import { _deepEquals, _filterUndefinedValues, _sortObjectDeep } from '@naturalcycles/js-lib/object'
 import {
-  _assert,
-  _by,
-  _deepEquals,
-  _filterUndefinedValues,
-  _since,
-  _sortBy,
-  _sortObjectDeep,
   _stringMapValues,
-  generateJsonSchemaFromData,
-  localTime,
-} from '@naturalcycles/js-lib'
-import { dimGrey } from '@naturalcycles/nodejs-lib'
+  type ObjectWithId,
+  type UnixTimestampMillis,
+} from '@naturalcycles/js-lib/types'
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import { readableCreate } from '@naturalcycles/nodejs-lib/stream'
-import { BaseCommonDB } from '../../base.common.db.js'
-import type { CommonDB, CommonDBSupport } from '../../common.db.js'
-import { commonDBFullSupport } from '../../common.db.js'
+import { BaseCommonDB } from '../../commondb/base.common.db.js'
+import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js'
+import { commonDBFullSupport } from '../../commondb/common.db.js'
 import type {
   CommonDBOptions,
   CommonDBSaveOptions,
@@ -24,8 +22,8 @@ import type {
   DBSaveBatchOperation,
   RunQueryResult,
 } from '../../db.model.js'
+import { queryInMemory } from '../../inmemory/queryInMemory.js'
 import type { DBQuery } from '../../query/dbQuery.js'
-import { queryInMemory } from '../inmemory/queryInMemory.js'
 import type { FileDBCfg } from './file.db.model.js'
 
 /**

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

@@ -1,5 +1,5 @@
-import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib'
 import { _by } from '@naturalcycles/js-lib'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 import type { DBSaveBatchOperation } from '../../db.model.js'
 import type { FileDBPersistencePlugin } from './file.db.model.js'
 

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

@@ -1,8 +1,12 @@
 import { Readable } from 'node:stream'
-import type { ObjectWithId } from '@naturalcycles/js-lib'
-import { pMap } from '@naturalcycles/js-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import { _pipeline } from '@naturalcycles/nodejs-lib/stream'
+import { pMap } from '@naturalcycles/js-lib/promise'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import {
+  _pipeline,
+  createReadStreamAsNDJSON,
+  createWriteStreamAsNDJSON,
+} from '@naturalcycles/nodejs-lib/stream'
 import type { DBSaveBatchOperation } from '../../db.model.js'
 import type { FileDBPersistencePlugin } from './file.db.model.js'
 
@@ -47,7 +51,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
 
     if (!(await fs2.pathExistsAsync(filePath))) return []
 
-    return await fs2.createReadStreamAsNDJSON(filePath).toArray()
+    return await createReadStreamAsNDJSON(filePath).toArray()
   }
 
   async saveFiles(ops: DBSaveBatchOperation<any>[]): Promise<void> {
@@ -59,6 +63,6 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`
 
-    await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(filePath)])
+    await _pipeline([Readable.from(rows), ...createWriteStreamAsNDJSON(filePath)])
   }
 }

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

@@ -1,4 +1,4 @@
-import type { ObjectWithId } from '@naturalcycles/js-lib'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { DBSaveBatchOperation } from '../../db.model.js'
 import type { FileDBPersistencePlugin } from './file.db.model.js'
 

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

@@ -1,11 +1,11 @@
+import type { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import type {
   BaseDBEntity,
-  CommonLogger,
-  ErrorMode,
   NumberOfMilliseconds,
   Promisable,
   UnixTimestamp,
-} from '@naturalcycles/js-lib'
+} from '@naturalcycles/js-lib/types'
 import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod'
 import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv'
 import type { JoiValidationError, ObjectSchema } from '@naturalcycles/nodejs-lib/joi'
@@ -13,7 +13,7 @@ import type {
   TransformLogProgressOptions,
   TransformMapOptions,
 } from '@naturalcycles/nodejs-lib/stream'
-import type { CommonDB } from '../common.db.js'
+import type { CommonDB } from '../commondb/common.db.js'
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model.js'
 
 export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntity, ID = BM['id']> {

package/src/commondao/common.dao.ts

@@ -1,33 +1,26 @@
 import type { Transform } from 'node:stream'
+import { _isTruthy, _uniqBy } from '@naturalcycles/js-lib'
+import { _since, localTime } from '@naturalcycles/js-lib/datetime'
+import { _assert, AppError, ErrorMode } from '@naturalcycles/js-lib/error'
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import {
+  _deepCopy,
+  _deepJsonEquals,
+  _filterUndefinedValues,
+  _objectAssignExact,
+} from '@naturalcycles/js-lib/object'
+import { pMap } from '@naturalcycles/js-lib/promise'
+import { _truncate } from '@naturalcycles/js-lib/string'
 import type {
   AsyncIndexedMapper,
   BaseDBEntity,
-  CommonLogger,
-  JsonSchemaObject,
-  JsonSchemaRootObject,
   ObjectWithId,
   StringMap,
   UnixTimestampMillis,
   Unsaved,
-} from '@naturalcycles/js-lib'
-import {
-  _assert,
-  _deepCopy,
-  _deepJsonEquals,
-  _filterUndefinedValues,
-  _isTruthy,
-  _objectAssignExact,
-  _passthroughPredicate,
-  _since,
-  _truncate,
-  _typeCast,
-  _uniqBy,
-  AppError,
-  ErrorMode,
-  localTime,
-  pMap,
-  SKIP,
-} from '@naturalcycles/js-lib'
+} from '@naturalcycles/js-lib/types'
+import { _passthroughPredicate, _typeCast, SKIP } from '@naturalcycles/js-lib/types'
 import type { ZodValidationError } from '@naturalcycles/js-lib/zod'
 import { ZodType, zSafeValidate } from '@naturalcycles/js-lib/zod'
 import { stringId } from '@naturalcycles/nodejs-lib'

package/src/commondao/index.ts

@@ -0,0 +1,2 @@
+export * from './common.dao.js'
+export * from './common.dao.model.js'

package/src/{base.common.db.ts → commondb/base.common.db.ts}

@@ -1,12 +1,6 @@
-import type {
-  JsonSchemaObject,
-  JsonSchemaRootObject,
-  ObjectWithId,
-  StringMap,
-} from '@naturalcycles/js-lib'
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
-import type { CommonDB, CommonDBSupport } from './common.db.js'
-import { CommonDBType } from './common.db.js'
 import type {
   CommonDBOptions,
   CommonDBSaveOptions,
@@ -14,9 +8,11 @@ import type {
   DBTransaction,
   DBTransactionFn,
   RunQueryResult,
-} from './db.model.js'
-import type { DBQuery } from './query/dbQuery.js'
-import { FakeDBTransaction } from './transaction/dbTransaction.util.js'
+} from '../db.model.js'
+import type { DBQuery } from '../query/dbQuery.js'
+import { FakeDBTransaction } from '../transaction/dbTransaction.util.js'
+import type { CommonDB, CommonDBSupport } from './common.db.js'
+import { CommonDBType } from './common.db.js'
 
 /**
  * No-op implementation of CommonDB interface.

package/src/{common.db.ts → commondb/common.db.ts}

@@ -1,9 +1,5 @@
-import type {
-  JsonSchemaObject,
-  JsonSchemaRootObject,
-  ObjectWithId,
-  StringMap,
-} from '@naturalcycles/js-lib'
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type {
   CommonDBCreateOptions,
@@ -15,8 +11,8 @@ import type {
   DBTransaction,
   DBTransactionFn,
   RunQueryResult,
-} from './db.model.js'
-import type { DBQuery } from './query/dbQuery.js'
+} from '../db.model.js'
+import type { DBQuery } from '../query/dbQuery.js'
 
 export enum CommonDBType {
   'document' = 'document',

package/src/db.model.ts

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

package/src/index.ts

@@ -1,17 +1,6 @@
-export * from './adapter/inmemory/inMemory.db.js'
-export * from './adapter/inmemory/inMemoryKeyValueDB.js'
-export * from './adapter/inmemory/queryInMemory.js'
-export * from './base.common.db.js'
-export * from './common.db.js'
-export * from './commondao/common.dao.js'
-export * from './commondao/common.dao.model.js'
+export * from './commondb/base.common.db.js'
+export * from './commondb/common.db.js'
 export * from './db.model.js'
-export * from './kv/commonKeyValueDao.js'
-export * from './kv/commonKeyValueDaoMemoCache.js'
-export * from './kv/commonKeyValueDB.js'
 export * from './model.util.js'
-export * from './pipeline/dbPipelineBackup.js'
-export * from './pipeline/dbPipelineCopy.js'
-export * from './pipeline/dbPipelineRestore.js'
 export * from './query/dbQuery.js'
 export * from './transaction/dbTransaction.util.js'

package/src/{adapter/inmemory → inmemory}/inMemory.db.ts

@@ -1,30 +1,33 @@
 import { Readable } from 'node:stream'
-import type {
-  AnyObjectWithId,
-  CommonLogger,
-  JsonSchemaObject,
-  JsonSchemaRootObject,
-  ObjectWithId,
-  StringMap,
-} from '@naturalcycles/js-lib'
+import { _by, _isEmptyObject } from '@naturalcycles/js-lib'
+import { _since, localTime } from '@naturalcycles/js-lib/datetime'
+import { _assert } from '@naturalcycles/js-lib/error'
+import {
+  generateJsonSchemaFromData,
+  type JsonSchemaObject,
+  type JsonSchemaRootObject,
+} from '@naturalcycles/js-lib/json-schema'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { _deepCopy, _sortObjectDeep } from '@naturalcycles/js-lib/object'
+import { pMap } from '@naturalcycles/js-lib/promise'
 import {
-  _assert,
-  _by,
-  _deepCopy,
-  _isEmptyObject,
-  _since,
-  _sortObjectDeep,
   _stringMapEntries,
   _stringMapValues,
-  generateJsonSchemaFromData,
-  localTime,
-  pMap,
-} from '@naturalcycles/js-lib'
-import { dimGrey, yellow } from '@naturalcycles/nodejs-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import { _pipeline, bufferReviver, type ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
-import type { CommonDB, CommonDBSupport } from '../../common.db.js'
-import { commonDBFullSupport, CommonDBType } from '../../common.db.js'
+  type AnyObjectWithId,
+  type ObjectWithId,
+  type StringMap,
+} from '@naturalcycles/js-lib/types'
+import { dimGrey, yellow } from '@naturalcycles/nodejs-lib/colors'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import {
+  _pipeline,
+  bufferReviver,
+  createReadStreamAsNDJSON,
+  createWriteStreamAsNDJSON,
+  type ReadableTyped,
+} from '@naturalcycles/nodejs-lib/stream'
+import type { CommonDB, CommonDBSupport } from '../commondb/common.db.js'
+import { commonDBFullSupport, CommonDBType } from '../commondb/common.db.js'
 import type {
   CommonDBCreateOptions,
   CommonDBOptions,
@@ -34,8 +37,8 @@ import type {
   DBTransaction,
   DBTransactionFn,
   RunQueryResult,
-} from '../../db.model.js'
-import type { DBQuery } from '../../query/dbQuery.js'
+} from '../db.model.js'
+import type { DBQuery } from '../query/dbQuery.js'
 import { queryInMemory } from './queryInMemory.js'
 
 export interface InMemoryDBCfg {
@@ -329,7 +332,7 @@ export class InMemoryDB implements CommonDB {
       tables++
       const fname = `${persistentStoragePath}/${table}.ndjson${persistZip ? '.gz' : ''}`
 
-      await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(fname)])
+      await _pipeline([Readable.from(rows), ...createWriteStreamAsNDJSON(fname)])
     })
 
     this.cfg.logger!.log(
@@ -357,7 +360,7 @@ export class InMemoryDB implements CommonDB {
       const fname = `${persistentStoragePath}/${file}`
       const table = file.split('.ndjson')[0]!
 
-      const rows = await fs2.createReadStreamAsNDJSON(fname).toArray()
+      const rows = await createReadStreamAsNDJSON(fname).toArray()
 
       this.data[table] = _by(rows, r => r.id)
     })

package/src/{adapter/inmemory → inmemory}/inMemoryKeyValueDB.ts

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

package/src/inmemory/index.ts

@@ -0,0 +1,3 @@
+export * from './inMemory.db.js'
+export * from './inMemoryKeyValueDB.js'
+export * from './queryInMemory.js'

package/src/{adapter/inmemory → inmemory}/queryInMemory.ts

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

package/src/kv/commonKeyValueDB.ts

@@ -1,4 +1,4 @@
-import type { Integer, UnixTimestamp } from '@naturalcycles/js-lib'
+import type { Integer, UnixTimestamp } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDBCreateOptions } from '../db.model.js'
 

package/src/kv/commonKeyValueDao.ts

@@ -1,7 +1,9 @@
-import type { CommonLogger, KeyValueTuple } from '@naturalcycles/js-lib'
-import { AppError, pMap } from '@naturalcycles/js-lib'
-import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { pMap } from '@naturalcycles/js-lib/promise'
+import type { KeyValueTuple } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib/zip'
 import type { CommonDaoLogLevel } from '../commondao/common.dao.model.js'
 import type { CommonDBCreateOptions } from '../db.model.js'
 import type {

package/src/kv/commonKeyValueDaoMemoCache.ts

@@ -1,5 +1,7 @@
-import type { AsyncMemoCache, NumberOfSeconds, UnixTimestamp } from '@naturalcycles/js-lib'
-import { localTime, MISS } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import type { AsyncMemoCache } from '@naturalcycles/js-lib/decorators'
+import type { NumberOfSeconds, UnixTimestamp } from '@naturalcycles/js-lib/types'
+import { MISS } from '@naturalcycles/js-lib/types'
 import type { CommonKeyValueDao } from './commonKeyValueDao.js'
 
 export interface CommonKeyValueDaoMemoCacheCfg<VALUE> {

package/src/kv/index.ts

@@ -0,0 +1,3 @@
+export * from './commonKeyValueDao.js'
+export * from './commonKeyValueDaoMemoCache.js'
+export * from './commonKeyValueDB.js'

package/src/model.util.ts

@@ -1,5 +1,5 @@
-import type { CreatedUpdated, CreatedUpdatedId } from '@naturalcycles/js-lib'
-import { localTime } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import type { CreatedUpdated, CreatedUpdatedId } from '@naturalcycles/js-lib/types'
 import { stringId } from '@naturalcycles/nodejs-lib'
 
 export function createdUpdatedFields(

package/src/pipeline/dbPipelineBackup.ts

@@ -1,10 +1,14 @@
-import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib'
-import { _passthroughMapper, AppError, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib'
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import type {
-  TransformLogProgressOptions,
-  TransformMapOptions,
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { AppError, ErrorMode } from '@naturalcycles/js-lib/error'
+import { pMap } from '@naturalcycles/js-lib/promise'
+import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib/types'
+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 {
+  createWriteStreamAsNDJSON,
+  type TransformLogProgressOptions,
+  type TransformMapOptions,
 } from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
@@ -13,7 +17,7 @@ import {
   transformMap,
   transformTap,
 } from '@naturalcycles/nodejs-lib/stream'
-import type { CommonDB } from '../common.db.js'
+import type { CommonDB } from '../commondb/common.db.js'
 import { DBQuery } from '../query/dbQuery.js'
 
 export interface DBPipelineBackupOptions extends TransformLogProgressOptions {
@@ -223,7 +227,7 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
         transformTap(() => {
           rows++
         }),
-        ...fs2.createWriteStreamAsNDJSON(filePath),
+        ...createWriteStreamAsNDJSON(filePath),
       ])
 
       const { size: sizeBytes } = await fs2.statAsync(filePath)

package/src/pipeline/dbPipelineCopy.ts

@@ -1,6 +1,9 @@
-import type { AsyncMapper, BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib'
-import { _passthroughMapper, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib'
-import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { ErrorMode } from '@naturalcycles/js-lib/error'
+import { pMap } from '@naturalcycles/js-lib/promise'
+import type { AsyncMapper, BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib/types'
+import { _passthroughMapper } from '@naturalcycles/js-lib/types'
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors'
 import type {
   TransformLogProgressOptions,
   TransformMapOptions,
@@ -14,7 +17,7 @@ import {
   transformTap,
   writableForEach,
 } from '@naturalcycles/nodejs-lib/stream'
-import type { CommonDB } from '../common.db.js'
+import type { CommonDB } from '../commondb/common.db.js'
 import type { CommonDBSaveOptions } from '../db.model.js'
 import { DBQuery } from '../query/dbQuery.js'