From 8d6d97c55591df11ac9dc93bbacf8f764bcf13ff Mon Sep 17 00:00:00 2001
From: Wojciech Mizia <miziawojciech@gmail.com>
Date: Wed, 22 Jan 2025 14:58:46 +0100
Subject: [PATCH 1/6] only single file on xalan frontend

---
 .../xml/XmlOutputFieldComponent.vue           | 22 ++++++++++++++-----
 .../xml/XmlTabbedInputComponent.vue           | 12 ++++++----
 Frontend/src/style.css                        |  4 ++++
 Frontend/src/views/XSLTView.vue               |  6 +++--
 Frontend/tsconfig.json                        |  3 ++-
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/Frontend/src/components/xml/XmlOutputFieldComponent.vue b/Frontend/src/components/xml/XmlOutputFieldComponent.vue
index 2e0adc8..5804712 100644
--- a/Frontend/src/components/xml/XmlOutputFieldComponent.vue
+++ b/Frontend/src/components/xml/XmlOutputFieldComponent.vue
@@ -7,11 +7,12 @@ const props = defineProps(
     {
         tool: {type: String, required: true},
         xml: {type: [String, Array<TabData>], required: true},
-        query: {type: String, required: true}
+        query: {type: String, required: true},
+        activeTabId: {type: Number, required: false}
     }
 )
 
-const emit = defineEmits(["update"]);
+const emit = defineEmits(["update", "update:engine"]);
 
 const result = ref('');
 
@@ -111,14 +112,16 @@ function prepareURL(): string {
     const engineEndpoint = engine.value == "libxml" ? "libxml" : "java";
    
     let tool = props.tool;
-    if (Array.isArray(props.xml) && props.xml.length > 1)
+    if (Array.isArray(props.xml) && props.xml.length > 1 && engine.value !== "xalan")
         tool = "multiple/xslt";
 
     return document.location.protocol + "//" + document.location.hostname + "/" + engineEndpoint + "/" + tool;
 }
 
 function selectRequestBodyType() : string {
-    if (Array.isArray(props.xml) && props.xml.length > 1)
+    if (Array.isArray(props.xml) && engine.value == "xalan")
+      return prepareRequestBodySingleXml(props.xml.at(props.activeTabId!)!.data)
+    else if (Array.isArray(props.xml) && props.xml.length > 1)
         return prepareRequestBodyMultiXml();
     else if (Array.isArray(props.xml))
         return prepareRequestBodySingleXml(props.xml.at(0)!.data);
@@ -188,6 +191,10 @@ 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");
 }
@@ -202,6 +209,11 @@ function highlightField() {
     return "";
 }
 
+function handleChange() {
+  changeAvailableVersions();
+  emitEngineChange();
+}
+
 </script>
 
 <template>
@@ -209,7 +221,7 @@ function highlightField() {
         <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="changeAvailableVersions()" 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="handleChange()" 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">
diff --git a/Frontend/src/components/xml/XmlTabbedInputComponent.vue b/Frontend/src/components/xml/XmlTabbedInputComponent.vue
index add3252..f9f8f2f 100644
--- a/Frontend/src/components/xml/XmlTabbedInputComponent.vue
+++ b/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}
+        tabCountLimit: {type: Number, required: false, validator: (value) => typeof value == "number" && value > 0},
+        engine: {type: String, required: true}
     }
 )
-const emit = defineEmits(['update:modelValue'])
-
+const emit = defineEmits(['update:modelValue', 'update:activeTabId'])
 const newTabId = ref(0);
 const activeTabId = ref(0);
 const data = ref('')
@@ -30,6 +30,9 @@ tabs.value.push({
 function sendValue() {
     emit('update:modelValue', tabs.value);
 }
+function emitActiveTab() {
+  emit('update:activeTabId', activeTabId.value);
+}
 
 function updateData(newData: string) {
     data.value = newData;
@@ -73,6 +76,7 @@ function changeActiveTab(id : number) {
     
     tabs.value.at(index)!.data = data.value;
     activeTabId.value = id;
+    emitActiveTab();
     data.value = tabs.value.at(newIndex)!.data;
 
     sendValue();
@@ -128,7 +132,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">{{ tab.name }}</TabComponent>
+                <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' : '']">{{ tab.name }}</TabComponent>
             </div>
             <div class="flex gap-2">
                 <div class="flex items-stretch w-64">
diff --git a/Frontend/src/style.css b/Frontend/src/style.css
index c85c2d2..7b46710 100644
--- a/Frontend/src/style.css
+++ b/Frontend/src/style.css
@@ -43,3 +43,7 @@
 .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;
+}
diff --git a/Frontend/src/views/XSLTView.vue b/Frontend/src/views/XSLTView.vue
index 164f36e..639ea7b 100644
--- a/Frontend/src/views/XSLTView.vue
+++ b/Frontend/src/views/XSLTView.vue
@@ -11,6 +11,8 @@ 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;
@@ -22,10 +24,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" :tab-count-limit="3" v-model="xml"></xmlTabbedInputComponent>
+                <xmlTabbedInputComponent stylized-name="XML" v-model:activeTabId="activeTabId" :engine="engine" :tab-count-limit="3" v-model="xml"></xmlTabbedInputComponent>
                 <xmlInputFieldComponent stylized-name="XSLT" :data="query" v-model="query"></xmlInputFieldComponent>
             </div>
-            <xmlOutputFieldComponent tool="xslt" :xml="xml" :query="query" @update="updateVersion"></xmlOutputFieldComponent>
+            <xmlOutputFieldComponent tool="xslt" :xml="xml" :active-tab-id="activeTabId" v-model:engine="engine" :query="query" @update="updateVersion"></xmlOutputFieldComponent>
         </div>
         <TooltipComponent tool-type="xslt" :version="version"></TooltipComponent>
     </div>
diff --git a/Frontend/tsconfig.json b/Frontend/tsconfig.json
index 877be66..7ae67fc 100644
--- a/Frontend/tsconfig.json
+++ b/Frontend/tsconfig.json
@@ -8,7 +8,8 @@
       "@components/*":["./src/components/*"],
       "@views/*":["./src/views/*"],
       "@assets/*":["./src/assets/*"],
-    }
+    },
+    "types": ["vite/client", "vue"]
   },
   "references": [
     {
-- 
2.51.0


From 2c8470b4e2ee954b63c1f2aab3bb21bf5b6f97e1 Mon Sep 17 00:00:00 2001
From: Wojciech Mizia <miziawojciech@gmail.com>
Date: Thu, 30 Jan 2025 15:07:32 +0100
Subject: [PATCH 2/6] only single files for libxml

---
 .../src/components/xml/XmlOutputFieldComponent.vue   | 12 ++++++------
 .../src/components/xml/XmlTabbedInputComponent.vue   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Frontend/src/components/xml/XmlOutputFieldComponent.vue b/Frontend/src/components/xml/XmlOutputFieldComponent.vue
index 5804712..09757f6 100644
--- a/Frontend/src/components/xml/XmlOutputFieldComponent.vue
+++ b/Frontend/src/components/xml/XmlOutputFieldComponent.vue
@@ -110,23 +110,23 @@ 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 !== "xalan")
+    if (Array.isArray(props.xml) && props.xml.length > 1 && engine.value == "saxon")
         tool = "multiple/xslt";
 
     return document.location.protocol + "//" + document.location.hostname + "/" + engineEndpoint + "/" + tool;
 }
 
 function selectRequestBodyType() : string {
-    if (Array.isArray(props.xml) && engine.value == "xalan")
+    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();
+      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 {
diff --git a/Frontend/src/components/xml/XmlTabbedInputComponent.vue b/Frontend/src/components/xml/XmlTabbedInputComponent.vue
index f9f8f2f..18fd8cd 100644
--- a/Frontend/src/components/xml/XmlTabbedInputComponent.vue
+++ b/Frontend/src/components/xml/XmlTabbedInputComponent.vue
@@ -132,7 +132,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' : '']">{{ tab.name }}</TabComponent>
+                <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>
             </div>
             <div class="flex gap-2">
                 <div class="flex items-stretch w-64">
-- 
2.51.0


From 1a72dc202d97acc6752ebb6e228d4f53cb3906a8 Mon Sep 17 00:00:00 2001
From: Wojciech Mizia <miziawojciech@gmail.com>
Date: Wed, 5 Feb 2025 12:46:00 +0100
Subject: [PATCH 3/6] fix xalan xpath bugs

---
 .../src/main/java/com/r11/tools/xml/Xalan.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java b/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
index 5c64093..73b41e9 100644
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
@@ -18,6 +18,10 @@ 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;
@@ -61,6 +65,13 @@ 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");
@@ -101,7 +112,10 @@ public class Xalan implements XmlEngine{
                     for (Node nn = n.getNextSibling(); isTextNode(nn); nn = nn.getNextSibling()) {
                         resultString.append(nn.getNodeValue());
                     }
-                } else {
+                } else if (isAttributeNode(n)) {
+                    resultString.append(n.getNodeValue());
+                }
+                else {
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                     serializer.transform(new DOMSource(n), new StreamResult(new OutputStreamWriter(outputStream)));
                     resultString.append(outputStream);
-- 
2.51.0


From ec1b56677d611f646c5889cf9c679e7c0f3d4965 Mon Sep 17 00:00:00 2001
From: Wojciech Mizia <miziawojciech@gmail.com>
Date: Wed, 5 Feb 2025 14:07:50 +0100
Subject: [PATCH 4/6] remove unnecessary

---
 Frontend/tsconfig.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Frontend/tsconfig.json b/Frontend/tsconfig.json
index 7ae67fc..877be66 100644
--- a/Frontend/tsconfig.json
+++ b/Frontend/tsconfig.json
@@ -8,8 +8,7 @@
       "@components/*":["./src/components/*"],
       "@views/*":["./src/views/*"],
       "@assets/*":["./src/assets/*"],
-    },
-    "types": ["vite/client", "vue"]
+    }
   },
   "references": [
     {
-- 
2.51.0


From 3b96031a426d0f8b534c1a80930ddb2f32280f90 Mon Sep 17 00:00:00 2001
From: Wojciech Mizia <miziawojciech@gmail.com>
Date: Thu, 6 Feb 2025 18:30:30 +0100
Subject: [PATCH 5/6] fix libxml xpath bugs

---
 Backend-libXML/Parser.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Backend-libXML/Parser.py b/Backend-libXML/Parser.py
index 442484d..7984545 100644
--- a/Backend-libXML/Parser.py
+++ b/Backend-libXML/Parser.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from lxml import etree, html
 from io import BytesIO
 
@@ -79,9 +81,11 @@ def xpath(source: str, xpath: str) -> str:
     else:
         result_string = ""
         for e in result:
-            result_string += etree.tostring(e, pretty_print=True).decode() + "\n"
-        return result_string, "node"
-
+            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"
 
 
 def xsd(source: str, xsd: str) -> bool:
-- 
2.51.0


From 29b9fbb5087cb72571b9efc411632119a74f5c09 Mon Sep 17 00:00:00 2001
From: Wojciech Mizia <miziawojciech@gmail.com>
Date: Fri, 7 Feb 2025 13:47:43 +0100
Subject: [PATCH 6/6] remove unused imports

---
 Backend-libXML/Parser.py                                      | 2 --
 .../tools-services/src/main/java/com/r11/tools/xml/Xalan.java | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/Backend-libXML/Parser.py b/Backend-libXML/Parser.py
index 7984545..46b834f 100644
--- a/Backend-libXML/Parser.py
+++ b/Backend-libXML/Parser.py
@@ -1,5 +1,3 @@
-from typing import Any
-
 from lxml import etree, html
 from io import BytesIO
 
diff --git a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java b/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
index 73b41e9..56f15fa 100644
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
+++ b/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;
-- 
2.51.0