@opra/elastic 1.12.5 → 1.13.0

package/cjs/elastic-entity-service.js

@@ -101,16 +101,19 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             id: input._id,
             document: doc,
         };
-        const client = this.getClient();
-        const r = options?.replaceIfExists
-            ? await client.index(request, options?.transport)
-            : await client.create(request, options?.transport);
+        const r = await this.__create(request, options);
         /* istanbul ignore next */
         if (!(r._id && (r.result === 'created' || r.result === 'updated'))) {
             throw new common_1.InternalServerError(`Unknown error while creating document for "${this.getResourceName()}"`);
         }
         return r;
     }
+    async __create(request, options) {
+        const client = this.getClient();
+        return options?.replaceIfExists
+            ? await client.index(request, options?.transport)
+            : await client.create(request, options?.transport);
+    }
     /**
      * Returns the count of documents in the collection based on the provided options.
      *
@@ -134,6 +137,9 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             ...options?.request,
             query,
         };
+        return this.__count(request, options);
+    }
+    __count(request, options) {
         const client = this.getClient();
         return client.count(request, options?.transport);
     }
@@ -162,8 +168,7 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             ...options?.request,
             query,
         };
-        const client = this.getClient();
-        return client.deleteByQuery(request, options?.transport);
+        return this.__delete(request, options);
     }
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
@@ -188,6 +193,9 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             index: this.getIndexName(),
             query,
         };
+        return await this.__delete(request, options);
+    }
+    async __delete(request, options) {
         const client = this.getClient();
         return client.deleteByQuery(request, options?.transport);
     }
@@ -219,8 +227,7 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             ...options?.request,
             query,
         };
-        const client = this.getClient();
-        const r = await client.search(request, options?.transport);
+        const r = await this.__findMany(request, options);
         if (options?.noDecode)
             return r;
         if (r.hits.hits?.length) {
@@ -235,6 +242,10 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
         }
         return r;
     }
+    async __findMany(request, options) {
+        const client = this.getClient();
+        return client.search(request, options?.transport);
+    }
     /**
      * Executes a search operation on the Elasticsearch index using the provided search command.
      *
@@ -317,6 +328,9 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             script,
             query,
         };
+        return await this.__update(request, options);
+    }
+    async __update(request, options) {
         const client = this.getClient();
         return client.updateByQuery(request, options?.transport);
     }

package/esm/elastic-entity-service.js

@@ -98,16 +98,19 @@ export class ElasticEntityService extends ElasticService {
             id: input._id,
             document: doc,
         };
-        const client = this.getClient();
-        const r = options?.replaceIfExists
-            ? await client.index(request, options?.transport)
-            : await client.create(request, options?.transport);
+        const r = await this.__create(request, options);
         /* istanbul ignore next */
         if (!(r._id && (r.result === 'created' || r.result === 'updated'))) {
             throw new InternalServerError(`Unknown error while creating document for "${this.getResourceName()}"`);
         }
         return r;
     }
+    async __create(request, options) {
+        const client = this.getClient();
+        return options?.replaceIfExists
+            ? await client.index(request, options?.transport)
+            : await client.create(request, options?.transport);
+    }
     /**
      * Returns the count of documents in the collection based on the provided options.
      *
@@ -131,6 +134,9 @@ export class ElasticEntityService extends ElasticService {
             ...options?.request,
             query,
         };
+        return this.__count(request, options);
+    }
+    __count(request, options) {
         const client = this.getClient();
         return client.count(request, options?.transport);
     }
@@ -159,8 +165,7 @@ export class ElasticEntityService extends ElasticService {
             ...options?.request,
             query,
         };
-        const client = this.getClient();
-        return client.deleteByQuery(request, options?.transport);
+        return this.__delete(request, options);
     }
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
@@ -185,6 +190,9 @@ export class ElasticEntityService extends ElasticService {
             index: this.getIndexName(),
             query,
         };
+        return await this.__delete(request, options);
+    }
+    async __delete(request, options) {
         const client = this.getClient();
         return client.deleteByQuery(request, options?.transport);
     }
@@ -216,8 +224,7 @@ export class ElasticEntityService extends ElasticService {
             ...options?.request,
             query,
         };
-        const client = this.getClient();
-        const r = await client.search(request, options?.transport);
+        const r = await this.__findMany(request, options);
         if (options?.noDecode)
             return r;
         if (r.hits.hits?.length) {
@@ -232,6 +239,10 @@ export class ElasticEntityService extends ElasticService {
         }
         return r;
     }
+    async __findMany(request, options) {
+        const client = this.getClient();
+        return client.search(request, options?.transport);
+    }
     /**
      * Executes a search operation on the Elasticsearch index using the provided search command.
      *
@@ -314,6 +325,9 @@ export class ElasticEntityService extends ElasticService {
             script,
             query,
         };
+        return await this.__update(request, options);
+    }
+    async __update(request, options) {
         const client = this.getClient();
         return client.updateByQuery(request, options?.transport);
     }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@opra/elastic",
-  "version": "1.12.5",
+  "version": "1.13.0",
   "description": "Opra Elastic Search adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@jsopen/objects": "^1.5.2",
     "tslib": "^2.8.1",
-    "valgen": "^5.13.4"
+    "valgen": "^5.14.0"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": ">=8.7.0 <9",
-    "@opra/common": "^1.12.5",
-    "@opra/core": "^1.12.5"
+    "@opra/common": "^1.13.0",
+    "@opra/core": "^1.13.0"
   },
   "type": "module",
   "exports": {

package/types/elastic-entity-service.d.ts

@@ -232,6 +232,7 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      * @protected
      */
     protected _create(command: ElasticEntityService.CreateCommand): Promise<ElasticEntityService.CreateResponse>;
+    protected __create(request: ElasticEntityService.CreateRequest, options?: ElasticEntityService.CreateOptions): Promise<estypes.WriteResponseBase>;
     /**
      * Returns the count of documents in the collection based on the provided options.
      *
@@ -239,6 +240,7 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      * @protected
      */
     protected _count(command: ElasticEntityService.CountCommand): Promise<ElasticEntityService.CountResponse>;
+    protected __count(request: ElasticEntityService.CountRequest, options?: ElasticEntityService.CountOptions): Promise<estypes.CountResponse>;
     /**
      * Deletes a document from the collection.
      *
@@ -253,12 +255,14 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      * @protected
      */
     protected _deleteMany(command: ElasticEntityService.DeleteManyCommand): Promise<ElasticEntityService.DeleteByQueryResponse>;
+    protected __delete(request: ElasticEntityService.DeleteByQueryRequest, options?: ElasticEntityService.DeleteOptions): Promise<estypes.DeleteByQueryResponse>;
     /**
      * Returns search hits that match the query defined in the request
      *
      * @param {ElasticEntityService.FindManyCommand} command
      */
     protected _findMany(command: ElasticEntityService.FindManyCommand): Promise<ElasticEntityService.SearchResponse<PartialDTO<T>>>;
+    protected __findMany(request: ElasticEntityService.SearchRequest, options?: ElasticEntityService.FindManyOptions): Promise<estypes.SearchResponse<T, Record<string, estypes.AggregationsAggregate>>>;
     /**
      * Executes a search operation on the Elasticsearch index using the provided search command.
      *
@@ -272,6 +276,7 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      * @param {ElasticEntityService.UpdateCommand<T>} command
      */
     protected _updateMany(command: ElasticEntityService.UpdateCommand<T>): Promise<ElasticEntityService.UpdateByQueryResponse>;
+    protected __update(request: ElasticEntityService.UpdateByQueryRequest, options?: ElasticEntityService.UpdateManyOptions): Promise<estypes.UpdateByQueryResponse>;
     /**
      * Generates an ID.
      *