@travetto/model-query 8.0.0-alpha.16 → 8.0.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query",
-  "version": "8.0.0-alpha.16",
+  "version": "8.0.0-alpha.19",
   "type": "module",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
@@ -27,12 +27,12 @@
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/di": "^8.0.0-alpha.14",
-    "@travetto/model": "^8.0.0-alpha.15",
-    "@travetto/schema": "^8.0.0-alpha.15"
+    "@travetto/di": "^8.0.0-alpha.17",
+    "@travetto/model": "^8.0.0-alpha.18",
+    "@travetto/schema": "^8.0.0-alpha.18"
   },
   "peerDependencies": {
-    "@travetto/test": "^8.0.0-alpha.14"
+    "@travetto/test": "^8.0.0-alpha.17"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/model/where-clause.ts

@@ -1,11 +1,11 @@
-import type { Primitive, ValidFields, TimeSpan, ValidTypedFields } from '@travetto/runtime';
+import type { Primitive, ValidFields, TimeSpan, KeyPaths } from '@travetto/runtime';
 import type { Point } from '@travetto/schema';
 
 export type QueryPrimitive = Primitive | Date | Point;
 export type QueryPrimitiveArray = QueryPrimitive[];
 export type DistanceUnit = 'mi' | 'm' | 'km' | 'ft' | 'rad';
 export type RetainQueryPrimitiveFields<T> = Pick<T, ValidFields<T, QueryPrimitive>>;
-export type ValidStringFields<T> = ValidTypedFields<T, String | string | string[] | String[] | undefined>;
+export type ValidStringFields<T> = KeyPaths<T, String | string | string[] | String[] | undefined>;
 
 type General<T> = {
   $eq?: T;

package/src/util/suggest.ts

@@ -1,5 +1,5 @@
 import { ModelRegistryIndex, type ModelType } from '@travetto/model';
-import { castTo, type Class, hasFunction } from '@travetto/runtime';
+import { castKey, castTo, type Class, hasFunction } from '@travetto/runtime';
 import { SchemaRegistryIndex } from '@travetto/schema';
 
 import type { PageableModelQuery, Query } from '../model/query.ts';
@@ -28,7 +28,15 @@ export class ModelQuerySuggestUtil {
    */
   static getSuggestQuery<T extends ModelType>(cls: Class<T>, field: ValidStringFields<T>, prefix?: string, query?: Query<T>): Query<T> {
     const limit = query?.limit ?? 10;
-    const clauses: WhereClauseRaw<ModelType>[] = prefix ? [{ [field]: { $regex: this.getSuggestRegex(prefix) } }] : [];
+    const clauses: WhereClauseRaw<ModelType>[] = [];
+    if (prefix) {
+      const parts = `${field}`.split('.');
+      let o: WhereClauseRaw<ModelType> = { [parts.at(-1)!]: { $regex: this.getSuggestRegex(prefix) } };
+      for (let i = parts.length - 2; i >= 0; i -= 1) {
+        o = { [parts[i]]: o };
+      }
+      clauses.push(o);
+    }
     const select: Query<T>['select'] = {
       ...query?.select
     };
@@ -75,8 +83,13 @@ export class ModelQuerySuggestUtil {
     const pattern = this.getSuggestRegex(prefix);
 
     const out: ([string, U] | readonly [string, U])[] = [];
+    const parts = `${field}`.split('.');
+
     for (const result of results) {
-      const resultValue = result[field];
+      let resultValue = result[castKey<T>(parts[0])];
+      for (let i = 1; i < parts.length; i++) {
+        resultValue = resultValue[castKey(parts[i])];
+      }
       if (Array.isArray(resultValue)) {
         out.push(...resultValue.filter(item => pattern.test(item)).map((item: string) => [item, transform(item, result)] as const));
       } else if (typeof resultValue === 'string') {