@bedrockio/yada 1.10.2 → 1.10.4

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.10.4
+
+- Fixed type errors for rest params.
+
+## 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/TypeSchema.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Schema = _interopRequireDefault(require("./Schema"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class TypeSchema extends _Schema.default {
   constructor(Class, meta) {
     const type = Class.name.toLowerCase();

package/dist/cjs/array.js

@@ -7,7 +7,7 @@ exports.default = _default;
 var _lodash = require("lodash");
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class ArraySchema extends _TypeSchema.default {
   constructor(meta) {
     super(Array, meta);

package/dist/cjs/boolean.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class BooleanSchema extends _TypeSchema.default {
   constructor() {
     super(Boolean);

package/dist/cjs/date.js

@@ -7,7 +7,7 @@ exports.default = _default;
 var _validator = _interopRequireDefault(require("validator"));
 var _Schema = _interopRequireDefault(require("./Schema"));
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class DateSchema extends _Schema.default {
   constructor() {
     super({

package/dist/cjs/index.js

@@ -90,9 +90,8 @@ var _number = _interopRequireDefault(require("./number"));
 var _object = _interopRequireDefault(require("./object"));
 var _string = _interopRequireDefault(require("./string"));
 var _tuple = _interopRequireDefault(require("./tuple"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Accepts anything.
  */
@@ -121,7 +120,7 @@ function reject(...args) {
 function custom(fn) {
   return new _Schema.default().custom(fn);
 }
-var _default = {
+var _default = exports.default = {
   array: _array.default,
   boolean: _boolean.default,
   date: _date.default,
@@ -138,5 +137,4 @@ var _default = {
   useLocalizer: _localization.useLocalizer,
   getLocalizedMessages: _localization.getLocalizedMessages,
   LocalizedError: _errors.LocalizedError
-};
-exports.default = _default;
+};

package/dist/cjs/number.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class NumberSchema extends _TypeSchema.default {
   constructor() {
     super(Number);

package/dist/cjs/object.js

@@ -8,9 +8,8 @@ var _lodash = require("lodash");
 var _Schema = _interopRequireWildcard(require("./Schema"));
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const APPEND_ASSERTION_TYPES = ['required', 'type', 'custom'];
 const INTEGER_REG = /^\d+$/;
 
@@ -63,10 +62,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 +77,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 +102,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 {
@@ -171,7 +177,7 @@ class ObjectSchema extends _TypeSchema.default {
   /**
    * Returns a new schema that only validates the selected fields.
    *
-   * @param {...string} [names] Names to include.
+   * @param {...string} names Names to include.
    */
   pick(...names) {
     if (Array.isArray(names[0])) {
@@ -185,7 +191,7 @@ class ObjectSchema extends _TypeSchema.default {
   /**
    * Returns a new schema that omits fields.
    *
-   * @param {...string} [names] Names to exclude.
+   * @param {...string} names Names to exclude.
    */
   omit(...names) {
     if (Array.isArray(names[0])) {

package/dist/cjs/password.js

@@ -39,14 +39,10 @@ function validateLength(expected) {
     }
   };
 }
-const validateLowercase = validateRegex(LOWER_REG, 'Must contain at least {length} lowercase character{s}.');
-exports.validateLowercase = validateLowercase;
-const validateUppercase = validateRegex(UPPER_REG, 'Must contain at least {length} uppercase character{s}.');
-exports.validateUppercase = validateUppercase;
-const validateNumbers = validateRegex(NUMBER_REG, 'Must contain at least {length} number{s}.');
-exports.validateNumbers = validateNumbers;
-const validateSymbols = validateRegex(SYMBOL_REG, 'Must contain at least {length} symbol{s}.');
-exports.validateSymbols = validateSymbols;
+const validateLowercase = exports.validateLowercase = validateRegex(LOWER_REG, 'Must contain at least {length} lowercase character{s}.');
+const validateUppercase = exports.validateUppercase = validateRegex(UPPER_REG, 'Must contain at least {length} uppercase character{s}.');
+const validateNumbers = exports.validateNumbers = validateRegex(NUMBER_REG, 'Must contain at least {length} number{s}.');
+const validateSymbols = exports.validateSymbols = validateRegex(SYMBOL_REG, 'Must contain at least {length} symbol{s}.');
 function validateRegex(reg, message) {
   return expected => {
     return (str = '') => {

package/dist/cjs/string.js

@@ -9,7 +9,7 @@ var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
 var _password = require("./password");
 var _utils = require("./utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const PHONE_REG = /^\+\d{1,3}\d{3,14}$/;
 const NANP_REG = /^\+1[2-9]\d{2}[2-9]\d{6}$/;

package/dist/cjs/tuple.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _Schema = _interopRequireDefault(require("./Schema"));
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class TupleSchema extends _Schema.default {
   constructor(schemas) {
     super({
@@ -96,7 +96,7 @@ class TupleSchema extends _Schema.default {
 /**
  * Creates a [tuple schema](https://github.com/bedrockio/yada#tuple).
  *
- * @param {...Schema} [schemas] Schemas to validate
+ * @param {...Schema} schemas Schemas to validate
  * the exact types of elements allowed in the tuple. Also
  * accepts a single array argument.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/yada",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "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;
@@ -184,7 +192,7 @@ class ObjectSchema extends TypeSchema {
   /**
    * Returns a new schema that only validates the selected fields.
    *
-   * @param {...string} [names] Names to include.
+   * @param {...string} names Names to include.
    */
   pick(...names) {
     if (Array.isArray(names[0])) {
@@ -198,7 +206,7 @@ class ObjectSchema extends TypeSchema {
   /**
    * Returns a new schema that omits fields.
    *
-   * @param {...string} [names] Names to exclude.
+   * @param {...string} names Names to exclude.
    */
   omit(...names) {
     if (Array.isArray(names[0])) {

package/src/tuple.js

@@ -83,7 +83,7 @@ class TupleSchema extends Schema {
 /**
  * Creates a [tuple schema](https://github.com/bedrockio/yada#tuple).
  *
- * @param {...Schema} [schemas] Schemas to validate
+ * @param {...Schema} schemas Schemas to validate
  * the exact types of elements allowed in the tuple. Also
  * accepts a single array argument.
  */

package/types/object.d.ts

@@ -35,15 +35,15 @@ declare class ObjectSchema extends TypeSchema {
     /**
      * Returns a new schema that only validates the selected fields.
      *
-     * @param {...string} [names] Names to include.
+     * @param {...string} names Names to include.
      */
-    pick(...names?: string[]): ObjectSchema;
+    pick(...names: string[]): ObjectSchema;
     /**
      * Returns a new schema that omits fields.
      *
-     * @param {...string} [names] Names to exclude.
+     * @param {...string} names Names to exclude.
      */
-    omit(...names?: string[]): ObjectSchema;
+    omit(...names: string[]): ObjectSchema;
     /**
      * Augments the object schema to make fields required.
      * Field names may be passed as an array or arguments.

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,eAFc,MAAM,EAAA,gBASnB;IAED;;;;OAIG;IACH,eAFc,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"}

package/types/password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../src/password.js"],"names":[],"mappings":"AAeA,sDASC;AAED,sEAUC;AAuBQ,yEAWN;AAXM,yEAWN;AAXM,uEAWN;AAXM,uEAWN"}
+{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../src/password.js"],"names":[],"mappings":"AAeA,sDASC;AAED,gDACU,YAAQ,UASjB;AAuBQ,mDACG,YAAQ,UAUjB;AAXM,mDACG,YAAQ,UAUjB;AAXM,iDACG,YAAQ,UAUjB;AAXM,iDACG,YAAQ,UAUjB"}

package/types/tuple.d.ts

@@ -1,11 +1,11 @@
 /**
  * Creates a [tuple schema](https://github.com/bedrockio/yada#tuple).
  *
- * @param {...Schema} [schemas] Schemas to validate
+ * @param {...Schema} schemas Schemas to validate
  * the exact types of elements allowed in the tuple. Also
  * accepts a single array argument.
  */
-export default function _default(...schemas?: Schema[]): TupleSchema;
+export default function _default(...schemas: Schema[]): TupleSchema;
 import Schema from './Schema';
 declare class TupleSchema extends Schema {
     constructor(schemas: any);

package/types/tuple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../src/tuple.js"],"names":[],"mappings":"AAkFA;;;;;;GAMG;AACH,8CAJc,MAAM,EAAA,eASnB;mBA9FkB,UAAU;AAG7B;IACE,0BAGC;IAED,cAoDC;IAED,cAEC;IAMD,gCAQC;CACF"}
+{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../src/tuple.js"],"names":[],"mappings":"AAkFA;;;;;;GAMG;AACH,6CAJc,MAAM,EAAA,eASnB;mBA9FkB,UAAU;AAG7B;IACE,0BAGC;IAED,cAoDC;IAED,cAEC;IAMD,gCAQC;CACF"}