@aeriajs/validation 0.0.125 → 0.0.127

package/dist/validate.d.ts

@@ -3,13 +3,12 @@ import { Result } from '@aeriajs/types';
 import { ValidationErrorCode } from '@aeriajs/types';
 export type ValidateOptions = {
     tolerateExtraneous?: boolean;
-    filterOutExtraneous?: boolean;
     throwOnError?: boolean;
     coerce?: boolean;
     parentProperty?: Omit<Description, '$id'> | Property;
 };
 export declare const makeValidationError: <TValidationError extends ValidationError>(error: TValidationError) => TValidationError;
-export declare const validateProperty: <TWhat>(propName: string, what: TWhat, property: Property | undefined, options?: ValidateOptions) => Result.Either<PropertyValidationError | ValidationError, unknown>;
+export declare const validateProperty: <TWhat>(what: TWhat, property: Property | undefined, options?: ValidateOptions) => Result.Either<PropertyValidationError | ValidationError, unknown>;
 export declare const validateWholeness: (what: Record<string, unknown>, schema: Omit<JsonSchema, "$id">) => {
     code: ValidationErrorCode.MissingProperties;
     errors: {

package/dist/validate.js

@@ -4,11 +4,6 @@ exports.validator = exports.validate = exports.validateWholeness = exports.valid
 const types_1 = require("@aeriajs/types");
 const common_1 = require("@aeriajs/common");
 const types_2 = require("@aeriajs/types");
-const getValueType = (value) => {
-    return Array.isArray(value)
-        ? 'array'
-        : typeof value;
-};
 const getPropertyType = (property) => {
     if ('type' in property) {
         if ('format' in property && property.format) {
@@ -26,9 +21,9 @@ const getPropertyType = (property) => {
     if ('const' in property) {
         return typeof property.const;
     }
-    if ('$ref' in property
-        || 'properties' in property
-        || 'additionalProperties' in property) {
+    if ('properties' in property
+        || 'additionalProperties' in property
+        || '$ref' in property) {
         return 'object';
     }
 };
@@ -42,13 +37,13 @@ const makeValidationError = (error) => {
     return error;
 };
 exports.makeValidationError = makeValidationError;
-const validateProperty = (propName, what, property, options = {}) => {
+const validateProperty = (what, property, options = {}) => {
     if (!property) {
         if (options.parentProperty && 'additionalProperties' in options.parentProperty && options.parentProperty.additionalProperties) {
-            if (options.filterOutExtraneous) {
-                return types_1.Result.result(undefined);
+            if (options.parentProperty.additionalProperties === true) {
+                return types_1.Result.result(what);
             }
-            return types_1.Result.result(what);
+            return (0, exports.validateProperty)(what, options.parentProperty.additionalProperties);
         }
         if (options.tolerateExtraneous) {
             return types_1.Result.result(undefined);
@@ -62,9 +57,10 @@ const validateProperty = (propName, what, property, options = {}) => {
         return types_1.Result.result(undefined);
     }
     const expectedType = getPropertyType(property);
-    const actualType = getValueType(what);
+    const actualType = Array.isArray(what)
+        ? 'array'
+        : typeof what;
     if (actualType !== expectedType
-        && !(('items' in property || 'enum' in property) && actualType === 'array')
         && !(actualType === 'number' && expectedType === 'integer')) {
         if (expectedType === 'datetime' && what instanceof Date) {
             return types_1.Result.result(what);
@@ -96,89 +92,85 @@ const validateProperty = (propName, what, property, options = {}) => {
             got: actualType,
         }));
     }
-    if ('properties' in property) {
-        return (0, exports.validate)(what, property, options);
-    }
-    if ('enum' in property && property.enum.length === 0) {
-        return types_1.Result.result(what);
-    }
-    if ('const' in property) {
-        if (what !== property.const) {
-            return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
-                expected: property.const,
-                got: what,
-            }));
-        }
-        return types_1.Result.result(what);
-    }
-    if ('items' in property) {
-        if (!Array.isArray(what)) {
-            return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
-                expected: expectedType,
-                got: actualType,
-            }));
-        }
-        if (property.minItems) {
-            if (what.length < property.minItems) {
-                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.MoreItemsExpected));
-            }
-        }
-        if (property.maxItems) {
-            if (what.length > property.maxItems) {
-                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.LessItemsExpected));
-            }
-        }
-        let i = 0;
-        for (const elem of what) {
-            const { error } = (0, exports.validateProperty)(propName, elem, property.items, options);
-            if (error) {
-                if ('errors' in error) {
-                    continue;
-                }
-                error.index = i;
-                return types_1.Result.error(error);
-            }
-            i++;
-        }
-    }
-    else if ('type' in property) {
+    if ('type' in property) {
         switch (property.type) {
-            case 'number':
             case 'integer': {
+                if (!Number.isInteger(what)) {
+                    return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
+                        expected: 'integer',
+                        got: 'invalid_number',
+                    }));
+                }
+            }
+            case 'number': {
                 if (typeof what !== 'number') {
                     return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
                         expected: expectedType,
                         got: actualType,
                     }));
                 }
-                if (property.type === 'integer') {
-                    if (!Number.isInteger(what)) {
-                        return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
-                            expected: 'integer',
-                            got: 'invalid_number',
-                        }));
-                    }
-                }
-                if ((property.maximum && property.maximum < what)
-                    || (property.minimum && property.minimum > what)
-                    || (property.exclusiveMaximum && property.exclusiveMaximum <= what)
-                    || (property.exclusiveMinimum && property.exclusiveMinimum >= what)) {
+                if ((typeof property.maximum === 'number' && property.maximum < what)
+                    || (typeof property.minimum === 'number' && property.minimum > what)
+                    || (typeof property.exclusiveMaximum === 'number' && property.exclusiveMaximum <= what)
+                    || (typeof property.exclusiveMinimum === 'number' && property.exclusiveMinimum >= what)) {
                     return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
                         expected: 'number',
                         got: 'invalid_number',
                     }));
                 }
+                break;
+            }
+            case 'object': {
+                return (0, exports.validate)(what, property, options);
+            }
+            case 'array': {
+                if (!Array.isArray(what)) {
+                    return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
+                        expected: expectedType,
+                        got: actualType,
+                    }));
+                }
+                if (property.minItems) {
+                    if (what.length < property.minItems) {
+                        return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.MoreItemsExpected));
+                    }
+                }
+                if (property.maxItems) {
+                    if (what.length > property.maxItems) {
+                        return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.LessItemsExpected));
+                    }
+                }
+                let i = 0;
+                for (const elem of what) {
+                    const { error } = (0, exports.validateProperty)(elem, property.items, options);
+                    if (error) {
+                        if ('errors' in error) {
+                            continue;
+                        }
+                        error.index = i;
+                        return types_1.Result.error(error);
+                    }
+                    i++;
+                }
             }
         }
     }
     else if ('enum' in property) {
-        if (!property.enum.includes(what)) {
+        if (!property.enum.includes(what) && property.enum.length === 0) {
             return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.ExtraneousElement, {
                 expected: property.enum,
                 got: what,
             }));
         }
     }
+    else if ('const' in property) {
+        if (what !== property.const) {
+            return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
+                expected: property.const,
+                got: what,
+            }));
+        }
+    }
     return types_1.Result.result(what);
 };
 exports.validateProperty = validateProperty;
@@ -190,8 +182,7 @@ const validateWholeness = (what, schema) => {
     if (missingProps.length > 0) {
         return (0, exports.makeValidationError)({
             code: types_2.ValidationErrorCode.MissingProperties,
-            errors: Object.fromEntries(missingProps
-                .map((error) => [
+            errors: Object.fromEntries(missingProps.map((error) => [
                 error,
                 {
                     type: 'missing',
@@ -202,47 +193,45 @@ const validateWholeness = (what, schema) => {
 };
 exports.validateWholeness = validateWholeness;
 const validate = (what, schema, options = {}) => {
-    if (!what) {
+    if (what === undefined) {
         return types_1.Result.error((0, exports.makeValidationError)({
             code: types_2.ValidationErrorCode.EmptyTarget,
             errors: {},
         }));
     }
     if (!('properties' in schema)) {
-        const { error } = (0, exports.validateProperty)('', what, schema);
-        return error
-            ? types_1.Result.error(error)
-            : types_1.Result.result(what);
+        const { error } = (0, exports.validateProperty)(what, schema);
+        if (error) {
+            return types_1.Result.error(error);
+        }
+        return types_1.Result.result(what);
     }
     const wholenessError = (0, exports.validateWholeness)(what, schema);
     if (wholenessError) {
         if (options.throwOnError) {
-            throw new Error(types_2.ValidationErrorCode.MissingProperties);
+            throw new TypeError(types_2.ValidationErrorCode.MissingProperties);
         }
         return types_1.Result.error(wholenessError);
     }
     const errors = {};
     const resultCopy = {};
     for (const propName in what) {
-        const { error, result: parsed } = (0, exports.validateProperty)(propName, what[propName], schema.properties[propName], {
+        const { error, result: parsed } = (0, exports.validateProperty)(what[propName], schema.properties[propName], {
             ...options,
             parentProperty: schema,
         });
         if (error) {
+            if (options.throwOnError) {
+                throw new TypeError(types_2.ValidationErrorCode.InvalidProperties);
+            }
             errors[propName] = error;
+            continue;
         }
         if (parsed !== undefined) {
             resultCopy[propName] = parsed;
         }
     }
     if (Object.keys(errors).length > 0) {
-        if (options.throwOnError) {
-            const error = new TypeError(types_2.ValidationErrorCode.InvalidProperties);
-            Object.assign(error, {
-                errors,
-            });
-            throw error;
-        }
         return types_1.Result.error((0, exports.makeValidationError)({
             code: types_2.ValidationErrorCode.InvalidProperties,
             errors,

package/dist/validate.mjs

@@ -2,9 +2,6 @@
 import { Result } from "@aeriajs/types";
 import { getMissingProperties } from "@aeriajs/common";
 import { ValidationErrorCode, PropertyValidationErrorCode } from "@aeriajs/types";
-const getValueType = (value) => {
-  return Array.isArray(value) ? "array" : typeof value;
-};
 const getPropertyType = (property) => {
   if ("type" in property) {
     if ("format" in property && property.format) {
@@ -22,7 +19,7 @@ const getPropertyType = (property) => {
   if ("const" in property) {
     return typeof property.const;
   }
-  if ("$ref" in property || "properties" in property || "additionalProperties" in property) {
+  if ("properties" in property || "additionalProperties" in property || "$ref" in property) {
     return "object";
   }
 };
@@ -35,13 +32,13 @@ const makePropertyError = (type, details) => {
 export const makeValidationError = (error) => {
   return error;
 };
-export const validateProperty = (propName, what, property, options = {}) => {
+export const validateProperty = (what, property, options = {}) => {
   if (!property) {
     if (options.parentProperty && "additionalProperties" in options.parentProperty && options.parentProperty.additionalProperties) {
-      if (options.filterOutExtraneous) {
-        return Result.result(void 0);
+      if (options.parentProperty.additionalProperties === true) {
+        return Result.result(what);
       }
-      return Result.result(what);
+      return validateProperty(what, options.parentProperty.additionalProperties);
     }
     if (options.tolerateExtraneous) {
       return Result.result(void 0);
@@ -55,8 +52,8 @@ export const validateProperty = (propName, what, property, options = {}) => {
     return Result.result(void 0);
   }
   const expectedType = getPropertyType(property);
-  const actualType = getValueType(what);
-  if (actualType !== expectedType && !(("items" in property || "enum" in property) && actualType === "array") && !(actualType === "number" && expectedType === "integer")) {
+  const actualType = Array.isArray(what) ? "array" : typeof what;
+  if (actualType !== expectedType && !(actualType === "number" && expectedType === "integer")) {
     if (expectedType === "datetime" && what instanceof Date) {
       return Result.result(what);
     }
@@ -87,83 +84,79 @@ export const validateProperty = (propName, what, property, options = {}) => {
       got: actualType
     }));
   }
-  if ("properties" in property) {
-    return validate(what, property, options);
-  }
-  if ("enum" in property && property.enum.length === 0) {
-    return Result.result(what);
-  }
-  if ("const" in property) {
-    if (what !== property.const) {
-      return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
-        expected: property.const,
-        got: what
-      }));
-    }
-    return Result.result(what);
-  }
-  if ("items" in property) {
-    if (!Array.isArray(what)) {
-      return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
-        expected: expectedType,
-        got: actualType
-      }));
-    }
-    if (property.minItems) {
-      if (what.length < property.minItems) {
-        return Result.error(makePropertyError(PropertyValidationErrorCode.MoreItemsExpected));
-      }
-    }
-    if (property.maxItems) {
-      if (what.length > property.maxItems) {
-        return Result.error(makePropertyError(PropertyValidationErrorCode.LessItemsExpected));
-      }
-    }
-    let i = 0;
-    for (const elem of what) {
-      const { error } = validateProperty(propName, elem, property.items, options);
-      if (error) {
-        if ("errors" in error) {
-          continue;
-        }
-        error.index = i;
-        return Result.error(error);
-      }
-      i++;
-    }
-  } else if ("type" in property) {
+  if ("type" in property) {
     switch (property.type) {
-      case "number":
       case "integer": {
+        if (!Number.isInteger(what)) {
+          return Result.error(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
+            expected: "integer",
+            got: "invalid_number"
+          }));
+        }
+      }
+      case "number": {
         if (typeof what !== "number") {
           return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
             expected: expectedType,
             got: actualType
           }));
         }
-        if (property.type === "integer") {
-          if (!Number.isInteger(what)) {
-            return Result.error(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
-              expected: "integer",
-              got: "invalid_number"
-            }));
-          }
-        }
-        if (property.maximum && property.maximum < what || property.minimum && property.minimum > what || property.exclusiveMaximum && property.exclusiveMaximum <= what || property.exclusiveMinimum && property.exclusiveMinimum >= what) {
+        if (typeof property.maximum === "number" && property.maximum < what || typeof property.minimum === "number" && property.minimum > what || typeof property.exclusiveMaximum === "number" && property.exclusiveMaximum <= what || typeof property.exclusiveMinimum === "number" && property.exclusiveMinimum >= what) {
           return Result.error(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
             expected: "number",
             got: "invalid_number"
           }));
         }
+        break;
+      }
+      case "object": {
+        return validate(what, property, options);
+      }
+      case "array": {
+        if (!Array.isArray(what)) {
+          return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
+            expected: expectedType,
+            got: actualType
+          }));
+        }
+        if (property.minItems) {
+          if (what.length < property.minItems) {
+            return Result.error(makePropertyError(PropertyValidationErrorCode.MoreItemsExpected));
+          }
+        }
+        if (property.maxItems) {
+          if (what.length > property.maxItems) {
+            return Result.error(makePropertyError(PropertyValidationErrorCode.LessItemsExpected));
+          }
+        }
+        let i = 0;
+        for (const elem of what) {
+          const { error } = validateProperty(elem, property.items, options);
+          if (error) {
+            if ("errors" in error) {
+              continue;
+            }
+            error.index = i;
+            return Result.error(error);
+          }
+          i++;
+        }
       }
     }
   } else if ("enum" in property) {
-    if (!property.enum.includes(what)) {
+    if (!property.enum.includes(what) && property.enum.length === 0) {
       return Result.error(makePropertyError(PropertyValidationErrorCode.ExtraneousElement, {
         expected: property.enum,
         got: what
       }));
     }
+  } else if ("const" in property) {
+    if (what !== property.const) {
+      return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
+        expected: property.const,
+        got: what
+      }));
+    }
   }
   return Result.result(what);
 };
@@ -183,50 +176,45 @@ export const validateWholeness = (what, schema) => {
   }
 };
 export const validate = (what, schema, options = {}) => {
-  if (!what) {
+  if (what === void 0) {
     return Result.error(makeValidationError({
       code: ValidationErrorCode.EmptyTarget,
       errors: {}
     }));
   }
   if (!("properties" in schema)) {
-    const { error } = validateProperty("", what, schema);
-    return error ? Result.error(error) : Result.result(what);
+    const { error } = validateProperty(what, schema);
+    if (error) {
+      return Result.error(error);
+    }
+    return Result.result(what);
   }
   const wholenessError = validateWholeness(what, schema);
   if (wholenessError) {
     if (options.throwOnError) {
-      throw new Error(ValidationErrorCode.MissingProperties);
+      throw new TypeError(ValidationErrorCode.MissingProperties);
     }
     return Result.error(wholenessError);
   }
   const errors = {};
   const resultCopy = {};
   for (const propName in what) {
-    const { error, result: parsed } = validateProperty(
-      propName,
-      what[propName],
-      schema.properties[propName],
-      {
-        ...options,
-        parentProperty: schema
-      }
-    );
+    const { error, result: parsed } = validateProperty(what[propName], schema.properties[propName], {
+      ...options,
+      parentProperty: schema
+    });
     if (error) {
+      if (options.throwOnError) {
+        throw new TypeError(ValidationErrorCode.InvalidProperties);
+      }
       errors[propName] = error;
+      continue;
     }
     if (parsed !== void 0) {
       resultCopy[propName] = parsed;
     }
   }
   if (Object.keys(errors).length > 0) {
-    if (options.throwOnError) {
-      const error = new TypeError(ValidationErrorCode.InvalidProperties);
-      Object.assign(error, {
-        errors
-      });
-      throw error;
-    }
     return Result.error(makeValidationError({
       code: ValidationErrorCode.InvalidProperties,
       errors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/validation",
-  "version": "0.0.125",
+  "version": "0.0.127",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",