jails.stdlib 1.2.0 → 2.0.0

package/form-validation/index.js

@@ -1,96 +1,104 @@
-var T = Object.defineProperty, B = Object.defineProperties;
-var C = Object.getOwnPropertyDescriptors;
-var D = Object.getOwnPropertySymbols;
-var G = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
-var A = (a, r, e) => r in a ? T(a, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[r] = e, m = (a, r) => {
+var C = Object.defineProperty, G = Object.defineProperties;
+var H = Object.getOwnPropertyDescriptors;
+var h = Object.getOwnPropertySymbols;
+var L = Object.prototype.hasOwnProperty, M = Object.prototype.propertyIsEnumerable;
+var A = (t, r, e) => r in t ? C(t, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[r] = e, v = (t, r) => {
   for (var e in r || (r = {}))
-    G.call(r, e) && A(a, e, r[e]);
-  if (D)
-    for (var e of D(r))
-      H.call(r, e) && A(a, e, r[e]);
-  return a;
-}, L = (a, r) => B(a, C(r));
-const M = "form-validation", g = "[data-validation]", J = "[data-mask]";
-function U({
-  main: a,
+    L.call(r, e) && A(t, e, r[e]);
+  if (h)
+    for (var e of h(r))
+      M.call(r, e) && A(t, e, r[e]);
+  return t;
+}, w = (t, r) => G(t, H(r));
+var y = (t, r) => {
+  var e = {};
+  for (var a in t)
+    L.call(t, a) && r.indexOf(a) < 0 && (e[a] = t[a]);
+  if (t != null && h)
+    for (var a of h(t))
+      r.indexOf(a) < 0 && M.call(t, a) && (e[a] = t[a]);
+  return e;
+};
+const S = "form-validation", p = "[data-validation]", J = "[data-mask]";
+function W({
+  main: t,
   elm: r,
   state: e,
-  on: n,
-  emit: v,
-  dependencies: y,
-  trigger: F
+  on: a,
+  emit: g,
+  dependencies: N,
+  trigger: O
 }) {
-  var k;
-  const { validations: h, masks: E } = y, f = (k = r.querySelector("input,select,textarea")) == null ? void 0 : k.form;
-  let u = S(f);
-  a((t) => {
-    n("input", "input, textarea, select", z), n("input", J, $), n("input", g, p("input")), n("change", g, p("change")), n("blur", g, p("blur")), n("focus", "input, textarea, select", N), n("blur", "input, textarea, select", O), f.addEventListener("reset", j), f.addEventListener("submit", _), I();
-  }), r.setValues = (t) => {
-    e.set((s) => s.form.values = m(m({}, s.form.values), t));
+  var V;
+  const u = y(N, []), f = (V = r.querySelector("input,select,textarea")) == null ? void 0 : V.form;
+  let m = I(f);
+  t((s) => {
+    a("input", "input, textarea, select", j), a("input", J, K), a("input", p, b("input")), a("change", p, b("change")), a("blur", p, b("blur")), a("focus", "input, textarea, select", _), a("blur", "input, textarea, select", $), f.addEventListener("reset", T), f.addEventListener("submit", q), z();
+  }), r.setValues = (s) => {
+    e.set((o) => o.form.values = v(v({}, o.form.values), s));
   };
-  const I = () => {
-    if (!h)
+  const z = () => {
+    if (!u)
       throw new Error(
-        "<form-validation> - No validations provided in dependencies"
+        "<form-validation> - No entities provided in dependencies"
       );
-    const t = V();
-    e.set((s) => s.form.values = t);
-  }, V = () => {
-    const t = {};
-    return u.forEach((s) => t[s] = ""), t;
-  }, N = (t) => {
-    const s = t.target.name;
-    e.set((o) => {
-      o.form.touched[s] = !0, o.form.focused[s] = !0;
+    const s = E();
+    e.set((o) => o.form.values = s);
+  }, E = () => {
+    const s = {};
+    return m.forEach((o) => s[o] = ""), s;
+  }, _ = (s) => {
+    const o = s.target.name;
+    e.set((n) => {
+      n.form.touched[o] = !0, n.form.focused[o] = !0;
     });
-  }, O = (t) => {
-    const s = t.target.name;
-    e.set((o) => {
-      o.form.focused[s] = !1;
+  }, $ = (s) => {
+    const o = s.target.name;
+    e.set((n) => {
+      n.form.focused[o] = !1;
     });
-  }, p = (t) => (s) => {
-    const o = s.target, i = o.name, c = w(o, f), b = o.dataset.validation.split(/\s/), d = [], x = e.get();
-    b.forEach((l) => {
-      if (l in h) {
-        const { ok: q, message: K } = h[l](
-          c,
-          o,
-          f
-        );
-        q || d.push(K);
+  }, b = (s) => (o) => {
+    const n = o.target, c = n.name, l = F(n, f), k = n.dataset.validation.split(/\s/), d = [], x = e.get();
+    k.forEach((i) => {
+      if (i in u) {
+        const D = u[i];
+        if (!D.validate(l, n, f)) {
+          const B = D.message(l, n, f);
+          d.push(B);
+        }
       }
-    }), d.length ? t === "input" ? (u.add(o.name), e.set((l) => {
-      l.form.isValid = !1, x.form.errors[i] && d[0] != x.form.errors[i] && (l.form.errors[i] = d[0]);
-    })) : (t === "blur" || t === "change") && (u.add(o.name), e.set((l) => {
-      l.form.errors[i] = d[0], l.form.isValid = !1;
-    })) : (u.delete(o.name), e.set((l) => {
-      delete l.form.errors[i], u.size || (l.form.isValid = !0);
+    }), d.length ? s === "input" ? (m.add(n.name), e.set((i) => {
+      i.form.isValid = !1, x.form.errors[c] && d[0] != x.form.errors[c] && (i.form.errors[c] = d[0]);
+    })) : (s === "blur" || s === "change") && (m.add(n.name), e.set((i) => {
+      i.form.errors[c] = d[0], i.form.isValid = !1;
+    })) : (m.delete(n.name), e.set((i) => {
+      delete i.form.errors[c], m.size || (i.form.isValid = !0);
     }));
-  }, z = (t) => {
-    const { name: s } = t.target, o = w(t.target, f);
-    e.set((i) => i.form.values[s] = o);
-  }, _ = (t) => {
-    t.preventDefault(), F("blur", g);
-    const o = e.get().form.errors;
-    if (Object.keys(o).length)
-      v(`${M}:error`, { errors: o });
+  }, j = (s) => {
+    const { name: o } = s.target, n = F(s.target, f);
+    e.set((c) => c.form.values[o] = n);
+  }, q = (s) => {
+    s.preventDefault(), O("blur", p);
+    const n = e.get().form.errors;
+    if (Object.keys(n).length)
+      g(`${S}:error`, { errors: n });
     else {
-      const c = Q(t.target);
-      v(`${M}:submit`, m({}, c));
+      const l = Q(s.target);
+      g(`${S}:submit`, v({}, l));
     }
-  }, $ = (t) => {
-    let s = t.target.value;
-    const { mask: o } = t.target.dataset;
-    o.split(/s/).forEach((c) => {
-      if (c && c in E) {
-        const b = E[c];
-        s = b(s, t.target, t.target.form);
+  }, K = (s) => {
+    let o = s.target.value;
+    const { mask: n } = s.target.dataset;
+    n.split(/s/).forEach((l) => {
+      if (u[l] && u[l].mask) {
+        const k = u[l].mask;
+        o = k(o, s.target, s.target.form);
       }
-    }), e.set((c) => c.form.values[t.target.name] = s || "");
-  }, j = () => {
-    u = S(f), e.set({
-      form: L(m({}, P.form), {
-        values: V()
+    }), e.set((l) => l.form.values[s.target.name] = o || "");
+  }, T = () => {
+    m = I(f), e.set({
+      form: w(v({}, P.form), {
+        values: E()
       })
     });
   };
@@ -103,19 +111,19 @@ const P = {
     isValid: !1,
     focused: {}
   }
-}, Q = (a) => {
-  const r = new FormData(a), e = {};
-  for (let [n, v] of r)
-    e[n] = v;
+}, Q = (t) => {
+  const r = new FormData(t), e = {};
+  for (let [a, g] of r)
+    e[a] = g;
   return { formData: r, data: e };
-}, w = (a, r) => {
-  const { name: e, type: n } = a;
-  return n == "checkbox" ? a.checked ? a.value : "" : r[e].value;
-}, S = (a) => {
+}, F = (t, r) => {
+  const { name: e, type: a } = t;
+  return a == "checkbox" ? t.checked ? t.value : "" : r[e].value;
+}, I = (t) => {
   const r = /* @__PURE__ */ new Set();
-  return Array.from(a.elements).filter((e) => e.name && e.dataset.validation).forEach((e) => r.add(e.name)), r;
+  return Array.from(t.elements).filter((e) => e.name && e.dataset.validation).forEach((e) => r.add(e.name)), r;
 };
 export {
-  U as default,
+  W as default,
   P as model
 };

package/form-validation/index.ts

@@ -12,7 +12,7 @@ export default function formValidation({
 	trigger,
 }) {
 	//
-	const { validations, masks } = dependencies
+	const { ...entities } = dependencies
 	const form = elm.querySelector('input,select,textarea')?.form
 	let fields = getFields(form)
 
@@ -36,9 +36,9 @@ export default function formValidation({
 	}
 
 	const initialValues = () => {
-		if (!validations) {
+		if (!entities) {
 			throw new Error(
-				'<form-validation> - No validations provided in dependencies'
+				'<form-validation> - No entities provided in dependencies'
 			)
 		}
 		const fields = getInitialValues()
@@ -75,13 +75,11 @@ export default function formValidation({
 		const currentState = state.get()
 
 		validationList.forEach((validation) => {
-			if (validation in validations) {
-				const { ok, message } = validations[validation](
-					value,
-					input,
-					form
-				)
+			if (validation in entities) {
+				const entity = entities[validation]
+				const ok = entity.validate( value, input, form )
 				if (!ok) {
+					const message = entity.message( value, input, form)
 					errorsList.push(message)
 				}
 			}
@@ -145,8 +143,8 @@ export default function formValidation({
 		const allMasks = mask.split(/s/)
 
 		allMasks.forEach((mask) => {
-			if (mask && mask in masks) {
-				const fn = masks[mask]
+			if (entities[mask] && entities[mask].mask) {
+				const fn = entities[mask].mask
 				value = fn(value, e.target, e.target.form)
 			}
 		})

package/form-validation/index.umd.js

@@ -1 +1 @@
-(function(a,r){typeof exports=="object"&&typeof module!="undefined"?r(exports):typeof define=="function"&&define.amd?define(["exports"],r):(a=typeof globalThis!="undefined"?globalThis:a||self,r(a["form-validation"]={}))})(this,(function(a){"use strict";var H=Object.defineProperty,J=Object.defineProperties;var Q=Object.getOwnPropertyDescriptors;var L=Object.getOwnPropertySymbols;var R=Object.prototype.hasOwnProperty,U=Object.prototype.propertyIsEnumerable;var w=(a,r,n)=>r in a?H(a,r,{enumerable:!0,configurable:!0,writable:!0,value:n}):a[r]=n,p=(a,r)=>{for(var n in r||(r={}))R.call(r,n)&&w(a,n,r[n]);if(L)for(var n of L(r))U.call(r,n)&&w(a,n,r[n]);return a},O=(a,r)=>J(a,Q(r));const r="form-validation",n="[data-validation]",T="[data-mask]";function _({main:f,elm:c,state:t,on:i,emit:h,dependencies:F,trigger:I}){var S;const{validations:b,masks:y}=F,m=(S=c.querySelector("input,select,textarea"))==null?void 0:S.form;let v=x(m);f(e=>{i("input","input, textarea, select",q),i("input",T,P),i("input",n,E("input")),i("change",n,E("change")),i("blur",n,E("blur")),i("focus","input, textarea, select",z),i("blur","input, textarea, select",$),m.addEventListener("reset",B),m.addEventListener("submit",K),N()}),c.setValues=e=>{t.set(s=>s.form.values=p(p({},s.form.values),e))};const N=()=>{if(!b)throw new Error("<form-validation> - No validations provided in dependencies");const e=D();t.set(s=>s.form.values=e)},D=()=>{const e={};return v.forEach(s=>e[s]=""),e},z=e=>{const s=e.target.name;t.set(o=>{o.form.touched[s]=!0,o.form.focused[s]=!0})},$=e=>{const s=e.target.name;t.set(o=>{o.form.focused[s]=!1})},E=e=>s=>{const o=s.target,u=o.name,d=M(o,m),V=o.dataset.validation.split(/\s/),g=[],A=t.get();V.forEach(l=>{if(l in b){const{ok:C,message:G}=b[l](d,o,m);C||g.push(G)}}),g.length?e==="input"?(v.add(o.name),t.set(l=>{l.form.isValid=!1,A.form.errors[u]&&g[0]!=A.form.errors[u]&&(l.form.errors[u]=g[0])})):(e==="blur"||e==="change")&&(v.add(o.name),t.set(l=>{l.form.errors[u]=g[0],l.form.isValid=!1})):(v.delete(o.name),t.set(l=>{delete l.form.errors[u],v.size||(l.form.isValid=!0)}))},q=e=>{const{name:s}=e.target,o=M(e.target,m);t.set(u=>u.form.values[s]=o)},K=e=>{e.preventDefault(),I("blur",n);const o=t.get().form.errors;if(Object.keys(o).length)h(`${r}:error`,{errors:o});else{const d=j(e.target);h(`${r}:submit`,p({},d))}},P=e=>{let s=e.target.value;const{mask:o}=e.target.dataset;o.split(/s/).forEach(d=>{if(d&&d in y){const V=y[d];s=V(s,e.target,e.target.form)}}),t.set(d=>d.form.values[e.target.name]=s||"")},B=()=>{v=x(m),t.set({form:O(p({},k.form),{values:D()})})}}const k={form:{errors:{},values:{},touched:{},isValid:!1,focused:{}}},j=f=>{const c=new FormData(f),t={};for(let[i,h]of c)t[i]=h;return{formData:c,data:t}},M=(f,c)=>{const{name:t,type:i}=f;return i=="checkbox"?f.checked?f.value:"":c[t].value},x=f=>{const c=new Set;return Array.from(f.elements).filter(t=>t.name&&t.dataset.validation).forEach(t=>c.add(t.name)),c};a.default=_,a.model=k,Object.defineProperties(a,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})}));
+(function(t,s){typeof exports=="object"&&typeof module!="undefined"?s(exports):typeof define=="function"&&define.amd?define(["exports"],s):(t=typeof globalThis!="undefined"?globalThis:t||self,s(t["form-validation"]={}))})(this,(function(t){"use strict";var Q=Object.defineProperty,R=Object.defineProperties;var U=Object.getOwnPropertyDescriptors;var E=Object.getOwnPropertySymbols;var T=Object.prototype.hasOwnProperty,_=Object.prototype.propertyIsEnumerable;var O=(t,s,n)=>s in t?Q(t,s,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[s]=n,b=(t,s)=>{for(var n in s||(s={}))T.call(s,n)&&O(t,n,s[n]);if(E)for(var n of E(s))_.call(s,n)&&O(t,n,s[n]);return t},j=(t,s)=>R(t,U(s));var F=(t,s)=>{var n={};for(var i in t)T.call(t,i)&&s.indexOf(i)<0&&(n[i]=t[i]);if(t!=null&&E)for(var i of E(t))s.indexOf(i)<0&&_.call(t,i)&&(n[i]=t[i]);return n};const s="form-validation",n="[data-validation]",i="[data-mask]";function I({main:d,elm:f,state:o,on:l,emit:k,dependencies:z,trigger:$}){var A;const g=F(z,[]),v=(A=f.querySelector("input,select,textarea"))==null?void 0:A.form;let p=D(v);d(e=>{l("input","input, textarea, select",B),l("input",i,G),l("input",n,V("input")),l("change",n,V("change")),l("blur",n,V("blur")),l("focus","input, textarea, select",K),l("blur","input, textarea, select",P),v.addEventListener("reset",H),v.addEventListener("submit",C),q()}),f.setValues=e=>{o.set(r=>r.form.values=b(b({},r.form.values),e))};const q=()=>{if(!g)throw new Error("<form-validation> - No entities provided in dependencies");const e=S();o.set(r=>r.form.values=e)},S=()=>{const e={};return p.forEach(r=>e[r]=""),e},K=e=>{const r=e.target.name;o.set(a=>{a.form.touched[r]=!0,a.form.focused[r]=!0})},P=e=>{const r=e.target.name;o.set(a=>{a.form.focused[r]=!1})},V=e=>r=>{const a=r.target,m=a.name,u=x(a,v),y=a.dataset.validation.split(/\s/),h=[],L=o.get();y.forEach(c=>{if(c in g){const w=g[c];if(!w.validate(u,a,v)){const J=w.message(u,a,v);h.push(J)}}}),h.length?e==="input"?(p.add(a.name),o.set(c=>{c.form.isValid=!1,L.form.errors[m]&&h[0]!=L.form.errors[m]&&(c.form.errors[m]=h[0])})):(e==="blur"||e==="change")&&(p.add(a.name),o.set(c=>{c.form.errors[m]=h[0],c.form.isValid=!1})):(p.delete(a.name),o.set(c=>{delete c.form.errors[m],p.size||(c.form.isValid=!0)}))},B=e=>{const{name:r}=e.target,a=x(e.target,v);o.set(m=>m.form.values[r]=a)},C=e=>{e.preventDefault(),$("blur",n);const a=o.get().form.errors;if(Object.keys(a).length)k(`${s}:error`,{errors:a});else{const u=N(e.target);k(`${s}:submit`,b({},u))}},G=e=>{let r=e.target.value;const{mask:a}=e.target.dataset;a.split(/s/).forEach(u=>{if(g[u]&&g[u].mask){const y=g[u].mask;r=y(r,e.target,e.target.form)}}),o.set(u=>u.form.values[e.target.name]=r||"")},H=()=>{p=D(v),o.set({form:j(b({},M.form),{values:S()})})}}const M={form:{errors:{},values:{},touched:{},isValid:!1,focused:{}}},N=d=>{const f=new FormData(d),o={};for(let[l,k]of f)o[l]=k;return{formData:f,data:o}},x=(d,f)=>{const{name:o,type:l}=d;return l=="checkbox"?d.checked?d.value:"":f[o].value},D=d=>{const f=new Set;return Array.from(d.elements).filter(o=>o.name&&o.dataset.validation).forEach(o=>f.add(o.name)),f};t.default=I,t.model=M,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})}));

package/form-validation/readme.md

@@ -44,9 +44,9 @@ on('form-validation:error', ({ errors }) => {})
 ##### main.ts
 ```ts
 import * as formValidation from 'jails.stdlib/form-validation'
-import rules from './my-custom-rules'
+import * as entities from './my-entities'
 
-jails.register('form-validation', formValidation, { ...rules })
+jails.register('form-validation', formValidation, { ...entities })
 jails.start()
 ```
 
@@ -84,37 +84,62 @@ jails.start()
 ```
 
 ##### my-custom-rules/index.ts
+You need to provide a map of entities that will be used to validate the kind of your form fields.
+They all need to implement: `validate()`, `message()`. Optional: `mask()`.
+
+##### Example
+
 ```ts
-export default {
-    
-    validations : {
-        
-        required(value, input, form) {
-            if (!value) return { ok: false, message: 'This field is required'}
-            return { ok: true }
-        },
-    
-        email(value, input, form) {
-            if (!value) return { ok: true }
-            if (!value.match(/(.*)@(.*)\.\w{2,}/)) return { ok: false, message: 'Invalid email' }
-            return { ok: true }
-        },
-    
-        number(value, input, form) {
-            if (value.match(/\D/g)) return { ok: false, message:'This field takes only number' }
-            return { ok: true }
-        }
+import * as formValidation from 'jails.stdlib/form-validation'
+import { email, number, required } from './my-entities'
+
+jails.register('form-validation', formValidation, { email, number, required })
+jails.start()
+```
+
+**./my-entities.ts**
+
+```ts
+export const email = {
+    validate( value, input, form ) {
+       if (!value) return true
+       if (!value.match(/(.*)@(.*)\.\w{2,}/)) return false
+       return true
+    },
+    mask() {
+        // I don't have a mask
     },
+    message( value, input, form ) {
+        return `Invalid Email`
+    }
+}
 
-    masks: {
-        number(value, input, form) {
-            return value.replace(/\D/, '')
-        }
+export const required = {
+    validate(value, input, form) {
+        if (!value) return false
+        return true 
+    },
+    mask(value, input, form) {
+        // I don't have a mask
+    },
+    message(value, input, form) {
+        return `This field is required`
+    }
+}
+
+export const number = {
+    validate(value, input, form) {
+        if (value.match(/\D/g)) return false
+        return true 
+    },
+    mask(value, input, form) {
+        return value.replace(/\D/, '')
+    },
+    message() {
+       return `This field accepts only number` 
     }
 }
 ```
- 
-To see how to inject this dependency, go back to the [usage](#usage) section.
 
 
 ##### element.setValues(...data)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jails.stdlib",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "The Jails Standard Library",
   "types": "index.d.ts",
   "repository": {