@fewangsit/wangsvue-fats 1.0.1-alpha.32 → 1.0.1-alpha.33

package/utils/date.util.es.js

@@ -1,84 +1,88 @@
-const w = () => {
-  const { consoleSettings: t, generalSetting: m } = JSON.parse(
+const p = () => {
+  const { consoleSettings: o, generalSetting: s } = JSON.parse(
     localStorage.getItem("user") ?? "{}"
-  ), { dateFormat: a, timeFormat: r, timezone: o } = t ?? m ?? {};
-  let n = {};
-  return !a || r === null || !o ? {} : (typeof a == "string" ? n = {
-    dateFormat: a,
-    timeFormat: r,
-    timezone: o
-  } : n = {
+  ), { dateFormat: r, timeFormat: a, timezone: e } = o ?? s ?? {};
+  let d = {};
+  return !r || a === null || !e ? {} : (typeof r == "string" ? d = {
+    dateFormat: r,
+    timeFormat: a,
+    timezone: e
+  } : d = {
     formatPreset: {
-      ...a,
-      weekday: a != null && a.weekday ? a.weekday : void 0,
+      ...r,
+      weekday: r != null && r.weekday ? r.weekday : void 0,
       hour: "2-digit",
       minute: "2-digit",
       second: "2-digit",
-      hour12: r,
-      timezone: o
+      hour12: a,
+      timezone: e
     }
-  }, n);
-}, p = (t, m = {
-  locale: "en-gb",
-  dateFormat: "dd/mm/yy",
-  timeFormat: "HH:mm",
-  showDate: !0
-}, a = !0) => {
-  const { showDate: r = !0 } = m;
+  }, d);
+}, F = (o, s, r = !0) => {
+  const a = {
+    locale: "en-gb",
+    dateFormat: "dd/mm/yy",
+    timeFormat: "HH:mm"
+  }, e = r ? p() : null;
+  s ?? (s = {});
+  const {
+    showDate: d = !0,
+    dateFormat: c = (e == null ? void 0 : e.dateFormat) ?? a.dateFormat,
+    // Here dateFormat will use: guven options, then generalSettings, lastly the default
+    timezone: y = (e == null ? void 0 : e.timezone) ?? a.timezone
+    // Here timeFormat will use: given options, then generalSettings, lastly the default
+  } = s;
   let {
-    locale: o = "en-gb",
-    dateFormat: n = "dd/mm/yy",
-    timezone: y,
-    timeFormat: i,
-    showTime: s
-  } = m;
-  const d = a ? w() : {};
-  if (d && (o = d.locale ?? o, n = d.dateFormat ?? n, i = d.timeFormat ?? i, y = d.timezone ?? y, s = s ?? !1), d.formatPreset) {
+    locale: m = (e == null ? void 0 : e.locale) ?? a.locale,
+    timeFormat: i = (e == null ? void 0 : e.timeFormat) ?? a.timeFormat,
+    showTime: n
+  } = s;
+  if (e && (n = n ?? !1), e != null && e.formatPreset) {
     const {
-      locale: g,
-      timezone: l,
-      hour: u,
+      locale: l,
+      timezone: f,
+      hour: g,
       minute: h,
-      second: f,
-      hour12: M,
-      ...b
-    } = d.formatPreset, k = s ? { hour: u, minute: h, second: f, hour12: M } : {};
-    return t.toLocaleString(g, {
-      ...l ? { timeZone: l } : {},
-      ...b,
+      second: M,
+      hour12: D,
       ...k
-    }).replace(/\b(am|pm)\b/g, (D) => D.toUpperCase());
+    } = e.formatPreset, b = n ? { hour: g, minute: h, second: M, hour12: D } : {};
+    return o.toLocaleString(l, {
+      ...f ? { timeZone: f } : {},
+      ...k,
+      ...b
+    }).replace(/\b(am|pm)\b/g, (w) => w.toUpperCase());
   }
-  let e = {
+  let t = {
     ...y ? { timeZone: y } : {}
   };
-  if (r)
-    switch (n) {
+  if (d)
+    switch (c) {
       case "d/m/yy":
       case "_2/_1/06":
-        e = {
+        t = {
           year: "2-digit",
           month: "numeric",
           day: "numeric"
-        }, o = "id-id";
+        }, m = "id-id";
         break;
       case "m/d/yy":
       case "_1/_2/06":
-        e = {
+        t = {
           year: "2-digit",
           month: "numeric",
           day: "numeric"
-        }, o = "en-us";
+        }, m = "en-us";
         break;
       case "d/mm/yy":
-        e = {
+        t = {
           year: "2-digit",
           month: "2-digit",
           day: "numeric"
         };
         break;
       case "dd/mm/yyyy":
-        e = {
+        t = {
           year: "numeric",
           month: "2-digit",
           day: "2-digit"
@@ -86,28 +90,28 @@ const w = () => {
         break;
       case "dd M yy":
       case "02 Jan 06":
-        e = {
+        t = {
           year: "2-digit",
           month: "short",
           day: "2-digit"
         };
         break;
       case "dd M yyyy":
-        e = {
+        t = {
           year: "numeric",
           month: "short",
           day: "2-digit"
         };
         break;
       case "dd MM yy":
-        e = {
+        t = {
           year: "2-digit",
           month: "long",
           day: "2-digit"
         };
         break;
       case "dd MM yyyy":
-        e = {
+        t = {
           year: "numeric",
           month: "long",
           day: "2-digit"
@@ -116,7 +120,7 @@ const w = () => {
       case "D dd M yy":
       case "D, dd M yy":
       case "Mon, 02 Jan 06":
-        e = {
+        t = {
           weekday: "short",
           year: "2-digit",
           month: "short",
@@ -126,7 +130,7 @@ const w = () => {
       case "D dd M yyyy":
       case "D, dd M yyyy":
       case "Mon, 02 Jan 2006":
-        e = {
+        t = {
           weekday: "short",
           year: "numeric",
           month: "short",
@@ -135,7 +139,7 @@ const w = () => {
         break;
       case "DD dd MM yy":
       case "DD, dd MM yy":
-        e = {
+        t = {
           weekday: "long",
           year: "2-digit",
           month: "long",
@@ -144,7 +148,7 @@ const w = () => {
         break;
       case "DD dd MM yyyy":
       case "DD, dd MM yyyy":
-        e = {
+        t = {
           weekday: "long",
           year: "numeric",
           month: "long",
@@ -153,21 +157,21 @@ const w = () => {
         break;
       case "02/01/06":
       default:
-        e = {
+        t = {
           year: "2-digit",
           month: "2-digit",
           day: "2-digit"
         };
         break;
     }
-  if (s && !i && (i = "HH:mm"), s || i && s != !1)
+  if (n && !i && (i = "HH:mm"), n || i && n != !1)
     switch (i) {
       case "HH:mm":
       case "HH:mm a":
       case "15:04":
       case "03:04 PM":
-        e = {
-          ...e,
+        t = {
+          ...t,
           hour: "2-digit",
           minute: "2-digit",
           hour12: i.includes("a") || i.includes("PM")
@@ -177,8 +181,8 @@ const w = () => {
       case "HH:mm:ss a":
       case "15:04:05":
       case "03:04:05 PM":
-        e = {
-          ...e,
+        t = {
+          ...t,
           hour: "2-digit",
           minute: "2-digit",
           second: "2-digit",
@@ -186,28 +190,28 @@ const w = () => {
         };
         break;
     }
-  let c = n.includes(",") ? t.toLocaleString(o, e) : t.toLocaleString(o, e).replace(",", "");
-  return c = c.replace(/\./g, ":"), c.replace(/\b(am|pm)\b/g, (g) => g.toUpperCase());
-}, S = (t) => (
+  let u = c.includes(",") ? o.toLocaleString(m, t) : o.toLocaleString(m, t).replace(",", "");
+  return u = u.replace(/\./g, ":"), u.replace(/\b(am|pm)\b/g, (l) => l.toUpperCase());
+}, P = (o) => (
   // Use Sweden locale, which uses ISO 8601 format: https://stackoverflow.com/a/58633651/27534858
-  new Date(t).toLocaleString("sv")
-), P = (t, m, a = "en") => {
-  const r = Math.floor((Date.now() - t.getTime()) / 1e3);
-  if (m && r > m)
-    return p(t);
-  const o = [
-    [Math.floor(r / 31536e3), "year"],
-    [Math.floor(r / 2628e3), "month"],
-    [Math.floor(r / 86400), "day"],
-    [Math.floor(r / 3600), "hour"],
-    [Math.floor(r / 60), "minute"],
-    [r, "second"]
-  ], [n, y] = o.find(([d]) => d > 0) ?? [0, "second"], s = new Intl.RelativeTimeFormat(a, { numeric: "auto" }).format(-n, y);
-  return a === "id" && s.trim().toLowerCase() === "sekarang" ? "baru saja" : s;
-}, F = (t) => typeof t == "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z$/.test(t) && !isNaN(Date.parse(t));
+  new Date(o).toLocaleString("sv")
+), T = (o, s, r = "en") => {
+  const a = Math.floor((Date.now() - o.getTime()) / 1e3);
+  if (s && a > s)
+    return F(o);
+  const e = [
+    [Math.floor(a / 31536e3), "year"],
+    [Math.floor(a / 2628e3), "month"],
+    [Math.floor(a / 86400), "day"],
+    [Math.floor(a / 3600), "hour"],
+    [Math.floor(a / 60), "minute"],
+    [a, "second"]
+  ], [d, c] = e.find(([i]) => i > 0) ?? [0, "second"], m = new Intl.RelativeTimeFormat(r, { numeric: "auto" }).format(-d, c);
+  return r === "id" && m.trim().toLowerCase() === "sekarang" ? "baru saja" : m;
+}, L = (o) => typeof o == "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z$/.test(o) && !isNaN(Date.parse(o));
 export {
-  S as a,
-  P as b,
-  p as f,
-  F as i
+  P as a,
+  T as b,
+  F as f,
+  L as i
 };

package/wangsvue-fats.esm.browser.js

@@ -1295,67 +1295,71 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
       timezone: r
     }
   }, o);
-}, Nd = (t, e = {
-  locale: "en-gb",
-  dateFormat: "dd/mm/yy",
-  timeFormat: "HH:mm",
-  showDate: !0
-}, n = !0) => {
-  const { showDate: i = !0 } = e;
+}, Nd = (t, e, n = !0) => {
+  const i = {
+    locale: "en-gb",
+    dateFormat: "dd/mm/yy",
+    timeFormat: "HH:mm"
+  }, r = n ? y4() : null;
+  e ?? (e = {});
+  const {
+    showDate: o = !0,
+    dateFormat: s = (r == null ? void 0 : r.dateFormat) ?? i.dateFormat,
+    // Here dateFormat will use: guven options, then generalSettings, lastly the default
+    timezone: a = (r == null ? void 0 : r.timezone) ?? i.timezone
+    // Here timeFormat will use: given options, then generalSettings, lastly the default
+  } = e;
   let {
-    locale: r = "en-gb",
-    dateFormat: o = "dd/mm/yy",
-    timezone: s,
-    timeFormat: a,
-    showTime: l
+    locale: l = (r == null ? void 0 : r.locale) ?? i.locale,
+    timeFormat: u = (r == null ? void 0 : r.timeFormat) ?? i.timeFormat,
+    showTime: c
   } = e;
-  const u = n ? y4() : {};
-  if (u && (r = u.locale ?? r, o = u.dateFormat ?? o, a = u.timeFormat ?? a, s = u.timezone ?? s, l = l ?? !1), u.formatPreset) {
+  if (r && (c = c ?? !1), r != null && r.formatPreset) {
     const {
-      locale: f,
-      timezone: p,
-      hour: h,
-      minute: m,
-      second: v,
-      hour12: w,
-      ...A
-    } = u.formatPreset, k = l ? { hour: h, minute: m, second: v, hour12: w } : {};
-    return t.toLocaleString(f, {
-      ...p ? { timeZone: p } : {},
-      ...A,
+      locale: p,
+      timezone: h,
+      hour: m,
+      minute: v,
+      second: w,
+      hour12: A,
       ...k
-    }).replace(/\b(am|pm)\b/g, (S) => S.toUpperCase());
-  }
-  let c = {
-    ...s ? { timeZone: s } : {}
+    } = r.formatPreset, b = c ? { hour: m, minute: v, second: w, hour12: A } : {};
+    return t.toLocaleString(p, {
+      ...h ? { timeZone: h } : {},
+      ...k,
+      ...b
+    }).replace(/\b(am|pm)\b/g, (y) => y.toUpperCase());
+  }
+  let d = {
+    ...a ? { timeZone: a } : {}
   };
-  if (i)
-    switch (o) {
+  if (o)
+    switch (s) {
       case "d/m/yy":
       case "_2/_1/06":
-        c = {
+        d = {
           year: "2-digit",
           month: "numeric",
           day: "numeric"
-        }, r = "id-id";
+        }, l = "id-id";
         break;
       case "m/d/yy":
       case "_1/_2/06":
-        c = {
+        d = {
           year: "2-digit",
           month: "numeric",
           day: "numeric"
-        }, r = "en-us";
+        }, l = "en-us";
         break;
       case "d/mm/yy":
-        c = {
+        d = {
           year: "2-digit",
           month: "2-digit",
           day: "numeric"
         };
         break;
       case "dd/mm/yyyy":
-        c = {
+        d = {
           year: "numeric",
           month: "2-digit",
           day: "2-digit"
@@ -1363,28 +1367,28 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
         break;
       case "dd M yy":
       case "02 Jan 06":
-        c = {
+        d = {
           year: "2-digit",
           month: "short",
           day: "2-digit"
         };
         break;
       case "dd M yyyy":
-        c = {
+        d = {
           year: "numeric",
           month: "short",
           day: "2-digit"
         };
         break;
       case "dd MM yy":
-        c = {
+        d = {
           year: "2-digit",
           month: "long",
           day: "2-digit"
         };
         break;
       case "dd MM yyyy":
-        c = {
+        d = {
           year: "numeric",
           month: "long",
           day: "2-digit"
@@ -1393,7 +1397,7 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
       case "D dd M yy":
       case "D, dd M yy":
       case "Mon, 02 Jan 06":
-        c = {
+        d = {
           weekday: "short",
           year: "2-digit",
           month: "short",
@@ -1403,7 +1407,7 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
       case "D dd M yyyy":
       case "D, dd M yyyy":
       case "Mon, 02 Jan 2006":
-        c = {
+        d = {
           weekday: "short",
           year: "numeric",
           month: "short",
@@ -1412,7 +1416,7 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
         break;
       case "DD dd MM yy":
       case "DD, dd MM yy":
-        c = {
+        d = {
           weekday: "long",
           year: "2-digit",
           month: "long",
@@ -1421,7 +1425,7 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
         break;
       case "DD dd MM yyyy":
       case "DD, dd MM yyyy":
-        c = {
+        d = {
           weekday: "long",
           year: "numeric",
           month: "long",
@@ -1430,41 +1434,41 @@ const uie = (t, e = !1) => Object.keys(IA(t, e)).map(Number), IA = (t, e = !1) =
         break;
       case "02/01/06":
       default:
-        c = {
+        d = {
           year: "2-digit",
           month: "2-digit",
           day: "2-digit"
         };
         break;
     }
-  if (l && !a && (a = "HH:mm"), l || a && l != !1)
-    switch (a) {
+  if (c && !u && (u = "HH:mm"), c || u && c != !1)
+    switch (u) {
       case "HH:mm":
       case "HH:mm a":
       case "15:04":
       case "03:04 PM":
-        c = {
-          ...c,
+        d = {
+          ...d,
           hour: "2-digit",
           minute: "2-digit",
-          hour12: a.includes("a") || a.includes("PM")
+          hour12: u.includes("a") || u.includes("PM")
         };
         break;
       case "HH:mm:ss":
       case "HH:mm:ss a":
       case "15:04:05":
       case "03:04:05 PM":
-        c = {
-          ...c,
+        d = {
+          ...d,
           hour: "2-digit",
           minute: "2-digit",
           second: "2-digit",
-          hour12: a.includes("a") || a.includes("PM")
+          hour12: u.includes("a") || u.includes("PM")
         };
         break;
     }
-  let d = o.includes(",") ? t.toLocaleString(r, c) : t.toLocaleString(r, c).replace(",", "");
-  return d = d.replace(/\./g, ":"), d.replace(/\b(am|pm)\b/g, (f) => f.toUpperCase());
+  let f = s.includes(",") ? t.toLocaleString(l, d) : t.toLocaleString(l, d).replace(",", "");
+  return f = f.replace(/\./g, ":"), f.replace(/\b(am|pm)\b/g, (p) => p.toUpperCase());
 }, b4 = (t) => (
   // Use Sweden locale, which uses ISO 8601 format: https://stackoverflow.com/a/58633651/27534858
   new Date(t).toLocaleString("sv")