@mikro-orm/knex 7.0.0-dev.23 → 7.0.0-dev.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.23",
+  "version": "7.0.0-dev.24",
   "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.",
   "type": "module",
   "exports": {
@@ -57,6 +57,6 @@
     "@mikro-orm/core": "^6.5.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.23"
+    "@mikro-orm/core": "7.0.0-dev.24"
   }
 }

package/query/QueryBuilder.js

@@ -285,7 +285,7 @@ export class QueryBuilder {
                     }
                 }
                 if (Utils.hasObjectKeys(join.cond)) {
-                    /* istanbul ignore next */
+                    /* v8 ignore next */
                     join.cond = { $and: [join.cond, cond] };
                 }
                 else {
@@ -1249,17 +1249,27 @@ export 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 === 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 === JoinType.leftJoin || parentJoin?.type === JoinType.nestedLeftJoin) {
-                    const nested = (parentJoin.nested ??= new Set());
+                if (join.parent?.type === JoinType.leftJoin || join.parent?.type === JoinType.nestedLeftJoin) {
+                    const nested = ((join.parent).nested ??= new Set());
                     join.type = join.type === JoinType.innerJoin
                         ? JoinType.nestedInnerJoin
                         : JoinType.nestedLeftJoin;
                     nested.add(join);
                 }
+                else if (join.parent?.type === JoinType.nestedInnerJoin) {
+                    const group = lookupParentGroup(join.parent);
+                    join.type = join.type === JoinType.innerJoin
+                        ? JoinType.nestedInnerJoin
+                        : JoinType.nestedLeftJoin;
+                    group?.add(join);
+                }
             }
         }
     }

package/typings.d.ts

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