@koalarx/nest 3.1.26 → 3.1.27

package/core/database/repository.base.js

@@ -72,6 +72,13 @@ class RepositoryBase {
                     select: this.getSelectRootPrismaSchema(instance.constructor),
                 };
             }
+            else if (instance instanceof list_1.List) {
+                const list = new entity()[prop.name];
+                const entityInstance = list.entityType;
+                selectSchema[prop.name] = {
+                    select: this.getSelectRootPrismaSchema(entityInstance),
+                };
+            }
             else {
                 selectSchema[prop.name] = true;
             }
@@ -305,28 +312,27 @@ class RepositoryBase {
     async enrichEntityWithRelations(entity, data, cache = new Map()) {
         if (!data)
             return data;
-        const relationQueries = [];
-        const relationKeys = [];
         const allProps = auto_mapping_list_1.AutoMappingList.getAllProps(entity);
-        allProps.forEach((prop) => {
+        for (const prop of allProps) {
             const propName = prop.name;
             const propDef = auto_mapping_list_1.AutoMappingList.getPropDefinitions(entity, propName);
             if (propDef?.type === list_1.List.name) {
                 const list = new entity()[prop.name];
                 const entityInstance = list.entityType;
-                relationKeys.push(propName);
                 const items = [];
-                data[propName]?.forEach((item) => {
+                for (const item of data[propName] || []) {
                     const cacheKey = `${entity.name}-${propName}-${this.getIdOnEntity(new entityInstance(), item)}`;
                     if (cache.has(cacheKey)) {
-                        items.push(Promise.resolve(cache.get(cacheKey)));
-                        return;
+                        items.push(cache.get(cacheKey));
+                        continue;
                     }
                     cache.set(cacheKey, item);
-                    items.push(this.loadRelationForEntity(this.getWhereByIdSchema(new entityInstance(), item), entityInstance, cache));
-                });
-                relationQueries.push(Promise.all(items));
-                return;
+                    const enrichedItem = await this.loadRelationForEntity(this.getWhereByIdSchema(new entityInstance(), item), entityInstance, cache);
+                    cache.set(cacheKey, enrichedItem);
+                    items.push(enrichedItem);
+                }
+                data[propName] = items;
+                continue;
             }
             const relationEntity = auto_mapping_list_1.AutoMappingList.getSourceByName(propDef?.type ?? '');
             if (relationEntity && data[propName]) {
@@ -336,15 +342,9 @@ class RepositoryBase {
                     return;
                 }
                 cache.set(cacheKey, data[propName]);
-                relationKeys.push(propName);
-                relationQueries.push(this.loadRelationForEntity(this.getWhereByIdSchema(relationEntity, data[propName]), relationEntity, cache));
+                data[propName] = await this.loadRelationForEntity(this.getWhereByIdSchema(relationEntity, data[propName]), relationEntity, cache);
+                cache.set(cacheKey, data[propName]);
             }
-        });
-        if (relationQueries.length > 0) {
-            const results = await Promise.all(relationQueries);
-            relationKeys.forEach((key, index) => {
-                data[key] = results[index];
-            });
         }
         return data;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "3.1.26",
+  "version": "3.1.27",
   "description": "",
   "author": "Igor D. Rangel",
   "license": "MIT",