@ztimson/utils 0.28.17 → 0.29.1

package/dist/index.cjs

@@ -3021,22 +3021,23 @@ ${err.message || err.toString()}`);
       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] === "/") {
@@ -3047,9 +3048,33 @@ ${err.message || err.toString()}`);
           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 = "";
@@ -3082,8 +3107,14 @@ ${err.message || err.toString()}`);
       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++;
@@ -3092,6 +3123,9 @@ ${err.message || err.toString()}`);
     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 = "") {