@bedrockio/yada 1.0.22 → 1.0.24

package/dist/cjs/Schema.js

@@ -207,11 +207,21 @@ class Schema {
       required,
       default: defaultValue,
       format,
-      ...this.enumToOpenApi(),
       ...tags,
-      ...extra
+      ...this.enumToOpenApi(),
+      ...this.expandExtra(extra)
     };
   }
+  expandExtra(extra = {}) {
+    const {
+      tag,
+      ...rest
+    } = extra;
+    if (typeof extra?.tag === 'function') {
+      Object.assign(rest, extra.tag(this.meta));
+    }
+    return rest;
+  }
 
   // Private
 

package/dist/cjs/date.js

@@ -10,7 +10,10 @@ var _Schema = _interopRequireDefault(require("./Schema"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class DateSchema extends _Schema.default {
   constructor() {
-    super();
+    super({
+      type: 'string',
+      format: 'date-time'
+    });
     this.assert('type', val => {
       const date = new Date(val);
       if (!val && val !== 0 || isNaN(date.getTime())) {

package/dist/cjs/object.js

@@ -143,7 +143,7 @@ class ObjectSchema extends _TypeSchema.default {
   toOpenApi(extra) {
     const properties = {};
     for (let [key, schema] of Object.entries(this.getFields())) {
-      properties[key] = schema.toOpenApi();
+      properties[key] = schema.toOpenApi(extra);
     }
     return {
       ...super.toOpenApi(extra),

package/dist/cjs/string.js

@@ -10,7 +10,7 @@ var _errors = require("./errors");
 var _password = require("./password");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-const PHONE_REG = /^\+?[1-9]\d{1,14}$/;
+const PHONE_REG = /^\+\d{1,3}\d{3,14}$/;
 const PHONE_DESCRIPTION = 'A phone number in [E.164](https://en.wikipedia.org/wiki/E.164) format.';
 class StringSchema extends _TypeSchema.default {
   constructor() {

package/package.json

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

package/src/Schema.js

@@ -193,12 +193,20 @@ export default class Schema {
       required,
       default: defaultValue,
       format,
-      ...this.enumToOpenApi(),
       ...tags,
-      ...extra,
+      ...this.enumToOpenApi(),
+      ...this.expandExtra(extra),
     };
   }
 
+  expandExtra(extra = {}) {
+    const { tag, ...rest } = extra;
+    if (typeof extra?.tag === 'function') {
+      Object.assign(rest, extra.tag(this.meta));
+    }
+    return rest;
+  }
+
   // Private
 
   /**

package/src/date.js

@@ -5,7 +5,7 @@ import Schema from './Schema';
 
 class DateSchema extends Schema {
   constructor() {
-    super();
+    super({ type: 'string', format: 'date-time' });
     this.assert('type', (val) => {
       const date = new Date(val);
       if ((!val && val !== 0) || isNaN(date.getTime())) {

package/src/object.js

@@ -136,7 +136,7 @@ class ObjectSchema extends TypeSchema {
   toOpenApi(extra) {
     const properties = {};
     for (let [key, schema] of Object.entries(this.getFields())) {
-      properties[key] = schema.toOpenApi();
+      properties[key] = schema.toOpenApi(extra);
     }
     return {
       ...super.toOpenApi(extra),

package/src/string.js

@@ -11,7 +11,7 @@ import {
 } from './password';
 
 const SLUG_REG = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-const PHONE_REG = /^\+?[1-9]\d{1,14}$/;
+const PHONE_REG = /^\+\d{1,3}\d{3,14}$/;
 
 const PHONE_DESCRIPTION =
   'A phone number in [E.164](https://en.wikipedia.org/wiki/E.164) format.';

package/types/Schema.d.ts

@@ -64,6 +64,7 @@ export default class Schema {
      */
     append(schema: any): this;
     toOpenApi(extra: any): any;
+    expandExtra(extra?: {}): {};
     /**
      * @returns {this}
      */

package/types/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AAsUA,4CAEC;AA7TD;;GAEG;AAEH;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,qBAFa,IAAI,CAQhB;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;IAID;;OAEG;IACH,kCAFa,IAAI,CAgChB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAUC;IAED;;;;;;;;MAoCC;CACF;8BAxTY,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":"AA8UA,4CAEC;AArUD;;GAEG;AAEH;IACE,uBAGC;IAFC,kBAAoB;IACpB,SAAgB;IAKlB;;OAEG;IACH,YAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,qBAFa,IAAI,CAQhB;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,4BAMC;IAID;;OAEG;IACH,kCAFa,IAAI,CAgChB;IAED;;OAEG;IACH,4BAFa,IAAI,CAUhB;IAED,oCAKC;IAED;;OAEG;IACH,oBAFa,IAAI,CAShB;IAED,gCAGC;IAED,qEAUC;IAED;;;;;;;;MAoCC;CACF;8BAhUY,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC"}