@aeriajs/validation 0.0.89 → 0.0.90

package/dist/validate.d.ts

@@ -2,10 +2,10 @@ import type { JsonSchema, Property, InferSchema, Description, PropertyValidation
 import { Result } from '@aeriajs/types';
 import { ValidationErrorCode } from '@aeriajs/types';
 export type ValidateOptions = {
-    extraneous?: string[] | 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>;

package/dist/validate.js

@@ -41,14 +41,18 @@ const makeValidationError = (error) => {
 };
 exports.makeValidationError = makeValidationError;
 const validateProperty = (propName, what, property, options = {}) => {
-    const { extraneous, filterOutExtraneous, coerce } = options;
+    const { filterOutExtraneous, coerce } = options;
     if (what === undefined) {
         return types_1.Result.result(what);
     }
     if (!property) {
-        if (extraneous || (Array.isArray(extraneous) && extraneous.includes(propName))) {
-            if (filterOutExtraneous) {
-                return types_1.Result.result(undefined);
+        if (options.parentProperty && 'additionalProperties' in options.parentProperty && options.parentProperty.additionalProperties) {
+            const extraneous = options.parentProperty.additionalProperties;
+            if (typeof extraneous === 'boolean' || Object.keys(extraneous).includes(propName)) {
+                if (filterOutExtraneous) {
+                    return types_1.Result.result(undefined);
+                }
+                return types_1.Result.result(what);
             }
             return types_1.Result.result(what);
         }
@@ -210,7 +214,10 @@ 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], options);
+        const { error, result: parsed } = (0, exports.validateProperty)(propName, what[propName], schema.properties[propName], {
+            ...options,
+            parentProperty: schema,
+        });
         if (error) {
             errors[propName] = error;
         }

package/dist/validate.mjs

@@ -34,14 +34,18 @@ export const makeValidationError = (error) => {
   return error;
 };
 export const validateProperty = (propName, what, property, options = {}) => {
-  const { extraneous, filterOutExtraneous, coerce } = options;
+  const { filterOutExtraneous, coerce } = options;
   if (what === void 0) {
     return Result.result(what);
   }
   if (!property) {
-    if (extraneous || Array.isArray(extraneous) && extraneous.includes(propName)) {
-      if (filterOutExtraneous) {
-        return Result.result(void 0);
+    if (options.parentProperty && "additionalProperties" in options.parentProperty && options.parentProperty.additionalProperties) {
+      const extraneous = options.parentProperty.additionalProperties;
+      if (typeof extraneous === "boolean" || Object.keys(extraneous).includes(propName)) {
+        if (filterOutExtraneous) {
+          return Result.result(void 0);
+        }
+        return Result.result(what);
       }
       return Result.result(what);
     }
@@ -193,7 +197,10 @@ export const validate = (what, schema, options = {}) => {
       propName,
       what[propName],
       schema.properties[propName],
-      options
+      {
+        ...options,
+        parentProperty: schema
+      }
     );
     if (error) {
       errors[propName] = error;

package/package.json

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