@opra/elastic 1.5.7 → 1.6.0

package/cjs/elastic-collection-service.js

@@ -164,7 +164,7 @@ class ElasticCollectionService extends elastic_entity_service_js_1.ElasticEntity
                 command.options?.filter,
             ]);
             command.options = { ...options, request, filter };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             return !!(typeof r.hits.total === 'number'
                 ? r.hits.total
                 : r.hits.total?.value);
@@ -190,7 +190,7 @@ class ElasticCollectionService extends elastic_entity_service_js_1.ElasticEntity
                 size: 0,
             };
             command.options = { ...options, request };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             return !!(typeof r.hits.total === 'number'
                 ? r.hits.total
                 : r.hits.total?.value);
@@ -218,7 +218,7 @@ class ElasticCollectionService extends elastic_entity_service_js_1.ElasticEntity
                 limit: 1,
                 options: { ...command.options, filter },
             };
-            const r = await this._search(newCommand);
+            const r = await this._findMany(newCommand);
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');
                 return {
@@ -248,7 +248,7 @@ class ElasticCollectionService extends elastic_entity_service_js_1.ElasticEntity
                 limit: 1,
                 options: { ...command.options, filter },
             };
-            const r = await this._search(newCommand);
+            const r = await this._findMany(newCommand);
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');
                 return {
@@ -275,7 +275,7 @@ class ElasticCollectionService extends elastic_entity_service_js_1.ElasticEntity
             ]);
             const limit = command.options?.limit || this.defaultLimit;
             command.options = { ...command.options, filter, limit };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');
                 return r.hits.hits.map((x) => ({
@@ -308,7 +308,7 @@ class ElasticCollectionService extends elastic_entity_service_js_1.ElasticEntity
                 limit,
                 request: { ...command.options?.request, track_total_hits: true },
             };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             const out = {};
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');

package/cjs/elastic-entity-service.js

@@ -192,9 +192,9 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
     /**
      * Returns search hits that match the query defined in the request
      *
-     * @param {ElasticEntityService.SearchCommand} command
+     * @param {ElasticEntityService.FindManyCommand} command
      */
-    async _search(command) {
+    async _findMany(command) {
         const { options } = command;
         const filterQuery = elastic_adapter_js_1.ElasticAdapter.prepareFilter([
             command.documentId
@@ -307,8 +307,10 @@ class ElasticEntityService extends elastic_service_js_1.ElasticService {
             projection: '*',
             scope: this._dataTypeScope,
         };
-        if (operation === 'update')
+        if (operation === 'update') {
             options.partial = 'deep';
+            options.keepKeyFields = true;
+        }
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
         this._inputCodecs[cacheKey] = validator;

package/esm/elastic-collection-service.js

@@ -161,7 +161,7 @@ export class ElasticCollectionService extends ElasticEntityService {
                 command.options?.filter,
             ]);
             command.options = { ...options, request, filter };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             return !!(typeof r.hits.total === 'number'
                 ? r.hits.total
                 : r.hits.total?.value);
@@ -187,7 +187,7 @@ export class ElasticCollectionService extends ElasticEntityService {
                 size: 0,
             };
             command.options = { ...options, request };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             return !!(typeof r.hits.total === 'number'
                 ? r.hits.total
                 : r.hits.total?.value);
@@ -215,7 +215,7 @@ export class ElasticCollectionService extends ElasticEntityService {
                 limit: 1,
                 options: { ...command.options, filter },
             };
-            const r = await this._search(newCommand);
+            const r = await this._findMany(newCommand);
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');
                 return {
@@ -245,7 +245,7 @@ export class ElasticCollectionService extends ElasticEntityService {
                 limit: 1,
                 options: { ...command.options, filter },
             };
-            const r = await this._search(newCommand);
+            const r = await this._findMany(newCommand);
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');
                 return {
@@ -272,7 +272,7 @@ export class ElasticCollectionService extends ElasticEntityService {
             ]);
             const limit = command.options?.limit || this.defaultLimit;
             command.options = { ...command.options, filter, limit };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');
                 return r.hits.hits.map((x) => ({
@@ -305,7 +305,7 @@ export class ElasticCollectionService extends ElasticEntityService {
                 limit,
                 request: { ...command.options?.request, track_total_hits: true },
             };
-            const r = await this._search(command);
+            const r = await this._findMany(command);
             const out = {};
             if (r.hits.hits?.length) {
                 const outputCodec = this._getOutputCodec('find');

package/esm/elastic-entity-service.js

@@ -189,9 +189,9 @@ export class ElasticEntityService extends ElasticService {
     /**
      * Returns search hits that match the query defined in the request
      *
-     * @param {ElasticEntityService.SearchCommand} command
+     * @param {ElasticEntityService.FindManyCommand} command
      */
-    async _search(command) {
+    async _findMany(command) {
         const { options } = command;
         const filterQuery = ElasticAdapter.prepareFilter([
             command.documentId
@@ -304,8 +304,10 @@ export class ElasticEntityService extends ElasticService {
             projection: '*',
             scope: this._dataTypeScope,
         };
-        if (operation === 'update')
+        if (operation === 'update') {
             options.partial = 'deep';
+            options.keepKeyFields = true;
+        }
         const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
         this._inputCodecs[cacheKey] = validator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/elastic",
-  "version": "1.5.7",
+  "version": "1.6.0",
   "description": "Opra Elastic Search adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -11,8 +11,8 @@
   },
   "peerDependencies": {
     "@elastic/elasticsearch": ">=8.7.0",
-    "@opra/common": "^1.5.7",
-    "@opra/core": "^1.5.7"
+    "@opra/common": "^1.6.0",
+    "@opra/core": "^1.6.0"
   },
   "type": "module",
   "exports": {

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

@@ -141,33 +141,33 @@ export declare class ElasticCollectionService<T extends object = any> extends El
     /**
      * Finds multiple documents in the ElasticDB collection.
      *
-     * @param {ElasticEntityService.SearchOptions} options - The options for the find operation.
+     * @param {ElasticEntityService.FindManyOptions} options - The options for the find operation.
      * @return {Promise<PartialDTO<T> | undefined>} A Promise that resolves to an array of partial outputs of type T.
      */
-    findMany(options: RequiredSome<ElasticEntityService.SearchOptions, 'projection'>): Promise<PartialDTO<T>[]>;
+    findMany(options: RequiredSome<ElasticEntityService.FindManyOptions, 'projection'>): Promise<PartialDTO<T>[]>;
     /**
      * Finds multiple documents in the ElasticDB collection.
      *
-     * @param {ElasticEntityService.SearchOptions} options - The options for the find operation.
+     * @param {ElasticEntityService.FindManyOptions} options - The options for the find operation.
      * @return {Promise<T | undefined>} A Promise that resolves to an array of partial outputs of type T.
      */
-    findMany(options?: ElasticEntityService.SearchOptions): Promise<T[]>;
+    findMany(options?: ElasticEntityService.FindManyOptions): Promise<T[]>;
     /**
      * Finds multiple documents in the collection and returns both records (max limit)
      * and total count that matched the given criteria
      *
-     * @param {ElasticEntityService.SearchOptions} [options] - The options for the find operation.
+     * @param {ElasticEntityService.FindManyOptions} [options] - The options for the find operation.
      * @return {ElasticCollectionService.FindManyWithCountResult<PartialDTO<T>>} A Promise that resolves to an array of partial outputs of type T.
      */
-    findManyWithCount(options: RequiredSome<ElasticEntityService.SearchOptions, 'projection'>): Promise<ElasticCollectionService.FindManyWithCountResult<PartialDTO<T>>>;
+    findManyWithCount(options: RequiredSome<ElasticEntityService.FindManyOptions, 'projection'>): Promise<ElasticCollectionService.FindManyWithCountResult<PartialDTO<T>>>;
     /**
      * Finds multiple documents in the collection and returns both records (max limit)
      * and total count that matched the given criteria
      *
-     * @param {ElasticEntityService.SearchOptions} [options] - The options for the find operation.
+     * @param {ElasticEntityService.FindManyOptions} [options] - The options for the find operation.
      * @return {ElasticCollectionService.FindManyWithCountResult<T>} A Promise that resolves to an array of partial outputs of type T.
      */
-    findManyWithCount(options?: ElasticEntityService.SearchOptions): Promise<ElasticCollectionService.FindManyWithCountResult<T>>;
+    findManyWithCount(options?: ElasticEntityService.FindManyOptions): Promise<ElasticCollectionService.FindManyWithCountResult<T>>;
     /**
      * Retrieves a document from the collection by its ID. Throws error if not found.
      *

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

@@ -72,7 +72,7 @@ export declare namespace ElasticEntityService {
      * @interface
      * @template T - The type of the document.
      */
-    interface FindOneOptions extends StrictOmit<SearchOptions, 'limit'> {
+    interface FindOneOptions extends StrictOmit<FindManyOptions, 'limit'> {
     }
     /**
      * Represents options for "findMany" operation
@@ -80,7 +80,7 @@ export declare namespace ElasticEntityService {
      * @interface
      * @template T - The type of the document.
      */
-    interface SearchOptions {
+    interface FindManyOptions {
         filter?: ElasticAdapter.FilterInput;
         projection?: string | string[];
         sort?: string[];
@@ -127,9 +127,9 @@ export declare namespace ElasticEntityService {
         crud: 'delete';
         options?: DeleteManyOptions;
     }
-    interface SearchCommand extends StrictOmit<CommandInfo, 'input'> {
+    interface FindManyCommand extends StrictOmit<CommandInfo, 'input'> {
         crud: 'read';
-        options?: SearchOptions;
+        options?: FindManyOptions;
     }
     interface UpdateCommand<T> extends CommandInfo {
         crud: 'update';
@@ -228,9 +228,9 @@ export declare class ElasticEntityService<T extends object = any> extends Elasti
     /**
      * Returns search hits that match the query defined in the request
      *
-     * @param {ElasticEntityService.SearchCommand} command
+     * @param {ElasticEntityService.FindManyCommand} command
      */
-    protected _search(command: ElasticEntityService.SearchCommand): Promise<elastic.SearchResponse>;
+    protected _findMany(command: ElasticEntityService.FindManyCommand): Promise<elastic.SearchResponse>;
     /**
      * Updates multiple documents in the collection based on the specified input and options.
      *