@travetto/model-elasticsearch 5.0.0 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "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.15.0",
-    "@travetto/config": "^5.0.0",
-    "@travetto/model": "^5.0.0",
-    "@travetto/model-query": "^5.0.0"
+    "@travetto/config": "^5.0.2",
+    "@travetto/model": "^5.0.2",
+    "@travetto/model-query": "^5.0.2"
   },
   "peerDependencies": {
-    "@travetto/command": "^5.0.0"
+    "@travetto/command": "^5.0.2"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/service.ts

@@ -208,13 +208,13 @@ export class ElasticsearchModelService implements
     return item;
   }
 
-  async updatePartial<T extends ModelType>(cls: Class<T>, data: Partial<T> & { id: string }): Promise<T> {
+  async updatePartial<T extends ModelType>(cls: Class<T>, data: Partial<T> & { id: string }, view?: string): Promise<T> {
     ModelCrudUtil.ensureNotSubType(cls);
 
-    await ModelCrudUtil.prePersist(cls, data, 'partial');
+    const item = await ModelCrudUtil.prePartialUpdate(cls, data, view);
 
-    const script = ElasticsearchSchemaUtil.generateUpdateScript(data);
-    const id = data.id;
+    const script = ElasticsearchSchemaUtil.generateUpdateScript(item);
+    const id = item.id!;
 
     console.debug('Partial Script', { script });
 
@@ -375,10 +375,7 @@ export class ElasticsearchModelService implements
   }
 
   async * listByIndex<T extends ModelType>(cls: Class<T>, idx: string, body?: DeepPartial<T>): AsyncIterable<T> {
-    const cfg = ModelRegistry.getIndex(cls, idx);
-    if (cfg.type === 'unique') {
-      throw new AppError('Cannot list on unique indices', 'data');
-    }
+    const cfg = ModelRegistry.getIndex(cls, idx, ['sorted', 'unsorted']);
     let search = await this.execSearch<T>(cls, {
       scroll: '2m',
       size: 100,
@@ -431,7 +428,7 @@ export class ElasticsearchModelService implements
   }
 
   // Query Crud
-  async updateOneWithQuery<T extends ModelType>(cls: Class<T>, data: T, query: ModelQuery<T>): Promise<T> {
+  async updateByQuery<T extends ModelType>(cls: Class<T>, data: T, query: ModelQuery<T>): Promise<T> {
     ModelCrudUtil.ensureNotSubType(cls);
     await QueryVerifier.verify(cls, query);
 
@@ -485,10 +482,12 @@ export class ElasticsearchModelService implements
     return res.deleted ?? 0;
   }
 
-  async updateByQuery<T extends ModelType>(cls: Class<T>, query: ModelQuery<T>, data: Partial<T>): Promise<number> {
+  async updatePartialByQuery<T extends ModelType>(cls: Class<T>, query: ModelQuery<T>, data: Partial<T>): Promise<number> {
     await QueryVerifier.verify(cls, query);
 
-    const script = ElasticsearchSchemaUtil.generateUpdateScript(data);
+    const item = await ModelCrudUtil.prePartialUpdate(cls, data);
+
+    const script = ElasticsearchSchemaUtil.generateUpdateScript(item);
 
     const search = ElasticsearchQueryUtil.getSearchObject(cls, query, this.config.schemaConfig);
     const res = await this.client.updateByQuery({