@bedrockio/model 0.18.2 → 0.18.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.18.3
+
+- Fixed issues with `getUpdateValidation` not allowing null for nested objects.
+
 ## 0.18.2
 
 - Further fix for `reload` not working with delete hooks.

package/dist/cjs/validation.js

@@ -183,7 +183,7 @@ function getObjectSchema(arg, options) {
   if ((0, _utils.isSchemaTypedef)(arg)) {
     return getSchemaForTypedef(arg, options);
   } else if ((0, _utils.isMongooseSchema)(arg)) {
-    return getObjectSchema(arg.obj, options);
+    return getNestedSchema(arg.obj, options);
   } else if (Array.isArray(arg)) {
     return getArraySchema(arg, options);
   } else if (typeof arg === 'object') {
@@ -195,7 +195,7 @@ function getObjectSchema(arg, options) {
     const map = {};
     for (let [key, field] of Object.entries(arg)) {
       if (!isExcludedField(field, options)) {
-        map[key] = getObjectSchema(field, options);
+        map[key] = getNestedSchema(field, options);
       }
     }
     let schema = _yada.default.object(map);
@@ -214,11 +214,21 @@ function getObjectSchema(arg, options) {
         allowFlatKeys: true
       });
     }
+    if (isNullAllowed(options)) {
+      schema = schema.nullable();
+    }
     return schema;
   } else {
     return getSchemaForType(arg, options);
   }
 }
+function getNestedSchema(arg, options) {
+  return getObjectSchema(arg, {
+    ...options,
+    isNested: true,
+    isArrayElement: false
+  });
+}
 function getArraySchema(arr, options) {
   let schema;
   if (arr.length === 0) {
@@ -228,7 +238,8 @@ function getArraySchema(arr, options) {
     // validations as they are a new context.
     schema = getObjectSchema(arr[0], {
       ...options,
-      skipRequired: false
+      skipRequired: false,
+      isArrayElement: true
     });
     if (!options.unwindArrayFields) {
       schema = _yada.default.array(schema);
@@ -255,7 +266,7 @@ function getSchemaForTypedef(typedef, options = {}) {
     // Null may be allowed to unset non-required fields
     // in an update operation or to search for non-existent
     // fields in a search operation.
-    if (allowNull(typedef, options)) {
+    if (isNullAllowedForTypedef(typedef, options)) {
       schema = schema.nullable();
     }
 
@@ -371,8 +382,16 @@ function getSearchSchema(schema, type) {
 function isRequired(typedef, options) {
   return typedef.required && !typedef.default && !options.skipRequired;
 }
-function allowNull(typedef, options) {
-  if (!options.allowNull) {
+function isNullAllowed(options) {
+  const {
+    allowNull,
+    isNested,
+    isArrayElement
+  } = options;
+  return allowNull && isNested && !isArrayElement;
+}
+function isNullAllowedForTypedef(typedef, options) {
+  if (!isNullAllowed(options)) {
     return false;
   }
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {

package/src/validation.js

@@ -200,15 +200,17 @@ function getObjectSchema(arg, options) {
   if (isSchemaTypedef(arg)) {
     return getSchemaForTypedef(arg, options);
   } else if (isMongooseSchema(arg)) {
-    return getObjectSchema(arg.obj, options);
+    return getNestedSchema(arg.obj, options);
   } else if (Array.isArray(arg)) {
     return getArraySchema(arg, options);
   } else if (typeof arg === 'object') {
     const { stripUnknown, stripEmpty, allowFlatKeys } = options;
+
     const map = {};
+
     for (let [key, field] of Object.entries(arg)) {
       if (!isExcludedField(field, options)) {
-        map[key] = getObjectSchema(field, options);
+        map[key] = getNestedSchema(field, options);
       }
     }
 
@@ -232,12 +234,24 @@ function getObjectSchema(arg, options) {
       });
     }
 
+    if (isNullAllowed(options)) {
+      schema = schema.nullable();
+    }
+
     return schema;
   } else {
     return getSchemaForType(arg, options);
   }
 }
 
+function getNestedSchema(arg, options) {
+  return getObjectSchema(arg, {
+    ...options,
+    isNested: true,
+    isArrayElement: false,
+  });
+}
+
 function getArraySchema(arr, options) {
   let schema;
   if (arr.length === 0) {
@@ -248,6 +262,7 @@ function getArraySchema(arr, options) {
     schema = getObjectSchema(arr[0], {
       ...options,
       skipRequired: false,
+      isArrayElement: true,
     });
     if (!options.unwindArrayFields) {
       schema = yd.array(schema);
@@ -275,7 +290,7 @@ function getSchemaForTypedef(typedef, options = {}) {
     // Null may be allowed to unset non-required fields
     // in an update operation or to search for non-existent
     // fields in a search operation.
-    if (allowNull(typedef, options)) {
+    if (isNullAllowedForTypedef(typedef, options)) {
       schema = schema.nullable();
     }
 
@@ -407,8 +422,13 @@ function isRequired(typedef, options) {
   return typedef.required && !typedef.default && !options.skipRequired;
 }
 
-function allowNull(typedef, options) {
-  if (!options.allowNull) {
+function isNullAllowed(options) {
+  const { allowNull, isNested, isArrayElement } = options;
+  return allowNull && isNested && !isArrayElement;
+}
+
+function isNullAllowedForTypedef(typedef, options) {
+  if (!isNullAllowed(options)) {
     return false;
   }
   const { required, type } = typedef;

package/types/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AA6DA,kDAEC;AAED,oEA4FC;AAsBD,wEAiBC;AA8SD;;;EAEC;AAED;;;EAOC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.js"],"names":[],"mappings":"AA6DA,kDAEC;AAED,oEA4FC;AAsBD,wEAiBC;AAkUD;;;EAEC;AAED;;;EAOC"}