@plasius/schema 1.2.6 → 1.2.8

package/dist/index.cjs

@@ -60,6 +60,12 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/field.builder.ts
+function mergeValidatorResult(previousResult, nextValid) {
+  if (previousResult !== true) {
+    return previousResult;
+  }
+  return nextValid;
+}
 var FieldBuilder = class _FieldBuilder {
   constructor(type, options = {}) {
     this.type = type;
@@ -67,6 +73,7 @@ var FieldBuilder = class _FieldBuilder {
     this.itemType = options.itemType;
     this.refType = options.refType;
   }
+  type;
   _type;
   _storageType;
   isSystem = false;
@@ -155,19 +162,19 @@ var FieldBuilder = class _FieldBuilder {
       const prevValidator = this._validator;
       this._validator = (value) => {
         const valid = typeof value === "number" && value >= min;
-        return prevValidator ? prevValidator(value) && valid : valid;
+        return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
       };
     } else if (this.type === "string") {
       const prevValidator = this._validator;
       this._validator = (value) => {
         const valid = typeof value === "string" && value.length >= min;
-        return prevValidator ? prevValidator(value) && valid : valid;
+        return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
       };
     } else if (this.type === "array") {
       const prevValidator = this._validator;
       this._validator = (value) => {
         const valid = Array.isArray(value) && value.length >= min;
-        return prevValidator ? prevValidator(value) && valid : valid;
+        return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
       };
     } else {
       throw new Error(
@@ -181,19 +188,19 @@ var FieldBuilder = class _FieldBuilder {
       const prevValidator = this._validator;
       this._validator = (value) => {
         const valid = typeof value === "number" && value <= max;
-        return prevValidator ? prevValidator(value) && valid : valid;
+        return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
       };
     } else if (this.type === "string") {
       const prevValidator = this._validator;
       this._validator = (value) => {
         const valid = typeof value === "string" && value.length <= max;
-        return prevValidator ? prevValidator(value) && valid : valid;
+        return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
       };
     } else if (this.type === "array") {
       const prevValidator = this._validator;
       this._validator = (value) => {
         const valid = Array.isArray(value) && value.length <= max;
-        return prevValidator ? prevValidator(value) && valid : valid;
+        return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
       };
     } else {
       throw new Error(
@@ -209,7 +216,7 @@ var FieldBuilder = class _FieldBuilder {
     const prevValidator = this._validator;
     this._validator = (value) => {
       const valid = typeof value === "string" && regex.test(value);
-      return prevValidator ? prevValidator(value) && valid : valid;
+      return prevValidator ? mergeValidatorResult(prevValidator(value), valid) : valid;
     };
     return this;
   }
@@ -1608,6 +1615,38 @@ function getValidator(def) {
 function getShape(def) {
   return def?._shape ?? def?.shape ?? void 0;
 }
+function normalizeValidationIssue(path, issue, defaultCode) {
+  if (typeof issue === "string") {
+    return {
+      path,
+      code: defaultCode,
+      message: issue
+    };
+  }
+  return {
+    path: issue.path ?? path,
+    code: issue.code || defaultCode,
+    message: issue.message
+  };
+}
+function normalizeValidatorIssues(path, result, defaultCode) {
+  if (result === true) {
+    return [];
+  }
+  if (result === false) {
+    return [
+      {
+        path,
+        code: defaultCode,
+        message: `Invalid value for field: ${path}`
+      }
+    ];
+  }
+  if (Array.isArray(result)) {
+    return result.map((issue) => normalizeValidationIssue(path, issue, defaultCode));
+  }
+  return [normalizeValidationIssue(path, result, defaultCode)];
+}
 function checkMissingRequired(parentKey, key, value, def, errors) {
   if (value === void 0 || value === null) {
     const path = parentKey ? `${parentKey}.${key}` : key;
@@ -1626,13 +1665,16 @@ function checkImmutable(parentKey, key, value, def, existing, errors) {
   }
   return { immutableViolation: false };
 }
-function runCustomValidator(parentKey, key, value, def, errors) {
+function runCustomValidator(parentKey, key, value, def, errors, issues) {
   const validator = getValidator(def);
   if (validator && value !== void 0 && value !== null) {
-    const valid = validator(value);
-    if (!valid) {
-      const path = parentKey ? `${parentKey}.${key}` : key;
-      errors.push(`Invalid value for field: ${path}`);
+    const path = parentKey ? `${parentKey}.${key}` : key;
+    const normalizedIssues = normalizeValidatorIssues(path, validator(value), "invalid_value");
+    if (normalizedIssues.length > 0) {
+      errors.push(...normalizedIssues.map((issue) => issue.message));
+      if (issues) {
+        issues.push(...normalizedIssues);
+      }
       return { invalid: true };
     }
   }
@@ -1672,7 +1714,7 @@ function validateBooleanField(parentKey, key, value, _def, errors) {
     errors.push(`Field ${path} must be boolean`);
   }
 }
-function validateObjectChildren(parentKey, obj, shape, errors, existing, piiEnforcement, logger) {
+function validateObjectChildren(parentKey, obj, shape, errors, issues, existing, piiEnforcement, logger) {
   for (const [childKey, childDef] of Object.entries(shape)) {
     let childValue = obj[childKey];
     const existingChild = existing && typeof existing === "object" ? existing[childKey] : void 0;
@@ -1713,7 +1755,8 @@ function validateObjectChildren(parentKey, obj, shape, errors, existing, piiEnfo
       childKey,
       childValue,
       childDef,
-      errors
+      errors,
+      issues
     );
     if (invalid) continue;
     validateByType(
@@ -1722,13 +1765,14 @@ function validateObjectChildren(parentKey, obj, shape, errors, existing, piiEnfo
       childValue,
       childDef,
       errors,
+      issues,
       existingChild,
       piiEnforcement,
       logger
     );
   }
 }
-function validateObjectField(parentKey, key, value, def, errors, existing, piiEnforcement, logger) {
+function validateObjectField(parentKey, key, value, def, errors, issues, existing, piiEnforcement, logger) {
   const path = parentKey ? `${parentKey}.${key}` : key;
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     errors.push(`Field ${path} must be object`);
@@ -1736,7 +1780,7 @@ function validateObjectField(parentKey, key, value, def, errors, existing, piiEn
   }
   const objShape = getShape(def);
   if (objShape)
-    validateObjectChildren(path, value, objShape, errors, existing, piiEnforcement, logger);
+    validateObjectChildren(path, value, objShape, errors, issues, existing, piiEnforcement, logger);
 }
 function validateArrayOfStrings(parentKey, key, arr, itemDef, errors) {
   const path = parentKey ? `${parentKey}.${key}` : key;
@@ -1795,7 +1839,7 @@ function validateArrayOfBooleans(parentKey, key, arr, _itemDef, errors) {
     });
   }
 }
-function validateArrayOfObjects(parentKey, key, arr, itemDef, errors, existing, piiEnforcement, logger) {
+function validateArrayOfObjects(parentKey, key, arr, itemDef, errors, issues, existing, piiEnforcement, logger) {
   const path = parentKey ? `${parentKey}.${key}` : key;
   if (!Array.isArray(arr) || !arr.every((v) => typeof v === "object" && v !== null && !Array.isArray(v))) {
     errors.push(`Field ${path} must be object[]`);
@@ -1849,7 +1893,8 @@ function validateArrayOfObjects(parentKey, key, arr, itemDef, errors, existing,
         childKey,
         childValue,
         childDef,
-        errors
+        errors,
+        issues
       );
       if (invalid) continue;
       validateByType(
@@ -1858,6 +1903,7 @@ function validateArrayOfObjects(parentKey, key, arr, itemDef, errors, existing,
         childValue,
         childDef,
         errors,
+        issues,
         existingChild,
         piiEnforcement,
         logger
@@ -1865,7 +1911,7 @@ function validateArrayOfObjects(parentKey, key, arr, itemDef, errors, existing,
     }
   });
 }
-function validateArrayField(parentKey, key, value, def, errors, existing, piiEnforcement, logger) {
+function validateArrayField(parentKey, key, value, def, errors, issues, existing, piiEnforcement, logger) {
   const path = parentKey ? `${parentKey}.${key}` : key;
   if (!Array.isArray(value)) {
     errors.push(`Field ${key} must be an array`);
@@ -1885,6 +1931,7 @@ function validateArrayField(parentKey, key, value, def, errors, existing, piiEnf
       value,
       def.itemType,
       errors,
+      issues,
       existing,
       piiEnforcement,
       logger
@@ -1941,9 +1988,14 @@ function validateArrayField(parentKey, key, value, def, errors, existing, piiEnf
             if (shortCircuit) continue;
             const childValidator = getValidator(childDef);
             if (childValidator && childValue !== void 0 && childValue !== null) {
-              const valid = childValidator(childValue);
-              if (!valid) {
-                errors.push(`Invalid value for field: ${childPath}`);
+              const normalizedIssues = normalizeValidatorIssues(
+                childPath,
+                childValidator(childValue),
+                "invalid_value"
+              );
+              if (normalizedIssues.length > 0) {
+                errors.push(...normalizedIssues.map((issue) => issue.message));
+                issues.push(...normalizedIssues);
                 continue;
               }
             }
@@ -1953,6 +2005,7 @@ function validateArrayField(parentKey, key, value, def, errors, existing, piiEnf
               childValue,
               childDef,
               errors,
+              issues,
               existingChild,
               piiEnforcement,
               logger
@@ -1978,7 +2031,7 @@ function validateRefField(parentKey, key, value, def, errors, _existing, _piiEnf
     );
   }
 }
-function validateByType(parentKey, key, value, def, errors, existing, piiEnforcement, logger) {
+function validateByType(parentKey, key, value, def, errors, issues, existing, piiEnforcement, logger) {
   const path = parentKey ? `${parentKey}.${key}` : key;
   switch (def.type) {
     case "string":
@@ -1994,6 +2047,7 @@ function validateByType(parentKey, key, value, def, errors, existing, piiEnforce
         value,
         def,
         errors,
+        issues,
         existing,
         piiEnforcement,
         logger
@@ -2005,6 +2059,7 @@ function validateByType(parentKey, key, value, def, errors, existing, piiEnforce
         value,
         def,
         errors,
+        issues,
         existing,
         piiEnforcement,
         logger
@@ -2040,6 +2095,7 @@ function createSchema(_shape, entityType, options = {
     // 🔗 Validate input against the schema
     validate(input, existing) {
       const errors = [];
+      const issues = [];
       const result = {};
       const piiMode = options.piiEnforcement ?? "none";
       if (typeof input !== "object" || input === null) {
@@ -2103,16 +2159,19 @@ function createSchema(_shape, entityType, options = {
         if (shortCircuit) continue;
         const validateField = (val) => {
           const localErrors = [];
+          const localIssues = [];
           const { invalid } = runCustomValidator(
             "",
             key,
             val,
             def,
-            localErrors
+            localErrors,
+            localIssues
           );
           if (!invalid) {
-            validateByType("", key, val, def, localErrors, existingField, piiMode, console);
+            validateByType("", key, val, def, localErrors, localIssues, existingField, piiMode, console);
           }
+          issues.push(...localIssues);
           return localErrors;
         };
         let fieldValue = value;
@@ -2153,7 +2212,8 @@ function createSchema(_shape, entityType, options = {
       return {
         valid: errors.length === 0,
         value: result,
-        errors
+        errors,
+        issues
       };
     },
     // specific validator for a schema to allow conditional validation