@travetto/model-elasticsearch 7.1.4 → 8.0.0-alpha.1

package/README.md

@@ -13,7 +13,7 @@ npm install @travetto/model-elasticsearch
 yarn add @travetto/model-elasticsearch
 ```
 
-This module provides an [elasticsearch](https://elastic.co)-based implementation of the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.").  This source allows the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") module to read, write and query against [elasticsearch](https://elastic.co). In development mode, [ElasticsearchModelService](https://github.com/travetto/travetto/tree/main/module/model-elasticsearch/src/service.ts#L29) will also modify the [elasticsearch](https://elastic.co) schema in real time to minimize impact to development. 
+This module provides an [elasticsearch](https://elastic.co)-based implementation of the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.").  This source allows the [Data Modeling Support](https://github.com/travetto/travetto/tree/main/module/model#readme "Datastore abstraction for core operations.") module to read, write and query against [elasticsearch](https://elastic.co). In development mode, [ElasticsearchModelService](https://github.com/travetto/travetto/tree/main/module/model-elasticsearch/src/service.ts#L36) will also modify the [elasticsearch](https://elastic.co) schema in real time to minimize impact to development. 
 
 Supported features:
    *  [CRUD](https://github.com/travetto/travetto/tree/main/module/model/src/types/crud.ts#L11)
@@ -42,7 +42,7 @@ export class Init {
 }
 ```
 
-where the [ElasticsearchModelConfig](https://github.com/travetto/travetto/tree/main/module/model-elasticsearch/src/config.ts#L10) is defined by:
+where the [ElasticsearchModelConfig](https://github.com/travetto/travetto/tree/main/module/model-elasticsearch/src/config.ts#L11) is defined by:
 
 **Code: Structure of ElasticsearchModelConfig**
 ```typescript
@@ -96,7 +96,8 @@ export class ElasticsearchModelConfig {
   /**
    * Build final hosts
    */
-  postConstruct(): void {
+  @PostConstruct()
+  finalizeConfig(): void {
     console.debug('Constructed', { config: this });
     this.hosts = this.hosts
       .map(host => host.includes(':') ? host : `${host}:${this.port}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-elasticsearch",
-  "version": "7.1.4",
+  "version": "8.0.0-alpha.1",
   "type": "module",
   "description": "Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.",
   "keywords": [
@@ -28,13 +28,13 @@
     "directory": "module/model-elasticsearch"
   },
   "dependencies": {
-    "@elastic/elasticsearch": "^9.2.0",
-    "@travetto/config": "^7.1.4",
-    "@travetto/model": "^7.1.4",
-    "@travetto/model-query": "^7.1.4"
+    "@elastic/elasticsearch": "^9.3.4",
+    "@travetto/config": "^8.0.0-alpha.1",
+    "@travetto/model": "^8.0.0-alpha.1",
+    "@travetto/model-query": "^8.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.1.4"
+    "@travetto/cli": "^8.0.0-alpha.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config.ts

@@ -1,5 +1,6 @@
 import type { TimeSpan } from '@travetto/runtime';
 import { Config } from '@travetto/config';
+import { PostConstruct } from '@travetto/di';
 
 import type { EsSchemaConfig } from './internal/types.ts';
 
@@ -56,7 +57,8 @@ export class ElasticsearchModelConfig {
   /**
    * Build final hosts
    */
-  postConstruct(): void {
+  @PostConstruct()
+  finalizeConfig(): void {
     console.debug('Constructed', { config: this });
     this.hosts = this.hosts
       .map(host => host.includes(':') ? host : `${host}:${this.port}`)

package/src/index-manager.ts

@@ -1,6 +1,7 @@
-import type { Client, estypes } from '@elastic/elasticsearch';
+import type { Client } from '@elastic/elasticsearch';
+import type * as estypes from '@elastic/elasticsearch/api/types';
 
-import type { Class } from '@travetto/runtime';
+import { JSONUtil, type Class } from '@travetto/runtime';
 import { ModelRegistryIndex, type ModelType, type ModelStorageSupport } from '@travetto/model';
 
 import type { ElasticsearchModelConfig } from './config.ts';
@@ -40,12 +41,12 @@ export class IndexManager implements ModelStorageSupport {
    * Build the elasticsearch identity set for a given class (index)
    */
   getIdentity<T extends ModelType>(cls: Class<T>): { index: string } {
-    if (!this.#identities.has(cls)) {
+    const result = this.#identities.getOrInsertComputed(cls, () => {
       const col = this.getStore(cls);
       const index = this.getNamespacedIndex(col);
-      this.#identities.set(cls, { index });
-    }
-    return { ...this.#identities.get(cls)! };
+      return { index };
+    });
+    return { ...result };
   }
 
   /**
@@ -78,7 +79,7 @@ export class IndexManager implements ModelStorageSupport {
   async exportModel(cls: Class<ModelType>): Promise<string> {
     const schema = ElasticsearchSchemaUtil.generateSchemaMapping(cls, this.config.schemaConfig);
     const { index } = this.getIdentity(cls); // Already namespaced
-    return `curl -XPOST $ES_HOST/${index} -d '${JSON.stringify({
+    return `curl -XPOST $ES_HOST/${index} -d '${JSONUtil.toUTF8({
       mappings: schema,
       settings: this.config.indexCreate
     })}'`;

package/src/internal/query.ts

@@ -1,4 +1,4 @@
-import type { estypes } from '@elastic/elasticsearch';
+import type * as estypes from '@elastic/elasticsearch/api/types';
 
 import { castTo, type Class, TypedObject } from '@travetto/runtime';
 import { type WhereClause, type SelectClause, type SortClause, type Query, ModelQueryUtil } from '@travetto/model-query';

package/src/internal/schema.ts

@@ -1,6 +1,6 @@
-import type { estypes } from '@elastic/elasticsearch';
+import type * as estypes from '@elastic/elasticsearch/api/types';
 
-import { type Class, toConcrete } from '@travetto/runtime';
+import { castTo, type Class, toConcrete } from '@travetto/runtime';
 import { type Point, DataUtil, SchemaRegistryIndex } from '@travetto/schema';
 
 import type { EsSchemaConfig } from './types.ts';
@@ -84,6 +84,8 @@ export class ElasticsearchSchemaUtil {
     for (const [field, config] of Object.entries(fields)) {
       if (config.type === PointConcrete) {
         properties[field] = { type: 'geo_point' };
+      } else if (config.type === castTo(BigInt)) {
+        properties[field] = { type: 'long' };
       } else if (config.type === Number) {
         let property: Record<string, unknown> = { type: 'integer' };
         if (config.precision) {

package/src/service.ts

@@ -1,13 +1,14 @@
-import { Client, errors, type estypes } from '@elastic/elasticsearch';
+import { Client, errors, Serializer } from '@elastic/elasticsearch';
+import type * as estypes from '@elastic/elasticsearch/api/types';
 
 import {
   type ModelCrudSupport, type BulkOperation, type BulkResponse, type ModelBulkSupport, type ModelExpirySupport,
   type ModelIndexedSupport, type ModelType, type ModelStorageSupport, NotFoundError, ModelRegistryIndex, type OptionalId,
   ModelCrudUtil, ModelIndexedUtil, ModelStorageUtil, ModelExpiryUtil, ModelBulkUtil,
 } from '@travetto/model';
-import { ShutdownManager, type DeepPartial, type Class, castTo, asFull, TypedObject, asConstructable } from '@travetto/runtime';
+import { ShutdownManager, type DeepPartial, type Class, castTo, asFull, TypedObject, asConstructable, JSONUtil } from '@travetto/runtime';
 import { BindUtil } from '@travetto/schema';
-import { Injectable } from '@travetto/di';
+import { Injectable, PostConstruct } from '@travetto/di';
 import {
   type ModelQuery, type ModelQueryCrudSupport, type ModelQueryFacetSupport,
   type ModelQuerySupport, type PageableModelQuery, type Query, type ValidStringFields,
@@ -22,6 +23,13 @@ import { ElasticsearchQueryUtil } from './internal/query.ts';
 import { ElasticsearchSchemaUtil } from './internal/schema.ts';
 import { IndexManager } from './index-manager.ts';
 
+const ELASTICSEARCH_REPLACER = {
+  replacer(this: unknown, key: string, value: unknown): unknown {
+    // @ts-expect-error
+    return (typeof this[key] === 'bigint' ? this[key].toString() : value);
+  }
+};
+
 /**
  * Elasticsearch model source.
  */
@@ -40,6 +48,24 @@ export class ElasticsearchModelService implements
 
   constructor(config: ElasticsearchModelConfig) { this.config = config; }
 
+  @PostConstruct()
+  async initializeClient(this: ElasticsearchModelService): Promise<void> {
+    this.client = new Client({
+      nodes: this.config.hosts,
+      ...(this.config.options || {}),
+      Serializer: class extends Serializer {
+        deserialize = JSONUtil.fromUTF8;
+        serialize = (obj: unknown): string => JSONUtil.toUTF8(obj, ELASTICSEARCH_REPLACER);
+      }
+    });
+    await this.client.cluster.health({});
+    this.manager = new IndexManager(this.config, this.client);
+
+    await ModelStorageUtil.storageInitialization(this.manager);
+    ShutdownManager.signal.addEventListener('abort', () => this.client.close());
+    ModelExpiryUtil.registerCull(this);
+  }
+
   /**
    * Directly run the search
    */
@@ -107,19 +133,6 @@ export class ElasticsearchModelService implements
     }
   }
 
-  async postConstruct(this: ElasticsearchModelService): Promise<void> {
-    this.client = new Client({
-      nodes: this.config.hosts,
-      ...(this.config.options || {}),
-    });
-    await this.client.cluster.health({});
-    this.manager = new IndexManager(this.config, this.client);
-
-    await ModelStorageUtil.storageInitialization(this.manager);
-    ShutdownManager.signal.addEventListener('abort', () => this.client.close());
-    ModelExpiryUtil.registerCull(this);
-  }
-
   createStorage(): Promise<void> { return this.manager.createStorage(); }
   deleteStorage(): Promise<void> { return this.manager.deleteStorage(); }
   upsertModel(cls: Class): Promise<void> { return this.manager.upsertModel(cls); }
@@ -157,22 +170,17 @@ export class ElasticsearchModelService implements
   }
 
   async create<T extends ModelType>(cls: Class<T>, item: OptionalId<T>): Promise<T> {
-    try {
-      const clean = await ModelCrudUtil.preStore(cls, item, this);
-      const id = this.preUpdate(clean);
+    const clean = await ModelCrudUtil.preStore(cls, item, this);
+    const id = this.preUpdate(clean);
 
-      await this.client.index({
-        ...this.manager.getIdentity(cls),
-        id,
-        refresh: true,
-        body: castTo<T & { id: never }>(clean)
-      });
+    await this.client.index({
+      ...this.manager.getIdentity(cls),
+      id,
+      refresh: true,
+      body: castTo<T & { id: never }>(clean)
+    });
 
-      return this.postUpdate(clean, id);
-    } catch (error) {
-      console.error(error);
-      throw error;
-    }
+    return this.postUpdate(clean, id);
   }
 
   async update<T extends ModelType>(cls: Class<T>, item: T): Promise<T> {
@@ -531,7 +539,7 @@ export class ElasticsearchModelService implements
     });
     const search = ElasticsearchQueryUtil.getSearchObject(cls, resolvedQuery);
     const result = await this.execSearch(cls, search);
-    const all = await Promise.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]: field === 'id' ? hit._id : hit._source![field] })));
     return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, all, item => item, query && query.limit);
   }
 

package/support/service.elasticsearch.ts

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