@aeriajs/validation 0.0.124 → 0.0.126

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

@@ -12,11 +12,10 @@ const getValueType = (value) => {
 const getPropertyType = (property) => {
     if ('type' in property) {
         if ('format' in property && property.format) {
-            if ([
-                'date',
-                'date-time',
-            ].includes(property.format)) {
-                return 'datetime';
+            switch (property.format) {
+                case 'date':
+                case 'date-time':
+                    return 'datetime';
             }
         }
         return property.type;
@@ -24,9 +23,12 @@ const getPropertyType = (property) => {
     if ('enum' in property) {
         return typeof property.enum[0];
     }
-    if ('$ref' in property
-        || 'properties' in property
-        || 'additionalProperties' in property) {
+    if ('const' in property) {
+        return typeof property.const;
+    }
+    if ('properties' in property
+        || 'additionalProperties' in property
+        || '$ref' in property) {
         return 'object';
     }
 };
@@ -40,13 +42,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 (typeof options.parentProperty.additionalProperties === 'boolean') {
+                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);
@@ -56,34 +58,18 @@ const validateProperty = (propName, what, property, options = {}) => {
     if (what === null || what === undefined) {
         return types_1.Result.result(what);
     }
-    if ('properties' in property) {
-        return (0, exports.validate)(what, property, options);
-    }
-    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 ('enum' in property && property.enum.length === 0) {
-        return types_1.Result.result(what);
-    }
     if ('getter' in property) {
         return types_1.Result.result(undefined);
     }
     const expectedType = getPropertyType(property);
     const actualType = getValueType(what);
     if (actualType !== expectedType
-        && !('items' in property && actualType === 'array')
         && !(actualType === 'number' && expectedType === 'integer')) {
         if (expectedType === 'datetime' && what instanceof Date) {
             return types_1.Result.result(what);
         }
         if ('$ref' in property && typeof what === 'string') {
-            if (/^[0-9a-fA-F]{24}$/.test(what)) {
+            if (/^[0-9a-f]{24}$/.test(what)) {
                 return types_1.Result.result(what);
             }
         }
@@ -109,71 +95,85 @@ const validateProperty = (propName, what, property, options = {}) => {
             got: actualType,
         }));
     }
-    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;
+    if ('type' in property) {
+        switch (property.type) {
+            case 'integer': {
+                if (!Number.isInteger(what)) {
+                    return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
+                        expected: 'integer',
+                        got: 'invalid_number',
+                    }));
                 }
-                error.index = i;
-                return types_1.Result.error(error);
             }
-            i++;
-        }
-    }
-    else if ('type' in property) {
-        if (property.type === '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 ((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;
             }
-        }
-        if (property.type === 'integer' || property.type === 'number') {
-            if (typeof what !== 'number') {
-                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
-                    expected: expectedType,
-                    got: actualType,
-                }));
+            case 'object': {
+                return (0, exports.validate)(what, property, options);
             }
-            if ((property.maximum && property.maximum < what)
-                || (property.minimum && property.minimum > what)
-                || (property.exclusiveMaximum && property.exclusiveMaximum <= what)
-                || (property.exclusiveMinimum && property.exclusiveMinimum >= what)) {
-                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
-                    expected: 'number',
-                    got: 'invalid_number',
-                }));
+            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;
@@ -204,7 +204,7 @@ const validate = (what, schema, options = {}) => {
         }));
     }
     if (!('properties' in schema)) {
-        const { error } = (0, exports.validateProperty)('', what, schema);
+        const { error } = (0, exports.validateProperty)(what, schema);
         return error
             ? types_1.Result.error(error)
             : types_1.Result.result(what);
@@ -219,7 +219,7 @@ const validate = (what, schema, options = {}) => {
     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,
         });

package/dist/validate.mjs

@@ -8,11 +8,10 @@ const getValueType = (value) => {
 const getPropertyType = (property) => {
   if ("type" in property) {
     if ("format" in property && property.format) {
-      if ([
-        "date",
-        "date-time"
-      ].includes(property.format)) {
-        return "datetime";
+      switch (property.format) {
+        case "date":
+        case "date-time":
+          return "datetime";
       }
     }
     return property.type;
@@ -20,7 +19,10 @@ const getPropertyType = (property) => {
   if ("enum" in property) {
     return typeof property.enum[0];
   }
-  if ("$ref" in property || "properties" in property || "additionalProperties" in property) {
+  if ("const" in property) {
+    return typeof property.const;
+  }
+  if ("properties" in property || "additionalProperties" in property || "$ref" in property) {
     return "object";
   }
 };
@@ -33,13 +35,16 @@ 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 (typeof options.parentProperty.additionalProperties === "boolean") {
+        return Result.result(what);
       }
-      return Result.result(what);
+      return validateProperty(
+        what,
+        options.parentProperty.additionalProperties
+      );
     }
     if (options.tolerateExtraneous) {
       return Result.result(void 0);
@@ -49,32 +54,17 @@ export const validateProperty = (propName, what, property, options = {}) => {
   if (what === null || what === void 0) {
     return Result.result(what);
   }
-  if ("properties" in property) {
-    return validate(what, property, options);
-  }
-  if ("const" in property) {
-    if (what !== property.const) {
-      return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
-        expected: property.const,
-        got: what
-      }));
-    }
-    return Result.result(what);
-  }
-  if ("enum" in property && property.enum.length === 0) {
-    return Result.result(what);
-  }
   if ("getter" in property) {
     return Result.result(void 0);
   }
   const expectedType = getPropertyType(property);
   const actualType = getValueType(what);
-  if (actualType !== expectedType && !("items" in property && actualType === "array") && !(actualType === "number" && expectedType === "integer")) {
+  if (actualType !== expectedType && !(actualType === "number" && expectedType === "integer")) {
     if (expectedType === "datetime" && what instanceof Date) {
       return Result.result(what);
     }
     if ("$ref" in property && typeof what === "string") {
-      if (/^[0-9a-fA-F]{24}$/.test(what)) {
+      if (/^[0-9a-f]{24}$/.test(what)) {
         return Result.result(what);
       }
     }
@@ -100,65 +90,79 @@ export const validateProperty = (propName, what, property, options = {}) => {
       got: actualType
     }));
   }
-  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;
+  if ("type" in property) {
+    switch (property.type) {
+      case "integer": {
+        if (!Number.isInteger(what)) {
+          return Result.error(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
+            expected: "integer",
+            got: "invalid_number"
+          }));
         }
-        error.index = i;
-        return Result.error(error);
       }
-      i++;
-    }
-  } else if ("type" in property) {
-    if (property.type === "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 (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;
       }
-    }
-    if (property.type === "integer" || property.type === "number") {
-      if (typeof what !== "number") {
-        return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
-          expected: expectedType,
-          got: actualType
-        }));
+      case "object": {
+        return validate(what, property, options);
       }
-      if (property.maximum && property.maximum < what || property.minimum && property.minimum > what || property.exclusiveMaximum && property.exclusiveMaximum <= what || property.exclusiveMinimum && property.exclusiveMinimum >= what) {
-        return Result.error(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
-          expected: "number",
-          got: "invalid_number"
-        }));
+      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);
 };
@@ -185,7 +189,7 @@ export const validate = (what, schema, options = {}) => {
     }));
   }
   if (!("properties" in schema)) {
-    const { error } = validateProperty("", what, schema);
+    const { error } = validateProperty(what, schema);
     return error ? Result.error(error) : Result.result(what);
   }
   const wholenessError = validateWholeness(what, schema);
@@ -198,15 +202,10 @@ export const validate = (what, schema, options = {}) => {
   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) {
       errors[propName] = error;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/validation",
-  "version": "0.0.124",
+  "version": "0.0.126",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,7 +26,7 @@
     "@aeriajs/types": "link:../types"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.119",
+    "@aeriajs/common": "^0.0.120",
     "@aeriajs/types": "^0.0.102",
     "mongodb": "^6.5.0"
   },