@travetto/model-elasticsearch 3.1.7 → 3.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
     "elasticsearch",
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@elastic/elasticsearch": "^8.6.0",
-    "@travetto/config": "^3.1.2",
-    "@travetto/model": "^3.1.8",
-    "@travetto/model-query": "^3.1.7"
+    "@travetto/config": "^3.1.3",
+    "@travetto/model": "^3.1.9",
+    "@travetto/model-query": "^3.1.9"
   },
   "peerDependencies": {
     "@travetto/command": "^3.1.2"

package/src/internal/query.ts

@@ -1,4 +1,4 @@
-import { InlineScript, QueryDslQueryContainer, SearchRequest, SearchResponse, Sort, SortOptions } from '@elastic/elasticsearch/lib/api/types';
+import { QueryDslQueryContainer, SearchRequest, SearchResponse, Sort, SortOptions } from '@elastic/elasticsearch/lib/api/types';
 
 import { Class, DataUtil, ObjectUtil } from '@travetto/base';
 import { WhereClause, SelectClause, SortClause, Query } from '@travetto/model-query';
@@ -24,18 +24,6 @@ const has$Not = (o: unknown): o is ({ $not: WhereClause<unknown> }) => !!o && '$
  */
 export class ElasticsearchQueryUtil {
 
-  /**
-   * Build the update script for a given object
-   */
-  static generateEmptyScript(path: string): InlineScript {
-    const out: InlineScript = {
-      lang: 'painless',
-      source: 'return doc[params.key] == null || doc[params.key].size() == 0;',
-      params: { key: path },
-    };
-    return out;
-  }
-
   /**
    * Convert `a.b.c` to `a : { b : { c : ... }}`
    */
@@ -170,11 +158,9 @@ export class ElasticsearchQueryUtil {
             }
             case '$empty': {
               const q = {
-                script: {
-                  script: this.generateEmptyScript(sPath)
-                }
+                exists: { field: sPath }
               };
-              items.push(v ? q : { bool: { ['must_not']: q } });
+              items.push(!v ? q : { bool: { ['must_not']: q } });
               break;
             }
             case '$regex': {

package/src/service.ts

@@ -69,7 +69,9 @@ export class ElasticsearchModelService implements
       });
       return res;
     } catch (err) {
-      console.error((err as any).meta.body.error);
+      if (err instanceof es.errors.ResponseError && err.meta.body && typeof err.meta.body === 'object' && 'error' in err.meta.body) {
+        console.error(err.meta.body.error);
+      }
       throw err;
     }
   }
@@ -77,24 +79,23 @@ export class ElasticsearchModelService implements
   /**
    * Convert _id to id
    */
-  async postLoad<T extends ModelType>(cls: Class<T>, o: T): Promise<T> {
-    if (isWithId(o)) {
-      o.id = o._id!;
-      delete o._id;
+  async postLoad<T extends ModelType>(cls: Class<T>, item: T): Promise<T> {
+    if (isWithId(item)) {
+      delete item._id;
     }
 
-    o = await ModelCrudUtil.load(cls, o);
+    item = await ModelCrudUtil.load(cls, item);
 
     const { expiresAt } = ModelRegistry.get(cls);
 
     if (expiresAt) {
-      const expiry = ModelExpiryUtil.getExpiryState(cls, o);
+      const expiry = ModelExpiryUtil.getExpiryState(cls, item);
       if (!expiry.expired) {
-        return o;
+        return item;
       }
-      throw new NotFoundError(cls, o.id);
+      throw new NotFoundError(cls, item.id);
     } else {
-      return o;
+      return item;
     }
   }
 
@@ -269,15 +270,11 @@ export class ElasticsearchModelService implements
       } else if (op.insert) {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         acc.push({ create: { ...ident, _id: op.insert.id } }, op.insert as T);
-        delete op.insert.id;
       } else if (op.upsert) {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         acc.push({ index: { ...ident, _id: op.upsert.id } }, op.upsert as T);
-        delete op.upsert.id;
       } else if (op.update) {
         acc.push({ update: { ...ident, _id: op.update.id } }, { doc: op.update });
-        // @ts-expect-error
-        delete op.update.id;
       }
       return acc;
     }, []);