Merge pull request #2 from justapagamentos/feature/url-validator

Feature/url validator
justapagamentos · May 24, 2019 · d3d8175 · d3d8175
2 parents 0d84aaa + 096946c
commit d3d8175
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/projects/justa/br-validators/README.md b/projects/justa/br-validators/README.md
@@ -48,6 +48,7 @@ export class AppComponent {
 - validateCNPJ (format: xx.xxx.xxx/xxxx-xx | xxxxxxxxxxxxxx)
 - validateCPF (format: xxx.xxx.xxx-xx | xxxxxxxxxxx)
 - validatePhone (format: (xx)xxxxx-xxxx | (xx)xxxx-xxxx | xxxxxxxxxx)
+- validateURL (format: http[s]://lol.com)
 
 ## Build (dev only)
 

diff --git a/projects/justa/br-validators/package.json b/projects/justa/br-validators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@justa/ng-validators",
-  "version": "0.2.0",
+  "version": "1.0.0",
   "peerDependencies": {
     "@angular/common": "^5.0.0 || ^6.0.0 || ^7.0.0",
     "@angular/core": "^5.0.0 || ^6.0.0 || ^7.0.0",

diff --git a/projects/justa/br-validators/src/validators/index.ts b/projects/justa/br-validators/src/validators/index.ts
@@ -8,6 +8,10 @@ import * as Moment from "moment";
 
 const moment = Moment;
 
+const urlPattern = new RegExp(
+  /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/
+);
+
 /**
  * @description remove all non digits caracters
  */
@@ -60,9 +64,20 @@ function validatePhone(control: AbstractControl): ValidationErrors | null {
     : null;
 }
 
+/**
+ * @description validateURL for FormBuilder
+ */
+function validateURL(control: AbstractControl): ValidationErrors | null {
+  const controlValue = control.value;
+  return !urlPattern.test(controlValue)
+    ? { isInvalid: { expected: true, message: "URL Inválida." } }
+    : null;
+}
+
 export const jstValidators = {
   validateDate,
   validateCNPJ,
   validateCPF,
-  validatePhone
+  validatePhone,
+  validateURL
 };