@ztimson/utils 0.27.2 → 0.27.4

package/dist/index.cjs

@@ -122,7 +122,19 @@ ${opts.message || this.desc}`;
     }
   }
   function applyDeltas(base, ...deltas) {
-    for (let d of deltas) base = applyDeltas(base, d);
+    function applyDelta(base2, delta) {
+      if (delta === null) return null;
+      if (typeof base2 !== "object" || base2 === null) return delta === void 0 ? base2 : delta;
+      const result = Array.isArray(base2) ? [...base2] : { ...base2 };
+      for (const key in delta) {
+        const val = delta[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 result;
+    }
+    for (const d of deltas.flat()) base = applyDelta(base, (d == null ? void 0 : d.delta) ?? d);
     return base;
   }
   function calcDelta(old, updated) {
@@ -881,33 +893,6 @@ ${opts.message || this.desc}`;
       }).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 () => {
@@ -945,28 +930,56 @@ ${opts.message || this.desc}`;
       }
     }
     let zonedDate = new Date(date);
+    let get;
+    const partsMap = {};
     if (!numericTz && tzName !== "UTC") {
       const parts = new Intl.DateTimeFormat("en-US", {
         timeZone: tzName,
         year: "numeric",
         month: "2-digit",
         day: "2-digit",
+        weekday: "long",
         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;
+      parts.forEach((p) => {
+        partsMap[p.type] = p.value;
+      });
+      const monthValue = parseInt(partsMap.month) - 1;
+      const dayOfWeekValue = (/* @__PURE__ */ new Date(`${partsMap.year}-${partsMap.month}-${partsMap.day}`)).getDay();
+      const hourValue = parseInt(partsMap.hour);
+      get = (fn2) => {
+        switch (fn2) {
+          case "FullYear":
+            return parseInt(partsMap.year);
+          case "Month":
+            return monthValue;
+          case "Date":
+            return parseInt(partsMap.day);
+          case "Day":
+            return dayOfWeekValue;
+          case "Hours":
+            return hourValue;
+          case "Minutes":
+            return parseInt(partsMap.minute);
+          case "Seconds":
+            return parseInt(partsMap.second);
+          default:
+            return 0;
+        }
       };
-      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") {
+    } else {
       const offset = numericTz ? tz : 0;
       zonedDate = new Date(date.getTime() + offset * 60 * 60 * 1e3);
+      get = (fn2) => zonedDate[`getUTC${fn2}`]();
+    }
+    function numSuffix2(n) {
+      const s = ["th", "st", "nd", "rd"];
+      const v = n % 100;
+      return n + (s[(v - 20) % 10] || s[v] || s[0]);
     }
-    const get = (fn2) => numericTz || tzName === "UTC" ? zonedDate[`getUTC${fn2}`]() : zonedDate[`get${fn2}`]();
     function getTZOffset() {
       var _a2, _b;
       if (numericTz) {
@@ -1000,7 +1013,7 @@ ${opts.message || this.desc}`;
       M: (get("Month") + 1).toString(),
       DDD: dayOfYear(zonedDate).toString(),
       DD: get("Date").toString().padStart(2, "0"),
-      Do: numSuffix(get("Date")),
+      Do: numSuffix2(get("Date")),
       D: get("Date").toString(),
       dddd: dayOfWeek(get("Day")),
       ddd: dayOfWeek(get("Day")).slice(0, 3),
@@ -1012,7 +1025,7 @@ ${opts.message || this.desc}`;
       m: get("Minutes").toString(),
       ss: get("Seconds").toString().padStart(2, "0"),
       s: get("Seconds").toString(),
-      SSS: get("Milliseconds").toString().padStart(3, "0"),
+      SSS: zonedDate[`getUTC${"Milliseconds"}`]().toString().padStart(3, "0"),
       A: get("Hours") >= 12 ? "PM" : "AM",
       a: get("Hours") >= 12 ? "pm" : "am",
       ZZ: getTZOffset().replace(":", ""),
@@ -1776,6 +1789,33 @@ ${opts.message || this.desc}`;
   };
   __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 numSuffix(n) {
+    const s = ["th", "st", "nd", "rd"], v = n % 100;
+    return `${n}${s[(v - 20) % 10] || s[v] || s[0]}`;
+  }
   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, ""));