@ztimson/utils 0.28.17 → 0.29.1

package/dist/index.mjs

@@ -3017,22 +3017,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 +3044,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 };
+    }
+    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 { tag: tagName, attributes, children };
+    return { [tagName]: result };
   }
   function parseTagName() {
     let name = "";
@@ -3078,8 +3103,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 +3119,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 = "") {