@rws-framework/db 4.1.2 → 4.1.4

package/dist/decorators/Relation.js

@@ -19,7 +19,8 @@ function Relation(theModel, relationOptions = _DEFAULTS) {
                     relationOptions.relationName :
                     null
             };
-            if (relationOptions.required) {
+            // Only set default cascade behavior if no explicit cascade was provided
+            if (relationOptions.required && !relationOptions.cascade) {
                 if (!metaOpts.cascade) {
                     metaOpts.cascade = {};
                 }

package/dist/models/core/RWSModel.js

@@ -113,7 +113,7 @@ class RWSModel {
         const relationsAlreadyPopulated = this.checkRelationsPrePopulated(data, relOneData, relManyData);
         if (allowRelations && !relationsAlreadyPopulated) {
             // Use traditional relation hydration if not pre-populated
-            await HydrateUtils_1.HydrateUtils.hydrateRelations(this, relManyData, relOneData, seriesHydrationfields, fullDataMode, data);
+            await HydrateUtils_1.HydrateUtils.hydrateRelations(this, relManyData, relOneData, seriesHydrationfields, fullDataMode, data, postLoadExecute);
         }
         else if (allowRelations && relationsAlreadyPopulated) {
             // Relations are already populated from Prisma, just assign them directly
@@ -355,23 +355,27 @@ class RWSModel {
             if (fields && fields.length > 0) {
                 return fields.includes(relationName);
             }
+            // If no relations config and no fields specified, include all relations
+            if (!hasRelationsConfig && (!fields || fields.length === 0)) {
+                return true;
+            }
             // If no fields specified but relations config exists, include enabled relations
             if (hasRelationsConfig) {
                 return allowedRelations[relationName] === true;
             }
-            // If no relations config and no fields specified, include all relations
+            // Default: include all relations when no restrictions
             return true;
         };
-        // Add one-to-one and many-to-one relations
+        // Add one-to-one and many-to-one relations (without nesting)
         for (const key in relOneData) {
             if (shouldIncludeRelation(key)) {
-                includes[key] = true;
+                includes[key] = true; // Only load this level, no nested relations
             }
         }
-        // Add one-to-many relations
+        // Add one-to-many relations (without nesting)
         for (const key in relManyData) {
             if (shouldIncludeRelation(key)) {
-                includes[key] = true;
+                includes[key] = true; // Only load this level, no nested relations
             }
         }
         return Object.keys(includes).length > 0 ? includes : null;
@@ -479,7 +483,7 @@ class RWSModel {
                             for (const ignoredKey of childIgnoredKeys) {
                                 delete filteredData[ignoredKey];
                             }
-                            await relatedInstance._asyncFill(filteredData, false, false, true);
+                            await relatedInstance._asyncFill(filteredData, false, false, true); // allowRelations = false
                             this[key] = relatedInstance;
                         }
                     }
@@ -519,7 +523,7 @@ class RWSModel {
                                 for (const ignoredKey of childIgnoredKeys) {
                                     delete filteredData[ignoredKey];
                                 }
-                                await relatedInstance._asyncFill(filteredData, false, false, true);
+                                await relatedInstance._asyncFill(filteredData, false, false, true); // allowRelations = false
                                 relatedInstances.push(relatedInstance);
                             }
                         }
@@ -543,45 +547,26 @@ class RWSModel {
         else {
             where[pk] = this[pk];
         }
-        // Get ignored keys from model's @RWSCollection decorator
-        const ignoredKeys = (this.constructor._CUT_KEYS || []);
-        let fields = undefined;
-        // Build fields list excluding ignored ones if there are ignored keys
-        if (ignoredKeys.length > 0) {
-            // Get proper database fields from model annotations
-            const annotations = await ModelUtils_1.ModelUtils.getModelAnnotations(this.constructor);
-            // Get scalar fields (TrackType decorated fields)
-            const scalarFields = ModelUtils_1.ModelUtils.getModelScalarFields(this);
-            // Get relation fields from annotations
-            const relationFields = Object.keys(annotations).filter(key => annotations[key].annotationType === 'Relation' ||
-                annotations[key].annotationType === 'InverseRelation');
-            // Combine all database fields
-            const allDbFields = [...scalarFields, ...relationFields];
-            // Filter out ignored keys
-            fields = allDbFields.filter(field => !ignoredKeys.includes(field));
-            // Always include id if not ignored
-            if (!fields.includes('id') && !ignoredKeys.includes('id')) {
-                fields.push('id');
-            }
-        }
-        // Find the fresh data from database with field filtering
-        const freshData = await FindUtils_1.FindUtils.findOneBy(this.constructor, {
+        // Use findBy with allowRelations to ensure all relations are loaded
+        // For reload(), allow unlimited depth by setting maxDepth to a high value
+        const results = await this.constructor.findBy({
             conditions: where,
-            fields: fields
+            allowRelations: true
         });
+        const freshData = results[0];
         if (!freshData) {
             return null;
         }
-        // Convert the fresh instance back to plain data for hydration
-        const plainData = await freshData.toMongo();
-        // Preserve foreign key fields from _relationFields to ensure relations can be hydrated
-        for (const key in this._relationFields) {
-            if (plainData[key] === undefined) {
-                plainData[key] = this._relationFields[key];
+        // Copy all properties from the fresh instance to this instance
+        Object.keys(this).forEach(key => {
+            if (!key.startsWith('_') && key !== 'postLoadExecuted') {
+                delete this[key];
             }
-        }
-        // Hydrate current instance with fresh data including relations
-        await this._asyncFill(plainData, true, true, true);
+        });
+        // Copy all data from fresh instance including relations
+        Object.keys(freshData).forEach(key => {
+            this[key] = freshData[key];
+        });
         return this;
     }
     // Helper method to get property with fallback to stored relation fields

package/dist/models/utils/HydrateUtils.js

@@ -73,7 +73,7 @@ class HydrateUtils {
                             [relMeta.foreignKey]: data[pk]
                         },
                         fields: childFields,
-                        allowRelations: false,
+                        allowRelations: false, // Prevent nested relation loading
                         cancelPostLoad: !postLoadExecute
                     });
                 }
@@ -83,7 +83,7 @@ class HydrateUtils {
                             [relMeta.foreignKey]: data[pk]
                         },
                         fields: childFields,
-                        allowRelations: false,
+                        allowRelations: false, // Prevent nested relation loading
                         cancelPostLoad: !postLoadExecute
                     });
                 }
@@ -97,7 +97,12 @@ class HydrateUtils {
             const relMeta = relOneData[key];
             const relationEnabled = !RelationUtils_1.RelationUtils.checkRelDisabled(model, relMeta.key);
             if (!data[relMeta.hydrationField] && relMeta.required) {
-                throw new Error(`Relation field "${relMeta.hydrationField}" is required in model ${this.constructor.name}.`);
+                // Only throw error if this is a fresh load, not a reload of existing model
+                if (!model.id) {
+                    throw new Error(`Relation field "${relMeta.hydrationField}" is required in model ${model.constructor.name}.`);
+                }
+                // For existing models (reloads), skip loading this relation if the field is missing
+                continue;
             }
             if (relationEnabled && data[relMeta.hydrationField]) {
                 const pk = ModelUtils_1.ModelUtils.findPrimaryKeyFields(relMeta.model);
@@ -115,7 +120,7 @@ class HydrateUtils {
                 model[relMeta.key] = await relMeta.model.findOneBy({
                     conditions: where,
                     fields: childFields
-                }, { allowRelations: false });
+                }, { allowRelations: false }); // Prevent nested relation loading
             }
             // else if (relationEnabled && !data[relMeta.hydrationField] && data[relMeta.key]) {
             //     const newRelModel: RWSModel<any> = await relMeta.model.create(data[relMeta.key]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/decorators/Relation.ts

@@ -43,7 +43,8 @@ function Relation(theModel: () => OpModelType<RWSModel<any>>, relationOptions: P
                   null
             };  
             
-            if(relationOptions.required){
+            // Only set default cascade behavior if no explicit cascade was provided
+            if(relationOptions.required && !relationOptions.cascade){
                 if(!metaOpts.cascade){
                     metaOpts.cascade = {};
                 }

package/src/models/core/RWSModel.ts

@@ -137,7 +137,7 @@ class RWSModel<T> implements IModel {
 
         if (allowRelations && !relationsAlreadyPopulated) {
             // Use traditional relation hydration if not pre-populated
-            await HydrateUtils.hydrateRelations(this, relManyData, relOneData, seriesHydrationfields, fullDataMode, data);
+            await HydrateUtils.hydrateRelations(this, relManyData, relOneData, seriesHydrationfields, fullDataMode, data, postLoadExecute);
         } else if (allowRelations && relationsAlreadyPopulated) {
             // Relations are already populated from Prisma, just assign them directly
             await this.hydratePrePopulatedRelations(data, relOneData, relManyData);
@@ -471,26 +471,31 @@ class RWSModel<T> implements IModel {
                 return fields.includes(relationName);
             }
             
+            // If no relations config and no fields specified, include all relations
+            if (!hasRelationsConfig && (!fields || fields.length === 0)) {
+                return true;
+            }
+            
             // If no fields specified but relations config exists, include enabled relations
             if (hasRelationsConfig) {
                 return allowedRelations[relationName] === true;
             }
             
-            // If no relations config and no fields specified, include all relations
+            // Default: include all relations when no restrictions
             return true;
         };
         
-        // Add one-to-one and many-to-one relations
+        // Add one-to-one and many-to-one relations (without nesting)
         for (const key in relOneData) {
             if (shouldIncludeRelation(key)) {
-                includes[key] = true;
+                includes[key] = true; // Only load this level, no nested relations
             }
         }
         
-        // Add one-to-many relations
+        // Add one-to-many relations (without nesting)
         for (const key in relManyData) {
             if (shouldIncludeRelation(key)) {
-                includes[key] = true;
+                includes[key] = true; // Only load this level, no nested relations
             }
         }
         
@@ -613,7 +618,7 @@ class RWSModel<T> implements IModel {
                                 delete filteredData[ignoredKey];
                             }
                             
-                            await relatedInstance._asyncFill(filteredData, false, false, true);
+                        await relatedInstance._asyncFill(filteredData, false, false, true); // allowRelations = false
                             this[key] = relatedInstance;
                         }
                     } else if (Array.isArray(relationData) && relationData.length > 0) {
@@ -657,7 +662,7 @@ class RWSModel<T> implements IModel {
                                     delete filteredData[ignoredKey];
                                 }
                                 
-                                await relatedInstance._asyncFill(filteredData, false, false, true);
+                                await relatedInstance._asyncFill(filteredData, false, false, true); // allowRelations = false
                                 relatedInstances.push(relatedInstance);
                             }
                         }
@@ -686,58 +691,30 @@ class RWSModel<T> implements IModel {
             where[pk as string] = this[pk as string]
         }         
         
-        // Get ignored keys from model's @RWSCollection decorator
-        const ignoredKeys = ((this.constructor as OpModelType<any>)._CUT_KEYS || []);
-        let fields: string[] | undefined = undefined;
-        
-        // Build fields list excluding ignored ones if there are ignored keys
-        if (ignoredKeys.length > 0) {
-            // Get proper database fields from model annotations
-            const annotations = await ModelUtils.getModelAnnotations(this.constructor as OpModelType<any>);
-            
-            // Get scalar fields (TrackType decorated fields)
-            const scalarFields = ModelUtils.getModelScalarFields(this);
-            
-            // Get relation fields from annotations
-            const relationFields = Object.keys(annotations).filter(key => 
-                annotations[key].annotationType === 'Relation' || 
-                annotations[key].annotationType === 'InverseRelation'
-            );
-            
-            // Combine all database fields
-            const allDbFields = [...scalarFields, ...relationFields];
-            
-            // Filter out ignored keys
-            fields = allDbFields.filter(field => !ignoredKeys.includes(field));
-            
-            // Always include id if not ignored
-            if (!fields.includes('id') && !ignoredKeys.includes('id')) {
-                fields.push('id');
-            }
-        }
-        
-        // Find the fresh data from database with field filtering
-        const freshData = await FindUtils.findOneBy(this.constructor as OpModelType<any>, { 
+        // Use findBy with allowRelations to ensure all relations are loaded
+        // For reload(), allow unlimited depth by setting maxDepth to a high value
+        const results = await (this.constructor as OpModelType<any>).findBy({
             conditions: where,
-            fields: fields
+            allowRelations: true
         });
         
+        const freshData = results[0];
+        
         if (!freshData) {
             return null;
         }
         
-        // Convert the fresh instance back to plain data for hydration
-        const plainData = await freshData.toMongo();
-        
-        // Preserve foreign key fields from _relationFields to ensure relations can be hydrated
-        for (const key in this._relationFields) {
-            if (plainData[key] === undefined) {
-                plainData[key] = this._relationFields[key];
+        // Copy all properties from the fresh instance to this instance
+        Object.keys(this).forEach(key => {
+            if (!key.startsWith('_') && key !== 'postLoadExecuted') {
+                delete this[key];
             }
-        }
+        });
         
-        // Hydrate current instance with fresh data including relations
-        await this._asyncFill(plainData, true, true, true);
+        // Copy all data from fresh instance including relations
+        Object.keys(freshData).forEach(key => {
+            this[key] = freshData[key];
+        });
         
         return this;
     }

package/src/models/utils/HydrateUtils.ts

@@ -91,7 +91,7 @@ export class HydrateUtils {
                             [relMeta.foreignKey]: data[pk]
                         },
                         fields: childFields,
-                        allowRelations: false,
+                        allowRelations: false, // Prevent nested relation loading
                         cancelPostLoad: !postLoadExecute
                     });
                 } else {
@@ -100,7 +100,7 @@ export class HydrateUtils {
                             [relMeta.foreignKey]: data[pk]
                         },
                         fields: childFields,
-                        allowRelations: false,
+                        allowRelations: false, // Prevent nested relation loading
                         cancelPostLoad: !postLoadExecute
                     });
                 }
@@ -117,7 +117,12 @@ export class HydrateUtils {
             const relationEnabled = !RelationUtils.checkRelDisabled(model, relMeta.key);
 
             if (!data[relMeta.hydrationField] && relMeta.required) {
-                throw new Error(`Relation field "${relMeta.hydrationField}" is required in model ${this.constructor.name}.`)
+                // Only throw error if this is a fresh load, not a reload of existing model
+                if (!model.id) {
+                    throw new Error(`Relation field "${relMeta.hydrationField}" is required in model ${model.constructor.name}.`);
+                }
+                // For existing models (reloads), skip loading this relation if the field is missing
+                continue;
             }
 
             if (relationEnabled && data[relMeta.hydrationField]) {
@@ -139,7 +144,7 @@ export class HydrateUtils {
                 model[relMeta.key] = await relMeta.model.findOneBy({ 
                     conditions: where,
                     fields: childFields
-                }, { allowRelations: false });
+                }, { allowRelations: false }); // Prevent nested relation loading
             }
             // else if (relationEnabled && !data[relMeta.hydrationField] && data[relMeta.key]) {
             //     const newRelModel: RWSModel<any> = await relMeta.model.create(data[relMeta.key]);