@bedrockio/yada 1.0.30 → 1.0.32

package/dist/cjs/Schema.js

@@ -202,18 +202,29 @@ class Schema {
     const {
       required,
       format,
-      tags,
-      default: defaultValue
+      tags
     } = this.meta;
     return {
       required,
-      default: defaultValue,
       format,
       ...tags,
+      ...this.getDefault(),
       ...this.enumToOpenApi(),
       ...this.expandExtra(extra)
     };
   }
+  getDefault() {
+    const {
+      default: defaultValue
+    } = this.meta;
+    if (typeof defaultValue === 'function') {
+      return {};
+    } else {
+      return {
+        default: defaultValue
+      };
+    }
+  }
   inspect() {
     return JSON.stringify(this.toOpenApi(), null, 2);
   }

package/dist/cjs/date.js

@@ -111,7 +111,9 @@ class DateSchema extends _Schema.default {
         original
       } = options;
       if (typeof original !== 'string') {
-        throw new _errors.LocalizedError('Must be a string.');
+        if (!options.default) {
+          throw new _errors.LocalizedError('Must be a string.');
+        }
       } else if (!_validator.default.isISO8601(original)) {
         throw new _errors.LocalizedError('Must be in ISO 8601 format.');
       }
@@ -120,10 +122,11 @@ class DateSchema extends _Schema.default {
   timestamp() {
     return this.clone({
       format: 'timestamp'
-    }).assert('format', (date, {
-      original
-    }) => {
-      if (typeof original !== 'number') {
+    }).assert('format', (date, options) => {
+      const {
+        original
+      } = options;
+      if (typeof original !== 'number' && !options.default) {
         throw new _errors.LocalizedError('Must be a timestamp in milliseconds.');
       }
     });
@@ -131,11 +134,14 @@ class DateSchema extends _Schema.default {
   unix() {
     return this.clone({
       format: 'unix timestamp'
-    }).assert('format', (date, {
-      original
-    }) => {
+    }).assert('format', (date, options) => {
+      const {
+        original
+      } = options;
       if (typeof original !== 'number') {
-        throw new _errors.LocalizedError('Must be a timestamp in seconds.');
+        if (!options.default) {
+          throw new _errors.LocalizedError('Must be a timestamp in seconds.');
+        }
       } else {
         return new Date(original * 1000);
       }
@@ -153,6 +159,22 @@ class DateSchema extends _Schema.default {
       ...super.toOpenApi(extra)
     };
   }
+  getDefault() {
+    const {
+      default: defaultValue
+    } = this.meta;
+    if (defaultValue === Date.now) {
+      return {
+        default: 'now'
+      };
+    } else if (typeof defaultValue === 'function') {
+      return {
+        default: 'custom'
+      };
+    } else {
+      return super.getDefault();
+    }
+  }
 }
 
 /**

package/package.json

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

package/src/Schema.js

@@ -190,17 +190,26 @@ export default class Schema {
   }
 
   toOpenApi(extra) {
-    const { required, format, tags, default: defaultValue } = this.meta;
+    const { required, format, tags } = this.meta;
     return {
       required,
-      default: defaultValue,
       format,
       ...tags,
+      ...this.getDefault(),
       ...this.enumToOpenApi(),
       ...this.expandExtra(extra),
     };
   }
 
+  getDefault() {
+    const { default: defaultValue } = this.meta;
+    if (typeof defaultValue === 'function') {
+      return {};
+    } else {
+      return { default: defaultValue };
+    }
+  }
+
   inspect() {
     return JSON.stringify(this.toOpenApi(), null, 2);
   }

package/src/date.js

@@ -101,7 +101,9 @@ class DateSchema extends Schema {
     return this.clone({ format }).assert('format', (val, options) => {
       const { original } = options;
       if (typeof original !== 'string') {
-        throw new LocalizedError('Must be a string.');
+        if (!options.default) {
+          throw new LocalizedError('Must be a string.');
+        }
       } else if (!validator.isISO8601(original)) {
         throw new LocalizedError('Must be in ISO 8601 format.');
       }
@@ -111,8 +113,9 @@ class DateSchema extends Schema {
   timestamp() {
     return this.clone({ format: 'timestamp' }).assert(
       'format',
-      (date, { original }) => {
-        if (typeof original !== 'number') {
+      (date, options) => {
+        const { original } = options;
+        if (typeof original !== 'number' && !options.default) {
           throw new LocalizedError('Must be a timestamp in milliseconds.');
         }
       }
@@ -122,9 +125,12 @@ class DateSchema extends Schema {
   unix() {
     return this.clone({ format: 'unix timestamp' }).assert(
       'format',
-      (date, { original }) => {
+      (date, options) => {
+        const { original } = options;
         if (typeof original !== 'number') {
-          throw new LocalizedError('Must be a timestamp in seconds.');
+          if (!options.default) {
+            throw new LocalizedError('Must be a timestamp in seconds.');
+          }
         } else {
           return new Date(original * 1000);
         }
@@ -143,6 +149,17 @@ class DateSchema extends Schema {
       ...super.toOpenApi(extra),
     };
   }
+
+  getDefault() {
+    const { default: defaultValue } = this.meta;
+    if (defaultValue === Date.now) {
+      return { default: 'now' };
+    } else if (typeof defaultValue === 'function') {
+      return { default: 'custom' };
+    } else {
+      return super.getDefault();
+    }
+  }
 }
 
 /**

package/types/Schema.d.ts

@@ -64,6 +64,11 @@ export default class Schema {
      */
     append(schema: any): this;
     toOpenApi(extra: any): any;
+    getDefault(): {
+        default?: undefined;
+    } | {
+        default: any;
+    };
     inspect(): string;
     expandExtra(extra?: {}): {};
     /**

package/types/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAuVA,4CAEC;AA7UD;;GAEG;AAEH;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,mBAFa,IAAI,CAShB;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;8BAxUY,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":"AAgWA,4CAEC;AAtVD;;GAEG;AAEH;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,mBAFa,IAAI,CAShB;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;;;;MAOC;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;8BAjVY,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC"}

package/types/date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../src/date.js"],"names":[],"mappings":"AAmJA;;GAEG;AACH,+CAEC;AAnJD;IACE,cAUC;IAED;;OAEG;IACH,SAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED;;OAEG;IACH,SAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED;;OAEG;IACH,YAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED;;OAEG;IACH,WAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED,mBAOC;IAED,qBAOC;IAED;;OAEG;IACH,aAFW,MAAM,GAAG,WAAW,cAW9B;IAED,wBASC;IAED,mBAWC;CAaF"}
+{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../src/date.js"],"names":[],"mappings":"AAoKA;;GAEG;AACH,+CAEC;AApKD;IACE,cAUC;IAED;;OAEG;IACH,SAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED;;OAEG;IACH,SAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED;;OAEG;IACH,YAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED;;OAEG;IACH,WAFW,MAAM,GAAC,MAAM,GAAC,IAAI,cAY5B;IAED,mBAOC;IAED,qBAOC;IAED;;OAEG;IACH,aAFW,MAAM,GAAG,WAAW,cAa9B;IAED,wBAUC;IAED,mBAcC;CAwBF"}