@travetto/model-mongo 3.1.0-rc.6 → 3.1.0-rc.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "3.1.0-rc.6",
+  "version": "3.1.0-rc.7",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "mongo",
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "@travetto/config": "^3.1.0-rc.6",
-    "@travetto/model": "^3.1.0-rc.6",
-    "@travetto/model-query": "^3.1.0-rc.6",
+    "@travetto/model": "^3.1.0-rc.7",
+    "@travetto/model-query": "^3.1.0-rc.7",
     "mongodb": "^5.0.1"
   },
   "peerDependencies": {

package/src/service.ts

@@ -29,7 +29,6 @@ import { ModelExpiryUtil } from '@travetto/model/src/internal/service/expiry';
 import { StreamModel, STREAMS } from '@travetto/model/src/internal/service/stream';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 import { ModelBulkUtil } from '@travetto/model/src/internal/service/bulk';
-import { ModelUtil } from '@travetto/model/src/internal/util';
 
 import { MongoUtil, WithId } from './internal/util';
 import { MongoModelConfig } from './config';
@@ -54,6 +53,7 @@ export class MongoModelService implements
   ModelQueryCrudSupport, ModelQueryFacetSupport,
   ModelQuerySuggestSupport, ModelExpirySupport {
 
+  uuid = ModelCrudUtil.uuidGenerator();
   client: mongo.MongoClient;
   #db: mongo.Db;
   #bucket: mongo.GridFSBucket;
@@ -87,13 +87,6 @@ export class MongoModelService implements
     return MongoUtil.prepareQuery(cls, { where }, checkExpiry).filter;
   }
 
-  /**
-   * Build a mongo identifier
-   */
-  uuid(): string {
-    return ModelUtil.uuid();
-  }
-
   // Storage
   async createStorage(): Promise<void> { }
 
@@ -499,8 +492,8 @@ export class MongoModelService implements
   }
 
   async queryOne<T extends ModelType>(cls: Class<T>, query: ModelQuery<T>, failOnMany = false): Promise<T> {
-    const results = await this.query(cls, { ...query, limit: failOnMany ? 2 : 1 });
-    return ModelQueryUtil.verifyGetSingleCounts(cls, results, failOnMany);
+    const results = await this.query<T>(cls, { ...query, limit: failOnMany ? 2 : 1 });
+    return ModelQueryUtil.verifyGetSingleCounts<T>(cls, results, failOnMany);
   }
 
   // Query Crud
@@ -565,14 +558,14 @@ export class MongoModelService implements
 
   // Suggest
   async suggestValues<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, prefix?: string, query?: PageableModelQuery<T>): Promise<string[]> {
-    const q = ModelQuerySuggestUtil.getSuggestFieldQuery(cls, field, prefix, query);
-    const results = await this.query(cls, q);
-    return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, results, (a) => a, query && query.limit);
+    const q = ModelQuerySuggestUtil.getSuggestFieldQuery<T>(cls, field, prefix, query);
+    const results = await this.query<T>(cls, q);
+    return ModelQuerySuggestUtil.combineSuggestResults<T, string>(cls, field, prefix, results, (a) => a, query && query.limit);
   }
 
   async suggest<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, prefix?: string, query?: PageableModelQuery<T>): Promise<T[]> {
-    const q = ModelQuerySuggestUtil.getSuggestQuery(cls, field, prefix, query);
-    const results = await this.query(cls, q);
+    const q = ModelQuerySuggestUtil.getSuggestQuery<T>(cls, field, prefix, query);
+    const results = await this.query<T>(cls, q);
     return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, results, (_, b) => b, query && query.limit);
   }
 }