kanun 1.0.7 → 1.0.9

package/dist/index.cjs

@@ -2301,7 +2301,6 @@ var BaseValidator = class BaseValidator {
 	*/
 	withContext(context = {}) {
 		this.context = context;
-		this.addRules(this.initalRules);
 		return this;
 	}
 	/**
@@ -2552,8 +2551,7 @@ var BaseValidator = class BaseValidator {
 	* Parse the given rules add assign them to the current rules
 	*/
 	addRules(rules) {
-		const availableData = mergeDeep(this.getContext().requestFiles ?? {}, this.data);
-		const response = validationRuleParser.explodeRules(dotify(rules, true), availableData);
+		const response = validationRuleParser.explodeRules(dotify(rules, true), this.data);
 		this.rules = response.rules;
 		this.implicitAttributes = response.implicitAttributes;
 	}
@@ -2660,17 +2658,11 @@ 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);
-		const fileValue = deepFind(this.getContext().requestFiles ?? {}, attribute);
-		if (typeof fileValue !== "undefined" && (typeof dataValue === "undefined" || dataValue === null || dataValue === "")) return fileValue;
-		return dataValue;
+		if (typeof dataValue !== "undefined") return dataValue;
+		return deepFind(this.getContext().requestFiles ?? {}, attribute);
 	}
 	/**
 	* Get the primary attribute name
@@ -3338,6 +3330,19 @@ var Validator = class Validator {
 		};
 	}
 	/**
+	* Prefer request-scoped uploaded files over scalar placeholder body values.
+	* 
+	* @param attribute 
+	* @returns 
+	*/
+	getValidatedAttributeValue(attribute) {
+		const dataValue = deepFind(this.data, attribute);
+		const requestFileValue = deepFind(this.getContext().requestFiles ?? {}, attribute);
+		if (typeof requestFileValue === "undefined") return dataValue;
+		if (typeof dataValue === "undefined" || dataValue === null || typeof dataValue === "string" || typeof dataValue === "number" || typeof dataValue === "boolean") return requestFileValue;
+		return dataValue;
+	}
+	/**
 	* Get the data that passed validation.
 	*/
 	validatedData() {
@@ -3346,8 +3351,7 @@ var Validator = class Validator {
 		const clean = {};
 		for (const key of validKeys) {
 			if (excluded.has(key)) continue;
-			const value = deepFind(this.data, key);
-			const resolvedValue = typeof value !== "undefined" ? value : deepFind(this.getContext().requestFiles ?? {}, key);
+			const resolvedValue = this.getValidatedAttributeValue(key);
 			if (typeof resolvedValue !== "undefined") deepSet(clean, key, resolvedValue);
 		}
 		return clean;

package/dist/index.d.ts

@@ -610,11 +610,6 @@ 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;
   /**
@@ -777,7 +772,10 @@ declare abstract class IValidationRule {
  * Parse rule names from rule string or string[] definitions
  */
 type ExtractRules<R> = R extends string ? R extends `${infer Head}|${infer Tail}` ? Head extends `${infer Rule}:${string}` ? Rule | ExtractRules<Tail> : Head | ExtractRules<Tail> : R extends `${infer Rule}:${string}` ? Rule : R : R extends string[] ? ExtractRules<R[number]> : never;
-type ValidatedByRules<D extends Record<string, any>, R extends RulesForData<D>> = { [K in Extract<keyof R, keyof D>]: D[K] };
+type ValidatedData<T> = { [K in keyof T]: T[K] };
+type RuleOutputKey<T extends string> = T extends `${infer Root}.*${string}` ? Root : T extends `${infer Root}.${string}` ? Root : T;
+type RuleOutputKeys<R extends Record<string, any>> = RuleOutputKey<Extract<keyof R, string>>;
+type ValidatedByRules<D extends Record<string, any>, R extends RulesForData<D>> = ValidatedData<{ [K in Extract<RuleOutputKeys<R>, keyof D>]: D[K] } & { [K in Exclude<RuleOutputKeys<R>, keyof D>]: any }>;
 /**
  * Flatten data structure into dot-notation keys
  * including wildcards (*) for arrays.
@@ -1202,7 +1200,7 @@ declare class Validator<D extends Record<string, any> = any, R extends RulesForD
    * @param bagName
    * @returns
    */
-  validateWithBag(bagName: string): Promise<ValidatedByRules<D, R>>;
+  validateWithBag(bagName: string): Promise<{ [K_1 in Extract<Extract<keyof R, string> extends infer T_1 ? T_1 extends Extract<keyof R, string> ? T_1 extends `${infer Root}.*${string}` ? Root : T_1 extends `${infer Root_1}.${string}` ? Root_1 : T_1 : never : never, keyof D>]: D[K_1] } & { [K_2 in Exclude<Extract<keyof R, string> extends infer T_2 ? T_2 extends Extract<keyof R, string> ? T_2 extends `${infer Root}.*${string}` ? Root : T_2 extends `${infer Root_1}.${string}` ? Root_1 : T_2 : never : never, keyof D>]: any } extends infer T ? { [K in keyof T]: T[K] } : never>;
   /**
    * Stop validation on first failure.
    */
@@ -1222,6 +1220,13 @@ declare class Validator<D extends Record<string, any> = any, R extends RulesForD
    * @returns The current context object
    */
   getContext(): Record<string, any>;
+  /**
+   * Prefer request-scoped uploaded files over scalar placeholder body values.
+   *
+   * @param attribute
+   * @returns
+   */
+  private getValidatedAttributeValue;
   /**
    * Get the data that passed validation.
    */

package/dist/index.js

@@ -2271,7 +2271,6 @@ var BaseValidator = class BaseValidator {
 	*/
 	withContext(context = {}) {
 		this.context = context;
-		this.addRules(this.initalRules);
 		return this;
 	}
 	/**
@@ -2522,8 +2521,7 @@ var BaseValidator = class BaseValidator {
 	* Parse the given rules add assign them to the current rules
 	*/
 	addRules(rules) {
-		const availableData = mergeDeep(this.getContext().requestFiles ?? {}, this.data);
-		const response = validationRuleParser.explodeRules(dotify(rules, true), availableData);
+		const response = validationRuleParser.explodeRules(dotify(rules, true), this.data);
 		this.rules = response.rules;
 		this.implicitAttributes = response.implicitAttributes;
 	}
@@ -2630,17 +2628,11 @@ 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);
-		const fileValue = deepFind(this.getContext().requestFiles ?? {}, attribute);
-		if (typeof fileValue !== "undefined" && (typeof dataValue === "undefined" || dataValue === null || dataValue === "")) return fileValue;
-		return dataValue;
+		if (typeof dataValue !== "undefined") return dataValue;
+		return deepFind(this.getContext().requestFiles ?? {}, attribute);
 	}
 	/**
 	* Get the primary attribute name
@@ -3308,6 +3300,19 @@ var Validator = class Validator {
 		};
 	}
 	/**
+	* Prefer request-scoped uploaded files over scalar placeholder body values.
+	* 
+	* @param attribute 
+	* @returns 
+	*/
+	getValidatedAttributeValue(attribute) {
+		const dataValue = deepFind(this.data, attribute);
+		const requestFileValue = deepFind(this.getContext().requestFiles ?? {}, attribute);
+		if (typeof requestFileValue === "undefined") return dataValue;
+		if (typeof dataValue === "undefined" || dataValue === null || typeof dataValue === "string" || typeof dataValue === "number" || typeof dataValue === "boolean") return requestFileValue;
+		return dataValue;
+	}
+	/**
 	* Get the data that passed validation.
 	*/
 	validatedData() {
@@ -3316,8 +3321,7 @@ var Validator = class Validator {
 		const clean = {};
 		for (const key of validKeys) {
 			if (excluded.has(key)) continue;
-			const value = deepFind(this.data, key);
-			const resolvedValue = typeof value !== "undefined" ? value : deepFind(this.getContext().requestFiles ?? {}, key);
+			const resolvedValue = this.getValidatedAttributeValue(key);
 			if (typeof resolvedValue !== "undefined") deepSet(clean, key, resolvedValue);
 		}
 		return clean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kanun",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Framework-agnostic TypeScript-first validation library.",
   "type": "module",
   "files": [
@@ -44,11 +44,13 @@
     "@types/multer": "^2.1.0",
     "@types/node": "^20.11.0",
     "@vitest/coverage-v8": "4.0.18",
+    "axios": "^1.13.6",
     "barrelize": "^1.7.4",
     "eslint": "^10.0.2",
     "express": "^5.2.1",
     "fastify": "^5.8.2",
     "h3": "2.0.1-rc.16",
+    "happy-dom": "^20.8.4",
     "hono": "^4.12.8",
     "multer": "^2.1.1",
     "tsdown": "0.21.0-beta.2",
@@ -64,6 +66,7 @@
   "scripts": {
     "lint": "eslint",
     "test": "vitest",
+    "test:browser": "vitest --project browser",
     "test:file-plugin": "vitest --watch=false tests/file-plugin-validator.test.ts",
     "test:coverage": "vitest --coverage --watch=false",
     "build": "tsdown",
@@ -73,6 +76,7 @@
     "barrel": "barrelize",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
+    "docs:preview": "vitepress preview docs",
+    "publish:packages": "pnpm publish --filter './packages/*' --access public"
   }
 }