masterrecord 0.3.57 → 0.3.58

package/insertManager.js

@@ -352,22 +352,28 @@ class InsertManager {
             if (!isRelationship) {
                 const val = currentRealModel[entity];
                 if (val != null && typeof val === 'object') {
-                    const entityName = entityModel.__name || 'unknown';
+                    // Always reject Promises — a set() transform cannot meaningfully handle them
                     if (typeof val.then === 'function') {
+                        const entityName = entityModel.__name || 'unknown';
                         this._errorModel.isValid = false;
                         this._errorModel.errors.push(
                             `Property '${entity}' on entity '${entityName}' contains a Promise. Did you forget to await an async call?`
                         );
-                    } else if (Array.isArray(val)) {
-                        this._errorModel.isValid = false;
-                        this._errorModel.errors.push(
-                            `Property '${entity}' on entity '${entityName}' contains an Array, expected a scalar value`
-                        );
-                    } else if (!(val instanceof Date)) {
-                        this._errorModel.isValid = false;
-                        this._errorModel.errors.push(
-                            `Property '${entity}' on entity '${entityName}' contains an Object, expected a scalar value`
-                        );
+                    } else if (!currentEntity.set) {
+                        // Only flag Array/Object when there is no custom set() transform,
+                        // since the setter may serialize them to a scalar (e.g. JSON.stringify)
+                        const entityName = entityModel.__name || 'unknown';
+                        if (Array.isArray(val)) {
+                            this._errorModel.isValid = false;
+                            this._errorModel.errors.push(
+                                `Property '${entity}' on entity '${entityName}' contains an Array, expected a scalar value`
+                            );
+                        } else if (!(val instanceof Date)) {
+                            this._errorModel.isValid = false;
+                            this._errorModel.errors.push(
+                                `Property '${entity}' on entity '${entityName}' contains an Object, expected a scalar value`
+                            );
+                        }
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "masterrecord",
-  "version": "0.3.57",
+  "version": "0.3.58",
   "description": "An Object-relational mapping for the Master framework. Master Record connects classes to relational database tables to establish a database with almost zero-configuration ",
   "main": "MasterRecord.js",
   "bin": {

package/test/promise-detection-test.js

@@ -219,6 +219,67 @@ console.log("──────────────────────
     assert(err.errors.length === 3, 'Three errors (Promise + Array + Object)');
 }
 
+// -----------------------------------------------------------
+// Test 9: Array allowed when field has a custom set() transform
+// -----------------------------------------------------------
+console.log("\nTest 9: Array allowed with custom set() transform");
+console.log("──────────────────────────────────────────────────");
+{
+    const entityWithSetter = {
+        __name: 'BatchJob',
+        id:        { type: 'integer', primary: true, auto: true, nullable: true },
+        name:      { type: 'string', nullable: false },
+        error_log: { type: 'string', nullable: true, set: function(value) {
+            if (Array.isArray(value)) return JSON.stringify(value);
+            return value;
+        }},
+        config_snapshot: { type: 'string', nullable: true, set: function(value) {
+            if (typeof value === 'object' && value !== null) return JSON.stringify(value);
+            return value;
+        }},
+    };
+    const { mgr, err } = makeManager();
+    const realModel = {
+        name: 'job1',
+        error_log: ['err1', 'err2'],
+        config_snapshot: { retries: 3 },
+        __entity: entityWithSetter,
+    };
+    const cleanModel = { ...realModel };
+
+    mgr.validateEntity(cleanModel, realModel, entityWithSetter);
+
+    assert(err.isValid, 'Array with set() passes validation');
+    assert(err.errors.length === 0, 'No errors when set() is defined');
+}
+
+// -----------------------------------------------------------
+// Test 10: Promise still rejected even when field has set()
+// -----------------------------------------------------------
+console.log("\nTest 10: Promise rejected even with custom set()");
+console.log("──────────────────────────────────────────────────");
+{
+    const entityWithSetter = {
+        __name: 'BatchJob',
+        id:        { type: 'integer', primary: true, auto: true, nullable: true },
+        error_log: { type: 'string', nullable: true, set: function(value) {
+            if (Array.isArray(value)) return JSON.stringify(value);
+            return value;
+        }},
+    };
+    const { mgr, err } = makeManager();
+    const realModel = {
+        error_log: Promise.resolve(['err1']),
+        __entity: entityWithSetter,
+    };
+    const cleanModel = { ...realModel };
+
+    mgr.validateEntity(cleanModel, realModel, entityWithSetter);
+
+    assert(!err.isValid, 'Promise still rejected with set()');
+    assert(err.errors[0].includes('Promise'), 'Error mentions Promise');
+}
+
 // Summary
 console.log("\n" + "=".repeat(64));
 console.log(`Test Results: ${passed} passed, ${failed} failed`);