@travetto/model-mongo 8.0.6 → 8.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "8.0.6",
+  "version": "8.0.8",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
     "database",
@@ -32,7 +32,7 @@
     "@travetto/config": "^8.0.3",
     "@travetto/model": "^8.0.4",
     "@travetto/model-indexed": "^8.0.4",
-    "@travetto/model-query": "^8.0.6",
+    "@travetto/model-query": "^8.0.8",
     "mongodb": "^7.6.0"
   },
   "peerDependencies": {

package/src/service.ts

@@ -58,6 +58,7 @@ import {
   type ModelQueryCrudSupport,
   ModelQueryCrudUtil,
   type ModelQueryFacet,
+  type FacetModelQuery,
   type ModelQueryFacetSupport,
   type ModelQuerySuggestSupport,
   ModelQuerySuggestUtil,
@@ -66,6 +67,7 @@ import {
   type NumberFieldAggregateResult,
   type PageableModelQuery,
   QueryVerifier,
+  type SuggestModelQuery,
   type ValidComparableFields,
   type ValidStringFields,
   type WhereClause
@@ -713,13 +715,14 @@ export class MongoModelService
   }
 
   // Facet
-  async facetByQuery<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, query?: ModelQuery<T>): Promise<ModelQueryFacet[]> {
+  async facetByQuery<T extends ModelType>(
+    cls: Class<T>,
+    field: ValidStringFields<T>,
+    query?: FacetModelQuery<T>
+  ): Promise<ModelQueryFacet[]> {
     await QueryVerifier.verify(cls, query);
 
     const col = await this.getStore(cls);
-    if (query) {
-      await QueryVerifier.verify(cls, query);
-    }
 
     let queryObject: Record<string, unknown> = { [field]: { $exists: true } };
 
@@ -727,8 +730,19 @@ export class MongoModelService
       queryObject = { $and: [queryObject, MongoUtil.extractWhereFilter(cls, query.where)] };
     }
 
+    const unwinds: object[] = [];
+    const segments = String(field).split('.');
+    for (let index = 1; index <= segments.length; index++) {
+      const subPath = segments.slice(0, index);
+      const fieldConfiguration = SchemaRegistryIndex.getNestedFieldConfig(cls, subPath);
+      if (fieldConfiguration?.array) {
+        unwinds.push({ $unwind: `$${subPath.join('.')}` });
+      }
+    }
+
     const aggregations: object[] = [
       { $match: queryObject },
+      ...unwinds,
       {
         $group: {
           _id: `$${field}`,
@@ -736,17 +750,22 @@ export class MongoModelService
             $sum: 1
           }
         }
-      }
+      },
+      {
+        $sort: {
+          count: -1
+        }
+      },
+      ...(query?.offset !== undefined ? [{ $skip: query.offset }] : []),
+      ...(query?.limit !== undefined ? [{ $limit: query.limit }] : [])
     ];
 
     const result = await col.aggregate<{ _id: ObjectId; count: number }>(aggregations).toArray();
 
-    return result
-      .map(item => ({
-        key: MongoUtil.idToString(item._id),
-        count: item.count
-      }))
-      .toSorted((a, b) => b.count - a.count);
+    return result.map(item => ({
+      key: MongoUtil.idToString(item._id),
+      count: item.count
+    }));
   }
 
   // Aggregate
@@ -791,24 +810,24 @@ export class MongoModelService
     cls: Class<T>,
     field: ValidStringFields<T>,
     prefix?: string,
-    query?: PageableModelQuery<T>
+    query?: SuggestModelQuery<T>
   ): Promise<string[]> {
     await QueryVerifier.verify(cls, query);
     const resolvedQuery = ModelQuerySuggestUtil.getSuggestFieldQuery<T>(cls, field, prefix, query);
     const results = await this.query<T>(cls, resolvedQuery);
-    return ModelQuerySuggestUtil.combineSuggestResults<T, string>(cls, field, prefix, results, a => a, query?.limit);
+    return ModelQuerySuggestUtil.combineSuggestResults<T, string>(cls, field, prefix, results, a => a, query);
   }
 
   async suggestByQuery<T extends ModelType>(
     cls: Class<T>,
     field: ValidStringFields<T>,
     prefix?: string,
-    query?: PageableModelQuery<T>
+    query?: SuggestModelQuery<T>
   ): Promise<T[]> {
     await QueryVerifier.verify(cls, query);
     const resolvedQuery = ModelQuerySuggestUtil.getSuggestQuery<T>(cls, field, prefix, query);
     const results = await this.query<T>(cls, resolvedQuery);
-    return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, results, (_, b) => b, query?.limit);
+    return ModelQuerySuggestUtil.combineSuggestResults(cls, field, prefix, results, (_, b) => b, query);
   }
 
   // Other