fix(core): fix for validation module related to requested changes

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";

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;

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

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;

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

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;

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

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;

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

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);

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

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;

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

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;

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

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;

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

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;

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

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";
 

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<string, string> = new Map<string, string>();

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";

packages/stark-core/src/validation/validator.intf.ts

@@ -1,5 +1,3 @@
-"use strict";
-
 import { Validator } from "class-validator";
 
 export interface StarkValidator extends Validator {

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() {

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";

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";
 

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);
 	});

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;
 }

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<any, any> = new Map();
+		validMap.set("testKey", "testValue");
+		expect(starkMapNotEmpty(validMap)).toBe(true);
+	});
+
+	it("should return FALSE if the map is empty", () => {
+		const invalidMap: Map<any, any> = new Map();
+		expect(starkMapNotEmpty(invalidMap)).toBe(false);
+	});
+});