@nattyjs/validation-decorators 0.0.1-beta.31 → 0.0.1-beta.32

package/dist/index.cjs

@@ -8,6 +8,9 @@ const ValidatorNames = {
   alpha: "alpha",
   alphaNumeric: "alphaNumeric",
   ascii: "ascii",
+  custom: "custom",
+  compare: "compare",
+  compose: "compose",
   contains: "contains",
   creditCard: "creditCard",
   cusip: "cusip",
@@ -216,9 +219,9 @@ class Linq {
 }
 
 class ValidatorValueChecker {
-  static pass(params, config) {
+  static pass(params, config, isContinue = false) {
     if (Linq.execute(config, params))
-      return RegexValidator.isNotBlank(params.value);
+      return isContinue || RegexValidator.isNotBlank(params.value);
     else
       return false;
   }
@@ -248,6 +251,52 @@ function alphaNumericValidator(configModel, control) {
   return alphaValidation(configModel, control, [RegExRule.alphaNumeric, RegExRule.alphaNumericWithSpace], ValidatorNames.alphaNumeric);
 }
 
+function compareValidator(configModel, control) {
+  let config = getConfigObject(configModel);
+  if (ValidatorValueChecker.pass(control, config)) {
+    const compareControlValue = control.current[config.fieldName];
+    if (RegexValidator.isNotBlank(compareControlValue)) {
+      if (!(compareControlValue === control.value))
+        return ValidationMessage.toJson(ValidatorNames.compare, config, [control.value, compareControlValue]);
+    }
+  }
+  return ValidationMessage.null();
+}
+
+function composeValidator(configModel, control) {
+  let config = getConfigObject(configModel);
+  if (ValidatorValueChecker.pass(control, config, true)) {
+    if (config.validators) {
+      let result = void 0;
+      for (let validator of config.validators) {
+        result = validator.validator(control);
+        if (result)
+          break;
+      }
+      if (result)
+        return config.messageKey || config.message ? ValidationMessage.toJson(config.messageKey || ValidatorNames.compose, config, [control.value]) : result;
+    }
+  }
+  return ValidationMessage.null();
+}
+
+function customValidator(configModel, control) {
+  let config = getConfigObject(configModel);
+  if (ValidatorValueChecker.pass(control, config, true)) {
+    if (config.validators) {
+      let result = void 0;
+      for (let validator of config.validators) {
+        result = validator(control);
+        if (result)
+          break;
+      }
+      if (result)
+        return config.messageKey || config.message ? ValidationMessage.toJson(config.messageKey || ValidatorNames.custom, config, [control.value]) : result;
+    }
+  }
+  return ValidationMessage.null();
+}
+
 function containsValidator(configModel, control) {
   let config = getConfigObject(configModel);
   if (ValidatorValueChecker.pass(control, config)) {
@@ -1551,6 +1600,9 @@ const ControlValidators = {
   alpha: alphaValidator,
   alphaNumeric: alphaNumericValidator,
   ascii: asciiValidator,
+  compare: compareValidator,
+  compose: composeValidator,
+  custom: customValidator,
   contains: containsValidator,
   creditCard: creditCardValidator,
   cusip: cusipValidator,

package/dist/index.d.ts

@@ -384,6 +384,19 @@ declare function alphaValidator(configModel: AlphaConfig, params: ValidatorParam
 
 declare function alphaNumericValidator(configModel: AlphaConfig, control: ValidatorParams): ValidatorFn;
 
+interface CompareConfig extends FieldConfig {
+}
+
+declare function compareValidator(configModel: CompareConfig, control: ValidatorParams): ValidatorFn;
+
+interface ComposeConfig extends BaseValidatorConfig {
+    validators: ValidatorFn[];
+}
+
+declare function composeValidator(configModel: ComposeConfig, control: ValidatorParams): ValidatorFn;
+
+declare function customValidator(configModel: ComposeConfig, control: ValidatorParams): ValidatorFn;
+
 declare function containsValidator(configModel: DefaultConfig, control: ValidatorParams): ValidatorFn;
 
 declare function creditCardValidator(configModel: CreditCardConfig, control: ValidatorParams): ValidatorFn;
@@ -496,6 +509,9 @@ declare const ControlValidators: {
     alpha: typeof alphaValidator;
     alphaNumeric: typeof alphaNumericValidator;
     ascii: typeof asciiValidator;
+    compare: typeof compareValidator;
+    compose: typeof composeValidator;
+    custom: typeof customValidator;
     contains: typeof containsValidator;
     creditCard: typeof creditCardValidator;
     cusip: typeof cusipValidator;
@@ -579,4 +595,4 @@ declare const validationForms: {
     configure(config: FormConfig): void;
 };
 
-export { AlphaConfig, ArrayConfig, BaseValidatorConfig, ContainsConfig, ControlValidators, CreditCardConfig, DateConfig, DefaultConfig, DifferentConfig, DigitConfig, EmailConfig, ExtensionConfig, FactorConfig, FieldConfig, FileConfig, FormConfig, HexColorConfig, IBANConfig, IpConfig, MaskConfig, MaxDateConfig, MaxTimeConfig, MessageConfig, MinDateConfig, MinTimeConfig, NumberConfig, NumericConfig, NumericValueType, PasswordConfig, PatternConfig, RangeConfig, RelationalOperatorConfig, RequiredConfig, StringComparisonConfig, StringValueConfig, TimeConfig, TimeRelationConfig, UrlConfig, ValidatorFn, allOf as decoratorAllOfValidation, alphaNumeric as decoratorAlphaNumericValidation, alpha as decoratorAlphaValidation, ascii as decoratorAsciiValidation, blacklist as decoratorBlacklistSanitizer, contains as decoratorContainsValidation, creditCard as decoratorCreditCardValidation, cusip as decoratorCusipValidation, dataUri as decoratorDataUriValidation, date as decoratorDateValidation, different as decoratorDifferentValdiation, digit as decoratorDigitValidation, email as decoratorEmailValidation, endsWith as decoratorEndsWithValidation, escape as decoratorEscapeSanitizer, even as decoratorEvenValidation, extension as decoratorExtensionValidation, factor as decoratorFactorValidation, greaterThanEqualTo as decoratorGreaterThanEqualToValidation, greaterThan as decoratorGreaterThanValidation, hexColor as decoratorHexColorValidation, ip as decoratorIpValidation, json as decoratorJsonValidation, latLong as decoratorLatLongValidation, latitude as decoratorLatitudeValdiation, leapYear as decoratorLeapYearValidation, lessThanEqualTo as decoratorLessThanEqualToValidation, lessThan as decoratorLessThanValidation, longitude as decoratorLongitudeValidation, lowerCase as decoratorLowercaseValidation, ltrim as decoratorLtrimSanitizer, mac as decoratorMacValidation, maxDate as decoratorMaxDateValidation, maxLength as decoratorMaxLengthValidation, maxNumber as decoratorMaxNumberValidation, maxTime as decoratorMaxTimeValidation, minDate as decoratorMinDateValidation, minLength as decoratorMinLengthValidation, minNumber as decoratorMinNumberValidation, minTime as decoratorMinTimeValidation, noneOf as decoratorNoneOfValidation, notEmpty as decoratorNotEmptyValidation, numeric as decoratorNumericValidation, odd as decoratorOddValidation, oneOf as decoratorOneOfValidation, password as decoratorPasswordValdiation, pattern as decoratorPatternValidation, port as decoratorPortValidation, prefix as decoratorPrefixSanitizer, primeNumber as decoratorPrimeNumberValidation, range as decoratorRangeValidation, decoratorRegistrationCaller, requiredTrue as decoratorRequiredTrueValidation, required as decoratorRequiredValidation, rtrim as decoratorRtrimSanitizer, sanitize as decoratorSanitizeSanitizer, startsWith as decoratorStartsWithValidation, stripLow as decoratorStripLowSanitizer, suffix as decoratorSuffixSanitizer, toBoolean as decoratorToBooleanSanitizer, toDate as decoratorToDateSanitizer, toInt as decoratorToIntSanitizer, toString as decoratorToStringSanitizer, trim as decoratorTrimSanitizer, upperCase as decoratorUpperCaseValidation, url as decoratorUrlValidation, whitelist as decoratorWhitelistSanitizer, prop, validationForms };
+export { AlphaConfig, ArrayConfig, BaseValidatorConfig, CompareConfig, ComposeConfig, ContainsConfig, ControlValidators, CreditCardConfig, DateConfig, DefaultConfig, DifferentConfig, DigitConfig, EmailConfig, ExtensionConfig, FactorConfig, FieldConfig, FileConfig, FormConfig, HexColorConfig, IBANConfig, IpConfig, MaskConfig, MaxDateConfig, MaxTimeConfig, MessageConfig, MinDateConfig, MinTimeConfig, NumberConfig, NumericConfig, NumericValueType, PasswordConfig, PatternConfig, RangeConfig, RelationalOperatorConfig, RequiredConfig, StringComparisonConfig, StringValueConfig, TimeConfig, TimeRelationConfig, UrlConfig, ValidatorFn, ValidatorParams, allOf as decoratorAllOfValidation, alphaNumeric as decoratorAlphaNumericValidation, alpha as decoratorAlphaValidation, ascii as decoratorAsciiValidation, blacklist as decoratorBlacklistSanitizer, contains as decoratorContainsValidation, creditCard as decoratorCreditCardValidation, cusip as decoratorCusipValidation, dataUri as decoratorDataUriValidation, date as decoratorDateValidation, different as decoratorDifferentValdiation, digit as decoratorDigitValidation, email as decoratorEmailValidation, endsWith as decoratorEndsWithValidation, escape as decoratorEscapeSanitizer, even as decoratorEvenValidation, extension as decoratorExtensionValidation, factor as decoratorFactorValidation, greaterThanEqualTo as decoratorGreaterThanEqualToValidation, greaterThan as decoratorGreaterThanValidation, hexColor as decoratorHexColorValidation, ip as decoratorIpValidation, json as decoratorJsonValidation, latLong as decoratorLatLongValidation, latitude as decoratorLatitudeValdiation, leapYear as decoratorLeapYearValidation, lessThanEqualTo as decoratorLessThanEqualToValidation, lessThan as decoratorLessThanValidation, longitude as decoratorLongitudeValidation, lowerCase as decoratorLowercaseValidation, ltrim as decoratorLtrimSanitizer, mac as decoratorMacValidation, maxDate as decoratorMaxDateValidation, maxLength as decoratorMaxLengthValidation, maxNumber as decoratorMaxNumberValidation, maxTime as decoratorMaxTimeValidation, minDate as decoratorMinDateValidation, minLength as decoratorMinLengthValidation, minNumber as decoratorMinNumberValidation, minTime as decoratorMinTimeValidation, noneOf as decoratorNoneOfValidation, notEmpty as decoratorNotEmptyValidation, numeric as decoratorNumericValidation, odd as decoratorOddValidation, oneOf as decoratorOneOfValidation, password as decoratorPasswordValdiation, pattern as decoratorPatternValidation, port as decoratorPortValidation, prefix as decoratorPrefixSanitizer, primeNumber as decoratorPrimeNumberValidation, range as decoratorRangeValidation, decoratorRegistrationCaller, requiredTrue as decoratorRequiredTrueValidation, required as decoratorRequiredValidation, rtrim as decoratorRtrimSanitizer, sanitize as decoratorSanitizeSanitizer, startsWith as decoratorStartsWithValidation, stripLow as decoratorStripLowSanitizer, suffix as decoratorSuffixSanitizer, toBoolean as decoratorToBooleanSanitizer, toDate as decoratorToDateSanitizer, toInt as decoratorToIntSanitizer, toString as decoratorToStringSanitizer, trim as decoratorTrimSanitizer, upperCase as decoratorUpperCaseValidation, url as decoratorUrlValidation, whitelist as decoratorWhitelistSanitizer, prop, validationForms };

package/dist/index.mjs

@@ -4,6 +4,9 @@ const ValidatorNames = {
   alpha: "alpha",
   alphaNumeric: "alphaNumeric",
   ascii: "ascii",
+  custom: "custom",
+  compare: "compare",
+  compose: "compose",
   contains: "contains",
   creditCard: "creditCard",
   cusip: "cusip",
@@ -212,9 +215,9 @@ class Linq {
 }
 
 class ValidatorValueChecker {
-  static pass(params, config) {
+  static pass(params, config, isContinue = false) {
     if (Linq.execute(config, params))
-      return RegexValidator.isNotBlank(params.value);
+      return isContinue || RegexValidator.isNotBlank(params.value);
     else
       return false;
   }
@@ -244,6 +247,52 @@ function alphaNumericValidator(configModel, control) {
   return alphaValidation(configModel, control, [RegExRule.alphaNumeric, RegExRule.alphaNumericWithSpace], ValidatorNames.alphaNumeric);
 }
 
+function compareValidator(configModel, control) {
+  let config = getConfigObject(configModel);
+  if (ValidatorValueChecker.pass(control, config)) {
+    const compareControlValue = control.current[config.fieldName];
+    if (RegexValidator.isNotBlank(compareControlValue)) {
+      if (!(compareControlValue === control.value))
+        return ValidationMessage.toJson(ValidatorNames.compare, config, [control.value, compareControlValue]);
+    }
+  }
+  return ValidationMessage.null();
+}
+
+function composeValidator(configModel, control) {
+  let config = getConfigObject(configModel);
+  if (ValidatorValueChecker.pass(control, config, true)) {
+    if (config.validators) {
+      let result = void 0;
+      for (let validator of config.validators) {
+        result = validator.validator(control);
+        if (result)
+          break;
+      }
+      if (result)
+        return config.messageKey || config.message ? ValidationMessage.toJson(config.messageKey || ValidatorNames.compose, config, [control.value]) : result;
+    }
+  }
+  return ValidationMessage.null();
+}
+
+function customValidator(configModel, control) {
+  let config = getConfigObject(configModel);
+  if (ValidatorValueChecker.pass(control, config, true)) {
+    if (config.validators) {
+      let result = void 0;
+      for (let validator of config.validators) {
+        result = validator(control);
+        if (result)
+          break;
+      }
+      if (result)
+        return config.messageKey || config.message ? ValidationMessage.toJson(config.messageKey || ValidatorNames.custom, config, [control.value]) : result;
+    }
+  }
+  return ValidationMessage.null();
+}
+
 function containsValidator(configModel, control) {
   let config = getConfigObject(configModel);
   if (ValidatorValueChecker.pass(control, config)) {
@@ -1547,6 +1596,9 @@ const ControlValidators = {
   alpha: alphaValidator,
   alphaNumeric: alphaNumericValidator,
   ascii: asciiValidator,
+  compare: compareValidator,
+  compose: composeValidator,
+  custom: customValidator,
   contains: containsValidator,
   creditCard: creditCardValidator,
   cusip: cusipValidator,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/validation-decorators",
-  "version": "0.0.1-beta.31",
+  "version": "0.0.1-beta.32",
   "description": "",
   "module": "./dist/index.mjs",
   "main": "./dist/index.cjs",
@@ -16,6 +16,6 @@
   "devDependencies": {
     "unbuild": "^0.7.4",
     "@types/node": "20.3.1",
-    "@nattyjs/types": "0.0.1-beta.31"
+    "@nattyjs/types": "0.0.1-beta.32"
   }
 }