fix libxml xpath bugs

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:

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);

Frontend/src/components/common/CodeEditorComponent.vue

@@ -2,8 +2,7 @@
 import { onBeforeUpdate, inject } from 'vue'
 import { Codemirror } from 'vue-codemirror'
 import { oneDark } from '@codemirror/theme-one-dark'
-import { createTheme} from 'thememirror';
-import {tags as t} from '@lezer/highlight';
+import { espresso } from 'thememirror';
 import {xml} from '@codemirror/lang-xml'
 import {json} from '@codemirror/lang-json'
 import {html} from '@codemirror/lang-html'
@@ -19,47 +18,6 @@ const props= defineProps({
     },
 })
 
-const lightTheme = createTheme({
-	variant: 'light',
-	settings: {
-		background: '#FFFFFF',
-		foreground: '#000000',
-		caret: '#000000',
-		selection: '#80C7FF',
-		gutterBackground: '#FFFFFF',
-		gutterForeground: '#00000070',
-		lineHighlight: '#C1E2F840',
-	},
-	styles: [
-		{
-			tag: t.comment,
-			color: '#AAAAAA',
-		},
-		{
-			tag: [t.keyword, t.operator, t.typeName, t.tagName, t.propertyName],
-			color: '#2F6F9F',
-			fontWeight: 'bold',
-		},
-		{
-			tag: [t.attributeName, t.definition(t.propertyName)],
-			color: '#4F9FD0',
-		},
-		{
-			tag: [t.className, t.string, t.special(t.brace)],
-			color: '#CF4F5F',
-		},
-		{
-			tag: t.number,
-			color: '#CF4F5F',
-			fontWeight: 'bold',
-		},
-		{
-			tag: t.variableName,
-			fontWeight: 'bold',
-		},
-	],
-});
-
 const emit = defineEmits(
   [
     'update:updatedCode'
@@ -79,7 +37,7 @@ function selectTheme() {
   if (isDarkModeSet())
     return oneDark;
   else
-    return lightTheme;
+    return espresso;
 }
 
 function isDarkModeSet(){
@@ -125,4 +83,4 @@ function parseLanguage(name: String){
       />
     
   </div>
-</template>
+</template>

Frontend/src/components/xml/XmlOutputFieldComponent.vue

@@ -18,7 +18,6 @@ const result = ref('');
 
 let enginesForCurrentTool = ref(["saxon", "xalan", "libxml"]);
 
-const allVersionsOfXpath = ["2.0", "3.0", "3.1"];
 const allVersions = ["1.0", "2.0", "3.0", "3.1"];
 let versionsForCurrentEngine = ref([""]);
 
@@ -74,7 +73,7 @@ function changeAvailableVersionsOfXPath() {
     if(engine.value == "xalan" || engine.value == "libxml")
         versionsForCurrentEngine.value = ["1.0"];
     else if (engine.value == "saxon")
-        versionsForCurrentEngine.value = allVersionsOfXpath;
+        versionsForCurrentEngine.value = allVersions;
 }
 
 function selectDefaultEngine() {

issue_template/bug.md

@@ -1,21 +0,0 @@
----
-
-name: "Bug template"    
-about: "This template is for reporting bugs"  
-title: "Bug"    
-
----
-
-## Description
-*A clear and concise description of the issue.*
-
-### Selected Fields
-- **Engine:** [Specify the engine used]
-- **Version:** [Specify the version]
-- **Tool:** [Specify the currently used tool]
-
-### Data: 
-*Paste used xml/xslt/json etc...*
-
-## Additional Context
-*Any other information that might help with this issue.*

issue_template/feature.md

@@ -1,10 +0,0 @@
----
-
-name: "Feature request template"    
-about: "This template is for requesting features"    
-title: "Feature request" 
-
----
-
-## Feature Request 
-*Describe the feature you’d like to see and why it’s useful.*