@travetto/model-elasticsearch 3.1.6 → 3.1.7

package/package.json

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

package/src/internal/query.ts

@@ -1,4 +1,4 @@
-import { QueryDslQueryContainer, SearchRequest, SearchResponse, Sort, SortOptions } from '@elastic/elasticsearch/lib/api/types';
+import { InlineScript, 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,6 +24,18 @@ 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 : ... }}`
    */
@@ -156,6 +168,15 @@ export class ElasticsearchQueryUtil {
               items.push({ range: { [sPath]: out } });
               break;
             }
+            case '$empty': {
+              const q = {
+                script: {
+                  script: this.generateEmptyScript(sPath)
+                }
+              };
+              items.push(v ? q : { bool: { ['must_not']: q } });
+              break;
+            }
             case '$regex': {
               // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
               const pattern = DataUtil.toRegex(v as string);

package/src/service.ts

@@ -61,12 +61,17 @@ export class ElasticsearchModelService implements
     if (query && Object.keys(query).length === 0) {
       query = undefined;
     }
-    const res = await this.client.search<T>({
-      ...this.manager.getIdentity(cls),
-      ...search,
-      query
-    });
-    return res;
+    try {
+      const res = await this.client.search<T>({
+        ...this.manager.getIdentity(cls),
+        ...search,
+        query
+      });
+      return res;
+    } catch (err) {
+      console.error((err as any).meta.body.error);
+      throw err;
+    }
   }
 
   /**