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

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

@@ -8,6 +8,7 @@ export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLi
     private _scopeName?;
     private _bucketName?;
     private _tryCount;
+    private _pkIndexed;
     protected logger: Logger;
     /** @inheritDoc */
     readonly fullPath: string;
@@ -22,6 +23,8 @@ 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);
+    private get _randomIndexName();
+    protected _indexName(name: string): string;
     /**
      * Fetch urn from doc as doc._urn
      * */
@@ -45,7 +48,7 @@ export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLi
     /**
      * Execute the creation of indexes with keys
      * */
-    protected _createMoreIndices(...keys: Array<keyof CbEntity>): Promise<void>;
+    protected _createMoreIndices(...keys: Array<keyof E>): Promise<void>;
     /**
      * Execute the creation of primary key
      * */

package/dist/repo/cb.repo.js

@@ -35,6 +35,31 @@ class CbRepo {
             F_TRASH_ID = cb.f('_trashId');
         }
     }
+    get _randomIndexName() {
+        return 'idx_' + (0, node_crypto_1.randomUUID)().match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g)
+            .map(s => s.toLowerCase())
+            .join('_');
+    }
+    _indexName(name) {
+        if (typeof name !== 'string') {
+            return this._randomIndexName;
+        }
+        name = name.trim();
+        if (name === '') {
+            return this._randomIndexName;
+        }
+        name = name.match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g)
+            .map(s => s.toLowerCase())
+            .join('_');
+        name = name.replace(/^_+|_+$/g, '');
+        if (name === '') {
+            return this._randomIndexName;
+        }
+        if (!name.startsWith('idx_')) {
+            name = 'idx_' + name;
+        }
+        return name;
+    }
     /**
      * Fetch urn from doc as doc._urn
      * */
@@ -107,17 +132,16 @@ class CbRepo {
             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];
+                const given = p1;
+                if (!common_1.$is.text(name)) {
+                    name = given.map(item => item.split('.').pop()).join('.');
                 }
+                fields.push(...given.map(f => this.cb.f(f)));
             }
             else {
                 fields.push(p1);
             }
-            if (!name.startsWith('idx_')) {
-                name = 'idx_' + name;
-            }
+            name = this._indexName(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] });
         });
@@ -127,9 +151,22 @@ class CbRepo {
      * */
     _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);
+            const already = [];
+            const promises = keys
+                .filter(k => {
+                if (already.includes(k)) {
+                    return false;
+                }
+                already.push(k);
+                return true;
+            })
+                .map(k => this._createIndex(k));
+            if (!this._pkIndexed) {
+                promises.push(this._createPk());
+            }
+            if (promises.length > 0) {
+                yield Promise.all(promises);
+            }
         });
     }
     /**
@@ -137,8 +174,11 @@ class CbRepo {
      * */
     _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] });
+            if (!this._pkIndexed) {
+                const sql = `CREATE PRIMARY INDEX \`pk\` ON ${this.fullPath}`;
+                yield this.cb.one(this.def, sql, { name: `${this.path}.pk`, ignoredErrors: [couchbase_1.IndexExistsError] });
+                this._pkIndexed = true;
+            }
         });
     }
     /** @inheritDoc */

package/package.json

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