@travetto/model-elasticsearch 3.1.3 → 3.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
     "elasticsearch",
@@ -29,8 +29,8 @@
   "dependencies": {
     "@elastic/elasticsearch": "^8.6.0",
     "@travetto/config": "^3.1.2",
-    "@travetto/model": "^3.1.5",
-    "@travetto/model-query": "^3.1.3"
+    "@travetto/model": "^3.1.6",
+    "@travetto/model-query": "^3.1.4"
   },
   "peerDependencies": {
     "@travetto/command": "^3.1.1"

package/src/internal/schema.ts

@@ -1,6 +1,6 @@
 import { InlineScript, MappingProperty, MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
 
-import { Class, DataUtil, ObjectUtil } from '@travetto/base';
+import { Class, DataUtil } from '@travetto/base';
 import { ModelRegistry } from '@travetto/model';
 import { PointImpl } from '@travetto/model-query/src/internal/model/point';
 import { SchemaRegistry } from '@travetto/schema';
@@ -15,37 +15,41 @@ export class ElasticsearchSchemaUtil {
   /**
    * Build the update script for a given object
    */
-  static generateUpdateScript(o: Record<string, unknown>, path: string = '', arr = false): InlineScript {
-    const ops: string[] = [];
+  static generateUpdateScript(o: Record<string, unknown>): InlineScript {
     const out: InlineScript = {
-      params: {},
       lang: 'painless',
-      source: ''
+      source: `
+ for (entry in params.body.entrySet()) {
+  def key = entry.getKey();
+  def value = entry.getValue();
+  if (key ==~ /^_?id$/) {
+    continue;
+  }
+  if (value == null) {
+    ctx._source.remove(key);
+  } else {
+    ctx._source[key] = value;
+  }
+ }
+`,
+      params: { body: o },
     };
-    for (const x of Object.keys(o ?? {})) {
-      if (!path && (x === '_id' || x === 'id')) {
-        continue;
-      }
-      const prop = arr ? `${path}[${x}]` : `${path}${path ? '.' : ''}${x}`;
-      if (o[x] === undefined || o[x] === null) {
-        ops.push(`ctx._source.${path}${path ? '.' : ''}remove("${x}")`);
-      } else if (ObjectUtil.isPrimitive(o[x]) || Array.isArray(o[x])) {
-        const param = prop.toLowerCase().replace(/[^a-z0-9_$]/g, '_');
-        ops.push(`ctx._source.${prop} = params.${param}`);
-        out.params![param] = o[x];
-      } else {
-        ops.push(`ctx._source.${prop} = ctx._source.${prop} == null ? [:] : ctx._source.${prop}`);
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const sub = this.generateUpdateScript(o[x] as Record<string, unknown>, prop);
-        ops.push(sub.source);
-        Object.assign(out.params!, sub.params);
-      }
-    }
-    out.source = ops.join(';');
-
     return out;
   }
 
+  /**
+   * Generate replace script
+   * @param o
+   * @returns
+   */
+  static generateReplaceScript(o: Record<string, unknown>): InlineScript {
+    return {
+      lang: 'painless',
+      source: 'ctx._source.clear(); ctx._source.putAll(params.body)',
+      params: { body: o }
+    };
+  }
+
   /**
    * Build one or more mappings depending on the polymorphic state
    */

package/src/service.ts

@@ -1,6 +1,6 @@
 import es from '@elastic/elasticsearch';
 import {
-  AggregationsStringTermsAggregate, AggregationsStringTermsBucket, DeleteByQueryRequest, SearchRequest, SearchResponse
+  AggregationsStringTermsAggregate, AggregationsStringTermsBucket, DeleteByQueryRequest, SearchRequest, SearchResponse, UpdateByQueryResponse
 } from '@elastic/elasticsearch/lib/api/types';
 
 import {
@@ -9,7 +9,7 @@ import {
   OptionalId
 } from '@travetto/model';
 import { ShutdownManager, type Class, AppError } from '@travetto/base';
-import { SchemaChange, DeepPartial } from '@travetto/schema';
+import { SchemaChange, DeepPartial, BindUtil } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import {
   ModelQuery, ModelQueryCrudSupport, ModelQueryFacetSupport,
@@ -96,7 +96,7 @@ export class ElasticsearchModelService implements
   async postConstruct(this: ElasticsearchModelService): Promise<void> {
     this.client = new es.Client({
       nodes: this.config.hosts,
-      ...(this.config.options || {})
+      ...(this.config.options || {}),
     });
     await this.client.cluster.health({});
     this.manager = new IndexManager(this.config, this.client);
@@ -132,7 +132,7 @@ export class ElasticsearchModelService implements
       const res = await this.client.delete({
         ...this.manager.getIdentity(cls),
         id,
-        refresh: true
+        refresh: true,
       });
       if (res.result === 'not_found') {
         throw new NotFoundError(cls, id);
@@ -421,6 +421,47 @@ export class ElasticsearchModelService implements
   }
 
   // Query Crud
+  async updateOneWithQuery<T extends ModelType>(cls: Class<T>, data: T, query: ModelQuery<T>): Promise<T> {
+    ModelCrudUtil.ensureNotSubType(cls);
+
+    const item = await ModelCrudUtil.preStore(cls, data, this);
+    const id = item.id;
+
+    query = ModelQueryUtil.getQueryWithId(cls, data, query);
+
+    if (ModelRegistry.get(cls).expiresAt) {
+      await this.get(cls, id);
+    }
+
+    const search = ElasticsearchQueryUtil.getSearchObject(cls, query, this.config.schemaConfig);
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const copy = BindUtil.bindSchemaToObject(cls, {} as T, item);
+
+    try {
+      const res = await this.client.updateByQuery({
+        ...this.manager.getIdentity(cls),
+        refresh: true,
+        query: search.query,
+        max_docs: 1,
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        script: ElasticsearchSchemaUtil.generateReplaceScript(copy as {})
+      });
+
+      if (res.version_conflicts || res.updated === undefined || res.updated === 0) {
+        throw new NotFoundError(cls, id);
+      }
+    } catch (err) {
+      if (err instanceof es.errors.ResponseError && (err.body as UpdateByQueryResponse).version_conflicts) {
+        throw new NotFoundError(cls, id);
+      } else {
+        throw err;
+      }
+    }
+
+    return item;
+  }
+
   async deleteByQuery<T extends ModelType>(cls: Class<T>, query: ModelQuery<T> = {}): Promise<number> {
     const res = await this.client.deleteByQuery({
       ...this.manager.getIdentity(cls),