@naturalcycles/db-lib 10.5.0 → 10.7.0

package/dist/adapter/cachedb/cache.db.d.ts

@@ -1,7 +1,8 @@
-import type { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
+import type { ObjectWithId } 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 { BaseCommonDB } from '../../commondb/base.common.db.js';
+import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js';
 import type { RunQueryResult } from '../../db.model.js';
 import type { DBQuery } from '../../query/dbQuery.js';
 import type { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBSaveOptions, CacheDBStreamOptions } from './cache.db.model.js';

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

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { _isTruthy } from '@naturalcycles/js-lib';
-import { BaseCommonDB } from '../../base.common.db.js';
-import { commonDBFullSupport } from '../../common.db.js';
+import { BaseCommonDB } from '../../commondb/base.common.db.js';
+import { commonDBFullSupport } from '../../commondb/common.db.js';
 /**
  * CommonDB implementation that proxies requests to downstream CommonDB
  * and does in-memory caching.

package/dist/adapter/cachedb/cache.db.model.d.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, CommonDBSaveOptions, CommonDBStreamOptions } from '../../db.model.js';
 export interface CacheDBCfg {
     name: string;

package/dist/adapter/file/file.db.d.ts

@@ -1,7 +1,8 @@
-import type { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
+import { type ObjectWithId } 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 { BaseCommonDB } from '../../commondb/base.common.db.js';
+import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js';
 import type { CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBSaveBatchOperation, RunQueryResult } from '../../db.model.js';
 import type { DBQuery } from '../../query/dbQuery.js';
 import type { FileDBCfg } from './file.db.model.js';

package/dist/adapter/file/file.db.js

@@ -1,9 +1,14 @@
-import { _assert, _by, _deepEquals, _filterUndefinedValues, _since, _sortBy, _sortObjectDeep, _stringMapValues, generateJsonSchemaFromData, localTime, } from '@naturalcycles/js-lib';
-import { dimGrey } from '@naturalcycles/nodejs-lib';
+import { _by, _sortBy } from '@naturalcycles/js-lib';
+import { _since, localTime } from '@naturalcycles/js-lib/datetime';
+import { _assert } from '@naturalcycles/js-lib/error';
+import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema';
+import { _deepEquals, _filterUndefinedValues, _sortObjectDeep } from '@naturalcycles/js-lib/object';
+import { _stringMapValues, } from '@naturalcycles/js-lib/types';
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 import { readableCreate } from '@naturalcycles/nodejs-lib/stream';
-import { BaseCommonDB } from '../../base.common.db.js';
-import { commonDBFullSupport } from '../../common.db.js';
-import { queryInMemory } from '../inmemory/queryInMemory.js';
+import { BaseCommonDB } from '../../commondb/base.common.db.js';
+import { commonDBFullSupport } from '../../commondb/common.db.js';
+import { queryInMemory } from '../../inmemory/queryInMemory.js';
 /**
  * Provides barebone implementation for "whole file" based CommonDB.
  * "whole file" means that the persistence layer doesn't allow any querying,

package/dist/adapter/file/file.db.model.d.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';
 export interface FileDBPersistencePlugin {

package/dist/adapter/file/inMemory.persistence.plugin.d.ts

@@ -1,4 +1,4 @@
-import type { ObjectWithId, StringMap } 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/dist/adapter/file/localFile.persistence.plugin.d.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';
 export interface LocalFilePersistencePluginCfg {

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

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
-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 { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { _pipeline, createReadStreamAsNDJSON, createWriteStreamAsNDJSON, } from '@naturalcycles/nodejs-lib/stream';
 /**
  * Persists in local filesystem as ndjson.
  */
@@ -26,7 +26,7 @@ export class LocalFilePersistencePlugin {
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
         if (!(await fs2.pathExistsAsync(filePath)))
             return [];
-        return await fs2.createReadStreamAsNDJSON(filePath).toArray();
+        return await createReadStreamAsNDJSON(filePath).toArray();
     }
     async saveFiles(ops) {
         await pMap(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 32 });
@@ -35,6 +35,6 @@ export class LocalFilePersistencePlugin {
         await fs2.ensureDirAsync(this.cfg.storagePath);
         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/dist/adapter/file/noop.persistence.plugin.d.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';
 export declare class NoopPersistencePlugin implements FileDBPersistencePlugin {

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

@@ -1,5 +1,7 @@
 import type { Transform } from 'node:stream';
-import type { AsyncIndexedMapper, BaseDBEntity, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, StringMap, UnixTimestampMillis, Unsaved } from '@naturalcycles/js-lib';
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import type { AsyncIndexedMapper, BaseDBEntity, StringMap, UnixTimestampMillis, Unsaved } from '@naturalcycles/js-lib/types';
 import { ZodType } from '@naturalcycles/js-lib/zod';
 import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { type ObjectSchema } from '@naturalcycles/nodejs-lib/joi';

package/dist/commondao/common.dao.js

@@ -1,4 +1,10 @@
-import { _assert, _deepCopy, _deepJsonEquals, _filterUndefinedValues, _isTruthy, _objectAssignExact, _passthroughPredicate, _since, _truncate, _typeCast, _uniqBy, AppError, ErrorMode, localTime, pMap, SKIP, } from '@naturalcycles/js-lib';
+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 { _deepCopy, _deepJsonEquals, _filterUndefinedValues, _objectAssignExact, } from '@naturalcycles/js-lib/object';
+import { pMap } from '@naturalcycles/js-lib/promise';
+import { _truncate } from '@naturalcycles/js-lib/string';
+import { _passthroughPredicate, _typeCast, SKIP } from '@naturalcycles/js-lib/types';
 import { ZodType, zSafeValidate } from '@naturalcycles/js-lib/zod';
 import { stringId } from '@naturalcycles/nodejs-lib';
 import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';

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

@@ -1,9 +1,11 @@
-import type { BaseDBEntity, CommonLogger, ErrorMode, NumberOfMilliseconds, Promisable, UnixTimestamp } from '@naturalcycles/js-lib';
+import type { ErrorMode } from '@naturalcycles/js-lib/error';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import type { BaseDBEntity, NumberOfMilliseconds, Promisable, UnixTimestamp } 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';
 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/dist/commondao/index.d.ts

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

package/dist/commondao/index.js

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

package/dist/{base.common.db.d.ts → commondb/base.common.db.d.ts}

@@ -1,9 +1,10 @@
-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 { CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from '../db.model.js';
+import type { DBQuery } from '../query/dbQuery.js';
 import type { CommonDB, CommonDBSupport } from './common.db.js';
 import { CommonDBType } from './common.db.js';
-import type { CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from './db.model.js';
-import type { DBQuery } from './query/dbQuery.js';
 /**
  * No-op implementation of CommonDB interface.
  * To be extended by actual implementations.

package/dist/{base.common.db.js → commondb/base.common.db.js}

@@ -1,5 +1,5 @@
+import { FakeDBTransaction } from '../transaction/dbTransaction.util.js';
 import { CommonDBType } from './common.db.js';
-import { FakeDBTransaction } from './transaction/dbTransaction.util.js';
 /**
  * No-op implementation of CommonDB interface.
  * To be extended by actual implementations.

package/dist/{common.db.d.ts → commondb/common.db.d.ts}

@@ -1,7 +1,8 @@
-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, CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from './db.model.js';
-import type { DBQuery } from './query/dbQuery.js';
+import type { CommonDBCreateOptions, CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from '../db.model.js';
+import type { DBQuery } from '../query/dbQuery.js';
 export declare enum CommonDBType {
     'document' = "document",
     'relational' = "relational"

package/dist/db.model.d.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.
  * Insert will fail if row already exists.

package/dist/index.d.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/dist/index.js

@@ -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/dist/{adapter/inmemory → inmemory}/inMemory.db.d.ts

@@ -1,9 +1,11 @@
-import type { AnyObjectWithId, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, StringMap } from '@naturalcycles/js-lib';
+import { type JsonSchemaObject, type JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import { type AnyObjectWithId, type ObjectWithId, type 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 { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBOperation, DBTransaction, DBTransactionFn, RunQueryResult } from '../../db.model.js';
-import type { DBQuery } from '../../query/dbQuery.js';
+import type { CommonDB, CommonDBSupport } from '../commondb/common.db.js';
+import { CommonDBType } from '../commondb/common.db.js';
+import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBOperation, DBTransaction, DBTransactionFn, RunQueryResult } from '../db.model.js';
+import type { DBQuery } from '../query/dbQuery.js';
 export interface InMemoryDBCfg {
     /**
      * @default ''

package/dist/{adapter/inmemory → inmemory}/inMemory.db.js

@@ -1,9 +1,15 @@
 import { Readable } from 'node:stream';
-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 } from '@naturalcycles/nodejs-lib/stream';
-import { commonDBFullSupport, CommonDBType } from '../../common.db.js';
+import { _by, _isEmptyObject } from '@naturalcycles/js-lib';
+import { _since, localTime } from '@naturalcycles/js-lib/datetime';
+import { _assert } from '@naturalcycles/js-lib/error';
+import { generateJsonSchemaFromData, } from '@naturalcycles/js-lib/json-schema';
+import { _deepCopy, _sortObjectDeep } from '@naturalcycles/js-lib/object';
+import { pMap } from '@naturalcycles/js-lib/promise';
+import { _stringMapEntries, _stringMapValues, } 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, } from '@naturalcycles/nodejs-lib/stream';
+import { commonDBFullSupport, CommonDBType } from '../commondb/common.db.js';
 import { queryInMemory } from './queryInMemory.js';
 export class InMemoryDB {
     dbType = CommonDBType.document;
@@ -183,7 +189,7 @@ export class InMemoryDB {
                 return; // 0 rows
             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(`flushToDisk took ${dimGrey(_since(started))} to save ${yellow(tables)} tables`);
     }
@@ -201,7 +207,7 @@ export class InMemoryDB {
         await pMap(files, async (file) => {
             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);
         });
         this.cfg.logger.log(`restoreFromDisk took ${dimGrey(_since(started))} to read ${yellow(files.length)} tables`);

package/dist/{adapter/inmemory → inmemory}/inMemoryKeyValueDB.d.ts

@@ -1,7 +1,7 @@
-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 type { CommonDBCreateOptions } from '../db.model.js';
+import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '../kv/commonKeyValueDB.js';
 export interface InMemoryKeyValueDBCfg {
 }
 export declare class InMemoryKeyValueDB implements CommonKeyValueDB {

package/dist/{adapter/inmemory → inmemory}/inMemoryKeyValueDB.js

@@ -1,5 +1,5 @@
 import { Readable } from 'node:stream';
-import { commonKeyValueDBFullSupport } from '../../kv/commonKeyValueDB.js';
+import { commonKeyValueDBFullSupport } from '../kv/commonKeyValueDB.js';
 export class InMemoryKeyValueDB {
     cfg;
     constructor(cfg = {}) {

package/dist/inmemory/index.d.ts

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

package/dist/inmemory/index.js

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

package/dist/inmemory/queryInMemory.d.ts

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

package/dist/{adapter/inmemory → inmemory}/queryInMemory.js

@@ -1,4 +1,4 @@
-import { _get, _pick } from '@naturalcycles/js-lib';
+import { _get, _pick } from '@naturalcycles/js-lib/object';
 const FILTER_FNS = {
     '==': (v, val) => v === val,
     '!=': (v, val) => v !== val,

package/dist/kv/commonKeyValueDB.d.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/dist/kv/commonKeyValueDao.d.ts

@@ -1,4 +1,5 @@
-import type { CommonLogger, KeyValueTuple } from '@naturalcycles/js-lib';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import type { KeyValueTuple } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDaoLogLevel } from '../commondao/common.dao.model.js';
 import type { CommonDBCreateOptions } from '../db.model.js';

package/dist/kv/commonKeyValueDao.js

@@ -1,5 +1,6 @@
-import { AppError, pMap } from '@naturalcycles/js-lib';
-import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { pMap } from '@naturalcycles/js-lib/promise';
+import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib/zip';
 export const commonKeyValueDaoDeflatedJsonTransformer = {
     valueToBuffer: async (v) => await deflateString(JSON.stringify(v)),
     bufferToValue: async (buf) => JSON.parse(await inflateToString(buf)),

package/dist/kv/commonKeyValueDaoMemoCache.d.ts

@@ -1,5 +1,6 @@
-import type { AsyncMemoCache, NumberOfSeconds } from '@naturalcycles/js-lib';
-import { MISS } from '@naturalcycles/js-lib';
+import type { AsyncMemoCache } from '@naturalcycles/js-lib/decorators';
+import type { NumberOfSeconds } from '@naturalcycles/js-lib/types';
+import { MISS } from '@naturalcycles/js-lib/types';
 import type { CommonKeyValueDao } from './commonKeyValueDao.js';
 export interface CommonKeyValueDaoMemoCacheCfg<VALUE> {
     dao: CommonKeyValueDao<string, VALUE>;

package/dist/kv/commonKeyValueDaoMemoCache.js

@@ -1,4 +1,5 @@
-import { localTime, MISS } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
+import { MISS } from '@naturalcycles/js-lib/types';
 /**
  * AsyncMemoCache implementation, backed by CommonKeyValueDao.
  *

package/dist/kv/index.d.ts

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

package/dist/kv/index.js

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

package/dist/model.util.d.ts

@@ -1,4 +1,4 @@
-import type { CreatedUpdated, CreatedUpdatedId } from '@naturalcycles/js-lib';
+import type { CreatedUpdated, CreatedUpdatedId } from '@naturalcycles/js-lib/types';
 export declare function createdUpdatedFields(existingObject?: Partial<CreatedUpdated> | null): CreatedUpdated;
 export declare function createdUpdatedIdFields(existingObject?: Partial<CreatedUpdatedId> | null): CreatedUpdatedId;
 export declare function deserializeJsonField<T = any>(f?: string): T;

package/dist/model.util.js

@@ -1,4 +1,4 @@
-import { localTime } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
 import { stringId } from '@naturalcycles/nodejs-lib';
 export function createdUpdatedFields(existingObject) {
     const now = localTime.nowUnix();

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -1,8 +1,8 @@
-import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib';
-import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
+import { ErrorMode } from '@naturalcycles/js-lib/error';
+import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-lib/types';
+import { type TransformLogProgressOptions, type TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
 import { NDJsonStats } 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 {
     /**

package/dist/pipeline/dbPipelineBackup.js

@@ -1,6 +1,10 @@
-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 { localTime } from '@naturalcycles/js-lib/datetime';
+import { AppError, ErrorMode } from '@naturalcycles/js-lib/error';
+import { pMap } from '@naturalcycles/js-lib/promise';
+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, } from '@naturalcycles/nodejs-lib/stream';
 import { _pipeline, NDJsonStats, transformLogProgress, transformMap, transformTap, } from '@naturalcycles/nodejs-lib/stream';
 import { DBQuery } from '../query/dbQuery.js';
 /**
@@ -68,7 +72,7 @@ export async function dbPipelineBackup(opt) {
             transformTap(() => {
                 rows++;
             }),
-            ...fs2.createWriteStreamAsNDJSON(filePath),
+            ...createWriteStreamAsNDJSON(filePath),
         ]);
         const { size: sizeBytes } = await fs2.statAsync(filePath);
         const stats = NDJsonStats.create({

package/dist/pipeline/dbPipelineCopy.d.ts

@@ -1,8 +1,8 @@
-import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
-import { ErrorMode } from '@naturalcycles/js-lib';
+import { ErrorMode } from '@naturalcycles/js-lib/error';
+import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib/types';
 import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
 import { NDJsonStats } 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 DBPipelineCopyOptions extends TransformLogProgressOptions {
     dbInput: CommonDB;

package/dist/pipeline/dbPipelineCopy.js

@@ -1,5 +1,8 @@
-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 { _passthroughMapper } from '@naturalcycles/js-lib/types';
+import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors';
 import { _pipeline, NDJsonStats, transformChunk, transformLogProgress, transformMap, transformTap, writableForEach, } from '@naturalcycles/nodejs-lib/stream';
 import { DBQuery } from '../query/dbQuery.js';
 /**

package/dist/pipeline/dbPipelineRestore.d.ts

@@ -1,8 +1,8 @@
-import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
-import { ErrorMode } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib/stream';
+import { ErrorMode } from '@naturalcycles/js-lib/error';
+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 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 {
     /**

package/dist/pipeline/dbPipelineRestore.js

@@ -1,6 +1,12 @@
-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 { _hb } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
+import { ErrorMode } from '@naturalcycles/js-lib/error';
+import { _mapValues } from '@naturalcycles/js-lib/object';
+import { pMap } from '@naturalcycles/js-lib/promise';
+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 { createReadStreamAsNDJSON, } from '@naturalcycles/nodejs-lib/stream';
 import { _pipeline, NDJsonStats, transformChunk, transformFilterSync, transformLogProgress, transformMap, transformTap, writableForEach, } from '@naturalcycles/nodejs-lib/stream';
 /**
  * Pipeline from NDJSON files in a folder (optionally gzipped) to CommonDB.
@@ -62,7 +68,7 @@ export async function dbPipelineRestore(opt) {
         const sizeBytes = sizeByTable[table];
         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/dist/pipeline/index.d.ts

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

package/dist/pipeline/index.js

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

package/dist/query/dbQuery.d.ts

@@ -1,4 +1,4 @@
-import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib';
+import type { AsyncIndexedMapper, BaseDBEntity, ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDao } from '../commondao/common.dao.js';
 import type { CommonDaoOptions, CommonDaoReadOptions, CommonDaoStreamDeleteOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from '../commondao/common.dao.model.js';

package/dist/query/dbQuery.js

@@ -1,4 +1,5 @@
-import { _objectAssign, _truncate } from '@naturalcycles/js-lib';
+import { _truncate } from '@naturalcycles/js-lib/string';
+import { _objectAssign } from '@naturalcycles/js-lib/types';
 export const dbQueryFilterOperatorValues = [
     '<',
     '<=',

package/dist/testing/commonDBTest.d.ts

@@ -1,4 +1,4 @@
-import type { CommonDB } from '../common.db.js';
+import type { CommonDB } from '../commondb/common.db.js';
 /**
  * All options default to `false`.
  */

package/dist/testing/commonDBTest.js

@@ -1,5 +1,8 @@
-import { _deepFreeze, _filterObject, _pick, _sortBy, localTime, pMap } from '@naturalcycles/js-lib';
-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 { CommonDBType } from '../commondb/common.db.js';
 import { DBQuery } from '../query/dbQuery.js';
 import { createTestItemDBM, createTestItemsDBM, TEST_TABLE, testItemBMJsonSchema, } from './test.model.js';
 export async function runCommonDBTest(db, quirks = {}) {

package/dist/testing/commonDaoTest.d.ts

@@ -1,3 +1,3 @@
-import type { CommonDB } from '../common.db.js';
+import type { CommonDB } from '../commondb/common.db.js';
 import type { CommonDBImplementationQuirks } from './commonDBTest.js';
 export declare function runCommonDaoTest(db: CommonDB, quirks?: CommonDBImplementationQuirks): Promise<void>;