@ztimson/utils 0.29.0 → 0.29.2

package/dist/index.mjs

@@ -1233,9 +1233,46 @@ function dayOfYear(date) {
 function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz = "local") {
   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 && tz.toLowerCase?.() === "local";
-  const tzName = localTz ? Intl.DateTimeFormat().resolvedOptions().timeZone : numericTz ? "UTC" : tz;
+  const TIMEZONE_MAP = [
+    { name: "IDLW", iana: "Etc/GMT+12", offset: -720 },
+    { name: "SST", iana: "Pacific/Pago_Pago", offset: -660 },
+    { name: "HST", iana: "Pacific/Honolulu", offset: -600 },
+    { name: "AKST", iana: "America/Anchorage", offset: -540 },
+    { name: "PST", iana: "America/Los_Angeles", offset: -480 },
+    { name: "MST", iana: "America/Denver", offset: -420 },
+    { name: "CST", iana: "America/Chicago", offset: -360 },
+    { name: "EST", iana: "America/New_York", offset: -300 },
+    { name: "AST", iana: "America/Halifax", offset: -240 },
+    { name: "BRT", iana: "America/Sao_Paulo", offset: -180 },
+    { name: "MAT", iana: "Atlantic/South_Georgia", offset: -120 },
+    { name: "AZOT", iana: "Atlantic/Azores", offset: -60 },
+    { name: "UTC", iana: "UTC", offset: 0 },
+    { name: "CET", iana: "Europe/Paris", offset: 60 },
+    { name: "EET", iana: "Europe/Athens", offset: 120 },
+    { name: "MSK", iana: "Europe/Moscow", offset: 180 },
+    { name: "GST", iana: "Asia/Dubai", offset: 240 },
+    { name: "PKT", iana: "Asia/Karachi", offset: 300 },
+    { name: "IST", iana: "Asia/Kolkata", offset: 330 },
+    { name: "BST", iana: "Asia/Dhaka", offset: 360 },
+    { name: "ICT", iana: "Asia/Bangkok", offset: 420 },
+    { name: "CST", iana: "Asia/Shanghai", offset: 480 },
+    { name: "JST", iana: "Asia/Tokyo", offset: 540 },
+    { name: "AEST", iana: "Australia/Sydney", offset: 600 },
+    { name: "SBT", iana: "Pacific/Guadalcanal", offset: 660 },
+    { name: "TOT", iana: "Pacific/Tongatapu", offset: 780 },
+    { name: "LINT", iana: "Pacific/Kiritimati", offset: 840 }
+  ];
+  let numericTz = typeof tz === "number";
+  const localTz = tz === "local" || !numericTz && tz.toString().toLowerCase?.() === "local";
+  let tzName = localTz ? Intl.DateTimeFormat().resolvedOptions().timeZone : numericTz ? "UTC" : tz;
+  let offsetMinutes = 0;
+  if (numericTz) {
+    offsetMinutes = Math.abs(tz) < 24 ? tz * 60 : tz;
+    const closest = TIMEZONE_MAP.reduce(
+      (prev, curr) => Math.abs(curr.offset - offsetMinutes) < Math.abs(prev.offset - offsetMinutes) ? curr : prev
+    );
+    tzName = closest.iana;
+  }
   if (!numericTz && tzName !== "UTC") {
     try {
       new Intl.DateTimeFormat("en-US", { timeZone: tzName }).format();
@@ -1285,8 +1322,7 @@ function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(
       }
     };
   } else {
-    const offset = numericTz ? tz : 0;
-    zonedDate = new Date(date.getTime() + offset * 60 * 60 * 1e3);
+    zonedDate = new Date(date.getTime() + offsetMinutes * 60 * 1e3);
     get = (fn2) => zonedDate[`getUTC${fn2}`]();
   }
   function numSuffix2(n) {
@@ -1296,10 +1332,9 @@ function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(
   }
   function getTZOffset() {
     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")}`;
+      const hours = Math.floor(Math.abs(offsetMinutes) / 60);
+      const mins = Math.abs(offsetMinutes) % 60;
+      return `${offsetMinutes >= 0 ? "+" : "-"}${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}`;
     }
     try {
       const offset = new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "longOffset", hour: "2-digit", minute: "2-digit" }).formatToParts(date).find((p) => p.type === "timeZoneName")?.value.match(/([+-]\d{2}:\d{2})/)?.[1];
@@ -1309,7 +1344,6 @@ function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(
     return "+00:00";
   }
   function getTZAbbr() {
-    if (numericTz && tz === 0) return "UTC";
     try {
       return new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "short" }).formatToParts(date).find((p) => p.type === "timeZoneName")?.value || "";
     } catch {
@@ -3017,22 +3051,23 @@ function fromXml(xml) {
     if (xml[pos] !== "<") return parseText();
     pos++;
     if (xml[pos] === "?") {
-      parseDeclaration();
-      return parseNode();
+      const declaration = parseDeclaration();
+      return { ["?" + declaration]: "", ...parseNode() };
     }
     if (xml[pos] === "!") {
       parseComment();
       return parseNode();
     }
     const tagName = parseTagName();
-    const attributes = parseAttributes();
+    parseAttributes();
     skipWhitespace();
     if (xml[pos] === "/" && xml[pos + 1] === ">") {
       pos += 2;
-      return { tag: tagName, attributes, children: [] };
+      return { [tagName]: "" };
     }
     pos++;
     const children = [];
+    let textContent = "";
     while (pos < xml.length) {
       skipWhitespace();
       if (xml[pos] === "<" && xml[pos + 1] === "/") {
@@ -3043,9 +3078,33 @@ function fromXml(xml) {
         break;
       }
       const child = parseNode();
-      if (child) children.push(child);
+      if (typeof child === "string") {
+        textContent += child;
+      } else if (child) {
+        children.push(child);
+      }
+    }
+    if (children.length === 0 && textContent) {
+      const value = isNumeric(textContent) ? Number(textContent) : textContent;
+      return { [tagName]: value };
     }
-    return { tag: tagName, attributes, children };
+    if (children.length === 0) {
+      return { [tagName]: "" };
+    }
+    const result = {};
+    for (const child of children) {
+      for (const [key, value] of Object.entries(child)) {
+        if (result[key]) {
+          if (!Array.isArray(result[key])) {
+            result[key] = [result[key]];
+          }
+          result[key].push(value);
+        } else {
+          result[key] = value;
+        }
+      }
+    }
+    return { [tagName]: result };
   }
   function parseTagName() {
     let name = "";
@@ -3078,8 +3137,14 @@ function fromXml(xml) {
     return text ? escapeXml(text, true) : null;
   }
   function parseDeclaration() {
+    pos++;
+    let name = "";
+    while (pos < xml.length && xml[pos] !== " " && xml[pos] !== "?") {
+      name += xml[pos++];
+    }
     while (xml[pos] !== ">") pos++;
     pos++;
+    return name;
   }
   function parseComment() {
     while (!(xml[pos] === "-" && xml[pos + 1] === "-" && xml[pos + 2] === ">")) pos++;
@@ -3088,6 +3153,9 @@ function fromXml(xml) {
   function skipWhitespace() {
     while (pos < xml.length && /\s/.test(xml[pos])) pos++;
   }
+  function isNumeric(str) {
+    return !isNaN(Number(str)) && !isNaN(parseFloat(str)) && str.trim() !== "";
+  }
   return parseNode();
 }
 function toXml(obj, indent = "") {