@ztimson/utils 0.26.26 → 0.27.1

package/dist/index.mjs

@@ -117,44 +117,33 @@ ${opts.message || this.desc}`;
 `;
   }
 }
-function applyDeltas(target, deltas) {
-  for (const delta of deltas) {
-    for (const [key, value] of Object.entries(delta)) {
-      if (value === null) {
-        delete target[key];
-      } else if (Array.isArray(value)) {
-        target[key] = [...value];
-      } else if (typeof value === "object") {
-        if (typeof target[key] !== "object" || Array.isArray(target[key]) || !target[key])
-          target[key] = {};
-        applyDeltas(target[key], [value]);
-      } else {
-        target[key] = value;
-      }
-    }
+function applyDelta(base, deltas) {
+  if (deltas === null) return null;
+  if (typeof base !== "object" || base === null) return deltas === void 0 ? base : deltas;
+  const result = Array.isArray(base) ? [...base] : { ...base };
+  for (const key in deltas) {
+    const val = deltas[key];
+    if (val === void 0) delete result[key];
+    else if (typeof val === "object" && val !== null && !Array.isArray(val)) result[key] = applyDelta(result[key], val);
+    else result[key] = val;
   }
-  return target;
+  return result;
 }
-function calcDelta(old, target) {
+function calcDelta(old, updated) {
+  if (updated == null) return null;
   const delta = {};
-  const keys = /* @__PURE__ */ new Set([...Object.keys(old || {}), ...Object.keys(target || {})]);
-  for (const key of keys) {
-    const val1 = old == null ? void 0 : old[key];
-    const val2 = target == null ? void 0 : target[key];
-    if (!(key in target)) {
-      delta[key] = val1;
-    } else if (!(key in old)) {
-      delta[key] = null;
-    } else if (Array.isArray(val1) || Array.isArray(val2)) {
-      if (JSON.stringify(val1) !== JSON.stringify(val2)) delta[key] = val1;
-    } else if (typeof val1 === "object" && typeof val2 === "object" && val1 && val2) {
-      const nested = calcDelta(val1, val2);
-      if (Object.keys(nested).length) delta[key] = nested;
-    } else if (val1 !== val2) {
-      delta[key] = val1;
+  const isObj = (v) => v && typeof v === "object" && !Array.isArray(v);
+  for (const key of /* @__PURE__ */ new Set([...old ? Object.keys(old) : [], ...updated ? Object.keys(updated) : []])) {
+    const oldVal = old == null ? void 0 : old[key];
+    const newVal = updated == null ? void 0 : updated[key];
+    if (isObj(oldVal) && isObj(newVal)) {
+      const nested = calcDelta(oldVal, newVal);
+      if (nested !== null && Object.keys(nested).length > 0) delta[key] = nested;
+    } else if (JSON.stringify(oldVal) !== JSON.stringify(newVal)) {
+      delta[key] = newVal;
     }
   }
-  return delta;
+  return Object.keys(delta).length === 0 ? {} : delta;
 }
 function clean(obj, undefinedOnly = false) {
   if (obj == null) throw new Error("Cannot clean a NULL value");
@@ -896,6 +885,33 @@ function toCsv(target, flatten = true) {
     }).join(","))
   ].join("\n");
 }
+function dec2Frac(num, maxDen = 1e3) {
+  let sign = Math.sign(num);
+  num = Math.abs(num);
+  if (Number.isInteger(num)) return sign * num + "";
+  let closest = { n: 0, d: 1, diff: Math.abs(num) };
+  for (let d = 1; d <= maxDen; d++) {
+    let n = Math.round(num * d);
+    let diff = Math.abs(num - n / d);
+    if (diff < closest.diff) {
+      closest = { n, d, diff };
+      if (diff < 1e-8) break;
+    }
+  }
+  let integer = Math.floor(closest.n / closest.d);
+  let numerator = closest.n - integer * closest.d;
+  return (sign < 0 ? "-" : "") + (integer ? integer + " " : "") + (numerator ? numerator + "/" + closest.d : "");
+}
+function fracToDec(frac) {
+  let split = frac.split(" ");
+  const whole = split.length == 2 ? Number(split[0]) : 0;
+  split = split.pop().split("/");
+  return whole + Number(split[0]) / Number(split[1]);
+}
+function numSuffix(n) {
+  const s = ["th", "st", "nd", "rd"], v = n % 100;
+  return `${n}${s[(v - 20) % 10] || s[v] || s[0]}`;
+}
 function adjustedInterval(cb, ms) {
   let cancel = false, timeout = null;
   const p = async () => {
@@ -911,103 +927,101 @@ function adjustedInterval(cb, ms) {
     if (timeout) clearTimeout(timeout);
   };
 }
-function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz) {
-  const timezones = [
-    ["IDLW", -12],
-    ["SST", -11],
-    ["HST", -10],
-    ["AKST", -9],
-    ["PST", -8],
-    ["MST", -7],
-    ["CST", -6],
-    ["EST", -5],
-    ["AST", -4],
-    ["BRT", -3],
-    ["MAT", -2],
-    ["AZOT", -1],
-    ["UTC", 0],
-    ["CET", 1],
-    ["EET", 2],
-    ["MSK", 3],
-    ["AST", 4],
-    ["PKT", 5],
-    ["IST", 5.5],
-    ["BST", 6],
-    ["ICT", 7],
-    ["CST", 8],
-    ["JST", 9],
-    ["AEST", 10],
-    ["SBT", 11],
-    ["FJT", 12],
-    ["TOT", 13],
-    ["LINT", 14]
-  ];
-  function adjustTz(date2, gmt) {
-    const currentOffset = date2.getTimezoneOffset();
-    const adjustedOffset = gmt * 60;
-    return new Date(date2.getTime() + (adjustedOffset + currentOffset) * 6e4);
-  }
-  function day(num) {
-    return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][num] || "Unknown";
-  }
-  function doy(date2) {
-    const start = /* @__PURE__ */ new Date(`${date2.getFullYear()}-01-01 0:00:00`);
-    return Math.ceil((date2.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
-  }
-  function month(num) {
-    return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][num] || "Unknown";
-  }
-  function suffix(num) {
-    if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
-    switch (num % 10) {
-      case 1:
-        return `${num}st`;
-      case 2:
-        return `${num}nd`;
-      case 3:
-        return `${num}rd`;
-      default:
-        return `${num}th`;
+function dayOfWeek(d) {
+  return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][d];
+}
+function dayOfYear(date) {
+  const start = new Date(Date.UTC(date.getUTCFullYear(), 0, 1));
+  return Math.ceil((date.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
+}
+function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz = "local") {
+  var _a;
+  if (typeof date === "number" || typeof date === "string") date = new Date(date);
+  if (isNaN(date.getTime())) throw new Error("Invalid date input");
+  const numericTz = typeof tz === "number";
+  const localTz = tz === "local" || !numericTz && ((_a = tz.toLowerCase) == null ? void 0 : _a.call(tz)) === "local";
+  const tzName = localTz ? Intl.DateTimeFormat().resolvedOptions().timeZone : numericTz ? "UTC" : tz;
+  if (!numericTz && tzName !== "UTC") {
+    try {
+      new Intl.DateTimeFormat("en-US", { timeZone: tzName }).format();
+    } catch {
+      throw new Error(`Invalid timezone: ${tzName}`);
+    }
+  }
+  let zonedDate = new Date(date);
+  if (!numericTz && tzName !== "UTC") {
+    const parts = new Intl.DateTimeFormat("en-US", {
+      timeZone: tzName,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false
+    }).formatToParts(date);
+    const get2 = (type) => {
+      var _a2;
+      return (_a2 = parts.find((p) => p.type === type)) == null ? void 0 : _a2.value;
+    };
+    const build = `${get2("year")}-${get2("month")}-${get2("day")}T${get2("hour")}:${get2("minute")}:${get2("second")}Z`;
+    zonedDate = new Date(build);
+  } else if (numericTz || tzName === "UTC") {
+    const offset = numericTz ? tz : 0;
+    zonedDate = new Date(date.getTime() + offset * 60 * 60 * 1e3);
+  }
+  const get = (fn2) => numericTz || tzName === "UTC" ? zonedDate[`getUTC${fn2}`]() : zonedDate[`get${fn2}`]();
+  function getTZOffset() {
+    var _a2, _b;
+    if (numericTz) {
+      const total = tz * 60;
+      const hours = Math.floor(Math.abs(total) / 60);
+      const mins = Math.abs(total) % 60;
+      return `${tz >= 0 ? "+" : "-"}${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}`;
+    }
+    try {
+      const offset = (_b = (_a2 = new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "longOffset", hour: "2-digit", minute: "2-digit" }).formatToParts(date).find((p) => p.type === "timeZoneName")) == null ? void 0 : _a2.value.match(/([+-]\d{2}:\d{2})/)) == null ? void 0 : _b[1];
+      if (offset) return offset;
+    } catch {
+    }
+    return "+00:00";
+  }
+  function getTZAbbr() {
+    var _a2;
+    if (numericTz && tz === 0) return "UTC";
+    try {
+      return ((_a2 = new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "short" }).formatToParts(date).find((p) => p.type === "timeZoneName")) == null ? void 0 : _a2.value) || "";
+    } catch {
+      return tzName;
     }
   }
-  function tzOffset(offset) {
-    const hours = ~~(offset / 60);
-    const minutes = offset % 60;
-    return (offset > 0 ? "-" : "") + `${hours}:${minutes.toString().padStart(2, "0")}`;
-  }
-  if (typeof date == "number" || typeof date == "string" || date == null) date = new Date(date);
-  let t;
-  if (tz == null) tz = -(date.getTimezoneOffset() / 60);
-  t = timezones.find((t2) => isNaN(tz) ? t2[0] == tz : t2[1] == tz);
-  if (!t) throw new Error(`Unknown timezone: ${tz}`);
-  date = adjustTz(date, t[1]);
   const tokens = {
-    "YYYY": date.getFullYear().toString(),
-    "YY": date.getFullYear().toString().slice(2),
-    "MMMM": month(date.getMonth()),
-    "MMM": month(date.getMonth()).slice(0, 3),
-    "MM": (date.getMonth() + 1).toString().padStart(2, "0"),
-    "M": (date.getMonth() + 1).toString(),
-    "DDD": doy(date).toString(),
-    "DD": date.getDate().toString().padStart(2, "0"),
-    "Do": suffix(date.getDate()),
-    "D": date.getDate().toString(),
-    "dddd": day(date.getDay()),
-    "ddd": day(date.getDay()).slice(0, 3),
-    "HH": date.getHours().toString().padStart(2, "0"),
-    "H": date.getHours().toString(),
-    "hh": (date.getHours() % 12 || 12).toString().padStart(2, "0"),
-    "h": (date.getHours() % 12 || 12).toString(),
-    "mm": date.getMinutes().toString().padStart(2, "0"),
-    "m": date.getMinutes().toString(),
-    "ss": date.getSeconds().toString().padStart(2, "0"),
-    "s": date.getSeconds().toString(),
-    "SSS": date.getMilliseconds().toString().padStart(3, "0"),
-    "A": date.getHours() >= 12 ? "PM" : "AM",
-    "a": date.getHours() >= 12 ? "pm" : "am",
-    "ZZ": tzOffset(t[1] * 60).replace(":", ""),
-    "Z": tzOffset(t[1] * 60),
-    "z": typeof tz == "string" ? tz : t[0]
+    YYYY: get("FullYear").toString(),
+    YY: get("FullYear").toString().slice(2),
+    MMMM: month(get("Month")),
+    MMM: month(get("Month")).slice(0, 3),
+    MM: (get("Month") + 1).toString().padStart(2, "0"),
+    M: (get("Month") + 1).toString(),
+    DDD: dayOfYear(zonedDate).toString(),
+    DD: get("Date").toString().padStart(2, "0"),
+    Do: numSuffix(get("Date")),
+    D: get("Date").toString(),
+    dddd: dayOfWeek(get("Day")),
+    ddd: dayOfWeek(get("Day")).slice(0, 3),
+    HH: get("Hours").toString().padStart(2, "0"),
+    H: get("Hours").toString(),
+    hh: (get("Hours") % 12 || 12).toString().padStart(2, "0"),
+    h: (get("Hours") % 12 || 12).toString(),
+    mm: get("Minutes").toString().padStart(2, "0"),
+    m: get("Minutes").toString(),
+    ss: get("Seconds").toString().padStart(2, "0"),
+    s: get("Seconds").toString(),
+    SSS: get("Milliseconds").toString().padStart(3, "0"),
+    A: get("Hours") >= 12 ? "PM" : "AM",
+    a: get("Hours") >= 12 ? "pm" : "am",
+    ZZ: getTZOffset().replace(":", ""),
+    Z: getTZOffset(),
+    z: getTZAbbr()
   };
   return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, (token) => tokens[token]);
 }
@@ -1015,6 +1029,9 @@ function instantInterval(fn2, interval) {
   fn2();
   return setInterval(fn2, interval);
 }
+function month(m) {
+  return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][m];
+}
 function sleep(ms) {
   return new Promise((res) => setTimeout(res, ms));
 }
@@ -1763,29 +1780,6 @@ const _Logger = class _Logger extends TypedEmitter {
 };
 __publicField(_Logger, "LOG_LEVEL", 4);
 let Logger = _Logger;
-function dec2Frac(num, maxDen = 1e3) {
-  let sign = Math.sign(num);
-  num = Math.abs(num);
-  if (Number.isInteger(num)) return sign * num + "";
-  let closest = { n: 0, d: 1, diff: Math.abs(num) };
-  for (let d = 1; d <= maxDen; d++) {
-    let n = Math.round(num * d);
-    let diff = Math.abs(num - n / d);
-    if (diff < closest.diff) {
-      closest = { n, d, diff };
-      if (diff < 1e-8) break;
-    }
-  }
-  let integer = Math.floor(closest.n / closest.d);
-  let numerator = closest.n - integer * closest.d;
-  return (sign < 0 ? "-" : "") + (integer ? integer + " " : "") + (numerator ? numerator + "/" + closest.d : "");
-}
-function fracToDec(frac) {
-  let split = frac.split(" ");
-  const whole = split.length == 2 ? Number(split[0]) : 0;
-  split = split.pop().split("/");
-  return whole + Number(split[0]) / Number(split[1]);
-}
 function compareVersions(target, vs) {
   const [tMajor, tMinor, tPatch] = target.split(".").map((v) => +v.replace(/[^0-9]/g, ""));
   const [vMajor, vMinor, vPatch] = vs.split(".").map((v) => +v.replace(/[^0-9]/g, ""));
@@ -2370,7 +2364,7 @@ export {
   UnauthorizedError,
   addUnique,
   adjustedInterval,
-  applyDeltas,
+  applyDelta,
   arrayDiff,
   calcDelta,
   camelCase,
@@ -2379,6 +2373,8 @@ export {
   compareVersions,
   contrast,
   createJwt,
+  dayOfWeek,
+  dayOfYear,
   dec2Frac,
   decodeJwt,
   deepCopy,
@@ -2415,6 +2411,8 @@ export {
   matchAll,
   md5,
   mixin,
+  month,
+  numSuffix,
   pad,
   parseUrl,
   pascalCase,