npm - @aeriajs/validation - Versions diffs - 0.0.134 → 0.0.135 - Mend

@aeriajs/validation 0.0.134 → 0.0.135

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/validate.d.ts CHANGED Viewed

@@ -9,7 +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 validateRefs: <TWhat>(what: TWhat, property: Property | Description, 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 CHANGED Viewed

@@ -190,53 +190,51 @@ const validateProperty = (what, property, options = {}) => {
 };
 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);
+    if ('$ref' in property) {
+        let description;
+        if (descriptions) {
+            description = descriptions[property.$ref];
         }
-        else if ('items' in property) {
-            if (!Array.isArray(what)) {
+        else {
+            const collection = await (0, entrypoint_1.getCollection)(property.$ref);
+            if (!collection) {
                 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);
-                }
-            }
+            description = collection.description;
         }
-        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 (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);
             }
-            if (Object.keys(errors).length > 0) {
-                return types_1.Result.error((0, exports.makeValidationError)({
-                    code: types_2.ValidationErrorCode.InvalidProperties,
-                    errors,
-                }));
+        }
+    }
+    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({});
 };

package/dist/validate.mjs CHANGED Viewed

@@ -178,50 +178,48 @@ 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)) {
+  if ("$ref" in property) {
+    let description;
+    if (descriptions) {
+      description = descriptions[property.$ref];
+    } else {
+      const collection = await getCollection(property.$ref);
+      if (!collection) {
         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;
-        }
+      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);
       }
-      if (Object.keys(errors).length > 0) {
-        return Result.error(makeValidationError({
-          code: ValidationErrorCode.InvalidProperties,
-          errors
-        }));
+    }
+  } 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({});
 };

package/package.json CHANGED Viewed

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