@aeriajs/validation 0.0.137 → 0.0.139

package/dist/validate.d.ts

@@ -5,7 +5,7 @@ export type ValidateOptions = {
     tolerateExtraneous?: boolean;
     throwOnError?: boolean;
     coerce?: boolean;
-    parentProperty?: Omit<Description, '$id'> | Property;
+    parentProperty?: Property | Description;
 };
 export declare const makeValidationError: <TValidationError extends ValidationError>(error: TValidationError) => TValidationError;
 export declare const validateProperty: <TWhat>(what: TWhat, property: Property | undefined, options?: ValidateOptions) => Result.Either<PropertyValidationError | ValidationError, unknown>;
@@ -18,7 +18,7 @@ export declare const validateWholeness: (what: Record<string, unknown>, schema:
         };
     };
 } | undefined;
-export declare const validate: <TWhat, const TJsonSchema extends Omit<Description, "$id"> | Property>(what: TWhat | undefined, schema: TJsonSchema, options?: ValidateOptions) => {
+export declare const validate: <TWhat, const TJsonSchema extends Property | Description>(what: TWhat | undefined, schema: TJsonSchema, options?: ValidateOptions) => {
     readonly _tag: "Error";
     readonly error: PropertyValidationError | ValidationError;
     readonly result: undefined;
@@ -27,7 +27,16 @@ export declare const validate: <TWhat, const TJsonSchema extends Omit<Descriptio
     readonly error: undefined;
     readonly result: InferSchema<TJsonSchema, {}>;
 };
-export declare const validator: <const TJsonSchema extends Omit<Description, "$id"> | Property>(schema: TJsonSchema, options?: ValidateOptions) => readonly [InferSchema<TJsonSchema>, <TWhat>(what: TWhat) => {
+export declare const validateWithRefs: <TWhat, const TJsonSchema extends Property | Description>(what: TWhat | undefined, schema: TJsonSchema, options?: ValidateOptions, descriptions?: Record<string, Description>) => Promise<{
+    readonly _tag: "Error";
+    readonly error: PropertyValidationError | ValidationError;
+    readonly result: undefined;
+} | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: InferSchema<TJsonSchema, {}>;
+}>;
+export declare const validator: <const TJsonSchema extends Property | Description>(schema: TJsonSchema, options?: ValidateOptions) => readonly [InferSchema<TJsonSchema>, <TWhat>(what: TWhat) => {
     readonly _tag: "Error";
     readonly error: PropertyValidationError | ValidationError;
     readonly result: undefined;

package/dist/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validator = exports.validate = exports.validateWholeness = exports.validateRefs = exports.validateProperty = exports.makeValidationError = void 0;
+exports.validator = exports.validateWithRefs = exports.validate = exports.validateWholeness = exports.validateRefs = exports.validateProperty = exports.makeValidationError = void 0;
 const types_1 = require("@aeriajs/types");
 const common_1 = require("@aeriajs/common");
 const types_2 = require("@aeriajs/types");
@@ -209,7 +209,7 @@ const validateRefs = async (what, property, options, descriptions) => {
                     got: typeof what,
                 }));
             }
-            return (0, exports.validate)(what, description);
+            return (0, exports.validate)(what, description, options);
         }
         else if ('items' in property) {
             if (!Array.isArray(what)) {
@@ -307,6 +307,14 @@ const validate = (what, schema, options = {}) => {
     return types_1.Result.result(resultCopy);
 };
 exports.validate = validate;
+const validateWithRefs = async (what, schema, options = {}, descriptions) => {
+    const { error: refsError } = await (0, exports.validateRefs)(what, schema, options, descriptions);
+    if (refsError) {
+        return types_1.Result.error(refsError);
+    }
+    return (0, exports.validate)(what, schema, options);
+};
+exports.validateWithRefs = validateWithRefs;
 const validator = (schema, options = {}) => {
     return [
         {},

package/dist/validate.mjs

@@ -196,7 +196,7 @@ export const validateRefs = async (what, property, options, descriptions) => {
           got: typeof what
         }));
       }
-      return validate(what, description);
+      return validate(what, description, options);
     } else if ("items" in property) {
       if (!Array.isArray(what)) {
         throw new Error();
@@ -287,6 +287,13 @@ export const validate = (what, schema, options = {}) => {
   }
   return Result.result(resultCopy);
 };
+export const validateWithRefs = async (what, schema, options = {}, descriptions) => {
+  const { error: refsError } = await validateRefs(what, schema, options, descriptions);
+  if (refsError) {
+    return Result.error(refsError);
+  }
+  return validate(what, schema, options);
+};
 export const validator = (schema, options = {}) => {
   return [
     {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/validation",
-  "version": "0.0.137",
+  "version": "0.0.139",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",