@bedrockio/yada 1.10.2 → 1.10.3

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.10.3
+
+- Fix for strip empty allowing required fields.
+- Fix for flat null property being stripped.
+- Fix for defaults not being respected with flat keys.
+
 ## 1.10.2
 
 - Shortcut methods for object options.

package/dist/cjs/object.js

@@ -63,10 +63,7 @@ class ObjectSchema extends _TypeSchema.default {
       let errors = [];
       const result = {};
       for (let key of keys) {
-        const value = passed[key];
-        if (value === '' && stripEmpty) {
-          continue;
-        }
+        let value = passed[key];
         const schema = getSchema(fields, key, options);
         if (!schema) {
           if (stripUnknown) {
@@ -81,7 +78,19 @@ class ObjectSchema extends _TypeSchema.default {
           continue;
         }
         try {
-          const validateOptions = {
+          let isBaseObject = false;
+          if (allowFlatKeys && value === undefined) {
+            // When allowing keys like "profile.name", "profile" must still
+            // be validated, but will not exist so expand the passed object
+            // and take the base value.
+            value = expandFlatSyntax(passed)[key];
+
+            // If the flat key did not exist but the expanded key did then
+            // we have a "base object". If both keys do not exist then the
+            // validation result needs to be set as it could be a default.
+            isBaseObject = value !== undefined;
+          }
+          const transformed = await schema.validate(value, {
             ...options,
             path: [...path, key],
             required: schema.meta.required,
@@ -94,18 +103,16 @@ class ObjectSchema extends _TypeSchema.default {
             // The original root represents the root object
             // before it was transformed.
             originalRoot: original
-          };
-          if (allowFlatKeys && !value) {
-            // When allowing keys like "profile.name", "profile" will
-            // not be passed so expand the passed object and make sure
-            // the base validates, but do not transform the result.
-            const expanded = expandFlatSyntax(passed);
-            await schema.validate(expanded[key], validateOptions);
-          } else {
-            const transformed = await schema.validate(value, validateOptions);
-            if (transformed !== undefined) {
-              result[key] = transformed;
-            }
+          });
+          if (transformed === '' && stripEmpty) {
+            continue;
+          } else if (isBaseObject) {
+            // We do not want to return the "profile" object in the
+            // result when only flat keys are passed, so continue here.
+            continue;
+          }
+          if (transformed !== undefined) {
+            result[key] = transformed;
           }
         } catch (error) {
           const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "Validation library inspired by Joi.",
   "scripts": {
     "test": "jest",

package/src/object.js

@@ -66,11 +66,7 @@ class ObjectSchema extends TypeSchema {
       const result = {};
 
       for (let key of keys) {
-        const value = passed[key];
-
-        if (value === '' && stripEmpty) {
-          continue;
-        }
+        let value = passed[key];
 
         const schema = getSchema(fields, key, options);
 
@@ -89,7 +85,21 @@ class ObjectSchema extends TypeSchema {
         }
 
         try {
-          const validateOptions = {
+          let isBaseObject = false;
+
+          if (allowFlatKeys && value === undefined) {
+            // When allowing keys like "profile.name", "profile" must still
+            // be validated, but will not exist so expand the passed object
+            // and take the base value.
+            value = expandFlatSyntax(passed)[key];
+
+            // If the flat key did not exist but the expanded key did then
+            // we have a "base object". If both keys do not exist then the
+            // validation result needs to be set as it could be a default.
+            isBaseObject = value !== undefined;
+          }
+
+          const transformed = await schema.validate(value, {
             ...options,
 
             path: [...path, key],
@@ -105,20 +115,18 @@ class ObjectSchema extends TypeSchema {
             // The original root represents the root object
             // before it was transformed.
             originalRoot: original,
-          };
-
-          if (allowFlatKeys && !value) {
-            // When allowing keys like "profile.name", "profile" will
-            // not be passed so expand the passed object and make sure
-            // the base validates, but do not transform the result.
-            const expanded = expandFlatSyntax(passed);
-
-            await schema.validate(expanded[key], validateOptions);
-          } else {
-            const transformed = await schema.validate(value, validateOptions);
-            if (transformed !== undefined) {
-              result[key] = transformed;
-            }
+          });
+
+          if (transformed === '' && stripEmpty) {
+            continue;
+          } else if (isBaseObject) {
+            // We do not want to return the "profile" object in the
+            // result when only flat keys are passed, so continue here.
+            continue;
+          }
+
+          if (transformed !== undefined) {
+            result[key] = transformed;
           }
         } catch (error) {
           const { message } = schema.meta;

package/types/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AA8fA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAQnB;wBA9fY;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,EAAE;AAD3C;;GAEG;AAEH;IACE,uBAIC;IAED,sBAOC;IAED,cAyGC;IAED;;;;;;OAMG;IACH,WAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAkB9B;IAED;;;;;;OAMG;IACH,cAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAc9B;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;;;;OAOG;IACH,mBAHc,MAAM,EAAA,gBAuBnB;IAED;;OAEG;IACH,2BAQC;IAED;;;;;;OAMG;IACH,yCAFa,IAAI,CAiBhB;IAED;;;;;;OAMG;IACH,cAEC;IAED;;;;;;;;;OASG;IACH,YAFW,SAAS,GAAC,MAAM,gBA+B1B;IAID;;OAEG;IACH,mBAIC;IAED;;OAEG;IACH,qBAIC;IAED;;OAEG;IACH,sBAIC;IAED;;OAEG;IACH,uBAIC;IAED;;;;;;;;;;;OAWG;IACH,kBALG;QAA0B,UAAU,GAA5B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,aAAa,GAA/B,OAAO;QACW,cAAc,GAAhC,OAAO;KAA0B,QAI3C;IAID,gCAmBC;CACF;mBApZgC,UAAU;uBACpB,cAAc"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AAsgBA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAQnB;wBAtgBY;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,EAAE;AAD3C;;GAEG;AAEH;IACE,uBAIC;IAED,sBAOC;IAED,cAiHC;IAED;;;;;;OAMG;IACH,WAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAkB9B;IAED;;;;;;OAMG;IACH,cAFW,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC,OAc9B;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,gBAFc,MAAM,EAAA,gBASnB;IAED;;;;;;;OAOG;IACH,mBAHc,MAAM,EAAA,gBAuBnB;IAED;;OAEG;IACH,2BAQC;IAED;;;;;;OAMG;IACH,yCAFa,IAAI,CAiBhB;IAED;;;;;;OAMG;IACH,cAEC;IAED;;;;;;;;;OASG;IACH,YAFW,SAAS,GAAC,MAAM,gBA+B1B;IAID;;OAEG;IACH,mBAIC;IAED;;OAEG;IACH,qBAIC;IAED;;OAEG;IACH,sBAIC;IAED;;OAEG;IACH,uBAIC;IAED;;;;;;;;;;;OAWG;IACH,kBALG;QAA0B,UAAU,GAA5B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,aAAa,GAA/B,OAAO;QACW,cAAc,GAAhC,OAAO;KAA0B,QAI3C;IAID,gCAmBC;CACF;mBA5ZgC,UAAU;uBACpB,cAAc"}