@aeriajs/validation 0.0.126 → 0.0.127

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) {
@@ -45,7 +40,7 @@ exports.makeValidationError = makeValidationError;
 const validateProperty = (what, property, options = {}) => {
     if (!property) {
         if (options.parentProperty && 'additionalProperties' in options.parentProperty && options.parentProperty.additionalProperties) {
-            if (typeof options.parentProperty.additionalProperties === 'boolean') {
+            if (options.parentProperty.additionalProperties === true) {
                 return types_1.Result.result(what);
             }
             return (0, exports.validateProperty)(what, options.parentProperty.additionalProperties);
@@ -62,7 +57,9 @@ const validateProperty = (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
         && !(actualType === 'number' && expectedType === 'integer')) {
         if (expectedType === 'datetime' && what instanceof Date) {
@@ -185,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',
@@ -197,7 +193,7 @@ 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: {},
@@ -205,14 +201,15 @@ const validate = (what, schema, options = {}) => {
     }
     if (!('properties' in schema)) {
         const { error } = (0, exports.validateProperty)(what, schema);
-        return error
-            ? types_1.Result.error(error)
-            : types_1.Result.result(what);
+        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);
     }
@@ -224,20 +221,17 @@ const validate = (what, schema, 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) {
@@ -38,13 +35,10 @@ export const makeValidationError = (error) => {
 export const validateProperty = (what, property, options = {}) => {
   if (!property) {
     if (options.parentProperty && "additionalProperties" in options.parentProperty && options.parentProperty.additionalProperties) {
-      if (typeof options.parentProperty.additionalProperties === "boolean") {
+      if (options.parentProperty.additionalProperties === true) {
         return Result.result(what);
       }
-      return validateProperty(
-        what,
-        options.parentProperty.additionalProperties
-      );
+      return validateProperty(what, options.parentProperty.additionalProperties);
     }
     if (options.tolerateExtraneous) {
       return Result.result(void 0);
@@ -58,7 +52,7 @@ export const validateProperty = (what, property, options = {}) => {
     return Result.result(void 0);
   }
   const expectedType = getPropertyType(property);
-  const actualType = getValueType(what);
+  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);
@@ -182,7 +176,7 @@ 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: {}
@@ -190,12 +184,15 @@ export const validate = (what, schema, options = {}) => {
   }
   if (!("properties" in schema)) {
     const { error } = validateProperty(what, schema);
-    return error ? Result.error(error) : Result.result(what);
+    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);
   }
@@ -207,20 +204,17 @@ export const validate = (what, schema, 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.126",
+  "version": "0.0.127",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",