@zajno/common 1.5.5 → 1.5.8

package/src/validation/__tests__/validator.test.ts

@@ -92,4 +92,16 @@ describe('validation websites', () => {
     it('valid website with directory path', () => {
         expect(validation.Validators.website('http://www.regexbuddy.com/index.html?source=library')).toEqual(ValidationErrors.None);
     });
+
+    it('valid website with many dashes', () => {
+        expect(validation.Validators.website('https://www.test-test-test-test.com')).toEqual(ValidationErrors.None);
+    });
+
+    it('valid website with short domain', () => {
+        expect(validation.Validators.website('https://t.me')).toEqual(ValidationErrors.None);
+    });
+
+    it('test url with few dashes in a row', () => {
+        expect(validation.Validators.website('https://dashedurl-------.com')).toEqual(ValidationErrors.Website);
+    });
 });

package/src/validation/validators.ts

@@ -22,7 +22,7 @@ export const ValidatorsRegExps = {
     expiryDateCard: /^\d+$/,
     cvv: /^\d+$/,
     // eslint-disable-next-line no-useless-escape
-    website: /^(https?:\/\/)?([a-z0-9]+([a-z0-9\-]+\.))+[a-z]{2,}(:[0-9]{1,})?(\/.*)?$/i,
+    website: /^(https?:\/\/)?([a-z0-9]+((((-?[a-z0-9]{2,})+)?)\.))+[a-z]{2,}(:[0-9]{1,})?(\/.*)?$/i,
     linkedin: /^(https?:\/\/)?([a-z]+\d*[a-z]*\.)?linkedin\.com\/.*$/i,
 };