@koalarx/nest 3.0.8 → 3.0.10

package/core/database/repository.base.d.ts

@@ -19,6 +19,9 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private readonly _modelName;
     private readonly _include?;
     constructor({ context, modelName, include, }: RepositoryInitProps<TEntity, TContext>);
+    private getConnectPrismaSchemaForRelation;
+    private getSelectRootPrismaSchema;
+    private getPropNameFromEntitySource;
     private listRelationEntities;
     private listToRelationActionList;
     private entityToPrisma;
@@ -27,7 +30,6 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private orphanRemoval;
     private getIdPropName;
     private getInclude;
-    private getPropNameFromEntitySource;
     private persistRelations;
     protected context(transactionalClient?: TContext): TContext[TModelKey];
     protected findById(id: IComparableId): Promise<TEntity | null>;

package/core/database/repository.base.js

@@ -16,6 +16,46 @@ class RepositoryBase {
         this._modelName = modelName;
         this._include = include;
     }
+    getConnectPrismaSchemaForRelation(entity, data) {
+        const propIdName = this.getIdPropName(entity);
+        return {
+            connect: {
+                [propIdName]: (data ?? entity)[propIdName],
+            },
+        };
+    }
+    getSelectRootPrismaSchema(entity) {
+        const selectSchema = {};
+        Object.keys(entity)
+            .filter((key) => !['id', '_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]),
+                };
+            }
+            else {
+                selectSchema[key] = true;
+            }
+        });
+        return selectSchema;
+    }
+    getPropNameFromEntitySource(source, entity) {
+        return Object.keys(source).find((key) => {
+            const propDefinitions = auto_mapping_list_1.AutoMappingList.getPropDefinitions(source.constructor, key);
+            if (propDefinitions) {
+                if (propDefinitions.type === entity.name) {
+                    return true;
+                }
+                else if (source[key] instanceof list_1.List) {
+                    const list = source[key];
+                    return list.entityType?.name === entity.name;
+                }
+            }
+            return false;
+        });
+    }
     listRelationEntities(entity) {
         const relationEntities = [];
         Object.keys(entity).forEach((key) => {
@@ -23,16 +63,13 @@ class RepositoryBase {
                 const list = entity[key];
                 list.toArray('added').forEach((item) => {
                     relationEntities.push(item);
-                    relationEntities.push(...this.listRelationEntities(item));
                 });
                 list.toArray('updated').forEach((item) => {
                     relationEntities.push(item);
-                    relationEntities.push(...this.listRelationEntities(item));
                 });
             }
             else if (entity[key] instanceof entity_base_1.EntityBase) {
                 relationEntities.push(entity[key]);
-                relationEntities.push(...this.listRelationEntities(entity[key]));
             }
         });
         return relationEntities;
@@ -47,6 +84,7 @@ class RepositoryBase {
                 const entityInstance = list.entityType;
                 const modelName = entityInstance.name;
                 const parentModelName = entity.constructor.name;
+                const parentPropName = this.getPropNameFromEntitySource(new entityInstance(), entity.constructor) ?? parentModelName;
                 if (modelName) {
                     list.toArray('removed').forEach((item) => {
                         relationDeletes.push({
@@ -63,12 +101,9 @@ class RepositoryBase {
                             schema: {
                                 data: {
                                     ...this.entityToPrisma(item),
-                                    [(0, KlString_1.toCamelCase)(parentModelName)]: {
-                                        connect: {
-                                            [this.getIdPropName(entity)]: entity[this.getIdPropName(entity)],
-                                        },
-                                    },
+                                    [parentPropName]: this.getConnectPrismaSchemaForRelation(entity),
                                 },
+                                select: this.getSelectRootPrismaSchema(item),
                             },
                             relations: this.listRelationEntities(item),
                         });
@@ -80,6 +115,7 @@ class RepositoryBase {
                             schema: {
                                 where: { id: item._id },
                                 data: this.entityToPrisma(item),
+                                select: this.getSelectRootPrismaSchema(item),
                             },
                             relations: this.listRelationEntities(item),
                         });
@@ -119,7 +155,7 @@ class RepositoryBase {
                     };
                 }
             }
-            else {
+            else if (!Array.isArray(entity[key])) {
                 prismaSchema[key] = entity[key];
             }
         });
@@ -165,21 +201,6 @@ class RepositoryBase {
         });
         return result;
     }
-    getPropNameFromEntitySource(source, entity) {
-        return Object.keys(source).find((key) => {
-            const propDefinitions = auto_mapping_list_1.AutoMappingList.getPropDefinitions(source.constructor, key);
-            if (propDefinitions) {
-                if (propDefinitions.type === entity.name) {
-                    return true;
-                }
-                else if (source[key] instanceof list_1.List) {
-                    const list = source[key];
-                    return list.entityType?.name === entity.name;
-                }
-            }
-            return false;
-        });
-    }
     persistRelations(transaction, entity) {
         const { relationCreates, relationUpdates, relationDeletes } = this.listToRelationActionList(entity);
         return Promise.all([
@@ -188,18 +209,17 @@ class RepositoryBase {
                 .then((response) => {
                 return Promise.all(relationCreate.relations.map((relation) => {
                     const relationPropName = this.getPropNameFromEntitySource(relation, relationCreate.entityInstance);
-                    if (!relationPropName) {
-                        throw new Error(`Propname not found for relation entity ${relation.constructor.name} on entity ${relationCreate.entityInstance.constructor.name}`);
+                    if (relationPropName) {
+                        relation[relationPropName] =
+                            this.getConnectPrismaSchemaForRelation(relationCreate.entityInstance, response);
                     }
-                    const relationEntity = this.createEntity(response, relationCreate.entityInstance);
-                    relationEntity._action = entity_base_1.EntityActionType.create;
-                    relation[relationPropName] = relationEntity;
                     return transaction[(0, KlString_1.toCamelCase)(relation.constructor.name)]
                         .create({
                         data: this.entityToPrisma(relation),
+                        select: this.getSelectRootPrismaSchema(relation),
                     })
                         .then((response) => {
-                        entity[this.getIdPropName(relation)] =
+                        relation[this.getIdPropName(relation)] =
                             response[this.getIdPropName(relation)];
                         return this.persistRelations(transaction, relation);
                     });

package/package.json

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