fix: solve error on merge

Author: 4lessandrodev

lib/utils/color-converter.util.ts

@@ -6,8 +6,8 @@ const colorConverter = {
 	 * @example #ffffff
 	 * @returns rgb(255, 255, 255)
 	 */
-	HEXToRGB(color: string, validate: (color: string) => boolean) {
-		const isValid = validate(color);
+	HEXToRGB(color: string, validate?: (color: string) => boolean) {
+		const isValid = validate?.(color) ?? true;
 
 		if (!isValid) {
 			return color;
@@ -30,8 +30,8 @@ const colorConverter = {
 	 * @example rgb(255, 255, 255)
 	 * @returns hex color #ffffff
 	 */
-	RGBToHEX(color: string, validate: (color: string) => boolean) {
-		const isValid = validate(color);
+	RGBToHEX(color: string, validate?: (color: string) => boolean) {
+		const isValid = validate?.(color) ?? true;
 
 		if (!isValid) {
 			return color;

lib/utils/hex-color.value-object.ts

@@ -49,10 +49,7 @@ class HEXColorValueObject extends ValueObject<Prop> {
 	 * @example rgb(255, 255, 255)
 	 */
 	getAsRGB(): string {
-		return colorConverter.HEXToRGB(
-			this.props.value,
-			HEXColorValueObject.isValidProps,
-		);
+		return colorConverter.HEXToRGB(this.props.value);
 	}
 
 	/**

lib/utils/rgb-color.value-object.ts

@@ -51,10 +51,7 @@ class RGBColorValueObject extends ValueObject<Prop> {
 	 * @example #ffffff
 	 */
 	getAsHex(): string {
-		return colorConverter.RGBToHEX(
-			this.props.value,
-			RGBColorValueObject.isValidProps,
-		);
+		return colorConverter.RGBToHEX(this.props.value);
 	}
 
 	/**

tests/utils/color-converter.util.spec.ts

@@ -17,22 +17,28 @@ describe('color-converter', () => {
 	});
 
 	it('should convert from rgb to hex', () => {
-		const converter = colorConverter.RGBToHEX('rgb(20, 250, 30)');
+		const converter = colorConverter.RGBToHEX(
+			'rgb(20, 250, 30)',
+			() => true,
+		);
 		expect(converter).toBe('#14fa1e');
 	});
 
 	it('should convert from hex to rgb', () => {
-		const converter = colorConverter.HEXToRGB('#ffffff');
+		const converter = colorConverter.HEXToRGB('#ffffff', () => true);
 		expect(converter).toBe('rgb(255, 255, 255)');
 	});
 
 	it('should return the same value if provide an invalid rgb color', () => {
-		const converter = colorConverter.RGBToHEX('rgb(300, 255, 255)');
+		const converter = colorConverter.RGBToHEX(
+			'rgb(300, 255, 255)',
+			() => false,
+		);
 		expect(converter).toBe('rgb(300, 255, 255)');
 	});
 
 	it('should return the same value if provide an invalid hex color', () => {
-		const converter = colorConverter.HEXToRGB('#invalid');
+		const converter = colorConverter.HEXToRGB('#invalid', () => false);
 		expect(converter).toBe('#invalid');
 	});
 });