update

Author: fredericcarre

src/utils/xmlParser.ts

@@ -1,41 +1,41 @@
 import { ParsedApiConfiguration } from '../configuration/parsedApiConfigurationTypes';
 
-type XmlJsonNode = { [key: string]: string | XmlJsonNode | XmlJsonNode[] };
+type XmlJsonNode = {
+  [key: string]: XmlJsonNode | XmlJsonNode[] | string;
+  _: string;
+};
 
-function xmlNodeToJson(node: Element): XmlJsonNode | string {
-    const obj: XmlJsonNode = {};
-  
-    for (const attr of Array.from(node.attributes)) {
-      obj[attr.name] = attr.value;
-    }
-  
-    for (const child of Array.from(node.children)) {
-      const key = child.tagName;
-      const childObj = xmlNodeToJson(child);
-  
-      if (typeof childObj === 'string') {
-        // On ignore les strings dans les enfants structurés
-        obj[key] = childObj;
-        continue;
-      }
-  
-      if (obj[key]) {
-        if (!Array.isArray(obj[key])) {
-          obj[key] = [obj[key] as XmlJsonNode];
-        }
-        (obj[key] as XmlJsonNode[]).push(childObj);
-      } else {
-        obj[key] = childObj;
+function xmlNodeToJson(node: Element): XmlJsonNode {
+  const obj: XmlJsonNode = { _: '' };
+
+  // Attributs
+  for (const attr of Array.from(node.attributes)) {
+    obj[attr.name] = attr.value;
+  }
+
+  // Enfants
+  for (const child of Array.from(node.children)) {
+    const tag = child.tagName;
+    const childObj = xmlNodeToJson(child);
+    if (obj[tag]) {
+      if (!Array.isArray(obj[tag])) {
+        obj[tag] = [obj[tag] as XmlJsonNode];
       }
+      (obj[tag] as XmlJsonNode[]).push(childObj);
+    } else {
+      obj[tag] = childObj;
     }
-  
-    const text = node.textContent?.trim();
-    if (text && node.children.length === 0 && node.attributes.length === 0) {
-      return text;
-    }
-  
-    return obj;
   }
+
+  // Texte
+  const text = node.textContent?.trim();
+  if (text && node.children.length === 0) {
+    obj._ = text;
+  }
+
+  return obj;
+}
+
 
 export function parseXmlToJson(xml: string): ParsedApiConfiguration {
   const parser = new DOMParser();