@naturalcycles/db-lib 10.5.0 → 10.7.0

package/src/pipeline/dbPipelineRestore.ts

@@ -1,22 +1,17 @@
-import type {
-  AsyncMapper,
-  BaseDBEntity,
-  JsonSchemaObject,
-  UnixTimestamp,
-} from '@naturalcycles/js-lib'
+import { _hb } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema'
+import { _mapValues } from '@naturalcycles/js-lib/object'
+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 { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import {
-  _hb,
-  _mapValues,
-  _passthroughMapper,
-  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,
+  createReadStreamAsNDJSON,
+  type TransformLogProgressOptions,
+  type TransformMapOptions,
 } from '@naturalcycles/nodejs-lib/stream'
 import {
   _pipeline,
@@ -28,7 +23,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'
 
 export interface DBPipelineRestoreOptions extends TransformLogProgressOptions {
@@ -200,7 +195,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
       console.log(`<< ${grey(filePath)} ${dimWhite(_hb(sizeBytes))} started...`)
 
       await _pipeline([
-        fs2.createReadStreamAsNDJSON(filePath).take(limit || Number.POSITIVE_INFINITY),
+        createReadStreamAsNDJSON(filePath).take(limit || Number.POSITIVE_INFINITY),
         transformTap(() => rows++),
         transformLogProgress({
           logEvery: 1000,

package/src/pipeline/index.ts

@@ -0,0 +1,3 @@
+export * from './dbPipelineBackup.js'
+export * from './dbPipelineCopy.js'
+export * from './dbPipelineRestore.js'

package/src/query/dbQuery.ts

@@ -1,5 +1,6 @@
-import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib'
-import { _objectAssign, _truncate } from '@naturalcycles/js-lib'
+import { _truncate } from '@naturalcycles/js-lib/string'
+import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib/types'
+import { _objectAssign } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonDao } from '../commondao/common.dao.js'
 import type {

package/src/testing/commonDBTest.ts

@@ -1,6 +1,9 @@
-import { _deepFreeze, _filterObject, _pick, _sortBy, localTime, pMap } from '@naturalcycles/js-lib'
-import type { CommonDB } from '../common.db.js'
-import { CommonDBType } from '../common.db.js'
+import { _sortBy } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { _deepFreeze, _filterObject, _pick } from '@naturalcycles/js-lib/object'
+import { pMap } from '@naturalcycles/js-lib/promise'
+import type { CommonDB } from '../commondb/common.db.js'
+import { CommonDBType } from '../commondb/common.db.js'
 import { DBQuery } from '../query/dbQuery.js'
 import type { TestItemDBM } from './test.model.js'
 import {

package/src/testing/commonDaoTest.ts

@@ -1,9 +1,11 @@
 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 type { CommonDB } from '../common.db.js'
 import { CommonDao } from '../commondao/common.dao.js'
 import { CommonDaoLogLevel } from '../commondao/common.dao.model.js'
+import type { CommonDB } from '../commondb/common.db.js'
 import { DBQuery } from '../query/dbQuery.js'
 import type { CommonDBImplementationQuirks } from './commonDBTest.js'
 import type { TestItemBM } from './test.model.js'

package/src/testing/keyValueDBTest.ts

@@ -1,5 +1,5 @@
-import type { KeyValueTuple } from '@naturalcycles/js-lib'
 import { _range, _sortBy } from '@naturalcycles/js-lib'
+import type { KeyValueTuple } from '@naturalcycles/js-lib/types'
 import type { CommonKeyValueDB } from '../kv/commonKeyValueDB.js'
 import { TEST_TABLE } from './test.model.js'
 

package/src/testing/test.model.ts

@@ -1,5 +1,7 @@
-import type { BaseDBEntity, JsonSchemaObject, UnixTimestamp } from '@naturalcycles/js-lib'
-import { _range, jsonSchema } from '@naturalcycles/js-lib'
+import { _range } from '@naturalcycles/js-lib'
+import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema'
+import { jsonSchema } from '@naturalcycles/js-lib/json-schema'
+import type { BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib/types'
 import {
   baseDBEntitySchema,
   binarySchema,

package/src/timeseries/commonTimeSeriesDao.ts

@@ -1,5 +1,5 @@
-import type { ObjectWithId } from '@naturalcycles/js-lib'
 import { _isTruthy } from '@naturalcycles/js-lib'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import { DBQuery } from '../query/dbQuery.js'
 import type {
   CommonTimeSeriesDaoCfg,

package/src/timeseries/timeSeries.model.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/src/transaction/dbTransaction.util.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'
 
 /**

package/dist/adapter/inmemory/queryInMemory.d.ts

@@ -1,3 +0,0 @@
-import type { ObjectWithId } from '@naturalcycles/js-lib';
-import type { DBQuery } from '../../query/dbQuery.js';
-export declare function queryInMemory<ROW extends ObjectWithId>(q: DBQuery<ROW>, rows?: ROW[]): ROW[];