@travetto/model-elasticsearch 8.0.0-alpha.17 → 8.0.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "8.0.0-alpha.17",
+  "version": "8.0.0-alpha.19",
   "type": "module",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
@@ -28,14 +28,14 @@
     "directory": "module/model-elasticsearch"
   },
   "dependencies": {
-    "@elastic/elasticsearch": "^9.3.4",
-    "@travetto/config": "^8.0.0-alpha.15",
-    "@travetto/model": "^8.0.0-alpha.15",
-    "@travetto/model-indexed": "^8.0.0-alpha.17",
-    "@travetto/model-query": "^8.0.0-alpha.16"
+    "@elastic/elasticsearch": "^9.4.2",
+    "@travetto/config": "^8.0.0-alpha.17",
+    "@travetto/model": "^8.0.0-alpha.17",
+    "@travetto/model-indexed": "^8.0.0-alpha.19",
+    "@travetto/model-query": "^8.0.0-alpha.18"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.20"
+    "@travetto/cli": "^8.0.0-alpha.22"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/internal/schema.ts

@@ -7,8 +7,8 @@ import type { EsSchemaConfig } from './types.ts';
 
 const PointConcrete = toConcrete<Point>();
 
-const isMappingType = (input: estypes.MappingProperty): input is estypes.MappingTypeMapping =>
-  (input.type === 'object' || input.type === 'nested') && 'properties' in input && !!input.properties;
+const isMappingType = (input: estypes.MappingProperty): input is estypes.MappingTypeMapping & estypes.MappingProperty =>
+  !!input && !!input.type && (input.type === 'object' || input.type === 'nested');
 
 /**
  * Utils for ES Schema management
@@ -163,14 +163,20 @@ export class ElasticsearchSchemaUtil {
       const currentProperty = currentProperties[key];
       const neededProperty = neededProperties[key];
 
-      if (!currentProperty || !neededProperty || currentProperty.type !== neededProperty.type) {
-        changed.push(path);
+      if (isMappingType(currentProperty) && isMappingType(neededProperty)) {
+        if (currentProperty.type !== neededProperty.type) {
+          changed.push(path);
+        } else {
+          changed.push(...this.getChangedFields(
+            'properties' in currentProperty ? currentProperty : { properties: {} },
+            'properties' in neededProperty ? neededProperty : { properties: {} },
+            path
+          ));
+        }
       } else if (isMappingType(currentProperty) || isMappingType(neededProperty)) {
-        changed.push(...this.getChangedFields(
-          'properties' in currentProperty ? currentProperty : { properties: {} },
-          'properties' in neededProperty ? neededProperty : { properties: {} },
-          path
-        ));
+        changed.push(path);
+      } else if (!currentProperty || !neededProperty || currentProperty.type !== neededProperty.type) {
+        changed.push(path);
       }
     }
     return changed;

package/src/service.ts

@@ -662,7 +662,7 @@ export class ElasticsearchModelService implements
     });
     const search = ElasticsearchQueryUtil.getSearchObject(cls, resolvedQuery);
     const result = await this.execSearch(cls, search);
-    const all = result.hits.hits.map(hit => castTo<T>(({ [field]: field === 'id' ? hit._id : hit._source![field] })));
+    const all = result.hits.hits.map(hit => castTo<T>((field === 'id' ? { id: hit._id } : hit._source)));
     return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, all, item => item, query && query.limit);
   }