valgen 4.0.0-alpha.6 → 4.0.0

package/esm/rules/string-formats.js

@@ -5,10 +5,10 @@ import { validator } from '../core/index.js';
  * @validator isUUID
  */
 export function isUUID(version, options) {
-    return validator('isUUID', function (input, context) {
+    return validator('isUUID', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validatorJS.isUUID(input, version))
             return input;
-        context.failure(`{{label}} is not a valid UUID${version ? ' v' + version : ''}`);
+        context.fail(_this, `{{label}} is not a valid UUID${version ? ' v' + version : ''}`, input);
     }, options);
 }
 /**
@@ -16,10 +16,10 @@ export function isUUID(version, options) {
  * @validator isEmail
  */
 export function isEmail(options) {
-    return validator('isEmail', function (input, context) {
+    return validator('isEmail', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isEmail(input, options))
             return input;
-        context.failure(`{{label}} is not a valid a EMail`);
+        context.fail(_this, `{{label}} is not a valid a EMail`, input);
     }, options);
 }
 /**
@@ -27,10 +27,10 @@ export function isEmail(options) {
  * @validator isMobilePhone
  */
 export function isMobilePhone(options) {
-    return validator('isMobilePhone', function (input, context) {
+    return validator('isMobilePhone', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isMobilePhone(input, options?.locale, options))
             return input;
-        context.failure(`{{label}} is not a valid a Mobile Phone Number`);
+        context.fail(_this, `{{label}} is not a valid a Mobile Phone Number`, input);
     }, options);
 }
 /**
@@ -38,10 +38,10 @@ export function isMobilePhone(options) {
  * @validator isIP
  */
 export function isIP(version, options) {
-    return validator('isIP', function (input, context) {
+    return validator('isIP', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validatorJS.isIP(input, version))
             return input;
-        context.failure(`{{label}} is not a valid IP${version ? ' v' + version : ''}`);
+        context.fail(_this, `{{label}} is not a valid IP${version ? ' v' + version : ''}`, input);
     }, options);
 }
 /**
@@ -49,10 +49,10 @@ export function isIP(version, options) {
  * @validator isUUID
  */
 export function isIPRange(version, options) {
-    return validator('isIPRange', function (input, context) {
+    return validator('isIPRange', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validatorJS.isIPRange(input, version))
             return input;
-        context.failure(`{{label}} is not a valid IP${version ? ' v' + version : ''} range`);
+        context.fail(_this, `{{label}} is not a valid IP${version ? ' v' + version : ''} range`, input);
     }, options);
 }
 /**
@@ -60,10 +60,10 @@ export function isIPRange(version, options) {
  * @validator isMACAddress
  */
 export function isMACAddress(options) {
-    return validator('isMACAddress', function (input, context) {
+    return validator('isMACAddress', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validatorJS.isMACAddress(input, options))
             return input;
-        context.failure(`{{label}} is not a valid MAC address`);
+        context.fail(_this, `{{label}} is not a valid MAC address`, input);
     }, options);
 }
 /**
@@ -71,10 +71,10 @@ export function isMACAddress(options) {
  * @validator isPort
  */
 export function isPort(options) {
-    return validator('isPort', function (input, context) {
+    return validator('isPort', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validatorJS.isPort(input))
             return input;
-        context.failure(`{{label}} is not a valid port number`);
+        context.fail(_this, `{{label}} is not a valid port number`, input);
     }, options);
 }
 /**
@@ -82,10 +82,10 @@ export function isPort(options) {
  * @validator isURL
  */
 export function isURL(options) {
-    return validator('isURL', function (input, context) {
+    return validator('isURL', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validatorJS.isURL(input, options))
             return input;
-        context.failure(`{{label}} is not a valid URL`);
+        context.fail(_this, `{{label}} is not a valid URL`, input);
     }, options);
 }
 /**
@@ -93,10 +93,10 @@ export function isURL(options) {
  * @validator isBase64
  */
 export function isBase64(options) {
-    return validator('isBase64', function (input, context) {
+    return validator('isBase64', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isBase64(input, options))
             return input;
-        context.failure(`{{label}} is not a valid a Base64 string`);
+        context.fail(_this, `{{label}} is not a valid a Base64 string`, input);
     }, options);
 }
 /**
@@ -104,10 +104,10 @@ export function isBase64(options) {
  * @validator isBIC
  */
 export function isBIC(options) {
-    return validator('isBIC', function (input, context) {
+    return validator('isBIC', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isBIC(input))
             return input;
-        context.failure(`{{label}}is not a valid a BIC (Bank Identification Code) or SWIFT code`);
+        context.fail(_this, `{{label}}is not a valid a BIC (Bank Identification Code) or SWIFT code`, input);
     }, options);
 }
 /**
@@ -115,10 +115,10 @@ export function isBIC(options) {
  * @validator isCreditCard
  */
 export function isCreditCard(options) {
-    return validator('isCreditCard', function (input, context) {
+    return validator('isCreditCard', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isCreditCard(input, options))
             return input;
-        context.failure(`{{label}} is not a valid Credit Card number`);
+        context.fail(_this, `{{label}} is not a valid Credit Card number`, input);
     }, options);
 }
 /**
@@ -126,10 +126,10 @@ export function isCreditCard(options) {
  * @validator isEAN
  */
 export function isIBAN(options) {
-    return validator('isIBAN', function (input, context) {
+    return validator('isIBAN', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isIBAN(input))
             return input;
-        context.failure(`{{label}} is not a valid IBAN (International Bank Account Number)`);
+        context.fail(_this, `{{label}} is not a valid IBAN (International Bank Account Number)`, input);
     }, options);
 }
 /**
@@ -137,10 +137,10 @@ export function isIBAN(options) {
  * @validator isPassportNumber
  */
 export function isPassportNumber(countryCode, options) {
-    return validator('isPassportNumber', function (input, context) {
+    return validator('isPassportNumber', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isPassportNumber(input, countryCode))
             return input;
-        context.failure(`{{label}} is not a valid ${countryCode} PassportNumber)`);
+        context.fail(_this, `{{label}} is not a valid ${countryCode} PassportNumber)`, input);
     }, options);
 }
 /**
@@ -148,10 +148,10 @@ export function isPassportNumber(countryCode, options) {
  * @validator isEAN
  */
 export function isEAN(options) {
-    return validator('isEAN', function (input, context) {
+    return validator('isEAN', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isEAN(input))
             return input;
-        context.failure(`{{label}} is not a valid EAN (European Article Number)`);
+        context.fail(_this, `{{label}} is not a valid EAN (European Article Number)`, input);
     }, options);
 }
 /**
@@ -159,10 +159,10 @@ export function isEAN(options) {
  * @validator isFQDN
  */
 export function isFQDN(options) {
-    return validator('isFQDN', function (input, context) {
+    return validator('isFQDN', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isFQDN(input, options))
             return input;
-        context.failure(`{{label}} is not valid FQDN`);
+        context.fail(_this, `{{label}} is not valid FQDN`, input);
     }, options);
 }
 /**
@@ -170,10 +170,10 @@ export function isFQDN(options) {
  * @validator isISSN
  */
 export function isISSN(options) {
-    return validator('isISSN', function (input, context) {
+    return validator('isISSN', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isISSN(input, options))
             return input;
-        context.failure(`{{label}} is not a valid ISSN`);
+        context.fail(_this, `{{label}} is not a valid ISSN`, input);
     }, options);
 }
 /**
@@ -181,10 +181,10 @@ export function isISSN(options) {
  * @validator isVAT
  */
 export function isVAT(countryCode, options) {
-    return validator('isVAT', function (input, context) {
+    return validator('isVAT', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isVAT(input, countryCode))
             return input;
-        context.failure(`{{label}} is not a valid VAT number`);
+        context.fail(_this, `{{label}} is not a valid VAT number`, input);
     }, options);
 }
 /**
@@ -192,10 +192,10 @@ export function isVAT(countryCode, options) {
  * @validator isBtcAddress
  */
 export function isBtcAddress(options) {
-    return validator('isBtcAddress', function (input, context) {
+    return validator('isBtcAddress', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isBtcAddress(input))
             return input;
-        context.failure(`{{label}} is not a valid a BTC address`);
+        context.fail(_this, `{{label}} is not a valid a BTC address`, input);
     }, options);
 }
 /**
@@ -203,10 +203,10 @@ export function isBtcAddress(options) {
  * @validator isBtcAddress
  */
 export function isETHAddress(options) {
-    return validator('isETHAddress', function (input, context) {
+    return validator('isETHAddress', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isEthereumAddress(input))
             return input;
-        context.failure(`{{label}} is not a valid a ETH (Ethereum) address`);
+        context.fail(_this, `{{label}} is not a valid a ETH (Ethereum) address`, input);
     }, options);
 }
 /**
@@ -214,10 +214,10 @@ export function isETHAddress(options) {
  * @validator isHash
  */
 export function isHash(algorithm, options) {
-    return validator('isHash', function (input, context) {
+    return validator('isHash', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isHash(input, algorithm))
             return input;
-        context.failure(`{{label}} is not a valid ${algorithm} hash`);
+        context.fail(_this, `{{label}} is not a valid ${algorithm} hash`, input);
     }, options);
 }
 /**
@@ -225,10 +225,10 @@ export function isHash(algorithm, options) {
  * @validator isHexColor
  */
 export function isHexColor(options) {
-    return validator('isHexColor', function (input, context) {
+    return validator('isHexColor', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isHexColor(input))
             return input;
-        context.failure(`{{label}} is not a valid Hex Color`);
+        context.fail(_this, `{{label}} is not a valid Hex Color`, input);
     }, options);
 }
 /**
@@ -236,10 +236,10 @@ export function isHexColor(options) {
  * @validator isHash
  */
 export function isJWT(options) {
-    return validator('isJWT', function (input, context) {
+    return validator('isJWT', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isJWT(input))
             return input;
-        context.failure(`{{label}} is not a valid JWT token`);
+        context.fail(_this, `{{label}} is not a valid JWT token`, input);
     }, options);
 }
 /**
@@ -247,10 +247,10 @@ export function isJWT(options) {
  * @validator isLowercase
  */
 export function isLowercase(options) {
-    return validator('isLowercase', function (input, context) {
+    return validator('isLowercase', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isLowercase(input))
             return input;
-        context.failure(`{{label}} is not a lowercase string`);
+        context.fail(_this, `{{label}} is not a lowercase string`, input);
     }, options);
 }
 /**
@@ -258,9 +258,9 @@ export function isLowercase(options) {
  * @validator isUppercase
  */
 export function isUppercase(options) {
-    return validator('isLowercase', function (input, context) {
+    return validator('isLowercase', function (input, context, _this) {
         if (typeof input === 'string' && validatorJS.isUppercase(input))
             return input;
-        context.failure(`{{label}} is not an uppercase string`);
+        context.fail(_this, `{{label}} is not an uppercase string`, input);
     }, options);
 }

package/esm/rules/union.js

@@ -4,24 +4,29 @@ import { validator } from '../core/index.js';
  */
 export function union(codecs) {
     const l = codecs.length;
-    return validator('union', function (input, context) {
+    return validator('union', function (input, context, _this) {
         let i;
         let c;
         let v;
         let passed = false;
+        // Mock fail method to prevent errors
+        context.fail = () => passed = false;
         for (i = 0; i < l; i++) {
             c = codecs[i];
             try {
-                v = c(input, context);
                 passed = true;
-                break;
+                v = c(input, context);
+                if (passed)
+                    break;
             }
-            catch (e) {
+            catch {
                 //
             }
         }
+        // Restore fail method
+        delete context.fail;
         if (passed)
             return v;
-        context.failure(`{{location}} didn't match any of required format`);
+        context.fail(_this, `{{location}} didn't match any of required format`, input);
     });
 }

package/esm/rules/utilities.js

@@ -1,4 +1,4 @@
-import { isValidator, kValidatorFn, validator } from '../core/index.js';
+import { isValidator, validator } from '../core/index.js';
 /**
  * Forwards codec process to a sub codec. Useful for circular checks
  * @validator forwardRef
@@ -6,7 +6,7 @@ import { isValidator, kValidatorFn, validator } from '../core/index.js';
 export function forwardRef(fn) {
     return validator('forwardRef', function (input, context) {
         const nested = fn(context);
-        return nested[kValidatorFn](input, context, nested);
+        return nested(input, context);
     });
 }
 export function iif(check, _then, _else) {
@@ -20,7 +20,7 @@ export function iif(check, _then, _else) {
             // ignored
         }
         if (isValidator(c))
-            return c[kValidatorFn](input, context, c);
+            return c(input, context);
         return c;
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valgen",
   "description": "Fast runtime type validator, converter and io (encoding/decoding) library",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -12,10 +12,10 @@
     "url": "https://github.com/panates/valgen.git"
   },
   "dependencies": {
-    "@types/validator": "^13.7.17",
+    "@types/validator": "^13.11.1",
     "dayjs": "^2.0.0-alpha.4",
-    "ts-gems": "^2.4.0",
-    "validator": "^13.9.0"
+    "ts-gems": "^2.4.1",
+    "validator": "^13.11.0"
   },
   "type": "module",
   "types": "typings/index.d.ts",

package/typings/core/context.d.ts

@@ -1,26 +1,18 @@
 import type { ErrorIssue, ExecutionOptions, OnFailFunction } from './types';
-import type { Validator } from './validator';
-export declare namespace Context {
-    interface InputDetails {
-        context?: string;
-        root?: string;
-        value?: any;
-        label?: string;
-        location?: string;
-        property?: string | number;
-        [key: string]: any;
-    }
-}
+import type { Validator } from './validator.js';
 export declare class Context implements ExecutionOptions {
-    rule: Validator<any>;
     errors: ErrorIssue[];
     maxErrors?: number;
     onFail?: OnFailFunction;
     coerce?: boolean;
-    input: Context.InputDetails;
-    parent?: Context;
-    root?: Context;
-    constructor(rule: Validator<any>, options?: ExecutionOptions);
-    failure(message: Partial<ErrorIssue> | string | Error): void;
-    extend(rule: Validator<any, any>, options?: ExecutionOptions): Context;
+    root?: string;
+    location?: string;
+    scope?: object;
+    context?: string;
+    property?: string;
+    index?: number;
+    label?: string;
+    constructor(options?: ExecutionOptions);
+    fail(rule: Validator, message: string | Error, value: any, details?: Record<string, any>): void;
+    extend(options?: ExecutionOptions): Context;
 }

package/typings/core/types.d.ts

@@ -1,11 +1,14 @@
 import type { Context } from './context';
 export interface ErrorIssue {
-    rule: string;
     message: string;
+    rule: string;
     value: any;
     root?: string;
+    location?: string;
     context?: string;
     property?: string;
+    index?: number;
+    label?: string;
     [key: string]: any;
 }
 export type OnFailFunction = (issue: ErrorIssue, context: Context, _super?: OnFailFunction) => string | Omit<ErrorIssue, 'id' | 'input'>;

package/typings/core/validator.d.ts

@@ -3,7 +3,7 @@ import { kValidatorFn } from './constants.js';
 import { Context } from './context.js';
 import { ErrorIssue, ExecutionOptions, ValidationOptions } from './types.js';
 export type ValidateFunction<T, I = T, R extends Validator<T, I> = Validator<T, I>> = (input: I, context: Context, _this: R) => Nullish<T>;
-export interface Validator<T, I = unknown, O extends ExecutionOptions = ExecutionOptions> {
+export interface Validator<T = any, I = any, O extends ExecutionOptions = ExecutionOptions> {
     (input: I, options?: O, context?: Context): T;
     silent(input: I, options?: O, context?: Context): {
         value?: T;

package/typings/helpers/omit-undefined.d.ts

@@ -0,0 +1 @@
+export declare function omitUndefined<T>(obj: T, recursive?: boolean): T;

package/typings/rules/is-object.d.ts

@@ -7,7 +7,7 @@ export type ObjectSchema = Record<string | number, Validator<any, any> | [Valida
 export interface IsObjectOptions<T> extends ValidationOptions {
     name?: string;
     ctor?: Type<T>;
-    additionalFields?: boolean | Validator<any, any> | 'ignore';
+    additionalFields?: boolean | Validator<any, any> | 'error';
     caseInSensitive?: boolean;
     detectCircular?: boolean;
 }