@cheetah.js/orm 0.1.103 → 0.1.105

package/dist/SqlBuilder.d.ts

@@ -44,7 +44,10 @@ export declare class SqlBuilder<T> {
     executeAndReturnFirstOrFail(): Promise<T>;
     executeAndReturnAll(): Promise<T[]>;
     private hasOneToManyJoinedJoin;
+    private getOriginEntityForJoin;
+    private findNestedModel;
     private processOneToManyJoinedResult;
+    private processAllOneToManyJoinedResults;
     private attachOneToManyRelations;
     private removeDuplicatesByPrimaryKey;
     private getPrimaryKeyName;

package/dist/SqlBuilder.js

@@ -210,6 +210,10 @@ class SqlBuilder {
             return [];
         }
         const rows = result.query.rows;
+        const hasOneToManyJoinedJoin = this.hasOneToManyJoinedJoin();
+        if (hasOneToManyJoinedJoin) {
+            return this.processAllOneToManyJoinedResults(rows);
+        }
         const results = [];
         for (const row of rows) {
             const models = this.modelTransformer.transform(this.model, this.statements, row);
@@ -227,10 +231,39 @@ class SqlBuilder {
             return false;
         }
         return this.statements.join.some(join => {
-            const relationship = this.entity.relations.find(rel => rel.propertyKey === join.joinProperty);
+            const originEntity = this.getOriginEntityForJoin(join);
+            if (!originEntity) {
+                return false;
+            }
+            const relationship = originEntity.relations.find(rel => rel.propertyKey === join.joinProperty);
             return relationship?.relation === 'one-to-many';
         });
     }
+    getOriginEntityForJoin(join) {
+        const rootAlias = this.statements.alias;
+        if (join.originAlias === rootAlias) {
+            return this.entity;
+        }
+        const parentJoin = this.statements.join.find(j => j.joinAlias === join.originAlias);
+        if (parentJoin && parentJoin.joinEntity) {
+            return this.entityStorage.get(parentJoin.joinEntity);
+        }
+        return null;
+    }
+    findNestedModel(model, targetAlias) {
+        if (!this.statements.join) {
+            return null;
+        }
+        for (const join of this.statements.join) {
+            if (join.joinAlias === targetAlias) {
+                const parentModel = join.originAlias === this.statements.alias
+                    ? model
+                    : this.findNestedModel(model, join.originAlias);
+                return parentModel?.[join.joinProperty];
+            }
+        }
+        return null;
+    }
     async processOneToManyJoinedResult(rows) {
         const primaryKey = this.getPrimaryKeyName();
         const alias = this.statements.alias;
@@ -242,16 +275,46 @@ class SqlBuilder {
         this.attachOneToManyRelations(model, relatedRows);
         return model;
     }
+    async processAllOneToManyJoinedResults(rows) {
+        const primaryKey = this.getPrimaryKeyName();
+        const alias = this.statements.alias;
+        const primaryKeyColumn = `${alias}_${primaryKey}`;
+        const groupedRows = new Map();
+        for (const row of rows) {
+            const pkValue = row[primaryKeyColumn];
+            if (!groupedRows.has(pkValue)) {
+                groupedRows.set(pkValue, []);
+            }
+            groupedRows.get(pkValue).push(row);
+        }
+        const results = [];
+        for (const [, relatedRows] of groupedRows) {
+            const model = this.modelTransformer.transform(this.model, this.statements, relatedRows[0]);
+            this.afterHooks(model);
+            this.attachOneToManyRelations(model, relatedRows);
+            results.push(model);
+        }
+        return results;
+    }
     attachOneToManyRelations(model, rows) {
         if (!this.statements.join) {
             return;
         }
         for (const join of this.statements.join) {
-            const relationship = this.entity.relations.find(rel => rel.propertyKey === join.joinProperty);
+            const originEntity = this.getOriginEntityForJoin(join);
+            if (!originEntity) {
+                continue;
+            }
+            const relationship = originEntity.relations.find(rel => rel.propertyKey === join.joinProperty);
             if (relationship?.relation === 'one-to-many') {
                 const joinedModels = rows.map(row => this.modelTransformer.transform(join.joinEntity, { alias: join.joinAlias }, row));
                 const uniqueModels = this.removeDuplicatesByPrimaryKey(joinedModels, join.joinEntity);
-                model[join.joinProperty] = uniqueModels;
+                const targetModel = join.originAlias === this.statements.alias
+                    ? model
+                    : this.findNestedModel(model, join.originAlias);
+                if (targetModel) {
+                    targetModel[join.joinProperty] = uniqueModels;
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.103",
+  "version": "0.1.105",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "d1e6603d2e9c4f45d469eb6443d004ef96bdf76c"
+  "gitHead": "e25d2331c9fca65627ad761e8dd4ade19d97fcb8"
 }