@naturalcycles/db-lib 10.0.2 → 10.1.1

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

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

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

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonDaoLogLevel = void 0;
-var CommonDaoLogLevel;
+export var CommonDaoLogLevel;
 (function (CommonDaoLogLevel) {
     /**
      * Same as undefined
@@ -19,4 +16,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 = CommonDaoLogLevel = {}));
+})(CommonDaoLogLevel || (CommonDaoLogLevel = {}));

package/dist/db.model.d.ts

@@ -1,5 +1,5 @@
 import type { ObjectWithId, UnixTimestamp } from '@naturalcycles/js-lib';
-import type { CommonDB } from './common.db';
+import type { CommonDB } from './common.db.js';
 /**
  * Similar to SQL INSERT, UPDATE.
  * Insert will fail if row already exists.
@@ -23,6 +23,11 @@ export interface DBTransaction {
     getByIds: CommonDB['getByIds'];
     saveBatch: CommonDB['saveBatch'];
     deleteByIds: CommonDB['deleteByIds'];
+    /**
+     * Commit the transaction.
+     * May throw.
+     */
+    commit: () => Promise<void>;
     /**
      * Perform a graceful rollback.
      * It'll rollback the transaction and won't throw/re-throw any errors.

package/dist/db.model.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBModelType = exports.DBRelation = void 0;
-var DBRelation;
+export var DBRelation;
 (function (DBRelation) {
     DBRelation["ONE_TO_ONE"] = "ONE_TO_ONE";
     DBRelation["ONE_TO_MANY"] = "ONE_TO_MANY";
-})(DBRelation || (exports.DBRelation = DBRelation = {}));
-var DBModelType;
+})(DBRelation || (DBRelation = {}));
+export var DBModelType;
 (function (DBModelType) {
     DBModelType["DBM"] = "DBM";
     DBModelType["BM"] = "BM";
-})(DBModelType || (exports.DBModelType = DBModelType = {}));
+})(DBModelType || (DBModelType = {}));

package/dist/index.d.ts

@@ -1,17 +1,17 @@
-export * from './adapter/inmemory/inMemory.db';
-export * from './adapter/inmemory/inMemoryKeyValueDB';
-export * from './adapter/inmemory/queryInMemory';
-export * from './base.common.db';
-export * from './common.db';
-export * from './commondao/common.dao';
-export * from './commondao/common.dao.model';
-export * from './db.model';
-export * from './kv/commonKeyValueDao';
-export * from './kv/commonKeyValueDaoMemoCache';
-export * from './kv/commonKeyValueDB';
-export * from './model.util';
-export * from './pipeline/dbPipelineBackup';
-export * from './pipeline/dbPipelineCopy';
-export * from './pipeline/dbPipelineRestore';
-export * from './query/dbQuery';
-export * from './transaction/dbTransaction.util';
+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 './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,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./adapter/inmemory/inMemory.db"), exports);
-tslib_1.__exportStar(require("./adapter/inmemory/inMemoryKeyValueDB"), exports);
-tslib_1.__exportStar(require("./adapter/inmemory/queryInMemory"), exports);
-tslib_1.__exportStar(require("./base.common.db"), exports);
-tslib_1.__exportStar(require("./common.db"), exports);
-tslib_1.__exportStar(require("./commondao/common.dao"), exports);
-tslib_1.__exportStar(require("./commondao/common.dao.model"), exports);
-tslib_1.__exportStar(require("./db.model"), exports);
-tslib_1.__exportStar(require("./kv/commonKeyValueDao"), exports);
-tslib_1.__exportStar(require("./kv/commonKeyValueDaoMemoCache"), exports);
-tslib_1.__exportStar(require("./kv/commonKeyValueDB"), exports);
-tslib_1.__exportStar(require("./model.util"), exports);
-tslib_1.__exportStar(require("./pipeline/dbPipelineBackup"), exports);
-tslib_1.__exportStar(require("./pipeline/dbPipelineCopy"), exports);
-tslib_1.__exportStar(require("./pipeline/dbPipelineRestore"), exports);
-tslib_1.__exportStar(require("./query/dbQuery"), exports);
-tslib_1.__exportStar(require("./transaction/dbTransaction.util"), exports);
+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 './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/kv/commonKeyValueDB.d.ts

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

package/dist/kv/commonKeyValueDB.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonKeyValueDBFullSupport = void 0;
-exports.commonKeyValueDBFullSupport = {
+export const commonKeyValueDBFullSupport = {
     count: true,
     increment: true,
 };

package/dist/kv/commonKeyValueDao.d.ts

@@ -1,8 +1,8 @@
 import type { CommonLogger, KeyValueTuple } from '@naturalcycles/js-lib';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import type { CommonDaoLogLevel } from '../commondao/common.dao.model';
-import type { CommonDBCreateOptions } from '../db.model';
-import type { CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from './commonKeyValueDB';
+import type { CommonDaoLogLevel } from '../commondao/common.dao.model.js';
+import type { CommonDBCreateOptions } from '../db.model.js';
+import type { CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from './commonKeyValueDB.js';
 export interface CommonKeyValueDaoCfg<V> {
     db: CommonKeyValueDB;
     table: string;

package/dist/kv/commonKeyValueDao.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonKeyValueDao = exports.commonKeyValueDaoDeflatedJsonTransformer = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-exports.commonKeyValueDaoDeflatedJsonTransformer = {
-    valueToBuffer: async (v) => await (0, nodejs_lib_1.deflateString)(JSON.stringify(v)),
-    bufferToValue: async (buf) => JSON.parse(await (0, nodejs_lib_1.inflateToString)(buf)),
+import { AppError, pMap } from '@naturalcycles/js-lib';
+import { deflateString, inflateToString } from '@naturalcycles/nodejs-lib';
+export const commonKeyValueDaoDeflatedJsonTransformer = {
+    valueToBuffer: async (v) => await deflateString(JSON.stringify(v)),
+    bufferToValue: async (buf) => JSON.parse(await inflateToString(buf)),
 };
 // todo: logging
 // todo: readonly
-class CommonKeyValueDao {
+export class CommonKeyValueDao {
     constructor(cfg) {
         this.cfg = {
             logger: console,
@@ -39,7 +36,7 @@ class CommonKeyValueDao {
         const [r] = await this.getByIds([id]);
         if (!r) {
             const { table } = this.cfg;
-            throw new js_lib_1.AppError(`DB row required, but not found in ${table}`, {
+            throw new AppError(`DB row required, but not found in ${table}`, {
                 table,
                 id,
             });
@@ -50,7 +47,7 @@ class CommonKeyValueDao {
         const [r] = await this.cfg.db.getByIds(this.cfg.table, [id]);
         if (!r) {
             const { table } = this.cfg;
-            throw new js_lib_1.AppError(`DB row required, but not found in ${table}`, {
+            throw new AppError(`DB row required, but not found in ${table}`, {
                 table,
                 id,
             });
@@ -61,7 +58,7 @@ class CommonKeyValueDao {
         const entries = await this.cfg.db.getByIds(this.cfg.table, ids);
         if (!this.cfg.transformer)
             return entries;
-        return await (0, js_lib_1.pMap)(entries, async ([id, raw]) => [
+        return await pMap(entries, async ([id, raw]) => [
             id,
             await this.cfg.transformer.bufferToValue(raw),
         ]);
@@ -79,7 +76,7 @@ class CommonKeyValueDao {
             rawEntries = entries;
         }
         else {
-            rawEntries = await (0, js_lib_1.pMap)(entries, async ([id, v]) => [id, await transformer.valueToBuffer(v)]);
+            rawEntries = await pMap(entries, async ([id, v]) => [id, await transformer.valueToBuffer(v)]);
         }
         await this.cfg.db.saveBatch(this.cfg.table, rawEntries, opt);
     }
@@ -149,4 +146,3 @@ class CommonKeyValueDao {
         return await this.cfg.db.incrementBatch(this.cfg.table, entries);
     }
 }
-exports.CommonKeyValueDao = CommonKeyValueDao;

package/dist/kv/commonKeyValueDaoMemoCache.d.ts

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

package/dist/kv/commonKeyValueDaoMemoCache.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonKeyValueDaoMemoCache = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
+import { localTime, MISS } from '@naturalcycles/js-lib';
 /**
  * AsyncMemoCache implementation, backed by CommonKeyValueDao.
  *
@@ -10,17 +7,17 @@ const js_lib_1 = require("@naturalcycles/js-lib");
  * Also, does not support .clear(), as it's more dangerous than useful to actually
  * clear the whole table/cache.
  */
-class CommonKeyValueDaoMemoCache {
+export class CommonKeyValueDaoMemoCache {
     cfg;
     constructor(cfg) {
         this.cfg = cfg;
     }
     async get(k) {
-        return (await this.cfg.dao.getById(k)) || js_lib_1.MISS;
+        return (await this.cfg.dao.getById(k)) || MISS;
     }
     async set(k, v) {
         const opt = this.cfg.ttl
-            ? { expireAt: (js_lib_1.localTime.nowUnix() + this.cfg.ttl) }
+            ? { expireAt: (localTime.nowUnix() + this.cfg.ttl) }
             : undefined;
         await this.cfg.dao.save(k, v, opt);
     }
@@ -28,4 +25,3 @@ class CommonKeyValueDaoMemoCache {
         throw new Error('CommonKeyValueDaoMemoCache.clear is not supported, because cache is expected to be persistent');
     }
 }
-exports.CommonKeyValueDaoMemoCache = CommonKeyValueDaoMemoCache;

package/dist/model.util.js

@@ -1,30 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createdUpdatedFields = createdUpdatedFields;
-exports.createdUpdatedIdFields = createdUpdatedIdFields;
-exports.deserializeJsonField = deserializeJsonField;
-exports.serializeJsonField = serializeJsonField;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-function createdUpdatedFields(existingObject) {
-    const now = js_lib_1.localTime.nowUnix();
+import { localTime } from '@naturalcycles/js-lib';
+import { stringId } from '@naturalcycles/nodejs-lib';
+export function createdUpdatedFields(existingObject) {
+    const now = localTime.nowUnix();
     return {
         created: existingObject?.created || now,
         updated: now,
     };
 }
-function createdUpdatedIdFields(existingObject) {
-    const now = js_lib_1.localTime.nowUnix();
+export function createdUpdatedIdFields(existingObject) {
+    const now = localTime.nowUnix();
     return {
         created: existingObject?.created || now,
-        id: existingObject?.id || (0, nodejs_lib_1.stringId)(),
+        id: existingObject?.id || stringId(),
         updated: now,
     };
 }
-function deserializeJsonField(f) {
+export function deserializeJsonField(f) {
     return JSON.parse(f || '{}');
 }
-function serializeJsonField(f) {
+export function serializeJsonField(f) {
     if (f === undefined)
         return;
     return JSON.stringify(f);

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -2,8 +2,8 @@ import type { AsyncMapper, StringMap, UnixTimestamp } from '@naturalcycles/js-li
 import { ErrorMode } from '@naturalcycles/js-lib';
 import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { NDJsonStats } from '@naturalcycles/nodejs-lib';
-import type { CommonDB } from '../common.db';
-import { DBQuery } from '../index';
+import type { CommonDB } from '../common.db.js';
+import { DBQuery } from '../query/dbQuery.js';
 export interface DBPipelineBackupOptions extends TransformLogProgressOptions {
     /**
      * DB to dump data from.

package/dist/pipeline/dbPipelineBackup.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbPipelineBackup = dbPipelineBackup;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const index_1 = require("../index");
+import { _passthroughMapper, AppError, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib';
+import { _pipeline, boldWhite, dimWhite, fs2, grey, NDJsonStats, transformLogProgress, transformMap, transformTap, yellow, } from '@naturalcycles/nodejs-lib';
+import { DBQuery } from '../query/dbQuery.js';
 /**
  * Pipeline from input stream(s) to a NDJSON file (optionally gzipped).
  * File is overwritten (by default).
@@ -13,17 +10,17 @@ const index_1 = require("../index");
  *
  * Optionally you can provide mapperPerTable and @param transformMapOptions (one for all mappers) - it will run for each table.
  */
-async function dbPipelineBackup(opt) {
-    const { db, concurrency = 16, limit = 0, outputDirPath, protectFromOverwrite = false, mapperPerTable = {}, queryPerTable = {}, logEveryPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, emitSchemaFromDB = false, } = opt;
+export async function dbPipelineBackup(opt) {
+    const { db, concurrency = 16, limit = 0, outputDirPath, protectFromOverwrite = false, mapperPerTable = {}, queryPerTable = {}, logEveryPerTable = {}, transformMapOptions, errorMode = ErrorMode.SUPPRESS, emitSchemaFromDB = false, } = opt;
     const gzip = opt.gzip !== false; // default to true
     let { tables } = opt;
-    console.log(`>> ${(0, nodejs_lib_1.dimWhite)('dbPipelineBackup')} started in ${(0, nodejs_lib_1.grey)(outputDirPath)}...`);
-    nodejs_lib_1.fs2.ensureDir(outputDirPath);
+    console.log(`>> ${dimWhite('dbPipelineBackup')} started in ${grey(outputDirPath)}...`);
+    fs2.ensureDir(outputDirPath);
     tables ||= await db.getTables();
-    console.log(`${(0, nodejs_lib_1.yellow)(tables.length)} ${(0, nodejs_lib_1.boldWhite)('table(s)')}:\n` + tables.join('\n'));
+    console.log(`${yellow(tables.length)} ${boldWhite('table(s)')}:\n` + tables.join('\n'));
     const statsPerTable = {};
-    await (0, js_lib_1.pMap)(tables, async (table) => {
-        let q = index_1.DBQuery.create(table).limit(limit);
+    await pMap(tables, async (table) => {
+        let q = DBQuery.create(table).limit(limit);
         const sinceUpdated = opt.sinceUpdatedPerTable?.[table] ?? opt.sinceUpdated;
         if (sinceUpdated) {
             q = q.filter('updated', '>=', sinceUpdated);
@@ -31,56 +28,56 @@ async function dbPipelineBackup(opt) {
         if (queryPerTable[table]) {
             // Override the Query with this Query, completely ingoring any of the other query-related options
             q = queryPerTable[table];
-            console.log(`>> ${(0, nodejs_lib_1.grey)(table)} ${q.pretty()}`);
+            console.log(`>> ${grey(table)} ${q.pretty()}`);
         }
         else {
             const sinceUpdatedStr = sinceUpdated
-                ? ' since ' + (0, nodejs_lib_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty())
+                ? ' since ' + grey(localTime(sinceUpdated).toPretty())
                 : '';
-            console.log(`>> ${(0, nodejs_lib_1.grey)(table)}${sinceUpdatedStr}`);
+            console.log(`>> ${grey(table)}${sinceUpdatedStr}`);
         }
         const filePath = `${outputDirPath}/${table}.ndjson` + (gzip ? '.gz' : '');
         const schemaFilePath = `${outputDirPath}/${table}.schema.json`;
-        if (protectFromOverwrite && nodejs_lib_1.fs2.pathExists(filePath)) {
-            throw new js_lib_1.AppError(`dbPipelineBackup: output file exists: ${filePath}`);
+        if (protectFromOverwrite && fs2.pathExists(filePath)) {
+            throw new AppError(`dbPipelineBackup: output file exists: ${filePath}`);
         }
         const started = Date.now();
         let rows = 0;
-        nodejs_lib_1.fs2.ensureFile(filePath);
+        fs2.ensureFile(filePath);
         // console.log(`>> ${grey(filePath)} started...`)
         if (emitSchemaFromDB) {
             const schema = await db.getTableSchema(table);
-            await nodejs_lib_1.fs2.writeJsonAsync(schemaFilePath, schema, { spaces: 2 });
-            console.log(`>> ${(0, nodejs_lib_1.grey)(schemaFilePath)} saved (generated from DB)`);
+            await fs2.writeJsonAsync(schemaFilePath, schema, { spaces: 2 });
+            console.log(`>> ${grey(schemaFilePath)} saved (generated from DB)`);
         }
-        await (0, nodejs_lib_1._pipeline)([
+        await _pipeline([
             db.streamQuery(q),
-            (0, nodejs_lib_1.transformLogProgress)({
+            transformLogProgress({
                 ...opt,
                 logEvery: logEveryPerTable[table] ?? opt.logEvery ?? 1000,
                 metric: table,
             }),
-            (0, nodejs_lib_1.transformMap)(mapperPerTable[table] || js_lib_1._passthroughMapper, {
+            transformMap(mapperPerTable[table] || _passthroughMapper, {
                 errorMode,
                 flattenArrayOutput: true,
                 ...transformMapOptions,
                 metric: table,
             }),
-            (0, nodejs_lib_1.transformTap)(() => {
+            transformTap(() => {
                 rows++;
             }),
-            ...nodejs_lib_1.fs2.createWriteStreamAsNDJSON(filePath),
+            ...fs2.createWriteStreamAsNDJSON(filePath),
         ]);
-        const { size: sizeBytes } = await nodejs_lib_1.fs2.statAsync(filePath);
-        const stats = nodejs_lib_1.NDJsonStats.create({
+        const { size: sizeBytes } = await fs2.statAsync(filePath);
+        const stats = NDJsonStats.create({
             tookMillis: Date.now() - started,
             rows,
             sizeBytes,
         });
-        console.log(`>> ${(0, nodejs_lib_1.grey)(filePath)}\n` + stats.toPretty());
+        console.log(`>> ${grey(filePath)}\n` + stats.toPretty());
         statsPerTable[table] = stats;
     }, { concurrency, errorMode });
-    const statsTotal = nodejs_lib_1.NDJsonStats.createCombined(Object.values(statsPerTable));
+    const statsTotal = NDJsonStats.createCombined(Object.values(statsPerTable));
     console.log(statsTotal.toPretty('total'));
     return statsTotal;
 }

package/dist/pipeline/dbPipelineCopy.d.ts

@@ -2,8 +2,8 @@ import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
 import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { NDJsonStats } from '@naturalcycles/nodejs-lib';
-import type { CommonDB } from '../common.db';
-import type { CommonDBSaveOptions } from '../db.model';
+import type { CommonDB } from '../common.db.js';
+import type { CommonDBSaveOptions } from '../db.model.js';
 export interface DBPipelineCopyOptions extends TransformLogProgressOptions {
     dbInput: CommonDB;
     dbOutput: CommonDB;

package/dist/pipeline/dbPipelineCopy.js

@@ -1,61 +1,58 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbPipelineCopy = dbPipelineCopy;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const dbQuery_1 = require("../query/dbQuery");
+import { _passthroughMapper, ErrorMode, localTime, pMap } from '@naturalcycles/js-lib';
+import { _pipeline, boldWhite, dimWhite, grey, NDJsonStats, transformChunk, transformLogProgress, transformMap, transformTap, writableForEach, yellow, } from '@naturalcycles/nodejs-lib';
+import { DBQuery } from '../query/dbQuery.js';
 /**
  * Pipeline from input stream(s) to CommonDB .saveBatch().
  * Input stream can be a stream from CommonDB.streamQuery()
  * Allows to define a mapper and a predicate to map/filter objects between input and output.
  * Handles backpressure.
  */
-async function dbPipelineCopy(opt) {
-    const { chunkSize = 100, dbInput, dbOutput, concurrency = 16, limit = 0, sinceUpdated, mapperPerTable = {}, saveOptionsPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, } = opt;
+export async function dbPipelineCopy(opt) {
+    const { chunkSize = 100, dbInput, dbOutput, concurrency = 16, limit = 0, sinceUpdated, mapperPerTable = {}, saveOptionsPerTable = {}, transformMapOptions, errorMode = ErrorMode.SUPPRESS, } = opt;
     let { tables } = opt;
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, nodejs_lib_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
-    console.log(`>> ${(0, nodejs_lib_1.dimWhite)('dbPipelineCopy')} started...${sinceUpdatedStr}`);
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + grey(localTime(sinceUpdated).toPretty()) : '';
+    console.log(`>> ${dimWhite('dbPipelineCopy')} started...${sinceUpdatedStr}`);
     tables ||= await dbInput.getTables();
-    console.log(`${(0, nodejs_lib_1.yellow)(tables.length)} ${(0, nodejs_lib_1.boldWhite)('table(s)')}:\n` + tables.join('\n'));
+    console.log(`${yellow(tables.length)} ${boldWhite('table(s)')}:\n` + tables.join('\n'));
     const statsPerTable = {};
-    await (0, js_lib_1.pMap)(tables, async (table) => {
-        let q = dbQuery_1.DBQuery.create(table).limit(limit);
+    await pMap(tables, async (table) => {
+        let q = DBQuery.create(table).limit(limit);
         if (sinceUpdated) {
             q = q.filter('updated', '>=', sinceUpdated);
         }
         const saveOptions = saveOptionsPerTable[table] || {};
-        const mapper = mapperPerTable[table] || js_lib_1._passthroughMapper;
+        const mapper = mapperPerTable[table] || _passthroughMapper;
         const stream = dbInput.streamQuery(q);
         const started = Date.now();
         let rows = 0;
-        await (0, nodejs_lib_1._pipeline)([
+        await _pipeline([
             stream,
-            (0, nodejs_lib_1.transformLogProgress)({
+            transformLogProgress({
                 logEvery: 1000,
                 ...opt,
                 metric: table,
             }),
-            (0, nodejs_lib_1.transformMap)(mapper, {
+            transformMap(mapper, {
                 errorMode,
                 flattenArrayOutput: true,
                 ...transformMapOptions,
                 metric: table,
             }),
-            (0, nodejs_lib_1.transformTap)(() => rows++),
-            (0, nodejs_lib_1.transformChunk)({ chunkSize }),
-            (0, nodejs_lib_1.writableForEach)(async (dbms) => {
+            transformTap(() => rows++),
+            transformChunk({ chunkSize }),
+            writableForEach(async (dbms) => {
                 await dbOutput.saveBatch(table, dbms, saveOptions);
             }),
         ]);
-        const stats = nodejs_lib_1.NDJsonStats.create({
+        const stats = NDJsonStats.create({
             tookMillis: Date.now() - started,
             rows,
             sizeBytes: 0, // n/a
         });
-        console.log(`>> ${(0, nodejs_lib_1.grey)(table)}\n` + stats.toPretty());
+        console.log(`>> ${grey(table)}\n` + stats.toPretty());
         statsPerTable[table] = stats;
     }, { concurrency, errorMode });
-    const statsTotal = nodejs_lib_1.NDJsonStats.createCombined(Object.values(statsPerTable));
+    const statsTotal = NDJsonStats.createCombined(Object.values(statsPerTable));
     console.log(statsTotal.toPretty('total'));
     return statsTotal;
 }

package/dist/pipeline/dbPipelineRestore.d.ts

@@ -2,8 +2,8 @@ import type { AsyncMapper, UnixTimestamp } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib';
 import type { TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { NDJsonStats } from '@naturalcycles/nodejs-lib';
-import type { CommonDB } from '../common.db';
-import type { CommonDBSaveOptions } from '../index';
+import type { CommonDB } from '../common.db.js';
+import type { CommonDBSaveOptions } from '../db.model.js';
 export interface DBPipelineRestoreOptions extends TransformLogProgressOptions {
     /**
      * DB to save data to.