@bedrockio/model 0.13.2 → 0.13.3

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.13.3
+
+- Bumped yada version.
+- Fix for empty string not unsetting nested enum string fields.
+
 ## 0.13.2
 
 - Bumped yada version.

package/dist/cjs/assign.js

@@ -30,7 +30,7 @@ function unsetReferenceFields(fields, schema = {}) {
       fields[key] = undefined;
     } else if (value instanceof _mongoose.default.Document) {
       fields[key] = value;
-    } else if (value && typeof value === 'object') {
+    } else if (hasEnumerableFields(value)) {
       unsetReferenceFields(value, (0, _utils.getField)(schema, key));
     }
   }
@@ -42,11 +42,25 @@ function unsetReferenceFields(fields, schema = {}) {
 function flattenObject(obj, root = {}, rootPath = []) {
   for (let [key, val] of Object.entries(obj)) {
     const path = [...rootPath, key];
-    if ((0, _lodash.isPlainObject)(val)) {
+    if (hasEnumerableFields(val)) {
       flattenObject(val, root, path);
     } else {
       root[path.join('.')] = val;
     }
   }
   return root;
+}
+
+// Only plain objects and arrays with fields should
+// be enumerated to allow setting of their inner fields.
+// Note that mongoose documents etc should NOT be enumerated
+// over as their value should be set directly for the field.
+// Additionally if an array is empty it should not have its
+// fields enumerated but instead directly set the empty array
+// for the field.
+function hasEnumerableFields(arg) {
+  if ((0, _lodash.isPlainObject)(arg) || Array.isArray(arg)) {
+    return Object.keys(arg).length > 0;
+  }
+  return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -30,7 +30,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@bedrockio/yada": "^1.6.0",
+    "@bedrockio/yada": "^1.6.1",
     "mongoose": "^8.13.1"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "@babel/preset-env": "^7.26.0",
     "@bedrockio/eslint-plugin": "^1.1.7",
     "@bedrockio/prettier-config": "^1.0.2",
-    "@bedrockio/yada": "^1.6.0",
+    "@bedrockio/yada": "^1.6.1",
     "@shelf/jest-mongodb": "^5.1.0",
     "eslint": "^9.19.0",
     "jest": "^29.7.0",

package/src/assign.js

@@ -25,7 +25,7 @@ function unsetReferenceFields(fields, schema = {}) {
       fields[key] = undefined;
     } else if (value instanceof mongoose.Document) {
       fields[key] = value;
-    } else if (value && typeof value === 'object') {
+    } else if (hasEnumerableFields(value)) {
       unsetReferenceFields(value, getField(schema, key));
     }
   }
@@ -37,7 +37,7 @@ function unsetReferenceFields(fields, schema = {}) {
 function flattenObject(obj, root = {}, rootPath = []) {
   for (let [key, val] of Object.entries(obj)) {
     const path = [...rootPath, key];
-    if (isPlainObject(val)) {
+    if (hasEnumerableFields(val)) {
       flattenObject(val, root, path);
     } else {
       root[path.join('.')] = val;
@@ -45,3 +45,17 @@ function flattenObject(obj, root = {}, rootPath = []) {
   }
   return root;
 }
+
+// Only plain objects and arrays with fields should
+// be enumerated to allow setting of their inner fields.
+// Note that mongoose documents etc should NOT be enumerated
+// over as their value should be set directly for the field.
+// Additionally if an array is empty it should not have its
+// fields enumerated but instead directly set the empty array
+// for the field.
+function hasEnumerableFields(arg) {
+  if (isPlainObject(arg) || Array.isArray(arg)) {
+    return Object.keys(arg).length > 0;
+  }
+  return false;
+}