@aeriajs/validation 0.0.57 → 0.0.58

package/dist/validate.d.ts

@@ -1,5 +1,5 @@
 import type { Either, JsonSchema, Property, InferSchema, Description, PropertyValidationError, ValidationError } from '@aeriajs/types';
-import { ValidationErrorCodes } from '@aeriajs/types';
+import { ValidationErrorCode } from '@aeriajs/types';
 export type ValidateOptions = {
     extraneous?: string[] | boolean;
     filterOutExtraneous?: boolean;
@@ -7,9 +7,9 @@ export type ValidateOptions = {
     coerce?: boolean;
 };
 export declare const makeValidationError: <TValidationError extends ValidationError>(error: TValidationError) => TValidationError;
-export declare const validateProperty: (propName: string, what: any, property: Property | undefined, options?: ValidateOptions) => Either<PropertyValidationError | ValidationError, any>;
+export declare const validateProperty: <TWhat>(propName: string, what: TWhat, property: Property | undefined, options?: ValidateOptions) => Either<PropertyValidationError | ValidationError, any>;
 export declare const validateWholeness: (what: Record<string, any>, schema: Omit<JsonSchema, '$id'>) => {
-    code: ValidationErrorCodes.MissingProperties;
+    code: ValidationErrorCode.MissingProperties;
     errors: {
         [k: string]: {
             type: "missing";
@@ -17,6 +17,4 @@ export declare const validateWholeness: (what: Record<string, any>, schema: Omit
     };
 } | undefined;
 export declare const validate: <TWhat, const TJsonSchema extends Property | Omit<Description, "$id">>(what: TWhat | undefined, schema: TJsonSchema, options?: ValidateOptions) => import("@aeriajs/types").Left<PropertyValidationError | ValidationError> | import("@aeriajs/types").Right<InferSchema<TJsonSchema>>;
-export declare const validateSilently: <TWhat, const TJsonSchema extends Property | Omit<Description, "$id">>(what: TWhat | undefined, schema: TJsonSchema, options?: ValidateOptions) => InferSchema<TJsonSchema> | null;
 export declare const validator: <const TJsonSchema extends Property | Omit<Description, "$id">>(schema: TJsonSchema, options?: ValidateOptions) => readonly [InferSchema<TJsonSchema>, <TWhat>(what: TWhat) => import("@aeriajs/types").Left<PropertyValidationError | ValidationError> | import("@aeriajs/types").Right<InferSchema<TJsonSchema>>];
-export declare const silentValidator: <const TJsonSchema extends Property | Omit<Description, "$id">>(schema: TJsonSchema, options?: ValidateOptions) => readonly [InferSchema<TJsonSchema>, <TWhat>(what: TWhat) => InferSchema<TJsonSchema> | null];

package/dist/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.silentValidator = exports.validator = exports.validateSilently = exports.validate = exports.validateWholeness = exports.validateProperty = exports.makeValidationError = void 0;
+exports.validator = exports.validate = exports.validateWholeness = exports.validateProperty = exports.makeValidationError = void 0;
 const common_1 = require("@aeriajs/common");
 const types_1 = require("@aeriajs/types");
 const getValueType = (value) => {
@@ -51,7 +51,7 @@ const validateProperty = (propName, what, property, options = {}) => {
             }
             return (0, common_1.right)(what);
         }
-        return (0, common_1.left)(makePropertyError('extraneous', {
+        return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.Extraneous, {
             expected: 'undefined',
             got: getValueType(what),
         }));
@@ -64,7 +64,7 @@ const validateProperty = (propName, what, property, options = {}) => {
     }
     if ('const' in property) {
         if (what !== property.const) {
-            return (0, common_1.left)(makePropertyError('unmatching', {
+            return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
                 expected: property.const,
                 got: what,
             }));
@@ -85,34 +85,40 @@ const validateProperty = (propName, what, property, options = {}) => {
         if (expectedType === 'boolean' && !what) {
             return (0, common_1.right)(what);
         }
-        if ('$ref' in property && actualType === 'string') {
+        if ('$ref' in property && typeof what === 'string') {
             if (/^[0-9a-fA-F]{24}$/.test(what)) {
                 return (0, common_1.right)(what);
             }
         }
         if (coerce) {
-            if (expectedType === 'number' && actualType === 'string') {
+            if (expectedType === 'number' && typeof what === 'string') {
                 const coerced = parseFloat(what);
                 if (!isNaN(coerced)) {
                     return (0, common_1.right)(coerced);
                 }
             }
-            if (expectedType === 'integer' && actualType === 'string') {
+            if (expectedType === 'integer' && typeof what === 'string') {
                 const coerced = parseInt(what);
                 if (!isNaN(coerced)) {
                     return (0, common_1.right)(coerced);
                 }
             }
-            if (expectedType === 'string' && actualType === 'number') {
+            if (expectedType === 'string' && typeof what === 'number') {
                 return (0, common_1.right)(String(what));
             }
         }
-        return (0, common_1.left)(makePropertyError('unmatching', {
+        return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
             expected: expectedType,
             got: actualType,
         }));
     }
     if ('items' in property) {
+        if (!Array.isArray(what)) {
+            return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
+                expected: expectedType,
+                got: actualType,
+            }));
+        }
         let i = 0;
         for (const elem of what) {
             const resultEither = (0, exports.validateProperty)(propName, elem, property.items, options);
@@ -130,18 +136,24 @@ const validateProperty = (propName, what, property, options = {}) => {
     else if ('type' in property) {
         if (property.type === 'integer') {
             if (!Number.isInteger(what)) {
-                return (0, common_1.left)(makePropertyError('numeric_constraint', {
+                return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.NumericConstraint, {
                     expected: 'integer',
                     got: 'invalid_number',
                 }));
             }
         }
         if (property.type === 'integer' || property.type === 'number') {
+            if (typeof what !== 'number') {
+                return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
+                    expected: expectedType,
+                    got: actualType,
+                }));
+            }
             if ((property.maximum && property.maximum < what)
                 || (property.minimum && property.minimum > what)
                 || (property.exclusiveMaximum && property.exclusiveMaximum <= what)
                 || (property.exclusiveMinimum && property.exclusiveMinimum >= what)) {
-                return (0, common_1.left)(makePropertyError('numeric_constraint', {
+                return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.NumericConstraint, {
                     expected: 'number',
                     got: 'invalid_number',
                 }));
@@ -150,7 +162,7 @@ const validateProperty = (propName, what, property, options = {}) => {
     }
     else if ('enum' in property) {
         if (!property.enum.includes(what)) {
-            return (0, common_1.left)(makePropertyError('extraneous_element', {
+            return (0, common_1.left)(makePropertyError(types_1.PropertyValidationErrorCode.ExtraneousElement, {
                 expected: property.enum,
                 got: what,
             }));
@@ -166,7 +178,7 @@ const validateWholeness = (what, schema) => {
     const missingProps = (0, common_1.getMissingProperties)(what, schema, required);
     if (missingProps.length > 0) {
         return (0, exports.makeValidationError)({
-            code: types_1.ValidationErrorCodes.MissingProperties,
+            code: types_1.ValidationErrorCode.MissingProperties,
             errors: Object.fromEntries(missingProps
                 .map((error) => [
                 error,
@@ -181,7 +193,7 @@ exports.validateWholeness = validateWholeness;
 const validate = (what, schema, options = {}) => {
     if (!what) {
         return (0, common_1.left)((0, exports.makeValidationError)({
-            code: types_1.ValidationErrorCodes.EmptyTarget,
+            code: types_1.ValidationErrorCode.EmptyTarget,
             errors: {},
         }));
     }
@@ -210,27 +222,20 @@ const validate = (what, schema, options = {}) => {
     }
     if (Object.keys(errors).length > 0) {
         if (options.throwOnError) {
-            const error = new TypeError(types_1.ValidationErrorCodes.InvalidProperties);
+            const error = new TypeError(types_1.ValidationErrorCode.InvalidProperties);
             Object.assign(error, {
                 errors,
             });
             throw error;
         }
         return (0, common_1.left)((0, exports.makeValidationError)({
-            code: types_1.ValidationErrorCodes.InvalidProperties,
+            code: types_1.ValidationErrorCode.InvalidProperties,
             errors,
         }));
     }
     return (0, common_1.right)(resultCopy);
 };
 exports.validate = validate;
-const validateSilently = (what, schema, options = {}) => {
-    const resultEither = (0, exports.validate)(what, schema, options);
-    return (0, common_1.isLeft)(resultEither)
-        ? null
-        : (0, common_1.unwrapEither)(resultEither);
-};
-exports.validateSilently = validateSilently;
 const validator = (schema, options = {}) => {
     return [
         {},
@@ -240,12 +245,3 @@ const validator = (schema, options = {}) => {
     ];
 };
 exports.validator = validator;
-const silentValidator = (schema, options = {}) => {
-    return [
-        {},
-        (what) => {
-            return (0, exports.validateSilently)(what, schema, options);
-        },
-    ];
-};
-exports.silentValidator = silentValidator;

package/dist/validate.mjs

@@ -1,6 +1,6 @@
 "use strict";
 import { isLeft, left, right, unwrapEither, getMissingProperties } from "@aeriajs/common";
-import { ValidationErrorCodes } from "@aeriajs/types";
+import { ValidationErrorCode, PropertyValidationErrorCode } from "@aeriajs/types";
 const getValueType = (value) => {
   return Array.isArray(value) ? "array" : typeof value;
 };
@@ -44,7 +44,7 @@ export const validateProperty = (propName, what, property, options = {}) => {
       }
       return right(what);
     }
-    return left(makePropertyError("extraneous", {
+    return left(makePropertyError(PropertyValidationErrorCode.Extraneous, {
       expected: "undefined",
       got: getValueType(what)
     }));
@@ -57,7 +57,7 @@ export const validateProperty = (propName, what, property, options = {}) => {
   }
   if ("const" in property) {
     if (what !== property.const) {
-      return left(makePropertyError("unmatching", {
+      return left(makePropertyError(PropertyValidationErrorCode.Unmatching, {
         expected: property.const,
         got: what
       }));
@@ -76,34 +76,40 @@ export const validateProperty = (propName, what, property, options = {}) => {
     if (expectedType === "boolean" && !what) {
       return right(what);
     }
-    if ("$ref" in property && actualType === "string") {
+    if ("$ref" in property && typeof what === "string") {
       if (/^[0-9a-fA-F]{24}$/.test(what)) {
         return right(what);
       }
     }
     if (coerce) {
-      if (expectedType === "number" && actualType === "string") {
+      if (expectedType === "number" && typeof what === "string") {
         const coerced = parseFloat(what);
         if (!isNaN(coerced)) {
           return right(coerced);
         }
       }
-      if (expectedType === "integer" && actualType === "string") {
+      if (expectedType === "integer" && typeof what === "string") {
         const coerced = parseInt(what);
         if (!isNaN(coerced)) {
           return right(coerced);
         }
       }
-      if (expectedType === "string" && actualType === "number") {
+      if (expectedType === "string" && typeof what === "number") {
         return right(String(what));
       }
     }
-    return left(makePropertyError("unmatching", {
+    return left(makePropertyError(PropertyValidationErrorCode.Unmatching, {
       expected: expectedType,
       got: actualType
     }));
   }
   if ("items" in property) {
+    if (!Array.isArray(what)) {
+      return left(makePropertyError(PropertyValidationErrorCode.Unmatching, {
+        expected: expectedType,
+        got: actualType
+      }));
+    }
     let i = 0;
     for (const elem of what) {
       const resultEither = validateProperty(propName, elem, property.items, options);
@@ -120,15 +126,21 @@ export const validateProperty = (propName, what, property, options = {}) => {
   } else if ("type" in property) {
     if (property.type === "integer") {
       if (!Number.isInteger(what)) {
-        return left(makePropertyError("numeric_constraint", {
+        return left(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
           expected: "integer",
           got: "invalid_number"
         }));
       }
     }
     if (property.type === "integer" || property.type === "number") {
+      if (typeof what !== "number") {
+        return left(makePropertyError(PropertyValidationErrorCode.Unmatching, {
+          expected: expectedType,
+          got: actualType
+        }));
+      }
       if (property.maximum && property.maximum < what || property.minimum && property.minimum > what || property.exclusiveMaximum && property.exclusiveMaximum <= what || property.exclusiveMinimum && property.exclusiveMinimum >= what) {
-        return left(makePropertyError("numeric_constraint", {
+        return left(makePropertyError(PropertyValidationErrorCode.NumericConstraint, {
           expected: "number",
           got: "invalid_number"
         }));
@@ -136,7 +148,7 @@ export const validateProperty = (propName, what, property, options = {}) => {
     }
   } else if ("enum" in property) {
     if (!property.enum.includes(what)) {
-      return left(makePropertyError("extraneous_element", {
+      return left(makePropertyError(PropertyValidationErrorCode.ExtraneousElement, {
         expected: property.enum,
         got: what
       }));
@@ -149,7 +161,7 @@ export const validateWholeness = (what, schema) => {
   const missingProps = getMissingProperties(what, schema, required);
   if (missingProps.length > 0) {
     return makeValidationError({
-      code: ValidationErrorCodes.MissingProperties,
+      code: ValidationErrorCode.MissingProperties,
       errors: Object.fromEntries(missingProps.map((error) => [
         error,
         {
@@ -162,7 +174,7 @@ export const validateWholeness = (what, schema) => {
 export const validate = (what, schema, options = {}) => {
   if (!what) {
     return left(makeValidationError({
-      code: ValidationErrorCodes.EmptyTarget,
+      code: ValidationErrorCode.EmptyTarget,
       errors: {}
     }));
   }
@@ -194,23 +206,19 @@ export const validate = (what, schema, options = {}) => {
   }
   if (Object.keys(errors).length > 0) {
     if (options.throwOnError) {
-      const error = new TypeError(ValidationErrorCodes.InvalidProperties);
+      const error = new TypeError(ValidationErrorCode.InvalidProperties);
       Object.assign(error, {
         errors
       });
       throw error;
     }
     return left(makeValidationError({
-      code: ValidationErrorCodes.InvalidProperties,
+      code: ValidationErrorCode.InvalidProperties,
       errors
     }));
   }
   return right(resultCopy);
 };
-export const validateSilently = (what, schema, options = {}) => {
-  const resultEither = validate(what, schema, options);
-  return isLeft(resultEither) ? null : unwrapEither(resultEither);
-};
 export const validator = (schema, options = {}) => {
   return [
     {},
@@ -219,11 +227,3 @@ export const validator = (schema, options = {}) => {
     }
   ];
 };
-export const silentValidator = (schema, options = {}) => {
-  return [
-    {},
-    (what) => {
-      return validateSilently(what, schema, options);
-    }
-  ];
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/validation",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,8 +26,8 @@
     "@aeriajs/types": "link:../types"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.54",
-    "@aeriajs/types": "^0.0.51"
+    "@aeriajs/common": "^0.0.55",
+    "@aeriajs/types": "^0.0.52"
   },
   "scripts": {
     "test": "env TS_NODE_COMPILER_OPTIONS=\"$(cat ../compilerOptions.json)\" mocha -r ts-node/register tests/*.spec.ts",