fixed formatXML()

Backend-libXML/Parser.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from lxml import etree, html
 from io import BytesIO
 
@@ -42,17 +40,20 @@ def formatXML(source: str, prettify: bool) -> str:
     if prolog_start != -1:
         prolog_end = source.find("?>") + 2
         prolog = source[prolog_start:prolog_end]
-        source = source[prolog_end: ]
-    
+        source = source[prolog_end:].strip()
+
     byte_input = BytesIO(source.encode("utf-8"))
     parser = etree.XMLParser(remove_blank_text=True)
     xml = etree.parse(byte_input, parser=parser)
 
     if prettify:
         prolog += "\n"
+        return prolog + etree.tostring(xml, pretty_print=True, encoding="utf-8").decode("utf-8")
 
-    return prolog + etree.tostring(xml, pretty_print=prettify).decode()
+    raw_xml = etree.tostring(xml, encoding="utf-8").decode("utf-8")
+    raw_xml = " ".join(raw_xml.split())
 
+    return prolog + raw_xml
 
 def xpath(source: str, xpath: str) -> str:
     """
@@ -81,11 +82,8 @@ def xpath(source: str, xpath: str) -> str:
     else:
         result_string = ""
         for e in result:
-            if isinstance(e, etree._Element):
-                result_string += etree.tostring(e, pretty_print=True).decode() + "\n"
-            else:
-                result_string += str(e) + "\n"
-    return result_string, "node"
+            result_string += etree.tostring(e, pretty_print=True).decode() + "\n"
+        return result_string, "node"
 
 
 def xsd(source: str, xsd: str) -> bool:
@@ -108,8 +106,6 @@ def xsd(source: str, xsd: str) -> bool:
     except etree.DocumentInvalid as e:
         return str(e)
 
-    
-    
 def xslt(source: str, xslt: str) -> str:
     """
     Method used to transform XML string using XSLT

Backend-libXML/main.py

@@ -36,8 +36,8 @@ def process_xml(request: request, type: str) -> str:
             response_json['result'] = Parser.xslt(data, processorData)
         elif (type == "xpath"):
             response_json['result'], response_json['type'] = Parser.xpath(data, processorData)
-        elif (type == "prettify"):
-            response_json['result'] = Parser.formatXML(data, True)
+        # elif (type == "prettify"):
+        #     response_json['result'] = Parser.formatXML(data, True)
         elif (type == "minimize"):
             response_json['result'] = Parser.formatXML(data, False)
         elif (type == "prettifyHtml"):
@@ -77,9 +77,10 @@ def xsd():
 def xslt():
     return process_xml(request, "xslt")
 
-@app.route("/prettify", methods=["POST"])
-def prettify():
-    return process_xml(request, "prettify")
+# Removed because lxml can't pretify <xs:complexType mixed="true">
+# @app.route("/prettify", methods=["POST"])
+# def prettify():
+#     return process_xml(request, "prettify")
 
 @app.route("/minimize", methods=["POST"])
 def minimize():

Backend/tools-services/src/main/java/com/r11/tools/SparkApplication.java

@@ -44,6 +44,7 @@ public class SparkApplication {
         registry.registerController(new XmlController(gson, logger, saxon, xalan));
         registry.registerController(new MultipleXMLController(gson,logger, saxon));
         registry.registerController(new JsonController(gson, jsongson, logger));
+        registry.registerController(new XmlFormatterController(gson));
 
         registry.register();
 

Backend/tools-services/src/main/java/com/r11/tools/controller/XmlFormatterController.java

@@ -0,0 +1,51 @@
+package com.r11.tools.controller;
+
+import com.google.gson.Gson;
+import com.r11.tools.controller.internal.GlobalControllerManifest;
+import com.r11.tools.controller.internal.HandlerType;
+import com.r11.tools.controller.internal.RestController;
+import com.r11.tools.controller.internal.ScopedControllerManifest;
+import com.r11.tools.controller.internal.XmlJobType;
+import com.r11.tools.model.XMLRequestBody;
+import com.r11.tools.model.XMLResponseBody;
+import com.r11.tools.xml.XmlFormatter;
+import spark.Request;
+import spark.Response;
+
+@GlobalControllerManifest
+public class XmlFormatterController implements RestController {
+    private final Gson gson;
+
+    public XmlFormatterController(Gson gson) {
+        this.gson = gson;
+    }
+
+
+    @ScopedControllerManifest(method = HandlerType.POST, path = "/prettify")
+    public void acceptRequestXslt(Request request, Response response) {
+        acceptRequest(request, response);
+    }
+    private void acceptRequest(Request request, Response response){
+        long timeStart = System.currentTimeMillis();
+        long duration;
+
+        XmlFormatter formatter = new XmlFormatter();
+        XMLRequestBody requestBody;
+        try {
+            requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
+        } catch (Exception e) {
+            requestErrorResponse(response, e);
+            return;
+        }
+        String responseString = formatter.formatXML(requestBody.getData());
+        duration = System.currentTimeMillis() - timeStart;
+        XMLResponseBody responseBody = new  XMLResponseBody(responseString,"OK",duration);
+        response.body(this.gson.toJson(responseBody));
+
+    }
+    private void requestErrorResponse(Response response, Exception ex) {
+        XMLResponseBody responseBody = new XMLResponseBody(ex.getMessage(), "ERR", "N/A", -1);
+        response.status(400);
+        response.body(this.gson.toJson(responseBody));
+    }
+}

Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java

@@ -4,6 +4,7 @@ import com.google.gson.annotations.SerializedName;
 
 /**
  * POJO class used to contain body of XML related requests
+ *
  * @author Adam Bem
  */
 public class XMLRequestBody {
@@ -15,6 +16,8 @@ public class XMLRequestBody {
     private String processor;
     @SerializedName("version")
     private String version;
+    @SerializedName("pretify")
+    private String pretif;
 
     public String getData() {
         return data;
@@ -31,4 +34,8 @@ public class XMLRequestBody {
     public String getVersion() {
         return version;
     }
+
+    public String getPretif() {
+        return pretif;
+    }
 }

Backend/tools-services/src/main/java/com/r11/tools/model/XMLResponseBody.java

@@ -2,6 +2,7 @@ package com.r11.tools.model;
 
 public class XMLResponseBody {
 
+
     private String result;
     private String status;
     private String processor;
@@ -10,6 +11,11 @@ public class XMLResponseBody {
     // Optional
     private String type;
 
+    public XMLResponseBody(String result, String status, long duration) {
+        this.result = result;
+        this.status = status;
+        this.duration = duration;
+    }
     public XMLResponseBody(String result, String status, String processor) {
         this.result = result;
         this.status = status;

Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java

@@ -18,10 +18,6 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringReader;
@@ -65,13 +61,6 @@ public class Xalan implements XmlEngine{
         return nodeType == Node.CDATA_SECTION_NODE || nodeType == Node.TEXT_NODE;
     }
 
-    private boolean isAttributeNode(Node n) {
-        if (n == null)
-            return false;
-        short nodeType = n.getNodeType();
-        return nodeType == Node.CDATA_SECTION_NODE || nodeType == Node.ATTRIBUTE_NODE;
-    }
-
     @Override
     public String processXSLT(XMLMultipleFilesData[] data, String transform) throws Exception {
         throw new UnsupportedOperationException("Xalan does not support multiple files XSLT processing");
@@ -112,10 +101,7 @@ public class Xalan implements XmlEngine{
                     for (Node nn = n.getNextSibling(); isTextNode(nn); nn = nn.getNextSibling()) {
                         resultString.append(nn.getNodeValue());
                     }
-                } else if (isAttributeNode(n)) {
-                    resultString.append(n.getNodeValue());
-                }
-                else {
+                } else {
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                     serializer.transform(new DOMSource(n), new StreamResult(new OutputStreamWriter(outputStream)));
                     resultString.append(outputStream);

Backend/tools-services/src/main/java/com/r11/tools/xml/XmlFormatter.java

@@ -0,0 +1,37 @@
+package com.r11.tools.xml;
+
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+public class XmlFormatter {
+    public String formatXML(String inputXML) {
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setNamespaceAware(true);
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document document = builder.parse(new InputSource(new StringReader(inputXML)));
+
+            TransformerFactory transformerFactory = TransformerFactory.newInstance();
+            Transformer transformer = transformerFactory.newTransformer();
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+
+            StringWriter writer = new StringWriter();
+            transformer.transform(new DOMSource(document), new StreamResult(writer));
+            return writer.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

Frontend/src/components/formatter/XMLButtonFormatterComponent.vue

@@ -18,38 +18,37 @@ function process() {
 }
 
 function prepareRequest():Request {
-    var request = new Request(prepareURL(), {
-        body: prepareRequestBody(),
-        method: "POST"
+  return new Request(prepareURL(), {
+      body: prepareRequestBody(),
+      method: "POST"
     })
-    return request
 }
 
 function prepareURL(): string {
-    var mode = "prettify"
-    if (props.isMinimizer)
-        mode = "minimize"
-    return document.location.protocol + "//" + document.location.hostname + "/libxml/" + mode
+  let mode = "/java/prettify";
+  console.log("prepareUrl")
+  console.log(props.isMinimizer)
+  if (props.isMinimizer)
+        mode = "/libxml/minimize"
+    return document.location.protocol + "//" + document.location.hostname + mode
 }
 
 function prepareRequestBody():string {
-    var requestBody = JSON.stringify({
-        "data": props.xml,
-        "processorData": "N/A",
-        "processor": "libxml",
-        "version": "1.0"
+  return JSON.stringify({
+      "data": props.xml,
+      "processorData": "N/A",
+      "processor": "libxml",
+      "version": "1.0"
     })
-    return requestBody
 }
 
 async function fetchRequest(request: Request):Promise<JSON> {
-    var responseBody = await fetch(request)
-    .then(response => response.json())
-    .then((body) => {
-        emit("update:error", body.status == "ERR")
-        return body
-    })
-    return responseBody
+  return await fetch(request)
+        .then(response => response.json())
+        .then((body) => {
+          emit("update:error", body.status == "ERR")
+          return body
+        })
 }
 
 function sendProcessedData(data: JSON) {

Frontend/src/components/xml/XmlOutputFieldComponent.vue

@@ -7,12 +7,11 @@ const props = defineProps(
     {
         tool: {type: String, required: true},
         xml: {type: [String, Array<TabData>], required: true},
-        query: {type: String, required: true},
-        activeTabId: {type: Number, required: false}
+        query: {type: String, required: true}
     }
 )
 
-const emit = defineEmits(["update", "update:engine"]);
+const emit = defineEmits(["update"]);
 
 const result = ref('');
 
@@ -110,23 +109,21 @@ function prepareRequest():Request {
 
 function prepareURL(): string {
     const engineEndpoint = engine.value == "libxml" ? "libxml" : "java";
-
+   
     let tool = props.tool;
-    if (Array.isArray(props.xml) && props.xml.length > 1 && engine.value == "saxon")
+    if (Array.isArray(props.xml) && props.xml.length > 1)
         tool = "multiple/xslt";
 
     return document.location.protocol + "//" + document.location.hostname + "/" + engineEndpoint + "/" + tool;
 }
 
 function selectRequestBodyType() : string {
-    if (Array.isArray(props.xml) && (engine.value == "xalan" || engine.value == "libxml"))
-      return prepareRequestBodySingleXml(props.xml.at(props.activeTabId!)!.data)
-    else if (Array.isArray(props.xml) && props.xml.length > 1)
-      return prepareRequestBodyMultiXml();
+    if (Array.isArray(props.xml) && props.xml.length > 1)
+        return prepareRequestBodyMultiXml();
     else if (Array.isArray(props.xml))
-      return prepareRequestBodySingleXml(props.xml.at(0)!.data);
+        return prepareRequestBodySingleXml(props.xml.at(0)!.data);
     else
-      return prepareRequestBodySingleXml(props.xml!);
+        return prepareRequestBodySingleXml(props.xml!);
 }
 
 function prepareRequestBodySingleXml(data: string):string {
@@ -191,10 +188,6 @@ function emitVersionChange() {
     emit("update", version.value);
 }
 
-function emitEngineChange() {
-  emit("update:engine", engine.value);
-}
-
 function isVersionSelectionAvailable() {
     return !(versionsForCurrentEngine.value.length == 1 && versionsForCurrentEngine.value.at(0) == "N/A");
 }
@@ -209,11 +202,6 @@ function highlightField() {
     return "";
 }
 
-function handleChange() {
-  changeAvailableVersions();
-  emitEngineChange();
-}
-
 </script>
 
 <template>
@@ -221,7 +209,7 @@ function handleChange() {
         <div class="flex place-content-between w-full items-center pb-2">
             <span class="dark:text-white">Result:</span>
             <div class="flex space-x-2 overflow-x-auto">
-                <select v-model="engine" name="engine" @change="handleChange()" class="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600">
+                <select v-model="engine" name="engine" @change="changeAvailableVersions()" class="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600">
                     <option v-for="engine in enginesForCurrentTool" :value="engine">{{ engine }}</option>
                 </select>
                 <select v-model="version" v-if="isVersionSelectionAvailable()" name="version" @change="emitVersionChange()" class="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600">

Frontend/src/components/xml/XmlTabbedInputComponent.vue

@@ -10,11 +10,11 @@ const props = defineProps(
     {
         stylizedName: {type: String, required: true},
         data: {type: Array<TabData>},
-        tabCountLimit: {type: Number, required: false, validator: (value) => typeof value == "number" && value > 0},
-        engine: {type: String, required: true}
+        tabCountLimit: {type: Number, required: false, validator: (value) => typeof value == "number" && value > 0}
     }
 )
-const emit = defineEmits(['update:modelValue', 'update:activeTabId'])
+const emit = defineEmits(['update:modelValue'])
+
 const newTabId = ref(0);
 const activeTabId = ref(0);
 const data = ref('')
@@ -30,9 +30,6 @@ tabs.value.push({
 function sendValue() {
     emit('update:modelValue', tabs.value);
 }
-function emitActiveTab() {
-  emit('update:activeTabId', activeTabId.value);
-}
 
 function updateData(newData: string) {
     data.value = newData;
@@ -76,7 +73,6 @@ function changeActiveTab(id : number) {
     
     tabs.value.at(index)!.data = data.value;
     activeTabId.value = id;
-    emitActiveTab();
     data.value = tabs.value.at(newIndex)!.data;
 
     sendValue();
@@ -132,7 +128,7 @@ function findIndexWithID(id : number) : number {
     <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
         <div class="flex justify-between mb-2">
             <div class="flex gap-2 overflow-x-auto">
-                <TabComponent @click:activate="changeActiveTab" @click:remove="removeTab" v-for="tab in tabs" :id="tab.id" :isActive="tab.id == activeTabId" :class="[tab.id !== activeTabId && (props.engine === 'xalan' ? 'disabled-tab' : '' || props.engine === 'libxml' ? 'disabled-tab' : '')]">{{ tab.name }}</TabComponent>
+                <TabComponent @click:activate="changeActiveTab" @click:remove="removeTab" v-for="tab in tabs" :id="tab.id" :isActive="tab.id == activeTabId">{{ tab.name }}</TabComponent>
             </div>
             <div class="flex gap-2">
                 <div class="flex items-stretch w-64">

Frontend/src/style.css

@@ -43,7 +43,3 @@
 .tab-active {
     @apply py-2 px-3 h-fit text-slate-700 border-t border-l border-r border-slate-400 rounded-t-2xl bg-gradient-to-r from-blue-400 to-sky-300  dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
 }
-
-.disabled-tab {
-    @apply py-2 px-3 h-fit text-slate-400 border-t border-l border-r border-slate-300 rounded-t-2xl bg-gradient-to-r from-gray-200 to-gray-300 dark:from-gray-700 dark:to-gray-800 pointer-events-none opacity-50;
-}

Frontend/src/views/XSLTView.vue

@@ -11,8 +11,6 @@ import { ref } from 'vue';
 const xml = ref(new Array<TabData>);
 const query = ref('');
 const version = ref('');
-const engine = ref('')
-const activeTabId = ref(0)
 
 function updateVersion(newVersion: string) {
     version.value = newVersion;
@@ -24,10 +22,10 @@ function updateVersion(newVersion: string) {
     <div id="layout" class="flex flex-row w-full h-full">
         <div class="flex flex-col 2xl:flex-row w-full xl:w-7/12 grow overflow-hide pr-2">
             <div class="flex flex-col w-full 2xl:w-1/2 h-2/3 2xl:h-full flex-none items-center">
-                <xmlTabbedInputComponent stylized-name="XML" v-model:activeTabId="activeTabId" :engine="engine" :tab-count-limit="3" v-model="xml"></xmlTabbedInputComponent>
+                <xmlTabbedInputComponent stylized-name="XML" :tab-count-limit="3" v-model="xml"></xmlTabbedInputComponent>
                 <xmlInputFieldComponent stylized-name="XSLT" :data="query" v-model="query"></xmlInputFieldComponent>
             </div>
-            <xmlOutputFieldComponent tool="xslt" :xml="xml" :active-tab-id="activeTabId" v-model:engine="engine" :query="query" @update="updateVersion"></xmlOutputFieldComponent>
+            <xmlOutputFieldComponent tool="xslt" :xml="xml" :query="query" @update="updateVersion"></xmlOutputFieldComponent>
         </div>
         <TooltipComponent tool-type="xslt" :version="version"></TooltipComponent>
     </div>