@bedrockio/yada 1.0.17 → 1.0.18

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.18",
   "description": "Validation library inspired by Joi.",
   "scripts": {
     "test": "jest",

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/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"}