@fluid-topics/ft-wc-utils 2.0.36 → 2.0.37

package/build/ft-input/FtInput.js

@@ -4,10 +4,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { property, state } from "lit/decorators.js";
+import { processValidationRules, } from "./ValidationRules";
+import { property, state, } from "lit/decorators.js";
 import { repeat } from "lit/directives/repeat.js";
 import { when } from "lit/directives/when.js";
-import { html } from "lit";
+import { html, } from "lit";
 import { applyMixinOnce } from "../helpers";
 export var ValidateOn;
 (function (ValidateOn) {
@@ -66,8 +67,8 @@ export const toFtInput = applyMixinOnce(Symbol("toFtInput"), function (ElementCl
             }
         }
         triggerValidation() {
-            this.errorMessages = this.processRules([...this.errorRules, ...this.additionalErrorRules]);
-            this.warningMessages = this.processRules([...this.warningRules, ...this.additionalWarningRules]);
+            this.errorMessages = processValidationRules(this.value, ([...this.errorRules, ...this.additionalErrorRules]));
+            this.warningMessages = processValidationRules(this.value, ([...this.warningRules, ...this.additionalWarningRules]));
             this.status = this.resolveStatus();
             this.dispatchEvent(new InputValidationEvent(this.status));
         }
@@ -96,11 +97,6 @@ export const toFtInput = applyMixinOnce(Symbol("toFtInput"), function (ElementCl
                     : this.warningMessages.length ? Status.warning
                         : Status.default;
         }
-        processRules(rules) {
-            return rules.map((r) => r(this.value))
-                .filter((s) => s !== true)
-                .map((e) => e);
-        }
     }
     __decorate([
         property()

package/build/ft-input/ValidationRules.d.ts

@@ -1,6 +1,8 @@
 export type ValidationRule<V> = (value?: V) => true | string;
 export declare const ValidationRules: {
     required: (message: string) => ValidationRule<string>;
+    regex: (regex: RegExp, message: string) => ValidationRule<string>;
     email: (message: string) => ValidationRule<string>;
     url: (message: string) => ValidationRule<string>;
 };
+export declare function processValidationRules<V>(value: V | undefined, rules: ValidationRule<V>[]): string[];

package/build/ft-input/ValidationRules.js

@@ -1,13 +1,30 @@
 const URL_REGEX = /^[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/;
 const EMAIL_REGEX = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
+function testRegex(regex, message, v) {
+    if (!v) {
+        return true;
+    }
+    if (!regex.test(v)) {
+        return message;
+    }
+    return true;
+}
 export const ValidationRules = {
     required: function (message) {
         return (v) => (!!v || message);
     },
+    regex: function (regex, message) {
+        return (v) => testRegex(regex, message, v);
+    },
     email: function (message) {
-        return (v) => ((!v || EMAIL_REGEX.test(v.toString())) || message);
+        return (v) => testRegex(EMAIL_REGEX, message, v);
     },
     url: function (message) {
-        return (v) => ((!v || URL_REGEX.test(v.toString())) || message);
+        return (v) => testRegex(URL_REGEX, message, v);
     },
 };
+export function processValidationRules(value, rules) {
+    return rules.map((r) => r(value))
+        .filter((s) => s !== true)
+        .map((e) => e);
+}