@travetto/model-mysql 8.0.0-alpha.28 → 8.0.0-alpha.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mysql",
-  "version": "8.0.0-alpha.28",
+  "version": "8.0.0-alpha.29",
   "type": "module",
   "description": "MySQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
@@ -31,8 +31,8 @@
     "@travetto/config": "^8.0.0-alpha.23",
     "@travetto/context": "^8.0.0-alpha.21",
     "@travetto/model": "^8.0.0-alpha.24",
-    "@travetto/model-query": "^8.0.0-alpha.25",
-    "@travetto/model-sql": "^8.0.0-alpha.27",
+    "@travetto/model-query": "^8.0.0-alpha.26",
+    "@travetto/model-sql": "^8.0.0-alpha.28",
     "mysql2": "^3.23.1"
   },
   "peerDependencies": {

package/src/dialect.ts

@@ -1,6 +1,6 @@
 import { AbstractANSI99Dialect, type JSONSqlPathMode, type ResolvedPathContext, type TableContext } from '@travetto/model-sql';
 import { type Class, castTo, JSONUtil } from '@travetto/runtime';
-import type { SchemaFieldConfig } from '@travetto/schema';
+import { type SchemaFieldConfig, SchemaRegistryIndex } from '@travetto/schema';
 
 export class MysqlDialect extends AbstractANSI99Dialect {
   override returningSupport = false;
@@ -64,13 +64,36 @@ export class MysqlDialect extends AbstractANSI99Dialect {
     }
   }
 
+  #formatSubPath(context: ResolvedPathContext): string {
+    if (!context.subPath || context.subPath.length === 0) {
+      return '';
+    }
+    let currentClass: Class | undefined = context.arrayField?.type;
+    const parts: string[] = [];
+    for (let index = 0; index < context.subPath.length; index++) {
+      const segment = context.subPath[index];
+      if (currentClass) {
+        const classConfig = SchemaRegistryIndex.getOptional(currentClass)?.get();
+        const fieldConfig = classConfig?.fields[segment];
+        if (fieldConfig) {
+          parts.push(fieldConfig.array ? `${segment}[*]` : segment);
+          currentClass = fieldConfig.type;
+          continue;
+        }
+      }
+      parts.push(segment);
+    }
+    return parts.join('.');
+  }
+
   #getArraySqlPath(context: ResolvedPathContext): string {
     if (!context.arrayPath || context.arrayPath.length === 0 || !context.subPath || context.subPath.length === 0) {
       return context.sqlPath;
     }
     const columnName = this.escapeIdentifier(context.arrayPath[0]);
     const arrayPathPart = context.arrayPath.length > 1 ? context.arrayPath.slice(1).join('.') : '';
-    const jsonPathExpr = arrayPathPart ? `$.${arrayPathPart}[*].${context.subPath.join('.')}` : `$[*].${context.subPath.join('.')}`;
+    const formattedSubPath = this.#formatSubPath(context);
+    const jsonPathExpr = arrayPathPart ? `$.${arrayPathPart}[*].${formattedSubPath}` : `$[*].${formattedSubPath}`;
     return `JSON_EXTRACT(${columnName}, '${jsonPathExpr}')`;
   }