@koalarx/nest 3.1.15 → 3.1.17

package/core/database/repository.base.js

@@ -58,17 +58,22 @@ class RepositoryBase {
     }
     getSelectRootPrismaSchema(entity) {
         const selectSchema = {};
-        Object.keys(entity)
-            .filter((key) => !['_id', '_action'].includes(key))
-            .filter((key) => !(entity[key] instanceof Function || entity[key] instanceof list_1.List))
-            .forEach((key) => {
-            if (entity[key] instanceof entity_base_1.EntityBase) {
-                selectSchema[key] = {
-                    select: this.getSelectRootPrismaSchema(entity[key]),
+        const entityProps = auto_mapping_list_1.AutoMappingList.getAllProps(entity);
+        entityProps.forEach((prop) => {
+            let instance;
+            try {
+                instance = new (prop.type())();
+            }
+            catch {
+                instance = null;
+            }
+            if (instance instanceof entity_base_1.EntityBase) {
+                selectSchema[prop.name] = {
+                    select: this.getSelectRootPrismaSchema(instance.constructor),
                 };
             }
-            else {
-                selectSchema[key] = true;
+            else if (!(instance instanceof list_1.List)) {
+                selectSchema[prop.name] = true;
             }
         });
         return selectSchema;
@@ -285,7 +290,7 @@ class RepositoryBase {
     async loadRelationForEntity(where, entity, cache) {
         return this._context[(0, KlString_1.toCamelCase)((0, KlString_1.toCamelCase)(entity.name))]
             .findFirst({
-            select: this.getSelectWithRelationsId(entity),
+            select: this.getSelectRootPrismaSchema(entity),
             where,
         })
             .then((data) => this.enrichEntityWithRelations(entity, data, cache));
@@ -304,7 +309,7 @@ class RepositoryBase {
                 const entityInstance = list.entityType;
                 relationKeys.push(propName);
                 const items = [];
-                data[propName].forEach((item) => {
+                data[propName]?.forEach((item) => {
                     const cacheKey = `${entity.constructor.name}-${propName}-${this.getIdOnEntity(new entityInstance(), item)}`;
                     if (cache.has(cacheKey)) {
                         items.push(Promise.resolve(cache.get(cacheKey)));

package/package.json

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