jsf.js_next_gen 4.0.2-beta.4 → 4.0.2-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.2-beta.4",
+  "version": "4.0.2-beta.6",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -48,6 +48,6 @@
     "webpack-dev-server": "^4.15.1"
   },
   "dependencies": {
-    "mona-dish": "0.28.10"
+    "mona-dish": "0.28.11"
   }
 }

package/src/main/typescript/impl/util/FileUtils.ts

@@ -41,7 +41,8 @@ export function encodeFormData(formData: Config,
  */
 export function decodeEncodedValues(encoded: string): string[][] {
     const filterBlanks = item => !!(item || '').replace(/\s+/g, '');
-    const splitKeyValuePair = line => {
+    const splitKeyValuePair = _line => {
+        let line = decodeURIComponent(_line);
         let index = line.indexOf("=");
         if (index == -1) {
             return [line];
@@ -49,7 +50,7 @@ export function decodeEncodedValues(encoded: string): string[][] {
         return [line.substring(0, index), line.substring(index + 1)];
     };
 
-    let requestParamEntries = decodeURIComponent(encoded).split(/&/gi);
+    let requestParamEntries = encoded.split(/&/gi);
     return requestParamEntries.filter(filterBlanks).map(splitKeyValuePair);
 }
 

package/src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts

@@ -265,4 +265,187 @@ describe("test for proper request param patterns identical to the old implementa
         done();
     });
 
-});
+    /**
+     * This test is based on Tobago 6.0.0 (Jakarte EE 10).
+     */
+    it("tobago tree select", function (done) {
+        window.document.body.innerHTML = `
+<tobago-page locale='de' class='container-fluid' id='page' focus-on-error='true' wait-overlay-delay-full='1000' wait-overlay-delay-ajax='1000'>
+   <form action='/content/090-tree/01-select/Tree_Select.xhtml' id='page::form' method='post' accept-charset='UTF-8' data-tobago-context-path=''>
+    <input type='hidden' name='jakarta.faces.source' id='jakarta.faces.source' disabled='disabled'>
+    <tobago-focus id='page::lastFocusId'>
+     <input type='hidden' name='page::lastFocusId' id='page::lastFocusId::field'>
+    </tobago-focus>
+    <input type='hidden' name='org.apache.myfaces.tobago.webapp.Secret' id='org.apache.myfaces.tobago.webapp.Secret' value='secretValue'>
+    <div class='tobago-page-menuStore'>
+    </div>
+    <div class='tobago-page-toastStore'>
+    </div>
+    <span id='page::faces-state-container'><input type='hidden' name='jakarta.faces.ViewState' id='j_id__v_0:jakarta.faces.ViewState:1' value='viewStateValue' autocomplete='off'><input type='hidden' name='jakarta.faces.RenderKitId' value='tobago'><input type='hidden' id='j_id__v_0:jakarta.faces.ClientWindow:1' name='jakarta.faces.ClientWindow' value='clientWindowValue'></span>
+    <tobago-tree id='page:categoriesTree' data-tobago-selectable='multi' selectable='multi'>
+<tobago-tree-node id='page:categoriesTree:0:j_id_3' class='tobago-folder tobago-expanded' expandable='expandable' index='0' data-tobago-level='0'>
+<span id='page:categoriesTree:0:j_id_4' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:0:select' value='page:categoriesTree:0:select' id='page:categoriesTree:0:select'>
+<label class='form-check-label' for='page:categoriesTree:0:select'>Category</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:0:select' execute='page:categoriesTree:0:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:1:j_id_3' index='1' data-tobago-tree-parent='page:categoriesTree:0:j_id_3' parent='page:categoriesTree:0:j_id_3' data-tobago-level='1'>
+<span id='page:categoriesTree:1:j_id_4' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:1:select' value='page:categoriesTree:1:select' id='page:categoriesTree:1:select'>
+<label class='form-check-label' for='page:categoriesTree:1:select'>Sports</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:1:select' execute='page:categoriesTree:1:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:2:j_id_3' index='2' data-tobago-tree-parent='page:categoriesTree:0:j_id_3' parent='page:categoriesTree:0:j_id_3' data-tobago-level='1'>
+<span id='page:categoriesTree:2:j_id_4' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:2:select' value='page:categoriesTree:2:select' id='page:categoriesTree:2:select'>
+<label class='form-check-label' for='page:categoriesTree:2:select'>Movies</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:2:select' execute='page:categoriesTree:2:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:3:j_id_3' class='tobago-selected tobago-folder tobago-expanded' selected='selected' expandable='expandable' index='3' data-tobago-tree-parent='page:categoriesTree:0:j_id_3' parent='page:categoriesTree:0:j_id_3' data-tobago-level='1'>
+<span id='page:categoriesTree:3:j_id_4' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:3:select' value='page:categoriesTree:3:select' id='page:categoriesTree:3:select' checked='checked'>
+<label class='form-check-label' for='page:categoriesTree:3:select'>Music</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:3:select' execute='page:categoriesTree:3:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:4:j_id_3' index='4' data-tobago-tree-parent='page:categoriesTree:3:j_id_3' parent='page:categoriesTree:3:j_id_3' data-tobago-level='2'>
+<span id='page:categoriesTree:4:j_id_4' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:4:select' value='page:categoriesTree:4:select' id='page:categoriesTree:4:select'>
+<label class='form-check-label' for='page:categoriesTree:4:select'>Classic</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:4:select' execute='page:categoriesTree:4:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:5:j_id_3' index='5' data-tobago-tree-parent='page:categoriesTree:3:j_id_3' parent='page:categoriesTree:3:j_id_3' data-tobago-level='2'>
+<span id='page:categoriesTree:5:j_id_4' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:5:select' value='page:categoriesTree:5:select' id='page:categoriesTree:5:select'>
+<label class='form-check-label' for='page:categoriesTree:5:select'>Pop</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:5:select' execute='page:categoriesTree:5:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:6:j_id_3' class='tobago-folder' expandable='expandable' index='6' data-tobago-tree-parent='page:categoriesTree:3:j_id_3' parent='page:categoriesTree:3:j_id_3' data-tobago-level='2'>
+<span id='page:categoriesTree:6:j_id_4' class='tobago-toggle'><i class='bi-plus-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:6:select' value='page:categoriesTree:6:select' id='page:categoriesTree:6:select'>
+<label class='form-check-label' for='page:categoriesTree:6:select'>World</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:6:select' execute='page:categoriesTree:6:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:7:j_id_3' index='7' data-tobago-tree-parent='page:categoriesTree:0:j_id_3' parent='page:categoriesTree:0:j_id_3' data-tobago-level='1'>
+<span id='page:categoriesTree:7:j_id_4' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:7:select' value='page:categoriesTree:7:select' id='page:categoriesTree:7:select'>
+<label class='form-check-label' for='page:categoriesTree:7:select'>Games</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:7:select' execute='page:categoriesTree:7:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:8:j_id_3' class='tobago-folder tobago-expanded' expandable='expandable' index='8' data-tobago-tree-parent='page:categoriesTree:0:j_id_3' parent='page:categoriesTree:0:j_id_3' data-tobago-level='1'>
+<span id='page:categoriesTree:8:j_id_4' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:8:select' value='page:categoriesTree:8:select' id='page:categoriesTree:8:select'>
+<label class='form-check-label' for='page:categoriesTree:8:select'>Science</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:8:select' execute='page:categoriesTree:8:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:9:j_id_3' class='tobago-folder' expandable='expandable' index='9' data-tobago-tree-parent='page:categoriesTree:8:j_id_3' parent='page:categoriesTree:8:j_id_3' data-tobago-level='2'>
+<span id='page:categoriesTree:9:j_id_4' class='tobago-toggle'><i class='bi-plus-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:9:select' value='page:categoriesTree:9:select' id='page:categoriesTree:9:select'>
+<label class='form-check-label' for='page:categoriesTree:9:select'>Mathematics</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:9:select' execute='page:categoriesTree:9:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:10:j_id_3' index='10' data-tobago-tree-parent='page:categoriesTree:8:j_id_3' parent='page:categoriesTree:8:j_id_3' data-tobago-level='2'>
+<span id='page:categoriesTree:10:j_id_4' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:10:select' value='page:categoriesTree:10:select' id='page:categoriesTree:10:select'>
+<label class='form-check-label' for='page:categoriesTree:10:select'>Geography</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:10:select' execute='page:categoriesTree:10:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<tobago-tree-node id='page:categoriesTree:11:j_id_3' class='tobago-folder' expandable='expandable' index='11' data-tobago-tree-parent='page:categoriesTree:8:j_id_3' parent='page:categoriesTree:8:j_id_3' data-tobago-level='2'>
+<span id='page:categoriesTree:11:j_id_4' class='tobago-toggle'><i class='bi-plus-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='checkbox' name='page:categoriesTree:11:select' value='page:categoriesTree:11:select' id='page:categoriesTree:11:select'>
+<label class='form-check-label' for='page:categoriesTree:11:select'>Astronomy</label>
+<tobago-behavior event='change' client-id='page:categoriesTree:11:select' execute='page:categoriesTree:11:select page:categoriesTree' render='page:selectedNodesOutput page:categoriesTree'></tobago-behavior>
+</tobago-tree-select>
+</tobago-tree-node>
+<input type='hidden' name='page:categoriesTree::selected' id='page:categoriesTree::selected' class='tobago-selected' value='[3]'>
+<input type='hidden' name='page:categoriesTree::expanded' id='page:categoriesTree::expanded' class='tobago-expanded' value='[0,3,8]'>
+<tobago-scroll>
+<input id='page:categoriesTree::scrollPosition' name='page:categoriesTree::scrollPosition' type='hidden' value='[0,0]' data-tobago-scroll-position='true'>
+</tobago-scroll>
+</tobago-tree>
+    <tobago-out id='page:selectedNodesOutput' class='tobago-label-container tobago-auto-spacing'><label for='page:selectedNodesOutput' class='col-form-label'>Selected Nodes</label><span class='form-control-plaintext'>Music</span></tobago-out>
+   </form>
+   <noscript>
+    <div class='tobago-page-noscript'>Diese Seite benötigt JavaScript, allerdings ist JavaScript in Ihrem Browser derzeit deaktiviert. Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
+    </div>
+   </noscript>
+  </tobago-page>
+`;
+
+        //we now run the tests here
+        try {
+            let event = {
+                isTrusted: true,
+                type: 'change',
+                target: document.getElementById("page:categoriesTree:3:select"),
+                currentTarget: document.getElementById("page:categoriesTree:3:select")
+            };
+            global.debug2 = true;
+            faces.ajax.request(
+                document.getElementById("page:categoriesTree:3:select"),
+                event as any,
+                {
+                    "jakarta.faces.behavior.event": "change",
+                    execute: 'page:categoriesTree:3:select page:categoriesTree',
+                    render: 'page:selectedNodesOutput page:categoriesTree'
+                });
+        } catch (err) {
+            console.error(err);
+            expect(false).to.eq(true);
+        }
+        const requestBody = this.requests[0].requestBody;
+        let arsArr = requestBody.split("&");
+        let resultsMap = {};
+        for (let val of arsArr) {
+            let keyVal = val.split("=");
+
+            if (resultsMap[keyVal[0]]) {
+                console.log("duplicated key '" + keyVal[0] + "'");
+                expect(resultsMap[keyVal[0]]).not.to.exist;
+            }
+
+            resultsMap[keyVal[0]] = keyVal[1];
+        }
+
+        expect(resultsMap[encodeURIComponent("page::lastFocusId")]).to.exist;
+        expect(resultsMap["org.apache.myfaces.tobago.webapp.Secret"]).to.eq("secretValue");
+        expect(resultsMap["jakarta.faces.ViewState"]).to.eq("viewStateValue");
+        expect(resultsMap["jakarta.faces.RenderKitId"]).to.eq("tobago");
+        expect(resultsMap["jakarta.faces.ClientWindow"]).to.eq("clientWindowValue");
+        expect(resultsMap[encodeURIComponent("page:categoriesTree::selected")]).to.eq(encodeURIComponent("[3]"));
+        expect(resultsMap[encodeURIComponent("page:categoriesTree::expanded")]).to.eq(encodeURIComponent("[0,3,8]"));
+        expect(resultsMap[encodeURIComponent("page:categoriesTree::scrollPosition")]).to.eq(encodeURIComponent("[0,0]"));
+        expect(resultsMap["jakarta.faces.behavior.event"]).to.eq("change");
+        expect(resultsMap["jakarta.faces.partial.event"]).to.eq("change");
+        expect(resultsMap["jakarta.faces.source"]).to.eq(encodeURIComponent("page:categoriesTree:3:select"));
+        expect(resultsMap["jakarta.faces.partial.ajax"]).to.eq("true");
+        expect(resultsMap[encodeURIComponent("page::form")]).to.eq(encodeURIComponent("page::form"));
+        expect(resultsMap["jakarta.faces.partial.execute"]).to.eq(encodeURIComponent("page:categoriesTree:3:select page:categoriesTree"));
+        expect(resultsMap["jakarta.faces.partial.render"]).to.eq(encodeURIComponent("page:selectedNodesOutput page:categoriesTree"));
+        expect(resultsMap[encodeURIComponent("page:categoriesTree:3:select")]).to.exist;
+
+        done();
+    });
+});

package/src/main/typescript/test/xhrCore/RequestTest.spec.ts

@@ -18,7 +18,7 @@ import {describe, it} from "mocha";
 import * as sinon from "sinon";
 import {expect} from "chai";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {_Es2019Array, DomQuery} from "mona-dish";
+import {_Es2019Array, DomQuery, DQ$} from "mona-dish";
 import {
     COMPLETE, EMPTY_STR,
     P_AJAX,
@@ -687,7 +687,7 @@ describe('Tests after core when it hits response', function () {
 
     /**
      * the idea is if a checkbox or radio button is the issuing element
-     * we cannot attach it
+     * we cannot attach it if unchecked
      */
     it("must handle issuing checkboxes and radio buttons with values correctly", () => {
         const waitForResult = initCheckboxForm();
@@ -719,7 +719,46 @@ describe('Tests after core when it hits response', function () {
             }
 
             //TODO test assert here
-            expect(resultsMap["page%3numbers%31"]).to.not.exist;
+            expect(resultsMap["page%3Anumbers%3A1"]).to.not.exist;
+            //expect(doubles).to.eq(2);
+
+        });
+    });
+
+    /**
+     * the idea is if a checkbox or radio button is the issuing element
+     *  if checked
+     */
+    it("must handle issuing checkboxes and radio buttons with values correctly", () => {
+        const waitForResult = initCheckboxForm();
+        return waitForResult.then((close) => {
+            const send = sinon.spy(XMLHttpRequest.prototype, "send");
+            let dqElem = DomQuery.byId("page:numbers:1");
+            let element = dqElem.getAsElem(0).value;
+
+            faces.ajax.request(element, null, {
+                execute: "form1",
+                render: "@form",
+                params: {
+                    pass1: "pass1",
+                    pass2: "pass2"
+                }
+            });
+
+            let argsVal: any = send.args[0][0];
+            let arsArr = argsVal.split("&");
+            let resultsMap = {};
+            let doubles = 0;
+            for (let val of arsArr) {
+                let keyVal = val.split("=");
+                if(!!resultsMap[keyVal[0]]) {
+                    doubles++;
+                }
+                resultsMap[keyVal[0]] = keyVal[1];
+            }
+
+            //TODO test assert here
+            expect(resultsMap["page%3Anumbers%3A1"]).to.eq("1");
             //expect(doubles).to.eq(2);
 
         });
@@ -755,11 +794,94 @@ describe('Tests after core when it hits response', function () {
             }
 
             //TODO test assert here
-            expect(resultsMap["page%3numbers%3r%31"]).to.not.exist;
+            expect(resultsMap["page%3Anumbers%3Ar%3A1"]).to.not.exist;
+            //expect(doubles).to.eq(2);
+
+        });
+    });
+
+    it("must handle issuing checkboxes and radio buttons with values correctly with value", () => {
+        const waitForResult = initCheckboxForm();
+        return waitForResult.then((close) => {
+            const send = sinon.spy(XMLHttpRequest.prototype, "send");
+            let dqElem = DomQuery.byId("page:numbers:r:1");
+            let element = dqElem.getAsElem(0).value;
+
+            faces.ajax.request(element, null, {
+                execute: "form2",
+                render: "@form",
+                params: {
+                    pass1: "pass1",
+                    pass2: "pass2"
+                }
+            });
+
+            let argsVal: any = send.args[0][0];
+            let arsArr = argsVal.split("&");
+            let resultsMap = {};
+            let doubles = 0;
+            for (let val of arsArr) {
+                let keyVal = val.split("=");
+                if(!!resultsMap[keyVal[0]]) {
+                    doubles++;
+                }
+                resultsMap[keyVal[0]] = keyVal[1];
+            }
+
+            //TODO test assert here
+            expect(resultsMap["page%3Anumbers%3Ar%3A1"]).to.exist;
             //expect(doubles).to.eq(2);
 
         });
     });
 
+    /**
+     * https://issues.apache.org/jira/browse/MYFACES-4638
+     */
+    it("must pass values with & in its value correctly", function (done) {
+        let send = sinon.spy(XMLHttpRequest.prototype, "send");
+        let globalCnt = 0;
+        let localCnt = 0;
+        DomQuery.byId("input_1").val = "aaa&bbb";
+        try {
+            let element = DomQuery.byId("input_2").getAsElem(0).value;
+            faces.ajax.addOnEvent(() => {
+                globalCnt++;
+            });
+            faces.ajax.request(element, null, {
+                execute: "input_1",
+                render: "@form",
+                params: {
+                    pass1: "pass1",
+                    pass2: "pass2"
+                },
+                message: "Hello World",
+                onevent: (evt: any) => {
+                    localCnt++;
+                }
+            });
+
+            let xhrReq = this.requests[0];
+            let requestBody = xhrReq.requestBody.split("&");
+
+            xhrReq.respond(200, {'Content-Type': 'text/xml'}, STD_XML);
+            expect(requestBody.indexOf("input_1=aaa%26bbb")).not.to.eq(-1);
+            expect(requestBody.indexOf("pass1=pass1")).not.to.eq(-1);
+            expect(requestBody.indexOf("pass2=pass2")).not.to.eq(-1);
+            expect(requestBody.indexOf("message=Hello%20World")).not.to.eq(-1);
+
+            expect(this.jsfAjaxResponse.callCount).to.eq(1);
+            //success ommitted due to fake response
+            expect(globalCnt == 3).to.eq(true);
+            expect(localCnt == 3).to.eq(true);
+            done();
+        } catch (e) {
+            console.error(e);
+
+        } finally {
+            send.restore();
+        }
+    });
+
 });
 

package/target/classes/application.properties

@@ -0,0 +1 @@
+

package/target/impl/util/FileUtils.js

@@ -37,14 +37,15 @@ exports.encodeFormData = encodeFormData;
  */
 function decodeEncodedValues(encoded) {
     const filterBlanks = item => !!(item || '').replace(/\s+/g, '');
-    const splitKeyValuePair = line => {
+    const splitKeyValuePair = _line => {
+        let line = decodeURIComponent(_line);
         let index = line.indexOf("=");
         if (index == -1) {
             return [line];
         }
         return [line.substring(0, index), line.substring(index + 1)];
     };
-    let requestParamEntries = decodeURIComponent(encoded).split(/&/gi);
+    let requestParamEntries = encoded.split(/&/gi);
     return requestParamEntries.filter(filterBlanks).map(splitKeyValuePair);
 }
 exports.decodeEncodedValues = decodeEncodedValues;

package/target/impl/util/FileUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/FileUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/FileUtils.ts"],"names":[],"mappings":"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"}