@samet-it/be-couchbase-common 1.0.8 → 1.0.10

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

@@ -1,14 +1,12 @@
-import { Cluster, Collection, QueryResult } from 'couchbase';
+import { Cluster, QueryResult } from 'couchbase';
 import type { IgnoreFieldsByType, ReplaceType } from "@leyyo/common";
-import type { CbAdapterServiceLike, CbEntity, CbExecOpt, CbQueryResultMore, CbQueryResultOne } from "./index.types";
+import type { CbAdapterServiceLike, CbExecOpt, CbQueryResultMore, CbQueryResultOne } from "./index.types";
 import type { CbRepoDef } from "../repo";
 export declare class CbAdapterService implements CbAdapterServiceLike {
     private readonly _CLEAR_ERROR_INTERVAL;
     private logger;
     private _connected;
-    private _undefined;
     private _cluster;
-    private readonly _cbErrors;
     private readonly _nativeErrors;
     constructor();
     /**
@@ -19,25 +17,14 @@ export declare class CbAdapterService implements CbAdapterServiceLike {
      * Ping to DB
      * */
     private _ping;
-    /**
-     * Execute the creation of index
-     * */
-    private _createIndex;
-    /**
-     * Build json format of CB object
-     * */
-    private _toJson;
     protected _checkError(err: Error, opt: CbExecOpt): void;
     /** {@inheritDoc} */
     f(field: string): string;
     /** {@inheritDoc} */
     field(field: string): string;
-    s(value: string): string;
     v(value: unknown): string;
     value(value: unknown): string;
     /** {@inheritDoc} */
-    string(value: string): string;
-    /** {@inheritDoc} */
     flatten<T>(result: QueryResult<T>): Array<T>;
     /** {@inheritDoc} */
     rows<T>(rows: Array<T>): Array<T>;
@@ -46,14 +33,6 @@ export declare class CbAdapterService implements CbAdapterServiceLike {
     /** {@inheritDoc} */
     first<T>(rows: Array<T>): T | undefined;
     /** {@inheritDoc} */
-    checkError(p1: string | Error, p2?: Error): void;
-    /** {@inheritDoc} */
-    createIndex<T = Record<string, unknown>>(coll: Collection, p1: (keyof T | string) | Array<keyof T | string>, name?: string): Promise<void>;
-    /** {@inheritDoc} */
-    createBaseIndices(coll: Collection, ...keys: Array<keyof CbEntity>): Promise<void>;
-    /** {@inheritDoc} */
-    createPk(coll: Collection): Promise<void>;
-    /** {@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;

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

@@ -55,24 +55,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CbAdapterService = void 0;
 const couchbase = __importStar(require("couchbase"));
 const common_1 = require("@nestjs/common");
-const couchbase_1 = require("couchbase");
 const config_1 = require("../config");
+const common_2 = require("@leyyo/common");
 // noinspection JSUnusedGlobalSymbols
 let CbAdapterService = class CbAdapterService {
     constructor() {
         this._CLEAR_ERROR_INTERVAL = 1000 * 60 * 60 * 24; // daily
-        this._undefined = 0;
-        this._cbErrors = new Map();
         this._nativeErrors = new Map();
         this.logger = new common_1.Logger(this.constructor.name);
         this._clearErrors();
-        this._cbErrors.set('AmbiguousTimeoutError', { count: 0, log: true, known: true });
-        this._cbErrors.set('AuthenticationFailureError', { count: 0, log: true, known: true });
-        this._cbErrors.set('ConnectionClosedError', { count: 0, log: true, known: true });
-        this._cbErrors.set('InternalServerFailureError', { count: 0, log: true, known: true });
-        this._cbErrors.set('ServiceNotAvailableError', { count: 0, log: true, known: true });
-        this._cbErrors.set('TimeoutError', { count: 0, log: true, known: true });
-        this._cbErrors.set('UnambiguousTimeoutError', { count: 0, log: true, known: true });
     }
     /**
      * Clear native errors
@@ -90,113 +81,45 @@ let CbAdapterService = class CbAdapterService {
                 yield this.exec(this._cluster.ping(), { name: 'ping' });
             }
             catch (err) {
+                this.logger.warn(`Ping error => [${err.name}: ${err.message}]`);
             }
             setTimeout(() => this._ping(), 30000);
         });
     }
-    /**
-     * Execute the creation of index
-     * */
-    _createIndex(scope, sql) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            try {
-                return yield scope.query(sql);
-            }
-            catch (e) {
-                if (e instanceof couchbase_1.IndexExistsError) {
-                    return undefined;
-                }
-                this.logger.error(`!index[${(_a = e.name) !== null && _a !== void 0 ? _a : ''}] #${scope.name}] => ${sql}`, e);
-                // throw e; // TODO
-            }
-        });
-    }
-    /**
-     * Build json format of CB object
-     * */
-    _toJson(val) {
-        if ([undefined, null].includes(val)) {
-            return 'null';
-        }
-        switch (typeof val) {
-            case "string":
-            case "number":
-            case "bigint":
-            case "boolean":
-                return JSON.stringify(val);
-            case "object":
-                if (Array.isArray(val)) {
-                    return '[' + val
-                        .filter(v => v !== undefined)
-                        .map(v => this._toJson(v))
-                        .join(', ') + ']';
-                }
-                else if (val instanceof Map) {
-                    return this._toJson(Object.fromEntries(val.entries()));
-                }
-                else if (val instanceof Set) {
-                    return this._toJson(Array.from(val.values()));
-                }
-                else {
-                    return '{' + Array.from(Object.entries(val))
-                        .filter(item => item[1] !== undefined)
-                        .map(item => {
-                        const [k, v] = item;
-                        return '`' + k + '`: ' + this._toJson(v);
-                    }).join(', ') + '}';
-                }
-            case "symbol":
-                return JSON.stringify(val.description);
-            case "function":
-            case "undefined":
-                return 'null';
-        }
-    }
     _checkError(err, opt) {
-        var _a;
+        var _a, _b, _c;
+        let size = 1;
         if (!this._nativeErrors.has(err)) {
-            this._nativeErrors.set(err, 1);
+            this._nativeErrors.set(err, size);
         }
         else {
-            this._nativeErrors.set(err, this._nativeErrors.get(err) + 1);
+            size = this._nativeErrors.get(err) + 1;
+            this._nativeErrors.set(err, size);
         }
         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}`);
+            this.logger.warn(`[${size}] ${(_b = opt.name) !== null && _b !== void 0 ? _b : 'Ignored error'} => [${err.name}: ${err.message}]`);
             return;
         }
-        this.logger.debug(`${opt.name} => (${err.name})${err.message}`, JSON.stringify(err.context));
+        this.logger.error(`[${size}] ${(_c = opt.name) !== null && _c !== void 0 ? _c : 'Database error'} => [${err.name}: ${err.message}]`, JSON.stringify(err.context));
         throw err;
     }
     /** {@inheritDoc} */
     f(field) {
-        if (field.includes('.')) {
-            return field.split('.').map(part => this.f(part)).join('.');
-        }
-        else if (field.startsWith('`')) {
-            return field;
-        }
-        return `\`${field}\``;
+        return this.field(field);
     }
     /** {@inheritDoc} */
     field(field) {
-        return this.f(field);
-    }
-    s(value) {
-        if (typeof value === 'string') {
-            return value.includes('"') ? this._toJson(value) : `"${value}"`;
+        field = field.trim();
+        if (field.includes('.')) {
+            return field.split('.').map(part => this.field(part)).join('.');
         }
-        return this._toJson(value);
+        return field.startsWith('`') ? field : `\`${field}\``;
     }
     v(value) {
-        return this._toJson(value);
+        return this.value(value);
     }
     value(value) {
-        return this._toJson(value);
-    }
-    /** {@inheritDoc} */
-    string(value) {
-        return this.s(value);
+        return common_2.$dev.secureJson(value);
     }
     /** {@inheritDoc} */
     flatten(result) {
@@ -227,91 +150,6 @@ let CbAdapterService = class CbAdapterService {
         return undefined;
     }
     /** {@inheritDoc} */
-    checkError(p1, p2) {
-        var _a;
-        let op;
-        let err;
-        if (typeof p1 === 'string') {
-            p1 = p1.trim();
-            op = p1 ? `(${p1})` : '';
-            err = p2;
-        }
-        else {
-            op = '';
-            err = p1;
-        }
-        const name = (_a = err === null || err === void 0 ? void 0 : err.constructor) === null || _a === void 0 ? void 0 : _a.name;
-        if (name) {
-            if (!this._cbErrors.has(name)) {
-                this.logger.warn(`!first[${name}] #${op} [1]`, err);
-                this._cbErrors.set(name, { count: 1, log: true });
-            }
-            else {
-                const obj = this._cbErrors.get(name);
-                obj.count++;
-                if (obj.known) {
-                    this.logger.debug(`!known[${name}] #${op} [${obj.count}]`, err);
-                }
-                else {
-                    this.logger.debug(`!unknown[${name}] #${op} [${obj.count}]`, err);
-                }
-            }
-        }
-        else {
-            this._undefined++;
-            this.logger.warn(`!undefined[] #${op} [${this._undefined}]`, err);
-        }
-    }
-    /** {@inheritDoc} */
-    createIndex(coll, p1, name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (Array.isArray(p1)) {
-                const fields = p1.map(f => f.split('.').map(part => '`' + part + '`').join('.'));
-                name = name.split('.').join('_').split('-').join('_');
-                if (!name.startsWith('idx_')) {
-                    name = 'idx_' + name;
-                }
-                yield this._createIndex(coll.scope, `CREATE INDEX \`${name}\` ON \`${coll.name}\` (${fields.join(', ')})`);
-            }
-            else {
-                const field = p1;
-                if (!name) {
-                    name = 'idx_' + field.split('.').join('_').split('-').join('_');
-                }
-                else if (!name.startsWith('idx_')) {
-                    name = 'idx_' + name;
-                }
-                yield this._createIndex(coll.scope, `CREATE INDEX \`${name}\` ON \`${coll.name}\` (${field.split('.').map(part => '`' + part + '`').join('.')})`);
-            }
-        });
-    }
-    /** {@inheritDoc} */
-    createBaseIndices(coll, ...keys) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (keys.includes('id')) {
-                yield this.createIndex(coll, 'id');
-            }
-            if (keys.includes('createdAt')) {
-                yield this.createIndex(coll, 'createdAt');
-            }
-            if (keys.includes('updatedAt')) {
-                yield this.createIndex(coll, 'updatedAt');
-            }
-            if (keys.includes('_trashId')) {
-                yield this.createIndex(coll, '_trashId', 'trashId');
-            }
-            if (keys.includes('_urn')) {
-                yield this.createIndex(coll, '_urn', 'urn');
-            }
-        });
-    }
-    /** {@inheritDoc} */
-    createPk(coll) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this._createIndex(coll.scope, `CREATE PRIMARY INDEX \`pk\` ON \`${coll.name}\``);
-        });
-    }
-    /** {@inheritDoc} */
     castDates(given, ...fields) {
         if (fields.length < 1) {
             return;
@@ -410,7 +248,6 @@ let CbAdapterService = class CbAdapterService {
     /** {@inheritDoc} */
     connectDb() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (this._connected) {
                 return this._cluster;
             }
@@ -426,7 +263,7 @@ let CbAdapterService = class CbAdapterService {
                 return this._cluster;
             }
             catch (e) {
-                this.logger.error(`!connection[${(_a = e.name) !== null && _a !== void 0 ? _a : ''}]`, e);
+                this.logger.error(`Connection error => [${e.name}: ${e.message}]`);
                 throw e;
             }
         });

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

@@ -1,7 +1,6 @@
-import { Scope, Cluster, Collection, QueryResult, QueryOptions, QueryMetaData } from "couchbase";
+import { Cluster, Collection, CouchbaseError, QueryMetaData, QueryOptions, QueryResult, Scope } 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
@@ -11,14 +10,6 @@ export interface CbAdapterServiceLike {
      * Field name
      * */
     f(field: string): string;
-    /**
-     * Basic value: string
-     * */
-    string(value: string): string;
-    /**
-     * Basic value: string
-     * */
-    s(value: string): string;
     /**
      * Complex value
      * */
@@ -43,30 +34,6 @@ export interface CbAdapterServiceLike {
      * Return first row of rows
      * */
     first<T>(rows: Array<T>): T | undefined;
-    /**
-     * Check error
-     * */
-    checkError(err: Error): void;
-    /**
-     * Check error with operation
-     * */
-    checkError(op: string, err: Error): void;
-    /**
-     * Create index for multiple fields
-     * */
-    createIndex<T = Record<string, unknown>>(coll: Collection, fields: Array<keyof T | string>, name: string): Promise<void>;
-    /**
-     * Create index for a field
-     * */
-    createIndex<T = Record<string, unknown>>(coll: Collection, field: keyof T | string, name?: string): Promise<void>;
-    /**
-     * Create base indices for system fields
-     * */
-    createBaseIndices(coll: Collection, ...keys: Array<keyof CbEntity>): Promise<void>;
-    /**
-     * Create primary key
-     * */
-    createPk(coll: Collection): Promise<void>;
     /**
      * Cast dates
      * */
@@ -140,11 +107,6 @@ export interface CbEntity {
      * */
     _trashId?: string;
 }
-export interface CbErrorRec {
-    count: number;
-    log: boolean;
-    known?: boolean;
-}
 type CbIgnoreFields<T, I> = {
     [K in keyof T]: T[K] extends I ? K : never;
 }[keyof T];

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

@@ -53,17 +53,17 @@ 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)} ${field} = "${items[0]}"`;
+                return `${this._where(opt)} ${this.cb.f(field)} = ${this.cb.v(items[0])}`;
             }
             else {
-                return `${this._where(opt)} ${field} IN [${items.map(c => `"${c}"`).join(',')}]`;
+                return `${this._where(opt)} ${this.cb.f(field)} IN ${this.cb.v(items[0])}`;
             }
         }
     }
     /** @inheritDoc */
     sqlBool(opt, field, value) {
         if (typeof value === 'boolean') {
-            return `${this._where(opt)} ${field} = ${value ? 'true' : 'false'}`;
+            return `${this._where(opt)} ${this.cb.f(field)} = ${value ? 'true' : 'false'}`;
         }
         return undefined;
     }
@@ -72,17 +72,22 @@ class CbFilterUtilImpl {
         if (Array.isArray(value) && value.length === 2) {
             const [first, last] = value.map(v => (v instanceof Date) ? v.toISOString() : v);
             if (first !== undefined && last !== undefined) {
-                return `${this._where(opt)} ${field} BETWEEN "${first}" AND "${last}"`;
+                return `${this._where(opt)} ${this.cb.f(field)} BETWEEN ${this.cb.v(first)} AND ${this.cb.v(last)}`;
             }
             else if (first !== undefined && last === undefined) {
-                return `${this._where(opt)} ${field} >= "${first}"`;
+                return `${this._where(opt)} ${this.cb.f(field)} >= ${this.cb.v(first)}`;
             }
             else if (first === undefined && last !== undefined) {
-                return `${this._where(opt)} ${field} <= "${last}"`;
+                return `${this._where(opt)} ${this.cb.f(field)} <= ${this.cb.v(last)}`;
             }
         }
         return undefined;
     }
+    $set(cb) {
+        if (!this.cb) {
+            this.cb = cb;
+        }
+    }
 }
 // noinspection JSUnusedGlobalSymbols
 exports.cbFilterUtil = new CbFilterUtilImpl();

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

@@ -34,6 +34,22 @@ export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLi
      * Build update sql as set and unset
      * */
     protected _updateSql<T>(urn: string, doc: T): string;
+    /**
+     * Execute the creation of index for one field
+     * */
+    protected _createIndex(field: keyof E | string, name?: string): Promise<void>;
+    /**
+     * Execute the creation of index for complex fields
+     * */
+    protected _createIndex(fields: Array<keyof E | string>, name: string): Promise<void>;
+    /**
+     * Execute the creation of indexes with keys
+     * */
+    protected _createMoreIndices(...keys: Array<keyof CbEntity>): Promise<void>;
+    /**
+     * Execute the creation of primary key
+     * */
+    protected _createPk(): Promise<void>;
     /**
      * Create indices
      * */

package/dist/repo/cb.repo.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CbRepo = void 0;
+const couchbase_1 = require("couchbase");
 const common_1 = require("@leyyo/common");
 const config_1 = require("../config");
 const line_1 = require("../line");
@@ -29,9 +30,9 @@ class CbRepo {
         this._tryCount = 0;
         this.logger = new common_2.Logger(this.constructor.name);
         if (!F_ID) {
-            F_ID = this.cb.f('id');
-            F_URN = this.cb.f('_urn');
-            F_TRASH_ID = this.cb.f('_trashId');
+            F_ID = cb.f('id');
+            F_URN = cb.f('_urn');
+            F_TRASH_ID = cb.f('_trashId');
         }
     }
     /**
@@ -57,10 +58,10 @@ class CbRepo {
         return keys
             .map(item => {
             switch (typeof item) {
-                case "string":
+                case 'string':
                     const str = item.trim();
                     return str ? str : undefined;
-                case "number":
+                case 'number':
                     return item;
                 default:
                     return undefined;
@@ -72,22 +73,23 @@ class CbRepo {
      * Build update sql as set and unset
      * */
     _updateSql(urn, doc) {
+        const cb = this.cb;
         const set = [];
         const unset = [];
         for (const [k, v] of Object.entries(doc)) {
             if (!['_urn', 'id'].includes(k)) {
                 if (v === undefined) {
-                    unset.push(this.cb.f(k));
+                    unset.push(cb.f(k));
                 }
                 else {
-                    set.push([this.cb.f(k), this.cb.v(v)]);
+                    set.push([cb.f(k), cb.v(v)]);
                 }
             }
         }
         const lines = (0, line_1.cbLine)();
         lines
             .add(`UPDATE ${this.fullPath}`)
-            .add(`USE KEYS ${this.cb.s(urn)}`);
+            .add(`USE KEYS ${cb.v(urn)}`);
         if (unset.length > 0) {
             lines.add('UNSET ', unset.join(', '));
         }
@@ -97,6 +99,48 @@ class CbRepo {
         lines.add(`RETURNING meta().id ${F_URN}`);
         return lines.end();
     }
+    /**
+     * Execute the creation of index
+     * */
+    _createIndex(p1, name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let sql;
+            const fields = [];
+            if (Array.isArray(p1)) {
+                fields.push(...p1.map(f => this.cb.f(f)));
+                if (common_1.$is.text(name)) {
+                    name = fields[0];
+                }
+            }
+            else {
+                fields.push(p1);
+            }
+            if (!name.startsWith('idx_')) {
+                name = 'idx_' + name;
+            }
+            sql = `CREATE INDEX ${this.cb.f(name)} ON ${this.fullPath} (${fields.join(', ')})`;
+            yield this.cb.one(this.def, sql, { name: `${this.path}.index`, ignoredErrors: [couchbase_1.IndexExistsError] });
+        });
+    }
+    /**
+     * Execute the creation of indexes with keys
+     * */
+    _createMoreIndices(...keys) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const promises = keys.map(k => this._createIndex(k));
+            promises.push(this._createPk());
+            yield Promise.all(promises);
+        });
+    }
+    /**
+     * Execute the creation of primary key
+     * */
+    _createPk() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sql = `CREATE PRIMARY INDEX \`pk\` ON ${this.fullPath}`;
+            yield this.cb.one(this.def, sql, { name: `${this.path}.pk`, ignoredErrors: [couchbase_1.IndexExistsError] });
+        });
+    }
     /** @inheritDoc */
     get def() {
         return this;
@@ -105,14 +149,15 @@ class CbRepo {
     onModuleInit() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            const cb = this.cb;
             const mutable = this;
             try {
-                mutable.cluster = yield this.cb.connectDb();
+                mutable.cluster = yield cb.connectDb();
                 mutable.bucket = this.cluster.bucket((_a = this._bucketName) !== null && _a !== void 0 ? _a : config_1.couchbaseCommonConfig.raw.CB_BUCKET);
                 mutable.scope = this.bucket.scope((_b = this._scopeName) !== null && _b !== void 0 ? _b : config_1.couchbaseCommonConfig.raw.CB_SCOPE);
                 mutable.collection = this.scope.collection(this.colName);
                 mutable.path = `${this.bucket.name}.${this.scope.name}.${this.collection.name}`;
-                mutable.fullPath = this.cb.f(`${this.bucket.name}.${this.scope.name}.${this.collection.name}`);
+                mutable.fullPath = cb.f(`${this.bucket.name}.${this.scope.name}.${this.collection.name}`);
                 if (config_1.couchbaseCommonConfig.raw.CB_CREATE_INDICES) {
                     yield this._createIndices();
                 }
@@ -122,7 +167,6 @@ class CbRepo {
                     throw e;
                 }
                 this._tryCount++;
-                this.logger.error(`[${this._tryCount}] ${e.name} => ${e.message}`);
                 setTimeout(() => this.onModuleInit().then().catch(e2 => {
                     throw e2;
                 }), 1000);
@@ -133,30 +177,32 @@ class CbRepo {
     urnById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const opt = this.cb.buildOpt(p1, 'urnById');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'urnById');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT meta().id as ${F_URN}`)
                 .add(`FROM ${this.fullPath} a`)
-                .add(`WHERE (a.${F_ID} = ${this.cb.s(id)})`)
+                .add(`WHERE (a.${F_ID} = ${cb.v(id)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
-            return (_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
+            return (_a = (yield cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
         });
     }
     /** @inheritDoc */
     existsByUrn(urn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const opt = this.cb.buildOpt(p1, 'existsByUrn');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'existsByUrn');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT meta().id as ${F_URN}`)
                 .add(`FROM ${this.fullPath} a`)
-                .add(`USE KEYS ${this.cb.s(urn)}`)
+                .add(`USE KEYS ${cb.v(urn)}`)
                 .add(`WHERE (a.${F_TRASH_ID} IS MISSING)`)
                 .add('LIMIT 1');
-            return ((_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn) !== undefined;
+            return ((_a = (yield cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn) !== undefined;
         });
     }
     /** @inheritDoc */
@@ -169,35 +215,38 @@ class CbRepo {
     /** @inheritDoc */
     getByUrn(urn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'getByUrn');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'getByUrn');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT a.*`)
                 .add(`FROM ${this.fullPath} a`)
-                .add(`USE KEYS ${this.cb.s(urn)}`)
+                .add(`USE KEYS ${cb.v(urn)}`)
                 .add(`WHERE (a.${F_TRASH_ID} IS MISSING)`)
                 .add('LIMIT 1');
-            return (yield this.cb.one(this, lines.end(), opt)).row;
+            return (yield cb.one(this, lines.end(), opt)).row;
         });
     }
     /** @inheritDoc */
     getById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'getById');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'getById');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`SELECT a.*`)
                 .add(`FROM ${this.fullPath} a`)
-                .add(`WHERE (a.${F_ID} = ${this.cb.s(id)})`)
+                .add(`WHERE (a.${F_ID} = ${cb.v(id)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`)
                 .add('LIMIT 1');
-            return (yield this.cb.one(this, lines.end(), opt)).row;
+            return (yield cb.one(this, lines.end(), opt)).row;
         });
     }
     /** @inheritDoc */
     listByUrn(urnList, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'listByUrn');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'listByUrn');
             urnList = this._checkKeys(urnList);
             if (urnList.length < 1) {
                 return [];
@@ -206,15 +255,16 @@ class CbRepo {
             lines
                 .add(`SELECT a.*`)
                 .add(`FROM ${this.fullPath} a`)
-                .add(`USE KEYS [${urnList.map(urn => this.cb.s(urn)).join(',')}]`)
+                .add(`USE KEYS ${cb.v(urnList)}`)
                 .add(`WHERE (a.${F_TRASH_ID} IS MISSING)`);
-            return (yield this.cb.more(this, lines.end(), opt)).rows;
+            return (yield cb.more(this, lines.end(), opt)).rows;
         });
     }
     /** @inheritDoc */
     listById(ids, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'listById');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'listById');
             ids = this._checkKeys(ids);
             if (ids.length < 1) {
                 return [];
@@ -223,68 +273,73 @@ class CbRepo {
             lines
                 .add(`SELECT a.*`)
                 .add(`FROM ${this.fullPath} a`)
-                .add(`WHERE (a.${F_ID} IN [${ids.map(id => this.cb.s(id)).join(',')}])`)
+                .add(`WHERE (a.${F_ID} ${ids.length === 1 ? '=' : 'IN'} ${cb.v(ids)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`);
-            return (yield this.cb.more(this, lines.end(), opt)).rows;
+            return (yield cb.more(this, lines.end(), opt)).rows;
         });
     }
     /** @inheritDoc */
     removeByUrn(urn, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const opt = this.cb.buildOpt(p1, 'removeByUrn');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'removeByUrn');
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`DELETE
                   FROM ${this.fullPath} a`)
-                .add(`USE KEYS ${this.cb.s(urn)}`)
+                .add(`USE KEYS ${cb.v(urn)}`)
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`)
                 .add(`RETURNING a.${F_ID}`);
-            return (_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a.id;
+            return (_a = (yield cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a.id;
         });
     }
     /** @inheritDoc */
     removeById(id, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const opt = this.cb.buildOpt(p1, 'removeById');
+            const cb = this.cb;
+            const opt = 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(`WHERE (a.${F_ID} = ${cb.v(id)})`)
                 .add(`AND (a.${F_TRASH_ID} is missing)`)
                 .add(`RETURNING meta().id ${F_URN}`);
-            return (_a = (yield this.cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
+            return (_a = (yield cb.one(this, lines.end(), opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
         });
     }
     /** @inheritDoc */
     insert(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'insert');
+            const cb = this.cb;
+            const opt = 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.exec(this.collection.insert(urn, doc), opt);
+            const result = yield 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, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'replace');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'replace');
             const urn = this._urnFromDoc(doc, 'replace');
             doc.updatedAt = new Date().toISOString();
-            const result = yield this.cb.exec(this.collection.replace(urn, doc), opt);
+            const result = yield 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, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'upsert');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'upsert');
             const urn = this._urnFromDoc(doc, 'upsert');
             doc.updatedAt = new Date().toISOString();
-            const result = yield this.cb.exec(this.collection.upsert(urn, doc), opt);
+            const result = yield cb.exec(this.collection.upsert(urn, doc), opt);
             return (result === null || result === void 0 ? void 0 : result.token) ? result.token.toString() : 'modified';
         });
     }
@@ -292,18 +347,20 @@ class CbRepo {
     update(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const opt = this.cb.buildOpt(p1, 'update');
+            const cb = this.cb;
+            const opt = 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.one(this, sql, opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
+            return (_a = (yield cb.one(this, sql, opt)).row) === null || _a === void 0 ? void 0 : _a._urn;
         });
     }
     /** @inheritDoc */
     trash(doc, p1) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opt = this.cb.buildOpt(p1, 'trash');
+            const cb = this.cb;
+            const opt = cb.buildOpt(p1, 'trash');
             const urn = this._urnFromDoc(doc, 'trash');
             if (opt.trashId === undefined) {
                 opt.trashId = (0, node_crypto_1.randomUUID)();
@@ -311,10 +368,10 @@ class CbRepo {
             const lines = (0, line_1.cbLine)();
             lines
                 .add(`UPDATE ${this.fullPath} a`)
-                .add(`USE KEYS ${this.cb.s(urn)}`)
-                .add(`SET a.${F_TRASH_ID} = ${this.cb.s(opt.trashId)}`)
+                .add(`USE KEYS ${cb.v(urn)}`)
+                .add(`SET a.${F_TRASH_ID} = ${cb.v(opt.trashId)}`)
                 .add(`WHERE (a.${F_TRASH_ID} is missing)`);
-            yield this.cb.one(this, lines.end(), opt);
+            yield cb.one(this, lines.end(), opt);
             return opt.trashId;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-couchbase-common",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Couchbase common component",
   "keywords": [
     "Couchbase"