Merge pull request #394 from 4lessandrodev/develop

Fix: Email

Author: 4lessandrodev

.vscode/settings.json

@@ -10,5 +10,10 @@
 	"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": true,
 	"typescript.format.insertSpaceAfterConstructor": true,
 	"typescript.format.insertSpaceBeforeFunctionParenthesis": true,
-	"cSpell.words": ["cnpj"]
+	"cSpell.words": [
+		"cnpj"
+	],
+	"[typescript]": {
+		"editor.defaultFormatter": "vscode.typescript-language-features"
+	}
 }

CHANGELOG.md

@@ -10,6 +10,14 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+### [3.9.2] - 2024-05-28
+
+### Fix
+
+- Fix: Email Value Object with + char as alias value
+
+---
+
 ### [3.9.1] - 2024-05-02
 
 ### Fix

lib/utils/email.validator.util.ts

@@ -6,7 +6,7 @@
  * 64 = @
  * 46 = .
  */
-const ValidChars = { min: 97, max: 122, specials: [95, 45, 64, 46] };
+const ValidChars = { min: 97, max: 122, specials: [95, 45, 64, 46, 43] };
 
 const ValidCharsNum = { min: 48, max: 57 };
 
@@ -81,13 +81,24 @@ const IsValidCountry = (country: string): boolean => {
 	return true;
 };
 
+const IsValidNick = (email: string): boolean => {
+	const nick = email.split('@')?.[0];
+	return (
+		!nick.startsWith('+') &&
+		!nick.endsWith('+') &&
+		!nick.startsWith('-') &&
+		!nick.endsWith('-')
+	);
+};
+
 const IsValidDomain = (email: string): boolean => {
 	const domain = email.split('@');
 	const parts = domain[1].split('.');
 	if (parts.length === 1 || parts.length > 3) return false;
 
 	const isInValidStartAndEnd =
 		domain[1].startsWith('-') || domain[1].endsWith('-');
+
 	if (isInValidStartAndEnd) return false;
 
 	const isLessThanMax = email.length <= 64;
@@ -117,24 +128,22 @@ const IsValidDomain = (email: string): boolean => {
  * @returns true if is a valid email and false if not
  */
 export const IsValidEmail = (email: string): boolean => {
-	const AtCode = 64;
 	const isString: boolean = typeof email === 'string';
 	if (!isString) return false;
 
 	const trimEmail = email.trim().toLowerCase();
 
 	const isValidFirsChar: boolean =
 		IsAlphabet(trimEmail[0]) || IsNumber(trimEmail[0]);
+
 	if (!isValidFirsChar) return false;
 
 	const hasOnlyOneAt: boolean =
-		trimEmail.split('').reduce((total, current): number => {
-			const isAtCode = GetCharCode(current) === AtCode;
-			if (isAtCode) return (total = total + 1);
-			return total;
-		}, 0) === 1;
+		trimEmail.split('').filter((char) => char === '@').length === 1;
+	const hasOnlyOnePlus: boolean =
+		trimEmail.split('').filter((char) => char === '+').length > 1;
 
-	if (!hasOnlyOneAt) return false;
+	if (!hasOnlyOneAt || hasOnlyOnePlus) return false;
 
 	const isValidLength = HasValidLength(trimEmail);
 
@@ -144,6 +153,8 @@ export const IsValidEmail = (email: string): boolean => {
 
 	if (!isValidDomain) return false;
 
+	if (!IsValidNick(trimEmail)) return false;
+
 	const hasInvalidChar = trimEmail
 		.split('')
 		.map((char): boolean => IsValidChar(char))

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "types-ddd",
-	"version": "3.9.1",
+	"version": "3.9.2",
 	"description": "This package provide utils file and interfaces to assistant build a complex application with domain driving design",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

tests/utils/email-value-object.util.spec.ts

@@ -11,6 +11,31 @@ describe('email-value-object.util', () => {
 		expect(valueObject.isOk()).toBe(true);
 	});
 
+	it('should create a valid email with success', () => {
+		const valueObject = EmailValueObject.create('[email protected]');
+		expect(valueObject.isOk()).toBe(true);
+	});
+
+	it('should to be invalid email nick ends with +', () => {
+		const valueObject = EmailValueObject.create('[email protected]');
+		expect(valueObject.isFail()).toBe(true);
+	});
+
+	it('should to be invalid email nick starts with +', () => {
+		const valueObject = EmailValueObject.create('[email protected]');
+		expect(valueObject.isFail()).toBe(true);
+	});
+
+	it('should to be invalid email domain starts with +', () => {
+		const valueObject = EmailValueObject.create('johndoe@+domain.com');
+		expect(valueObject.isFail()).toBe(true);
+	});
+
+	it('should to be invalid email domain ends with +', () => {
+		const valueObject = EmailValueObject.create('[email protected]+');
+		expect(valueObject.isFail()).toBe(true);
+	});
+
 	it('should transform value to lower on create', () => {
 		const valueObject = EmailValueObject.create(
 			'[email protected]',