@bedrockio/yada 1.0.31 → 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

@@ -159,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.31",
+  "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

@@ -149,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":"AAyJA;;GAEG;AACH,+CAEC;AAzJD;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;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"}