@travetto/model-elasticsearch 4.1.4 → 5.0.0-rc.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "4.1.4",
+  "version": "5.0.0-rc.0",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
     "elasticsearch",
@@ -28,12 +28,12 @@
   },
   "dependencies": {
     "@elastic/elasticsearch": "^8.14.0",
-    "@travetto/config": "^4.1.2",
-    "@travetto/model": "^4.1.3",
-    "@travetto/model-query": "^4.1.4"
+    "@travetto/config": "^5.0.0-rc.0",
+    "@travetto/model": "^5.0.0-rc.0",
+    "@travetto/model-query": "^5.0.0-rc.0"
   },
   "peerDependencies": {
-    "@travetto/command": "^4.1.1"
+    "@travetto/command": "^5.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/internal/query.ts

@@ -1,6 +1,6 @@
 import { QueryDslQueryContainer, SearchRequest, SearchResponse, Sort, SortOptions } from '@elastic/elasticsearch/lib/api/types';
 
-import { Class, ObjectUtil } from '@travetto/base';
+import { Class } from '@travetto/base';
 import { WhereClause, SelectClause, SortClause, Query } from '@travetto/model-query';
 import { QueryLanguageParser } from '@travetto/model-query/src/internal/query/parser';
 import { QueryVerifier } from '@travetto/model-query/src/internal/query/verifier';
@@ -35,7 +35,7 @@ export class ElasticsearchQueryUtil {
     for (const key of keys) {
       const subPath = `${path}${key}`;
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      if (ObjectUtil.isPlainObject(sub[key]) && !Object.keys(sub[key] as Record<string, unknown>)[0].startsWith('$')) {
+      if (DataUtil.isPlainObject(sub[key]) && !Object.keys(sub[key] as Record<string, unknown>)[0].startsWith('$')) {
         Object.assign(out, this.extractSimple(sub[key], `${subPath}.`));
       } else {
         out[subPath] = sub[key];
@@ -93,7 +93,7 @@ export class ElasticsearchQueryUtil {
         ((key === 'id' && !path) ? '_id' : `${path}${key}`) :
         `${path}${key}`;
 
-      if (ObjectUtil.isPlainObject(top)) {
+      if (DataUtil.isPlainObject(top)) {
         const subKey = Object.keys(top)[0];
         if (!subKey.startsWith('$')) {
           const inner = this.extractWhereTermQuery(declaredType, top, config, `${sPath}.`);
@@ -321,7 +321,7 @@ export class ElasticsearchQueryUtil {
       const obj = r._source!;
       if (includeId) {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        (obj as unknown as { _id: string })._id = r._id;
+        (obj as unknown as { _id: string })._id = r._id!;
       }
       out.push(obj);
     }