valgen 4.0.0-alpha.6 → 4.0.0

package/cjs/rules/optional.js

@@ -10,7 +10,7 @@ function optional(nested, options) {
     return (0, index_js_1.validator)('optional', function (input, context) {
         if (input == null)
             return input;
-        return nested[index_js_1.kValidatorFn](input, context, nested);
+        return nested(input, context);
     }, options);
 }
 exports.optional = optional;
@@ -19,12 +19,12 @@ exports.optional = optional;
  * @validator required
  */
 function required(nested, options) {
-    return (0, index_js_1.validator)('required', function (input, context) {
+    return (0, index_js_1.validator)('required', function (input, context, _this) {
         if (input == null) {
-            context.failure(`{{label}} is required`);
+            context.fail(_this, `{{label}} is required`, input);
             return;
         }
-        return nested[index_js_1.kValidatorFn](input, context, nested);
+        return nested(input, context);
     }, options);
 }
 exports.required = required;
@@ -33,12 +33,12 @@ exports.required = required;
  * @validator exists
  */
 function exists(options) {
-    return (0, index_js_1.validator)('exists', function (input, context) {
+    return (0, index_js_1.validator)('exists', function (input, context, _this) {
         if (input !== undefined ||
-            (context.input.value && context.parent &&
-                Object.getOwnPropertyDescriptor(context.input.value, context.input.property)))
+            (context.scope &&
+                Object.getOwnPropertyDescriptor(context.scope, input)))
             return input;
-        context.failure(`{{label}} must exist`);
+        context.fail(_this, `{{label}} must exist`, input);
     }, options);
 }
 exports.exists = exists;

package/cjs/rules/pipe.js

@@ -14,8 +14,7 @@ function pipe(...rules) {
         let v = input;
         for (i = 0; i < l; i++) {
             c = rules[i];
-            const subContext = context.extend(c);
-            v = c[index_js_1.kValidatorFn](v, subContext, c);
+            v = c(v, context);
             if (context.errors.length)
                 return;
         }
@@ -34,8 +33,7 @@ function allOf(...rules) {
         const l = rules.length;
         for (i = 0; i < l; i++) {
             c = rules[i];
-            const subContext = context.extend(c);
-            c[index_js_1.kValidatorFn](input, subContext, c);
+            c(input, context);
         }
         return input;
     });

package/cjs/rules/range.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.range = exports.isLte = exports.isLt = exports.isGte = exports.isGt = void 0;
 const index_js_1 = require("../core/index.js");
 function isGt(minValue, options) {
-    return (0, index_js_1.validator)('isGt', function (input, context) {
+    return (0, index_js_1.validator)('isGt', function (input, context, _this) {
         if ((typeof minValue === 'number' || typeof minValue === 'bigint') &&
             (typeof input === 'number' || typeof input === 'bigint') &&
             input > minValue)
@@ -14,12 +14,12 @@ function isGt(minValue, options) {
             (input > minValue ||
                 (options?.caseInsensitive && input.toLowerCase() > minValue.toLowerCase())))
             return input;
-        context.failure(`{{label}} must be greater than ${(typeof minValue === 'string' ? `"${minValue}"` : minValue)}`);
+        context.fail(_this, `{{label}} must be greater than ${(typeof minValue === 'string' ? `"${minValue}"` : minValue)}`, input);
     }, options);
 }
 exports.isGt = isGt;
 function isGte(minValue, options) {
-    return (0, index_js_1.validator)('isGte', function (input, context) {
+    return (0, index_js_1.validator)('isGte', function (input, context, _this) {
         if ((typeof minValue === 'number' || typeof minValue === 'bigint') &&
             (typeof input === 'number' || typeof input === 'bigint') &&
             input >= minValue)
@@ -30,12 +30,12 @@ function isGte(minValue, options) {
             (input >= minValue ||
                 (options?.caseInsensitive && input.toLowerCase() >= minValue.toLowerCase())))
             return input;
-        context.failure(`{{label}} must be greater than or equal to ${(typeof minValue === 'string' ? `"${minValue}"` : minValue)}`);
+        context.fail(_this, `{{label}} must be greater than or equal to ${(typeof minValue === 'string' ? `"${minValue}"` : minValue)}`, input);
     }, options);
 }
 exports.isGte = isGte;
 function isLt(maxValue, options) {
-    return (0, index_js_1.validator)('isLt', function (input, context) {
+    return (0, index_js_1.validator)('isLt', function (input, context, _this) {
         if ((typeof maxValue === 'number' || typeof maxValue === 'bigint') &&
             (typeof input === 'number' || typeof input === 'bigint') &&
             input < maxValue)
@@ -46,12 +46,12 @@ function isLt(maxValue, options) {
             (input < maxValue ||
                 (options?.caseInsensitive && input.toLowerCase() < maxValue.toLowerCase())))
             return input;
-        context.failure(`{{label}} must be lover than ${(typeof maxValue === 'string' ? `"${maxValue}"` : maxValue)}`);
+        context.fail(_this, `{{label}} must be lover than ${(typeof maxValue === 'string' ? `"${maxValue}"` : maxValue)}`, input);
     }, options);
 }
 exports.isLt = isLt;
 function isLte(maxValue, options) {
-    return (0, index_js_1.validator)('isLt', function (input, context) {
+    return (0, index_js_1.validator)('isLt', function (input, context, _this) {
         if ((typeof maxValue === 'number' || typeof maxValue === 'bigint') &&
             (typeof input === 'number' || typeof input === 'bigint') &&
             input <= maxValue)
@@ -62,7 +62,7 @@ function isLte(maxValue, options) {
             (input <= maxValue ||
                 (options?.caseInsensitive && input.toLowerCase() <= maxValue.toLowerCase())))
             return input;
-        context.failure(`{{label}} must be lover than or equal to ${(typeof maxValue === 'string' ? `"${maxValue}"` : maxValue)}`);
+        context.fail(_this, `{{label}} must be lover than or equal to ${(typeof maxValue === 'string' ? `"${maxValue}"` : maxValue)}`, input);
     }, options);
 }
 exports.isLte = isLte;
@@ -71,7 +71,7 @@ exports.isLte = isLte;
  * @validator range
  */
 function range(minValue, maxValue, options) {
-    return (0, index_js_1.validator)('range', function (input, context) {
+    return (0, index_js_1.validator)('range', function (input, context, _this) {
         if ((typeof minValue === 'number' || typeof minValue === 'bigint') &&
             (typeof maxValue === 'number' || typeof maxValue === 'bigint') &&
             (typeof input === 'number' || typeof input === 'bigint') &&
@@ -83,7 +83,7 @@ function range(minValue, maxValue, options) {
         if (typeof minValue === 'string' && typeof maxValue === 'string' &&
             typeof input === 'string' && input >= minValue && input <= maxValue)
             return input;
-        context.failure(`{{label}} must be between ${minValue} and ${maxValue}`);
+        context.fail(_this, `{{label}} must be between ${minValue} and ${maxValue}`, input);
     }, options);
 }
 exports.range = range;

package/cjs/rules/string-formats.js

@@ -11,10 +11,10 @@ const index_js_1 = require("../core/index.js");
  * @validator isUUID
  */
 function isUUID(version, options) {
-    return (0, index_js_1.validator)('isUUID', function (input, context) {
+    return (0, index_js_1.validator)('isUUID', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validator_1.default.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);
 }
 exports.isUUID = isUUID;
@@ -23,10 +23,10 @@ exports.isUUID = isUUID;
  * @validator isEmail
  */
 function isEmail(options) {
-    return (0, index_js_1.validator)('isEmail', function (input, context) {
+    return (0, index_js_1.validator)('isEmail', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isEmail = isEmail;
@@ -35,10 +35,10 @@ exports.isEmail = isEmail;
  * @validator isMobilePhone
  */
 function isMobilePhone(options) {
-    return (0, index_js_1.validator)('isMobilePhone', function (input, context) {
+    return (0, index_js_1.validator)('isMobilePhone', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isMobilePhone = isMobilePhone;
@@ -47,10 +47,10 @@ exports.isMobilePhone = isMobilePhone;
  * @validator isIP
  */
 function isIP(version, options) {
-    return (0, index_js_1.validator)('isIP', function (input, context) {
+    return (0, index_js_1.validator)('isIP', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validator_1.default.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);
 }
 exports.isIP = isIP;
@@ -59,10 +59,10 @@ exports.isIP = isIP;
  * @validator isUUID
  */
 function isIPRange(version, options) {
-    return (0, index_js_1.validator)('isIPRange', function (input, context) {
+    return (0, index_js_1.validator)('isIPRange', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validator_1.default.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);
 }
 exports.isIPRange = isIPRange;
@@ -71,10 +71,10 @@ exports.isIPRange = isIPRange;
  * @validator isMACAddress
  */
 function isMACAddress(options) {
-    return (0, index_js_1.validator)('isMACAddress', function (input, context) {
+    return (0, index_js_1.validator)('isMACAddress', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validator_1.default.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);
 }
 exports.isMACAddress = isMACAddress;
@@ -83,10 +83,10 @@ exports.isMACAddress = isMACAddress;
  * @validator isPort
  */
 function isPort(options) {
-    return (0, index_js_1.validator)('isPort', function (input, context) {
+    return (0, index_js_1.validator)('isPort', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validator_1.default.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);
 }
 exports.isPort = isPort;
@@ -95,10 +95,10 @@ exports.isPort = isPort;
  * @validator isURL
  */
 function isURL(options) {
-    return (0, index_js_1.validator)('isURL', function (input, context) {
+    return (0, index_js_1.validator)('isURL', function (input, context, _this) {
         if (input != null && typeof input === 'string' && validator_1.default.isURL(input, options))
             return input;
-        context.failure(`{{label}} is not a valid URL`);
+        context.fail(_this, `{{label}} is not a valid URL`, input);
     }, options);
 }
 exports.isURL = isURL;
@@ -107,10 +107,10 @@ exports.isURL = isURL;
  * @validator isBase64
  */
 function isBase64(options) {
-    return (0, index_js_1.validator)('isBase64', function (input, context) {
+    return (0, index_js_1.validator)('isBase64', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isBase64 = isBase64;
@@ -119,10 +119,10 @@ exports.isBase64 = isBase64;
  * @validator isBIC
  */
 function isBIC(options) {
-    return (0, index_js_1.validator)('isBIC', function (input, context) {
+    return (0, index_js_1.validator)('isBIC', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isBIC = isBIC;
@@ -131,10 +131,10 @@ exports.isBIC = isBIC;
  * @validator isCreditCard
  */
 function isCreditCard(options) {
-    return (0, index_js_1.validator)('isCreditCard', function (input, context) {
+    return (0, index_js_1.validator)('isCreditCard', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isCreditCard = isCreditCard;
@@ -143,10 +143,10 @@ exports.isCreditCard = isCreditCard;
  * @validator isEAN
  */
 function isIBAN(options) {
-    return (0, index_js_1.validator)('isIBAN', function (input, context) {
+    return (0, index_js_1.validator)('isIBAN', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isIBAN = isIBAN;
@@ -155,10 +155,10 @@ exports.isIBAN = isIBAN;
  * @validator isPassportNumber
  */
 function isPassportNumber(countryCode, options) {
-    return (0, index_js_1.validator)('isPassportNumber', function (input, context) {
+    return (0, index_js_1.validator)('isPassportNumber', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isPassportNumber = isPassportNumber;
@@ -167,10 +167,10 @@ exports.isPassportNumber = isPassportNumber;
  * @validator isEAN
  */
 function isEAN(options) {
-    return (0, index_js_1.validator)('isEAN', function (input, context) {
+    return (0, index_js_1.validator)('isEAN', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isEAN = isEAN;
@@ -179,10 +179,10 @@ exports.isEAN = isEAN;
  * @validator isFQDN
  */
 function isFQDN(options) {
-    return (0, index_js_1.validator)('isFQDN', function (input, context) {
+    return (0, index_js_1.validator)('isFQDN', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.isFQDN(input, options))
             return input;
-        context.failure(`{{label}} is not valid FQDN`);
+        context.fail(_this, `{{label}} is not valid FQDN`, input);
     }, options);
 }
 exports.isFQDN = isFQDN;
@@ -191,10 +191,10 @@ exports.isFQDN = isFQDN;
  * @validator isISSN
  */
 function isISSN(options) {
-    return (0, index_js_1.validator)('isISSN', function (input, context) {
+    return (0, index_js_1.validator)('isISSN', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.isISSN(input, options))
             return input;
-        context.failure(`{{label}} is not a valid ISSN`);
+        context.fail(_this, `{{label}} is not a valid ISSN`, input);
     }, options);
 }
 exports.isISSN = isISSN;
@@ -203,10 +203,10 @@ exports.isISSN = isISSN;
  * @validator isVAT
  */
 function isVAT(countryCode, options) {
-    return (0, index_js_1.validator)('isVAT', function (input, context) {
+    return (0, index_js_1.validator)('isVAT', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isVAT = isVAT;
@@ -215,10 +215,10 @@ exports.isVAT = isVAT;
  * @validator isBtcAddress
  */
 function isBtcAddress(options) {
-    return (0, index_js_1.validator)('isBtcAddress', function (input, context) {
+    return (0, index_js_1.validator)('isBtcAddress', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isBtcAddress = isBtcAddress;
@@ -227,10 +227,10 @@ exports.isBtcAddress = isBtcAddress;
  * @validator isBtcAddress
  */
 function isETHAddress(options) {
-    return (0, index_js_1.validator)('isETHAddress', function (input, context) {
+    return (0, index_js_1.validator)('isETHAddress', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isETHAddress = isETHAddress;
@@ -239,10 +239,10 @@ exports.isETHAddress = isETHAddress;
  * @validator isHash
  */
 function isHash(algorithm, options) {
-    return (0, index_js_1.validator)('isHash', function (input, context) {
+    return (0, index_js_1.validator)('isHash', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isHash = isHash;
@@ -251,10 +251,10 @@ exports.isHash = isHash;
  * @validator isHexColor
  */
 function isHexColor(options) {
-    return (0, index_js_1.validator)('isHexColor', function (input, context) {
+    return (0, index_js_1.validator)('isHexColor', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isHexColor = isHexColor;
@@ -263,10 +263,10 @@ exports.isHexColor = isHexColor;
  * @validator isHash
  */
 function isJWT(options) {
-    return (0, index_js_1.validator)('isJWT', function (input, context) {
+    return (0, index_js_1.validator)('isJWT', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.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);
 }
 exports.isJWT = isJWT;
@@ -275,10 +275,10 @@ exports.isJWT = isJWT;
  * @validator isLowercase
  */
 function isLowercase(options) {
-    return (0, index_js_1.validator)('isLowercase', function (input, context) {
+    return (0, index_js_1.validator)('isLowercase', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.isLowercase(input))
             return input;
-        context.failure(`{{label}} is not a lowercase string`);
+        context.fail(_this, `{{label}} is not a lowercase string`, input);
     }, options);
 }
 exports.isLowercase = isLowercase;
@@ -287,10 +287,10 @@ exports.isLowercase = isLowercase;
  * @validator isUppercase
  */
 function isUppercase(options) {
-    return (0, index_js_1.validator)('isLowercase', function (input, context) {
+    return (0, index_js_1.validator)('isLowercase', function (input, context, _this) {
         if (typeof input === 'string' && validator_1.default.isUppercase(input))
             return input;
-        context.failure(`{{label}} is not an uppercase string`);
+        context.fail(_this, `{{label}} is not an uppercase string`, input);
     }, options);
 }
 exports.isUppercase = isUppercase;

package/cjs/rules/union.js

@@ -7,25 +7,30 @@ const index_js_1 = require("../core/index.js");
  */
 function union(codecs) {
     const l = codecs.length;
-    return (0, index_js_1.validator)('union', function (input, context) {
+    return (0, index_js_1.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);
     });
 }
 exports.union = union;

package/cjs/rules/utilities.js

@@ -9,7 +9,7 @@ const index_js_1 = require("../core/index.js");
 function forwardRef(fn) {
     return (0, index_js_1.validator)('forwardRef', function (input, context) {
         const nested = fn(context);
-        return nested[index_js_1.kValidatorFn](input, context, nested);
+        return nested(input, context);
     });
 }
 exports.forwardRef = forwardRef;
@@ -24,7 +24,7 @@ function iif(check, _then, _else) {
             // ignored
         }
         if ((0, index_js_1.isValidator)(c))
-            return c[index_js_1.kValidatorFn](input, context, c);
+            return c(input, context);
         return c;
     });
 }

package/esm/core/context.js

@@ -1,12 +1,11 @@
+import { omitUndefined } from '../helpers/omit-undefined.js';
 import { kOptions } from './constants.js';
 import { ValidationError } from './validation-error.js';
 const VARIABLE_REPLACE_PATTERN = /{{([^}]*)}}/g;
 const OPTIONAL_VAR_PATTERN = /^([^?]+)(?:\||(.*))?$/;
 export class Context {
-    constructor(rule, options) {
+    constructor(options) {
         this.errors = [];
-        this.input = {};
-        this.rule = rule;
         if (options?.maxErrors != null)
             this.maxErrors = options.maxErrors;
         if (typeof options?.onFail === 'function')
@@ -14,34 +13,43 @@ export class Context {
         if (options?.coerce != null)
             this.coerce = options?.coerce;
     }
-    failure(message) {
-        const issue = (typeof message === 'object'
-            ? { ...message, message: message.message }
-            : { message: '' + message });
-        issue.rule = this.rule.id;
-        Object.assign(issue, this.input);
-        if (this.onFail) {
+    fail(rule, message, value, details) {
+        const issue = omitUndefined({
+            message: message instanceof Error ? message.message : String(message),
+            rule: rule.id,
+            root: this.root,
+            location: this.location,
+            context: this.context,
+            property: this.property,
+            index: this.index,
+            label: this.label,
+            value,
+            ...details
+        });
+        issue.value = value;
+        const onFail = this.onFail || rule[kOptions].onFail;
+        if (onFail) {
             const proto = Object.getPrototypeOf(this);
-            const x = this.onFail(issue, this, proto.onFail);
+            const superOnFail = proto.onFail !== onFail ? proto.onFail : undefined;
+            const x = onFail(issue, this, superOnFail);
             if (!x)
                 return;
-            if (typeof x === 'object') {
-                delete x.id;
-                delete x.input;
+            if (typeof x === 'object')
                 Object.assign(issue, x);
-            }
             else
                 issue.message = String(x);
         }
-        issue.message = ('' + issue.message).replace(VARIABLE_REPLACE_PATTERN, (x, g) => {
+        issue.message = ('' + issue.message)
+            .replace(VARIABLE_REPLACE_PATTERN, (x, g) => {
             const m = OPTIONAL_VAR_PATTERN.exec(g);
             if (!m)
                 return x;
             const k = m[1];
-            const v = this.input[k] ??
-                (m[1] === 'label' ? this.input.property : undefined);
+            let v = issue[k];
+            if (!v && m[1] === 'label' && (this.label || this.property))
+                v = '`' + (this.label || this.property) + '`';
             if (v != null)
-                return '`' + v + '`';
+                return v;
             if (m[2])
                 return m[2];
             return m[1] === 'label' ? 'Value' : x;
@@ -50,12 +58,10 @@ export class Context {
         if (this.errors.length >= (this.maxErrors ?? Infinity))
             throw new ValidationError(this.errors);
     }
-    extend(rule, options) {
-        const extended = new Context(rule, { onFail: undefined, ...rule[kOptions], ...options });
+    extend(options) {
+        const extended = new Context({ onFail: undefined, ...options });
         Object.setPrototypeOf(extended, this);
         delete extended.errors;
-        extended.parent = this;
-        extended.root = this.root || this;
         return extended;
     }
 }

package/esm/core/validator.js

@@ -20,20 +20,21 @@ export function validator(arg0, arg1, arg2) {
     id = id || fn.name || 'unnamed-rule';
     const name = fn.name || camelCase(id);
     const _rule = ({
-        [name](input, options, parent) {
-            const ctx = parent ? parent.extend(_rule, options) : new Context(_rule, options);
+        [name](input, options) {
+            const ctx = options instanceof Context ? options : undefined;
+            const opts = (ctx ? undefined : options);
+            const context = ctx || new Context(opts);
             let value;
             try {
-                ctx.input.value = input;
-                value = fn(input, ctx, _rule);
+                value = fn(input, context, _rule);
             }
             catch (e) {
-                if (!parent && e instanceof ValidationError)
+                if (e instanceof ValidationError)
                     throw e;
-                ctx.failure(e);
+                context.fail(_rule, e, input);
             }
-            if (!parent && ctx.errors.length)
-                throw new ValidationError(ctx.errors);
+            if (!ctx && context.errors.length)
+                throw new ValidationError(context.errors);
             return value;
         }
     })[name];

package/esm/helpers/omit-undefined.js

@@ -0,0 +1,11 @@
+export function omitUndefined(obj, recursive) {
+    if (!(obj && typeof obj === 'object'))
+        return obj;
+    for (const k of Object.keys(obj)) {
+        if (obj[k] === undefined)
+            delete obj[k];
+        else if (recursive && typeof obj[k] === 'object')
+            omitUndefined(obj[k]);
+    }
+    return obj;
+}