Merge pull request #35 from takayukister/dev/1.4

Improve isTelephoneNumber validation
rocklobster-in · Sep 24, 2024 · 54516e2 · 54516e2
2 parents 3b49453 + d4b1969
commit 54516e2
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/rules/tel.js b/rules/tel.js
@@ -5,9 +5,24 @@ export const tel = function ( formDataTree ) {
 		.map( val => val.trim() ).filter( val => '' !== val );
 
 	const isTelephoneNumber = text => {
+		text = text.replace( /[#*].*$/, '' ); // Remove extension
 		text = text.replaceAll( /[()/.*#\s-]+/g, '' );
 
-		return /^[+]?[0-9]+$/.test( text );
+		const international = text.startsWith( '+' ) || text.startsWith( '00' );
+
+		if ( international ) {
+			text = `+${ text.replace( /^[+0]+/, '' ) }`;
+		}
+
+		if ( ! /^[+]?[0-9]+$/.test( text ) ) {
+			return false;
+		}
+
+		if ( ! ( 6 < text.length && text.length < 16 ) ) {
+			return false;
+		}
+
+		return true;
 	};
 
 	if ( ! values.every( isTelephoneNumber ) ) {