@samet-it/be-couchbase-common 1.0.2 → 1.0.5

package/dist/adapter/cb-adapter.service.d.ts

@@ -1,7 +1,6 @@
-import { type IgnoreFieldsByType, type ReplaceType } from "@leyyo/common";
-import { type QueryOptions } from 'couchbase';
 import { Cluster, Collection, QueryResult } from 'couchbase';
-import type { CbAdapterServiceLike, CbEntity, CbExecOpt, CbExecRec } from "./index.types";
+import type { IgnoreFieldsByType, ReplaceType } from "@leyyo/common";
+import type { CbAdapterServiceLike, CbEntity, CbExecOpt, CbQueryResultMore, CbQueryResultOne } from "./index.types";
 import type { CbRepoDef } from "../repo";
 export declare class CbAdapterService implements CbAdapterServiceLike {
     private readonly _CLEAR_ERROR_INTERVAL;
@@ -28,6 +27,7 @@ export declare class CbAdapterService implements CbAdapterServiceLike {
      * Build json format of CB object
      * */
     private _toJson;
+    protected _checkError(err: Error, opt: CbExecOpt): void;
     /** {@inheritDoc} */
     f(field: string): string;
     /** {@inheritDoc} */
@@ -57,14 +57,11 @@ export declare class CbAdapterService implements CbAdapterServiceLike {
     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;
-    protected _checkError<R = any>(err: Error, op: string, opt: CbExecOpt): R;
-    exec2<T>(repo: CbRepoDef, sql: string, opt?: CbExecOpt): Promise<Array<T>>;
-    exec2First<T>(repo: CbRepoDef, sql: string, opt?: CbExecOpt): Promise<T | undefined>;
-    execExtended<T>(repo: CbRepoDef, sql: string, query: QueryOptions, opt?: CbExecOpt): Promise<Array<T>>;
-    execFirstExtended<T>(repo: CbRepoDef, sql: string, query: QueryOptions, opt?: CbExecOpt): Promise<T | undefined>;
-    exec1<T>(repo: CbRepoDef, fn: Promise<T>, opt?: CbExecOpt): Promise<T>;
+    buildOpt(p1?: string | Partial<CbExecOpt>, name?: string): CbExecOpt;
     /** {@inheritDoc} */
-    exec<T>(opt: CbExecRec<T>): Promise<T>;
+    exec<T>(fn: Promise<T>, p1?: string | Omit<CbExecOpt, 'printSql'>): Promise<T>;
+    more<T>(repo: CbRepoDef, sql: string, p1?: string | CbExecOpt): Promise<CbQueryResultMore<T>>;
+    one<T>(repo: CbRepoDef, sql: string, p1?: string | CbExecOpt): Promise<CbQueryResultOne<T>>;
     /** {@inheritDoc} */
     connectDb(): Promise<Cluster>;
 }

package/dist/adapter/cb-adapter.service.js

@@ -55,7 +55,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CbAdapterService = void 0;
 const couchbase = __importStar(require("couchbase"));
 const common_1 = require("@nestjs/common");
-const common_2 = require("@leyyo/common");
 const couchbase_1 = require("couchbase");
 const config_1 = require("../config");
 // noinspection JSUnusedGlobalSymbols
@@ -87,15 +86,10 @@ let CbAdapterService = class CbAdapterService {
      * */
     _ping() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
-                yield this.exec({
-                    name: 'ping',
-                    promise: this._cluster.ping()
-                });
+                yield this.exec(this._cluster.ping(), { name: 'ping' });
             }
             catch (err) {
-                this.logger.error(`!ping[${(_a = err.name) !== null && _a !== void 0 ? _a : ''}]`, err);
             }
             setTimeout(() => this._ping(), 30000);
         });
@@ -159,6 +153,21 @@ let CbAdapterService = class CbAdapterService {
                 return 'null';
         }
     }
+    _checkError(err, opt) {
+        var _a;
+        if (!this._nativeErrors.has(err)) {
+            this._nativeErrors.set(err, 1);
+        }
+        else {
+            this._nativeErrors.set(err, this._nativeErrors.get(err) + 1);
+        }
+        if ((_a = opt === null || opt === void 0 ? void 0 : opt.ignoredErrors) === null || _a === void 0 ? void 0 : _a.includes(err)) {
+            this.logger.warn(`${opt.name} => (${err.name})${err.message}`);
+            return;
+        }
+        this.logger.error(`${opt.name} => (${err.name})${err.message}`, JSON.stringify(err.context));
+        throw err;
+    }
     /** {@inheritDoc} */
     f(field) {
         if (field.includes('.')) {
@@ -329,89 +338,72 @@ let CbAdapterService = class CbAdapterService {
         const arr = given;
         arr.forEach(item => this.castDates(item, ...fields));
     }
-    _checkError(err, op, opt) {
-        var _a;
-        if (!this._nativeErrors.has(err)) {
-            this._nativeErrors.set(err, 1);
-        }
-        else {
-            this._nativeErrors.set(err, this._nativeErrors.get(err) + 1);
-        }
-        if ((_a = opt === null || opt === void 0 ? void 0 : opt.ignoredErrors) === null || _a === void 0 ? void 0 : _a.includes(err)) {
-            return undefined;
+    buildOpt(p1, name) {
+        const opt = typeof p1 === 'string' ? { name: p1 } : Object.assign({}, p1);
+        if (typeof opt.name === undefined && typeof name !== undefined) {
+            opt.name = name;
         }
-        this.logger.error(`${op}${err.message}`, err);
-        throw err;
-    }
-    exec2(repo, sql, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.execExtended(repo, sql, undefined, opt);
-        });
+        opt.name = opt.name ? `[${opt.name}]` : '';
+        return opt;
     }
-    exec2First(repo, sql, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.first(yield this.exec2(repo, sql, opt));
-        });
-    }
-    execExtended(repo, sql, query, opt) {
+    /** {@inheritDoc} */
+    exec(fn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const op = (opt === null || opt === void 0 ? void 0 : opt.name) ? `[${opt.name}]` : '';
-            if (opt === null || opt === void 0 ? void 0 : opt.printSql) {
-                this.logger.log(`${repo.path} > SQL${op}`, sql);
-            }
+            const opt = this.buildOpt(p1);
             try {
-                return this.flatten(yield repo.scope.query(sql, query));
+                return yield fn;
             }
             catch (err) {
-                return this._checkError(err, op, opt);
+                this._checkError(err, opt);
+                return undefined;
             }
         });
     }
-    execFirstExtended(repo, sql, query, opt) {
+    more(repo, sql, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.first(yield this.execExtended(repo, sql, query, opt));
-        });
-    }
-    exec1(repo, fn, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const op = (opt === null || opt === void 0 ? void 0 : opt.name) ? `[${opt.name}]` : '';
-            common_2.$assert.object(fn, () => {
-                return { field: 'fn', where: 'CbAdapterService', path: repo.path, op: op };
-            });
-            common_2.$assert.func(fn.then, () => {
-                return { field: 'fn.then', where: 'CbAdapterService', path: repo.path, op: op };
-            });
+            const opt = this.buildOpt(p1);
+            if (opt.printSql) {
+                this.logger.log(`${repo.path} > SQL${opt.name}`, sql);
+            }
             try {
-                return yield fn;
+                const result = yield repo.scope.query(sql, opt);
+                return {
+                    success: true,
+                    rows: result.rows,
+                    meta: result.meta,
+                };
             }
             catch (err) {
-                return this._checkError(err, op, opt);
+                this._checkError(err, opt);
+                return {
+                    success: false,
+                    rows: [],
+                    error: err,
+                };
             }
         });
     }
-    /** {@inheritDoc} */
-    exec(opt) {
+    one(repo, sql, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!common_2.$is.bareObject(opt) || !common_2.$is.object(opt.promise) || !common_2.$is.func(opt.promise.then)) {
-                throw new Error(`Invalid exec options [${typeof opt}, ${typeof (opt === null || opt === void 0 ? void 0 : opt.promise)}]`);
+            const opt = this.buildOpt(p1);
+            if (opt.printSql) {
+                this.logger.log(`${repo.path} > SQL${opt.name}`, sql);
             }
             try {
-                return yield opt.promise;
+                const result = yield repo.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) {
-                const e = err;
-                if (!this._nativeErrors.has(e)) {
-                    this._nativeErrors.set(e, 1);
-                }
-                else {
-                    this._nativeErrors.set(e, this._nativeErrors.get(e) + 1);
-                }
-                if (Array.isArray(opt.ignoredErrors) && opt.ignoredErrors.includes(e)) {
-                    return undefined;
-                }
-                const op = opt.name ? `[${opt.name}] ` : '';
-                this.logger.error(`${op}${err.message}`, err);
-                throw err;
+                this._checkError(err, opt);
+                return {
+                    success: false,
+                    row: undefined,
+                    error: err,
+                };
             }
         });
     }

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

@@ -1,6 +1,7 @@
-import type { Scope, Cluster, Collection, QueryResult, QueryOptions } from "couchbase";
+import { Scope, Cluster, Collection, QueryResult, QueryOptions, QueryMetaData } from "couchbase";
 import type { IgnoreFieldsByType, ReplaceType } from "@leyyo/common";
 import type { CbRepoDef } from "../repo";
+import { CouchbaseError } from "couchbase/dist/errors";
 export interface CbAdapterServiceLike {
     /**
      * Field name
@@ -74,22 +75,49 @@ export interface CbAdapterServiceLike {
      * Cast dates for an array
      * */
     castDatesForList<T>(given: Array<ReplaceType<T, Date, string> | T>, ...fields: Array<IgnoreFieldsByType<T, Date>>): void;
+    buildOpt(): CbExecOpt;
+    buildOpt(name: string): CbExecOpt;
+    buildOpt(opt: Partial<CbExecOpt>, name?: string): CbExecOpt;
+    exec<T>(fn: Promise<T>): Promise<T>;
+    exec<T>(fn: Promise<T>, name: string): Promise<T>;
+    exec<T>(fn: Promise<T>, opt: Omit<CbExecOpt, 'printSql'>): Promise<T>;
     /**
      * Execute an sql
      * */
-    exec<T>(opt: CbExecRec<T>): Promise<T>;
-    /**
-     * Execute an sql
-     * */
-    exec2<T>(repo: CbRepoDef, sql: string, opt?: CbExecOpt): Promise<Array<T>>;
-    exec2First<T>(repo: CbRepoDef, sql: string, opt?: CbExecOpt): Promise<T | undefined>;
-    execExtended<T>(repo: CbRepoDef, sql: string, query: QueryOptions, opt?: CbExecOpt): Promise<Array<T>>;
-    execFirstExtended<T>(repo: CbRepoDef, sql: string, query: QueryOptions, opt?: CbExecOpt): Promise<T | undefined>;
+    more<T>(repo: CbRepoDef, sql: string): Promise<CbQueryResultMore<T>>;
+    more<T>(repo: CbRepoDef, sql: string, name: string): Promise<CbQueryResultMore<T>>;
+    more<T>(repo: CbRepoDef, sql: string, opt: CbExecOpt): Promise<CbQueryResultMore<T>>;
+    one<T>(repo: CbRepoDef, sql: string): Promise<CbQueryResultOne<T>>;
+    one<T>(repo: CbRepoDef, sql: string, name: string): Promise<CbQueryResultOne<T>>;
+    one<T>(repo: CbRepoDef, sql: string, opt?: CbExecOpt): Promise<CbQueryResultOne<T>>;
     /**
      * Connect to DB
      * */
     connectDb(): Promise<Cluster>;
 }
+export declare class CbQueryResult {
+    success: boolean;
+    /**
+     * [when success=true] The meta-data which has been returned by the query.
+     */
+    meta?: QueryMetaData;
+    /**
+     * [when success=false] Couchbase error
+     */
+    error?: CouchbaseError;
+}
+export declare class CbQueryResultOne<E = any> extends CbQueryResult {
+    /**
+     * The rows which have been returned by the query.
+     */
+    row: E | undefined;
+}
+export declare class CbQueryResultMore<E = any> extends CbQueryResult {
+    /**
+     * The rows which have been returned by the query.
+     */
+    rows: E[];
+}
 export interface CbEntity {
     /**
      * Id
@@ -123,21 +151,7 @@ type CbIgnoreFields<T, I> = {
 type CbReplaceType<T, O, N> = {
     [P in keyof T]: T[P] extends O ? N : T[P];
 };
-export interface CbExecRec<T> {
-    /**
-     * Promise function
-     * */
-    promise: Promise<T>;
-    /**
-     * Name of SQL
-     * */
-    name?: string;
-    /**
-     * Ignored errors
-     * */
-    ignoredErrors?: Omit<Error, 'message'> | Array<Omit<Error, 'message'>>;
-}
-export interface CbExecMutationOpt {
+export interface CbExecOpt extends QueryOptions {
     /**
      * Name of SQL
      * */
@@ -146,14 +160,10 @@ export interface CbExecMutationOpt {
      * Ignored errors
      * */
     ignoredErrors?: CbError[];
-}
-export interface CbExecOpt extends CbExecMutationOpt {
     /**
      * Name of SQL
      * */
     printSql?: string;
-}
-export interface CbExecTrashOpt extends CbExecOpt {
     trashId?: string;
 }
 export type CbIgnoreDate<T> = CbReplaceType<T, Date, string>;

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

@@ -4,10 +4,11 @@ exports.couchbaseCommonConfig = void 0;
 const env_1 = require("@leyyo/env");
 exports.couchbaseCommonConfig = env_1.envCore.configure
     .scope('CouchbaseCommon')
+    .begin
     .field('CB_HOST').text().required().end
     .field('CB_USER').text().required().end
     .field('CB_PASS').text().required().end
     .field('CB_BUCKET').text().required().end
     .field('CB_SCOPE').text().required().end
     .field('CB_CREATE_INDICES').boolean().def(false).end
-    .runtime;
+    .end;

package/dist/line/cb-line.impl.d.ts

@@ -1,2 +1,2 @@
-import type { CbLine } from "./index.types";
+import { CbLine } from "./index.types";
 export declare const cbLine: () => CbLine;

package/dist/line/cb-line.impl.js

@@ -2,6 +2,7 @@
 // ~~console.log(__filename);
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cbLine = void 0;
+const common_1 = require("@leyyo/common");
 class CbLineImpl {
     constructor() {
         this._lines = [];
@@ -62,6 +63,34 @@ class CbLineImpl {
         this._lines[index] = { mark, content: line };
         return true;
     }
+    both(flag, yes, no) {
+        common_1.$assert.func(yes, () => {
+            return { message: 'Invalid yes function', type: typeof yes, method: 'both' };
+        });
+        common_1.$assert.func(no, () => {
+            return { message: 'Invalid no function', type: typeof yes, method: 'both' };
+        });
+        flag ? yes() : no();
+        return this;
+    }
+    ifYes(flag, yes) {
+        common_1.$assert.func(yes, () => {
+            return { message: 'Invalid yes function', type: typeof yes, method: 'ifYes' };
+        });
+        if (flag) {
+            yes();
+        }
+        return this;
+    }
+    ifNo(flag, no) {
+        common_1.$assert.func(no, () => {
+            return { message: 'Invalid no function', type: typeof no, method: 'ifNo' };
+        });
+        if (!flag) {
+            no();
+        }
+        return this;
+    }
     /** @inheritDoc */
     clear() {
         this._lines.splice(0, this._lines.length);

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

@@ -39,8 +39,11 @@ export interface CbLine {
      * Replace marked line
      */
     replace(mark: string, line: string): boolean;
+    both(flag: boolean, yes: CbLineConditionalLambda, no: CbLineConditionalLambda): CbLine;
+    ifYes(flag: boolean, yes: CbLineConditionalLambda): CbLine;
+    ifNo(flag: boolean, no: CbLineConditionalLambda): CbLine;
     /**
-     * Builds an string from lines
+     * Builds a string from lines
      */
     end(): string;
     /**
@@ -56,3 +59,4 @@ export interface CbLine {
      */
     toString(): string;
 }
+export type CbLineConditionalLambda = () => void;

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

@@ -1,5 +1,5 @@
-import { CbAdapterService, type CbEntity, type CbError, type CbExecMutationOpt, type CbExecOpt, type CbExecTrashOpt } from "../adapter";
-import { Bucket, Cluster, Collection, type QueryOptions, Scope } from "couchbase";
+import { CbAdapterService, type CbEntity, type CbExecOpt } from "../adapter";
+import { Bucket, Cluster, Collection, Scope } from "couchbase";
 import type { CbRepoDef, CbRepoLike } from "./index.types";
 export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLike<E, ID> {
     protected colName: string;
@@ -19,7 +19,6 @@ export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLi
     /** @inheritDoc */
     readonly collection: Collection;
     protected constructor(colName: string, cb: CbAdapterService, _scopeName?: string, _bucketName?: string);
-    protected _pushIgnoredError<O extends CbExecMutationOpt>(opt: O, err: CbError): O;
     /**
      * Fetch urn from doc as doc._urn
      * */
@@ -43,53 +42,31 @@ export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLi
     /** @inheritDoc */
     onModuleInit(): Promise<void>;
     /** @inheritDoc */
-    urnByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<string | undefined>;
+    urnById(id: string, p1?: string | CbExecOpt): Promise<string | undefined>;
     /** @inheritDoc */
-    urnById(id: string, opt?: CbExecOpt): Promise<string | undefined>;
+    existsByUrn(urn: string, p1?: string | CbExecOpt): Promise<boolean>;
     /** @inheritDoc */
-    existsByUrn(urn: string, opt?: CbExecOpt): Promise<boolean>;
+    existsById(id: string, p1?: string | CbExecOpt): Promise<boolean>;
     /** @inheritDoc */
-    existsByUrnExtended(urn: string, query: QueryOptions, opt?: CbExecOpt): Promise<boolean>;
+    getByUrn(urn: string, p1?: string | CbExecOpt): Promise<E | undefined>;
     /** @inheritDoc */
-    existsById(id: string, opt?: CbExecOpt): Promise<boolean>;
+    getById(id: string, p1?: string | CbExecOpt): Promise<E | undefined>;
     /** @inheritDoc */
-    existsByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<boolean>;
+    listByUrn(urnList: string[], p1?: string | CbExecOpt): Promise<Array<E>>;
     /** @inheritDoc */
-    getByUrn(urn: string, opt?: CbExecOpt): Promise<E | undefined>;
+    listById(ids: string[], p1?: string | CbExecOpt): Promise<Array<E>>;
     /** @inheritDoc */
-    getByUrnExtended(urn: string, query: QueryOptions, opt?: CbExecOpt): Promise<E | undefined>;
+    removeByUrn(urn: string, p1?: string | CbExecOpt): Promise<string>;
     /** @inheritDoc */
-    getById(id: string, opt?: CbExecOpt): Promise<E | undefined>;
+    removeById(id: string, p1?: string | CbExecOpt): Promise<string>;
     /** @inheritDoc */
-    getByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<E | undefined>;
+    insert(doc: E, p1?: string | CbExecOpt): Promise<string>;
     /** @inheritDoc */
-    listByUrn(urnList: string[], opt?: CbExecOpt): Promise<Array<E>>;
+    replace(doc: E, p1?: string | CbExecOpt): Promise<string>;
     /** @inheritDoc */
-    listByUrnExtended(urnList: string[], query: QueryOptions, opt?: CbExecOpt): Promise<Array<E>>;
+    upsert(doc: E, p1?: string | CbExecOpt): Promise<string>;
     /** @inheritDoc */
-    listById(ids: string[], opt?: CbExecOpt): Promise<Array<E>>;
+    update(doc: Partial<E>, p1?: string | CbExecOpt): Promise<unknown>;
     /** @inheritDoc */
-    listByIdExtended(ids: string[], query: QueryOptions, opt?: CbExecOpt): Promise<Array<E>>;
-    /** @inheritDoc */
-    removeByUrn(urn: string, opt?: CbExecOpt): Promise<string>;
-    /** @inheritDoc */
-    removeByUrnExtended(urn: string, query: QueryOptions, opt?: CbExecOpt): Promise<string>;
-    /** @inheritDoc */
-    removeById(id: string, opt?: CbExecOpt): Promise<string>;
-    /** @inheritDoc */
-    removeByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<string>;
-    /** @inheritDoc */
-    insert(doc: E, opt?: CbExecMutationOpt): Promise<string>;
-    /** @inheritDoc */
-    replace(doc: E, opt?: CbExecMutationOpt): Promise<string>;
-    /** @inheritDoc */
-    upsert(doc: E, opt?: CbExecMutationOpt): Promise<string>;
-    /** @inheritDoc */
-    update(doc: Partial<E>, opt?: CbExecOpt): Promise<unknown>;
-    /** @inheritDoc */
-    updateExtended(doc: Partial<E>, query: QueryOptions, opt?: CbExecOpt): Promise<unknown>;
-    /** @inheritDoc */
-    trash(doc: E, opt?: CbExecTrashOpt): Promise<unknown>;
-    /** @inheritDoc */
-    trashExtended(doc: E, query: QueryOptions, opt?: CbExecTrashOpt): Promise<unknown>;
+    trash(doc: E, p1?: string | CbExecOpt): Promise<unknown>;
 }

package/dist/repo/cb.repo.js

@@ -31,19 +31,6 @@ class CbRepo {
             F_TRASH_ID = this.cb.f('_trashId');
         }
     }
-    // noinspection JSUnusedLocalSymbols
-    _pushIgnoredError(opt, err) {
-        if (!opt) {
-            opt = { ignoredErrors: [err] };
-        }
-        else if (!Array.isArray(opt.ignoredErrors)) {
-            opt.ignoredErrors = [err];
-        }
-        else if (!opt.ignoredErrors.includes(err)) {
-            opt.ignoredErrors.push(err);
-        }
-        return opt;
-    }
     /**
      * Fetch urn from doc as doc._urn
      * */
@@ -128,9 +115,10 @@ class CbRepo {
         });
     }
     /** @inheritDoc */
-    urnByIdExtended(id, query, opt) {
+    urnById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const opt = this.cb.buildOpt(p1, 'urnById');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT meta().id as ${F_URN}`)
@@ -138,25 +126,14 @@ class CbRepo {
                 .add(`WHERE (a.${F_ID} = ${this.cb.s(id)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
-            return (_a = (yield this.cb.execFirstExtended(this, lines.end(), query, opt))) === null || _a === void 0 ? void 0 : _a._urn;
+            return (_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
         });
     }
     /** @inheritDoc */
-    urnById(id, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.urnByIdExtended(id, undefined, opt);
-        });
-    }
-    /** @inheritDoc */
-    existsByUrn(urn, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.existsByUrnExtended(urn, undefined, opt);
-        });
-    }
-    /** @inheritDoc */
-    existsByUrnExtended(urn, query, opt) {
+    existsByUrn(urn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const opt = this.cb.buildOpt(p1, 'existsByUrn');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT meta().id as ${F_URN}`)
@@ -164,30 +141,20 @@ class CbRepo {
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add(`USE KEYS ${this.cb.s(urn)}`)
                 .add('LIMIT 1');
-            return ((_a = (yield this.cb.execFirstExtended(this, lines.end(), query, opt))) === null || _a === void 0 ? void 0 : _a._urn) !== undefined;
+            return ((_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn) !== undefined;
         });
     }
     /** @inheritDoc */
-    existsById(id, opt) {
+    existsById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.urnByIdExtended(id, undefined, opt)) !== undefined;
+            const opt = this.cb.buildOpt(p1, 'existsById');
+            return (yield this.urnById(id, opt)) !== undefined;
         });
     }
     /** @inheritDoc */
-    existsByIdExtended(id, query, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.urnByIdExtended(id, query, opt)) !== undefined;
-        });
-    }
-    /** @inheritDoc */
-    getByUrn(urn, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getByUrnExtended(urn, undefined, opt);
-        });
-    }
-    /** @inheritDoc */
-    getByUrnExtended(urn, query, opt) {
+    getByUrn(urn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'getByUrn');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT a.*`)
@@ -195,18 +162,13 @@ class CbRepo {
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add(`USE KEYS ${this.cb.s(urn)}`)
                 .add('LIMIT 1');
-            return this.cb.execFirstExtended(this, lines.end(), query, opt);
-        });
-    }
-    /** @inheritDoc */
-    getById(id, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getByIdExtended(id, undefined, opt);
+            return (yield this.cb.one(this, lines.end(), opt)).row;
         });
     }
     /** @inheritDoc */
-    getByIdExtended(id, query, opt) {
+    getById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'getById');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT a.*`)
@@ -214,18 +176,13 @@ class CbRepo {
                 .add(`WHERE (a.${F_ID} = ${this.cb.s(id)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
-            return this.cb.first(yield this.cb.execExtended(this, lines.end(), query, opt));
+            return (yield this.cb.one(this, lines.end(), opt)).row;
         });
     }
     /** @inheritDoc */
-    listByUrn(urnList, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.listByUrnExtended(urnList, undefined, opt);
-        });
-    }
-    /** @inheritDoc */
-    listByUrnExtended(urnList, query, opt) {
+    listByUrn(urnList, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'listByUrn');
             urnList = this._checkKeys(urnList);
             if (urnList.length < 1) {
                 return [];
@@ -236,18 +193,13 @@ class CbRepo {
                 .add(`FROM ${this.fullPath} a`)
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add(`USE KEYS [${urnList.map(urn => this.cb.s(urn)).join(',')}]`);
-            return this.cb.execExtended(this, lines.end(), query, opt);
-        });
-    }
-    /** @inheritDoc */
-    listById(ids, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.listByIdExtended(ids, undefined, opt);
+            return (yield this.cb.more(this, lines.end(), opt)).rows;
         });
     }
     /** @inheritDoc */
-    listByIdExtended(ids, query, opt) {
+    listById(ids, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'listById');
             ids = this._checkKeys(ids);
             if (ids.length < 1) {
                 return [];
@@ -258,19 +210,14 @@ class CbRepo {
                 .add(`FROM ${this.fullPath} a`)
                 .add(`WHERE (a.${F_ID} IN [${ids.map(id => this.cb.s(id)).join(',')}])`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`);
-            return this.cb.execExtended(this, lines.end(), query, opt);
-        });
-    }
-    /** @inheritDoc */
-    removeByUrn(urn, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.removeByUrnExtended(urn, undefined, opt);
+            return (yield this.cb.more(this, lines.end(), opt)).rows;
         });
     }
     /** @inheritDoc */
-    removeByUrnExtended(urn, query, opt) {
+    removeByUrn(urn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const opt = this.cb.buildOpt(p1, 'removeByUrn');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`DELETE
@@ -278,87 +225,72 @@ class CbRepo {
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add(`USE KEYS ${this.cb.s(urn)}`)
                 .add(`RETURNING a.${F_ID}`);
-            return (_a = (yield this.cb.execFirstExtended(this, lines.end(), query, opt))) === null || _a === void 0 ? void 0 : _a.id;
-        });
-    }
-    /** @inheritDoc */
-    removeById(id, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.removeByIdExtended(id, undefined, opt);
+            return (_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a.id;
         });
     }
     /** @inheritDoc */
-    removeByIdExtended(id, query, opt) {
+    removeById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const opt = this.cb.buildOpt(p1, 'removeById');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`DELETE FROM ${this.fullPath} a`)
                 .add(`WHERE (a.${F_ID} = ${this.cb.s(id)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`)
                 .add(`RETURNING meta().id ${F_URN}`);
-            return (_a = (yield this.cb.execFirstExtended(this, lines.end(), query, opt))) === null || _a === void 0 ? void 0 : _a._urn;
+            return (_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
         });
     }
     /** @inheritDoc */
-    insert(doc, opt) {
+    insert(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'insert');
             const urn = this._urnFromDoc(doc, 'insert');
             doc.createdAt = new Date().toISOString();
             doc.updatedAt = new Date().toISOString();
-            const result = yield this.cb.exec1(this, this.collection.insert(urn, doc), opt);
+            const result = yield this.cb.exec(this.collection.insert(urn, doc), opt);
             return (result === null || result === void 0 ? void 0 : result.token) ? result.token.toString() : 'inserted';
         });
     }
     /** @inheritDoc */
-    replace(doc, opt) {
+    replace(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'replace');
             const urn = this._urnFromDoc(doc, 'replace');
             doc.updatedAt = new Date().toISOString();
-            const result = yield this.cb.exec1(this, this.collection.replace(urn, doc), opt);
+            const result = yield this.cb.exec(this.collection.replace(urn, doc), opt);
             return (result === null || result === void 0 ? void 0 : result.token) ? result.token.toString() : 'inserted';
         });
     }
     /** @inheritDoc */
-    upsert(doc, opt) {
+    upsert(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'upsert');
             const urn = this._urnFromDoc(doc, 'upsert');
             doc.updatedAt = new Date().toISOString();
-            const result = yield this.cb.exec1(this, this.collection.upsert(urn, doc), opt);
+            const result = yield this.cb.exec(this.collection.upsert(urn, doc), opt);
             return (result === null || result === void 0 ? void 0 : result.token) ? result.token.toString() : 'modified';
         });
     }
     /** @inheritDoc */
-    update(doc, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.updateExtended(doc, undefined, opt);
-        });
-    }
-    /** @inheritDoc */
-    updateExtended(doc, query, opt) {
+    update(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const opt = this.cb.buildOpt(p1, 'update');
             const urn = this._urnFromDoc(doc, 'update');
             doc.updatedAt = new Date().toISOString();
             doc.updatedAt = new Date().toISOString();
             const sql = this._updateSql(urn, doc);
-            return (_a = (yield this.cb.execFirstExtended(this, sql, query, opt))) === null || _a === void 0 ? void 0 : _a._urn;
-        });
-    }
-    /** @inheritDoc */
-    trash(doc, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.trashExtended(doc, undefined, opt);
+            return (_a = (yield this.cb.one(this, sql, opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
         });
     }
     /** @inheritDoc */
-    trashExtended(doc, query, opt) {
+    trash(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
+            const opt = this.cb.buildOpt(p1, 'trash');
             const urn = this._urnFromDoc(doc, 'trash');
-            if (!opt) {
-                opt = { trashId: (0, node_crypto_1.randomUUID)() };
-            }
-            else if (!opt.trashId) {
+            if (opt.trashId === undefined) {
                 opt.trashId = (0, node_crypto_1.randomUUID)();
             }
             const lines = (0, line_1.cbLine)();
@@ -367,7 +299,7 @@ class CbRepo {
                 .add(`SET a.${F_TRASH_ID} = ${this.cb.s(opt.trashId)}`)
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add(`USE KEYS ${this.cb.s(urn)}`);
-            yield this.cb.execExtended(this, lines.end(), query, opt);
+            yield this.cb.one(this, lines.end(), opt);
             return opt.trashId;
         });
     }

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

@@ -1,5 +1,5 @@
-import type { Bucket, Cluster, Collection, QueryOptions, Scope } from "couchbase";
-import type { CbEntity, CbExecMutationOpt, CbExecOpt, CbExecTrashOpt } from "../adapter";
+import type { Bucket, Cluster, Collection, Scope } from "couchbase";
+import type { CbEntity, CbExecOpt } from "../adapter";
 export interface CbRepoLike<E extends CbEntity, ID> {
     /**
      * Readable Bucket/Scope/Collection path
@@ -37,103 +37,73 @@ export interface CbRepoLike<E extends CbEntity, ID> {
     /**
      * Get urn by id
      * */
+    urnById(id: string, name?: string): Promise<string | undefined>;
     urnById(id: string, opt?: CbExecOpt): Promise<string | undefined>;
-    /**
-     * Get urn by id with CB configuration
-     * */
-    urnByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<string | undefined>;
     /**
      * Doc exists by urn?
      * */
+    existsByUrn(urn: string, name?: string): Promise<boolean>;
     existsByUrn(urn: string, opt?: CbExecOpt): Promise<boolean>;
-    /**
-     * Doc exists by urn? with CB configuration
-     * */
-    existsByUrnExtended(urn: string, query: QueryOptions, opt?: CbExecOpt): Promise<boolean>;
     /**
      * Doc exists by id?
      * */
+    existsById(id: string, name?: string): Promise<boolean>;
     existsById(id: string, opt?: CbExecOpt): Promise<boolean>;
-    /**
-     * Doc exists by id? with CB configuration
-     * */
-    existsByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<boolean>;
     /**
      * Get doc by urn
      * */
+    getByUrn(urn: string, name?: string): Promise<E | undefined>;
     getByUrn(urn: string, opt?: CbExecOpt): Promise<E | undefined>;
-    /**
-     * Get doc by urn with CB configuration
-     * */
-    getByUrnExtended(urn: string, query: QueryOptions, opt?: CbExecOpt): Promise<E | undefined>;
     /**
      * Get doc by id
      * */
+    getById(id: string, name?: string): Promise<E | undefined>;
     getById(id: string, opt?: CbExecOpt): Promise<E | undefined>;
-    /**
-     * Get doc by id with CB configuration
-     * */
-    getByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<E | undefined>;
     /**
      * Get doc by urn
      * */
+    listByUrn(urnList: string[], name?: string): Promise<Array<E>>;
     listByUrn(urnList: string[], opt?: CbExecOpt): Promise<Array<E>>;
-    /**
-     * Get doc by urn with CB configuration
-     * */
-    listByUrnExtended(urnList: string[], query: QueryOptions, opt?: CbExecOpt): Promise<Array<E>>;
     /**
      * Get doc by id
      * */
+    listById(ids: string[], name?: string): Promise<Array<E>>;
     listById(ids: string[], opt?: CbExecOpt): Promise<Array<E>>;
-    /**
-     * Get doc by id with CB configuration
-     * */
-    listByIdExtended(ids: string[], query: QueryOptions, opt?: CbExecOpt): Promise<Array<E>>;
     /**
      * Remove doc by urn
      * */
+    removeByUrn(urn: string, name?: string): Promise<string>;
     removeByUrn(urn: string, opt?: CbExecOpt): Promise<string>;
-    /**
-     * Remove doc by urn with CB configuration
-     * */
-    removeByUrnExtended(urn: string, query: QueryOptions, opt?: CbExecOpt): Promise<string>;
     /**
      * Remove doc by urn
      * */
+    removeById(id: string, name?: string): Promise<string>;
     removeById(id: string, opt?: CbExecOpt): Promise<string>;
-    /**
-     * Remove doc by urn with CB configuration
-     * */
-    removeByIdExtended(id: string, query: QueryOptions, opt?: CbExecOpt): Promise<string>;
     /**
      * Create doc by entity
      * */
-    insert(doc: E, opt?: CbExecMutationOpt): Promise<string>;
+    insert(doc: E, name?: string): Promise<string>;
+    insert(doc: E, opt?: CbExecOpt): Promise<string>;
     /**
      * Replace doc by entity
      * */
-    replace(doc: E, opt?: CbExecMutationOpt): Promise<string>;
+    replace(doc: E, name?: string): Promise<string>;
+    replace(doc: E, opt?: CbExecOpt): Promise<string>;
     /**
      * Upsert doc by entity (insert vs update)
      * */
-    upsert(doc: E, opt?: CbExecMutationOpt): Promise<string>;
+    upsert(doc: E, name?: string): Promise<string>;
+    upsert(doc: E, opt?: CbExecOpt): Promise<string>;
     /**
      * Update doc
      * */
+    update(doc: Partial<E>, name?: string): Promise<unknown>;
     update(doc: Partial<E>, opt?: CbExecOpt): Promise<unknown>;
-    /**
-     * Update doc with CB configuration
-     * */
-    updateExtended(doc: Partial<E>, query: QueryOptions, opt?: CbExecOpt): Promise<unknown>;
     /**
      * Trash doc by entity
      * */
-    trash(doc: E, opt?: CbExecTrashOpt): Promise<unknown>;
-    /**
-     * Trash doc by entity with CB configuration
-     * */
-    trashExtended(doc: E, query: QueryOptions, opt?: CbExecTrashOpt): Promise<unknown>;
+    trash(doc: E, name?: string): Promise<unknown>;
+    trash(doc: E, opt?: CbExecOpt): Promise<unknown>;
 }
 export interface CbOnlyUrnRec {
     _urn: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-couchbase-common",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "Couchbase common component",
   "keywords": [
     "Couchbase"
@@ -67,9 +67,9 @@
   },
   "dependencies": {
     "@leyyo/common": "^1.0.13",
-    "@leyyo/env": "^1.0.11",
+    "@leyyo/env": "^1.0.13",
     "@nestjs/common": "^11.0.20",
-    "@samet-it/be-base-common": "^1.0.6",
+    "@samet-it/be-base-common": "^1.0.9",
     "couchbase": "^4.6.0"
   }
 }