@skyux/validation 5.9.6 → 5.11.2

package/bundles/skyux-validation.umd.js

@@ -1,8 +1,10 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/forms')) :
-    typeof define === 'function' && define.amd ? define('@skyux/validation', ['exports', '@angular/core', '@angular/forms'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.skyux = global.skyux || {}, global.skyux.validation = {}), global.ng.core, global.ng.forms));
-})(this, (function (exports, i0, forms) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/forms'), require('validator/es/lib/isURL')) :
+    typeof define === 'function' && define.amd ? define('@skyux/validation', ['exports', '@angular/core', '@angular/forms', 'validator/es/lib/isURL'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.skyux = global.skyux || {}, global.skyux.validation = {}), global.ng.core, global.ng.forms, global.isURL));
+})(this, (function (exports, i0, forms, isURL) { 'use strict';
+
+    function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -23,6 +25,7 @@
     }
 
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
+    var isURL__default = /*#__PURE__*/_interopDefaultLegacy(isURL);
 
     var SkyValidation = /** @class */ (function () {
         function SkyValidation() {
@@ -34,9 +37,24 @@
             var 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);
         };
-        SkyValidation.isUrl = function (url) {
+        SkyValidation.isUrl = function (value, options) {
+            if (typeof value !== 'string') {
+                return false;
+            }
+            var url = value;
             var 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__default["default"](url);
+                }
+            }
+            else {
+                return regex.test(url);
+            }
         };
         return SkyValidation;
     }());
@@ -115,34 +133,45 @@
      */
     var SkyUrlValidationDirective = /** @class */ (function () {
         function SkyUrlValidationDirective() {
+            // eslint-disable-next-line @typescript-eslint/no-empty-function
+            this._validatorChange = function () { };
         }
+        Object.defineProperty(SkyUrlValidationDirective.prototype, "skyUrlValidation", {
+            /**
+             * Specifies configuration options for the URL validation component.
+             */
+            set: function (value) {
+                this._skyUrlValidationOptions = value;
+                this._validatorChange();
+            },
+            enumerable: false,
+            configurable: true
+        });
         SkyUrlValidationDirective.prototype.validate = function (control) {
             var 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 } };
         };
-        SkyUrlValidationDirective.prototype.urlIsValid = function (url) {
-            return SkyValidation.isUrl(url);
+        SkyUrlValidationDirective.prototype.registerOnValidatorChange = function (fn) {
+            this._validatorChange = fn;
         };
         return SkyUrlValidationDirective;
     }());
     SkyUrlValidationDirective.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SkyUrlValidationDirective, deps: [], target: i0__namespace.ɵɵFactoryTarget.Directive });
-    SkyUrlValidationDirective.ɵdir = i0__namespace.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: SkyUrlValidationDirective, selector: "[skyUrlValidation]", providers: [SKY_URL_VALIDATION_VALIDATOR], ngImport: i0__namespace });
+    SkyUrlValidationDirective.ɵdir = i0__namespace.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: SkyUrlValidationDirective, selector: "[skyUrlValidation]", inputs: { skyUrlValidation: "skyUrlValidation" }, providers: [SKY_URL_VALIDATION_VALIDATOR], ngImport: i0__namespace });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SkyUrlValidationDirective, decorators: [{
                 type: i0.Directive,
                 args: [{
                         selector: '[skyUrlValidation]',
                         providers: [SKY_URL_VALIDATION_VALIDATOR],
                     }]
-            }] });
+            }], propDecorators: { skyUrlValidation: [{
+                    type: i0.Input
+                }] } });
 
     var SkyUrlValidationModule = /** @class */ (function () {
         function SkyUrlValidationModule() {
@@ -171,33 +200,43 @@
          * 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.
          */
         SkyValidators.email = function (control) {
             var 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
-         */
-        SkyValidators.url = function (control) {
-            var value = control.value;
-            if (!value) {
-                return undefined;
+        SkyValidators.url = function (value) {
+            var typeTester = value;
+            if (typeTester.rulesetVersion === undefined) {
+                // there are no SkyUrlValidationOptions passed in, so return ValidationErrors | null
+                var abstractControl = value;
+                var abstractControlValue = abstractControl.value;
+                if (!abstractControlValue) {
+                    return null;
+                }
+                return SkyValidation.isUrl(abstractControlValue)
+                    ? null
+                    : { skyUrl: { invalid: abstractControlValue } };
+            }
+            else {
+                // there are SkyUrlValidationOptions passed in, so return ValidatorFn
+                var skyUrlValidationOptions_1 = value;
+                return function (abstractControl) {
+                    var abstractControlValue = abstractControl.value;
+                    if (!abstractControlValue) {
+                        return null;
+                    }
+                    return SkyValidation.isUrl(abstractControl.value, skyUrlValidationOptions_1)
+                        ? null
+                        : { skyUrl: { invalid: abstractControl.value } };
+                };
             }
-            return SkyValidation.isUrl(value)
-                ? undefined
-                : { skyUrl: { invalid: value } };
         };
         return SkyValidators;
     }());