@koalarx/nest 3.1.26 → 3.1.28

package/core/database/repository.base.js

@@ -8,6 +8,7 @@ const auto_mapping_list_1 = require("../mapping/auto-mapping-list");
 const generate_prisma_include_schema_1 = require("../utils/generate-prisma-include-schema");
 const list_1 = require("../utils/list");
 const entity_base_1 = require("./entity.base");
+const proxy_1 = require("../utils/proxy");
 class RepositoryBase {
     _context;
     _modelName;
@@ -72,6 +73,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.getWhereByIdSchema(new entityInstance(), true),
+                };
+            }
             else {
                 selectSchema[prop.name] = true;
             }
@@ -300,51 +308,45 @@ class RepositoryBase {
             select: this.getSelectRootPrismaSchema(entity),
             where,
         })
-            .then((data) => this.enrichEntityWithRelations(entity, data, cache));
+            .then((data) => this.enrichEntityWithRelations(entity, (0, proxy_1.createProxy)(data), cache));
     }
     async enrichEntityWithRelations(entity, data, cache = new Map()) {
-        if (!data)
-            return data;
-        const relationQueries = [];
-        const relationKeys = [];
+        if (!data) {
+            return null;
+        }
         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) => {
-                    const cacheKey = `${entity.name}-${propName}-${this.getIdOnEntity(new entityInstance(), item)}`;
+                for (const item of data[propName] || []) {
+                    const cacheKey = `${entity.name}-${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]) {
-                const cacheKey = `${entity.name}-${propName}-${this.getIdOnEntity(new relationEntity(), data[propName])}`;
+                const cacheKey = `${entity.name}-${this.getIdOnEntity(new relationEntity(), data[propName])}`;
                 if (cache.has(cacheKey)) {
                     data[propName] = cache.get(cacheKey);
-                    return;
+                    continue;
                 }
                 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(new 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;
     }
@@ -416,7 +418,7 @@ class RepositoryBase {
         });
         if (!data)
             return null;
-        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, { ...data });
+        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, (0, proxy_1.createProxy)(data));
         return this.createEntity(enrichedEntity);
     }
     async findFirst(where) {
@@ -426,7 +428,7 @@ class RepositoryBase {
         });
         if (!data)
             return null;
-        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, { ...data });
+        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, (0, proxy_1.createProxy)(data));
         return this.createEntity(enrichedEntity);
     }
     async findUnique(where) {
@@ -436,7 +438,7 @@ class RepositoryBase {
         });
         if (!data)
             return null;
-        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, { ...data });
+        const enrichedEntity = await this.enrichEntityWithRelations(this._modelName.prototype.constructor, (0, proxy_1.createProxy)(data));
         return this.createEntity(enrichedEntity);
     }
     async findMany(where, pagination) {

package/core/utils/is-plain-object.d.ts

@@ -0,0 +1 @@
+export declare function isPlainObject(val: any): boolean;

package/core/utils/is-plain-object.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPlainObject = isPlainObject;
+function isPlainObject(val) {
+    if (typeof val !== 'object' || val === null)
+        return false;
+    return Object.prototype.toString.call(val) === '[object Object]';
+}

package/core/utils/proxy.d.ts

@@ -0,0 +1 @@
+export declare function createProxy(target: any): any;

package/core/utils/proxy.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProxy = createProxy;
+const is_plain_object_1 = require("./is-plain-object");
+const handle = {
+    get(target, prop) {
+        if (prop === '__isProxy')
+            return true;
+        return target[prop];
+    },
+    set(target, prop, value) {
+        target[prop] = value;
+        return true;
+    },
+};
+function createProxy(target) {
+    const proxy = new Proxy(target, handle);
+    Object.keys(proxy).forEach((key) => {
+        if ((0, is_plain_object_1.isPlainObject)(proxy[key])) {
+            proxy[key] = new Proxy(proxy[key], handle);
+        }
+        else if (Array.isArray(proxy[key])) {
+            proxy[key] = proxy[key].map((item) => (0, is_plain_object_1.isPlainObject)(item) ? new Proxy(item, handle) : item);
+        }
+    });
+    return proxy;
+}

package/package.json

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