@bedrockio/yada 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.8.2
+
+- Fixed array schemas not passing through `requireAllWithin`.
+
+## 1.8.1
+
+- Fixed bug with tagging in `toOpenApi`.
+
 ## 1.8.0
 
 - Removed undefined `format` field.

package/dist/cjs/Schema.js

@@ -241,7 +241,7 @@ class Schema {
    * @alias toJSON.
    */
   toOpenApi(...extra) {
-    return this.toJSON(extra);
+    return this.toJSON(...extra);
   }
   getAnyType() {
     const {

package/dist/cjs/array.js

@@ -10,8 +10,9 @@ var _TypeSchema = _interopRequireDefault(require("./TypeSchema"));
 var _errors = require("./errors");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class ArraySchema extends _TypeSchema.default {
-  constructor(schemas) {
+  constructor(schemas, meta) {
     super(Array, {
+      ...meta,
       schemas
     });
     this.setup();
@@ -106,6 +107,23 @@ class ArraySchema extends _TypeSchema.default {
     });
   }
 
+  /**
+   * Augments the array schema to make all nested fields required.
+   * @returns {this}
+   */
+  requireAllWithin() {
+    const {
+      schemas,
+      ...rest
+    } = this.meta;
+    const newSchemas = schemas.map(schema => {
+      return schema.requireAllWithin();
+    });
+
+    // @ts-ignore
+    return new ArraySchema(newSchemas, rest).required();
+  }
+
   // Private
 
   toString() {

package/package.json

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

package/src/Schema.js

@@ -232,7 +232,7 @@ export default class Schema {
    * @alias toJSON.
    */
   toOpenApi(...extra) {
-    return this.toJSON(extra);
+    return this.toJSON(...extra);
   }
 
   getAnyType() {

package/src/array.js

@@ -5,8 +5,8 @@ import TypeSchema from './TypeSchema';
 import { ArrayError, ElementError, LocalizedError } from './errors';
 
 class ArraySchema extends TypeSchema {
-  constructor(schemas) {
-    super(Array, { schemas });
+  constructor(schemas, meta) {
+    super(Array, { ...meta, schemas });
     this.setup();
   }
 
@@ -104,6 +104,21 @@ class ArraySchema extends TypeSchema {
     });
   }
 
+  /**
+   * Augments the array schema to make all nested fields required.
+   * @returns {this}
+   */
+  requireAllWithin() {
+    const { schemas, ...rest } = this.meta;
+
+    const newSchemas = schemas.map((schema) => {
+      return schema.requireAllWithin();
+    });
+
+    // @ts-ignore
+    return new ArraySchema(newSchemas, rest).required();
+  }
+
   // Private
 
   toString() {

package/types/array.d.ts

@@ -9,12 +9,16 @@
 export default function _default(...schemas?: Schema[]): ArraySchema;
 import Schema from './Schema';
 declare class ArraySchema extends TypeSchema {
-    constructor(schemas: any);
     setup(): void;
     length(length: any): this;
     min(length: any): this;
     max(length: any): this;
     latlng(): this;
+    /**
+     * Augments the array schema to make all nested fields required.
+     * @returns {this}
+     */
+    requireAllWithin(): this;
     toString(): string;
 }
 import TypeSchema from './TypeSchema';

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,EAAA,eAUnB;mBAlJkB,UAAU;AAI7B;IACE,0BAGC;IAED,cAsCC;IAED,0BAUC;IAED,uBAUC;IAED,uBAaC;IAED,eAaC;IAID,mBAEC;CAuBF;uBAlIsB,cAAc"}
+{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../src/array.js"],"names":[],"mappings":"AAsJA;;;;;;;GAOG;AACH,8CALc,MAAM,EAAA,eAUnB;mBAjKkB,UAAU;AAI7B;IAME,cAsCC;IAED,0BAUC;IAED,uBAUC;IAED,uBAaC;IAED,eAaC;IAED;;;OAGG;IACH,oBAFa,IAAI,CAWhB;IAID,mBAEC;CAuBF;uBAjJsB,cAAc"}