@bedrockio/yada 1.0.26 → 1.0.28

package/dist/cjs/Schema.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.isSchema = isSchema;
 var _errors = require("./errors");
+var _utils = require("./utils");
 const INITIAL_TYPES = ['default', 'required', 'type', 'transform'];
 const REQUIRED_TYPES = ['default', 'required'];
 
@@ -249,6 +250,10 @@ class Schema {
         for (let el of set) {
           if (isSchema(el)) {
             try {
+              // Must not pass cast option down when allowing
+              // other schema types as they may be allowed, for
+              // example allowing a string or array of strings.
+              options = (0, _utils.omit)(options, 'cast');
               return await el.validate(val, options);
             } catch (error) {
               continue;
@@ -257,7 +262,7 @@ class Schema {
             return;
           }
         }
-        throw new _errors.LocalizedError(msg, {
+        throw new _errors.LocalizedError(options.message || msg, {
           types: types.join(', ')
         });
       }

package/dist/cjs/array.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _Schema = _interopRequireDefault(require("./Schema"));
 var _errors = require("./errors");
+var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class ArraySchema extends _Schema.default {
   constructor(schemas) {
@@ -21,7 +22,8 @@ class ArraySchema extends _Schema.default {
    */
   setup() {
     const {
-      schemas
+      schemas,
+      message
     } = this.meta;
     const schema = schemas.length > 1 ? new _Schema.default().allow(schemas) : schemas[0];
     this.assert('type', (val, options) => {
@@ -40,6 +42,9 @@ class ArraySchema extends _Schema.default {
         for (let i = 0; i < arr.length; i++) {
           const el = arr[i];
           try {
+            // Allow enum message to take
+            // precedence over generic array message.
+            options = (0, _utils.omit)(options, 'message');
             result.push(await schema.validate(el, options));
           } catch (error) {
             if (error.details?.length === 1) {
@@ -50,7 +55,7 @@ class ArraySchema extends _Schema.default {
           }
         }
         if (errors.length) {
-          throw new _errors.ArrayError(this.meta.message, errors);
+          throw new _errors.ArrayError(message, errors);
         } else {
           return result;
         }

package/dist/cjs/object.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
+var _utils = require("./utils");
 var _Schema = _interopRequireDefault(require("./Schema"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const BASE_ASSERTIONS = ['type', 'transform', 'field'];
@@ -148,7 +149,7 @@ class ObjectSchema extends _TypeSchema.default {
     if (Array.isArray(names[0])) {
       names = names[0];
     }
-    const fields = pick(this.meta.fields, names);
+    const fields = (0, _utils.pick)(this.meta.fields, names);
     return new ObjectSchema(fields, {
       ...this.meta
     });
@@ -161,7 +162,7 @@ class ObjectSchema extends _TypeSchema.default {
     if (Array.isArray(names[0])) {
       names = names[0];
     }
-    const fields = omit(this.meta.fields, names);
+    const fields = (0, _utils.omit)(this.meta.fields, names);
     return new ObjectSchema(fields, {
       ...this.meta
     });
@@ -200,22 +201,6 @@ function expandDotProperties(obj) {
   }
   return result;
 }
-function pick(obj, keys) {
-  const result = {};
-  for (let key of keys) {
-    result[key] = obj[key];
-  }
-  return result;
-}
-function omit(obj, keys) {
-  const result = {};
-  for (let key of Object.keys(obj || {})) {
-    if (!keys.includes(key)) {
-      result[key] = obj[key];
-    }
-  }
-  return result;
-}
 
 /**
  * Creates an [object schema](https://github.com/bedrockio/yada#object).

package/dist/cjs/utils.js

@@ -15,5 +15,23 @@ Object.defineProperty(exports, "isSchemaError", {
     return _errors.isSchemaError;
   }
 });
+exports.omit = omit;
+exports.pick = pick;
 var _Schema = require("./Schema");
-var _errors = require("./errors");
+var _errors = require("./errors");
+function pick(obj, keys) {
+  const result = {};
+  for (let key of keys) {
+    result[key] = obj[key];
+  }
+  return result;
+}
+function omit(obj, keys) {
+  const result = {};
+  for (let key of Object.keys(obj || {})) {
+    if (!keys.includes(key)) {
+      result[key] = obj[key];
+    }
+  }
+  return result;
+}

package/package.json

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

package/src/Schema.js

@@ -5,6 +5,7 @@ import {
   LocalizedError,
   ArrayError,
 } from './errors';
+import { omit } from './utils';
 
 const INITIAL_TYPES = ['default', 'required', 'type', 'transform'];
 const REQUIRED_TYPES = ['default', 'required'];
@@ -232,6 +233,10 @@ export default class Schema {
         for (let el of set) {
           if (isSchema(el)) {
             try {
+              // Must not pass cast option down when allowing
+              // other schema types as they may be allowed, for
+              // example allowing a string or array of strings.
+              options = omit(options, 'cast');
               return await el.validate(val, options);
             } catch (error) {
               continue;
@@ -240,7 +245,7 @@ export default class Schema {
             return;
           }
         }
-        throw new LocalizedError(msg, {
+        throw new LocalizedError(options.message || msg, {
           types: types.join(', '),
         });
       }

package/src/array.js

@@ -1,5 +1,6 @@
 import Schema from './Schema';
 import { ArrayError, ElementError, LocalizedError } from './errors';
+import { omit } from './utils';
 
 class ArraySchema extends Schema {
   constructor(schemas) {
@@ -11,7 +12,7 @@ class ArraySchema extends Schema {
    * @private
    */
   setup() {
-    const { schemas } = this.meta;
+    const { schemas, message } = this.meta;
     const schema =
       schemas.length > 1 ? new Schema().allow(schemas) : schemas[0];
 
@@ -32,6 +33,9 @@ class ArraySchema extends Schema {
         for (let i = 0; i < arr.length; i++) {
           const el = arr[i];
           try {
+            // Allow enum message to take
+            // precedence over generic array message.
+            options = omit(options, 'message');
             result.push(await schema.validate(el, options));
           } catch (error) {
             if (error.details?.length === 1) {
@@ -44,7 +48,7 @@ class ArraySchema extends Schema {
           }
         }
         if (errors.length) {
-          throw new ArrayError(this.meta.message, errors);
+          throw new ArrayError(message, errors);
         } else {
           return result;
         }

package/src/object.js

@@ -1,5 +1,6 @@
 import TypeSchema from './TypeSchema';
 import { FieldError, LocalizedError } from './errors';
+import { pick, omit } from './utils';
 import Schema from './Schema';
 
 const BASE_ASSERTIONS = ['type', 'transform', 'field'];
@@ -197,24 +198,6 @@ function expandDotProperties(obj) {
   return result;
 }
 
-function pick(obj, keys) {
-  const result = {};
-  for (let key of keys) {
-    result[key] = obj[key];
-  }
-  return result;
-}
-
-function omit(obj, keys) {
-  const result = {};
-  for (let key of Object.keys(obj || {})) {
-    if (!keys.includes(key)) {
-      result[key] = obj[key];
-    }
-  }
-  return result;
-}
-
 /**
  * Creates an [object schema](https://github.com/bedrockio/yada#object).
  *

package/src/utils.js

@@ -1,2 +1,20 @@
 export { isSchema } from './Schema';
 export { isSchemaError } from './errors';
+
+export function pick(obj, keys) {
+  const result = {};
+  for (let key of keys) {
+    result[key] = obj[key];
+  }
+  return result;
+}
+
+export function omit(obj, keys) {
+  const result = {};
+  for (let key of Object.keys(obj || {})) {
+    if (!keys.includes(key)) {
+      result[key] = obj[key];
+    }
+  }
+  return result;
+}

package/types/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAiVA,4CAEC;AAxUD;;GAEG;AAEH;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,qBAFa,IAAI,CAQhB;IAED;;;;OAIG;IACH,gBAHW,eAAe,GACb,IAAI,CAmBhB;IAED;;;;OAIG;IACH,mBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,sBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,gBAFa,IAAI,CAShB;IAED;;OAEG;IACH,+BAFa,IAAI,CAMhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED,iDAqCC;IAED;;OAEG;IACH,kBAFa,IAAI,CAOhB;IAED;;;OAGG;IACH,qBAFa,IAAI,CAMhB;IAED,2BAUC;IAED,kBAEC;IAED,4BAMC;IAID;;OAEG;IACH,kCAFa,IAAI,CA+BhB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAUC;IAED;;;;;;;;MAoCC;CACF;8BAnUY,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAsVA,4CAEC;AA5UD;;GAEG;AAEH;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,qBAFa,IAAI,CAQhB;IAED;;;;OAIG;IACH,gBAHW,eAAe,GACb,IAAI,CAmBhB;IAED;;;;OAIG;IACH,mBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,sBAFa,IAAI,CAIhB;IAED;;;OAGG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED;;OAEG;IACH,gBAFa,IAAI,CAShB;IAED;;OAEG;IACH,+BAFa,IAAI,CAMhB;IAED;;OAEG;IACH,uBAFa,IAAI,CAIhB;IAED,iDAqCC;IAED;;OAEG;IACH,kBAFa,IAAI,CAOhB;IAED;;;OAGG;IACH,qBAFa,IAAI,CAMhB;IAED,2BAUC;IAED,kBAEC;IAED,4BAMC;IAID;;OAEG;IACH,kCAFa,IAAI,CAmChB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAUC;IAED;;;;;;;;MAoCC;CACF;8BAvUY,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC"}

package/types/array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../src/array.js"],"names":[],"mappings":"AAuIA;;;;;;;GAOG;AACH,8CALc,MAAM,iBAUnB;;AAjJD;IACE,0BAGC;IAED;;OAEG;IACH,cAwCC;IAED,iCAUC;IAED,8BAUC;IAED,8BAaC;IAED,sBAaC;CA2BF"}
+{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../src/array.js"],"names":[],"mappings":"AA2IA;;;;;;;GAOG;AACH,8CALc,MAAM,iBAUnB;;AApJD;IACE,0BAGC;IAED;;OAEG;IACH,cA2CC;IAED,iCAUC;IAED,8BAUC;IAED,8BAaC;IAED,sBAaC;CA2BF"}

package/types/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AAyNA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAMnB;;;;AA5ND;;GAEG;AAEH;IAUE;;OAEG;IACH,cAkEC;IAED;;OAEG;IACH,kBAEC;IAED;;OAEG;IAEH,YAHW,SAAS,GAAC,MAAM,gBAkC1B;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;CAcF"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../src/object.js"],"names":[],"mappings":"AAwMA;;;;;;GAMG;AACH,uCAJW,SAAS,gBAMnB;;;;AA1MD;;GAEG;AAEH;IAUE;;OAEG;IACH,cAkEC;IAED;;OAEG;IACH,kBAEC;IAED;;OAEG;IAEH,YAHW,SAAS,GAAC,MAAM,gBAkC1B;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;IAED;;OAEG;IACH,gBAFc,MAAM,kBAWnB;CAcF"}

package/types/utils.d.ts

@@ -1,3 +1,5 @@
+export function pick(obj: any, keys: any): {};
+export function omit(obj: any, keys: any): {};
 export { isSchema } from "./Schema";
 export { isSchemaError } from "./errors";
 //# sourceMappingURL=utils.d.ts.map

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":""}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.js"],"names":[],"mappings":"AAGA,8CAMC;AAED,8CAQC"}