@mikro-orm/knex 6.5.1 → 6.5.2-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.5.1",
+  "version": "6.5.2-dev.1",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.5.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "^6.0.0",
+    "@mikro-orm/core": "6.5.2-dev.1",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -1294,17 +1294,27 @@ class QueryBuilder {
             return;
         }
         const joins = Object.values(this._joins);
+        const lookupParentGroup = (j) => {
+            return j.nested ?? (j.parent ? lookupParentGroup(j.parent) : undefined);
+        };
         for (const join of joins) {
             if (join.type === enums_1.JoinType.innerJoin) {
-                const parentJoin = joins.find(j => j.alias === join.ownerAlias);
+                join.parent = joins.find(j => j.alias === join.ownerAlias);
                 // https://stackoverflow.com/a/56815807/3665878
-                if (parentJoin?.type === enums_1.JoinType.leftJoin || parentJoin?.type === enums_1.JoinType.nestedLeftJoin) {
-                    const nested = (parentJoin.nested ??= new Set());
+                if (join.parent?.type === enums_1.JoinType.leftJoin || join.parent?.type === enums_1.JoinType.nestedLeftJoin) {
+                    const nested = ((join.parent).nested ??= new Set());
                     join.type = join.type === enums_1.JoinType.innerJoin
                         ? enums_1.JoinType.nestedInnerJoin
                         : enums_1.JoinType.nestedLeftJoin;
                     nested.add(join);
                 }
+                else if (join.parent?.type === enums_1.JoinType.nestedInnerJoin) {
+                    const group = lookupParentGroup(join.parent);
+                    join.type = join.type === enums_1.JoinType.innerJoin
+                        ? enums_1.JoinType.nestedInnerJoin
+                        : enums_1.JoinType.nestedLeftJoin;
+                    group?.add(join);
+                }
             }
         }
     }

package/typings.d.ts

@@ -28,6 +28,7 @@ export interface JoinOptions {
     cond_?: Dictionary;
     subquery?: string;
     nested?: Set<JoinOptions>;
+    parent?: JoinOptions;
 }
 export interface Column {
     name: string;