kanun 1.0.5 → 1.0.7

package/dist/index.cjs

@@ -1470,8 +1470,9 @@ var validateAttributes = class {
 	}
 	getAttributeValue(attribute) {
 		const dataValue = deepFind(this.data, attribute);
-		if (typeof dataValue !== "undefined") return dataValue;
-		return deepFind(this.context.requestFiles ?? {}, attribute);
+		const fileValue = deepFind(this.context.requestFiles ?? {}, attribute);
+		if (typeof fileValue !== "undefined" && (typeof dataValue === "undefined" || dataValue === null || dataValue === "")) return fileValue;
+		return dataValue;
 	}
 	getDistinctValues(primaryAttribute) {
 		const gathered = validationData.initializeAndGatherData(primaryAttribute, this.data);
@@ -2067,11 +2068,12 @@ var Password$1 = class Password$1 extends IRuleContract {
 	* Determine if the validation rule passes.
 	*/
 	passes(value, attribute) {
-		const validator = new BaseValidator(this.data, { [attribute]: [
+		const passwordRules = [
 			"string",
 			`min:${this.minLength}`,
 			...this.customRules
-		] }, this.validator.customMessages, this.validator.customAttributes).setLang(this.lang);
+		];
+		const validator = new BaseValidator(this.data, { [attribute]: passwordRules }, this.validator.customMessages, this.validator.customAttributes).setLang(this.lang);
 		if (!validator.validate()) {
 			const errors = validator.errors().addErrorTypes().get(attribute);
 			for (const key in errors) this.validator.errors().add(attribute, errors[key]);
@@ -2299,6 +2301,7 @@ var BaseValidator = class BaseValidator {
 	*/
 	withContext(context = {}) {
 		this.context = context;
+		this.addRules(this.initalRules);
 		return this;
 	}
 	/**
@@ -2549,7 +2552,8 @@ var BaseValidator = class BaseValidator {
 	* Parse the given rules add assign them to the current rules
 	*/
 	addRules(rules) {
-		const response = validationRuleParser.explodeRules(dotify(rules, true), this.data);
+		const availableData = mergeDeep(this.getContext().requestFiles ?? {}, this.data);
+		const response = validationRuleParser.explodeRules(dotify(rules, true), availableData);
 		this.rules = response.rules;
 		this.implicitAttributes = response.implicitAttributes;
 	}
@@ -2656,11 +2660,17 @@ var BaseValidator = class BaseValidator {
 	}
 	/**
 	* Resolve an attribute value from validator data first, then request-scoped file context.
+	* When the data value is empty (null or empty string), prefer a file from requestFiles
+	* because framework body-parsers commonly set file input fields to '' or null.
+	* 
+	* @param attribute 
+	* @returns 
 	*/
 	getAttributeValue(attribute) {
 		const dataValue = deepFind(this.data, attribute);
-		if (typeof dataValue !== "undefined") return dataValue;
-		return deepFind(this.getContext().requestFiles ?? {}, attribute);
+		const fileValue = deepFind(this.getContext().requestFiles ?? {}, attribute);
+		if (typeof fileValue !== "undefined" && (typeof dataValue === "undefined" || dataValue === null || dataValue === "")) return fileValue;
+		return dataValue;
 	}
 	/**
 	* Get the primary attribute name

package/dist/index.d.ts

@@ -610,6 +610,11 @@ declare class BaseValidator<D extends GenericObject = GenericObject> {
   private isNotNullIfMarkedAsNullable;
   /**
    * Resolve an attribute value from validator data first, then request-scoped file context.
+   * When the data value is empty (null or empty string), prefer a file from requestFiles
+   * because framework body-parsers commonly set file input fields to '' or null.
+   *
+   * @param attribute
+   * @returns
    */
   private getAttributeValue;
   /**

package/dist/index.js

@@ -1440,8 +1440,9 @@ var validateAttributes = class {
 	}
 	getAttributeValue(attribute) {
 		const dataValue = deepFind(this.data, attribute);
-		if (typeof dataValue !== "undefined") return dataValue;
-		return deepFind(this.context.requestFiles ?? {}, attribute);
+		const fileValue = deepFind(this.context.requestFiles ?? {}, attribute);
+		if (typeof fileValue !== "undefined" && (typeof dataValue === "undefined" || dataValue === null || dataValue === "")) return fileValue;
+		return dataValue;
 	}
 	getDistinctValues(primaryAttribute) {
 		const gathered = validationData.initializeAndGatherData(primaryAttribute, this.data);
@@ -2037,11 +2038,12 @@ var Password$1 = class Password$1 extends IRuleContract {
 	* Determine if the validation rule passes.
 	*/
 	passes(value, attribute) {
-		const validator = new BaseValidator(this.data, { [attribute]: [
+		const passwordRules = [
 			"string",
 			`min:${this.minLength}`,
 			...this.customRules
-		] }, this.validator.customMessages, this.validator.customAttributes).setLang(this.lang);
+		];
+		const validator = new BaseValidator(this.data, { [attribute]: passwordRules }, this.validator.customMessages, this.validator.customAttributes).setLang(this.lang);
 		if (!validator.validate()) {
 			const errors = validator.errors().addErrorTypes().get(attribute);
 			for (const key in errors) this.validator.errors().add(attribute, errors[key]);
@@ -2269,6 +2271,7 @@ var BaseValidator = class BaseValidator {
 	*/
 	withContext(context = {}) {
 		this.context = context;
+		this.addRules(this.initalRules);
 		return this;
 	}
 	/**
@@ -2519,7 +2522,8 @@ var BaseValidator = class BaseValidator {
 	* Parse the given rules add assign them to the current rules
 	*/
 	addRules(rules) {
-		const response = validationRuleParser.explodeRules(dotify(rules, true), this.data);
+		const availableData = mergeDeep(this.getContext().requestFiles ?? {}, this.data);
+		const response = validationRuleParser.explodeRules(dotify(rules, true), availableData);
 		this.rules = response.rules;
 		this.implicitAttributes = response.implicitAttributes;
 	}
@@ -2626,11 +2630,17 @@ var BaseValidator = class BaseValidator {
 	}
 	/**
 	* Resolve an attribute value from validator data first, then request-scoped file context.
+	* When the data value is empty (null or empty string), prefer a file from requestFiles
+	* because framework body-parsers commonly set file input fields to '' or null.
+	* 
+	* @param attribute 
+	* @returns 
 	*/
 	getAttributeValue(attribute) {
 		const dataValue = deepFind(this.data, attribute);
-		if (typeof dataValue !== "undefined") return dataValue;
-		return deepFind(this.getContext().requestFiles ?? {}, attribute);
+		const fileValue = deepFind(this.getContext().requestFiles ?? {}, attribute);
+		if (typeof fileValue !== "undefined" && (typeof dataValue === "undefined" || dataValue === null || dataValue === "")) return fileValue;
+		return dataValue;
 	}
 	/**
 	* Get the primary attribute name

package/package.json

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