kanun 1.0.2 → 1.0.4

package/dist/index.cjs

@@ -49,10 +49,12 @@ function getValidatorContext() {
 * @returns 
 */
 function useValidatorContext(context = {}) {
-	const nextContext = {
-		...getValidatorContext(),
-		...context
-	};
+	const currentContext = validatorContextStorage.getStore();
+	if (currentContext) {
+		Object.assign(currentContext, context);
+		return currentContext;
+	}
+	const nextContext = { ...context };
 	validatorContextStorage.enterWith(nextContext);
 	return nextContext;
 }
@@ -1087,6 +1089,7 @@ var validateAttributes = class {
 	*/
 	validateRequired(value) {
 		if (value === null || typeof value === "undefined") return false;
+		else if (typeof Blob !== "undefined" && value instanceof Blob) return true;
 		else if (typeof value === "string" && value.trim() === "") return false;
 		else if (Array.isArray(value) && value.length < 1) return false;
 		else if (typeof value === "object" && Object.keys(value).length < 1) return false;
@@ -2355,7 +2358,7 @@ var BaseValidator = class BaseValidator {
 		[rule, parameters] = validationRuleParser.parse(rule);
 		const keys = this.getExplicitKeys(attribute);
 		if (keys.length > 0 && parameters.length > 0) parameters = this.replaceAsterisksInParameters(parameters, keys);
-		const value = deepFind(this.data, attribute);
+		const value = this.getAttributeValue(attribute);
 		const validatable = this.isValidatable(attribute, value, rule);
 		if (rule instanceof IRuleContract) return validatable ? this.validateUsingCustomRule(attribute, value, rule) : void 0;
 		const method = `validate${buildValidationMethodName(rule)}`;
@@ -2423,14 +2426,14 @@ var BaseValidator = class BaseValidator {
 	* Determine if the attribute is validatable.
 	*/
 	isValidatable(attribute, value, rule) {
-		return this.presentOrRuleIsImplicit(attribute, value, rule) && this.passesOptionalCheck(attribute) && this.isNotNullIfMarkedAsNullable(attribute, rule);
+		return this.presentOrRuleIsImplicit(attribute, value, rule) && this.passesOptionalCheck(attribute) && this.isNotNullIfMarkedAsNullable(attribute, value, rule);
 	}
 	/**
 	* Determine if the field is present, or the rule implies required.
 	*/
 	presentOrRuleIsImplicit(attribute, value, rule) {
 		if (typeof value === "string" && value.trim() === "") return isImplicitRule(rule);
-		return typeof deepFind(this.data, attribute) !== "undefined" || isImplicitRule(rule);
+		return typeof value !== "undefined" || isImplicitRule(rule);
 	}
 	/**
 	* Determine if the attribute passes any optional check.
@@ -2438,14 +2441,23 @@ var BaseValidator = class BaseValidator {
 	passesOptionalCheck(attribute) {
 		if (!validationRuleParser.hasRule(attribute, ["sometimes"], this.rules)) return true;
 		const data = validationData.initializeAndGatherData(attribute, this.data);
-		return Object.prototype.hasOwnProperty.call(data, attribute) || Object.prototype.hasOwnProperty.call(this.data, attribute);
+		const requestFiles = validationData.initializeAndGatherData(attribute, this.getContext().requestFiles ?? {});
+		return Object.prototype.hasOwnProperty.call(data, attribute) || Object.prototype.hasOwnProperty.call(this.data, attribute) || Object.prototype.hasOwnProperty.call(requestFiles, attribute) || Object.prototype.hasOwnProperty.call(this.getContext().requestFiles ?? {}, attribute);
 	}
 	/**
 	* Determine if the attribute fails the nullable check.
 	*/
-	isNotNullIfMarkedAsNullable(attribute, rule) {
+	isNotNullIfMarkedAsNullable(attribute, value, rule) {
 		if (isImplicitRule(rule) || !validationRuleParser.hasRule(attribute, ["nullable"], this.rules)) return true;
-		return deepFind(this.data, attribute) !== null;
+		return value !== null;
+	}
+	/**
+	* Resolve an attribute value from validator data first, then request-scoped file context.
+	*/
+	getAttributeValue(attribute) {
+		const dataValue = deepFind(this.data, attribute);
+		if (typeof dataValue !== "undefined") return dataValue;
+		return deepFind(this.getContext().requestFiles ?? {}, attribute);
 	}
 	/**
 	* Get the primary attribute name

package/dist/index.d.ts

@@ -603,6 +603,10 @@ declare class BaseValidator<D extends GenericObject = GenericObject> {
    * Determine if the attribute fails the nullable check.
    */
   private isNotNullIfMarkedAsNullable;
+  /**
+   * Resolve an attribute value from validator data first, then request-scoped file context.
+   */
+  private getAttributeValue;
   /**
    * Get the primary attribute name
    *

package/dist/index.js

@@ -19,10 +19,12 @@ function getValidatorContext() {
 * @returns 
 */
 function useValidatorContext(context = {}) {
-	const nextContext = {
-		...getValidatorContext(),
-		...context
-	};
+	const currentContext = validatorContextStorage.getStore();
+	if (currentContext) {
+		Object.assign(currentContext, context);
+		return currentContext;
+	}
+	const nextContext = { ...context };
 	validatorContextStorage.enterWith(nextContext);
 	return nextContext;
 }
@@ -1057,6 +1059,7 @@ var validateAttributes = class {
 	*/
 	validateRequired(value) {
 		if (value === null || typeof value === "undefined") return false;
+		else if (typeof Blob !== "undefined" && value instanceof Blob) return true;
 		else if (typeof value === "string" && value.trim() === "") return false;
 		else if (Array.isArray(value) && value.length < 1) return false;
 		else if (typeof value === "object" && Object.keys(value).length < 1) return false;
@@ -2325,7 +2328,7 @@ var BaseValidator = class BaseValidator {
 		[rule, parameters] = validationRuleParser.parse(rule);
 		const keys = this.getExplicitKeys(attribute);
 		if (keys.length > 0 && parameters.length > 0) parameters = this.replaceAsterisksInParameters(parameters, keys);
-		const value = deepFind(this.data, attribute);
+		const value = this.getAttributeValue(attribute);
 		const validatable = this.isValidatable(attribute, value, rule);
 		if (rule instanceof IRuleContract) return validatable ? this.validateUsingCustomRule(attribute, value, rule) : void 0;
 		const method = `validate${buildValidationMethodName(rule)}`;
@@ -2393,14 +2396,14 @@ var BaseValidator = class BaseValidator {
 	* Determine if the attribute is validatable.
 	*/
 	isValidatable(attribute, value, rule) {
-		return this.presentOrRuleIsImplicit(attribute, value, rule) && this.passesOptionalCheck(attribute) && this.isNotNullIfMarkedAsNullable(attribute, rule);
+		return this.presentOrRuleIsImplicit(attribute, value, rule) && this.passesOptionalCheck(attribute) && this.isNotNullIfMarkedAsNullable(attribute, value, rule);
 	}
 	/**
 	* Determine if the field is present, or the rule implies required.
 	*/
 	presentOrRuleIsImplicit(attribute, value, rule) {
 		if (typeof value === "string" && value.trim() === "") return isImplicitRule(rule);
-		return typeof deepFind(this.data, attribute) !== "undefined" || isImplicitRule(rule);
+		return typeof value !== "undefined" || isImplicitRule(rule);
 	}
 	/**
 	* Determine if the attribute passes any optional check.
@@ -2408,14 +2411,23 @@ var BaseValidator = class BaseValidator {
 	passesOptionalCheck(attribute) {
 		if (!validationRuleParser.hasRule(attribute, ["sometimes"], this.rules)) return true;
 		const data = validationData.initializeAndGatherData(attribute, this.data);
-		return Object.prototype.hasOwnProperty.call(data, attribute) || Object.prototype.hasOwnProperty.call(this.data, attribute);
+		const requestFiles = validationData.initializeAndGatherData(attribute, this.getContext().requestFiles ?? {});
+		return Object.prototype.hasOwnProperty.call(data, attribute) || Object.prototype.hasOwnProperty.call(this.data, attribute) || Object.prototype.hasOwnProperty.call(requestFiles, attribute) || Object.prototype.hasOwnProperty.call(this.getContext().requestFiles ?? {}, attribute);
 	}
 	/**
 	* Determine if the attribute fails the nullable check.
 	*/
-	isNotNullIfMarkedAsNullable(attribute, rule) {
+	isNotNullIfMarkedAsNullable(attribute, value, rule) {
 		if (isImplicitRule(rule) || !validationRuleParser.hasRule(attribute, ["nullable"], this.rules)) return true;
-		return deepFind(this.data, attribute) !== null;
+		return value !== null;
+	}
+	/**
+	* Resolve an attribute value from validator data first, then request-scoped file context.
+	*/
+	getAttributeValue(attribute) {
+		const dataValue = deepFind(this.data, attribute);
+		if (typeof dataValue !== "undefined") return dataValue;
+		return deepFind(this.getContext().requestFiles ?? {}, attribute);
 	}
 	/**
 	* Get the primary attribute name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kanun",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Framework-agnostic TypeScript-first validation library.",
   "type": "module",
   "files": [