adaptform 1.1.5 → 1.1.6

package/dist/core/FieldOptions.d.ts

@@ -20,4 +20,5 @@ export interface DateTimeFieldOptions extends FormFieldOptions {
     min?: Date | string | number;
     max?: Date | string | number;
     example?: string;
+    format?: string;
 }

package/dist/core/date/DateTimeField.d.ts

@@ -6,8 +6,10 @@ export declare class DateTimeField extends FormField<Date, string> {
     min: Date | null;
     max: Date | null;
     example: string;
+    format: string;
     constructor(defaultValue?: DateValue, options?: DateTimeFieldOptions);
     protected normalizeValue(value: any): Date | null;
+    protected parseByFormat(value: string, format: string): Date | null;
     get valueClear(): string | null;
     private typeValidator;
     private minValidator;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-class r {
+class l {
   _value;
   defaultValue;
   _error = null;
@@ -54,7 +54,7 @@ class r {
     return this._error = null, this.isValid;
   }
 }
-class m extends r {
+class x extends l {
   minLength;
   maxLength;
   regex;
@@ -87,9 +87,9 @@ class m extends r {
       super.value = "";
       return;
     }
-    let s = 0;
-    const l = this.mask.replace(/_/g, () => i[s++] ?? "_"), a = l.indexOf("_");
-    super.value = a === -1 ? l : l.slice(0, a);
+    let r = 0;
+    const s = this.mask.replace(/_/g, () => i[r++] ?? "_"), n = s.indexOf("_");
+    super.value = n === -1 ? s : s.slice(0, n);
   }
   minLengthValidator(t) {
     return this.minLength === null || !t ? null : t.length < this.minLength ? `Minimum ${this.minLength} characters` : null;
@@ -101,7 +101,7 @@ class m extends r {
     return t ? this.regex.test(t) ? null : this.example ? `Example: ${this.example}` : "Invalid format" : null;
   }
 }
-class d extends r {
+class p extends l {
   min;
   max;
   example;
@@ -132,28 +132,64 @@ class d extends r {
     return t === null || this.max === null ? null : t > this.max ? `Maximum value: ${this.max}` : null;
   }
 }
-class o extends r {
+class _ extends l {
   mode;
   min;
   max;
   example;
+  format;
   constructor(t = null, e = {}) {
     const i = t instanceof Date ? t : t ? new Date(t) : null;
-    super(i, e), this.mode = e.mode ?? "datetime", this.min = e.min ? new Date(e.min) : null, this.max = e.max ? new Date(e.max) : null, this.example = e.example ?? (this.mode === "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss"), this.validators.push(this.typeValidator.bind(this)), this.validators.push(this.minValidator.bind(this)), this.validators.push(this.maxValidator.bind(this));
+    super(i, e), this.mode = e.mode ?? "datetime", this.min = e.min ? new Date(e.min) : null, this.max = e.max ? new Date(e.max) : null, this.example = e.example ?? (this.mode === "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm"), this.format = e.format ?? (this.mode === "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm"), this.validators.push(this.typeValidator.bind(this)), this.validators.push(this.minValidator.bind(this)), this.validators.push(this.maxValidator.bind(this));
   }
   normalizeValue(t) {
     if (this.fieldIsEmpty(t)) return null;
     if (t instanceof Date) return isNaN(t.getTime()) ? null : t;
+    if (typeof t == "string" && this.format)
+      return this.parseByFormat(t, this.format);
     if (typeof t == "string" || typeof t == "number") {
       const e = new Date(t);
       return isNaN(e.getTime()) ? null : e;
     }
     return null;
   }
+  parseByFormat(t, e) {
+    const i = e.match(/[^A-Z]/gi);
+    if (!i) return null;
+    const r = t.split(new RegExp(`[${i.join("")}]`)), s = e.split(new RegExp("[^A-Z]+"));
+    if (r.length !== s.length) return null;
+    let n = 0, u = 0, m = 0, d = 0, c = 0, f = 0;
+    for (let o = 0; o < s.length; o++) {
+      const a = parseInt(r[o], 10);
+      if (isNaN(a)) return null;
+      switch (s[o]) {
+        case "YYYY":
+          n = a;
+          break;
+        case "MM":
+          u = a - 1;
+          break;
+        case "DD":
+          m = a;
+          break;
+        case "HH":
+          d = a;
+          break;
+        case "mm":
+          c = a;
+          break;
+        case "ss":
+          f = a;
+          break;
+      }
+    }
+    const g = new Date(n, u, m, d, c, f);
+    return isNaN(g.getTime()) ? null : g;
+  }
   get valueClear() {
     if (!this._value) return null;
-    const t = (l) => String(l).padStart(2, "0"), e = this._value.getFullYear(), i = t(this._value.getMonth() + 1), s = t(this._value.getDate());
-    return this.mode === "date" ? `${e}-${i}-${s}` : this._value.toISOString();
+    const t = (s) => String(s).padStart(2, "0"), e = this._value.getFullYear(), i = t(this._value.getMonth() + 1), r = t(this._value.getDate());
+    return this.mode === "date" ? `${e}-${i}-${r}` : this._value.toISOString();
   }
   typeValidator(t) {
     return t === null ? this.isRequired ? `Example: ${this.example}` : null : !(t instanceof Date) || isNaN(t.getTime()) ? this.example ? `Example: ${this.example}` : "Invalid date format" : null;
@@ -166,22 +202,22 @@ class o extends r {
     return !t || !this.max ? null : t > this.max ? `Date must be before ${this.formatDate(this.max)}` : null;
   }
   formatDate(t) {
-    const e = (u) => String(u).padStart(2, "0"), i = t.getFullYear(), s = e(t.getMonth() + 1), l = e(t.getDate()), a = e(t.getHours()), h = e(t.getMinutes());
-    return this.mode === "date" ? `${i}-${s}-${l}` : `${i}-${s}-${l} ${a}:${h}`;
+    const e = (m) => String(m).padStart(2, "0"), i = t.getFullYear(), r = e(t.getMonth() + 1), s = e(t.getDate()), n = e(t.getHours()), u = e(t.getMinutes());
+    return this.mode === "date" ? `${i}-${r}-${s}` : `${i}-${r}-${s} ${n}:${u}`;
   }
 }
-class c {
+class V {
   _errors = {};
   get declaredFields() {
     return Object.keys(this).filter(
-      (t) => this[t] instanceof r
+      (t) => this[t] instanceof l
     );
   }
   checkValid() {
     let t = !0;
     for (const e of this.declaredFields) {
       const i = this[e];
-      i instanceof r && (i.checkValid(), (i.isValid === !1 || i.isValid === null && i.isRequired) && (t = !1));
+      i instanceof l && (i.checkValid(), (i.isValid === !1 || i.isValid === null && i.isRequired) && (t = !1));
     }
     return t;
   }
@@ -189,14 +225,14 @@ class c {
     const t = {};
     for (const e of this.declaredFields) {
       const i = this[e];
-      t[e] = i instanceof r ? i.valueClear : i;
+      t[e] = i instanceof l ? i.valueClear : i;
     }
     return t;
   }
   get valueArray() {
     return this.declaredFields.map((t) => {
       const e = this[t];
-      return e instanceof r ? e.valueClear : e;
+      return e instanceof l ? e.valueClear : e;
     });
   }
   get errors() {
@@ -205,7 +241,7 @@ class c {
   set errors(t) {
     for (const e in t) {
       const i = this[e];
-      i instanceof r ? i.error = t[e] : this._errors[e] = t[e];
+      i instanceof l ? i.error = t[e] : this._errors[e] = t[e];
     }
   }
   set fields(t) {
@@ -214,31 +250,31 @@ class c {
         throw new Error(
           `Field "${e}" is not declared in form "${this.constructor.name}"`
         );
-      const i = this[e], s = t[e];
-      i instanceof r ? i.value = s : this[e] = s;
+      const i = this[e], r = t[e];
+      i instanceof l ? i.value = r : this[e] = r;
     }
   }
   setFieldValue(t, e) {
     const i = this[t];
-    i instanceof r ? i.value = e : this[t] = e;
+    i instanceof l ? i.value = e : this[t] = e;
   }
   getFieldValue(t) {
     const e = this[t];
-    return e instanceof r ? e.valueClear : e;
+    return e instanceof l ? e.valueClear : e;
   }
   reset() {
     for (const t of this.declaredFields) {
       const e = this[t];
-      e instanceof r && e.reset();
+      e instanceof l && e.reset();
     }
     for (const t of Object.keys(this._errors)) delete this._errors[t];
     return this;
   }
 }
 export {
-  o as DateTimeField,
-  c as Form,
-  r as FormField,
-  d as NumberField,
-  m as StringField
+  _ as DateTimeField,
+  V as Form,
+  l as FormField,
+  p as NumberField,
+  x as StringField
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adaptform",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "type": "module",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",