@zhin.js/schema 1.0.71 → 1.0.72

package/lib/schema.js

@@ -188,7 +188,7 @@ export class Schema {
     Schema.formatters = new Map();
     function checkDefault(schema, key, value, fallback = value) {
         if (isEmpty(value)) {
-            value = schema.meta.default || fallback;
+            value = schema.meta.default ?? fallback;
         }
         const validateType = (schema, key, value) => {
             switch (schema.meta.type) {
@@ -319,6 +319,8 @@ Schema.extend('regexp', function (key, value) {
 });
 Schema.extend('date', function (key, value) {
     value = Schema.checkDefault(this, key, value);
+    if (typeof value === 'undefined')
+        return value;
     return new Date(value);
 });
 Schema.extend('const', function (key, value) {
@@ -330,17 +332,26 @@ Schema.extend('const', function (key, value) {
 });
 Schema.extend('tuple', function (key, value) {
     value = Schema.checkDefault(this, key, value, []);
+    if (value.length > 0 && value.length !== this.options.list.length)
+        throw new TypeError(`${key} tuple length mismatch`);
     return value.map((item, index) => this.options.list[index](item, `${key}[${index}]`));
 });
 Schema.extend('union', function (key, value) {
     value = Schema.checkDefault(this, key, value);
+    let lastError;
+    const issues = [];
     for (const schema of this.options.list) {
         try {
             return schema(value, key);
         }
-        catch { /* schema mismatch, try next variant */ }
+        catch (e) {
+            lastError = e;
+            issues.push(e instanceof Error ? e.message : String(e));
+        }
     }
-    throw new Error(`${key} union type not match`);
+    const error = new Error(`${key} union type not match: ${issues.join('; ')}`);
+    error.lastError = lastError;
+    throw error;
 });
 Schema.extend('intersect', function (key, value) {
     value = Schema.checkDefault(this, key, value);

package/lib/validate.js

@@ -127,7 +127,17 @@ function validateOnly(schema, path, value) {
             return current;
         }
         case 'regexp':
+            if (value !== undefined && typeof value !== 'string' && !(value instanceof RegExp)) {
+                throw issue(path, `${path} is not a RegExp|string`);
+            }
+            return value;
         case 'date':
+            if (value !== undefined && typeof value !== 'number' && !(value instanceof Date)) {
+                throw issue(path, `${path} is not a Date|number`);
+            }
+            if (value instanceof Date && isNaN(value.getTime())) {
+                throw issue(path, `${path} is not a valid Date`);
+            }
             return value;
         default:
             throw issue(path, `${path} has unsupported schema type ${schema.meta.type}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/schema",
-  "version": "1.0.71",
+  "version": "1.0.72",
   "description": "Configuration validation and schema system for Zhin.js",
   "type": "module",
   "main": "./lib/index.js",