kanun 1.0.8 → 1.0.10

package/dist/index.cjs

@@ -3330,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() {
@@ -3338,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

@@ -119,6 +119,7 @@ declare class RequiredIf extends BaseRule {
 //#region src/Contracts/ValidationRuleName.d.ts
 type ValidationRuleAutocompleteKind = 'plain' | 'paramable';
 interface ValidationRuleAutocompleteMap {}
+interface ValidationRuleOutputTypeMap {}
 /**
  * Backward-compatible alias for older plugin augmentations.
  */
@@ -772,7 +773,12 @@ 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 RuleOutputOverride<R> = 'files' extends ExtractRules<R> ? ('files' extends keyof ValidationRuleOutputTypeMap ? ValidationRuleOutputTypeMap['files'] : never) : ValidationRuleOutputTypeMap[Extract<ExtractRules<R>, keyof ValidationRuleOutputTypeMap>];
+type FieldOutputValue<D extends Record<string, any>, K extends string, FieldRules> = K extends keyof D ? [RuleOutputOverride<FieldRules>] extends [never] ? D[K] : D[K] extends RuleOutputOverride<FieldRules> ? D[K] : RuleOutputOverride<FieldRules> : [RuleOutputOverride<FieldRules>] extends [never] ? any : RuleOutputOverride<FieldRules>;
+type ValidatedByRules<D extends Record<string, any>, R extends RulesForData<D>> = ValidatedData<{ [K in RuleOutputKeys<R>]: FieldOutputValue<D, K, K extends keyof R ? R[K] : never> }>;
 /**
  * Flatten data structure into dot-notation keys
  * including wildcards (*) for arrays.
@@ -1197,7 +1203,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<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]: K_1 extends keyof D ? ["files" extends ExtractRules<K_1 extends keyof R ? R[K_1] : never> ? never : ValidationRuleOutputTypeMap[Extract<ExtractRules<K_1 extends keyof R ? R[K_1] : never>, never>]] extends [never] ? D[K_1] : D[K_1] extends ("files" extends ExtractRules<K_1 extends keyof R ? R[K_1] : never> ? never : ValidationRuleOutputTypeMap[Extract<ExtractRules<K_1 extends keyof R ? R[K_1] : never>, never>]) ? D[K_1] : "files" extends ExtractRules<K_1 extends keyof R ? R[K_1] : never> ? never : ValidationRuleOutputTypeMap[Extract<ExtractRules<K_1 extends keyof R ? R[K_1] : never>, never>] : ["files" extends ExtractRules<K_1 extends keyof R ? R[K_1] : never> ? never : ValidationRuleOutputTypeMap[Extract<ExtractRules<K_1 extends keyof R ? R[K_1] : never>, never>]] extends [never] ? any : "files" extends ExtractRules<K_1 extends keyof R ? R[K_1] : never> ? never : ValidationRuleOutputTypeMap[Extract<ExtractRules<K_1 extends keyof R ? R[K_1] : never>, never>] } extends infer T ? { [K in keyof T]: T[K] } : never>;
   /**
    * Stop validation on first failure.
    */
@@ -1217,6 +1223,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.
    */
@@ -1629,4 +1642,4 @@ declare class ValidationException extends Error {
   getResponse(): any;
 }
 //#endregion
-export { BaseValidationRuleClass, BaseValidator, CustomAttributes, CustomErrors, CustomMessages, CustomParamableValidationRuleName, CustomPlainRuleName, CustomValidationRuleNameMap, CustomValidationRules, DotPaths, ErrorBag, ErrorMessage, Errors, ExtendedRules, ExtractRules, FieldMessages, GenericCallable, GenericObject, IDatabaseDriver, IMessageBag, IValidationRule, IValidator, ImplicitAttributes, ImplicitRule, InitialRule, InitialRules, Lang, MessageBag, Messages, MessagesForRules, NestedStringMap, ParamableValidationRuleName, Password, PlainRuleName, ReplaceAttributeInterface, Rules, RulesForData, TRule, ValidatedByRules, ValidationCallback, ValidationDataInterface, ValidationDatabaseExistsInput, ValidationException, ValidationMessageProvider, ValidationRule, ValidationRuleAutocompleteKind, ValidationRuleAutocompleteMap, ValidationRuleCallable, ValidationRuleEntry, ValidationRuleName, ValidationRuleParserInterface, ValidationRuleSet, ValidationServiceProvider, ValidationValueInspector, Validator, ValidatorPlugin, ValidatorPluginApi, addImplicitRule, buildValidationMethodName, compare, convertValuesToBoolean, convertValuesToNull, convertValuesToNumber, deepEqual, deepFind, deepFindMessage, deepSet, definePlugin, dotify, getFormattedAttribute, getKeyCombinations, getMessage, getNumericRules, getSize, getValidationMessageType, getValidationSize, getValidationValueInspector, getValidatorContext, isArrayOfRules, isImplicitRule, isInteger, isNumericRule, isObject, isRule, isSizeRule, make, mergeDeep, notRegex, plural, regex, register, registerImplicit, registerValueInspector, requiredIf, ruleIn, ruleNotIn, runWithValidatorContext, sameType, toDate, toSnakeCase, usePlugin, useValidatorContext };
+export { BaseValidationRuleClass, BaseValidator, CustomAttributes, CustomErrors, CustomMessages, CustomParamableValidationRuleName, CustomPlainRuleName, CustomValidationRuleNameMap, CustomValidationRules, DotPaths, ErrorBag, ErrorMessage, Errors, ExtendedRules, ExtractRules, FieldMessages, GenericCallable, GenericObject, IDatabaseDriver, IMessageBag, IValidationRule, IValidator, ImplicitAttributes, ImplicitRule, InitialRule, InitialRules, Lang, MessageBag, Messages, MessagesForRules, NestedStringMap, ParamableValidationRuleName, Password, PlainRuleName, ReplaceAttributeInterface, Rules, RulesForData, TRule, ValidatedByRules, ValidationCallback, ValidationDataInterface, ValidationDatabaseExistsInput, ValidationException, ValidationMessageProvider, ValidationRule, ValidationRuleAutocompleteKind, ValidationRuleAutocompleteMap, ValidationRuleCallable, ValidationRuleEntry, ValidationRuleName, ValidationRuleOutputTypeMap, ValidationRuleParserInterface, ValidationRuleSet, ValidationServiceProvider, ValidationValueInspector, Validator, ValidatorPlugin, ValidatorPluginApi, addImplicitRule, buildValidationMethodName, compare, convertValuesToBoolean, convertValuesToNull, convertValuesToNumber, deepEqual, deepFind, deepFindMessage, deepSet, definePlugin, dotify, getFormattedAttribute, getKeyCombinations, getMessage, getNumericRules, getSize, getValidationMessageType, getValidationSize, getValidationValueInspector, getValidatorContext, isArrayOfRules, isImplicitRule, isInteger, isNumericRule, isObject, isRule, isSizeRule, make, mergeDeep, notRegex, plural, regex, register, registerImplicit, registerValueInspector, requiredIf, ruleIn, ruleNotIn, runWithValidatorContext, sameType, toDate, toSnakeCase, usePlugin, useValidatorContext };

package/dist/index.js

@@ -3300,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() {
@@ -3308,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.8",
+  "version": "1.0.10",
   "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"
   }
 }