@skyux/validation 5.9.7 → 5.11.1

package/esm2015/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/components/validation/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wDAAwD,CAAC;AACvE,cAAc,oDAAoD,CAAC;AACnE,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC;AAEpD,0FAA0F;AAC1F,2EAA2E;AAC3E,OAAO,EAAE,2BAA2B,IAAI,EAAE,EAAE,MAAM,2DAA2D,CAAC;AAC9G,OAAO,EAAE,yBAAyB,IAAI,EAAE,EAAE,MAAM,uDAAuD,CAAC","sourcesContent":["export * from './lib/modules/email-validation/email-validation.module';\nexport * from './lib/modules/url-validation/url-validation.module';\nexport * from './lib/modules/validation/validation';\nexport * from './lib/modules/validators/validators';\n\n// Components and directives must be exported to support Angular's \"partial\" Ivy compiler.\n// Obscure names are used to indicate types are not part of the public API.\nexport { SkyEmailValidationDirective as λ1 } from './lib/modules/email-validation/email-validation.directive';\nexport { SkyUrlValidationDirective as λ2 } from './lib/modules/url-validation/url-validation.directive';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/components/validation/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wDAAwD,CAAC;AACvE,cAAc,qDAAqD,CAAC;AACpE,cAAc,oDAAoD,CAAC;AACnE,cAAc,qCAAqC,CAAC;AACpD,cAAc,qCAAqC,CAAC;AAEpD,0FAA0F;AAC1F,2EAA2E;AAC3E,OAAO,EAAE,2BAA2B,IAAI,EAAE,EAAE,MAAM,2DAA2D,CAAC;AAC9G,OAAO,EAAE,yBAAyB,IAAI,EAAE,EAAE,MAAM,uDAAuD,CAAC","sourcesContent":["export * from './lib/modules/email-validation/email-validation.module';\nexport * from './lib/modules/url-validation/url-validation-options';\nexport * from './lib/modules/url-validation/url-validation.module';\nexport * from './lib/modules/validation/validation';\nexport * from './lib/modules/validators/validators';\n\n// Components and directives must be exported to support Angular's \"partial\" Ivy compiler.\n// Obscure names are used to indicate types are not part of the public API.\nexport { SkyEmailValidationDirective as λ1 } from './lib/modules/email-validation/email-validation.directive';\nexport { SkyUrlValidationDirective as λ2 } from './lib/modules/url-validation/url-validation.directive';\n"]}

package/esm2015/lib/modules/url-validation/url-validation-options.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=url-validation-options.js.map

package/esm2015/lib/modules/url-validation/url-validation-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-validation-options.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation-options.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * Specifies options for the URL validator component.\n */\nexport interface SkyUrlValidationOptions {\n  /**\n   * Indicates the ruleset to use for URL validation. Ruleset 1 uses a regular expression and ruleset 2 uses the third-party [validator.js library](https://github.com/validatorjs/validator.js/).\n   */\n  rulesetVersion: 1 | 2;\n}\n"]}

package/esm2015/lib/modules/url-validation/url-validation.directive.js

@@ -1,5 +1,5 @@
-import { Directive, forwardRef } from '@angular/core';
-import { NG_VALIDATORS } from '@angular/forms';
+import { Directive, Input, forwardRef } from '@angular/core';
+import { NG_VALIDATORS, } from '@angular/forms';
 import { SkyValidation } from '../validation/validation';
 import * as i0 from "@angular/core";
 // tslint:disable:no-forward-ref no-use-before-declare
@@ -15,30 +15,39 @@ const SKY_URL_VALIDATION_VALIDATOR = {
  * This directive uses `NgModel` to bind data.
  */
 export class SkyUrlValidationDirective {
+    constructor() {
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        this._validatorChange = () => { };
+    }
+    /**
+     * Specifies configuration options for the URL validation component.
+     */
+    set skyUrlValidation(value) {
+        this._skyUrlValidationOptions = value;
+        this._validatorChange();
+    }
     validate(control) {
         const value = control.value;
         if (!value) {
-            return;
-        }
-        if (!this.urlIsValid(value)) {
-            return {
-                skyUrl: {
-                    invalid: control.value,
-                },
-            };
+            return null;
         }
+        return SkyValidation.isUrl(value, this._skyUrlValidationOptions)
+            ? null
+            : { skyUrl: { invalid: value } };
     }
-    urlIsValid(url) {
-        return SkyValidation.isUrl(url);
+    registerOnValidatorChange(fn) {
+        this._validatorChange = fn;
     }
 }
 SkyUrlValidationDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: SkyUrlValidationDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-SkyUrlValidationDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: SkyUrlValidationDirective, selector: "[skyUrlValidation]", providers: [SKY_URL_VALIDATION_VALIDATOR], ngImport: i0 });
+SkyUrlValidationDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: SkyUrlValidationDirective, selector: "[skyUrlValidation]", inputs: { skyUrlValidation: "skyUrlValidation" }, providers: [SKY_URL_VALIDATION_VALIDATOR], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: SkyUrlValidationDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[skyUrlValidation]',
                     providers: [SKY_URL_VALIDATION_VALIDATOR],
                 }]
-        }] });
+        }], propDecorators: { skyUrlValidation: [{
+                type: Input
+            }] } });
 //# sourceMappingURL=url-validation.directive.js.map

package/esm2015/lib/modules/url-validation/url-validation.directive.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-validation.directive.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAmB,aAAa,EAAa,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;;AAEzD,sDAAsD;AACtD,MAAM,4BAA4B,GAAG;IACnC,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC;IACxD,KAAK,EAAE,IAAI;CACZ,CAAC;AACF,gBAAgB;AAEhB;;;;GAIG;AAKH,MAAM,OAAO,yBAAyB;IAC7B,QAAQ,CAAC,OAAwB;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO;SACR;QAED,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC3B,OAAO;gBACL,MAAM,EAAE;oBACN,OAAO,EAAE,OAAO,CAAC,KAAK;iBACvB;aACF,CAAC;SACH;IACH,CAAC;IAEM,UAAU,CAAC,GAAW;QAC3B,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;;uHAnBU,yBAAyB;2GAAzB,yBAAyB,6CAFzB,CAAC,4BAA4B,CAAC;4FAE9B,yBAAyB;kBAJrC,SAAS;mBAAC;oBACT,QAAQ,EAAE,oBAAoB;oBAC9B,SAAS,EAAE,CAAC,4BAA4B,CAAC;iBAC1C","sourcesContent":["import { Directive, forwardRef } from '@angular/core';\nimport { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\n// tslint:disable:no-forward-ref no-use-before-declare\nconst SKY_URL_VALIDATION_VALIDATOR = {\n  provide: NG_VALIDATORS,\n  useExisting: forwardRef(() => SkyUrlValidationDirective),\n  multi: true,\n};\n// tslint:enable\n\n/**\n * Creates an input to validate URLs. Place this attribute on an `input` element.\n * If users enters values that are not valid URLs, an error message appears.\n * This directive uses `NgModel` to bind data.\n */\n@Directive({\n  selector: '[skyUrlValidation]',\n  providers: [SKY_URL_VALIDATION_VALIDATOR],\n})\nexport class SkyUrlValidationDirective implements Validator {\n  public validate(control: AbstractControl): { [key: string]: any } {\n    const value = control.value;\n\n    if (!value) {\n      return;\n    }\n\n    if (!this.urlIsValid(value)) {\n      return {\n        skyUrl: {\n          invalid: control.value,\n        },\n      };\n    }\n  }\n\n  public urlIsValid(url: string): boolean {\n    return SkyValidation.isUrl(url);\n  }\n}\n"]}
+{"version":3,"file":"url-validation.directive.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAEL,aAAa,GAGd,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;;AAIzD,sDAAsD;AACtD,MAAM,4BAA4B,GAAG;IACnC,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC;IACxD,KAAK,EAAE,IAAI;CACZ,CAAC;AACF,gBAAgB;AAEhB;;;;GAIG;AAKH,MAAM,OAAO,yBAAyB;IAJtC;QAgBE,gEAAgE;QACxD,qBAAgB,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;KAiBrC;IA7BC;;OAEG;IACH,IACW,gBAAgB,CAAC,KAA0C;QACpE,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC;QACtC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAOM,QAAQ,CAAC,OAAwB;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,wBAAwB,CAAC;YAC9D,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;IACrC,CAAC;IAEM,yBAAyB,CAAC,EAAc;QAC7C,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;;uHA7BU,yBAAyB;2GAAzB,yBAAyB,+FAFzB,CAAC,4BAA4B,CAAC;4FAE9B,yBAAyB;kBAJrC,SAAS;mBAAC;oBACT,QAAQ,EAAE,oBAAoB;oBAC9B,SAAS,EAAE,CAAC,4BAA4B,CAAC;iBAC1C;8BAMY,gBAAgB;sBAD1B,KAAK","sourcesContent":["import { Directive, Input, forwardRef } from '@angular/core';\nimport {\n  AbstractControl,\n  NG_VALIDATORS,\n  ValidationErrors,\n  Validator,\n} from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\nimport { SkyUrlValidationOptions } from './url-validation-options';\n\n// tslint:disable:no-forward-ref no-use-before-declare\nconst SKY_URL_VALIDATION_VALIDATOR = {\n  provide: NG_VALIDATORS,\n  useExisting: forwardRef(() => SkyUrlValidationDirective),\n  multi: true,\n};\n// tslint:enable\n\n/**\n * Creates an input to validate URLs. Place this attribute on an `input` element.\n * If users enters values that are not valid URLs, an error message appears.\n * This directive uses `NgModel` to bind data.\n */\n@Directive({\n  selector: '[skyUrlValidation]',\n  providers: [SKY_URL_VALIDATION_VALIDATOR],\n})\nexport class SkyUrlValidationDirective implements Validator {\n  /**\n   * Specifies configuration options for the URL validation component.\n   */\n  @Input()\n  public set skyUrlValidation(value: SkyUrlValidationOptions | undefined) {\n    this._skyUrlValidationOptions = value;\n    this._validatorChange();\n  }\n\n  private _skyUrlValidationOptions: SkyUrlValidationOptions | undefined;\n\n  // eslint-disable-next-line @typescript-eslint/no-empty-function\n  private _validatorChange = () => {};\n\n  public validate(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return null;\n    }\n\n    return SkyValidation.isUrl(value, this._skyUrlValidationOptions)\n      ? null\n      : { skyUrl: { invalid: value } };\n  }\n\n  public registerOnValidatorChange(fn: () => void): void {\n    this._validatorChange = fn;\n  }\n}\n"]}

package/esm2015/lib/modules/validation/validation.js

@@ -1,3 +1,4 @@
+import isURL from 'validator/es/lib/isURL';
 export class SkyValidation {
     static isEmail(emailAddress) {
         // The regex was obtained from http://emailregex.com/
@@ -6,9 +7,24 @@ export class SkyValidation {
         const regex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return regex.test(emailAddress);
     }
-    static isUrl(url) {
+    static isUrl(value, options) {
+        if (typeof value !== 'string') {
+            return false;
+        }
+        const url = value;
         const regex = /^((http|https):\/\/)?([\w-]+\.)+[\w-]+/i;
-        return regex.test(url);
+        if (options) {
+            switch (options.rulesetVersion) {
+                case 1:
+                    return regex.test(url);
+                case 2:
+                    // we are using the `validator` package's default options
+                    return isURL(url);
+            }
+        }
+        else {
+            return regex.test(url);
+        }
     }
 }
 //# sourceMappingURL=validation.js.map

package/esm2015/lib/modules/validation/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/validation/validation.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,aAAa;IAC1B,MAAM,CAAC,OAAO,CAAC,YAAoB;QACxC,qDAAqD;QACrD,gEAAgE;QAChE,2CAA2C;QAC3C,MAAM,KAAK,GACT,sJAAsJ,CAAC;QACzJ,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAW;QAC7B,MAAM,KAAK,GAAG,yCAAyC,CAAC;QACxD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;CACF","sourcesContent":["export abstract class SkyValidation {\n  public static isEmail(emailAddress: string): boolean {\n    // The regex was obtained from http://emailregex.com/\n    // which claims to correctly handle ~99% of all email addresses.\n    // tslint:disable-next-line:max-line-length\n    const regex =\n      /^(([^<>()[\\]\\\\.,;:\\s@\"]+(\\.[^<>()[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/;\n    return regex.test(emailAddress);\n  }\n\n  public static isUrl(url: string): boolean {\n    const regex = /^((http|https):\\/\\/)?([\\w-]+\\.)+[\\w-]+/i;\n    return regex.test(url);\n  }\n}\n"]}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/validation/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAI3C,MAAM,OAAgB,aAAa;IAC1B,MAAM,CAAC,OAAO,CAAC,YAAoB;QACxC,qDAAqD;QACrD,gEAAgE;QAChE,2CAA2C;QAC3C,MAAM,KAAK,GACT,sJAAsJ,CAAC;QACzJ,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,KAAK,CACjB,KAAc,EACd,OAAiC;QAEjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,GAAW,KAAK,CAAC;QAE1B,MAAM,KAAK,GAAG,yCAAyC,CAAC;QACxD,IAAI,OAAO,EAAE;YACX,QAAQ,OAAO,CAAC,cAAc,EAAE;gBAC9B,KAAK,CAAC;oBACJ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,KAAK,CAAC;oBACJ,yDAAyD;oBACzD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;aACrB;SACF;aAAM;YACL,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACxB;IACH,CAAC;CACF","sourcesContent":["import isURL from 'validator/es/lib/isURL';\n\nimport { SkyUrlValidationOptions } from '../url-validation/url-validation-options';\n\nexport abstract class SkyValidation {\n  public static isEmail(emailAddress: string): boolean {\n    // The regex was obtained from http://emailregex.com/\n    // which claims to correctly handle ~99% of all email addresses.\n    // tslint:disable-next-line:max-line-length\n    const regex =\n      /^(([^<>()[\\]\\\\.,;:\\s@\"]+(\\.[^<>()[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/;\n    return regex.test(emailAddress);\n  }\n\n  public static isUrl(\n    value: unknown,\n    options?: SkyUrlValidationOptions\n  ): boolean {\n    if (typeof value !== 'string') {\n      return false;\n    }\n\n    const url: string = value;\n\n    const regex = /^((http|https):\\/\\/)?([\\w-]+\\.)+[\\w-]+/i;\n    if (options) {\n      switch (options.rulesetVersion) {\n        case 1:\n          return regex.test(url);\n        case 2:\n          // we are using the `validator` package's default options\n          return isURL(url);\n      }\n    } else {\n      return regex.test(url);\n    }\n  }\n}\n"]}

package/esm2015/lib/modules/validators/validators.js

@@ -7,33 +7,43 @@ export class SkyValidators {
      * Validates email addresses in reactive forms. Add this validator directly to the form control
      * model in the component class. If users enter values that are not valid email addresses, the
      * validator throws an error. Since this is a sync validator, it returns a set of validation
-     * errors or `undefined` immediately when users enter values.
-     * @param control
+     * errors or `null` immediately when users enter values.
      */
     static email(control) {
         const value = control.value;
         if (!value) {
-            return undefined;
+            return null;
         }
         return SkyValidation.isEmail(value)
-            ? undefined
+            ? null
             : { skyEmail: { invalid: value } };
     }
-    /**
-     * Validates URLs in reactive forms. Add this validator directly to the form control model in
-     * the component class. If users enter values that are not valid URLs, the validator throws an
-     * error. Since this is a sync validator, it returns a set of validation errors or `undefined`
-     * immediately when users enter values.
-     * @param control
-     */
-    static url(control) {
-        const value = control.value;
-        if (!value) {
-            return undefined;
+    static url(value) {
+        const typeTester = value;
+        if (typeTester.rulesetVersion === undefined) {
+            // there are no SkyUrlValidationOptions passed in, so return ValidationErrors | null
+            const abstractControl = value;
+            const abstractControlValue = abstractControl.value;
+            if (!abstractControlValue) {
+                return null;
+            }
+            return SkyValidation.isUrl(abstractControlValue)
+                ? null
+                : { skyUrl: { invalid: abstractControlValue } };
+        }
+        else {
+            // there are SkyUrlValidationOptions passed in, so return ValidatorFn
+            const skyUrlValidationOptions = value;
+            return (abstractControl) => {
+                const abstractControlValue = abstractControl.value;
+                if (!abstractControlValue) {
+                    return null;
+                }
+                return SkyValidation.isUrl(abstractControl.value, skyUrlValidationOptions)
+                    ? null
+                    : { skyUrl: { invalid: abstractControl.value } };
+            };
         }
-        return SkyValidation.isUrl(value)
-            ? undefined
-            : { skyUrl: { invalid: value } };
     }
 }
 //# sourceMappingURL=validators.js.map

package/esm2015/lib/modules/validators/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/validators/validators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qEAAqE;AACrE,2DAA2D;AAC3D,WAAW;AACX,MAAM,OAAO,aAAa;IACxB;;;;;;OAMG;IACI,MAAM,CAAC,KAAK,CAAC,OAAwB;QAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,GAAG,CAAC,OAAwB;QACxC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;IACrC,CAAC;CACF","sourcesContent":["import { AbstractControl, ValidationErrors } from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\n// Need to add the following to classes which contain static methods.\n// See: https://github.com/ng-packagr/ng-packagr/issues/641\n// @dynamic\nexport class SkyValidators {\n  /**\n   * Validates email addresses in reactive forms. Add this validator directly to the form control\n   * model in the component class. If users enter values that are not valid email addresses, the\n   * validator throws an error. Since this is a sync validator, it returns a set of validation\n   * errors or `undefined` immediately when users enter values.\n   * @param control\n   */\n  public static email(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return undefined;\n    }\n\n    return SkyValidation.isEmail(value)\n      ? undefined\n      : { skyEmail: { invalid: value } };\n  }\n\n  /**\n   * Validates URLs in reactive forms. Add this validator directly to the form control model in\n   * the component class. If users enter values that are not valid URLs, the validator throws an\n   * error. Since this is a sync validator, it returns a set of validation errors or `undefined`\n   * immediately when users enter values.\n   * @param control\n   */\n  public static url(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return undefined;\n    }\n\n    return SkyValidation.isUrl(value)\n      ? undefined\n      : { skyUrl: { invalid: value } };\n  }\n}\n"]}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../../../../../../libs/components/validation/src/lib/modules/validators/validators.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qEAAqE;AACrE,2DAA2D;AAC3D,WAAW;AACX,MAAM,OAAO,aAAa;IACxB;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,OAAwB;QAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;IACvC,CAAC;IAoBM,MAAM,CAAC,GAAG,CACf,KAAgD;QAEhD,MAAM,UAAU,GAAG,KAAgC,CAAC;QACpD,IAAI,UAAU,CAAC,cAAc,KAAK,SAAS,EAAE;YAC3C,oFAAoF;YACpF,MAAM,eAAe,GAAG,KAAwB,CAAC;YACjD,MAAM,oBAAoB,GAAG,eAAe,CAAC,KAAK,CAAC;YACnD,IAAI,CAAC,oBAAoB,EAAE;gBACzB,OAAO,IAAI,CAAC;aACb;YACD,OAAO,aAAa,CAAC,KAAK,CAAC,oBAAoB,CAAC;gBAC9C,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,CAAC;SACnD;aAAM;YACL,qEAAqE;YACrE,MAAM,uBAAuB,GAAG,KAAgC,CAAC;YACjE,OAAO,CAAC,eAAgC,EAA2B,EAAE;gBACnE,MAAM,oBAAoB,GAAG,eAAe,CAAC,KAAK,CAAC;gBACnD,IAAI,CAAC,oBAAoB,EAAE;oBACzB,OAAO,IAAI,CAAC;iBACb;gBAED,OAAO,aAAa,CAAC,KAAK,CACxB,eAAe,CAAC,KAAK,EACrB,uBAAuB,CACxB;oBACC,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC;YACrD,CAAC,CAAC;SACH;IACH,CAAC;CACF","sourcesContent":["import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';\n\nimport { SkyUrlValidationOptions } from '../url-validation/url-validation-options';\nimport { SkyValidation } from '../validation/validation';\n\n// Need to add the following to classes which contain static methods.\n// See: https://github.com/ng-packagr/ng-packagr/issues/641\n// @dynamic\nexport class SkyValidators {\n  /**\n   * Validates email addresses in reactive forms. Add this validator directly to the form control\n   * model in the component class. If users enter values that are not valid email addresses, the\n   * validator throws an error. Since this is a sync validator, it returns a set of validation\n   * errors or `null` immediately when users enter values.\n   */\n  public static email(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return null;\n    }\n\n    return SkyValidation.isEmail(value)\n      ? null\n      : { skyEmail: { invalid: value } };\n  }\n\n  /**\n   * Validates URLs in reactive forms. Add this validator directly to the form control model in\n   * the component class. If users enter values that are not valid URLs, the validator throws an\n   * error. Since this is a sync validator, it returns a set of validation errors or `null`\n   * immediately when users enter values.\n   */\n  public static url(abstractControl: AbstractControl): ValidationErrors | null;\n\n  /**\n   * Validates URLs in reactive forms. Add this validator with ruleset parameters directly to\n   * the form control model in the component class. If users enter values that are not valid\n   * URLs, the validator throws an error. Since this is a sync validator, it returns a set of\n   * validation errors or `null` immediately when users enter values.\n   */\n  public static url(\n    skyUrlValidationOptions: SkyUrlValidationOptions\n  ): ValidatorFn | null;\n\n  public static url(\n    value: AbstractControl | SkyUrlValidationOptions\n  ): ValidatorFn | ValidationErrors | null {\n    const typeTester = value as SkyUrlValidationOptions;\n    if (typeTester.rulesetVersion === undefined) {\n      // there are no SkyUrlValidationOptions passed in, so return ValidationErrors | null\n      const abstractControl = value as AbstractControl;\n      const abstractControlValue = abstractControl.value;\n      if (!abstractControlValue) {\n        return null;\n      }\n      return SkyValidation.isUrl(abstractControlValue)\n        ? null\n        : { skyUrl: { invalid: abstractControlValue } };\n    } else {\n      // there are SkyUrlValidationOptions passed in, so return ValidatorFn\n      const skyUrlValidationOptions = value as SkyUrlValidationOptions;\n      return (abstractControl: AbstractControl): ValidationErrors | null => {\n        const abstractControlValue = abstractControl.value;\n        if (!abstractControlValue) {\n          return null;\n        }\n\n        return SkyValidation.isUrl(\n          abstractControl.value,\n          skyUrlValidationOptions\n        )\n          ? null\n          : { skyUrl: { invalid: abstractControl.value } };\n      };\n    }\n  }\n}\n"]}

package/fesm2015/skyux-validation.js

@@ -1,6 +1,7 @@
 import * as i0 from '@angular/core';
-import { forwardRef, Directive, NgModule } from '@angular/core';
+import { forwardRef, Directive, NgModule, Input } from '@angular/core';
 import { NG_VALIDATORS, FormsModule } from '@angular/forms';
+import isURL from 'validator/es/lib/isURL';
 
 class SkyValidation {
     static isEmail(emailAddress) {
@@ -10,9 +11,24 @@ class SkyValidation {
         const regex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return regex.test(emailAddress);
     }
-    static isUrl(url) {
+    static isUrl(value, options) {
+        if (typeof value !== 'string') {
+            return false;
+        }
+        const url = value;
         const regex = /^((http|https):\/\/)?([\w-]+\.)+[\w-]+/i;
-        return regex.test(url);
+        if (options) {
+            switch (options.rulesetVersion) {
+                case 1:
+                    return regex.test(url);
+                case 2:
+                    // we are using the `validator` package's default options
+                    return isURL(url);
+            }
+        }
+        else {
+            return regex.test(url);
+        }
     }
 }
 
@@ -83,32 +99,41 @@ const SKY_URL_VALIDATION_VALIDATOR = {
  * This directive uses `NgModel` to bind data.
  */
 class SkyUrlValidationDirective {
+    constructor() {
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        this._validatorChange = () => { };
+    }
+    /**
+     * Specifies configuration options for the URL validation component.
+     */
+    set skyUrlValidation(value) {
+        this._skyUrlValidationOptions = value;
+        this._validatorChange();
+    }
     validate(control) {
         const value = control.value;
         if (!value) {
-            return;
-        }
-        if (!this.urlIsValid(value)) {
-            return {
-                skyUrl: {
-                    invalid: control.value,
-                },
-            };
+            return null;
         }
+        return SkyValidation.isUrl(value, this._skyUrlValidationOptions)
+            ? null
+            : { skyUrl: { invalid: value } };
     }
-    urlIsValid(url) {
-        return SkyValidation.isUrl(url);
+    registerOnValidatorChange(fn) {
+        this._validatorChange = fn;
     }
 }
 SkyUrlValidationDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: SkyUrlValidationDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-SkyUrlValidationDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: SkyUrlValidationDirective, selector: "[skyUrlValidation]", providers: [SKY_URL_VALIDATION_VALIDATOR], ngImport: i0 });
+SkyUrlValidationDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: SkyUrlValidationDirective, selector: "[skyUrlValidation]", inputs: { skyUrlValidation: "skyUrlValidation" }, providers: [SKY_URL_VALIDATION_VALIDATOR], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: SkyUrlValidationDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[skyUrlValidation]',
                     providers: [SKY_URL_VALIDATION_VALIDATOR],
                 }]
-        }] });
+        }], propDecorators: { skyUrlValidation: [{
+                type: Input
+            }] } });
 
 class SkyUrlValidationModule {
 }
@@ -132,33 +157,43 @@ class SkyValidators {
      * Validates email addresses in reactive forms. Add this validator directly to the form control
      * model in the component class. If users enter values that are not valid email addresses, the
      * validator throws an error. Since this is a sync validator, it returns a set of validation
-     * errors or `undefined` immediately when users enter values.
-     * @param control
+     * errors or `null` immediately when users enter values.
      */
     static email(control) {
         const value = control.value;
         if (!value) {
-            return undefined;
+            return null;
         }
         return SkyValidation.isEmail(value)
-            ? undefined
+            ? null
             : { skyEmail: { invalid: value } };
     }
-    /**
-     * Validates URLs in reactive forms. Add this validator directly to the form control model in
-     * the component class. If users enter values that are not valid URLs, the validator throws an
-     * error. Since this is a sync validator, it returns a set of validation errors or `undefined`
-     * immediately when users enter values.
-     * @param control
-     */
-    static url(control) {
-        const value = control.value;
-        if (!value) {
-            return undefined;
+    static url(value) {
+        const typeTester = value;
+        if (typeTester.rulesetVersion === undefined) {
+            // there are no SkyUrlValidationOptions passed in, so return ValidationErrors | null
+            const abstractControl = value;
+            const abstractControlValue = abstractControl.value;
+            if (!abstractControlValue) {
+                return null;
+            }
+            return SkyValidation.isUrl(abstractControlValue)
+                ? null
+                : { skyUrl: { invalid: abstractControlValue } };
+        }
+        else {
+            // there are SkyUrlValidationOptions passed in, so return ValidatorFn
+            const skyUrlValidationOptions = value;
+            return (abstractControl) => {
+                const abstractControlValue = abstractControl.value;
+                if (!abstractControlValue) {
+                    return null;
+                }
+                return SkyValidation.isUrl(abstractControl.value, skyUrlValidationOptions)
+                    ? null
+                    : { skyUrl: { invalid: abstractControl.value } };
+            };
         }
-        return SkyValidation.isUrl(value)
-            ? undefined
-            : { skyUrl: { invalid: value } };
     }
 }
 

package/fesm2015/skyux-validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"skyux-validation.js","sources":["../../../../../libs/components/validation/src/lib/modules/validation/validation.ts","../../../../../libs/components/validation/src/lib/modules/email-validation/email-validation.directive.ts","../../../../../libs/components/validation/src/lib/modules/email-validation/email-validation.module.ts","../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation.directive.ts","../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation.module.ts","../../../../../libs/components/validation/src/lib/modules/validators/validators.ts","../../../../../libs/components/validation/src/skyux-validation.ts"],"sourcesContent":["export abstract class SkyValidation {\n  public static isEmail(emailAddress: string): boolean {\n    // The regex was obtained from http://emailregex.com/\n    // which claims to correctly handle ~99% of all email addresses.\n    // tslint:disable-next-line:max-line-length\n    const regex =\n      /^(([^<>()[\\]\\\\.,;:\\s@\"]+(\\.[^<>()[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/;\n    return regex.test(emailAddress);\n  }\n\n  public static isUrl(url: string): boolean {\n    const regex = /^((http|https):\\/\\/)?([\\w-]+\\.)+[\\w-]+/i;\n    return regex.test(url);\n  }\n}\n","import { Directive, forwardRef } from '@angular/core';\nimport { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\n// tslint:disable:no-forward-ref no-use-before-declare\nconst SKY_EMAIL_VALIDATION_VALIDATOR = {\n  provide: NG_VALIDATORS,\n  useExisting: forwardRef(() => SkyEmailValidationDirective),\n  multi: true,\n};\n// tslint:enable\n\n/**\n * Creates an input to validate email addresses. Place this attribute on an `input` element.\n * If users enter values that are not valid email addresses, an error message appears.\n * The directive uses `NgModel` to bind data.\n */\n@Directive({\n  selector: '[skyEmailValidation]',\n  providers: [SKY_EMAIL_VALIDATION_VALIDATOR],\n})\nexport class SkyEmailValidationDirective implements Validator {\n  public validate(control: AbstractControl): { [key: string]: any } {\n    const value = control.value;\n\n    if (!value) {\n      return;\n    }\n\n    if (!this.emailIsValid(value)) {\n      return {\n        skyEmail: {\n          invalid: control.value,\n        },\n      };\n    }\n  }\n\n  public emailIsValid(email: string): boolean {\n    return SkyValidation.isEmail(email);\n  }\n}\n","import { NgModule } from '@angular/core';\nimport { FormsModule } from '@angular/forms';\n\nimport { SkyEmailValidationDirective } from './email-validation.directive';\n\n@NgModule({\n  declarations: [SkyEmailValidationDirective],\n  imports: [FormsModule],\n  exports: [SkyEmailValidationDirective],\n})\nexport class SkyEmailValidationModule {}\n","import { Directive, forwardRef } from '@angular/core';\nimport { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\n// tslint:disable:no-forward-ref no-use-before-declare\nconst SKY_URL_VALIDATION_VALIDATOR = {\n  provide: NG_VALIDATORS,\n  useExisting: forwardRef(() => SkyUrlValidationDirective),\n  multi: true,\n};\n// tslint:enable\n\n/**\n * Creates an input to validate URLs. Place this attribute on an `input` element.\n * If users enters values that are not valid URLs, an error message appears.\n * This directive uses `NgModel` to bind data.\n */\n@Directive({\n  selector: '[skyUrlValidation]',\n  providers: [SKY_URL_VALIDATION_VALIDATOR],\n})\nexport class SkyUrlValidationDirective implements Validator {\n  public validate(control: AbstractControl): { [key: string]: any } {\n    const value = control.value;\n\n    if (!value) {\n      return;\n    }\n\n    if (!this.urlIsValid(value)) {\n      return {\n        skyUrl: {\n          invalid: control.value,\n        },\n      };\n    }\n  }\n\n  public urlIsValid(url: string): boolean {\n    return SkyValidation.isUrl(url);\n  }\n}\n","import { NgModule } from '@angular/core';\nimport { FormsModule } from '@angular/forms';\n\nimport { SkyUrlValidationDirective } from './url-validation.directive';\n\n@NgModule({\n  declarations: [SkyUrlValidationDirective],\n  imports: [FormsModule],\n  exports: [SkyUrlValidationDirective],\n})\nexport class SkyUrlValidationModule {}\n","import { AbstractControl, ValidationErrors } from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\n// Need to add the following to classes which contain static methods.\n// See: https://github.com/ng-packagr/ng-packagr/issues/641\n// @dynamic\nexport class SkyValidators {\n  /**\n   * Validates email addresses in reactive forms. Add this validator directly to the form control\n   * model in the component class. If users enter values that are not valid email addresses, the\n   * validator throws an error. Since this is a sync validator, it returns a set of validation\n   * errors or `undefined` immediately when users enter values.\n   * @param control\n   */\n  public static email(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return undefined;\n    }\n\n    return SkyValidation.isEmail(value)\n      ? undefined\n      : { skyEmail: { invalid: value } };\n  }\n\n  /**\n   * Validates URLs in reactive forms. Add this validator directly to the form control model in\n   * the component class. If users enter values that are not valid URLs, the validator throws an\n   * error. Since this is a sync validator, it returns a set of validation errors or `undefined`\n   * immediately when users enter values.\n   * @param control\n   */\n  public static url(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return undefined;\n    }\n\n    return SkyValidation.isUrl(value)\n      ? undefined\n      : { skyUrl: { invalid: value } };\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"skyux-validation.js","sources":["../../../../../libs/components/validation/src/lib/modules/validation/validation.ts","../../../../../libs/components/validation/src/lib/modules/email-validation/email-validation.directive.ts","../../../../../libs/components/validation/src/lib/modules/email-validation/email-validation.module.ts","../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation.directive.ts","../../../../../libs/components/validation/src/lib/modules/url-validation/url-validation.module.ts","../../../../../libs/components/validation/src/lib/modules/validators/validators.ts","../../../../../libs/components/validation/src/skyux-validation.ts"],"sourcesContent":["import isURL from 'validator/es/lib/isURL';\n\nimport { SkyUrlValidationOptions } from '../url-validation/url-validation-options';\n\nexport abstract class SkyValidation {\n  public static isEmail(emailAddress: string): boolean {\n    // The regex was obtained from http://emailregex.com/\n    // which claims to correctly handle ~99% of all email addresses.\n    // tslint:disable-next-line:max-line-length\n    const regex =\n      /^(([^<>()[\\]\\\\.,;:\\s@\"]+(\\.[^<>()[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/;\n    return regex.test(emailAddress);\n  }\n\n  public static isUrl(\n    value: unknown,\n    options?: SkyUrlValidationOptions\n  ): boolean {\n    if (typeof value !== 'string') {\n      return false;\n    }\n\n    const url: string = value;\n\n    const regex = /^((http|https):\\/\\/)?([\\w-]+\\.)+[\\w-]+/i;\n    if (options) {\n      switch (options.rulesetVersion) {\n        case 1:\n          return regex.test(url);\n        case 2:\n          // we are using the `validator` package's default options\n          return isURL(url);\n      }\n    } else {\n      return regex.test(url);\n    }\n  }\n}\n","import { Directive, forwardRef } from '@angular/core';\nimport { AbstractControl, NG_VALIDATORS, Validator } from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\n// tslint:disable:no-forward-ref no-use-before-declare\nconst SKY_EMAIL_VALIDATION_VALIDATOR = {\n  provide: NG_VALIDATORS,\n  useExisting: forwardRef(() => SkyEmailValidationDirective),\n  multi: true,\n};\n// tslint:enable\n\n/**\n * Creates an input to validate email addresses. Place this attribute on an `input` element.\n * If users enter values that are not valid email addresses, an error message appears.\n * The directive uses `NgModel` to bind data.\n */\n@Directive({\n  selector: '[skyEmailValidation]',\n  providers: [SKY_EMAIL_VALIDATION_VALIDATOR],\n})\nexport class SkyEmailValidationDirective implements Validator {\n  public validate(control: AbstractControl): { [key: string]: any } {\n    const value = control.value;\n\n    if (!value) {\n      return;\n    }\n\n    if (!this.emailIsValid(value)) {\n      return {\n        skyEmail: {\n          invalid: control.value,\n        },\n      };\n    }\n  }\n\n  public emailIsValid(email: string): boolean {\n    return SkyValidation.isEmail(email);\n  }\n}\n","import { NgModule } from '@angular/core';\nimport { FormsModule } from '@angular/forms';\n\nimport { SkyEmailValidationDirective } from './email-validation.directive';\n\n@NgModule({\n  declarations: [SkyEmailValidationDirective],\n  imports: [FormsModule],\n  exports: [SkyEmailValidationDirective],\n})\nexport class SkyEmailValidationModule {}\n","import { Directive, Input, forwardRef } from '@angular/core';\nimport {\n  AbstractControl,\n  NG_VALIDATORS,\n  ValidationErrors,\n  Validator,\n} from '@angular/forms';\n\nimport { SkyValidation } from '../validation/validation';\n\nimport { SkyUrlValidationOptions } from './url-validation-options';\n\n// tslint:disable:no-forward-ref no-use-before-declare\nconst SKY_URL_VALIDATION_VALIDATOR = {\n  provide: NG_VALIDATORS,\n  useExisting: forwardRef(() => SkyUrlValidationDirective),\n  multi: true,\n};\n// tslint:enable\n\n/**\n * Creates an input to validate URLs. Place this attribute on an `input` element.\n * If users enters values that are not valid URLs, an error message appears.\n * This directive uses `NgModel` to bind data.\n */\n@Directive({\n  selector: '[skyUrlValidation]',\n  providers: [SKY_URL_VALIDATION_VALIDATOR],\n})\nexport class SkyUrlValidationDirective implements Validator {\n  /**\n   * Specifies configuration options for the URL validation component.\n   */\n  @Input()\n  public set skyUrlValidation(value: SkyUrlValidationOptions | undefined) {\n    this._skyUrlValidationOptions = value;\n    this._validatorChange();\n  }\n\n  private _skyUrlValidationOptions: SkyUrlValidationOptions | undefined;\n\n  // eslint-disable-next-line @typescript-eslint/no-empty-function\n  private _validatorChange = () => {};\n\n  public validate(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return null;\n    }\n\n    return SkyValidation.isUrl(value, this._skyUrlValidationOptions)\n      ? null\n      : { skyUrl: { invalid: value } };\n  }\n\n  public registerOnValidatorChange(fn: () => void): void {\n    this._validatorChange = fn;\n  }\n}\n","import { NgModule } from '@angular/core';\nimport { FormsModule } from '@angular/forms';\n\nimport { SkyUrlValidationDirective } from './url-validation.directive';\n\n@NgModule({\n  declarations: [SkyUrlValidationDirective],\n  imports: [FormsModule],\n  exports: [SkyUrlValidationDirective],\n})\nexport class SkyUrlValidationModule {}\n","import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';\n\nimport { SkyUrlValidationOptions } from '../url-validation/url-validation-options';\nimport { SkyValidation } from '../validation/validation';\n\n// Need to add the following to classes which contain static methods.\n// See: https://github.com/ng-packagr/ng-packagr/issues/641\n// @dynamic\nexport class SkyValidators {\n  /**\n   * Validates email addresses in reactive forms. Add this validator directly to the form control\n   * model in the component class. If users enter values that are not valid email addresses, the\n   * validator throws an error. Since this is a sync validator, it returns a set of validation\n   * errors or `null` immediately when users enter values.\n   */\n  public static email(control: AbstractControl): ValidationErrors | null {\n    const value = control.value;\n\n    if (!value) {\n      return null;\n    }\n\n    return SkyValidation.isEmail(value)\n      ? null\n      : { skyEmail: { invalid: value } };\n  }\n\n  /**\n   * Validates URLs in reactive forms. Add this validator directly to the form control model in\n   * the component class. If users enter values that are not valid URLs, the validator throws an\n   * error. Since this is a sync validator, it returns a set of validation errors or `null`\n   * immediately when users enter values.\n   */\n  public static url(abstractControl: AbstractControl): ValidationErrors | null;\n\n  /**\n   * Validates URLs in reactive forms. Add this validator with ruleset parameters directly to\n   * the form control model in the component class. If users enter values that are not valid\n   * URLs, the validator throws an error. Since this is a sync validator, it returns a set of\n   * validation errors or `null` immediately when users enter values.\n   */\n  public static url(\n    skyUrlValidationOptions: SkyUrlValidationOptions\n  ): ValidatorFn | null;\n\n  public static url(\n    value: AbstractControl | SkyUrlValidationOptions\n  ): ValidatorFn | ValidationErrors | null {\n    const typeTester = value as SkyUrlValidationOptions;\n    if (typeTester.rulesetVersion === undefined) {\n      // there are no SkyUrlValidationOptions passed in, so return ValidationErrors | null\n      const abstractControl = value as AbstractControl;\n      const abstractControlValue = abstractControl.value;\n      if (!abstractControlValue) {\n        return null;\n      }\n      return SkyValidation.isUrl(abstractControlValue)\n        ? null\n        : { skyUrl: { invalid: abstractControlValue } };\n    } else {\n      // there are SkyUrlValidationOptions passed in, so return ValidatorFn\n      const skyUrlValidationOptions = value as SkyUrlValidationOptions;\n      return (abstractControl: AbstractControl): ValidationErrors | null => {\n        const abstractControlValue = abstractControl.value;\n        if (!abstractControlValue) {\n          return null;\n        }\n\n        return SkyValidation.isUrl(\n          abstractControl.value,\n          skyUrlValidationOptions\n        )\n          ? null\n          : { skyUrl: { invalid: abstractControl.value } };\n      };\n    }\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}

package/index.d.ts

@@ -1,4 +1,5 @@
 export * from './lib/modules/email-validation/email-validation.module';
+export * from './lib/modules/url-validation/url-validation-options';
 export * from './lib/modules/url-validation/url-validation.module';
 export * from './lib/modules/validation/validation';
 export * from './lib/modules/validators/validators';

package/lib/modules/url-validation/url-validation-options.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Specifies options for the URL validator component.
+ */
+export interface SkyUrlValidationOptions {
+    /**
+     * Indicates the ruleset to use for URL validation. Ruleset 1 uses a regular expression and ruleset 2 uses the third-party [validator.js library](https://github.com/validatorjs/validator.js/).
+     */
+    rulesetVersion: 1 | 2;
+}

package/lib/modules/url-validation/url-validation.directive.d.ts

@@ -1,4 +1,5 @@
-import { AbstractControl, Validator } from '@angular/forms';
+import { AbstractControl, ValidationErrors, Validator } from '@angular/forms';
+import { SkyUrlValidationOptions } from './url-validation-options';
 import * as i0 from "@angular/core";
 /**
  * Creates an input to validate URLs. Place this attribute on an `input` element.
@@ -6,10 +7,14 @@ import * as i0 from "@angular/core";
  * This directive uses `NgModel` to bind data.
  */
 export declare class SkyUrlValidationDirective implements Validator {
-    validate(control: AbstractControl): {
-        [key: string]: any;
-    };
-    urlIsValid(url: string): boolean;
+    /**
+     * Specifies configuration options for the URL validation component.
+     */
+    set skyUrlValidation(value: SkyUrlValidationOptions | undefined);
+    private _skyUrlValidationOptions;
+    private _validatorChange;
+    validate(control: AbstractControl): ValidationErrors | null;
+    registerOnValidatorChange(fn: () => void): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SkyUrlValidationDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<SkyUrlValidationDirective, "[skyUrlValidation]", never, {}, {}, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<SkyUrlValidationDirective, "[skyUrlValidation]", never, { "skyUrlValidation": "skyUrlValidation"; }, {}, never>;
 }

package/lib/modules/validation/validation.d.ts

@@ -1,4 +1,5 @@
+import { SkyUrlValidationOptions } from '../url-validation/url-validation-options';
 export declare abstract class SkyValidation {
     static isEmail(emailAddress: string): boolean;
-    static isUrl(url: string): boolean;
+    static isUrl(value: unknown, options?: SkyUrlValidationOptions): boolean;
 }

package/lib/modules/validators/validators.d.ts

@@ -1,19 +1,25 @@
-import { AbstractControl, ValidationErrors } from '@angular/forms';
+import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+import { SkyUrlValidationOptions } from '../url-validation/url-validation-options';
 export declare class SkyValidators {
     /**
      * Validates email addresses in reactive forms. Add this validator directly to the form control
      * model in the component class. If users enter values that are not valid email addresses, the
      * validator throws an error. Since this is a sync validator, it returns a set of validation
-     * errors or `undefined` immediately when users enter values.
-     * @param control
+     * errors or `null` immediately when users enter values.
      */
     static email(control: AbstractControl): ValidationErrors | null;
     /**
      * Validates URLs in reactive forms. Add this validator directly to the form control model in
      * the component class. If users enter values that are not valid URLs, the validator throws an
-     * error. Since this is a sync validator, it returns a set of validation errors or `undefined`
+     * error. Since this is a sync validator, it returns a set of validation errors or `null`
      * immediately when users enter values.
-     * @param control
      */
-    static url(control: AbstractControl): ValidationErrors | null;
+    static url(abstractControl: AbstractControl): ValidationErrors | null;
+    /**
+     * Validates URLs in reactive forms. Add this validator with ruleset parameters directly to
+     * the form control model in the component class. If users enter values that are not valid
+     * URLs, the validator throws an error. Since this is a sync validator, it returns a set of
+     * validation errors or `null` immediately when users enter values.
+     */
+    static url(skyUrlValidationOptions: SkyUrlValidationOptions): ValidatorFn | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/validation",
-  "version": "5.9.7",
+  "version": "5.11.1",
   "author": "Blackbaud, Inc.",
   "keywords": [
     "blackbaud",
@@ -21,7 +21,8 @@
     "@angular/forms": "^12.2.16"
   },
   "dependencies": {
-    "tslib": "^2.3.1"
+    "tslib": "^2.3.1",
+    "validator": "13.7.0"
   },
   "main": "bundles/skyux-validation.umd.js",
   "module": "fesm2015/skyux-validation.js",