@koalarx/nest 3.1.18 → 3.1.20

package/core/database/repository.base.js

@@ -108,19 +108,26 @@ class RepositoryBase {
         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) {
+        const entityProps = auto_mapping_list_1.AutoMappingList.getAllProps(source);
+        return entityProps.find((prop) => {
+            let instance;
+            try {
+                instance = new (prop.type())();
+            }
+            catch {
+                instance = null;
+            }
+            if (instance) {
+                if (instance.constructor.name === entity.name) {
                     return true;
                 }
-                else if (source[key] instanceof list_1.List) {
-                    const list = source[key];
+                else if (source[prop.name] instanceof list_1.List) {
+                    const list = source[prop.name];
                     return list.entityType?.name === entity.name;
                 }
             }
             return false;
-        });
+        })?.name;
     }
     listRelationEntities(entity, fromList = false) {
         const relationEntities = [];
@@ -150,7 +157,7 @@ class RepositoryBase {
                 const entityInstance = list.entityType;
                 const modelName = entityInstance.name;
                 const parentModelName = entity.constructor.name;
-                const parentPropName = this.getPropNameFromEntitySource(new entityInstance(), entity.constructor) ?? (0, KlString_1.toCamelCase)(parentModelName);
+                const parentPropName = this.getPropNameFromEntitySource(entityInstance, entity.constructor) ?? (0, KlString_1.toCamelCase)(parentModelName);
                 if (modelName) {
                     list.toArray('removed').forEach((item) => {
                         relationDeletes.push({

package/package.json

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

package/test/repositories/in-memory-base.repository.js

@@ -56,10 +56,12 @@ class InMemoryBaseRepository {
         }
     }
     getNewId() {
-        return this.typeId === 'number'
-            ? new KlArray_1.KlArray(this.items).orderBy('_id', 'desc')[0]?._id ??
-                0 + 1
-            : (0, node_crypto_1.randomUUID)();
+        if (this.typeId === 'number') {
+            const lastId = new KlArray_1.KlArray(this.items).orderBy('_id', 'desc')[0]
+                ?._id;
+            return lastId ? lastId + 1 : 1;
+        }
+        return (0, node_crypto_1.randomUUID)();
     }
 }
 exports.InMemoryBaseRepository = InMemoryBaseRepository;