@samet-it/be-db-common 1.1.9 → 1.3.2

package/dist/connection/db.connection.d.ts

@@ -1,5 +1,5 @@
-import type { DbConnectionLike, DbConnOpt, DbOnAfter, DbConnProps, DbEvent } from "./index.types";
-import type { Logger } from "@leyyo/common";
+import { DbConnectionLike, DbConnOpt, DbOnAfter, DbConnProps, DbEvent } from "./index.types";
+import { Logger } from "@leyyo/common";
 /**
  * DB connection abstract class
  *

package/dist/connection/db.connection.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbConnection = void 0;
-const be_base_common_1 = require("@samet-it/be-base-common");
 const type_1 = require("@leyyo/type");
+const common_1 = require("@leyyo/common");
 // noinspection JSUnusedGlobalSymbols
 /**
  * DB connection abstract class
@@ -43,10 +43,10 @@ class DbConnection {
          * Option of in-body usage in place of constructor param
          * */
         this._opt = {};
-        if (!(0, type_1.isObjectBare)(this._opt)) {
+        if (!(0, type_1.isBareObject)(this._opt)) {
             this._opt = {};
         }
-        if ((0, type_1.isObjectBare)(opt)) {
+        if ((0, type_1.isBareObject)(opt)) {
             this._opt = Object.assign(Object.assign({}, this._opt), opt);
         }
         this._props = Object.assign(Object.assign({}, this._opt), { connectTryCount: 0, pingTryCount: 0 });
@@ -70,7 +70,7 @@ class DbConnection {
         }
         else {
             fn().then().catch(e => {
-                this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'on', name));
+                this.logger.warn(common_1.errorCommon.text(e, 'on', name));
                 if (throwable) {
                     throw e;
                 }
@@ -88,7 +88,7 @@ class DbConnection {
         if (items.length > 0) {
             items.forEach(fn => {
                 fn().then().catch(e => {
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'trigger', 'on', name));
+                    this.logger.warn(common_1.errorCommon.text(e, 'trigger', 'on', name));
                     if (throwable) {
                         throw e;
                     }

package/dist/error/db-execute.error.d.ts

@@ -1,4 +1,4 @@
-import type { Opt } from "@leyyo/common";
+import { Opt } from "@leyyo/common";
 import { DbError } from "./db.error";
 /**
  * DB execute error during run sql

package/dist/error/db-invalid-value.error.d.ts

@@ -1,4 +1,4 @@
-import type { Opt } from "@leyyo/common";
+import { Opt } from "@leyyo/common";
 import { DbError } from "./db.error";
 /**
  * Cache validation error

package/dist/error/db-not-supported.error.d.ts

@@ -1,5 +1,5 @@
 import { DbError } from "./db.error";
-import type { Opt } from "@leyyo/common";
+import { Opt } from "@leyyo/common";
 /**
  * DB not-supported error
  * */

package/dist/line/db-lines.impl.d.ts

@@ -1,4 +1,4 @@
-import type { DbLines } from "./index.types";
+import { DbLines } from "./index.types";
 /**
  * Create new/empty sql lines
  *

package/dist/repo/db.repo.d.ts

@@ -1,10 +1,10 @@
 import { DbCheckKeysResult, DbRepoProps, DbRepoLike, DbRepoOpt, UrnDelimiter, DbCheckKeysTuple, DbExecOpt, DbMeta, DbRepoExtensionLambda, DbQueryResultOne, DbQueryResultMore } from "./index.types";
 import { DefDims, Entity, IdDocLike, Pair, Portion, UrnDocLike, UrnTuple, View } from "@samet-it/be-base-common";
 import { DbConnectionLike, UserFetcherLambda } from "../connection";
-import type { KeyValue, Logger, Opt, StrKey } from "@leyyo/common";
-import { type QueryAny, type QueryRegular } from "@leyyo/query";
-import type { CacheConnectionLike, CacheChannelLike, CacheExecOpt } from "@samet-it/be-cache-common";
-import type { DbLines } from "../line";
+import { KeyValue, Logger, Opt, StrKey } from "@leyyo/common";
+import { QueryAny, QueryRegular } from "@leyyo/query";
+import { CacheConnectionLike, CacheChannelLike, CacheExecOpt } from "@samet-it/be-cache-common";
+import { DbLines } from "../line";
 /**
  * DB repository abstract class
  *
@@ -272,15 +272,19 @@ export declare abstract class DbRepo<CONN extends DbConnectionLike, OPT extends
     getDim<R extends IdDocLike<ID>>(key: PORTION | KeyValue, dim?: DIMS): Promise<R>;
     /** @inheritDoc */
     listDims<R extends IdDocLike<ID>>(keys: Array<PORTION | KeyValue>, dim?: DIMS, ignoreCheck?: boolean): Promise<Array<R>>;
+    toPair(doc: ENT): Promise<PAIR>;
     /** @inheritDoc */
     getPair(key: PORTION | KeyValue): Promise<PAIR>;
     /** @inheritDoc */
     listPairs(keys: Array<PORTION | KeyValue>, ignoreCheck?: boolean): Promise<Array<PAIR>>;
+    toView(doc: ENT): Promise<VIEW>;
     /** @inheritDoc */
     getView(key: PORTION | KeyValue): Promise<VIEW>;
     /** @inheritDoc */
     listViews(keys: Array<PORTION | KeyValue>, ignoreCheck?: boolean): Promise<Array<VIEW>>;
     /** @inheritDoc */
+    toPortion(doc: ENT): Promise<PORTION>;
+    /** @inheritDoc */
     getPortion(key: PORTION | KeyValue): Promise<PORTION>;
     /** @inheritDoc */
     listPortions(keys: Array<PORTION | KeyValue>, ignoreCheck?: boolean): Promise<Array<PORTION>>;

package/dist/repo/db.repo.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbRepo = void 0;
 const node_crypto_1 = require("node:crypto");
 const be_base_common_1 = require("@samet-it/be-base-common");
+const common_1 = require("@leyyo/common");
 const query_1 = require("@leyyo/query");
 const type_1 = require("@leyyo/type");
 const error_1 = require("../error");
@@ -47,13 +48,13 @@ class DbRepo {
          * Option of in-body usage in place of constructor param
          * */
         this._opt = {};
-        if (!(0, type_1.isObjectFilled)(conn)) {
+        if (!(0, common_1.isFilledObj)(conn)) {
             throw new error_1.DbInvalidValueError('Connection', { where: 'DbRepo', method: 'constructor', type: typeof conn });
         }
-        if (!(0, type_1.isObjectBare)(this._opt)) {
+        if (!(0, type_1.isBareObject)(this._opt)) {
             this._opt = {};
         }
-        if ((0, type_1.isObjectBare)(opt)) {
+        if ((0, type_1.isBareObject)(opt)) {
             this._opt = Object.assign(Object.assign({}, this._opt), opt);
         }
         this._checkOptions();
@@ -421,18 +422,18 @@ class DbRepo {
         }
         if (opt === null || opt === void 0 ? void 0 : opt.silent) {
             if (size < 100) {
-                this.logger.warn(be_base_common_1.errorHandler.common.logText(err, ((_b = opt.name) !== null && _b !== void 0 ? _b : 'Database error'), size));
+                this.logger.warn(common_1.errorCommon.text(err, ((_b = opt.name) !== null && _b !== void 0 ? _b : 'Database error'), size));
             }
             return;
         }
         if (size < 100) {
-            this.logger.error(be_base_common_1.errorHandler.common.logText(err, ((_c = opt.name) !== null && _c !== void 0 ? _c : 'Database error'), size));
+            this.logger.error(common_1.errorCommon.text(err, ((_c = opt.name) !== null && _c !== void 0 ? _c : 'Database error'), size));
         }
         if (err instanceof error_1.DbError) {
             throw err;
         }
         else {
-            throw be_base_common_1.errorHandler.common.castForClass(error_1.DbError, err, { queryName: opt.name });
+            throw common_1.errorCommon.forcedCast(error_1.DbError, err, { queryName: opt.name });
         }
     }
     /** {@inheritDoc} */
@@ -532,7 +533,7 @@ class DbRepo {
                     found = yield this.cache.getByPrimary(key, opt);
                 }
                 catch (e) {
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'getByPrimary', 'cache', 'getByPrimary'));
+                    this.logger.warn(common_1.errorCommon.text(e, 'getByPrimary', 'cache', 'getByPrimary'));
                 }
                 if (found) {
                     return found;
@@ -542,7 +543,7 @@ class DbRepo {
             if (!opt.noCache && found && this.cache.isConnected) {
                 this.cache.ingestDoc(found, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'getByPrimary', 'cache', 'ingestDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'getByPrimary', 'cache', 'ingestDoc')));
             }
             return found;
         });
@@ -571,14 +572,14 @@ class DbRepo {
                     }
                 }
                 catch (e) {
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'getBySecondary', 'cache', 'getBySecondary'));
+                    this.logger.warn(common_1.errorCommon.text(e, 'getBySecondary', 'cache', 'getBySecondary'));
                 }
             }
             found = yield this.$getBySecondary(key, opt, true);
             if (found && this.cache.isConnected) {
                 this.cache.ingestDoc(found, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'getBySecondary', 'cache', 'ingestDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'getBySecondary', 'cache', 'ingestDoc')));
             }
             return found;
         });
@@ -616,7 +617,7 @@ class DbRepo {
                     }
                 }
                 catch (e) {
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'existsByPrimary', 'cache', 'getByPrimary'));
+                    this.logger.warn(common_1.errorCommon.text(e, 'existsByPrimary', 'cache', 'getByPrimary'));
                 }
             }
             return this.$existsByPrimary(key, opt, true);
@@ -645,7 +646,7 @@ class DbRepo {
                     }
                 }
                 catch (e) {
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'existsBySecondary', 'cache', 'getBySecondary'));
+                    this.logger.warn(common_1.errorCommon.text(e, 'existsBySecondary', 'cache', 'getBySecondary'));
                 }
             }
             return this.$existsBySecondary(key, opt, true);
@@ -672,7 +673,7 @@ class DbRepo {
                         founds = yield this.cache.getByPrimaryMore(result.urns, opt);
                     }
                     catch (e) {
-                        this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'list', 'cache', 'getByPrimary'));
+                        this.logger.warn(common_1.errorCommon.text(e, 'list', 'cache', 'getByPrimary'));
                     }
                     founds.forEach(val => {
                         const index = result.urns.indexOf(val.urn);
@@ -688,7 +689,7 @@ class DbRepo {
                         if (!opt.noCache && this.cache.isConnected) {
                             founds.forEach(found => this.cache.ingestDoc(found, opt)
                                 .then()
-                                .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'list', 'cache', 'ingestDoc'))));
+                                .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'list', 'cache', 'ingestDoc'))));
                         }
                         docs.push(...founds);
                     }
@@ -700,7 +701,7 @@ class DbRepo {
                         founds = yield this.cache.getBySecondaryMore(result.ids, opt);
                     }
                     catch (e) {
-                        this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'list', 'cache', 'getBySecondary'));
+                        this.logger.warn(common_1.errorCommon.text(e, 'list', 'cache', 'getBySecondary'));
                     }
                     founds.forEach(val => {
                         const index = result.ids.indexOf(val.id);
@@ -716,7 +717,7 @@ class DbRepo {
                         if (!opt.noCache && this.cache.isConnected) {
                             founds.forEach(found => this.cache.ingestDoc(found, opt)
                                 .then()
-                                .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'list', 'cache', 'ingestDoc'))));
+                                .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'list', 'cache', 'ingestDoc'))));
                         }
                         docs.push(...founds);
                     }
@@ -826,7 +827,7 @@ class DbRepo {
             if (!opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(replacedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'replace', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'replace', 'cache', 'clearDoc')));
             }
             return replacedKey;
         });
@@ -864,7 +865,7 @@ class DbRepo {
             if (!opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(createdKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'upsert', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'upsert', 'cache', 'clearDoc')));
             }
             return createdKey;
         });
@@ -919,7 +920,7 @@ class DbRepo {
             if (updatedKey && !opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(updatedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'updateByPrimary', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'updateByPrimary', 'cache', 'clearDoc')));
             }
             return updatedKey;
         });
@@ -962,7 +963,7 @@ class DbRepo {
             if (updatedKey && !opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(updatedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'updateBySecondary', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'updateBySecondary', 'cache', 'clearDoc')));
             }
             return updatedKey;
         });
@@ -1035,7 +1036,7 @@ class DbRepo {
             if (removedKey && !opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(removedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'removeByPrimary', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'removeByPrimary', 'cache', 'clearDoc')));
             }
             return removedKey;
         });
@@ -1061,7 +1062,7 @@ class DbRepo {
             if (removedKey && !opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(removedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'removeBySecondary', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'removeBySecondary', 'cache', 'clearDoc')));
             }
             return removedKey;
         });
@@ -1097,14 +1098,14 @@ class DbRepo {
             if (!ignoreCheck) {
                 (0, type_1.assertText)(key, Object.assign({ field: 'urn' }, param));
             }
-            if (!(0, type_1.isText)(opt.trashId)) {
+            if (!(0, common_1.isText)(opt.trashId)) {
                 opt.trashId = (0, node_crypto_1.randomUUID)();
             }
             const trashedKey = yield this.$trashByPrimary(key, opt, true);
             if (trashedKey && !opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(trashedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'trashByPrimary', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'trashByPrimary', 'cache', 'clearDoc')));
             }
             return trashedKey;
         });
@@ -1129,14 +1130,14 @@ class DbRepo {
             if (this.isIdSame) {
                 return this.trashByPrimary(this._keyToUrn(key), opt, ignoreCheck);
             }
-            if (!(0, type_1.isText)(opt.trashId)) {
+            if (!(0, common_1.isText)(opt.trashId)) {
                 opt.trashId = (0, node_crypto_1.randomUUID)();
             }
             const trashedKey = yield this.$trashBySecondary(key, opt, true);
             if (trashedKey && !opt.noCache && this.cache.isConnected) {
                 this.cache.clearDoc(trashedKey, opt)
                     .then()
-                    .catch(e => this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'trashBySecondary', 'cache', 'clearDoc')));
+                    .catch(e => this.logger.warn(common_1.errorCommon.text(e, 'trashBySecondary', 'cache', 'clearDoc')));
             }
             return trashedKey;
         });
@@ -1187,6 +1188,11 @@ class DbRepo {
     }
     // endregion dim
     // region pair
+    toPair(doc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.$toDim(doc, 'pair');
+        });
+    }
     /** @inheritDoc */
     getPair(key) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1201,6 +1207,11 @@ class DbRepo {
     }
     // endregion pair
     // region view
+    toView(doc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.$toDim(doc, 'view');
+        });
+    }
     /** @inheritDoc */
     getView(key) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1216,6 +1227,12 @@ class DbRepo {
     // endregion view
     // region portion
     /** @inheritDoc */
+    toPortion(doc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.$toDim(doc, 'portion');
+        });
+    }
+    /** @inheritDoc */
     getPortion(key) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.getDim(key, 'portion');

package/dist/repo/index.types.d.ts

@@ -1,9 +1,9 @@
-import type { DefDims, Entity, IdDocLike, Pair, Portion, UrnDef, UrnDocLike, UrnTuple, View } from "@samet-it/be-base-common";
-import type { DbConnectionLike, UserFetcherLambda } from "../connection";
-import type { QueryAny, QueryRegular } from "@leyyo/query";
-import type { CacheChannelLike, CacheConnectionLike, CacheExecOpt } from "@samet-it/be-cache-common";
-import type { KeyValue, OmitError, Opt, StrKey } from "@leyyo/common";
-import type { DbLines } from "../line";
+import { DefDims, Entity, IdDocLike, Pair, Portion, UrnDef, UrnDocLike, UrnTuple, View } from "@samet-it/be-base-common";
+import { DbConnectionLike, UserFetcherLambda } from "../connection";
+import { QueryAny, QueryRegular } from "@leyyo/query";
+import { CacheChannelLike, CacheConnectionLike, CacheExecOpt } from "@samet-it/be-cache-common";
+import { KeyValue, OmitError, Opt, StrKey } from "@leyyo/common";
+import { DbLines } from "../line";
 /**
  * DB repository interface
  *
@@ -662,6 +662,14 @@ export interface DbRepoLike<CONN extends DbConnectionLike, OPT extends DbExecOpt
      * @return {Promise<Array<IdDocLike>>} - dim objects
      * */
     listDims<R extends IdDocLike<ID>>(keys: Array<PORTION | KeyValue>, dim?: DIMS, ignoreCheck?: boolean): Promise<Array<R>>;
+    /**
+     * Convert document to pair
+     *
+     * @param {Entity} doc - document
+     * @return {Promise<Pair>} - pair object
+     * @async
+     * */
+    toPair(doc: ENT): Promise<PAIR>;
     /**
      * Get pair by key (primary or secondary)
      *
@@ -678,6 +686,14 @@ export interface DbRepoLike<CONN extends DbConnectionLike, OPT extends DbExecOpt
      * @return {Promise<Array<Pair>>} - pair objects
      * */
     listPairs(keys: Array<PORTION | KeyValue>, ignoreCheck?: boolean): Promise<Array<PAIR>>;
+    /**
+     * Convert document to view
+     *
+     * @param {Entity} doc - document
+     * @return {Promise<View>} - view object
+     * @async
+     * */
+    toView(doc: ENT): Promise<VIEW>;
     /**
      * Get view by key (primary or secondary)
      *
@@ -694,6 +710,14 @@ export interface DbRepoLike<CONN extends DbConnectionLike, OPT extends DbExecOpt
      * @return {Promise<Array<View>>} - view objects
      * */
     listViews(keys: Array<KeyValue>, ignoreCheck?: boolean): Promise<Array<VIEW>>;
+    /**
+     * Convert document to portion
+     *
+     * @param {Entity} doc - document
+     * @return {Promise<Portion>} - portion object
+     * @async
+     * */
+    toPortion(doc: ENT): Promise<PORTION>;
     /**
      * Get portion by key (primary or secondary)
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-db-common",
-  "version": "1.1.9",
+  "version": "1.3.2",
   "description": "Backend DB Common",
   "repository": {
     "type": "git",
@@ -64,10 +64,10 @@
     }
   },
   "dependencies": {
-    "@leyyo/common": "^1.2.4",
-    "@leyyo/query": "^1.2.2",
-    "@leyyo/type": "^1.1.1",
-    "@samet-it/be-base-common": "^1.1.5",
-    "@samet-it/be-cache-common": "^1.1.10"
+    "@leyyo/common": "^1.3.7",
+    "@leyyo/query": "^1.3.1",
+    "@leyyo/type": "^1.3.3",
+    "@samet-it/be-base-common": "^1.3.1",
+    "@samet-it/be-cache-common": "^1.3.1"
   }
 }