@opra/elastic 1.11.1 → 1.12.1

package/cjs/elastic-entity-service.js

@@ -102,7 +102,9 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             document: doc,
         };
         const client = this.getClient();
-        const r = await client.create(request, options?.transport);
+        const r = options?.replaceIfExists
+            ? await client.index(request, options?.transport)
+            : await client.create(request, options?.transport);
         /* 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()}"`);

package/esm/elastic-entity-service.js

@@ -99,7 +99,9 @@ export class ElasticEntityService extends ElasticService {
             document: doc,
         };
         const client = this.getClient();
-        const r = await client.create(request, options?.transport);
+        const r = options?.replaceIfExists
+            ? await client.index(request, options?.transport)
+            : await client.create(request, options?.transport);
         /* istanbul ignore next */
         if (!(r._id && (r.result === 'created' || r.result === 'updated'))) {
             throw new InternalServerError(`Unknown error while creating document for "${this.getResourceName()}"`);

package/package.json

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

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

@@ -30,8 +30,9 @@ export declare namespace ElasticEntityService {
      * @interface
      */
     interface CreateOptions {
-        request?: estypes.CreateRequest;
+        request?: CreateRequest;
         transport?: TransportRequestOptions;
+        replaceIfExists?: boolean;
     }
     /**
      * Represents options for "count" operation
@@ -41,7 +42,7 @@ export declare namespace ElasticEntityService {
      */
     interface CountOptions {
         filter?: ElasticAdapter.FilterInput;
-        request?: estypes.CountRequest;
+        request?: CountRequest;
         transport?: TransportRequestOptions;
     }
     /**
@@ -52,7 +53,7 @@ export declare namespace ElasticEntityService {
      */
     interface DeleteOptions {
         filter?: ElasticAdapter.FilterInput;
-        request?: estypes.DeleteByQueryRequest;
+        request?: DeleteByQueryRequest;
         transport?: TransportRequestOptions;
     }
     /**
@@ -63,7 +64,7 @@ export declare namespace ElasticEntityService {
      */
     interface DeleteManyOptions {
         filter?: ElasticAdapter.FilterInput;
-        request?: estypes.DeleteByQueryRequest;
+        request?: DeleteByQueryRequest;
         transport?: TransportRequestOptions;
     }
     /**
@@ -86,7 +87,7 @@ export declare namespace ElasticEntityService {
         sort?: string[];
         limit?: number;
         skip?: number;
-        request?: estypes.SearchRequest;
+        request?: SearchRequest;
         transport?: TransportRequestOptions;
         noDecode?: boolean;
     }
@@ -107,7 +108,7 @@ export declare namespace ElasticEntityService {
      */
     interface UpdateOneOptions {
         filter?: ElasticAdapter.FilterInput;
-        request?: estypes.UpdateByQueryRequest;
+        request?: UpdateByQueryRequest;
         transport?: TransportRequestOptions;
     }
     /**
@@ -118,7 +119,7 @@ export declare namespace ElasticEntityService {
      */
     interface UpdateManyOptions {
         filter?: ElasticAdapter.FilterInput;
-        request?: estypes.UpdateByQueryRequest;
+        request?: UpdateByQueryRequest;
         transport?: TransportRequestOptions;
     }
     interface CreateCommand extends StrictOmit<RequiredSome<CommandInfo, 'input'>, 'documentId'> {
@@ -143,7 +144,7 @@ export declare namespace ElasticEntityService {
     }
     interface SearchCommand extends StrictOmit<CommandInfo, 'input'> {
         crud: 'read';
-        request: estypes.SearchRequest;
+        request: SearchRequest;
         options?: SearchOptions;
     }
     interface UpdateCommand<T> extends CommandInfo {
@@ -151,7 +152,18 @@ export declare namespace ElasticEntityService {
         input: PatchDTO<T>;
         options?: UpdateOneOptions;
     }
+    type CreateRequest = estypes.CreateRequest;
+    type CreateResponse = estypes.CreateResponse;
+    type CountRequest = estypes.CountRequest;
+    type CountResponse = estypes.CountResponse;
+    type DeleteByQueryRequest = estypes.DeleteByQueryRequest;
+    type DeleteByQueryResponse = estypes.DeleteByQueryResponse;
+    type SearchRequest = estypes.SearchRequest;
     type SearchResponse<T> = estypes.SearchResponse<T>;
+    type UpdateByQueryRequest = estypes.UpdateByQueryRequest;
+    type UpdateByQueryResponse = estypes.UpdateByQueryResponse;
+    type QueryDslQueryContainer = estypes.QueryDslQueryContainer;
+    type Script = estypes.Script;
 }
 /**
  * @class ElasticEntityService
@@ -219,28 +231,28 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      * @param {ElasticEntityService.CreateCommand} command
      * @protected
      */
-    protected _create(command: ElasticEntityService.CreateCommand): Promise<estypes.CreateResponse>;
+    protected _create(command: ElasticEntityService.CreateCommand): Promise<ElasticEntityService.CreateResponse>;
     /**
      * Returns the count of documents in the collection based on the provided options.
      *
      * @param {ElasticEntityService.CountCommand} command
      * @protected
      */
-    protected _count(command: ElasticEntityService.CountCommand): Promise<estypes.CountResponse>;
+    protected _count(command: ElasticEntityService.CountCommand): Promise<ElasticEntityService.CountResponse>;
     /**
      * Deletes a document from the collection.
      *
      * @param {ElasticEntityService.DeleteCommand} command
      * @protected
      */
-    protected _delete(command: ElasticEntityService.DeleteCommand): Promise<estypes.DeleteByQueryResponse>;
+    protected _delete(command: ElasticEntityService.DeleteCommand): Promise<ElasticEntityService.DeleteByQueryResponse>;
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
      *
      * @param {ElasticEntityService.DeleteManyCommand} command
      * @protected
      */
-    protected _deleteMany(command: ElasticEntityService.DeleteManyCommand): Promise<estypes.DeleteByQueryResponse>;
+    protected _deleteMany(command: ElasticEntityService.DeleteManyCommand): Promise<ElasticEntityService.DeleteByQueryResponse>;
     /**
      * Returns search hits that match the query defined in the request
      *
@@ -259,7 +271,7 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      *
      * @param {ElasticEntityService.UpdateCommand<T>} command
      */
-    protected _updateMany(command: ElasticEntityService.UpdateCommand<T>): Promise<estypes.UpdateByQueryResponse>;
+    protected _updateMany(command: ElasticEntityService.UpdateCommand<T>): Promise<ElasticEntityService.UpdateByQueryResponse>;
     /**
      * Generates an ID.
      *
@@ -278,7 +290,7 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
      */
     getOutputCodec(operation: string): IsObject.Validator<T>;
     protected _executeCommand(command: ElasticEntityService.CommandInfo, commandFn: () => any): Promise<any>;
-    protected _mergeQueries(requestQuery?: estypes.QueryDslQueryContainer, filterQuery?: estypes.QueryDslQueryContainer): estypes.QueryDslQueryContainer | undefined;
+    protected _mergeQueries(requestQuery?: ElasticEntityService.QueryDslQueryContainer, filterQuery?: ElasticEntityService.QueryDslQueryContainer): ElasticEntityService.QueryDslQueryContainer | undefined;
     protected _beforeCreate(command: ElasticEntityService.CreateCommand): Promise<void>;
     protected _beforeUpdate(command: ElasticEntityService.UpdateCommand<T>): Promise<void>;
     protected _beforeUpdateMany(command: ElasticEntityService.UpdateCommand<T>): Promise<void>;