@bedrockio/yada 1.0.32 → 1.0.34

package/dist/cjs/Schema.js

@@ -208,18 +208,30 @@ class Schema {
       required,
       format,
       ...tags,
+      ...this.getAnyType(),
       ...this.getDefault(),
       ...this.enumToOpenApi(),
       ...this.expandExtra(extra)
     };
   }
+  getAnyType() {
+    const {
+      type,
+      enum: set
+    } = this.meta;
+    if (!type && !set) {
+      return {
+        type: ['object', 'array', 'string', 'number', 'boolean', 'null']
+      };
+    }
+  }
   getDefault() {
     const {
       default: defaultValue
     } = this.meta;
     if (typeof defaultValue === 'function') {
       return {};
-    } else {
+    } else if (defaultValue != null) {
       return {
         default: defaultValue
       };

package/dist/cjs/TypeSchema.js

@@ -24,8 +24,8 @@ class TypeSchema extends _Schema.default {
   }
   toOpenApi(extra) {
     return {
-      type: this.meta.type,
-      ...super.toOpenApi(extra)
+      ...super.toOpenApi(extra),
+      type: this.meta.type
     };
   }
 }

package/dist/cjs/array.js

@@ -131,9 +131,9 @@ class ArraySchema extends _Schema.default {
       };
     }
     return {
-      type: 'array',
       ...super.toOpenApi(extra),
-      ...other
+      ...other,
+      type: 'array'
     };
   }
 }

package/dist/cjs/date.js

@@ -155,8 +155,8 @@ class DateSchema extends _Schema.default {
       format
     } = this.meta;
     return {
-      type: format.includes('timestamp') ? 'number' : 'string',
-      ...super.toOpenApi(extra)
+      ...super.toOpenApi(extra),
+      type: format.includes('timestamp') ? 'number' : 'string'
     };
   }
   getDefault() {

package/dist/cjs/tuple.js

@@ -90,8 +90,8 @@ class TupleSchema extends _Schema.default {
       schemas
     } = this.meta;
     return {
-      type: 'array',
       ...super.toOpenApi(extra),
+      type: 'array',
       prefixItems: schemas.map(schema => {
         return schema.toOpenApi();
       })

package/package.json

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

package/src/Schema.js

@@ -195,18 +195,30 @@ export default class Schema {
       required,
       format,
       ...tags,
+      ...this.getAnyType(),
       ...this.getDefault(),
       ...this.enumToOpenApi(),
       ...this.expandExtra(extra),
     };
   }
 
+  getAnyType() {
+    const { type, enum: set } = this.meta;
+    if (!type && !set) {
+      return {
+        type: ['object', 'array', 'string', 'number', 'boolean', 'null'],
+      };
+    }
+  }
+
   getDefault() {
     const { default: defaultValue } = this.meta;
     if (typeof defaultValue === 'function') {
       return {};
-    } else {
-      return { default: defaultValue };
+    } else if (defaultValue != null) {
+      return {
+        default: defaultValue,
+      };
     }
   }
 

package/src/TypeSchema.js

@@ -16,8 +16,8 @@ export default class TypeSchema extends Schema {
 
   toOpenApi(extra) {
     return {
-      type: this.meta.type,
       ...super.toOpenApi(extra),
+      type: this.meta.type,
     };
   }
 }

package/src/array.js

@@ -130,9 +130,9 @@ class ArraySchema extends Schema {
     }
 
     return {
-      type: 'array',
       ...super.toOpenApi(extra),
       ...other,
+      type: 'array',
     };
   }
 }

package/src/date.js

@@ -145,8 +145,8 @@ class DateSchema extends Schema {
   toOpenApi(extra) {
     const { format } = this.meta;
     return {
-      type: format.includes('timestamp') ? 'number' : 'string',
       ...super.toOpenApi(extra),
+      type: format.includes('timestamp') ? 'number' : 'string',
     };
   }
 

package/src/tuple.js

@@ -80,8 +80,8 @@ class TupleSchema extends Schema {
   toOpenApi(extra) {
     const { schemas } = this.meta;
     return {
-      type: 'array',
       ...super.toOpenApi(extra),
+      type: 'array',
       prefixItems: schemas.map((schema) => {
         return schema.toOpenApi();
       }),

package/types/Schema.d.ts

@@ -64,6 +64,9 @@ export default class Schema {
      */
     append(schema: any): this;
     toOpenApi(extra: any): any;
+    getAnyType(): {
+        type: string[];
+    };
     getDefault(): {
         default?: undefined;
     } | {

package/types/Schema.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../src/Schema.js"],"names":[],"mappings":"AA4WA,4CAEC;AAlWD;;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,2BAWC;IAED;;MAOC;IAED;;;;MASC;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;8BA7VY,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC"}