@aeriajs/validation 0.0.132 → 0.0.134

package/dist/validate.d.ts

@@ -9,6 +9,7 @@ export type ValidateOptions = {
 };
 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>;
+export declare const validateRefs: <TWhat>(what: TWhat, property: Property | undefined, descriptions?: Record<string, Description>) => Promise<Result.Either<PropertyValidationError | ValidationError, unknown>>;
 export declare const validateWholeness: (what: Record<string, unknown>, schema: Omit<JsonSchema, "$id">) => {
     code: ValidationErrorCode.MissingProperties;
     errors: {

package/dist/validate.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validator = exports.validate = exports.validateWholeness = exports.validateProperty = exports.makeValidationError = void 0;
+exports.validator = 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");
+const entrypoint_1 = require("@aeriajs/entrypoint");
 const getPropertyType = (property) => {
     if ('type' in property) {
         if ('format' in property && property.format) {
@@ -65,9 +66,17 @@ const validateProperty = (what, property, options = {}) => {
         if (expectedType === 'datetime' && what instanceof Date) {
             return types_1.Result.result(what);
         }
-        if ('$ref' in property && typeof what === 'string') {
-            if (/^[0-9a-f]{24}$/.test(what)) {
-                return types_1.Result.result(what);
+        if ('$ref' in property) {
+            switch (typeof what) {
+                case 'string': {
+                    if (/^[0-9a-f]{24}$/.test(what)) {
+                        return types_1.Result.result(what);
+                    }
+                    return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
+                        expected: expectedType,
+                        got: actualType,
+                    }));
+                }
             }
         }
         if (options.coerce) {
@@ -180,6 +189,58 @@ const validateProperty = (what, property, options = {}) => {
     return types_1.Result.result(what);
 };
 exports.validateProperty = validateProperty;
+const validateRefs = async (what, property, descriptions) => {
+    if (property) {
+        if ('$ref' in property) {
+            let description;
+            if (descriptions) {
+                description = descriptions[property.$ref];
+            }
+            else {
+                const collection = await (0, entrypoint_1.getCollection)(property.$ref);
+                if (!collection) {
+                    throw new Error;
+                }
+                description = collection.description;
+            }
+            if (typeof what !== 'object') {
+                return types_1.Result.error(makePropertyError(types_2.PropertyValidationErrorCode.Unmatching, {
+                    expected: 'object',
+                    got: typeof what,
+                }));
+            }
+            return (0, exports.validate)(what, description);
+        }
+        else if ('items' in property) {
+            if (!Array.isArray(what)) {
+                throw new Error;
+            }
+            for (const elem of what) {
+                const { error } = await (0, exports.validateRefs)(elem, property.items, descriptions);
+                if (error) {
+                    return types_1.Result.error(error);
+                }
+            }
+        }
+        else if ('properties' in property) {
+            const errors = {};
+            for (const propName in what) {
+                const { error } = await (0, exports.validateRefs)(what[propName], property.properties[propName], descriptions);
+                if (error) {
+                    errors[propName] = error;
+                }
+            }
+            if (Object.keys(errors).length > 0) {
+                return types_1.Result.error((0, exports.makeValidationError)({
+                    code: types_2.ValidationErrorCode.InvalidProperties,
+                    errors,
+                }));
+            }
+        }
+    }
+    return types_1.Result.result({});
+};
+exports.validateRefs = validateRefs;
 const validateWholeness = (what, schema) => {
     const required = schema.required
         ? schema.required

package/dist/validate.mjs

@@ -2,6 +2,7 @@
 import { Result } from "@aeriajs/types";
 import { getMissingProperties } from "@aeriajs/common";
 import { ValidationErrorCode, PropertyValidationErrorCode } from "@aeriajs/types";
+import { getCollection } from "@aeriajs/entrypoint";
 const getPropertyType = (property) => {
   if ("type" in property) {
     if ("format" in property && property.format) {
@@ -57,9 +58,17 @@ export const validateProperty = (what, property, options = {}) => {
     if (expectedType === "datetime" && what instanceof Date) {
       return Result.result(what);
     }
-    if ("$ref" in property && typeof what === "string") {
-      if (/^[0-9a-f]{24}$/.test(what)) {
-        return Result.result(what);
+    if ("$ref" in property) {
+      switch (typeof what) {
+        case "string": {
+          if (/^[0-9a-f]{24}$/.test(what)) {
+            return Result.result(what);
+          }
+          return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
+            expected: expectedType,
+            got: actualType
+          }));
+        }
       }
     }
     if (options.coerce) {
@@ -168,6 +177,54 @@ export const validateProperty = (what, property, options = {}) => {
   }
   return Result.result(what);
 };
+export const validateRefs = async (what, property, descriptions) => {
+  if (property) {
+    if ("$ref" in property) {
+      let description;
+      if (descriptions) {
+        description = descriptions[property.$ref];
+      } else {
+        const collection = await getCollection(property.$ref);
+        if (!collection) {
+          throw new Error();
+        }
+        description = collection.description;
+      }
+      if (typeof what !== "object") {
+        return Result.error(makePropertyError(PropertyValidationErrorCode.Unmatching, {
+          expected: "object",
+          got: typeof what
+        }));
+      }
+      return validate(what, description);
+    } else if ("items" in property) {
+      if (!Array.isArray(what)) {
+        throw new Error();
+      }
+      for (const elem of what) {
+        const { error } = await validateRefs(elem, property.items, descriptions);
+        if (error) {
+          return Result.error(error);
+        }
+      }
+    } else if ("properties" in property) {
+      const errors = {};
+      for (const propName in what) {
+        const { error } = await validateRefs(what[propName], property.properties[propName], descriptions);
+        if (error) {
+          errors[propName] = error;
+        }
+      }
+      if (Object.keys(errors).length > 0) {
+        return Result.error(makeValidationError({
+          code: ValidationErrorCode.InvalidProperties,
+          errors
+        }));
+      }
+    }
+  }
+  return Result.result({});
+};
 export const validateWholeness = (what, schema) => {
   const required = schema.required ? schema.required : Object.keys(schema.properties);
   const missingProps = getMissingProperties(what, schema, required);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/validation",
-  "version": "0.0.132",
+  "version": "0.0.134",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -23,11 +23,13 @@
   },
   "devDependencies": {
     "@aeriajs/common": "link:../common",
+    "@aeriajs/entrypoint": "link:../entrypoint",
     "@aeriajs/types": "link:../types"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.124",
-    "@aeriajs/types": "^0.0.106",
+    "@aeriajs/common": "^0.0.125",
+    "@aeriajs/entrypoint": "^0.0.128",
+    "@aeriajs/types": "^0.0.107",
     "mongodb": "^6.5.0"
   },
   "scripts": {