@samet-it/be-couchbase-common 1.1.3 → 1.1.5

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

@@ -1,13 +1,14 @@
 import { CbConnection } from "./cb.connection";
+import { UrnDef } from "@samet-it/be-base-common";
 import type { DefDims, Entity, UrnDocLike, Pair, Portion, View } from "@samet-it/be-base-common";
 import { type CbRepoDirectOpt, type CbRepoLike } from "../repo";
 import type { CbDirectConnectionLike, CbDirectConnOpt } from "./index.types";
-import type { KeyValue } from "@leyyo/common";
+import type { KeyValue, StrKey } from "@leyyo/common";
 /**
  * Couchbase connection direct class
  * */
 export declare class CbDirectConnection extends CbConnection implements CbDirectConnectionLike {
     constructor(opt?: CbDirectConnOpt);
     /** @inheritDoc */
-    newRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ID, ENTITY, URN, DIMS, R>): CbRepoLike<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
+    newRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ENTITY, ID, URN, DIMS, R>): CbRepoLike<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
 }

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

@@ -1,13 +1,12 @@
 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 } from "./index.types";
-import type { CbRepoDef } from "../repo";
+import type { CbConnectionLike, CbConnOpt, CbExecOpt, CbConnProps, CbRepoLink } from "./index.types";
 import type { DbQueryResultMore, DbQueryResultOne } from "@samet-it/be-db-common";
 /**
  * Couchbase connection abstract class
  * */
-export declare abstract class CbConnection extends DbConnection<CbRepoDef, QueryMetaData, CbExecOpt> implements CbConnectionLike {
+export declare abstract class CbConnection extends DbConnection<CbRepoLink, QueryMetaData, CbExecOpt> implements CbConnectionLike {
     /** {@inheritDoc} */
     protected _props: CbConnProps;
     protected constructor(opt?: CbConnOpt);
@@ -28,9 +27,9 @@ export declare abstract class CbConnection extends DbConnection<CbRepoDef, Query
     /** {@inheritDoc} */
     castDatesForList<T>(given: Array<ReplaceType<T, Date, string> | T>, ...fields: Array<IgnoreFieldsByType<T, Date>>): void;
     /** {@inheritDoc} */
-    more<T>(repo: CbRepoDef, lines: string | DbLines, p1?: string | CbExecOpt): Promise<DbQueryResultMore<T, QueryMetaData>>;
+    more<T>(link: CbRepoLink, lines: string | DbLines, p1?: string | CbExecOpt): Promise<DbQueryResultMore<T, QueryMetaData>>;
     /** {@inheritDoc} */
-    one<T>(repo: CbRepoDef, lines: string | DbLines, p1?: string | CbExecOpt): Promise<DbQueryResultOne<T, QueryMetaData>>;
+    one<T>(link: CbRepoLink, lines: string | DbLines, p1?: string | CbExecOpt): Promise<DbQueryResultOne<T, QueryMetaData>>;
     /** {@inheritDoc} */
     connect(): Promise<boolean>;
     /** {@inheritDoc} */

package/dist/connection/cb.connection.js

@@ -160,15 +160,15 @@ class CbConnection extends be_db_common_1.DbConnection {
     // endregion transcoders
     // region query
     /** {@inheritDoc} */
-    more(repo, lines, p1) {
+    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(`${repo.props.path} > SQL${opt.name}`, sql);
+                this.logger.log(`${link.path} > SQL${opt.name}`, sql);
             }
             try {
-                const result = yield repo.props.scope.query(sql, opt);
+                const result = yield link.scope.query(sql, opt);
                 return {
                     success: true,
                     rows: result.rows,
@@ -186,15 +186,15 @@ class CbConnection extends be_db_common_1.DbConnection {
         });
     }
     /** {@inheritDoc} */
-    one(repo, lines, p1) {
+    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(`${repo.props.path} > SQL${opt.name}`, sql);
+                this.logger.log(`${link.path} > SQL${opt.name}`, sql);
             }
             try {
-                const result = yield repo.props.scope.query(sql, opt);
+                const result = yield link.scope.query(sql, opt);
                 return {
                     success: true,
                     row: (Array.isArray(result.rows) && result.rows.length > 0) ? result.rows[0] : undefined,

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

@@ -1,12 +1,12 @@
-import type { Cluster, QueryMetaData, QueryOptions, QueryResult } from "couchbase";
-import type { IgnoreFieldsByType, KeyValue, ReplaceType } from "@leyyo/common";
-import type { CbRepoDef, CbRepoDirectOpt, CbRepoLike } from "../repo";
-import type { DbConnectionLike, DbConnOpt, DbConnProps, DbExecOpt } from "@samet-it/be-db-common";
-import type { DefDims, Entity, UrnDocLike, Pair, Portion, View } from "@samet-it/be-base-common";
+import type { Cluster, QueryMetaData, QueryOptions, QueryResult, Scope } 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 { DefDims, Entity, UrnDocLike, Pair, Portion, View, UrnDef } from "@samet-it/be-base-common";
 /**
  * Couchbase connection interface
  * */
-export interface CbConnectionLike extends DbConnectionLike<CbRepoDef, QueryMetaData, CbExecOpt> {
+export interface CbConnectionLike extends DbConnectionLike<CbRepoLink, QueryMetaData, CbExecOpt> {
     /** @inheritDoc */
     get props(): Readonly<CbConnProps>;
     /**
@@ -81,7 +81,7 @@ export interface CbDirectConnectionLike extends CbConnectionLike {
      * @param {CbRepoDirectOpt} opt - options
      * @return {CbRepoLike} - created repository
      * */
-    newRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ID, ENTITY, URN, DIMS, R>): CbRepoLike<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
+    newRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>, R = unknown>(opt: CbRepoDirectOpt<ENTITY, ID, URN, DIMS, R>): CbRepoLike<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION>;
 }
 export type CbIgnoreDate<T> = CbReplaceType<T, Date, string>;
 export type CbIgnoreDateKeys<T> = CbIgnoreFields<T, Date>;
@@ -91,4 +91,7 @@ type CbIgnoreFields<T, I> = {
 type CbReplaceType<T, O, N> = {
     [P in keyof T]: T[P] extends O ? N : T[P];
 };
+export interface CbRepoLink extends DbRepoLink {
+    scope: Scope;
+}
 export {};

package/dist/repo/cb-direct.repo.d.ts

@@ -1,11 +1,11 @@
 import { CbRepo } from "./cb.repo";
-import type { DefDims, Entity, Pair, Portion, UrnDocLike, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, Pair, Portion, UrnDef, UrnDocLike, View } from "@samet-it/be-base-common";
 import type { CbConnectionLike } from "../connection";
 import type { CbRepoDirectOpt } from "./index.types";
-import type { KeyValue } from "@leyyo/common";
+import type { KeyValue, StrKey } from "@leyyo/common";
 /**
  * Couchbase repository direct class
  * */
-export declare class CbDirectRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>> extends CbRepo<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
-    constructor(conn: CbConnectionLike, opt: CbRepoDirectOpt<ID, ENTITY, URN, DIMS>);
+export declare class CbDirectRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>> extends CbRepo<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
+    constructor(conn: CbConnectionLike, opt: CbRepoDirectOpt<ENTITY, ID, URN, DIMS>);
 }

package/dist/repo/cb.repo.d.ts

@@ -1,18 +1,18 @@
 import type { CbConnectionLike, CbExecOpt } from "../connection";
 import type { KeyValue } from "@leyyo/common";
 import type { StrKey } from "@leyyo/common";
-import type { CbExistsOpt, CbGetOpt, CbInsertOpt, CbReplaceOpt, CbRepoDef, CbRepoProps, CbRepoLike, CbRepoOpt } from "./index.types";
+import type { CbExistsOpt, CbGetOpt, CbInsertOpt, CbReplaceOpt, CbRepoProps, CbRepoLike, CbRepoOpt } from "./index.types";
 import { DbRepo } from "@samet-it/be-db-common";
-import type { DefDims, Entity, Pair, Portion, UrnDocLike, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, Pair, Portion, UrnDef, UrnDocLike, View } from "@samet-it/be-base-common";
 import type { QueryRegular } from "@leyyo/query";
 /**
  * Couchbase repository abstract class
  * */
-export declare abstract class CbRepo<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>> extends DbRepo<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> implements CbRepoLike<ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
+export declare abstract class CbRepo<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>> extends DbRepo<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> implements CbRepoLike<ENTITY, ID, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
     private static _specs;
     /** @inheritDoc */
-    protected _props: CbRepoProps<ID, ENTITY>;
-    protected constructor(conn: CbConnectionLike, opt?: CbRepoOpt<ID, ENTITY>);
+    protected _props: CbRepoProps<ENTITY, ID>;
+    protected constructor(conn: CbConnectionLike, opt?: CbRepoOpt<ENTITY, ID>);
     /**
      * Check property name
      *
@@ -65,9 +65,7 @@ export declare abstract class CbRepo<ID extends KeyValue, ENTITY extends Entity<
      * */
     protected $createIndices(): Promise<void>;
     /** @inheritDoc */
-    get $def(): CbRepoDef;
-    /** @inheritDoc */
-    get props(): Readonly<CbRepoProps<ID, ENTITY>>;
+    get props(): Readonly<CbRepoProps<ENTITY, ID>>;
     /** @inheritDoc */
     $getByPrimary(key: string, p1?: CbGetOpt | string, ignoreCheck?: boolean): Promise<ENTITY | undefined>;
     /** @inheritDoc */

package/dist/repo/cb.repo.js

@@ -92,7 +92,7 @@ class CbRepo extends be_db_common_1.DbRepo {
             }
             name = this._indexName(name);
             sql = `CREATE INDEX ${conn.f(name)} ON ${full} (${fields.join(', ')}) IF NOT EXISTS`;
-            yield conn.one(this.$def, sql, {
+            yield conn.one(this._props, sql, {
                 name: `${path}.index`,
                 ignoredErrors: [couchbase_1.IndexExistsError.name]
             });
@@ -129,7 +129,7 @@ class CbRepo extends be_db_common_1.DbRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const { full, path, conn } = this._props;
             const sql = `CREATE PRIMARY INDEX \`pk\` ON ${full} IF NOT EXISTS`;
-            yield conn.one(this.$def, sql, {
+            yield conn.one(this._props, sql, {
                 name: `${path}.pk`,
                 ignoredErrors: [couchbase_1.IndexExistsError.name]
             });
@@ -226,10 +226,6 @@ class CbRepo extends be_db_common_1.DbRepo {
     // endregion protected-method
     // region getter
     /** @inheritDoc */
-    get $def() {
-        return this;
-    }
-    /** @inheritDoc */
     get props() {
         return this._props;
     }
@@ -259,7 +255,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
             const parameters = { key };
-            return (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row;
+            return (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row;
         });
     }
     /** @inheritDoc */
@@ -283,7 +279,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .no(useSoftDelete, `  AND (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
             const parameters = { key };
-            return (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row;
+            return (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row;
         });
     }
     // endregion get
@@ -308,7 +304,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
             const parameters = { key };
-            return ((_c = (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _c === void 0 ? void 0 : _c.x) === undefined;
+            return ((_c = (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _c === void 0 ? void 0 : _c.x) === undefined;
         });
     }
     /** @inheritDoc */
@@ -333,7 +329,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .yes(useSoftDelete, `WHERE (a.${F_TRASH_ID} IS MISSING)`)
                 .add('LIMIT 1');
             const parameters = { key };
-            return ((_a = (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x) === undefined;
+            return ((_a = (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x) === undefined;
         });
     }
     // endregion exists
@@ -356,7 +352,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .add(`USE KEYS $keys`)
                 .yes(useSoftDelete, `WHERE (a.${F_TRASH_ID} is missing)`);
             const parameters = { keys };
-            return (yield conn.more(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).rows;
+            return (yield conn.more(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).rows;
         });
     }
     /** @inheritDoc */
@@ -382,7 +378,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .add(`WHERE (a.${F_ID} IN $keys)`)
                 .yes(useSoftDelete, `  AND (a.${F_TRASH_ID} IS MISSING)`);
             const parameters = { keys };
-            return (yield conn.more(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).rows;
+            return (yield conn.more(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).rows;
         });
     }
     // endregion list
@@ -398,7 +394,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .add(`SELECT a.*`)
                 .add(`FROM ${full} a`)
                 .both(useSoftDelete, `WHERE (a.${F_TRASH_ID} is missing)`, `WHERE (meta().id is not missing)`);
-            return (yield conn.more(this.$def, lines.end(), opt)).rows;
+            return (yield conn.more(this._props, lines.end(), opt)).rows;
         });
     }
     // endregion filter
@@ -481,7 +477,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 }
                 lines
                     .yes(useSoftDelete, `WHERE (a.${F_TRASH_ID} is missing)`);
-                yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }));
+                yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }));
                 return key;
             }
             return undefined;
@@ -530,7 +526,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                     .yes(useSoftDelete, `  AND (a.${F_TRASH_ID} is missing)`);
                 parameters['key'] = key;
                 lines.add('RETURNING meta().id \`x\`');
-                return (_a = (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x;
+                return (_a = (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x;
             }
             return undefined;
         });
@@ -556,7 +552,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .add(`USE KEYS $key`)
                 .yes(useSoftDelete, `  AND (a.${F_TRASH_ID} is missing)`);
             const parameters = { key };
-            yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }));
+            yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }));
             return key;
         });
     }
@@ -582,7 +578,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 .yes(useSoftDelete, `  AND (a.${F_TRASH_ID} is missing)`)
                 .add('RETURNING meta().id \`x\`');
             const parameters = { key };
-            return (_a = (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x;
+            return (_a = (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x;
         });
     }
     // endregion remove
@@ -611,7 +607,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 trashId: opt.trashId,
                 key,
             };
-            yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }));
+            yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }));
             return key;
         });
     }
@@ -646,7 +642,7 @@ class CbRepo extends be_db_common_1.DbRepo {
                 trashId: opt.trashId,
                 key,
             };
-            return (_a = (yield conn.one(this.$def, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x;
+            return (_a = (yield conn.one(this._props, lines.end(), Object.assign(Object.assign({}, opt), { parameters }))).row) === null || _a === void 0 ? void 0 : _a.x;
         });
     }
 }

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

@@ -1,10 +1,10 @@
 import type { Bucket, BucketSettings, Cluster, Collection, CollectionSpec, RemoveOptions, Scope, ScopeSpec } from "couchbase";
 import type { CbConnectionLike, CbExecOpt } from "../connection";
 import type { DbRepoLike, DbRepoOpt, DbRepoToDim, DbRepoToUrnTuple } from "@samet-it/be-db-common";
-import type { DefDims, Entity, Pair, Portion, UrnDocLike, View } from "@samet-it/be-base-common";
+import type { DefDims, Entity, Pair, Portion, UrnDef, UrnDocLike, View } from "@samet-it/be-base-common";
 import type { ExistsOptions, GetOptions, InsertOptions, ReplaceOptions } from "couchbase";
 import type { DbRepoProps } from "@samet-it/be-db-common";
-import type { KeyValue } from "@leyyo/common";
+import type { KeyValue, StrKey } from "@leyyo/common";
 /**
  * General result for mutable queries to return key
  * */
@@ -18,11 +18,9 @@ export interface CbResultX {
  * Couchbase repository (collection) interface
  * @abstract
  * */
-export interface CbRepoLike<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, KEYS extends string = string, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = View<ID>, PORTION extends Portion<ID> = Portion<ID>> extends DbRepoLike<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
+export interface CbRepoLike<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, KEYS extends string = StrKey<ENTITY>, DIMS extends DefDims = DefDims, PAIR extends Pair<ID> = Pair<ID>, VIEW extends View<ID> = ENTITY, PORTION extends Portion<ID> = Portion<ID>> extends DbRepoLike<CbConnectionLike, CbExecOpt, ID, ENTITY, URN, KEYS, DIMS, PAIR, VIEW, PORTION> {
     /** @inheritDoc */
-    get $def(): CbRepoDef;
-    /** @inheritDoc */
-    get props(): Readonly<CbRepoProps<ID, ENTITY>>;
+    get props(): Readonly<CbRepoProps<ENTITY, ID>>;
     /** @inheritDoc */
     insert(doc: ENTITY, opt?: CbInsertOpt | string, ignoreCheck?: boolean): Promise<string>;
     /** @inheritDoc */
@@ -44,14 +42,10 @@ export interface CbRepoLike<ID extends KeyValue, ENTITY extends Entity<ID>, URN
     /** @inheritDoc */
     $removeBySecondary(key: KeyValue, opt?: CbRemoveOpt | string, ignoreCheck?: boolean): Promise<string>;
 }
-/**
- * Couchbase default repository (collection) without any generics
- * */
-export type CbRepoDef = CbRepoLike<KeyValue, Entity<KeyValue>, UrnDocLike>;
 /**
  * Couchbase repository (collection) option
  * */
-export interface CbRepoOpt<ID extends KeyValue, ENTITY extends Entity<ID>> extends DbRepoOpt<ID, ENTITY> {
+export interface CbRepoOpt<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue> extends DbRepoOpt<ID, ENTITY> {
     /**
      * Bucket name
      *
@@ -80,7 +74,7 @@ export interface CbRepoOpt<ID extends KeyValue, ENTITY extends Entity<ID>> exten
 /**
  * Couchbase repository (collection) props
  * */
-export interface CbRepoProps<ID extends KeyValue, ENTITY extends Entity<ID>> extends CbRepoOpt<ID, ENTITY>, DbRepoProps<CbConnectionLike, ID, ENTITY> {
+export interface CbRepoProps<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue> extends CbRepoOpt<ENTITY, ID>, DbRepoProps<CbConnectionLike, ID, ENTITY> {
     /**
      * Cluster
      *
@@ -124,7 +118,7 @@ export interface CbRepoPropsPart<S> {
 /**
  * Couchbase direct repository (collection) option
  * */
-export interface CbRepoDirectOpt<ID extends KeyValue, ENTITY extends Entity<ID>, URN extends UrnDocLike, DIMS extends DefDims = DefDims, R = unknown> extends CbRepoOpt<ID, ENTITY> {
+export interface CbRepoDirectOpt<ENTITY extends Entity<ID>, ID extends KeyValue = KeyValue, URN extends UrnDocLike = UrnDef<ID>, DIMS extends DefDims = DefDims, R = unknown> extends CbRepoOpt<ENTITY, ID> {
     /**
      * Name of logger class
      * */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-couchbase-common",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Couchbase common component",
   "keywords": [
     "Couchbase"
@@ -72,7 +72,7 @@
     "@leyyo/type": "^1.1.1",
     "@samet-it/be-base-common": "^1.1.1",
     "@samet-it/be-cache-common": "^1.1.1",
-    "@samet-it/be-db-common": "^1.1.1",
+    "@samet-it/be-db-common": "^1.1.2",
     "couchbase": "^4.6.0"
   }
 }