@naturalcycles/db-lib 8.11.0 → 8.13.0

package/dist/commondao/common.dao.js

@@ -7,7 +7,7 @@ const cnst_1 = require("../cnst");
 const db_model_1 = require("../db.model");
 const dbQuery_1 = require("../query/dbQuery");
 const common_dao_model_1 = require("./common.dao.model");
-const log = nodejs_lib_1.Debug('nc:db-lib:commondao');
+const log = (0, nodejs_lib_1.Debug)('nc:db-lib:commondao');
 /* eslint-disable no-dupe-class-members */
 /**
  * Lowest common denominator API between supported Databases.
@@ -24,7 +24,7 @@ class CommonDao {
             createdUpdated: true,
             ...cfg,
             hooks: {
-                createId: () => nodejs_lib_1.stringId(),
+                createId: () => (0, nodejs_lib_1.stringId)(),
                 parseNaturalId: () => ({}),
                 beforeCreate: bm => bm,
                 beforeDBMValidate: dbm => dbm,
@@ -33,15 +33,13 @@ class CommonDao {
                 beforeTMToBM: tm => tm,
                 beforeBMToTM: bm => bm,
                 anonymize: dbm => dbm,
+                onValidationError: err => err,
                 ...cfg.hooks,
             },
         };
     }
     // CREATE
     create(input, opt = {}) {
-        if (opt.throwOnError === undefined) {
-            opt.throwOnError = this.cfg.throwOnDaoCreateObject;
-        }
         let bm = this.cfg.hooks.beforeCreate(input);
         bm = this.validateAndConvert(bm, this.cfg.bmSchema, db_model_1.DBModelType.BM, opt);
         // If no SCHEMA - return as is
@@ -107,7 +105,7 @@ class CommonDao {
         return tm || null;
     }
     async getByIds(ids, opt = {}) {
-        const op = `getByIds ${ids.length} id(s) (${js_lib_1._truncate(ids.slice(0, 10).join(', '), 50)})`;
+        const op = `getByIds ${ids.length} id(s) (${(0, js_lib_1._truncate)(ids.slice(0, 10).join(', '), 50)})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
         const dbms = await this.cfg.db.getByIds(table, ids);
@@ -116,7 +114,7 @@ class CommonDao {
         return bms;
     }
     async getByIdsAsDBM(ids, opt = {}) {
-        const op = `getByIdsAsDBM ${ids.length} id(s) (${js_lib_1._truncate(ids.slice(0, 10).join(', '), 50)})`;
+        const op = `getByIdsAsDBM ${ids.length} id(s) (${(0, js_lib_1._truncate)(ids.slice(0, 10).join(', '), 50)})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
         const dbms = await this.cfg.db.getByIds(table, ids);
@@ -227,7 +225,7 @@ class CommonDao {
         const started = this.logStarted(op, q.table);
         const count = await this.cfg.db.runQueryCount(q, opt);
         if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {
-            log(`<< ${q.table}.${op}: ${count} row(s) in ${js_lib_1._since(started)}`);
+            log(`<< ${q.table}.${op}: ${count} row(s) in ${(0, js_lib_1._since)(started)}`);
         }
         return count;
     }
@@ -240,29 +238,29 @@ class CommonDao {
         const op = `streamQueryForEach(${q.pretty()})`;
         const started = this.logStarted(op, q.table, true);
         let count = 0;
-        await nodejs_lib_1._pipeline([
+        await (0, nodejs_lib_1._pipeline)([
             this.cfg.db.streamQuery(q, opt),
             // optimization: 1 validation is enough
             // transformMap<any, DBM>(dbm => (partialQuery || opt.raw ? dbm : this.anyToDBM(dbm, opt)), opt),
-            nodejs_lib_1.transformMapSync(dbm => {
+            (0, nodejs_lib_1.transformMapSync)(dbm => {
                 count++;
                 return partialQuery || opt.raw ? dbm : this.dbmToBM(dbm, opt);
             }, {
                 errorMode: opt.errorMode,
             }),
-            nodejs_lib_1.transformMap(mapper, {
+            (0, nodejs_lib_1.transformMap)(mapper, {
                 ...opt,
                 predicate: js_lib_1._passthroughPredicate, // to be able to logProgress
             }),
             // LogProgress should be AFTER the mapper, to be able to report correct stats
-            nodejs_lib_1.transformLogProgress({
+            (0, nodejs_lib_1.transformLogProgress)({
                 metric: q.table,
                 ...opt,
             }),
-            nodejs_lib_1.writableVoid(),
+            (0, nodejs_lib_1.writableVoid)(),
         ]);
         if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {
-            log(`<< ${q.table}.${op}: ${count} row(s) in ${js_lib_1._since(started)}`);
+            log(`<< ${q.table}.${op}: ${count} row(s) in ${(0, js_lib_1._since)(started)}`);
         }
     }
     async streamQueryAsDBMForEach(q, mapper, opt = {}) {
@@ -274,27 +272,27 @@ class CommonDao {
         const op = `streamQueryAsDBMForEach(${q.pretty()})`;
         const started = this.logStarted(op, q.table, true);
         let count = 0;
-        await nodejs_lib_1._pipeline([
+        await (0, nodejs_lib_1._pipeline)([
             this.cfg.db.streamQuery(q, opt),
-            nodejs_lib_1.transformMapSync(dbm => {
+            (0, nodejs_lib_1.transformMapSync)(dbm => {
                 count++;
                 return partialQuery || opt.raw ? dbm : this.anyToDBM(dbm, opt);
             }, {
                 errorMode: opt.errorMode,
             }),
-            nodejs_lib_1.transformMap(mapper, {
+            (0, nodejs_lib_1.transformMap)(mapper, {
                 ...opt,
                 predicate: js_lib_1._passthroughPredicate, // to be able to logProgress
             }),
             // LogProgress should be AFTER the mapper, to be able to report correct stats
-            nodejs_lib_1.transformLogProgress({
+            (0, nodejs_lib_1.transformLogProgress)({
                 metric: q.table,
                 ...opt,
             }),
-            nodejs_lib_1.writableVoid(),
+            (0, nodejs_lib_1.writableVoid)(),
         ]);
         if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {
-            log(`<< ${q.table}.${op}: ${count} row(s) in ${js_lib_1._since(started)}`);
+            log(`<< ${q.table}.${op}: ${count} row(s) in ${(0, js_lib_1._since)(started)}`);
         }
     }
     /**
@@ -309,7 +307,7 @@ class CommonDao {
         const stream = this.cfg.db.streamQuery(q, opt);
         if (partialQuery || opt.raw)
             return stream;
-        return stream.pipe(nodejs_lib_1.transformMapSimple(dbm => this.anyToDBM(dbm, opt), {
+        return stream.pipe((0, nodejs_lib_1.transformMapSimple)(dbm => this.anyToDBM(dbm, opt), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         }));
     }
@@ -329,7 +327,7 @@ class CommonDao {
             // optimization: 1 validation is enough
             // .pipe(transformMap<any, DBM>(dbm => this.anyToDBM(dbm, opt), safeOpt))
             // .pipe(transformMap<DBM, Saved<BM>>(dbm => this.dbmToBM(dbm, opt), safeOpt))
-            .pipe(nodejs_lib_1.transformMapSimple(dbm => this.dbmToBM(dbm, opt), {
+            .pipe((0, nodejs_lib_1.transformMapSimple)(dbm => this.dbmToBM(dbm, opt), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         })));
     }
@@ -341,7 +339,7 @@ class CommonDao {
     streamQueryIds(q, opt = {}) {
         q.table = opt.table || q.table;
         opt.errorMode || (opt.errorMode = js_lib_1.ErrorMode.SUPPRESS);
-        return this.cfg.db.streamQuery(q.select(['id']), opt).pipe(nodejs_lib_1.transformMapSimple(objectWithId => objectWithId.id, {
+        return this.cfg.db.streamQuery(q.select(['id']), opt).pipe((0, nodejs_lib_1.transformMapSimple)(objectWithId => objectWithId.id, {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         }));
     }
@@ -351,23 +349,23 @@ class CommonDao {
         const op = `streamQueryIdsForEach(${q.pretty()})`;
         const started = this.logStarted(op, q.table, true);
         let count = 0;
-        await nodejs_lib_1._pipeline([
+        await (0, nodejs_lib_1._pipeline)([
             this.cfg.db.streamQuery(q.select(['id']), opt),
-            nodejs_lib_1.transformMapSimple(objectWithId => objectWithId.id),
-            nodejs_lib_1.transformTap(() => count++),
-            nodejs_lib_1.transformMap(mapper, {
+            (0, nodejs_lib_1.transformMapSimple)(objectWithId => objectWithId.id),
+            (0, nodejs_lib_1.transformTap)(() => count++),
+            (0, nodejs_lib_1.transformMap)(mapper, {
                 ...opt,
                 predicate: js_lib_1._passthroughPredicate,
             }),
             // LogProgress should be AFTER the mapper, to be able to report correct stats
-            nodejs_lib_1.transformLogProgress({
+            (0, nodejs_lib_1.transformLogProgress)({
                 metric: q.table,
                 ...opt,
             }),
-            nodejs_lib_1.writableVoid(),
+            (0, nodejs_lib_1.writableVoid)(),
         ]);
         if (this.cfg.logLevel >= common_dao_model_1.CommonDaoLogLevel.OPERATIONS) {
-            log(`<< ${q.table}.${op}: ${count} id(s) in ${js_lib_1._since(started)}`);
+            log(`<< ${q.table}.${op}: ${count} id(s) in ${(0, js_lib_1._since)(started)}`);
         }
     }
     assignIdCreatedUpdated(obj, opt = {}) {
@@ -466,7 +464,7 @@ class CommonDao {
         const dbms = this.bmsToDBM(bms, opt);
         if (opt.ensureUniqueId)
             throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
-        const op = `saveBatch ${dbms.length} row(s) (${js_lib_1._truncate(dbms
+        const op = `saveBatch ${dbms.length} row(s) (${(0, js_lib_1._truncate)(dbms
             .slice(0, 10)
             .map(bm => bm.id)
             .join(', '), 50)})`;
@@ -487,7 +485,7 @@ class CommonDao {
             if (opt.ensureUniqueId)
                 throw new js_lib_1.AppError('ensureUniqueId is not supported in saveBatch');
         }
-        const op = `saveBatchAsDBM ${dbms.length} row(s) (${js_lib_1._truncate(dbms
+        const op = `saveBatchAsDBM ${dbms.length} row(s) (${(0, js_lib_1._truncate)(dbms
             .slice(0, 10)
             .map(bm => bm.id)
             .join(', '), 50)})`;
@@ -613,14 +611,15 @@ class CommonDao {
     /**
      * Returns *converted value*.
      * Validates (unless `skipValidation=true` passed).
-     * Throws only if `throwOnError=true` passed OR if `env().throwOnEntityValidationError`
+     *
+     * Does NOT mutate the object.
      */
     validateAndConvert(obj, schema, modelType, opt = {}) {
         // `raw` option completely bypasses any processing
         if (opt.raw)
             return obj;
         // Filter null and undefined values
-        obj = js_lib_1._filterNullishValues(obj);
+        obj = (0, js_lib_1._filterNullishValues)(obj);
         // Pre-validation hooks
         if (modelType === db_model_1.DBModelType.DBM) {
             obj = this.cfg.hooks.beforeDBMValidate(obj);
@@ -631,27 +630,36 @@ class CommonDao {
         }
         // This will Convert and Validate
         const table = opt.table || this.cfg.table;
-        const { value, error } = nodejs_lib_1.getValidationResult(obj, schema, table + (modelType || ''));
+        const objectName = table + (modelType || '');
+        let error;
+        let convertedValue;
+        if (schema instanceof nodejs_lib_1.AjvSchema) {
+            // Ajv schema
+            convertedValue = obj; // because Ajv mutates original object
+            error = schema.getValidationError(obj, {
+                objectName,
+            });
+        }
+        else {
+            // Joi
+            const vr = (0, nodejs_lib_1.getValidationResult)(obj, schema, objectName);
+            error = vr.error;
+            convertedValue = vr.value;
+        }
         // If we care about validation and there's an error
         if (error && !opt.skipValidation) {
-            if (opt.throwOnError ||
-                (this.cfg.throwOnEntityValidationError && opt.throwOnError === undefined)) {
-                throw error;
-            }
-            else {
-                // capture by Sentry and ignore the error
-                // It will still *convert* the value and return.
-                this.cfg.onValidationError?.(error);
-            }
+            const processedError = this.cfg.hooks.onValidationError(error);
+            if (processedError)
+                throw processedError;
         }
-        return value; // converted value
+        return convertedValue;
     }
     async getTableSchema() {
         return await this.cfg.db.getTableSchema(this.cfg.table);
     }
     async createTable(schema, opt) {
         this.requireWriteAccess();
-        await this.cfg.db.createTable(schema, opt);
+        await this.cfg.db.createTable(this.cfg.table, schema, opt);
     }
     /**
      * Proxy to this.cfg.db.ping
@@ -684,12 +692,12 @@ class CommonDao {
         else {
             logRes = `undefined`;
         }
-        log(...[`<< ${table}.${op}: ${logRes} in ${js_lib_1._since(started)}`].concat(args));
+        log(...[`<< ${table}.${op}: ${logRes} in ${(0, js_lib_1._since)(started)}`].concat(args));
     }
     logSaveResult(started, op, table) {
         if (!this.cfg.logLevel)
             return;
-        log(`<< ${table}.${op} in ${js_lib_1._since(started)}`);
+        log(`<< ${table}.${op} in ${(0, js_lib_1._since)(started)}`);
     }
     logStarted(op, table, force = false) {
         if (this.cfg.logStarted || force) {

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

@@ -1,15 +1,15 @@
 import { ErrorMode } from '@naturalcycles/js-lib';
-import { JoiValidationError, ObjectSchemaTyped, TransformLogProgressOptions } from '@naturalcycles/nodejs-lib';
+import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchemaTyped, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { CommonDB } from '../common.db';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, ObjectWithId } from '../db.model';
 export declare type CommonDaoCreateIdHook<BM, DBM> = (obj: DBM | BM) => string;
 export declare type CommonDaoParseNaturalIdHook<DBM> = (id: string) => Partial<DBM>;
 export declare type CommonDaoBeforeCreateHook<BM> = (bm: Partial<BM>) => BM;
-export declare type CommonDaoBeforeDBMValidateHook<DBM> = (dbm: DBM) => DBM;
-export declare type CommonDaoBeforeDBMToBMHook<BM, DBM> = (dbm: DBM) => BM;
-export declare type CommonDaoBeforeBMToDBMHook<BM, DBM> = (bm: BM) => DBM;
-export declare type CommonDaoBeforeTMToBMHook<BM, TM> = (tm: TM) => BM;
-export declare type CommonDaoBeforeBMToTMHook<BM, TM> = (bm: BM) => TM;
+export declare type CommonDaoBeforeDBMValidateHook<DBM> = (dbm: Partial<DBM>) => Partial<DBM>;
+export declare type CommonDaoBeforeDBMToBMHook<BM, DBM> = (dbm: DBM) => Partial<BM>;
+export declare type CommonDaoBeforeBMToDBMHook<BM, DBM> = (bm: BM) => Partial<DBM>;
+export declare type CommonDaoBeforeTMToBMHook<BM, TM> = (tm: TM) => Partial<BM>;
+export declare type CommonDaoBeforeBMToTMHook<BM, TM> = (bm: BM) => Partial<TM>;
 export declare type CommonDaoAnonymizeHook<DBM> = (dbm: DBM) => DBM;
 interface CommonDaoHooks<BM, DBM, TM> {
     createId: CommonDaoCreateIdHook<BM, DBM>;
@@ -21,6 +21,13 @@ interface CommonDaoHooks<BM, DBM, TM> {
     beforeTMToBM: CommonDaoBeforeTMToBMHook<BM, TM>;
     beforeBMToTM: CommonDaoBeforeBMToTMHook<BM, TM>;
     anonymize: CommonDaoAnonymizeHook<DBM>;
+    /**
+     * If hook is defined - allows to prevent or modify the error thrown.
+     * Return `false` to prevent throwing an error.
+     * Return original `err` to pass the error through (will be thrown in CommonDao).
+     * Return modified/new `Error` if needed.
+     */
+    onValidationError: (err: JoiValidationError | AjvValidationError) => Error | false;
 }
 export declare enum CommonDaoLogLevel {
     /**
@@ -34,9 +41,12 @@ export declare enum CommonDaoLogLevel {
 export interface CommonDaoCfg<BM extends Partial<ObjectWithId>, DBM extends ObjectWithId, TM> {
     db: CommonDB;
     table: string;
-    dbmSchema?: ObjectSchemaTyped<DBM>;
-    bmSchema?: ObjectSchemaTyped<BM>;
-    tmSchema?: ObjectSchemaTyped<TM>;
+    /**
+     * Joi or AjvSchema are supported.
+     */
+    dbmSchema?: ObjectSchemaTyped<DBM> | AjvSchema<DBM>;
+    bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM>;
+    tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM>;
     excludeFromIndexes?: string[];
     /**
      * @default to false
@@ -51,19 +61,6 @@ export interface CommonDaoCfg<BM extends Partial<ObjectWithId>, DBM extends Obje
      * @default false
      */
     logStarted?: boolean;
-    /**
-     * @default false
-     */
-    throwOnEntityValidationError?: boolean;
-    /**
-     * @default to throwOnEntityValidationError setting
-     */
-    throwOnDaoCreateObject?: boolean;
-    /**
-     * Called when validation error occurs.
-     * Called ONLY when error is NOT thrown (when throwOnEntityValidationError is off)
-     */
-    onValidationError?: (err: JoiValidationError) => any;
     hooks?: Partial<CommonDaoHooks<BM, DBM, TM>>;
     /**
      * @default true
@@ -99,10 +96,6 @@ export interface CommonDaoOptions extends CommonDBOptions {
      * @default false
      */
     raw?: boolean;
-    /**
-     * @default inherited from CommonDaoCfg.throwOnEntityValidationError
-     */
-    throwOnError?: boolean;
     /**
      * @default false
      */
@@ -135,7 +128,7 @@ export interface CommonDaoSaveOptions extends CommonDaoOptions, CommonDBSaveOpti
      */
     ensureUniqueId?: boolean;
 }
-export interface CommonDaoStreamForEachOptions<IN> extends CommonDaoStreamOptions, TransformLogProgressOptions<IN> {
+export interface CommonDaoStreamForEachOptions<IN> extends CommonDaoStreamOptions, TransformMapOptions<IN, any>, TransformLogProgressOptions<IN> {
 }
 export interface CommonDaoStreamOptions extends CommonDaoOptions {
     /**

package/dist/db.model.js

@@ -13,13 +13,13 @@ var DBModelType;
     DBModelType["BM"] = "BM";
     DBModelType["TM"] = "TM";
 })(DBModelType = exports.DBModelType || (exports.DBModelType = {}));
-exports.baseDBEntitySchema = nodejs_lib_1.objectSchema({
+exports.baseDBEntitySchema = (0, nodejs_lib_1.objectSchema)({
     id: nodejs_lib_1.stringSchema.optional(),
     created: nodejs_lib_1.unixTimestampSchema.optional(),
     updated: nodejs_lib_1.unixTimestampSchema.optional(),
     // _ver: verSchema.optional(),
 });
-exports.savedDBEntitySchema = nodejs_lib_1.objectSchema({
+exports.savedDBEntitySchema = (0, nodejs_lib_1.objectSchema)({
     id: nodejs_lib_1.stringSchema,
     created: nodejs_lib_1.unixTimestampSchema,
     updated: nodejs_lib_1.unixTimestampSchema,

package/dist/getDB.js

@@ -18,15 +18,15 @@ function getDB(index = 1) {
 }
 exports.getDB = getDB;
 // Extra function to provide index=1 as default (since memo doesn't work well with default arguments)
-const _getDB = js_lib_1._memoFn((index) => {
+const _getDB = (0, js_lib_1._memoFn)((index) => {
     const libName = process.env[`DB${index}`];
     if (!libName) {
-        throw new Error(`getDB(${colors_1.yellow(index)}), but process.env.${colors_1.white('DB' + index)} is not defined!`);
+        throw new Error(`getDB(${(0, colors_1.yellow)(index)}), but process.env.${(0, colors_1.white)('DB' + index)} is not defined!`);
     }
     const lib = require(libName);
     if (!lib.getDBAdapter) {
         throw new Error(`DB${index}=${libName}, but require('${libName}').getDBAdapter() is not defined`);
     }
-    const cfg = nodejs_lib_1.secretOptional(`SECRET_DB${index}`);
+    const cfg = (0, nodejs_lib_1.secretOptional)(`SECRET_DB${index}`);
     return lib.getDBAdapter(cfg);
 });

package/dist/index.d.ts

@@ -15,9 +15,7 @@ import { dbPipelineBackup, DBPipelineBackupOptions } from './pipeline/dbPipeline
 import { dbPipelineCopy, DBPipelineCopyOptions } from './pipeline/dbPipelineCopy';
 import { dbPipelineRestore, DBPipelineRestoreOptions } from './pipeline/dbPipelineRestore';
 import { DBQuery, DBQueryFilter, DBQueryFilterOperator, DBQueryFilterOperatorValues, DBQueryOrder, RunnableDBQuery } from './query/dbQuery';
-import { CommonSchema, CommonSchemaField, DATA_TYPE } from './schema/common.schema';
-import { CommonSchemaGenerator, CommonSchemaGeneratorCfg } from './schema/commonSchemaGenerator';
 import { DBTransaction, RunnableDBTransaction } from './transaction/dbTransaction';
 import { commitDBTransactionSimple, mergeDBOperations } from './transaction/dbTransaction.util';
-export type { DBQueryFilterOperator, DBQueryFilter, DBQueryOrder, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBCreateOptions, CommonDB, RunQueryResult, CreatedUpdated, CreatedUpdatedId, CreatedUpdatedVer, ObjectWithId, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CommonDaoCfg, CommonDaoCreateIdHook, CommonDaoParseNaturalIdHook, CommonDaoBeforeCreateHook, CommonDaoBeforeDBMValidateHook, CommonDaoBeforeDBMToBMHook, CommonDaoBeforeBMToDBMHook, CommonDaoBeforeTMToBMHook, CommonDaoBeforeBMToTMHook, CommonDaoAnonymizeHook, InMemoryDBCfg, InMemoryKeyValueDBCfg, DBPipelineBackupOptions, DBPipelineRestoreOptions, DBPipelineCopyOptions, CommonSchema, CommonSchemaField, CommonSchemaGeneratorCfg, CommonDBAdapter, DBOperation, DBSaveBatchOperation, DBDeleteByIdsOperation, CommonKeyValueDB, CommonKeyValueDaoCfg, KeyValueDBTuple, };
-export { DBQuery, DBQueryFilterOperatorValues, RunnableDBQuery, CommonDaoLogLevel, DBRelation, DBModelType, baseDBEntitySchema, savedDBEntitySchema, CommonDao, createdUpdatedFields, createdUpdatedIdFields, idField, InMemoryDB, InMemoryKeyValueDB, queryInMemory, serializeJsonField, deserializeJsonField, dbPipelineBackup, dbPipelineRestore, dbPipelineCopy, DATA_TYPE, getDB, DBLibError, BaseCommonDB, DBTransaction, RunnableDBTransaction, mergeDBOperations, commitDBTransactionSimple, CommonSchemaGenerator, CommonKeyValueDao, };
+export type { DBQueryFilterOperator, DBQueryFilter, DBQueryOrder, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBCreateOptions, CommonDB, RunQueryResult, CreatedUpdated, CreatedUpdatedId, CreatedUpdatedVer, ObjectWithId, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CommonDaoCfg, CommonDaoCreateIdHook, CommonDaoParseNaturalIdHook, CommonDaoBeforeCreateHook, CommonDaoBeforeDBMValidateHook, CommonDaoBeforeDBMToBMHook, CommonDaoBeforeBMToDBMHook, CommonDaoBeforeTMToBMHook, CommonDaoBeforeBMToTMHook, CommonDaoAnonymizeHook, InMemoryDBCfg, InMemoryKeyValueDBCfg, DBPipelineBackupOptions, DBPipelineRestoreOptions, DBPipelineCopyOptions, CommonDBAdapter, DBOperation, DBSaveBatchOperation, DBDeleteByIdsOperation, CommonKeyValueDB, CommonKeyValueDaoCfg, KeyValueDBTuple, };
+export { DBQuery, DBQueryFilterOperatorValues, RunnableDBQuery, CommonDaoLogLevel, DBRelation, DBModelType, baseDBEntitySchema, savedDBEntitySchema, CommonDao, createdUpdatedFields, createdUpdatedIdFields, idField, InMemoryDB, InMemoryKeyValueDB, queryInMemory, serializeJsonField, deserializeJsonField, dbPipelineBackup, dbPipelineRestore, dbPipelineCopy, getDB, DBLibError, BaseCommonDB, DBTransaction, RunnableDBTransaction, mergeDBOperations, commitDBTransactionSimple, CommonKeyValueDao, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonKeyValueDao = exports.CommonSchemaGenerator = exports.commitDBTransactionSimple = exports.mergeDBOperations = exports.RunnableDBTransaction = exports.DBTransaction = exports.BaseCommonDB = exports.DBLibError = exports.getDB = exports.DATA_TYPE = exports.dbPipelineCopy = exports.dbPipelineRestore = exports.dbPipelineBackup = exports.deserializeJsonField = exports.serializeJsonField = exports.queryInMemory = exports.InMemoryKeyValueDB = exports.InMemoryDB = exports.idField = exports.createdUpdatedIdFields = exports.createdUpdatedFields = exports.CommonDao = exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.DBModelType = exports.DBRelation = exports.CommonDaoLogLevel = exports.RunnableDBQuery = exports.DBQueryFilterOperatorValues = exports.DBQuery = void 0;
+exports.CommonKeyValueDao = exports.commitDBTransactionSimple = exports.mergeDBOperations = exports.RunnableDBTransaction = exports.DBTransaction = exports.BaseCommonDB = exports.DBLibError = exports.getDB = exports.dbPipelineCopy = exports.dbPipelineRestore = exports.dbPipelineBackup = exports.deserializeJsonField = exports.serializeJsonField = exports.queryInMemory = exports.InMemoryKeyValueDB = exports.InMemoryDB = exports.idField = exports.createdUpdatedIdFields = exports.createdUpdatedFields = exports.CommonDao = exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.DBModelType = exports.DBRelation = exports.CommonDaoLogLevel = exports.RunnableDBQuery = exports.DBQueryFilterOperatorValues = exports.DBQuery = void 0;
 const inMemory_db_1 = require("./adapter/inmemory/inMemory.db");
 Object.defineProperty(exports, "InMemoryDB", { enumerable: true, get: function () { return inMemory_db_1.InMemoryDB; } });
 const inMemoryKeyValueDB_1 = require("./adapter/inmemory/inMemoryKeyValueDB");
@@ -40,10 +40,6 @@ const dbQuery_1 = require("./query/dbQuery");
 Object.defineProperty(exports, "DBQuery", { enumerable: true, get: function () { return dbQuery_1.DBQuery; } });
 Object.defineProperty(exports, "DBQueryFilterOperatorValues", { enumerable: true, get: function () { return dbQuery_1.DBQueryFilterOperatorValues; } });
 Object.defineProperty(exports, "RunnableDBQuery", { enumerable: true, get: function () { return dbQuery_1.RunnableDBQuery; } });
-const common_schema_1 = require("./schema/common.schema");
-Object.defineProperty(exports, "DATA_TYPE", { enumerable: true, get: function () { return common_schema_1.DATA_TYPE; } });
-const commonSchemaGenerator_1 = require("./schema/commonSchemaGenerator");
-Object.defineProperty(exports, "CommonSchemaGenerator", { enumerable: true, get: function () { return commonSchemaGenerator_1.CommonSchemaGenerator; } });
 const dbTransaction_1 = require("./transaction/dbTransaction");
 Object.defineProperty(exports, "DBTransaction", { enumerable: true, get: function () { return dbTransaction_1.DBTransaction; } });
 Object.defineProperty(exports, "RunnableDBTransaction", { enumerable: true, get: function () { return dbTransaction_1.RunnableDBTransaction; } });

package/dist/kv/commonKeyValueDao.js

@@ -25,7 +25,7 @@ class CommonKeyValueDao {
         const entries = await this.cfg.db.getByIds(this.cfg.table, ids);
         if (!this.cfg.hooks?.mapBufferToValue)
             return entries;
-        return await js_lib_1.pMap(entries, async ([id, buf]) => [
+        return await (0, js_lib_1.pMap)(entries, async ([id, buf]) => [
             id,
             await this.cfg.hooks.mapBufferToValue(buf),
         ]);
@@ -39,7 +39,7 @@ class CommonKeyValueDao {
             bufferEntries = entries;
         }
         else {
-            bufferEntries = await js_lib_1.pMap(entries, async ([id, v]) => [
+            bufferEntries = await (0, js_lib_1.pMap)(entries, async ([id, v]) => [
                 id,
                 await this.cfg.hooks.mapValueToBuffer(v),
             ]);
@@ -58,7 +58,7 @@ class CommonKeyValueDao {
         }
         // todo: consider it when readableMap supports `errorMode: SUPPRESS`
         // readableMap(this.cfg.db.streamValues(this.cfg.table, limit), async buf => await this.cfg.hooks!.mapBufferToValue(buf))
-        return this.cfg.db.streamValues(this.cfg.table, limit).pipe(nodejs_lib_1.transformMap(async (buf) => await this.cfg.hooks.mapBufferToValue(buf), {
+        return this.cfg.db.streamValues(this.cfg.table, limit).pipe((0, nodejs_lib_1.transformMap)(async (buf) => await this.cfg.hooks.mapBufferToValue(buf), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
         }));
     }
@@ -66,7 +66,7 @@ class CommonKeyValueDao {
         if (!this.cfg.hooks?.mapBufferToValue) {
             return this.cfg.db.streamEntries(this.cfg.table, limit);
         }
-        return this.cfg.db.streamEntries(this.cfg.table, limit).pipe(nodejs_lib_1.transformMap(async ([id, buf]) => [id, await this.cfg.hooks.mapBufferToValue(buf)], {
+        return this.cfg.db.streamEntries(this.cfg.table, limit).pipe((0, nodejs_lib_1.transformMap)(async ([id, buf]) => [id, await this.cfg.hooks.mapBufferToValue(buf)], {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe cannot propagate errors
         }));
     }

package/dist/model.util.js

@@ -14,14 +14,14 @@ function createdUpdatedIdFields(existingObject) {
     const now = Math.floor(Date.now() / 1000);
     return {
         created: existingObject?.created || now,
-        id: existingObject?.id || nodejs_lib_1.stringId(),
+        id: existingObject?.id || (0, nodejs_lib_1.stringId)(),
         updated: now,
     };
 }
 exports.createdUpdatedIdFields = createdUpdatedIdFields;
 function idField(existingObject) {
     return {
-        id: existingObject?.id || nodejs_lib_1.stringId(),
+        id: existingObject?.id || (0, nodejs_lib_1.stringId)(),
     };
 }
 exports.idField = idField;

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -76,7 +76,6 @@ export interface DBPipelineBackupOptions extends TransformLogProgressOptions {
      * @default false
      * If true - will use CommonSchemaGenerator to detect schema from input data.
      */
-    emitSchemaFromData?: boolean;
     /**
      * @default false
      * If true - will use CommonDB.getTableSchema() and emit schema.

package/dist/pipeline/dbPipelineBackup.js

@@ -8,7 +8,6 @@ const time_lib_1 = require("@naturalcycles/time-lib");
 const fs = require("fs-extra");
 const zlib_1 = require("zlib");
 const index_1 = require("../index");
-const commonSchemaGenerator_1 = require("../schema/commonSchemaGenerator");
 // const log = Debug('nc:db-lib:pipeline')
 /**
  * Pipeline from input stream(s) to a NDJSON file (optionally gzipped).
@@ -20,19 +19,19 @@ const commonSchemaGenerator_1 = require("../schema/commonSchemaGenerator");
  * 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, sinceUpdated, outputDirPath, protectFromOverwrite = false, zlibOptions, mapperPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, emitSchemaFromDB = false, emitSchemaFromData = false, sortObjects = false, } = opt;
+    const { db, concurrency = 16, limit = 0, sinceUpdated, outputDirPath, protectFromOverwrite = false, zlibOptions, mapperPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, emitSchemaFromDB = false, sortObjects = false, } = opt;
     const strict = errorMode !== js_lib_1.ErrorMode.SUPPRESS;
     const gzip = opt.gzip !== false; // default to true
     let { tables } = opt;
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + colors_1.grey(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
-    console.log(`>> ${colors_1.dimWhite('dbPipelineBackup')} started in ${colors_1.grey(outputDirPath)}...${sinceUpdatedStr}`);
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
+    console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineBackup')} started in ${(0, colors_1.grey)(outputDirPath)}...${sinceUpdatedStr}`);
     fs.ensureDirSync(outputDirPath);
     if (!tables) {
         tables = await db.getTables();
     }
-    console.log(`${colors_1.yellow(tables.length)} ${colors_1.boldWhite('table(s)')}:\n` + tables.join('\n'));
+    console.log(`${(0, colors_1.yellow)(tables.length)} ${(0, colors_1.boldWhite)('table(s)')}:\n` + tables.join('\n'));
     const statsPerTable = {};
-    await js_lib_1.pMap(tables, async (table) => {
+    await (0, js_lib_1.pMap)(tables, async (table) => {
         let q = index_1.DBQuery.create(table).limit(limit);
         if (sinceUpdated) {
             q = q.filter('updated', '>=', sinceUpdated);
@@ -45,35 +44,30 @@ async function dbPipelineBackup(opt) {
         const started = Date.now();
         let rows = 0;
         await fs.ensureFile(filePath);
-        console.log(`>> ${colors_1.grey(filePath)} started...`);
+        console.log(`>> ${(0, colors_1.grey)(filePath)} started...`);
         if (emitSchemaFromDB) {
             const schema = await db.getTableSchema(table);
             await fs.writeJson(schemaFilePath, schema, { spaces: 2 });
-            console.log(`>> ${colors_1.grey(schemaFilePath)} saved (generated from DB)`);
+            console.log(`>> ${(0, colors_1.grey)(schemaFilePath)} saved (generated from DB)`);
         }
-        const schemaGen = emitSchemaFromData
-            ? new commonSchemaGenerator_1.CommonSchemaGenerator({ table, sortedFields: true })
-            : undefined;
-        await nodejs_lib_1._pipeline([
+        await (0, nodejs_lib_1._pipeline)([
             db.streamQuery(q),
-            nodejs_lib_1.transformLogProgress({
+            (0, nodejs_lib_1.transformLogProgress)({
                 logEvery: 1000,
                 ...opt,
                 metric: table,
             }),
-            nodejs_lib_1.transformMap(mapperPerTable[table] || js_lib_1._passthroughMapper, {
+            (0, nodejs_lib_1.transformMap)(mapperPerTable[table] || js_lib_1._passthroughMapper, {
                 errorMode,
                 flattenArrayOutput: true,
                 ...transformMapOptions,
                 metric: table,
             }),
-            nodejs_lib_1.transformTap(row => {
+            (0, nodejs_lib_1.transformTap)(() => {
                 rows++;
-                if (schemaGen)
-                    schemaGen.add(row);
             }),
-            nodejs_lib_1.transformToNDJson({ strict, sortObjects }),
-            ...(gzip ? [zlib_1.createGzip(zlibOptions)] : []),
+            (0, nodejs_lib_1.transformToNDJson)({ strict, sortObjects }),
+            ...(gzip ? [(0, zlib_1.createGzip)(zlibOptions)] : []),
             fs.createWriteStream(filePath),
         ]);
         const { size: sizeBytes } = await fs.stat(filePath);
@@ -82,12 +76,7 @@ async function dbPipelineBackup(opt) {
             rows,
             sizeBytes,
         });
-        console.log(`>> ${colors_1.grey(filePath)}\n` + stats.toPretty());
-        if (schemaGen) {
-            const schema = schemaGen.generate();
-            await fs.writeJson(schemaFilePath, schema, { spaces: 2 });
-            console.log(`>> ${colors_1.grey(schemaFilePath)} saved (generated from data)`);
-        }
+        console.log(`>> ${(0, colors_1.grey)(filePath)}\n` + stats.toPretty());
         statsPerTable[table] = stats;
     }, { concurrency, errorMode });
     const statsTotal = nodejs_lib_1.NDJsonStats.createCombined(Object.values(statsPerTable));