jsf.js_next_gen 4.0.0-RC.30 → 4.0.0-RC.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/window/faces-development.js +253 -156
- package/dist/window/faces-development.js.br +0 -0
- package/dist/window/faces-development.js.gz +0 -0
- package/dist/window/faces-development.js.map +1 -1
- package/dist/window/faces.js +1 -1
- package/dist/window/faces.js.br +0 -0
- package/dist/window/faces.js.gz +0 -0
- package/dist/window/faces.js.map +1 -1
- package/dist/window/jsf-development.js +253 -156
- package/dist/window/jsf-development.js.br +0 -0
- package/dist/window/jsf-development.js.gz +0 -0
- package/dist/window/jsf-development.js.map +1 -1
- package/dist/window/jsf.js +1 -1
- package/dist/window/jsf.js.br +0 -0
- package/dist/window/jsf.js.gz +0 -0
- package/dist/window/jsf.js.map +1 -1
- package/package.json +4 -4
- package/src/main/typescript/impl/AjaxImpl.ts +1 -1
- package/src/main/typescript/impl/util/FileUtils.ts +93 -0
- package/src/main/typescript/impl/xhrCore/XhrFormData.ts +72 -72
- package/src/main/typescript/impl/xhrCore/XhrRequest.ts +7 -10
- package/src/main/typescript/test/frameworkBase/_ext/shared/StandardInits.ts +1 -1
- package/src/main/typescript/test/xhrCore/FileUploadTest.spec.ts +3 -2
- package/src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts +34 -6
- package/target/impl/AjaxImpl.js +2 -2
- package/target/impl/AjaxImpl.js.map +1 -1
- package/target/impl/util/FileUtils.js +87 -0
- package/target/impl/util/FileUtils.js.map +1 -0
- package/target/impl/util/URLCodec.js +9 -1
- package/target/impl/util/URLCodec.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +56 -65
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +3 -2
- package/target/impl/xhrCore/XhrRequest.js.map +1 -1
- package/target/test/frameworkBase/_ext/shared/StandardInits.js +1 -1
- package/target/test/xhrCore/FileUploadTest.spec.js +1 -1
- package/target/test/xhrCore/FileUploadTest.spec.js.map +1 -1
- package/target/test/xhrCore/RequestParamsTest.spec.js +33 -3
- package/target/test/xhrCore/RequestParamsTest.spec.js.map +1 -1
- package/target/test-classes/jsf-development.js +1 -1
- package/src/main/typescript/impl/util/URLCodec.ts +0 -71
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getFormInputsAsStream = exports.fixKeyWithoutVal = exports.resolveFiles = exports.decodeEncodedValues = exports.encodeFormData = void 0;
|
|
4
|
+
const mona_dish_1 = require("mona-dish");
|
|
5
|
+
const ExtDomQuery_1 = require("./ExtDomQuery");
|
|
6
|
+
const Const_1 = require("../core/Const");
|
|
7
|
+
/*
|
|
8
|
+
* various routines for encoding and decoding url parameters
|
|
9
|
+
* into configs and vice versa
|
|
10
|
+
*/
|
|
11
|
+
/**
|
|
12
|
+
* encodes a given form data into a url encoded string
|
|
13
|
+
* @param formData the form data config object
|
|
14
|
+
* @param paramsMapper the params mapper
|
|
15
|
+
* @param defaultStr a default string if nothing comes out of it
|
|
16
|
+
*/
|
|
17
|
+
function encodeFormData(formData, paramsMapper = (inStr, inVal) => [inStr, inVal], defaultStr = Const_1.EMPTY_STR) {
|
|
18
|
+
if (formData.isAbsent()) {
|
|
19
|
+
return defaultStr;
|
|
20
|
+
}
|
|
21
|
+
const assocValues = formData.value;
|
|
22
|
+
const expandValueArrAndRename = key => mona_dish_1.Stream.of(...assocValues[key]).map(val => paramsMapper(key, val));
|
|
23
|
+
const isPropertyKey = key => assocValues.hasOwnProperty(key);
|
|
24
|
+
const isNotFile = ([, value]) => !(value instanceof ExtDomQuery_1.ExtDomQuery.global().File);
|
|
25
|
+
const mapIntoUrlParam = keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
|
|
26
|
+
const entries = mona_dish_1.LazyStream.of(...Object.keys(assocValues))
|
|
27
|
+
.filter(isPropertyKey)
|
|
28
|
+
.flatMap(expandValueArrAndRename)
|
|
29
|
+
//we cannot encode file elements that is handled by multipart requests anyway
|
|
30
|
+
.filter(isNotFile)
|
|
31
|
+
.map(mapIntoUrlParam)
|
|
32
|
+
.collect(new mona_dish_1.ArrayCollector());
|
|
33
|
+
return entries.join("&");
|
|
34
|
+
}
|
|
35
|
+
exports.encodeFormData = encodeFormData;
|
|
36
|
+
/**
|
|
37
|
+
* splits and decodes encoded values into strings containing of key=value
|
|
38
|
+
* @param encoded encoded string
|
|
39
|
+
*/
|
|
40
|
+
function decodeEncodedValues(encoded) {
|
|
41
|
+
const filterBlanks = item => !!(item || '').replace(/\s+/g, '');
|
|
42
|
+
const splitKeyValuePair = line => {
|
|
43
|
+
let index = line.indexOf("=");
|
|
44
|
+
if (index == -1) {
|
|
45
|
+
return [line];
|
|
46
|
+
}
|
|
47
|
+
return [line.substring(0, index), line.substring(index + 1)];
|
|
48
|
+
};
|
|
49
|
+
let requestParamEntries = decodeURIComponent(encoded).split(/&/gi);
|
|
50
|
+
return mona_dish_1.Stream.of(...requestParamEntries)
|
|
51
|
+
.filter(filterBlanks)
|
|
52
|
+
.map(splitKeyValuePair);
|
|
53
|
+
}
|
|
54
|
+
exports.decodeEncodedValues = decodeEncodedValues;
|
|
55
|
+
function resolveFiles(dataSource) {
|
|
56
|
+
return dataSource
|
|
57
|
+
.querySelectorAllDeep("input[type='file']")
|
|
58
|
+
.stream
|
|
59
|
+
.map(fileInput => [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)])
|
|
60
|
+
.flatMap(([key, files]) => {
|
|
61
|
+
return mona_dish_1.Stream.of(...files).map(file => [key, file]);
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
exports.resolveFiles = resolveFiles;
|
|
65
|
+
function fixKeyWithoutVal(keyVal) {
|
|
66
|
+
var _a, _b;
|
|
67
|
+
return keyVal.length < 3 ? [(_a = keyVal === null || keyVal === void 0 ? void 0 : keyVal[0]) !== null && _a !== void 0 ? _a : [], (_b = keyVal === null || keyVal === void 0 ? void 0 : keyVal[1]) !== null && _b !== void 0 ? _b : []] : keyVal;
|
|
68
|
+
}
|
|
69
|
+
exports.fixKeyWithoutVal = fixKeyWithoutVal;
|
|
70
|
+
/**
|
|
71
|
+
* gets all the inputs under the form parentItem
|
|
72
|
+
* as stream
|
|
73
|
+
* @param parentItem
|
|
74
|
+
*/
|
|
75
|
+
function getFormInputsAsStream(parentItem) {
|
|
76
|
+
//encoded String
|
|
77
|
+
const viewStateStr = (0, Const_1.$faces)().getViewState(parentItem.getAsElem(0).value);
|
|
78
|
+
// we now need to decode it and then merge it into the target buf
|
|
79
|
+
// which hosts already our overrides (aka do not override what is already there(
|
|
80
|
+
// after that we need to deal with form elements on a separate level
|
|
81
|
+
const standardInputs = decodeEncodedValues(viewStateStr);
|
|
82
|
+
const fileInputs = resolveFiles(parentItem);
|
|
83
|
+
const allInputs = standardInputs.concat(fileInputs);
|
|
84
|
+
return allInputs;
|
|
85
|
+
}
|
|
86
|
+
exports.getFormInputsAsStream = getFormInputsAsStream;
|
|
87
|
+
//# sourceMappingURL=FileUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/FileUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.decodeEncodedValues = exports.encodeFormData = exports.mergeKeyValueEntries = void 0;
|
|
3
|
+
exports.mergeFiles = exports.decodeEncodedValues = exports.encodeFormData = exports.mergeKeyValueEntries = void 0;
|
|
4
4
|
const mona_dish_1 = require("mona-dish");
|
|
5
5
|
const ExtDomQuery_1 = require("./ExtDomQuery");
|
|
6
6
|
const Const_1 = require("../core/Const");
|
|
@@ -66,4 +66,12 @@ function decodeEncodedValues(encoded) {
|
|
|
66
66
|
.replace(/\s+/g, ''));
|
|
67
67
|
}
|
|
68
68
|
exports.decodeEncodedValues = decodeEncodedValues;
|
|
69
|
+
function mergeFiles(target, dataSource) {
|
|
70
|
+
dataSource
|
|
71
|
+
.querySelectorAllDeep("input[type='file']")
|
|
72
|
+
.stream
|
|
73
|
+
.map(fileInput => [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)])
|
|
74
|
+
.each(([key, files]) => target.append(key).value = files);
|
|
75
|
+
}
|
|
76
|
+
exports.mergeFiles = mergeFiles;
|
|
69
77
|
//# sourceMappingURL=URLCodec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"URLCodec.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/URLCodec.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"URLCodec.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/util/URLCodec.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,7 @@ exports.XhrFormData = void 0;
|
|
|
18
18
|
*/
|
|
19
19
|
const mona_dish_1 = require("mona-dish");
|
|
20
20
|
const Const_1 = require("../core/Const");
|
|
21
|
-
const
|
|
22
|
-
const URLCodec_1 = require("../util/URLCodec");
|
|
21
|
+
const FileUtils_1 = require("../util/FileUtils");
|
|
23
22
|
const defaultParamsMapper = (key, item) => [key, item];
|
|
24
23
|
/**
|
|
25
24
|
* A unified form data class
|
|
@@ -29,9 +28,10 @@ const defaultParamsMapper = (key, item) => [key, item];
|
|
|
29
28
|
* due to api constraints on the HTML Form object in IE11
|
|
30
29
|
* and due to the url encoding constraint given by the faces.js spec
|
|
31
30
|
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
34
|
-
*
|
|
31
|
+
*
|
|
32
|
+
* internal storage format
|
|
33
|
+
* every value is stored as an array
|
|
34
|
+
* even scalar ones!
|
|
35
35
|
*/
|
|
36
36
|
class XhrFormData extends mona_dish_1.Config {
|
|
37
37
|
/**
|
|
@@ -62,39 +62,60 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
62
62
|
* Additionally the hidden element jakarta.faces.ViewState
|
|
63
63
|
* Enhancement partial page submit
|
|
64
64
|
*/
|
|
65
|
-
this.
|
|
65
|
+
this.resolveRequestType(this.dataSource, executes);
|
|
66
|
+
this.encodeSubmittableFields(this.dataSource, this.partialIds);
|
|
66
67
|
this.applyViewState(this.dataSource);
|
|
67
|
-
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* @returns a Form data representation, this is needed for file submits
|
|
71
|
+
*/
|
|
72
|
+
toFormData() {
|
|
73
|
+
/*
|
|
74
|
+
* expands key: [item1, item2]
|
|
75
|
+
* to: [{key: item1}, {key, item2}]
|
|
76
|
+
*/
|
|
77
|
+
let expandAssocArray = ([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
|
|
78
|
+
return { key, item };
|
|
79
|
+
});
|
|
80
|
+
/*
|
|
81
|
+
* remaps the incoming {key, value} tuples
|
|
82
|
+
* to naming container prefixed keys and values
|
|
83
|
+
*/
|
|
84
|
+
let remapForNamingContainer = ({ key, item }) => {
|
|
85
|
+
key = this.remapKeyForNamingContainer(key);
|
|
86
|
+
return { key, item };
|
|
87
|
+
};
|
|
88
|
+
/*
|
|
89
|
+
* collects everything into a FormData object
|
|
90
|
+
*/
|
|
91
|
+
let ret = new FormData();
|
|
92
|
+
let collectFormData = ({ key, item }) => {
|
|
93
|
+
ret.append(key, item);
|
|
94
|
+
};
|
|
95
|
+
mona_dish_1.Stream.ofAssoc(this.value)
|
|
96
|
+
.flatMap(expandAssocArray)
|
|
97
|
+
.map(remapForNamingContainer)
|
|
98
|
+
.each(collectFormData);
|
|
99
|
+
return ret;
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* returns an encoded string representation of our xhr form data
|
|
103
|
+
*
|
|
104
|
+
* @param defaultStr optional default value if nothing is there to encode
|
|
105
|
+
*/
|
|
106
|
+
toString(defaultStr = Const_1.EMPTY_STR) {
|
|
107
|
+
return (0, FileUtils_1.encodeFormData)(this, this.paramsMapper, defaultStr);
|
|
68
108
|
}
|
|
69
109
|
/**
|
|
70
110
|
* generic post init code, for now, this performs some post assign data post-processing
|
|
71
111
|
* @param executes the executable dom nodes which need to be processed into the form data, which we can send
|
|
72
112
|
* in our ajax request
|
|
73
113
|
*/
|
|
74
|
-
resolveRequestType(executes) {
|
|
75
|
-
if (!executes) {
|
|
114
|
+
resolveRequestType(rootElement, executes) {
|
|
115
|
+
if (!executes || executes.indexOf(Const_1.IDENT_NONE) != -1) {
|
|
76
116
|
return;
|
|
77
117
|
}
|
|
78
|
-
|
|
79
|
-
if (id == Const_1.IDENT_ALL) {
|
|
80
|
-
let namingContainer = this.remapKeyForNamingContainer("");
|
|
81
|
-
if (namingContainer.length) {
|
|
82
|
-
namingContainer = namingContainer.substring(0, namingContainer.length - 1);
|
|
83
|
-
return mona_dish_1.DQ.byId(namingContainer).isMultipartCandidate();
|
|
84
|
-
}
|
|
85
|
-
return mona_dish_1.DQ.byId(document.body).isMultipartCandidate();
|
|
86
|
-
}
|
|
87
|
-
else if (id == Const_1.IDENT_FORM) {
|
|
88
|
-
return this.dataSource.isMultipartCandidate(true);
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
const element = mona_dish_1.DQ.byId(id, true);
|
|
92
|
-
return element.isMultipartCandidate();
|
|
93
|
-
}
|
|
94
|
-
};
|
|
95
|
-
this.isMultipartRequest = mona_dish_1.LazyStream.of(...executes)
|
|
96
|
-
.filter(isMultiPartContainer)
|
|
97
|
-
.first().isPresent();
|
|
118
|
+
this.isMultipartRequest = rootElement.isMultipartCandidate(true);
|
|
98
119
|
}
|
|
99
120
|
/**
|
|
100
121
|
* special case view state handling
|
|
@@ -109,52 +130,22 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
109
130
|
let viewState = viewStateElement.inputValue;
|
|
110
131
|
this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
|
|
111
132
|
}
|
|
112
|
-
/**
|
|
113
|
-
* @returns a Form data representation, this is needed for file submits
|
|
114
|
-
*/
|
|
115
|
-
toFormData() {
|
|
116
|
-
let ret = new FormData();
|
|
117
|
-
this.appendInputs(ret);
|
|
118
|
-
return ret;
|
|
119
|
-
}
|
|
120
|
-
/**
|
|
121
|
-
* returns an encoded string representation of our xhr form data
|
|
122
|
-
*
|
|
123
|
-
* @param defaultStr optional default value if nothing is there to encode
|
|
124
|
-
*/
|
|
125
|
-
toString(defaultStr = Const_1.EMPTY_STR) {
|
|
126
|
-
return (0, URLCodec_1.encodeFormData)(this, this.paramsMapper, defaultStr);
|
|
127
|
-
}
|
|
128
133
|
/**
|
|
129
134
|
* determines fields to submit
|
|
130
135
|
* @param {Object} targetBuf - the target form buffer receiving the data
|
|
131
136
|
* @param {Node} parentItem - form element item is nested in
|
|
132
137
|
* @param {Array} partialIds - ids fo PPS
|
|
133
138
|
*/
|
|
134
|
-
encodeSubmittableFields(
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
let target = new ExtDomQuery_1.ExtConfig({});
|
|
141
|
-
(0, URLCodec_1.mergeKeyValueEntries)(target, (0, URLCodec_1.decodeEncodedValues)(viewStateStr), this.paramsMapper);
|
|
142
|
-
this.shallowMerge(target);
|
|
139
|
+
encodeSubmittableFields(parentItem, partialIds) {
|
|
140
|
+
const formInputs = (0, FileUtils_1.getFormInputsAsStream)(parentItem);
|
|
141
|
+
formInputs
|
|
142
|
+
.map(FileUtils_1.fixKeyWithoutVal)
|
|
143
|
+
.map(([key, value]) => this.paramsMapper(key, value))
|
|
144
|
+
.each(([key, value]) => this.append(key).value = value);
|
|
143
145
|
}
|
|
144
146
|
remapKeyForNamingContainer(key) {
|
|
145
147
|
return this.paramsMapper(key, "")[0];
|
|
146
148
|
}
|
|
147
|
-
appendInputs(ret) {
|
|
148
|
-
mona_dish_1.Stream.ofAssoc(this.value)
|
|
149
|
-
.flatMap(([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
|
|
150
|
-
return { key, item };
|
|
151
|
-
}))
|
|
152
|
-
.map(({ key, item }) => {
|
|
153
|
-
key = this.remapKeyForNamingContainer(key);
|
|
154
|
-
return { key, item };
|
|
155
|
-
})
|
|
156
|
-
.each(({ key, item }) => ret.append(key, item));
|
|
157
|
-
}
|
|
158
149
|
}
|
|
159
150
|
exports.XhrFormData = XhrFormData;
|
|
160
151
|
//# sourceMappingURL=XhrFormData.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XhrFormData.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrFormData.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,
|
|
1
|
+
{"version":3,"file":"XhrFormData.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrFormData.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ var failSaveExecute = Lang_1.ExtLang.failSaveExecute;
|
|
|
33
33
|
* a single ajax request into our queue
|
|
34
34
|
* and let the queue do the processing.
|
|
35
35
|
*
|
|
36
|
+
*
|
|
36
37
|
*/
|
|
37
38
|
class XhrRequest {
|
|
38
39
|
/**
|
|
@@ -80,7 +81,7 @@ class XhrRequest {
|
|
|
80
81
|
let ignoreErr = failSaveExecute;
|
|
81
82
|
let xhrObject = this.xhrObject;
|
|
82
83
|
let executesArr = () => {
|
|
83
|
-
return this.requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EXECUTE).get(
|
|
84
|
+
return this.requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EXECUTE).get(Const_1.IDENT_NONE).value.split(/\s+/gi);
|
|
84
85
|
};
|
|
85
86
|
try {
|
|
86
87
|
// encoded we need to decode
|
|
@@ -91,7 +92,7 @@ class XhrRequest {
|
|
|
91
92
|
// whatever the formData object delivers
|
|
92
93
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
93
94
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
94
|
-
// anyway TODO
|
|
95
|
+
// anyway TODO reimplement the partial ids array, we still do not have it in jsf the way we need it
|
|
95
96
|
let formData = new XhrFormData_1.XhrFormData(this.sourceForm, (0, RequestDataResolver_1.resoveNamingContainerMapper)(this.internalContext), executesArr(), this.partialIdsArray);
|
|
96
97
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
97
98
|
// next step the pass through parameters are merged in for post params
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,yCAAkD;AAClD,0CAA2C;AAE3C,+CAA0C;AAC1C,2CAAsC;AACtC,2CAAsC;AACtC,uCAAqC;AACrC,yCAoBuB;AACvB,+
|
|
1
|
+
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,yCAAkD;AAClD,0CAA2C;AAE3C,+CAA0C;AAC1C,2CAAsC;AACtC,2CAAsC;AACtC,uCAAqC;AACrC,yCAoBuB;AACvB,+DAI+B;AAC/B,IAAO,eAAe,GAAG,cAAO,CAAC,eAAe,CAAC;AAGjD;;;;;;;;;GASG;AAEH,MAAa,UAAU;IAYnB;;;;;;;;;;;;;;;OAeG;IACH,YACY,MAAU,EACV,UAAc,EACd,cAAyB,EACzB,eAAuB,EACvB,kBAAkB,EAAE,EACpB,UAAU,kBAAU,EACpB,WAAW,qBAAa,EACxB,cAAc,mBAAW,EACzB,YAAY,IAAI,cAAc,EAAE;QARhC,WAAM,GAAN,MAAM,CAAI;QACV,eAAU,GAAV,UAAU,CAAI;QACd,mBAAc,GAAd,cAAc,CAAW;QACzB,oBAAe,GAAf,eAAe,CAAQ;QACvB,oBAAe,GAAf,eAAe,CAAK;QACpB,YAAO,GAAP,OAAO,CAAa;QACpB,aAAQ,GAAR,QAAQ,CAAgB;QACxB,gBAAW,GAAX,WAAW,CAAc;QACzB,cAAS,GAAT,SAAS,CAAuB;QAjCpC,iBAAY,GAAG,KAAK,CAAC;QAE7B;;WAEG;QACK,mBAAc,GAAoB,EAAE,CAAC;QACrC,kBAAa,GAAoB,EAAE,CAAC;QA8BxC,2EAA2E;QAC3E,yEAAyE;QACzE,gEAAgE;QAChE,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAS,EAAE,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC,EAAE,CAAC,IAAS,EAAE,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK;QAED,IAAI,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAE/B,IAAI,WAAW,GAAG,GAAG,EAAE;YACnB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,8BAAsB,EAAE,iBAAS,CAAC,CAAC,GAAG,CAAC,kBAAU,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7G,CAAC,CAAC;QAEF,IAAI;YACA,4BAA4B;YAC5B,yDAAyD;YACzD,mFAAmF;YACnF,0EAA0E;YAC1E,6EAA6E;YAC7E,wCAAwC;YACxC,+GAA+G;YAC/G,4GAA4G;YAC5G,mGAAmG;YACnG,IAAI,QAAQ,GAAgB,IAAI,yBAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAA,iDAA2B,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAErJ,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;YAEhF,sEAAsE;YACtE,IAAI,CAAC,cAAc,CAAC,WAAW,GAAG,KAAK,CAAC;YACxC,IAAI,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YACzC,IAAI,wBAAwB,GAAG,cAAc,CAAC,KAAK,CAAC,8BAAsB,CAAc,CAAC;YAEzF,mFAAmF;YACnF,0BAA0B;YAC1B,wBAAwB,CAAC,WAAW,GAAG,KAAK,CAAC;YAC7C,2FAA2F;YAC3F,iGAAiG;YACjG,cAAc;YACd,IAAI;gBACA,QAAQ,CAAC,YAAY,CAAC,wBAAwB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aAC/D;oBAAS;gBACN,IAAI,CAAC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;gBACvC,wBAAwB,CAAC,WAAW,GAAG,IAAI,CAAC;aAC/C;YAED,IAAI,CAAC,eAAe,GAAG,wBAAwB,CAAC,QAAQ,CAAC;YAEzD,qFAAqF;YACrF,IAAI,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;YAE3C,eAAe,CAAC,MAAM,CAAC,6BAAqB,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;YAEjF,mFAAmF;YACnF,eAAe,CAAC,MAAM,CAAC,gBAAQ,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,gBAAQ,CAAC,CAAC,KAAK,CAAC;YAC9E,eAAe,CAAC,MAAM,CAAC,gBAAQ,CAAC,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,gBAAQ,CAAC,CAAC,KAAK,CAAC;YAE9E,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAA,qCAAe,EAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;YAE/F,iBAAiB;YACjB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAEvD,0GAA0G;YAC1G,sCAAsC;YACtC,qCAAqC;YACrC,IAAG,IAAI,CAAC,WAAW,IAAI,WAAW,EAAE;gBAChC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,oBAAY,EAAE,GAAG,IAAI,CAAC,WAAW,iBAAiB,CAAC,CAAC,CAAC;aACnG;YAED,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,sBAAc,EAAE,gBAAQ,CAAC,CAAC,CAAC;YAEtE,8CAA8C;YAC9C,kEAAkE;YAClE,6CAA6C;YAC7C,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,kBAAU,EAAE,kBAAU,CAAC,CAAC,CAAC;YAEpE,IAAI,CAAC,SAAS,CAAC,aAAK,CAAC,CAAC;YACtB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC9B;QAAC,OAAO,CAAC,EAAE;YACR,WAAW;YACX,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;SACvB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM;QACF,IAAI;YACA,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;SAC1B;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;SACvB;IACL,CAAC;IAED,OAAO,CAAC,IAAS;QACb,kBAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,QAAa,EAAE,QAAa,EAAE,EAAE;YACrE,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;IAED,MAAM,CAAC,IAAS;QACZ,kBAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,QAAa,EAAE,SAAc,EAAE,EAAE;YACvE,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;IAED,KAAK,CAAC,IAAwB;QAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,IAAgB;QACpB,wEAAwE;QACxE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAwB;QACzB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACK,oBAAoB,CAAC,OAAsB,EAAE,MAAqB;QACtE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAE/B,SAAS,CAAC,OAAO,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC,CAAC;QACF,SAAS,CAAC,SAAS,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC;QACF,SAAS,CAAC,MAAM,GAAG,GAAG,EAAE;YACpB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAC3B,CAAC,CAAC;QACF,SAAS,CAAC,SAAS,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC,CAAC;QACF,SAAS,CAAC,OAAO,GAAG,CAAC,SAAc,EAAE,EAAE;YAEnC,sEAAsE;YACtE,4EAA4E;YAC5E,2DAA2D;YAC3D,iFAAiF;YACjF,oEAAoE;YACpE,wBAAwB;YACxB,IAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;gBACzC,MAAM,EAAE,CAAC;gBACT,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,OAAO;aACV;YACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,aAA6B;QACrD,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,MAAK,CAAC,IAAI,uBAAuB;YACzD,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,MAAK,CAAC;YAC/B,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,MAAK,EAAE;YAClC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,MAAK,IAAI,CAAC;IAC5C,CAAC;IAED;;;;;WAKO;IAEC,OAAO,CAAC,MAAqB;QACjC,MAAM,EAAE,CAAC;IACb,CAAC;IAEO,SAAS,CAAC,MAAqB;QACnC,IAAI,CAAC,SAAS,CAAC,yBAAiB,CAAC,CAAC;QAClC,MAAM,EAAE,CAAC;IACb,CAAC;IAEO,SAAS,CAAC,OAAsB;;QAEpC,IAAI,CAAC,SAAS,CAAC,gBAAQ,CAAC,CAAC;QAEzB,0DAA0D;QAC1D,4CAA4C;QAC5C,IAAI,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,0CAAE,WAAW,CAAA,EAAE;YAC/B,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACjC,OAAO;SACV;QAED,IAAA,cAAM,GAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,MAAA,IAAI,CAAC,eAAe,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEO,kBAAkB,CAAC,OAAiB;;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,SAAS,GAAG;YACZ,IAAI,EAAE,aAAK;YACX,MAAM,EAAE,oBAAY;YACpB,YAAY,EAAE,GAAG;YACjB,YAAY,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,YAAY;YAC1C,qDAAqD;YACrD,wBAAwB;YACxB,MAAM,EAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK;SAChC,CAAC;QACF,IAAI;YACA,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;SACrC;gBAAS;YACN,iEAAiE;YACjE,kCAAkC;YAClC,OAAO,CAAC,SAAS,CAAC,CAAC;SACtB;QACD,4BAA4B;IAChC,CAAC;IAEO,MAAM,CAAC,IAAS,EAAE,OAAsB;QAC5C,6EAA6E;QAC7E,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,OAAO;SACV;QACD,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAEO,OAAO,CAAC,SAAc,EAAG,MAAqB;QAClD,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC5B,MAAM,EAAE,CAAC;IACb,CAAC;IAEO,WAAW,CAAC,QAAqB;QACrC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,IAAI,oBAAY,CAAC;QAC3C,IAAI,QAAQ,CAAC,kBAAkB,EAAE;YAC7B,sEAAsE;YACtE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChE;aAAM;YACH,kDAAkD;YAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC9D;IACL,CAAC;IAED;;OAEG;IACK,SAAS,CAAC,OAAe;;QAC7B,IAAI,SAAS,GAAG,qBAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC1F,IAAI;YACA,kCAAkC;YAClC,kDAAkD;YAClD,gDAAgD;YAChD,+EAA+E;YAC/E,IAAI,YAAY,GAAG,IAAA,wCAAkB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE,gBAAQ,CAAC,CAAC;YAE3F,yBAAc,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;SACrD;QAAC,OAAO,CAAC,EAAE;YACR,CAAC,CAAC,MAAM,GAAG,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,mCAAI,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,cAAM,CAAC,CAAC,KAAK,CAAC;YAChE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,CAAC;SACX;IACL,CAAC;IAEO,WAAW,CAAC,SAAS,EAAE,sBAA+B,KAAK;QAC/D,IAAI,SAAS,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,qBAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAE7N,IAAI,YAAY,GAAG,IAAA,wCAAkB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,EAAE,gBAAQ,CAAC,CAAC;QAC3F,yBAAc,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC;CACJ;AA1TD,gCA0TC"}
|
|
@@ -177,7 +177,7 @@ var StandardInits;
|
|
|
177
177
|
</head>
|
|
178
178
|
<body>
|
|
179
179
|
<form id="blarg" enctype="multipart/form-data">
|
|
180
|
-
<input type="file" id="fíleupload"></input>
|
|
180
|
+
<input type="file" id="fíleupload" name="fíleupload"></input>
|
|
181
181
|
<input type="text" id="input_1" name="input_1" value="input_1_val"></input>
|
|
182
182
|
<input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
|
|
183
183
|
<input type="button" id="input_2" name="input_2" value="input_1_val"></input>
|
|
@@ -144,7 +144,7 @@ const AjaxImpl_1 = require("../../impl/AjaxImpl");
|
|
|
144
144
|
try {
|
|
145
145
|
let button = mona_dish_1.DomQuery.byId("input_1");
|
|
146
146
|
button.addEventListener("click", (event) => {
|
|
147
|
-
faces.ajax.request(event.target, event, { render: '@all', execute: '
|
|
147
|
+
faces.ajax.request(event.target, event, { render: '@all', execute: '@none' });
|
|
148
148
|
}).click();
|
|
149
149
|
(0, chai_1.expect)(this.requests.length).to.eq(1);
|
|
150
150
|
let request = this.requests[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileUploadTest.spec.js","sourceRoot":"","sources":["../../../src/main/typescript/test/xhrCore/FileUploadTest.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,iCAAmC;AACnC,6CAA+B;AAC/B,+BAA4B;AAC5B,8EAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"FileUploadTest.spec.js","sourceRoot":"","sources":["../../../src/main/typescript/test/xhrCore/FileUploadTest.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,10 +55,39 @@ const mona_dish_1 = require("mona-dish");
|
|
|
55
55
|
const chai_1 = require("chai");
|
|
56
56
|
var HTML_PREFIX_EMBEDDED_BODY = StandardInits_1.StandardInits.HTML_PREFIX_EMBEDDED_BODY;
|
|
57
57
|
const mocha_1 = require("mocha");
|
|
58
|
-
const
|
|
58
|
+
const FileUtils_1 = require("../../impl/util/FileUtils");
|
|
59
|
+
const ExtDomQuery_1 = require("../../impl/util/ExtDomQuery");
|
|
60
|
+
/**
|
|
61
|
+
* merges a list of key value entries into a target config
|
|
62
|
+
* @param target the target receiving the key value entries
|
|
63
|
+
* @param keyValueEntries a list of key value entries divided by =
|
|
64
|
+
* @param paramsMapper a key value remapper
|
|
65
|
+
*/
|
|
66
|
+
function mergeKeyValueEntries(target, keyValueEntries, paramsMapper = (key, value) => [key, value]) {
|
|
67
|
+
function fixKeyWithoutVal(keyVal) {
|
|
68
|
+
var _a, _b;
|
|
69
|
+
return keyVal.length < 3 ? [(_a = keyVal === null || keyVal === void 0 ? void 0 : keyVal[0]) !== null && _a !== void 0 ? _a : [], (_b = keyVal === null || keyVal === void 0 ? void 0 : keyVal[1]) !== null && _b !== void 0 ? _b : []] : keyVal;
|
|
70
|
+
}
|
|
71
|
+
let toMerge = new ExtDomQuery_1.ExtConfig({});
|
|
72
|
+
keyValueEntries
|
|
73
|
+
//special case of having keys without values
|
|
74
|
+
.map(keyVal => fixKeyWithoutVal(keyVal))
|
|
75
|
+
.map(keyVal => paramsMapper(keyVal[0], keyVal[1]))
|
|
76
|
+
.each(keyVal => {
|
|
77
|
+
var _a, _b;
|
|
78
|
+
let value = (_b = (_a = keyVal === null || keyVal === void 0 ? void 0 : keyVal.splice(1)) === null || _a === void 0 ? void 0 : _a.join("")) !== null && _b !== void 0 ? _b : "";
|
|
79
|
+
if (toMerge.getIfPresent(keyVal[0]).isPresent()) {
|
|
80
|
+
toMerge.append(keyVal[0]).value = value;
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
toMerge.assign(keyVal[0]).value = value;
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
target.shallowMerge(toMerge);
|
|
87
|
+
}
|
|
59
88
|
function getFormData(requestBody) {
|
|
60
89
|
let ret = new mona_dish_1.Config({});
|
|
61
|
-
|
|
90
|
+
mergeKeyValueEntries(ret, (0, FileUtils_1.decodeEncodedValues)(requestBody));
|
|
62
91
|
return ret;
|
|
63
92
|
}
|
|
64
93
|
describe("test for proper request param patterns identical to the old implementation", function () {
|
|
@@ -122,7 +151,7 @@ describe("test for proper request param patterns identical to the old implementa
|
|
|
122
151
|
let requestBody = this.requests[0].requestBody;
|
|
123
152
|
//We check if the base64 encoded string matches the original
|
|
124
153
|
let formData = getFormData(requestBody);
|
|
125
|
-
(0, chai_1.expect)(
|
|
154
|
+
(0, chai_1.expect)(formData.getIf("jakarta.faces.ViewState").value == probe).to.be.true;
|
|
126
155
|
});
|
|
127
156
|
(0, mocha_1.it)("must handle empty parameters properly", function () {
|
|
128
157
|
let probe = "";
|
|
@@ -145,6 +174,7 @@ describe("test for proper request param patterns identical to the old implementa
|
|
|
145
174
|
});
|
|
146
175
|
(0, mocha_1.it)("must handle prefixed inputs properly (prefixes must be present) faces4", function (done) {
|
|
147
176
|
window.document.body.innerHTML = HTML_PREFIX_EMBEDDED_BODY;
|
|
177
|
+
global["debug_inp"] = true;
|
|
148
178
|
//we now run the tests here
|
|
149
179
|
try {
|
|
150
180
|
let event = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestParamsTest.spec.js","sourceRoot":"","sources":["../../../src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,6CAA+B;AAC/B,kDAAmD;AACnD,8EAAyE;AAEzE,IAAO,YAAY,GAAG,6BAAa,CAAC,YAAY,CAAC;AACjD,
|
|
1
|
+
{"version":3,"file":"RequestParamsTest.spec.js","sourceRoot":"","sources":["../../../src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -3121,7 +3121,7 @@ var XhrFormData = /** @class */ (function (_super) {
|
|
|
3121
3121
|
*/
|
|
3122
3122
|
XhrFormData.prototype.assignEncodedString = function (encoded) {
|
|
3123
3123
|
var keyValueEntries = decodeURIComponent(encoded).split(/&/gi);
|
|
3124
|
-
this.
|
|
3124
|
+
this.assignKeyValueEntries(keyValueEntries);
|
|
3125
3125
|
};
|
|
3126
3126
|
XhrFormData.prototype.assignString = function (keyValueEntries) {
|
|
3127
3127
|
var toMerge = new mona_dish_1.Config({});
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
import {ArrayCollector, Config, LazyStream, Stream} from "mona-dish";
|
|
2
|
-
import {ExtConfig, ExtDomQuery} from "./ExtDomQuery";
|
|
3
|
-
import {EMPTY_STR} from "../core/Const";
|
|
4
|
-
|
|
5
|
-
/*
|
|
6
|
-
* various routines for encoding and decoding url parameters
|
|
7
|
-
* into configs and vice versa
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
/**
|
|
11
|
-
* merges a list of key value entries into a target config
|
|
12
|
-
* @param target the target receiving the key value entries
|
|
13
|
-
* @param keyValueEntries a list of key value entries divided by =
|
|
14
|
-
* @param paramsMapper a key value remapper
|
|
15
|
-
*/
|
|
16
|
-
export function mergeKeyValueEntries(target: Config, keyValueEntries: string[], paramsMapper = (key, value) => [key, value]) {
|
|
17
|
-
|
|
18
|
-
function splitToKeyVal(line: string) {
|
|
19
|
-
return line.split(/=(.*)/gi);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
function fixKeyWithoutVal(keyVal: string[]) {
|
|
23
|
-
return keyVal.length < 3 ? [keyVal?.[0] ?? [], keyVal?.[1] ?? []] : keyVal;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
let toMerge = new ExtConfig({});
|
|
27
|
-
Stream.of(...keyValueEntries)
|
|
28
|
-
.map(line => splitToKeyVal(line))
|
|
29
|
-
//special case of having keys without values
|
|
30
|
-
.map(keyVal => fixKeyWithoutVal(keyVal))
|
|
31
|
-
.map(keyVal => paramsMapper(keyVal[0] as string, keyVal[1]))
|
|
32
|
-
.each(keyVal => {
|
|
33
|
-
toMerge.append(keyVal[0] as string).value = keyVal?.splice(1)?.join("") ?? "";
|
|
34
|
-
});
|
|
35
|
-
|
|
36
|
-
target.shallowMerge(toMerge);
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
/**
|
|
40
|
-
* encodes a given form data into a url encoded string
|
|
41
|
-
* @param formData the form data config object
|
|
42
|
-
* @param paramsMapper the params mapper
|
|
43
|
-
* @param defaultStr a default string if nothing comes out of it
|
|
44
|
-
*/
|
|
45
|
-
export function encodeFormData(formData: Config,
|
|
46
|
-
paramsMapper = (inStr, inVal) => [inStr, inVal],
|
|
47
|
-
defaultStr = EMPTY_STR): string {
|
|
48
|
-
if (formData.isAbsent()) {
|
|
49
|
-
return defaultStr;
|
|
50
|
-
}
|
|
51
|
-
let assocValues = formData.value;
|
|
52
|
-
let entries = LazyStream.of(...Object.keys(assocValues))
|
|
53
|
-
.filter(key => assocValues.hasOwnProperty(key))
|
|
54
|
-
.flatMap(key => Stream.of(...assocValues[key]).map(val => paramsMapper(key, val)))
|
|
55
|
-
//we cannot encode file elements that is handled by multipart requests anyway
|
|
56
|
-
.filter(([, value]) => !(value instanceof ExtDomQuery.global().File))
|
|
57
|
-
.map(keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`)
|
|
58
|
-
.collect(new ArrayCollector());
|
|
59
|
-
|
|
60
|
-
return entries.join("&")
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
/**
|
|
64
|
-
* splits and decodes encoded values into strings containing of key=value
|
|
65
|
-
* @param encoded encoded string
|
|
66
|
-
*/
|
|
67
|
-
export function decodeEncodedValues(encoded: string): string[] {
|
|
68
|
-
return decodeURIComponent(encoded).split(/&/gi)
|
|
69
|
-
.filter(item => !!(item || '')
|
|
70
|
-
.replace(/\s+/g, ''));
|
|
71
|
-
}
|