Merge branch 'master' into issue_tracker

Updated existing theme so that line highlighting is transparent,  had to add new theme because ovewriting exisiting value was impossible.

Reviewed-on: #291
Reviewed-by: Adam Bem <bema@noreply.example.com>
Co-authored-by: szewczyw <wojtekszewczyk2000@gmail.com>
Co-committed-by: szewczyw <wojtekszewczyk2000@gmail.com>

Backend-libXML/Parser.py

@@ -40,7 +40,7 @@ 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:].strip()
+        source = source[prolog_end: ]
     
     byte_input = BytesIO(source.encode("utf-8"))
     parser = etree.XMLParser(remove_blank_text=True)
@@ -48,12 +48,9 @@ def formatXML(source: str, prettify: bool) -> str:
 
     if prettify:
         prolog += "\n"
-        return prolog + etree.tostring(xml, pretty_print=True, encoding="utf-8").decode("utf-8")
 
-    raw_xml = etree.tostring(xml, encoding="utf-8").decode("utf-8")
+    return prolog + etree.tostring(xml, pretty_print=prettify).decode()
-    raw_xml = " ".join(raw_xml.split())
 
-    return prolog + raw_xml
 
 def xpath(source: str, xpath: str) -> str:
     """
@@ -86,6 +83,7 @@ def xpath(source: str, xpath: str) -> str:
         return result_string, "node"
 
 
+
 def xsd(source: str, xsd: str) -> bool:
     """
     Method used to validate XML string against XSD schema
@@ -106,6 +104,8 @@ 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"):
+        elif (type == "prettify"):
-        #     response_json['result'] = Parser.formatXML(data, True)
+            response_json['result'] = Parser.formatXML(data, True)
         elif (type == "minimize"):
             response_json['result'] = Parser.formatXML(data, False)
         elif (type == "prettifyHtml"):
@@ -77,10 +77,9 @@ def xsd():
 def xslt():
     return process_xml(request, "xslt")
 
-# Removed because lxml can't pretify <xs:complexType mixed="true">
+@app.route("/prettify", methods=["POST"])
-# @app.route("/prettify", methods=["POST"])
+def prettify():
-# def prettify():
+    return process_xml(request, "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,7 +44,6 @@ 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

@@ -1,51 +0,0 @@
-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,7 +4,6 @@ import com.google.gson.annotations.SerializedName;
 
 /**
  * POJO class used to contain body of XML related requests
- *
  * @author Adam Bem
  */
 public class XMLRequestBody {
@@ -16,8 +15,6 @@ public class XMLRequestBody {
     private String processor;
     @SerializedName("version")
     private String version;
-    @SerializedName("pretify")
-    private String pretif;
 
     public String getData() {
         return data;
@@ -34,8 +31,4 @@ 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,7 +2,6 @@ package com.r11.tools.model;
 
 public class XMLResponseBody {
 
-
     private String result;
     private String status;
     private String processor;
@@ -11,11 +10,6 @@ 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/XmlFormatter.java

@@ -1,37 +0,0 @@
-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/common/CodeEditorComponent.vue

@@ -2,7 +2,8 @@
 import { onBeforeUpdate, inject } from 'vue'
 import { Codemirror } from 'vue-codemirror'
 import { oneDark } from '@codemirror/theme-one-dark'
-import { espresso } from 'thememirror';
+import { createTheme} from 'thememirror';
+import {tags as t} from '@lezer/highlight';
 import {xml} from '@codemirror/lang-xml'
 import {json} from '@codemirror/lang-json'
 import {html} from '@codemirror/lang-html'
@@ -18,6 +19,47 @@ 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'
@@ -37,7 +79,7 @@ function selectTheme() {
   if (isDarkModeSet())
     return oneDark;
   else
-    return espresso;
+    return lightTheme;
 }
 
 function isDarkModeSet(){

Frontend/src/components/formatter/XMLButtonFormatterComponent.vue

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

issue_template/bug.md

@@ -0,0 +1,21 @@
+---
+
+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

@@ -0,0 +1,10 @@
+---
+
+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.*