@samet-it/be-couchbase-common 1.1.7 → 1.1.9

package/dist/config/couchbase-common.config.js

@@ -9,12 +9,32 @@ const env_1 = require("@leyyo/env");
 exports.couchbaseCommonConfig = env_1.envCore.configure
     .scope('CouchbaseCommon', 'CB')
     .start()
-    .field('PROTOCOL').text().def('couchbase').end()
-    .field('HOST').text().required().end()
-    .field('PORT').integer().end()
-    .field('USER').text().required().end()
-    .field('PASS').text().required().end()
-    .field('BUCKET').text().required().end()
-    .field('SCOPE').text().required().end()
-    .field('CREATE_INDICES').boolean().def(false).end()
+    // @formatter:off
+    .field('ENABLED')
+    .boolean().def(true).end()
+    .field('PROTOCOL')
+    .off(v => !v.ENABLED)
+    .text().def('couchbase').end()
+    .field('HOST')
+    .off(v => !v.ENABLED)
+    .text().required().end()
+    .field('PORT')
+    .off(v => !v.ENABLED)
+    .integer().end()
+    .field('USER')
+    .off(v => !v.ENABLED)
+    .text().required().end()
+    .field('PASS')
+    .off(v => !v.ENABLED)
+    .text().required().end()
+    .field('BUCKET')
+    .off(v => !v.ENABLED)
+    .text().required().end()
+    .field('SCOPE')
+    .off(v => !v.ENABLED)
+    .text().required().end()
+    .field('CREATE_INDICES')
+    .off(v => !v.ENABLED)
+    .boolean().def(false).end()
+    // @formatter:on
     .finish();

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

@@ -1,5 +1,9 @@
 import type { EnvBase } from "@leyyo/env";
 export interface CouchbaseCommonConf extends EnvBase {
+    /**
+     * Protocol
+     * */
+    readonly ENABLED: boolean;
     /**
      * Protocol
      * */

package/dist/connection/cb-direct.connection.js

@@ -16,7 +16,7 @@ class CbDirectConnection extends cb_connection_1.CbConnection {
      * */
     constructor(opt) {
         super(opt);
-        this.logger = be_base_common_1.logger.of(`CbConnection${(opt === null || opt === void 0 ? void 0 : opt.name) ? '#' + (opt === null || opt === void 0 ? void 0 : opt.name) : ''}`);
+        this.logger = be_base_common_1.logger.create(`CbConnection${(opt === null || opt === void 0 ? void 0 : opt.name) ? '#' + (opt === null || opt === void 0 ? void 0 : opt.name) : ''}`);
     }
     /** @inheritDoc */
     newRepo(opt) {

package/dist/connection/cb.connection.d.ts

@@ -1,12 +1,46 @@
-import type { QueryResult, QueryMetaData } from 'couchbase';
-import { type IgnoreFieldsByType, type ReplaceType } from "@leyyo/common";
-import { DbConnection, type DbLines } from "@samet-it/be-db-common";
-import type { CbConnectionLike, CbConnOpt, CbExecOpt, CbConnProps, CbRepoLink } from "./index.types";
-import type { DbQueryResultMore, DbQueryResultOne } from "@samet-it/be-db-common";
+import type { Cluster } from 'couchbase';
+import { DbConnection } from "@samet-it/be-db-common";
+import type { CbConnectionLike, CbConnOpt, CbConnProps } from "./index.types";
 /**
  * Couchbase connection abstract class
  * */
-export declare abstract class CbConnection extends DbConnection<CbRepoLink, QueryMetaData, CbExecOpt> implements CbConnectionLike {
+export declare abstract class CbConnection extends DbConnection implements CbConnectionLike {
+    /**
+     * Base/starting/min delay for connection
+     *
+     * @type {number} - as seconds
+     * */
+    private static readonly CONN_BASE_DELAY;
+    /**
+     * Last/max delay for connection
+     *
+     * @type {number} - as seconds
+     * */
+    private static readonly CONN_MAX_DELAY;
+    /**
+     * Try count
+     *
+     * @type {number} - times
+     * */
+    private static readonly CONN_TRY_COUNT;
+    /**
+     * Base/starting/min delay for ping
+     *
+     * @type {number} - as seconds
+     * */
+    private static readonly PING_BASE_DELAY;
+    /**
+     * Last/max delay ping
+     *
+     * @type {number} - as seconds
+     * */
+    private static readonly PING_MAX_DELAY;
+    /**
+     * Try count
+     *
+     * @type {number} - times
+     * */
+    private static readonly PING_TRY_COUNT;
     /** {@inheritDoc} */
     protected _props: CbConnProps;
     /**
@@ -19,22 +53,16 @@ export declare abstract class CbConnection extends DbConnection<CbRepoLink, Quer
      * Read configuration by variant
      * */
     protected _readEnv(): void;
+    protected get _connectionDelay(): number;
+    protected get _pingDelay(): number;
     /** {@inheritDoc} */
     get props(): Readonly<CbConnProps>;
     /** {@inheritDoc} */
-    field(field: string): string;
-    /** {@inheritDoc} */
-    value(value: unknown): string;
-    /** {@inheritDoc} */
-    flatten<T>(result: QueryResult<T>): Array<T>;
-    /** {@inheritDoc} */
-    castDates<T>(given: ReplaceType<T, Date, string> | T, ...fields: Array<IgnoreFieldsByType<T, Date>>): void;
-    /** {@inheritDoc} */
-    castDatesForList<T>(given: Array<ReplaceType<T, Date, string> | T>, ...fields: Array<IgnoreFieldsByType<T, Date>>): void;
+    get bucketName(): string;
     /** {@inheritDoc} */
-    more<T>(link: CbRepoLink, lines: string | DbLines, p1?: string | CbExecOpt): Promise<DbQueryResultMore<T, QueryMetaData>>;
+    get scopeName(): string;
     /** {@inheritDoc} */
-    one<T>(link: CbRepoLink, lines: string | DbLines, p1?: string | CbExecOpt): Promise<DbQueryResultOne<T, QueryMetaData>>;
+    get cluster(): Cluster;
     /** {@inheritDoc} */
     connect(): Promise<boolean>;
     /** {@inheritDoc} */

package/dist/connection/cb.connection.js

@@ -45,10 +45,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CbConnection = void 0;
 const couchbase = __importStar(require("couchbase"));
 const config_1 = require("../config");
-const common_1 = require("@leyyo/common");
-const filter_1 = require("../filter");
 const be_db_common_1 = require("@samet-it/be-db-common");
-const type_1 = require("@leyyo/type");
+const be_base_common_1 = require("@samet-it/be-base-common");
 /**
  * Couchbase connection abstract class
  * */
@@ -61,7 +59,6 @@ class CbConnection extends be_db_common_1.DbConnection {
      * */
     constructor(opt) {
         super(opt);
-        filter_1.cbFilterUtil.$set(this);
         this._readEnv();
     }
     // region protected-method
@@ -71,10 +68,11 @@ class CbConnection extends be_db_common_1.DbConnection {
     _readEnv() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const { _props: props } = this;
-        let env = config_1.couchbaseCommonConfig.valueShort;
+        let env = config_1.couchbaseCommonConfig.value;
         if (props.envVariant) {
-            env = config_1.couchbaseCommonConfig.configure.getVariation(props.envVariant).valueShort;
+            env = config_1.couchbaseCommonConfig.configure.getVariation(props.envVariant).value;
         }
+        props.isEnabled = props.isEnabled == env.ENABLED;
         props.protocol = (_a = props.protocol) !== null && _a !== void 0 ? _a : env.PROTOCOL;
         props.host = (_b = props.host) !== null && _b !== void 0 ? _b : env.HOST;
         props.port = (_c = props.port) !== null && _c !== void 0 ? _c : env.PORT;
@@ -84,173 +82,77 @@ class CbConnection extends be_db_common_1.DbConnection {
         props.scopeName = (_g = props.scopeName) !== null && _g !== void 0 ? _g : env.SCOPE;
         props.createIndices = (_h = props.createIndices) !== null && _h !== void 0 ? _h : env.CREATE_INDICES;
     }
+    get _connectionDelay() {
+        return this._delayWithJitter(this._props.connectTryCount, CbConnection.CONN_BASE_DELAY, CbConnection.CONN_MAX_DELAY);
+    }
+    get _pingDelay() {
+        return this._delayWithJitter(this._props.pingTryCount, CbConnection.PING_BASE_DELAY, CbConnection.PING_MAX_DELAY);
+    }
     // endregion protected-method
     // region getter
     /** {@inheritDoc} */
     get props() {
         return this._props;
     }
-    // endregion getter
-    // region field-value
-    /** {@inheritDoc} */
-    field(field) {
-        field = field.trim();
-        if (field.includes('.')) {
-            return field.split('.').map(part => this.field(part)).join('.');
-        }
-        return field.startsWith('`') ? field : `\`${field}\``;
-    }
-    /** {@inheritDoc} */
-    value(value) {
-        var _a;
-        switch (typeof value) {
-            case "string":
-                return JSON.stringify(value);
-            case "number":
-                return `${value}`;
-            case "boolean":
-                return value ? `true` : 'false';
-            case "object":
-                if (value) {
-                    return (0, common_1.secureJson)(value);
-                }
-                else {
-                    return 'null';
-                }
-            case "bigint":
-                return `"${value.toString(10)}"`;
-            case "symbol":
-                return JSON.stringify(value.description);
-            case "function":
-                return JSON.stringify(`${(_a = value.name) !== null && _a !== void 0 ? _a : '~fn~'}[${value.length}]()`);
-        }
-        return 'null';
-    }
     /** {@inheritDoc} */
-    flatten(result) {
-        if (result && Array.isArray(result.rows) && (result.rows.length > 0)) {
-            return result.rows;
-        }
-        return [];
+    get bucketName() {
+        return this._props.bucketName;
     }
-    // endregion field-value
-    // region transcoders
     /** {@inheritDoc} */
-    castDates(given, ...fields) {
-        if (fields.length < 1) {
-            return;
-        }
-        if (!given || typeof given !== 'object' && Array.isArray(given)) {
-            return;
-        }
-        const doc = given;
-        fields.forEach(field => {
-            const val = doc[field];
-            if (typeof val === 'string' || (typeof val === 'number' && val > 0 && Number.isInteger(val))) {
-                doc[field] = new Date(val);
-            }
-        });
+    get scopeName() {
+        return this._props.scopeName;
     }
     /** {@inheritDoc} */
-    castDatesForList(given, ...fields) {
-        if (fields.length < 1) {
-            return;
-        }
-        if (!given || !Array.isArray(given) || given.length < 1) {
-            return;
-        }
-        const arr = given;
-        arr.forEach(item => this.castDates(item, ...fields));
-    }
-    // endregion transcoders
-    // region query
-    /** {@inheritDoc} */
-    more(link, lines, p1) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.buildOpt(p1);
-            const sql = (0, type_1.isObjectValid)(lines) ? lines.end() : lines;
-            if (opt.printSql) {
-                this.logger.log(`${link.path} > SQL${opt.name}`, sql);
-            }
-            try {
-                const result = yield link.scope.query(sql, opt);
-                return {
-                    success: true,
-                    rows: result.rows,
-                    meta: result.meta,
-                };
-            }
-            catch (err) {
-                this.checkError(err, Object.assign(Object.assign({}, opt), { sql }));
-                return {
-                    success: false,
-                    rows: [],
-                    error: err,
-                };
-            }
-        });
-    }
-    /** {@inheritDoc} */
-    one(link, lines, p1) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.buildOpt(p1);
-            const sql = (0, type_1.isObjectValid)(lines) ? lines.end() : lines;
-            if (opt.printSql) {
-                this.logger.log(`${link.path} > SQL${opt.name}`, sql);
-            }
-            try {
-                const result = yield link.scope.query(sql, opt);
-                return {
-                    success: true,
-                    row: (Array.isArray(result.rows) && result.rows.length > 0) ? result.rows[0] : undefined,
-                    meta: result.meta,
-                };
-            }
-            catch (err) {
-                this.checkError(err, Object.assign(Object.assign({}, opt), { sql }));
-                return {
-                    success: false,
-                    row: undefined,
-                    error: err,
-                };
-            }
-        });
+    get cluster() {
+        return this._props.cluster;
     }
-    // endregion query
+    // endregion getter
     // region connect
     /** {@inheritDoc} */
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             const { _props: props } = this;
-            if (props.isConnected) {
+            if (!this.isEnabled) {
+                return false;
+            }
+            if (this.isConnected) {
                 return true;
             }
+            if (this._props.connectTryCount > CbConnection.CONN_TRY_COUNT) {
+                const err = new be_db_common_1.DbError('Maximum try county', { tryCount: this._props.connectTryCount });
+                this.logger.error(be_base_common_1.errorHandler.common.logText(err, 'connect'));
+                return false;
+            }
             try {
                 props.cluster = yield couchbase.connect(`${props.protocol}://${props.host}`, {
                     username: props.username,
                     password: props.password,
                 });
                 props.isConnected = true;
-                this.logger.log('Connected');
+                props.connectTryCount = 0;
+                this._triggerOnCase('connected', this._onConnected, false);
+                if (props.isFirst === undefined) {
+                    this._triggerOnCase('first-connected', this._onFirstConnected, true);
+                    props.isFirst = false;
+                }
+                // clear stopped ping
+                if (this._props.pingTryCount > CbConnection.PING_TRY_COUNT) {
+                    this._props.pingTryCount = 0;
+                    setTimeout(() => this.ping(true).then(), 30000);
+                }
+                props.isConnected = true;
+                this.logger.info('Connected');
                 setTimeout(() => this.ping(true).then(), 30000);
             }
             catch (e) {
-                this.checkError(e, { name: 'connection' });
-                throw e;
-            }
-            if (props.isFirst === undefined) {
-                if (this._onFirstConnected.length > 0) {
-                    yield Promise.all(this._onFirstConnected);
-                    this._onFirstConnected = [];
+                this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'connection', this._props.connectTryCount));
+                props.connectTryCount++;
+                const old = this.isConnected;
+                props.isConnected = false;
+                if (old) {
+                    this._triggerOnCase('disconnected', this._onDisconnected, false);
                 }
-                props.isFirst = false;
-            }
-            if (this._onConnected.length > 0) {
-                this._onConnected.forEach(fn => {
-                    fn().then().catch(e => {
-                        this.logger.error(`OnConnected <${e.name}> ${e.message}`);
-                    });
-                });
+                setTimeout(() => this.connect().then(), this._connectionDelay);
             }
             return true;
         });
@@ -258,14 +160,27 @@ class CbConnection extends be_db_common_1.DbConnection {
     /** {@inheritDoc} */
     ping(next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { _props: props } = this;
-            let result = false;
-            try {
-                yield this.exec(props.cluster.ping(), { name: 'ping' });
-                result = true;
+            if (!this.isEnabled) {
+                return false;
             }
-            catch (err) {
-                this.checkError(err, { name: 'ping', silent: true });
+            if (this._props.pingTryCount > CbConnection.PING_TRY_COUNT) {
+                const err = new be_db_common_1.DbError('Maximum try county', { tryCount: this._props.pingTryCount });
+                this.logger.error(be_base_common_1.errorHandler.common.logText(err, 'connect'));
+                return false;
+            }
+            let result = false;
+            if (this.isConnected) {
+                try {
+                    yield this.cluster.ping();
+                    this._props.pingTryCount = 0;
+                    result = true;
+                }
+                catch (err) {
+                    this._props.pingTryCount++;
+                    this.logger.warn(be_base_common_1.errorHandler.common.logText(err, 'ping', this._props.pingTryCount));
+                    setTimeout(() => this.ping(true).then(), this._pingDelay);
+                    next = false;
+                }
             }
             if (next) {
                 setTimeout(() => this.ping(true).then(), 30000);
@@ -275,3 +190,40 @@ class CbConnection extends be_db_common_1.DbConnection {
     }
 }
 exports.CbConnection = CbConnection;
+// region protected-property
+/**
+ * Base/starting/min delay for connection
+ *
+ * @type {number} - as seconds
+ * */
+CbConnection.CONN_BASE_DELAY = 500; // 0.5 sec
+/**
+ * Last/max delay for connection
+ *
+ * @type {number} - as seconds
+ * */
+CbConnection.CONN_MAX_DELAY = 1000 * 60 * 60; // 60 minutes
+/**
+ * Try count
+ *
+ * @type {number} - times
+ * */
+CbConnection.CONN_TRY_COUNT = 100; // 100 times
+/**
+ * Base/starting/min delay for ping
+ *
+ * @type {number} - as seconds
+ * */
+CbConnection.PING_BASE_DELAY = 200; // 0.2 sec
+/**
+ * Last/max delay ping
+ *
+ * @type {number} - as seconds
+ * */
+CbConnection.PING_MAX_DELAY = 1000 * 60 * 10; // 10 minutes
+/**
+ * Try count
+ *
+ * @type {number} - times
+ * */
+CbConnection.PING_TRY_COUNT = 100; // 100 times

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

@@ -1,26 +1,26 @@
-import type { Cluster, QueryMetaData, QueryOptions, QueryResult, Scope } from "couchbase";
+import type { Cluster } from "couchbase";
 import type { IgnoreFieldsByType, KeyValue, ReplaceType, StrKey } from "@leyyo/common";
 import type { CbRepoDirectOpt, CbRepoLike } from "../repo";
-import type { DbConnectionLike, DbConnOpt, DbConnProps, DbExecOpt, DbRepoLink } from "@samet-it/be-db-common";
+import type { DbConnDirectOpt, DbConnectionLike, DbConnOpt, DbConnProps } from "@samet-it/be-db-common";
 import type { DefDims, Entity, UrnDocLike, Pair, Portion, View, UrnDef } from "@samet-it/be-base-common";
 /**
  * Couchbase connection interface
  * */
-export interface CbConnectionLike extends DbConnectionLike<CbRepoLink, QueryMetaData, CbExecOpt> {
+export interface CbConnectionLike extends DbConnectionLike {
     /** @inheritDoc */
     get props(): Readonly<CbConnProps>;
     /**
-     * Flatten query result to rows
+     * Shortcut to {@link CbConnOpt#bucketName}
      * */
-    flatten<T>(result: QueryResult<T>): Array<T>;
+    get bucketName(): string;
     /**
-     * Cast dates
+     * Shortcut to {@link CbConnOpt#scopeName}
      * */
-    castDates<T>(given: ReplaceType<T, Date, string> | T, ...fields: Array<IgnoreFieldsByType<T, Date>>): void;
+    get scopeName(): string;
     /**
-     * Cast dates for an array
+     * Shortcut to {@link CbConnProps#cluster}
      * */
-    castDatesForList<T>(given: Array<ReplaceType<T, Date, string> | T>, ...fields: Array<IgnoreFieldsByType<T, Date>>): void;
+    get cluster(): Cluster;
 }
 /**
  * Couchbase connection option interface
@@ -45,17 +45,6 @@ export interface CbConnOpt extends DbConnOpt {
      * */
     createIndices?: boolean;
 }
-/**
- * Couchbase direct connection option interface
- * */
-export interface CbDirectConnOpt extends CbConnOpt {
-    /**
-     * Logger name
-     *
-     * @type {string}
-     * */
-    name?: string;
-}
 /**
  * Couchbase connection props interface
  * */
@@ -68,9 +57,10 @@ export interface CbConnProps extends CbConnOpt, DbConnProps {
     cluster: Cluster;
 }
 /**
- * Couchbase query option
+ * Couchbase direct connection option interface
  * */
-export type CbExecOpt = DbExecOpt & QueryOptions;
+export interface CbDirectConnOpt extends CbConnOpt, DbConnDirectOpt {
+}
 /**
  * Direct connection to use outside dependency injection
  * */
@@ -94,15 +84,5 @@ export interface CbDirectConnectionLike extends CbConnectionLike {
      * */
     newRepo<ENT extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef, VIEW extends View<ID> = ENT, PAIR extends Pair<ID> = Pair<ID>, PORTION extends Portion<ID> = Portion<ID>, KEYS extends string = StrKey<ENT>, DIMS extends DefDims = DefDims, R = unknown>(opt: CbRepoDirectOpt<ENT, ID, URN, DIMS, R>): CbRepoLike<ENT, ID, URN, VIEW, PAIR, PORTION, KEYS, DIMS>;
 }
-export type CbIgnoreDate<T> = CbReplaceType<T, Date, string>;
-export type CbIgnoreDateKeys<T> = CbIgnoreFields<T, Date>;
-type CbIgnoreFields<T, I> = {
-    [K in keyof T]: T[K] extends I ? K : never;
-}[keyof T];
-type CbReplaceType<T, O, N> = {
-    [P in keyof T]: T[P] extends O ? N : T[P];
-};
-export interface CbRepoLink extends DbRepoLink {
-    scope: Scope;
-}
-export {};
+export type CbIgnoreDate<T> = ReplaceType<T, Date, string>;
+export type CbIgnoreDateKeys<T> = IgnoreFieldsByType<T, Date>;

package/dist/filter/cb-filter-util.impl.js

@@ -53,10 +53,10 @@ class CbFilterUtilImpl {
         if (Array.isArray(items) && items.length > 0) {
             items = items.map(v => (v instanceof Date) ? v.toISOString() : v);
             if (items.length === 1) {
-                return `${this._where(opt)} ${this.cb.f(field)} = ${this.cb.v(items[0])}`;
+                return `${this._where(opt)} ${this.repo.f(field)} = ${this.repo.v(items[0])}`;
             }
             else {
-                return `${this._where(opt)} ${this.cb.f(field)} IN ${this.cb.v(items[0])}`;
+                return `${this._where(opt)} ${this.repo.f(field)} IN ${this.repo.v(items[0])}`;
             }
         }
         return undefined;
@@ -64,7 +64,7 @@ class CbFilterUtilImpl {
     /** @inheritDoc */
     sqlBool(opt, field, value) {
         if (typeof value === 'boolean') {
-            return `${this._where(opt)} ${this.cb.f(field)} = ${value ? 'true' : 'false'}`;
+            return `${this._where(opt)} ${this.repo.f(field)} = ${value ? 'true' : 'false'}`;
         }
         return undefined;
     }
@@ -73,20 +73,20 @@ class CbFilterUtilImpl {
         if (Array.isArray(value) && value.length > 0) {
             const [first, last] = value.map(v => (v instanceof Date) ? v.toISOString() : v);
             if (first !== undefined && last !== undefined) {
-                return `${this._where(opt)} ${this.cb.f(field)} BETWEEN ${this.cb.v(first)} AND ${this.cb.v(last)}`;
+                return `${this._where(opt)} ${this.repo.f(field)} BETWEEN ${this.repo.v(first)} AND ${this.repo.v(last)}`;
             }
             else if (first !== undefined && last === undefined) {
-                return `${this._where(opt)} ${this.cb.f(field)} >= ${this.cb.v(first)}`;
+                return `${this._where(opt)} ${this.repo.f(field)} >= ${this.repo.v(first)}`;
             }
             else if (first === undefined && last !== undefined) {
-                return `${this._where(opt)} ${this.cb.f(field)} <= ${this.cb.v(last)}`;
+                return `${this._where(opt)} ${this.repo.f(field)} <= ${this.repo.v(last)}`;
             }
         }
         return undefined;
     }
-    $set(cb) {
-        if (!this.cb) {
-            this.cb = cb;
+    $set(repo) {
+        if (!this.repo) {
+            this.repo = repo;
         }
     }
 }

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

@@ -1,5 +1,6 @@
-import type { CbConnectionLike } from "../connection";
 import type { DbLines } from "@samet-it/be-db-common";
+import { CbRepoLike } from "../repo";
+import { Entity } from "@samet-it/be-base-common";
 export type FilterCastLambda<T> = (v: unknown) => T;
 export interface CbFilterUtil {
     /**
@@ -26,7 +27,7 @@ export interface CbFilterUtil {
      * Builds a sql for between
      * */
     sqlBetween(opt: CbFilterUtilWhereOpt, field: string, value: [unknown, unknown]): string | undefined;
-    $set(cb: CbConnectionLike): void;
+    $set(repo: CbRepoLike<Entity>): void;
 }
 export interface CbFilterUtilWhereOpt {
     lines: DbLines;

package/dist/repo/cb-direct.repo.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CbDirectRepo = void 0;
 const cb_repo_1 = require("./cb.repo");
@@ -33,21 +24,10 @@ class CbDirectRepo extends cb_repo_1.CbRepo {
      * @param {CbRepoDirectOpt} opt - options
      * */
     constructor(conn, opt) {
+        var _a;
         super(conn, opt);
-        if (opt) {
-            if (!opt.name) {
-                opt.name = this._props.urnPrefix;
-            }
-            if (typeof opt.toUrnTuple === 'function') {
-                this.$toUrnTuple = opt.toUrnTuple;
-            }
-            if (typeof opt.toDim === 'function') {
-                this.$toDim = (doc, dim) => __awaiter(this, void 0, void 0, function* () {
-                    return (yield opt.toDim(doc, dim));
-                });
-            }
-        }
-        this.logger = be_base_common_1.logger.of(`CbRepo${(opt === null || opt === void 0 ? void 0 : opt.name) ? '#' + (opt === null || opt === void 0 ? void 0 : opt.name) : ''}`);
+        const logName = (_a = opt === null || opt === void 0 ? void 0 : opt.name) !== null && _a !== void 0 ? _a : this._props.urnPrefix;
+        this.logger = be_base_common_1.logger.create(`CbRepo${logName ? '#' + logName : ''}`);
     }
 }
 exports.CbDirectRepo = CbDirectRepo;