@bedrockio/yada 1.0.17 → 1.0.19

package/dist/cjs/string.js

@@ -25,6 +25,21 @@ class StringSchema extends _TypeSchema.default {
     });
   }
 
+  /**
+   * @param {number} length
+   */
+  length(length) {
+    return this.clone({
+      length
+    }).assert('length', str => {
+      if (str && str.length !== length) {
+        throw new _errors.LocalizedError('Must be exactly {length} characters.', {
+          length
+        });
+      }
+    });
+  }
+
   /**
    * @param {number} length
    */

package/dist/cjs/tuple.js

@@ -32,24 +32,35 @@ class TupleSchema extends _Schema.default {
       }
       return val;
     });
-    this.assert('length', val => {
+    this.assert('length', (arr, options) => {
+      const {
+        loose
+      } = options;
       const {
         length
       } = schemas;
-      if (val.length !== length) {
+      if (loose && arr.length === 0) {
+        // Empty arrays allowed with loose option so take no action.
+      } else if (arr.length !== length) {
         throw new _errors.LocalizedError('Tuple must be exactly {length} elements.', {
           length: schemas.length
         });
       }
-      return val;
+      return arr;
     });
     this.assert('elements', async (arr, options) => {
       const errors = [];
       const result = [];
-      for (let i = 0; i < schemas.length; i++) {
+      const min = Math.min(arr.length, schemas.length);
+      for (let i = 0; i < min; i++) {
+        let el = arr[i];
         const schema = schemas[i];
-        const el = arr[i];
         try {
+          if (el === undefined) {
+            // Coerce undefined to null to make sure validation
+            // is run but keep the same error message.
+            el = null;
+          }
           result.push(await schema.validate(el, options));
         } catch (error) {
           if (error.details?.length === 1) {
@@ -66,6 +77,11 @@ class TupleSchema extends _Schema.default {
       }
     });
   }
+  loose() {
+    return this.clone({
+      loose: true
+    });
+  }
   toString() {
     return 'tuple';
   }

package/package.json

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

package/src/string.js

@@ -27,6 +27,19 @@ class StringSchema extends TypeSchema {
     });
   }
 
+  /**
+   * @param {number} length
+   */
+  length(length) {
+    return this.clone({ length }).assert('length', (str) => {
+      if (str && str.length !== length) {
+        throw new LocalizedError('Must be exactly {length} characters.', {
+          length,
+        });
+      }
+    });
+  }
+
   /**
    * @param {number} length
    */

package/src/tuple.js

@@ -23,24 +23,33 @@ class TupleSchema extends Schema {
       return val;
     });
 
-    this.assert('length', (val) => {
+    this.assert('length', (arr, options) => {
+      const { loose } = options;
       const { length } = schemas;
-      if (val.length !== length) {
+      if (loose && arr.length === 0) {
+        // Empty arrays allowed with loose option so take no action.
+      } else if (arr.length !== length) {
         throw new LocalizedError('Tuple must be exactly {length} elements.', {
           length: schemas.length,
         });
       }
-      return val;
+      return arr;
     });
 
     this.assert('elements', async (arr, options) => {
       const errors = [];
       const result = [];
+      const min = Math.min(arr.length, schemas.length);
 
-      for (let i = 0; i < schemas.length; i++) {
+      for (let i = 0; i < min; i++) {
+        let el = arr[i];
         const schema = schemas[i];
-        const el = arr[i];
         try {
+          if (el === undefined) {
+            // Coerce undefined to null to make sure validation
+            // is run but keep the same error message.
+            el = null;
+          }
           result.push(await schema.validate(el, options));
         } catch (error) {
           if (error.details?.length === 1) {
@@ -60,6 +69,10 @@ class TupleSchema extends Schema {
     });
   }
 
+  loose() {
+    return this.clone({ loose: true });
+  }
+
   toString() {
     return 'tuple';
   }

package/types/string.d.ts

@@ -4,6 +4,10 @@
 export default function _default(): StringSchema;
 declare class StringSchema extends TypeSchema {
     constructor();
+    /**
+     * @param {number} length
+     */
+    length(length: number): StringSchema;
     /**
      * @param {number} length
      */

package/types/string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../src/string.js"],"names":[],"mappings":"AA4WA;;GAEG;AACH,iDAEC;AAlWD;IACE,cAWC;IAED;;OAEG;IACH,YAFW,MAAM,gBAUhB;IAED;;OAEG;IACH,YAFW,MAAM,gBAUhB;IAED,qBAIC;IAED;;OAEG;IACH,mBAFW,OAAO,gBAYjB;IAED;;OAEG;IACH,mBAFW,OAAO,gBAYjB;IAED;;OAEG;IACH,WAFW,MAAM,gBAahB;IAED,sBAMC;IAED,sBAMC;IAED,oBAMC;IAED,oBAMC;IAED,qBAMC;IAED,sBAMC;IAED;;;OAGG;IACH;QAF6B,OAAO,GAAzB,OAAO;qBAQjB;IAED,2BAMC;IAED,mBAMC;IAED,wBAMC;IAED,uBAMC;IAED,oBAMC;IAED,qBAOC;IAED,uBAMC;IAED;;OAEG;IACH,oBAFW,MAAM,gBAQhB;IAED;;;;;;;OAOG;IACH;QAN4B,SAAS,GAA1B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,YAAY,GAA7B,MAAM;QACW,YAAY,GAA7B,MAAM;qBA2BhB;IAED;;;;;;;;;;;OAWG;IACH;QAV6B,gBAAgB,GAAlC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,4BAA4B,GAA9C,OAAO;QACW,eAAe,GAAjC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,eAAe,GAAjC,OAAO;QACY,SAAS,GAA5B,MAAM,EAAE;qBAQlB;IAED;;;;;;;;OAQG;IACH;QAP6B,WAAW,GAA7B,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,kBAAkB,GAApC,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,cAAc,GAAhC,OAAO;QACW,iBAAiB,GAAnC,OAAO;qBAQjB;IAED;;OAEG;IACH,eAFW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,gBAQ3B;IAED,oBAMC;IAED,oBAMC;IAED,sBAMC;IAED,sBAMC;CAcF"}
+{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../src/string.js"],"names":[],"mappings":"AAyXA;;GAEG;AACH,iDAEC;AA/WD;IACE,cAWC;IAED;;OAEG;IACH,eAFW,MAAM,gBAUhB;IAED;;OAEG;IACH,YAFW,MAAM,gBAUhB;IAED;;OAEG;IACH,YAFW,MAAM,gBAUhB;IAED,qBAIC;IAED;;OAEG;IACH,mBAFW,OAAO,gBAYjB;IAED;;OAEG;IACH,mBAFW,OAAO,gBAYjB;IAED;;OAEG;IACH,WAFW,MAAM,gBAahB;IAED,sBAMC;IAED,sBAMC;IAED,oBAMC;IAED,oBAMC;IAED,qBAMC;IAED,sBAMC;IAED;;;OAGG;IACH;QAF6B,OAAO,GAAzB,OAAO;qBAQjB;IAED,2BAMC;IAED,mBAMC;IAED,wBAMC;IAED,uBAMC;IAED,oBAMC;IAED,qBAOC;IAED,uBAMC;IAED;;OAEG;IACH,oBAFW,MAAM,gBAQhB;IAED;;;;;;;OAOG;IACH;QAN4B,SAAS,GAA1B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,UAAU,GAA3B,MAAM;QACW,YAAY,GAA7B,MAAM;QACW,YAAY,GAA7B,MAAM;qBA2BhB;IAED;;;;;;;;;;;OAWG;IACH;QAV6B,gBAAgB,GAAlC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,YAAY,GAA9B,OAAO;QACW,4BAA4B,GAA9C,OAAO;QACW,eAAe,GAAjC,OAAO;QACW,sBAAsB,GAAxC,OAAO;QACW,eAAe,GAAjC,OAAO;QACY,SAAS,GAA5B,MAAM,EAAE;qBAQlB;IAED;;;;;;;;OAQG;IACH;QAP6B,WAAW,GAA7B,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,kBAAkB,GAApC,OAAO;QACW,iBAAiB,GAAnC,OAAO;QACW,cAAc,GAAhC,OAAO;QACW,iBAAiB,GAAnC,OAAO;qBAQjB;IAED;;OAEG;IACH,eAFW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,gBAQ3B;IAED,oBAMC;IAED,oBAMC;IAED,sBAMC;IAED,sBAMC;CAcF"}

package/types/tuple.d.ts

@@ -13,6 +13,7 @@ declare class TupleSchema extends Schema {
      * @private
      */
     private setup;
+    loose(): TupleSchema;
 }
 export {};
 //# sourceMappingURL=tuple.d.ts.map

package/types/tuple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../src/tuple.js"],"names":[],"mappings":"AA8EA;;;;;;GAMG;AACH,8CAJc,MAAM,iBASnB;;AAvFD;IACE,0BAGC;IAED;;OAEG;IACH,cAgDC;CAgBF"}
+{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../src/tuple.js"],"names":[],"mappings":"AA2FA;;;;;;GAMG;AACH,8CAJc,MAAM,iBASnB;;AApGD;IACE,0BAGC;IAED;;OAEG;IACH,cAyDC;IAED,qBAEC;CAgBF"}