@travetto/model-elasticsearch 4.0.0-rc.2 → 4.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.4",
   "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.12.0",
-    "@travetto/config": "^4.0.0-rc.2",
-    "@travetto/model": "^4.0.0-rc.2",
-    "@travetto/model-query": "^4.0.0-rc.2"
+    "@travetto/config": "^4.0.0-rc.4",
+    "@travetto/model": "^4.0.0-rc.4",
+    "@travetto/model-query": "^4.0.0-rc.4"
   },
   "peerDependencies": {
-    "@travetto/command": "^4.0.0-rc.2"
+    "@travetto/command": "^4.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/index-manager.ts

@@ -1,4 +1,4 @@
-import es from '@elastic/elasticsearch';
+import { Client } from '@elastic/elasticsearch';
 import { ReindexRequest } from '@elastic/elasticsearch/lib/api/types';
 
 import { Class } from '@travetto/base';
@@ -17,9 +17,9 @@ export class IndexManager implements ModelStorageSupport {
   #indexToAlias = new Map<string, string>();
   #aliasToIndex = new Map<string, string>();
   #identities = new Map<Class, { index: string }>();
-  #client: es.Client;
+  #client: Client;
 
-  constructor(public readonly config: ElasticsearchModelConfig, client: es.Client) {
+  constructor(public readonly config: ElasticsearchModelConfig, client: Client) {
     this.#client = client;
   }
 

package/src/service.ts

@@ -1,4 +1,4 @@
-import es from '@elastic/elasticsearch';
+import { Client, errors } from '@elastic/elasticsearch';
 import {
   AggregationsStringTermsAggregate, AggregationsStringTermsBucket, DeleteByQueryRequest, SearchRequest, SearchResponse, UpdateByQueryResponse
 } from '@elastic/elasticsearch/lib/api/types';
@@ -48,7 +48,7 @@ export class ElasticsearchModelService implements
   ModelQuerySuggestSupport, ModelQueryFacetSupport {
 
   idSource = ModelCrudUtil.uuidSource();
-  client: es.Client;
+  client: Client;
   manager: IndexManager;
 
   constructor(public readonly config: ElasticsearchModelConfig) { }
@@ -69,7 +69,7 @@ export class ElasticsearchModelService implements
       });
       return res;
     } catch (err) {
-      if (err instanceof es.errors.ResponseError && err.meta.body && typeof err.meta.body === 'object' && 'error' in err.meta.body) {
+      if (err instanceof errors.ResponseError && err.meta.body && typeof err.meta.body === 'object' && 'error' in err.meta.body) {
         console.error(err.meta.body.error);
       }
       throw err;
@@ -100,7 +100,7 @@ export class ElasticsearchModelService implements
   }
 
   async postConstruct(this: ElasticsearchModelService): Promise<void> {
-    this.client = new es.Client({
+    this.client = new Client({
       nodes: this.config.hosts,
       ...(this.config.options || {}),
     });
@@ -144,7 +144,7 @@ export class ElasticsearchModelService implements
         throw new NotFoundError(cls, id);
       }
     } catch (err) {
-      if (err && err instanceof es.errors.ResponseError && err.body && err.body.result === 'not_found') {
+      if (err && err instanceof errors.ResponseError && err.body && err.body.result === 'not_found') {
         throw new NotFoundError(cls, id);
       }
       throw err;
@@ -462,7 +462,7 @@ export class ElasticsearchModelService implements
       }
     } catch (err) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      if (err instanceof es.errors.ResponseError && (err.body as UpdateByQueryResponse).version_conflicts) {
+      if (err instanceof errors.ResponseError && (err.body as UpdateByQueryResponse).version_conflicts) {
         throw new NotFoundError(cls, id);
       } else {
         throw err;