@aeriajs/validation 0.0.71 → 0.0.72

package/dist/validate.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchema, Property, InferSchema, Description, PropertyValidationError, ValidationError } from '@aeriajs/types';
-import { Result } from '@aeriajs/common';
+import { Result } from '@aeriajs/types';
 import { ValidationErrorCode } from '@aeriajs/types';
 export type ValidateOptions = {
     extraneous?: string[] | boolean;

package/dist/validate.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 common_1 = require("@aeriajs/common");
+const types_2 = require("@aeriajs/types");
 const getValueType = (value) => {
     return Array.isArray(value)
         ? 'array'
@@ -42,79 +43,79 @@ exports.makeValidationError = makeValidationError;
 const validateProperty = (propName, what, property, options = {}) => {
     const { extraneous, filterOutExtraneous, coerce } = options;
     if (what === undefined) {
-        return common_1.Result.result(what);
+        return types_1.Result.result(what);
     }
     if (!property) {
         if (extraneous || (Array.isArray(extraneous) && extraneous.includes(propName))) {
             if (filterOutExtraneous) {
-                return common_1.Result.result(undefined);
+                return types_1.Result.result(undefined);
             }
-            return common_1.Result.result(what);
+            return types_1.Result.result(what);
         }
-        return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.Extraneous, {
+        return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Extraneous, {
             expected: 'undefined',
             got: getValueType(what),
         }));
     }
     if ('getter' in property) {
-        return common_1.Result.result(undefined);
+        return types_1.Result.result(undefined);
     }
     if ('properties' in property) {
         return (0, exports.validate)(what, property, options);
     }
     if ('const' in property) {
         if (what !== property.const) {
-            return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
+            return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
                 expected: property.const,
                 got: what,
             }));
         }
-        return common_1.Result.result(what);
+        return types_1.Result.result(what);
     }
     const expectedType = getPropertyType(property);
     const actualType = getValueType(what);
     if ('enum' in property && property.enum.length === 0) {
-        return common_1.Result.result(what);
+        return types_1.Result.result(what);
     }
     if (actualType !== expectedType
         && !('items' in property && actualType === 'array')
         && !(actualType === 'number' && expectedType === 'integer')) {
         if (expectedType === 'datetime' && what instanceof Date) {
-            return common_1.Result.result(what);
+            return types_1.Result.result(what);
         }
         if (expectedType === 'boolean' && !what) {
-            return common_1.Result.result(what);
+            return types_1.Result.result(what);
         }
         if ('$ref' in property && typeof what === 'string') {
             if (/^[0-9a-fA-F]{24}$/.test(what)) {
-                return common_1.Result.result(what);
+                return types_1.Result.result(what);
             }
         }
         if (coerce) {
             if (expectedType === 'number' && typeof what === 'string') {
                 const coerced = parseFloat(what);
                 if (!isNaN(coerced)) {
-                    return common_1.Result.result(coerced);
+                    return types_1.Result.result(coerced);
                 }
             }
             if (expectedType === 'integer' && typeof what === 'string') {
                 const coerced = parseInt(what);
                 if (!isNaN(coerced)) {
-                    return common_1.Result.result(coerced);
+                    return types_1.Result.result(coerced);
                 }
             }
             if (expectedType === 'string' && typeof what === 'number') {
-                return common_1.Result.result(String(what));
+                return types_1.Result.result(String(what));
             }
         }
-        return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
+        return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
             expected: expectedType,
             got: actualType,
         }));
     }
     if ('items' in property) {
         if (!Array.isArray(what)) {
-            return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
+            return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
                 expected: expectedType,
                 got: actualType,
             }));
@@ -127,7 +128,7 @@ const validateProperty = (propName, what, property, options = {}) => {
                     continue;
                 }
                 error.index = i;
-                return common_1.Result.error(error);
+                return types_1.Result.error(error);
             }
             i++;
         }
@@ -135,7 +136,7 @@ const validateProperty = (propName, what, property, options = {}) => {
     else if ('type' in property) {
         if (property.type === 'integer') {
             if (!Number.isInteger(what)) {
-                return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.NumericConstraint, {
+                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
                     expected: 'integer',
                     got: 'invalid_number',
                 }));
@@ -143,7 +144,7 @@ const validateProperty = (propName, what, property, options = {}) => {
         }
         if (property.type === 'integer' || property.type === 'number') {
             if (typeof what !== 'number') {
-                return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.Unmatching, {
+                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
                     expected: expectedType,
                     got: actualType,
                 }));
@@ -152,7 +153,7 @@ const validateProperty = (propName, what, property, options = {}) => {
                 || (property.minimum && property.minimum > what)
                 || (property.exclusiveMaximum && property.exclusiveMaximum <= what)
                 || (property.exclusiveMinimum && property.exclusiveMinimum >= what)) {
-                return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.NumericConstraint, {
+                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.NumericConstraint, {
                     expected: 'number',
                     got: 'invalid_number',
                 }));
@@ -161,13 +162,13 @@ const validateProperty = (propName, what, property, options = {}) => {
     }
     else if ('enum' in property) {
         if (!property.enum.includes(what)) {
-            return common_1.Result.error(makePropertyError(types_1.PropertyValidationErrorCode.ExtraneousElement, {
+            return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.ExtraneousElement, {
                 expected: property.enum,
                 got: what,
             }));
         }
     }
-    return common_1.Result.result(what);
+    return types_1.Result.result(what);
 };
 exports.validateProperty = validateProperty;
 const validateWholeness = (what, schema) => {
@@ -177,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.ValidationErrorCode.MissingProperties,
+            code: types_2.ValidationErrorCode.MissingProperties,
             errors: Object.fromEntries(missingProps
                 .map((error) => [
                 error,
@@ -191,20 +192,20 @@ const validateWholeness = (what, schema) => {
 exports.validateWholeness = validateWholeness;
 const validate = (what, schema, options = {}) => {
     if (!what) {
-        return common_1.Result.error((0, exports.makeValidationError)({
-            code: types_1.ValidationErrorCode.EmptyTarget,
+        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
-            ? common_1.Result.error(error)
-            : common_1.Result.result(what);
+            ? types_1.Result.error(error)
+            : types_1.Result.result(what);
     }
     const wholenessError = (0, exports.validateWholeness)(what, schema);
     if (wholenessError) {
-        return common_1.Result.error(wholenessError);
+        return types_1.Result.error(wholenessError);
     }
     const errors = {};
     const resultCopy = {};
@@ -219,18 +220,18 @@ const validate = (what, schema, options = {}) => {
     }
     if (Object.keys(errors).length > 0) {
         if (options.throwOnError) {
-            const error = new TypeError(types_1.ValidationErrorCode.InvalidProperties);
+            const error = new TypeError(types_2.ValidationErrorCode.InvalidProperties);
             Object.assign(error, {
                 errors,
             });
             throw error;
         }
-        return common_1.Result.error((0, exports.makeValidationError)({
-            code: types_1.ValidationErrorCode.InvalidProperties,
+        return types_1.Result.error((0, exports.makeValidationError)({
+            code: types_2.ValidationErrorCode.InvalidProperties,
             errors,
         }));
     }
-    return common_1.Result.result(resultCopy);
+    return types_1.Result.result(resultCopy);
 };
 exports.validate = validate;
 const validator = (schema, options = {}) => {

package/dist/validate.mjs

@@ -1,5 +1,6 @@
 "use strict";
-import { Result, getMissingProperties } from "@aeriajs/common";
+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;

package/package.json

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