@travetto/model-elasticsearch 5.0.16 → 5.0.18

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 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": "5.0.16",
+  "version": "5.0.18",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
     "elasticsearch",
@@ -27,11 +27,11 @@
     "directory": "module/model-elasticsearch"
   },
   "dependencies": {
-    "@elastic/elasticsearch": "^8.15.1",
-    "@travetto/cli": "^5.0.15",
-    "@travetto/config": "^5.0.12",
-    "@travetto/model": "^5.0.13",
-    "@travetto/model-query": "^5.0.13"
+    "@elastic/elasticsearch": "^8.17.0",
+    "@travetto/cli": "^5.0.17",
+    "@travetto/config": "^5.0.14",
+    "@travetto/model": "^5.0.15",
+    "@travetto/model-query": "^5.0.15"
   },
   "travetto": {
     "displayName": "Elasticsearch Model Source"

package/src/internal/query.ts

@@ -1,4 +1,4 @@
-import { DeleteByQueryRequest, QueryDslQueryContainer, SearchRequest, SearchResponse, Sort, SortOptions } from '@elastic/elasticsearch/lib/api/types';
+import { estypes } from '@elastic/elasticsearch';
 
 import { castTo, Class, TypedObject } from '@travetto/runtime';
 import { WhereClause, SelectClause, SortClause, Query } from '@travetto/model-query';
@@ -54,8 +54,8 @@ export class ElasticsearchQueryUtil {
   /**
    * Build sort mechanism
    */
-  static getSort<T extends ModelType>(sort: SortClause<T>[] | IndexConfig<T>['fields']): Sort {
-    return sort.map<SortOptions>(x => {
+  static getSort<T extends ModelType>(sort: SortClause<T>[] | IndexConfig<T>['fields']): estypes.Sort {
+    return sort.map<estypes.SortOptions>(x => {
       const o = this.extractSimple(x);
       const k = Object.keys(o)[0];
       const v: boolean | -1 | 1 = castTo(o[k]);
@@ -217,7 +217,7 @@ export class ElasticsearchQueryUtil {
    * @param cls
    * @param search
    */
-  static getSearchQuery<T extends ModelType>(cls: Class<T>, search: Record<string, unknown>, checkExpiry = true): QueryDslQueryContainer {
+  static getSearchQuery<T extends ModelType>(cls: Class<T>, search: Record<string, unknown>, checkExpiry = true): estypes.QueryDslQueryContainer {
     const clauses = [];
     if (search && Object.keys(search).length) {
       clauses.push(search);
@@ -250,8 +250,8 @@ export class ElasticsearchQueryUtil {
    */
   static getSearchObject<T extends ModelType>(
     cls: Class<T>, query: Query<T>, config?: EsSchemaConfig, checkExpiry = true
-  ): SearchRequest & Omit<DeleteByQueryRequest, 'index' | 'sort'> {
-    const search: (SearchRequest & Omit<DeleteByQueryRequest, 'index' | 'sort'>) = {
+  ): estypes.SearchRequest & Omit<estypes.DeleteByQueryRequest, 'index' | 'sort'> {
+    const search: (estypes.SearchRequest & Omit<estypes.DeleteByQueryRequest, 'index' | 'sort'>) = {
       query: this.getSearchQuery(cls, this.extractWhereQuery(cls, query.where ?? {}, config), checkExpiry)
     };
 
@@ -286,7 +286,7 @@ export class ElasticsearchQueryUtil {
   /**
    * Safely load the data, excluding ids if needed
    */
-  static cleanIdRemoval<T>(req: SearchRequest, results: SearchResponse<T>): T[] {
+  static cleanIdRemoval<T>(req: estypes.SearchRequest, results: estypes.SearchResponse<T>): T[] {
     const out: T[] = [];
 
     const toArr = <V>(x: V | V[] | undefined): V[] => (x ? (Array.isArray(x) ? x : [x]) : []);

package/src/service.ts

@@ -1,12 +1,11 @@
-import { Client, errors } from '@elastic/elasticsearch';
-import { AggregationsStringTermsAggregate, SearchRequest, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
+import { Client, errors, estypes } from '@elastic/elasticsearch';
 
 import {
   ModelCrudSupport, BulkOp, BulkResponse, ModelBulkSupport, ModelExpirySupport,
   ModelIndexedSupport, ModelType, ModelStorageSupport, NotFoundError, ModelRegistry,
   OptionalId
 } from '@travetto/model';
-import { ShutdownManager, type DeepPartial, type Class, AppError, castTo, asFull, TypedObject, asConstructable } from '@travetto/runtime';
+import { ShutdownManager, type DeepPartial, type Class, castTo, asFull, TypedObject, asConstructable } from '@travetto/runtime';
 import { SchemaChange, BindUtil } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import {
@@ -55,7 +54,7 @@ export class ElasticsearchModelService implements
   /**
    * Directly run the search
    */
-  async execSearch<T extends ModelType>(cls: Class<T>, search: SearchRequest): Promise<SearchResponse<T>> {
+  async execSearch<T extends ModelType>(cls: Class<T>, search: estypes.SearchRequest): Promise<estypes.SearchResponse<T>> {
     let query = search.query;
     if (query && Object.keys(query).length === 0) {
       query = undefined;
@@ -238,7 +237,7 @@ export class ElasticsearchModelService implements
   }
 
   async * list<T extends ModelType>(cls: Class<T>): AsyncIterable<T> {
-    let search: SearchResponse<T> = await this.execSearch<T>(cls, {
+    let search: estypes.SearchResponse<T> = await this.execSearch<T>(cls, {
       scroll: '2m',
       size: 100,
       query: ElasticsearchQueryUtil.getSearchQuery(cls, {})
@@ -342,7 +341,7 @@ export class ElasticsearchModelService implements
   // Indexed
   async getByIndex<T extends ModelType>(cls: Class<T>, idx: string, body: DeepPartial<T>): Promise<T> {
     const { key } = ModelIndexedUtil.computeIndexKey(cls, idx, body);
-    const res: SearchResponse<T> = await this.execSearch<T>(cls, {
+    const res = await this.execSearch<T>(cls, {
       query: ElasticsearchQueryUtil.getSearchQuery(cls,
         ElasticsearchQueryUtil.extractWhereTermQuery(cls,
           ModelIndexedUtil.projectIndex(cls, idx, body))
@@ -539,7 +538,7 @@ export class ElasticsearchModelService implements
     };
 
     const res = await this.execSearch(cls, search);
-    const { buckets } = castTo<AggregationsStringTermsAggregate>('buckets' in res.aggregations![field] ? res.aggregations![field] : { buckets: [] });
+    const { buckets } = castTo<estypes.AggregationsStringTermsAggregate>('buckets' in res.aggregations![field] ? res.aggregations![field] : { buckets: [] });
     const out = Array.isArray(buckets) ? buckets.map(b => ({ key: b.key, count: b.doc_count })) : [];
     return out;
   }

package/support/service.elasticsearch.ts

@@ -1,6 +1,6 @@
 import type { ServiceDescriptor } from '@travetto/cli';
 
-const version = '8.9.1';
+const version = '8.17.0';
 
 const port = 9200;