@mikro-orm/sql 7.1.15-dev.0 → 7.1.15-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.15-dev.0",
+  "version": "7.1.15-dev.2",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.14"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.15-dev.0"
+    "@mikro-orm/core": "7.1.15-dev.2"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.d.ts

@@ -782,6 +782,8 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * @internal
      */
     getJoinForPath(path: string, options?: ICriteriaNodeProcessOptions): JoinOptions | undefined;
+    /** Branch-insensitive path matching still must not cross branches — segments with different explicit branch markers (e.g. `Mobile[0]` vs `Mobile[1]`) belong to sibling joins. */
+    private branchesConflict;
     /**
      * @internal
      */

package/query/QueryBuilder.js

@@ -990,12 +990,13 @@ export class QueryBuilder {
         }
         if (!join && options?.ignoreBranching) {
             join = joins.find(j => {
-                return j.path?.replace(/\[\d+]/g, '') === path.replace(/\[\d+]/g, '');
+                return j.path?.replace(/\[\d+]/g, '') === path.replace(/\[\d+]/g, '') && !this.branchesConflict(j.path, path);
             });
         }
         if (!join && options?.matchPopulateJoins && options?.ignoreBranching) {
             join = joins.find(j => {
-                return j.path?.replace(/\[\d+]|\[populate]/g, '') === path.replace(/\[\d+]|\[populate]/g, '');
+                return (j.path?.replace(/\[\d+]|\[populate]/g, '') === path.replace(/\[\d+]|\[populate]/g, '') &&
+                    !this.branchesConflict(j.path, path));
             });
         }
         if (!join && options?.matchPopulateJoins) {
@@ -1005,6 +1006,12 @@ export class QueryBuilder {
         }
         return join;
     }
+    /** Branch-insensitive path matching still must not cross branches — segments with different explicit branch markers (e.g. `Mobile[0]` vs `Mobile[1]`) belong to sibling joins. */
+    branchesConflict(path1, path2) {
+        const markers = (path) => path.split('.').map(segment => /\[(\d+)]/.exec(segment)?.[1]);
+        const markers2 = markers(path2);
+        return markers(path1).some((m, idx) => m != null && markers2[idx] != null && m !== markers2[idx]);
+    }
     /**
      * @internal
      */