@travetto/model-elasticsearch 2.0.0 → 2.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/model-elasticsearch",
   "displayName": "Elasticsearch Model Source",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
     "elasticsearch",
@@ -28,13 +28,13 @@
     "directory": "module/model-elasticsearch"
   },
   "dependencies": {
-    "@elastic/elasticsearch": "^7.13.0",
-    "@travetto/config": "^2.0.0",
-    "@travetto/model": "^2.0.0",
-    "@travetto/model-query": "2.0.0"
+    "@elastic/elasticsearch": "^7.17.0",
+    "@travetto/config": "^2.1.0",
+    "@travetto/model": "^2.1.0",
+    "@travetto/model-query": "2.1.0"
   },
   "devDependencies": {
-    "@travetto/app": "^2.0.0"
+    "@travetto/app": "^2.1.0"
   },
   "publishConfig": {
     "access": "public"

package/src/internal/query.ts

@@ -248,7 +248,7 @@ export class ElasticsearchQueryUtil {
     }
     if (subType) {
       clauses.push({
-        term: { type: { value: subType } }
+        term: { type: { value: SchemaRegistry.getSubTypeName(cls) } }
       });
     }
     return clauses.length === 0 ? {} :

package/src/internal/schema.ts

@@ -1,5 +1,3 @@
-import { version as VERSION } from '@elastic/elasticsearch/package.json';
-
 import { Class, Util } from '@travetto/base';
 import { ModelRegistry } from '@travetto/model';
 import { PointImpl } from '@travetto/model-query/src/internal/model/point';
@@ -7,6 +5,8 @@ import { SchemaRegistry } from '@travetto/schema';
 
 import { EsSchemaConfig } from './types';
 
+const { version: VERSION } = require(require.resolve('@elastic/elasticsearch').replace('index.js', 'package.json'));
+
 
 type FieldType = {
   type?: string;

package/src/service.ts

@@ -4,7 +4,7 @@ import { Index, Update, Search, DeleteByQuery } from '@elastic/elasticsearch/api
 import {
   ModelCrudSupport, BulkOp, BulkResponse, ModelBulkSupport, ModelExpirySupport,
   ModelIndexedSupport, ModelType, ModelStorageSupport, NotFoundError, ModelRegistry,
-  SubTypeNotSupportedError, OptionalId
+  OptionalId
 } from '@travetto/model';
 import { Class, Util, ShutdownManager, AppError } from '@travetto/base';
 import { SchemaChange, DeepPartial } from '@travetto/schema';
@@ -119,9 +119,7 @@ export class ElasticsearchModelService implements
   }
 
   async delete<T extends ModelType>(cls: Class<T>, id: string) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
 
     try {
       const { body: res } = await this.client.delete({
@@ -160,9 +158,7 @@ export class ElasticsearchModelService implements
   }
 
   async update<T extends ModelType>(cls: Class<T>, o: T): Promise<T> {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
 
     o = await ModelCrudUtil.preStore(cls, o, this);
 
@@ -185,9 +181,7 @@ export class ElasticsearchModelService implements
   }
 
   async upsert<T extends ModelType>(cls: Class<T>, o: OptionalId<T>) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
 
     const item = await ModelCrudUtil.preStore(cls, o, this);
 
@@ -205,9 +199,7 @@ export class ElasticsearchModelService implements
   }
 
   async updatePartial<T extends ModelType>(cls: Class<T>, data: Partial<T> & { id: string }) {
-    if (ModelRegistry.get(cls).subType) {
-      throw new SubTypeNotSupportedError(cls);
-    }
+    ModelCrudUtil.ensureNotSubType(cls);
 
     const script = ElasticsearchSchemaUtil.generateUpdateScript(data);
     const id = data.id;

package/support/service.elasticsearch.ts

@@ -1,6 +1,7 @@
-import { version } from '@elastic/elasticsearch/package.json';
 import type { Service } from '@travetto/command/bin/lib/service';
 
+const { version } = require(require.resolve('@elastic/elasticsearch').replace('index.js', 'package.json'));
+
 const port = 9200;
 
 export const service: Service = {