Skip to content

Commit 48a81f1

Browse files
committed
fix: applied code review
1 parent e8fe8bd commit 48a81f1

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

src/utilities/phone/index.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,26 @@ export function isValidFirstNumber(phone: string): boolean {
4444
: isValidMobilePhoneFirstNumber(phone);
4545
}
4646

47-
function tryPhoneDigits(phone: string): { isValidDigits: boolean; digits: string } {
47+
function parsePhoneDigits(phone: string): { isValidDigits: boolean; digits: string } {
4848
return { isValidDigits: !!phone && typeof phone === 'string', digits: onlyNumbers(phone) };
4949
}
5050

5151
export function isValidMobilePhone(phone: string): boolean {
52-
const { isValidDigits, digits } = tryPhoneDigits(phone);
52+
const { isValidDigits, digits } = parsePhoneDigits(phone);
5353

5454
if (!isValidDigits) return false;
5555

5656
return isValidMobilePhoneLength(digits) && isValidMobilePhoneFirstNumber(digits) && isValidDDD(digits);
5757
}
5858

5959
export function isValidLandlinePhone(phone: string): boolean {
60-
const { isValidDigits, digits } = tryPhoneDigits(phone);
60+
const { isValidDigits, digits } = parsePhoneDigits(phone);
6161

6262
if (!isValidDigits) return false;
6363

6464
return isValidLandlinePhoneLength(digits) && isValidLandlinePhoneFirstNumber(digits) && isValidDDD(digits);
6565
}
6666

6767
export function isValid(phone: string): boolean {
68-
const { isValidDigits, digits } = tryPhoneDigits(phone);
69-
70-
if (!isValidDigits) return false;
71-
72-
return isValidLength(digits) && isValidFirstNumber(digits) && isValidDDD(digits);
68+
return isValidMobilePhone(phone) || isValidLandlinePhone(phone);
7369
}

0 commit comments

Comments
 (0)