cja-phoenix 0.14.3 → 0.14.5

package/dist/cja-phoenix.es.js

@@ -1839,13 +1839,26 @@ const Om = (e, t) => {
 }), Am = (e, t) => {
   const a = (t == null ? void 0 : t.format) == "mm/yyyy" ? 2 : 3, n = (t == null ? void 0 : t.format) == "mm/yyyy" ? 1 : 2;
   let r = go().transform(
-    (s, i) => !(i instanceof Date) && ((t == null ? void 0 : t.format) == "dd/mm/yyyy" || !(t != null && t.format)) && i.split("/").length == 3 && i.split("/")[2].length == 4 || (t == null ? void 0 : t.format) == "mm/yyyy" && i.split("/").length == 2 && i.split("/")[1].length == 4 ? new Date(i.split("/").reverse().join("-")) : s
-  ).typeError(e.invalid).test(
+    (s, i) => i == "phone_number" || i instanceof Date ? s : i
+  ).transform((s) => {
+    if (s.split) {
+      const i = s.split("/");
+      switch (t == null ? void 0 : t.format) {
+        case "dd/mm/yyyy":
+          if (i.length == 3 || i[2].length == 4)
+            return new Date(i.reverse().join("-"));
+        case "mm/yyyy":
+          if (i.length == 2 || i[1].length == 4)
+            return new Date(i.reverse().join("-"));
+      }
+    }
+    return s;
+  }).typeError(e.invalid).test(
     "dateTest",
     e.invalid,
     (s, i) => i.originalValue.split("/").length == a && i.originalValue.split("/")[n].length == 4
   );
-  return e.required && (r = r.required(e.required)), (t == null ? void 0 : t.maxDate) && e.maxDate && (r = r.min(t.maxDate, e.maxDate)), (t == null ? void 0 : t.minDate) && e.minDate && (r = r.max(t.minDate, e.minDate)), r;
+  return e.required && (r = r.required(e.required)), (t == null ? void 0 : t.minDate) && e.minDate && (r = r.min(t.minDate, e.minDate)), (t == null ? void 0 : t.maxDate) && e.maxDate && (r = r.max(t.maxDate, e.maxDate)), r;
 }, Im = (e) => {
   let t = Xa().transform((a) => a).min(9, e.invalid).test("nifTest", e.invalid, (a) => {
     if (!a)

package/dist/types/components/forms/DateInput.vue.d.ts

@@ -10,10 +10,10 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<"vertical" | "horizontal">;
         default: string;
     };
-    maxDate: {
+    minDate: {
         type: import("vue").PropType<string>;
     };
-    minDate: {
+    maxDate: {
         type: import("vue").PropType<string>;
     };
     size: {
@@ -64,10 +64,10 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<"vertical" | "horizontal">;
         default: string;
     };
-    maxDate: {
+    minDate: {
         type: import("vue").PropType<string>;
     };
-    minDate: {
+    maxDate: {
         type: import("vue").PropType<string>;
     };
     size: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cja-phoenix",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "scripts": {
     "build:dev": "rimraf dist && vue-tsc && vite build -m development",
     "build:link": "rimraf dist && vue-tsc && vite build -m development && npm link",

package/src/utils/formValidations.ts

@@ -165,16 +165,26 @@ export const date = (
   let validation = yup
     .date()
     .transform((v, ogV) =>
-      (!(ogV instanceof Date) &&
-        (options?.format == "dd/mm/yyyy" || !options?.format) &&
-        ogV.split("/").length == 3 &&
-        ogV.split("/")[2].length == 4) ||
-      (options?.format == "mm/yyyy" &&
-        ogV.split("/").length == 2 &&
-        ogV.split("/")[1].length == 4)
-        ? new Date(ogV.split("/").reverse().join("-"))
-        : v
+      // ogV as "phone_number" is still as of yet unexplained
+      ogV == "phone_number" || ogV instanceof Date ? v : ogV
     )
+    .transform((v) => {
+      if (v.split) {
+        const vArr = v.split("/");
+
+        switch (options?.format) {
+          case "dd/mm/yyyy":
+            if (vArr.length == 3 || vArr[2].length == 4)
+              return new Date(vArr.reverse().join("-"));
+
+          case "mm/yyyy":
+            if (vArr.length == 2 || vArr[1].length == 4)
+              return new Date(vArr.reverse().join("-"));
+        }
+      }
+
+      return v;
+    })
     .typeError(messages.invalid)
     .test(
       "dateTest",
@@ -188,14 +198,12 @@ export const date = (
     validation = validation.required(messages.required);
   }
 
-  // Due to how the calendar picker library works, min and max have to be inverted
-  // This may be fixed with an in-house implementation of a calendar picker
-  if (options?.maxDate && messages.maxDate) {
-    validation = validation.min(options.maxDate, messages.maxDate);
+  if (options?.minDate && messages.minDate) {
+    validation = validation.min(options.minDate, messages.minDate);
   }
 
-  if (options?.minDate && messages.minDate) {
-    validation = validation.max(options.minDate, messages.minDate);
+  if (options?.maxDate && messages.maxDate) {
+    validation = validation.max(options.maxDate, messages.maxDate);
   }
 
   return validation;