From 09a388d99a94f58fd574beef5cd341eea56bb792 Mon Sep 17 00:00:00 2001 From: tenretC Date: Thu, 19 Apr 2018 13:58:29 +0200 Subject: [PATCH] fix(core): fix for validation module related to requested changes --- .../src/validation/decorators/index.ts | 22 ++++++++--------- .../is-bban.validator.decorator.spec.ts | 2 +- .../is-bban/is-bban.validator.decorator.ts | 2 +- .../is-bic/is-bic.validator.decorator.spec.ts | 2 +- .../is-bic/is-bic.validator.decorator.ts | 2 +- ...company-number.validator.decorator.spec.ts | 2 +- .../is-company-number.validator.decorator.ts | 2 +- ...nt-unit-number.validator.decorator.spec.ts | 2 +- ...ishment-unit-number.validator.decorator.ts | 2 +- .../is-iban.validator.decorator.spec.ts | 4 ++-- .../is-iban/is-iban.validator.decorator.ts | 2 +- .../is-isin.validator.decorator.spec.ts | 2 +- .../is-isin/is-isin.validator.decorator.ts | 2 +- .../is-kbo/is-kbo.validator.decorator.spec.ts | 2 +- .../is-kbo/is-kbo.validator.decorator.ts | 2 +- .../is-nin/is-nin.validator.decorator.spec.ts | 2 +- .../is-nin/is-nin.validator.decorator.ts | 2 +- ...orted-language.validator.decorator.spec.ts | 2 +- ...-supported-language.validator.decorator.ts | 2 +- .../map-is-valid.validator.decorator.ts | 2 +- .../map-not-empty.validator.decorator.spec.ts | 2 +- packages/stark-core/src/validation/index.ts | 4 ++-- .../src/validation/validator.intf.ts | 2 -- .../stark-core/src/validation/validator.ts | 2 +- .../src/validation/validators/index.ts | 24 +++++++++---------- .../is-date-time/is-date-time.validator.fn.ts | 2 +- .../is-iban/is-iban.validator.fn.spec.ts | 2 +- .../is-iban/is-iban.validator.fn.ts | 4 ++-- .../map-not-empty.validator.fn.spec.ts | 19 +++++++++++++++ 29 files changed, 70 insertions(+), 53 deletions(-) create mode 100644 packages/stark-core/src/validation/validators/map-not-empty/map-not-empty.validator.fn.spec.ts diff --git a/packages/stark-core/src/validation/decorators/index.ts b/packages/stark-core/src/validation/decorators/index.ts index d6b1eb9251..57a8a0e2b9 100644 --- a/packages/stark-core/src/validation/decorators/index.ts +++ b/packages/stark-core/src/validation/decorators/index.ts @@ -1,13 +1,13 @@ "use strict"; -export * from "./is-bban"; -export * from "./is-bic"; -export * from "./is-company-number"; -export * from "./is-establishment-unit-number"; -export * from "./is-iban"; -export * from "./is-isin"; -export * from "./is-kbo"; -export * from "./is-nin"; -export * from "./is-supported-language"; -export * from "./map-is-valid"; -export * from "./map-not-empty"; +export * from "./is-bban/index"; +export * from "./is-bic/index"; +export * from "./is-company-number/index"; +export * from "./is-establishment-unit-number/index"; +export * from "./is-iban/index"; +export * from "./is-isin/index"; +export * from "./is-kbo/index"; +export * from "./is-nin/index"; +export * from "./is-supported-language/index"; +export * from "./map-is-valid/index"; +export * from "./map-not-empty/index"; diff --git a/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.spec.ts index 2bbfcbb51b..d60aa48dd1 100644 --- a/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsBBAN } from "./is-bban.validator.decorator"; -import { starkIsBBANValidatorName } from "../../validators/is-bban"; +import { starkIsBBANValidatorName } from "../../validators/is-bban/index"; class MyClass { @StarkIsBBAN("countryCode") public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.ts index 1d73312538..bd985b626c 100644 --- a/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-bban/is-bban.validator.decorator.ts @@ -11,7 +11,7 @@ import { import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsBBANValidatorName } from "../../validators/is-bban"; +import { starkIsBBANValidatorName } from "../../validators/is-bban/index"; /** * StarkIsBBAN validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.spec.ts index 8b88005987..ba56654fed 100644 --- a/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsBIC } from "./is-bic.validator.decorator"; -import { starkIsBICValidatorName } from "../../validators/is-bic"; +import { starkIsBICValidatorName } from "../../validators/is-bic/index"; class MyClass { @StarkIsBIC() public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.ts index 1aaf1c96d2..b6eef3c633 100644 --- a/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-bic/is-bic.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsBICValidatorName } from "../../validators/is-bic"; +import { starkIsBICValidatorName } from "../../validators/is-bic/index"; /** * StarkIsBIC validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.spec.ts index d0920e850f..66ce3ce37d 100644 --- a/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsCompanyNumber } from "./is-company-number.validator.decorator"; -import { starkIsCompanyNumberValidatorName } from "../../validators/is-company-number"; +import { starkIsCompanyNumberValidatorName } from "../../validators/is-company-number/index"; class MyClass { @StarkIsCompanyNumber() public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.ts index 3272d0ecfa..d5897dd054 100644 --- a/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-company-number/is-company-number.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsCompanyNumberValidatorName } from "../../validators/is-company-number"; +import { starkIsCompanyNumberValidatorName } from "../../validators/is-company-number/index"; /** * StarkIsCompanyNumber validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.spec.ts index b9eb69086b..b4b149d105 100644 --- a/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsEstablishmentUnitNumber } from "./is-establishment-unit-number.validator.decorator"; -import { starkIsEstablishmentUnitNumberValidatorName } from "../../validators/is-establishment-unit-number"; +import { starkIsEstablishmentUnitNumberValidatorName } from "../../validators/is-establishment-unit-number/index"; class MyClass { @StarkIsEstablishmentUnitNumber() public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.ts index b3d0b99c52..a29cf04136 100644 --- a/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-establishment-unit-number/is-establishment-unit-number.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsEstablishmentUnitNumberValidatorName } from "../../validators/is-establishment-unit-number"; +import { starkIsEstablishmentUnitNumberValidatorName } from "../../validators/is-establishment-unit-number/index"; /** * StarkIsBban validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.spec.ts index 2cc0bd0aa4..1004624fda 100644 --- a/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsIBAN } from "./is-iban.validator.decorator"; -import { starkIsIBANValidatorName } from "../../validators/is-iban"; +import { starkIsIBANValidatorName } from "../../validators/is-iban/index"; class MyClass { @StarkIsIBAN() public name: string; @@ -44,7 +44,7 @@ describe("ValidatorDecorator: StarkIsIBAN", () => { }); it("should NOT fail if iban is correct", () => { - myClass.name = "BE68539007547034"; + myClass.name = "BE68 5390 0754 7034"; const errors: ValidationError[] = validateSync(myClass); expect(errors.length).toBe(0); diff --git a/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.ts index df623f4fcc..362f583246 100644 --- a/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-iban/is-iban.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsIBANValidatorName } from "../../validators/is-iban"; +import { starkIsIBANValidatorName } from "../../validators/is-iban/index"; /** * StarkIsIBAN validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.spec.ts index 12405b9eb3..bd0a470f83 100644 --- a/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsISIN } from "./is-isin.validator.decorator"; -import { starkIsISINValidatorName } from "../../validators/is-isin"; +import { starkIsISINValidatorName } from "../../validators/is-isin/index"; class MyClass { @StarkIsISIN() public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.ts index ca69855f6f..00f337966b 100644 --- a/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-isin/is-isin.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsISINValidatorName } from "../../validators/is-isin"; +import { starkIsISINValidatorName } from "../../validators/is-isin/index"; /** * StarkIsBban validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.spec.ts index 26a3f7d386..5c342bc4fc 100644 --- a/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsKBO } from "./is-kbo.validator.decorator"; -import { starkIsKBOValidatorName } from "../../validators/is-kbo"; +import { starkIsKBOValidatorName } from "../../validators/is-kbo/index"; class MyClass { @StarkIsKBO() public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.ts index e60096b6e7..6fbedcd82d 100644 --- a/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-kbo/is-kbo.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsKBOValidatorName } from "../../validators/is-kbo"; +import { starkIsKBOValidatorName } from "../../validators/is-kbo/index"; /** * StarkIsBban validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.spec.ts index c5f4032498..c0720cf2bb 100644 --- a/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsNIN } from "./is-nin.validator.decorator"; -import { starkIsNINValidatorName } from "../../validators/is-nin"; +import { starkIsNINValidatorName } from "../../validators/is-nin/index"; class MyClass { @StarkIsNIN("countryCode") public name: string; diff --git a/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.ts index 894f897173..f6cfa728cc 100644 --- a/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-nin/is-nin.validator.decorator.ts @@ -11,7 +11,7 @@ import { import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsNINValidatorName } from "../../validators/is-nin"; +import { starkIsNINValidatorName } from "../../validators/is-nin/index"; /** * StarkIsNIN validator constraint diff --git a/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.spec.ts index f4134731b5..194baf04cd 100644 --- a/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.spec.ts @@ -2,7 +2,7 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkIsSupportedLanguage } from "./is-supported-language.validator.decorator"; -import { starkIsSupportedLanguageValidatorName } from "../../validators/is-supported-language"; +import { starkIsSupportedLanguageValidatorName } from "../../validators/is-supported-language/index"; class MyClass { @StarkIsSupportedLanguage() public language: string; diff --git a/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.ts b/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.ts index 9f2420ab41..5d25d23148 100644 --- a/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/is-supported-language/is-supported-language.validator.decorator.ts @@ -4,7 +4,7 @@ import { ValidatorConstraint, ValidatorConstraintInterface, ValidationOptions, r import { StarkValidatorImpl } from "../../validator"; import { StarkValidator } from "../../validator.intf"; -import { starkIsSupportedLanguageValidatorName } from "../../validators/is-supported-language"; +import { starkIsSupportedLanguageValidatorName } from "../../validators/is-supported-language/index"; /** * StarkIsSupportedLanguage validator constraint diff --git a/packages/stark-core/src/validation/decorators/map-is-valid/map-is-valid.validator.decorator.ts b/packages/stark-core/src/validation/decorators/map-is-valid/map-is-valid.validator.decorator.ts index 8a2d734696..636a6e16cb 100644 --- a/packages/stark-core/src/validation/decorators/map-is-valid/map-is-valid.validator.decorator.ts +++ b/packages/stark-core/src/validation/decorators/map-is-valid/map-is-valid.validator.decorator.ts @@ -6,7 +6,7 @@ import { ValidationError, validateSync } from "class-validator"; -import { StarkValidationErrorsUtil } from "../../../util"; +import { StarkValidationErrorsUtil } from "../../../util/index"; export const starkMapIsValidValidatorName: string = "starkMapIsValid"; diff --git a/packages/stark-core/src/validation/decorators/map-not-empty/map-not-empty.validator.decorator.spec.ts b/packages/stark-core/src/validation/decorators/map-not-empty/map-not-empty.validator.decorator.spec.ts index 590f1eb9e8..b5207d9a53 100644 --- a/packages/stark-core/src/validation/decorators/map-not-empty/map-not-empty.validator.decorator.spec.ts +++ b/packages/stark-core/src/validation/decorators/map-not-empty/map-not-empty.validator.decorator.spec.ts @@ -1,6 +1,6 @@ import { validateSync, ValidationError } from "class-validator"; import { StarkMapNotEmpty } from "./map-not-empty.validator.decorator"; -import { starkMapNotEmptyValidatorName } from "../../validators/map-not-empty"; +import { starkMapNotEmptyValidatorName } from "../../validators/map-not-empty/index"; class MyClass { @StarkMapNotEmpty() public dummyMap: Map = new Map(); diff --git a/packages/stark-core/src/validation/index.ts b/packages/stark-core/src/validation/index.ts index 6273f16173..3a34e4b0b7 100644 --- a/packages/stark-core/src/validation/index.ts +++ b/packages/stark-core/src/validation/index.ts @@ -1,7 +1,7 @@ "use strict"; -export * from "./decorators"; -export * from "./validators"; +export * from "./decorators/index"; +export * from "./validators/index"; export * from "./validator"; export * from "./validator.intf"; diff --git a/packages/stark-core/src/validation/validator.intf.ts b/packages/stark-core/src/validation/validator.intf.ts index addc78266e..21e09443de 100644 --- a/packages/stark-core/src/validation/validator.intf.ts +++ b/packages/stark-core/src/validation/validator.intf.ts @@ -1,5 +1,3 @@ -"use strict"; - import { Validator } from "class-validator"; export interface StarkValidator extends Validator { diff --git a/packages/stark-core/src/validation/validator.ts b/packages/stark-core/src/validation/validator.ts index 4d441fcd33..1287f2ef73 100644 --- a/packages/stark-core/src/validation/validator.ts +++ b/packages/stark-core/src/validation/validator.ts @@ -15,7 +15,7 @@ import { starkIsNIN, starkIsSupportedLanguage, starkMapNotEmpty -} from "./validators"; +} from "./validators/index"; export class StarkValidatorImpl extends Validator implements StarkValidator { public constructor() { diff --git a/packages/stark-core/src/validation/validators/index.ts b/packages/stark-core/src/validation/validators/index.ts index 87ae68405f..4b8abc1de3 100644 --- a/packages/stark-core/src/validation/validators/index.ts +++ b/packages/stark-core/src/validation/validators/index.ts @@ -1,14 +1,14 @@ "use strict"; -export * from "./array-size-range"; -export * from "./is-bban"; -export * from "./is-bic"; -export * from "./is-company-number"; -export * from "./is-date-time"; -export * from "./is-establishment-unit-number"; -export * from "./is-iban"; -export * from "./is-isin"; -export * from "./is-kbo"; -export * from "./is-nin"; -export * from "./is-supported-language"; -export * from "./map-not-empty"; +export * from "./array-size-range/index"; +export * from "./is-bban/index"; +export * from "./is-bic/index"; +export * from "./is-company-number/index"; +export * from "./is-date-time/index"; +export * from "./is-establishment-unit-number/index"; +export * from "./is-iban/index"; +export * from "./is-isin/index"; +export * from "./is-kbo/index"; +export * from "./is-nin/index"; +export * from "./is-supported-language/index"; +export * from "./map-not-empty/index"; diff --git a/packages/stark-core/src/validation/validators/is-date-time/is-date-time.validator.fn.ts b/packages/stark-core/src/validation/validators/is-date-time/is-date-time.validator.fn.ts index 70e2b05595..5dc7a6ffe0 100644 --- a/packages/stark-core/src/validation/validators/is-date-time/is-date-time.validator.fn.ts +++ b/packages/stark-core/src/validation/validators/is-date-time/is-date-time.validator.fn.ts @@ -1,6 +1,6 @@ "use strict"; -import * as moment from "moment"; +import moment from "moment"; export const starkIsDateTimeValidatorName: string = "starkIsDateTime"; diff --git a/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.spec.ts b/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.spec.ts index 2dfaaee346..f907f3141f 100644 --- a/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.spec.ts +++ b/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.spec.ts @@ -16,7 +16,7 @@ describe("Validator Function: StarkIsIBAN", () => { }); it("should NOT fail if iban is correct", () => { - iban = "BE68539007547034"; + iban = "BE68 5390 0754 7034"; const result: boolean = starkIsIBAN(iban); expect(result).toBe(true); }); diff --git a/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.ts b/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.ts index 51925e071b..4fbf16f460 100644 --- a/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.ts +++ b/packages/stark-core/src/validation/validators/is-iban/is-iban.validator.fn.ts @@ -1,13 +1,13 @@ "use strict"; -import { isValidIBAN, extractIBAN } from "ibantools"; +import { isValidIBAN, electronicFormatIBAN } from "ibantools"; export const starkIsIBANValidatorName: string = "starkIsIBAN"; export function starkIsIBAN(iban: string): boolean { if (typeof iban === "string") { //Since v2.0.0 of ibantools, isValidIBAN() is false if there is " " in the verified IBAN - return isValidIBAN(extractIBAN(iban).iban); + return isValidIBAN(electronicFormatIBAN(iban)); } return false; } diff --git a/packages/stark-core/src/validation/validators/map-not-empty/map-not-empty.validator.fn.spec.ts b/packages/stark-core/src/validation/validators/map-not-empty/map-not-empty.validator.fn.spec.ts new file mode 100644 index 0000000000..5bd05c87b6 --- /dev/null +++ b/packages/stark-core/src/validation/validators/map-not-empty/map-not-empty.validator.fn.spec.ts @@ -0,0 +1,19 @@ +import { starkMapNotEmpty } from "./map-not-empty.validator.fn"; + +describe("Validator Function: StarkMapNotEmpty", () => { + it("should return FALSE if the map is not of Map type", () => { + const invalidMap: any = undefined; + expect(starkMapNotEmpty(invalidMap)).toBe(false); + }); + + it("should return TRUE if the map is of Map type and is not empty", () => { + const validMap: Map = new Map(); + validMap.set("testKey", "testValue"); + expect(starkMapNotEmpty(validMap)).toBe(true); + }); + + it("should return FALSE if the map is empty", () => { + const invalidMap: Map = new Map(); + expect(starkMapNotEmpty(invalidMap)).toBe(false); + }); +});