jsf.js_next_gen 4.0.0-RC.30 → 4.0.0-RC.31
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 +223 -134
- 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 +223 -134
- 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/{URLCodec.ts → FileUtils.ts} +27 -32
- package/src/main/typescript/impl/xhrCore/XhrFormData.ts +64 -47
- package/src/main/typescript/impl/xhrCore/XhrRequest.ts +4 -3
- 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 +64 -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 +50 -44
- 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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jsf.js_next_gen",
|
|
3
|
-
"version": "4.0.0-RC.
|
|
3
|
+
"version": "4.0.0-RC.31",
|
|
4
4
|
"description": "A next generation typescript reimplementation of jsf.js",
|
|
5
5
|
"main": "dist/window/faces.js",
|
|
6
6
|
"scripts": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"@istanbuljs/nyc-config-typescript": "^1.0.2",
|
|
24
24
|
"@types/chai": "^4.3.4",
|
|
25
25
|
"@types/mocha": "^10.0.1",
|
|
26
|
-
"@types/node": "^18.
|
|
26
|
+
"@types/node": "^18.13.0",
|
|
27
27
|
"@types/sinon": "^10.0.13",
|
|
28
28
|
"babel-plugin-syntax-dynamic-import": "^6.18.0",
|
|
29
29
|
"chai": "^4.3.7",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"jsdom": "^21.1.0",
|
|
34
34
|
"jsdom-global": "^3.0.2",
|
|
35
35
|
"mocha": "^10.2.0",
|
|
36
|
-
"npm-check-updates": "^16.6.
|
|
36
|
+
"npm-check-updates": "^16.6.5",
|
|
37
37
|
"nyc": "^15.1.0",
|
|
38
38
|
"replace-in-file": "^6.3.5",
|
|
39
39
|
"rxjs": "^7.8.0",
|
|
@@ -48,6 +48,6 @@
|
|
|
48
48
|
"webpack-dev-server": "^4.11.1"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"mona-dish": "^0.24.
|
|
51
|
+
"mona-dish": "^0.24.8"
|
|
52
52
|
}
|
|
53
53
|
}
|
|
@@ -63,7 +63,7 @@ import {
|
|
|
63
63
|
resolveForm,
|
|
64
64
|
resolveTimeout, resolveViewId, resolveViewRootId, resoveNamingContainerMapper
|
|
65
65
|
} from "./xhrCore/RequestDataResolver";
|
|
66
|
-
import {encodeFormData} from "./util/
|
|
66
|
+
import {encodeFormData} from "./util/FileUtils";
|
|
67
67
|
|
|
68
68
|
/*
|
|
69
69
|
* allowed project stages
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {ArrayCollector, Config, LazyStream, Stream} from "mona-dish";
|
|
1
|
+
import {ArrayCollector, Config, DQ, LazyStream, Stream} from "mona-dish";
|
|
2
2
|
import {ExtConfig, ExtDomQuery} from "./ExtDomQuery";
|
|
3
3
|
import {EMPTY_STR} from "../core/Const";
|
|
4
4
|
|
|
@@ -7,34 +7,6 @@ import {EMPTY_STR} from "../core/Const";
|
|
|
7
7
|
* into configs and vice versa
|
|
8
8
|
*/
|
|
9
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
10
|
|
|
39
11
|
/**
|
|
40
12
|
* encodes a given form data into a url encoded string
|
|
@@ -64,8 +36,31 @@ export function encodeFormData(formData: Config,
|
|
|
64
36
|
* splits and decodes encoded values into strings containing of key=value
|
|
65
37
|
* @param encoded encoded string
|
|
66
38
|
*/
|
|
67
|
-
export function decodeEncodedValues(encoded: string): string[] {
|
|
68
|
-
return decodeURIComponent(encoded).split(/&/gi)
|
|
39
|
+
export function decodeEncodedValues(encoded: string): Stream<string[]> {
|
|
40
|
+
return Stream.of(...decodeURIComponent(encoded).split(/&/gi))
|
|
69
41
|
.filter(item => !!(item || '')
|
|
70
|
-
.replace(/\s+/g, ''))
|
|
42
|
+
.replace(/\s+/g, ''))
|
|
43
|
+
.map(line => {
|
|
44
|
+
let index = line.indexOf("=");
|
|
45
|
+
if (index == -1) {
|
|
46
|
+
return [line];
|
|
47
|
+
}
|
|
48
|
+
return [line.substring(0, index), line.substring(index + 1)];
|
|
49
|
+
})
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
export function resolveFiles(dataSource: DQ): Stream<[string, File]> {
|
|
54
|
+
return dataSource
|
|
55
|
+
.querySelectorAllDeep("input[type='file']")
|
|
56
|
+
.stream
|
|
57
|
+
.map(fileInput => [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)])
|
|
58
|
+
.flatMap(([key, files]) => {
|
|
59
|
+
return Stream.of(...files).map(file => [key, file])
|
|
60
|
+
});
|
|
71
61
|
}
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
export function fixKeyWithoutVal(keyVal: any[]) {
|
|
65
|
+
return keyVal.length < 3 ? [keyVal?.[0] ?? [], keyVal?.[1] ?? []] : keyVal;
|
|
66
|
+
}
|
|
@@ -13,10 +13,15 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import {Config, DQ,
|
|
17
|
-
import {$faces, $nsp, EMPTY_STR, IDENT_ALL, IDENT_FORM, P_VIEWSTATE} from "../core/Const";
|
|
16
|
+
import {ArrayCollector, Config, DQ, Stream} from "mona-dish";
|
|
17
|
+
import {$faces, $nsp, EMPTY_STR, IDENT_ALL, IDENT_FORM, IDENT_NONE, P_VIEWSTATE} from "../core/Const";
|
|
18
18
|
import {ExtConfig} from "../util/ExtDomQuery";
|
|
19
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
decodeEncodedValues,
|
|
21
|
+
encodeFormData,
|
|
22
|
+
resolveFiles,
|
|
23
|
+
fixKeyWithoutVal
|
|
24
|
+
} from "../util/FileUtils";
|
|
20
25
|
|
|
21
26
|
|
|
22
27
|
type ParamsMapper<V, K> = (key: V, item: K) => [V, K];
|
|
@@ -32,7 +37,11 @@ const defaultParamsMapper: ParamsMapper<string, any> = (key, item) => [key, item
|
|
|
32
37
|
*
|
|
33
38
|
* probably only one needed and one overlay!
|
|
34
39
|
* the entire file input storing probably is redundant now
|
|
35
|
-
* that dom query has been fixed
|
|
40
|
+
* that dom query has been fixed
|
|
41
|
+
*
|
|
42
|
+
* internal storage format
|
|
43
|
+
* every value is stored as an array
|
|
44
|
+
* even scalar ones!
|
|
36
45
|
*/
|
|
37
46
|
export class XhrFormData extends Config {
|
|
38
47
|
/**
|
|
@@ -61,9 +70,9 @@ export class XhrFormData extends Config {
|
|
|
61
70
|
* Additionally the hidden element jakarta.faces.ViewState
|
|
62
71
|
* Enhancement partial page submit
|
|
63
72
|
*/
|
|
64
|
-
this.
|
|
73
|
+
this.resolveRequestType(this.dataSource, executes);
|
|
74
|
+
this.encodeSubmittableFields(this.dataSource, this.partialIds);
|
|
65
75
|
this.applyViewState(this.dataSource);
|
|
66
|
-
this.resolveRequestType(executes);
|
|
67
76
|
}
|
|
68
77
|
|
|
69
78
|
/**
|
|
@@ -71,29 +80,11 @@ export class XhrFormData extends Config {
|
|
|
71
80
|
* @param executes the executable dom nodes which need to be processed into the form data, which we can send
|
|
72
81
|
* in our ajax request
|
|
73
82
|
*/
|
|
74
|
-
resolveRequestType(executes?: Array<string>) {
|
|
75
|
-
if (!executes) {
|
|
83
|
+
resolveRequestType(rootElement: DQ, executes?: Array<string>) {
|
|
84
|
+
if (!executes || executes.indexOf(IDENT_NONE) != -1) {
|
|
76
85
|
return;
|
|
77
86
|
}
|
|
78
|
-
|
|
79
|
-
if (id == IDENT_ALL) {
|
|
80
|
-
let namingContainer = this.remapKeyForNamingContainer("");
|
|
81
|
-
if (namingContainer.length) {
|
|
82
|
-
namingContainer = namingContainer.substring(0, namingContainer.length - 1);
|
|
83
|
-
return DQ.byId(namingContainer).isMultipartCandidate();
|
|
84
|
-
}
|
|
85
|
-
return DQ.byId(document.body).isMultipartCandidate();
|
|
86
|
-
} else if (id == IDENT_FORM) {
|
|
87
|
-
return this.dataSource.isMultipartCandidate(true);
|
|
88
|
-
} else {
|
|
89
|
-
const element = DQ.byId(id, true);
|
|
90
|
-
return element.isMultipartCandidate();
|
|
91
|
-
}
|
|
92
|
-
};
|
|
93
|
-
|
|
94
|
-
this.isMultipartRequest = LazyStream.of(...executes)
|
|
95
|
-
.filter(isMultiPartContainer)
|
|
96
|
-
.first().isPresent();
|
|
87
|
+
this.isMultipartRequest = rootElement.isMultipartCandidate(true);
|
|
97
88
|
}
|
|
98
89
|
|
|
99
90
|
/**
|
|
@@ -116,7 +107,36 @@ export class XhrFormData extends Config {
|
|
|
116
107
|
*/
|
|
117
108
|
toFormData(): FormData {
|
|
118
109
|
let ret: any = new FormData();
|
|
119
|
-
|
|
110
|
+
|
|
111
|
+
/*
|
|
112
|
+
* expands key: [item1, item2]
|
|
113
|
+
* to: [{key: item1}, {key, item2}]
|
|
114
|
+
*/
|
|
115
|
+
let expandArrayedData = ([key, item]) =>
|
|
116
|
+
Stream.of(...(item as Array<any>)).map(item => {
|
|
117
|
+
return {key, item};
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
/*
|
|
121
|
+
* remaps the incoming {key, value} tuples
|
|
122
|
+
* to naming container prefixed keys and values
|
|
123
|
+
*/
|
|
124
|
+
let remapForNamingContainer = ({key, item}) => {
|
|
125
|
+
key = this.remapKeyForNamingContainer(key);
|
|
126
|
+
return {key, item}
|
|
127
|
+
};
|
|
128
|
+
|
|
129
|
+
/*
|
|
130
|
+
* collects everything into a FormData object
|
|
131
|
+
*/
|
|
132
|
+
let collectFormData = ({key, item}) => {
|
|
133
|
+
ret.append(key, item)
|
|
134
|
+
};
|
|
135
|
+
|
|
136
|
+
Stream.ofAssoc(this.value)
|
|
137
|
+
.flatMap(expandArrayedData)
|
|
138
|
+
.map(remapForNamingContainer)
|
|
139
|
+
.each(collectFormData)
|
|
120
140
|
return ret;
|
|
121
141
|
}
|
|
122
142
|
|
|
@@ -136,32 +156,29 @@ export class XhrFormData extends Config {
|
|
|
136
156
|
* @param {Node} parentItem - form element item is nested in
|
|
137
157
|
* @param {Array} partialIds - ids fo PPS
|
|
138
158
|
*/
|
|
139
|
-
public encodeSubmittableFields(
|
|
140
|
-
parentItem: DQ, partialIds ?: string[]) {
|
|
159
|
+
public encodeSubmittableFields(parentItem: DQ, partialIds ?: string[]) {
|
|
141
160
|
//encoded String
|
|
142
|
-
|
|
161
|
+
const viewStateStr = $faces().getViewState(parentItem.getAsElem(0).value);
|
|
162
|
+
|
|
143
163
|
// we now need to decode it and then merge it into the target buf
|
|
144
164
|
// which hosts already our overrides (aka do not override what is already there(
|
|
145
165
|
// after that we need to deal with form elements on a separate level
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
166
|
+
const keyValueEntries: Stream<string[] | [string, File]> = decodeEncodedValues(viewStateStr);
|
|
167
|
+
const fileEntries = resolveFiles(parentItem);
|
|
168
|
+
const concatted = keyValueEntries.concat(fileEntries as any)
|
|
169
|
+
const formData = new ExtConfig({});
|
|
170
|
+
|
|
171
|
+
concatted
|
|
172
|
+
.map(fixKeyWithoutVal)
|
|
173
|
+
.map(keyVal => this.paramsMapper(keyVal[0] as string, keyVal[1]))
|
|
174
|
+
.each((entry) => {
|
|
175
|
+
formData.append(entry[0]).value = entry[1];
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
this.shallowMerge(formData, true, true);
|
|
149
179
|
}
|
|
150
180
|
|
|
151
181
|
private remapKeyForNamingContainer(key: string): string {
|
|
152
182
|
return this.paramsMapper(key, "")[0];
|
|
153
183
|
}
|
|
154
|
-
|
|
155
|
-
private appendInputs(ret: any) {
|
|
156
|
-
Stream.ofAssoc(this.value)
|
|
157
|
-
.flatMap(([key, item]) =>
|
|
158
|
-
Stream.of(...(item as Array<any>)).map(item => {
|
|
159
|
-
return {key, item};
|
|
160
|
-
}))
|
|
161
|
-
.map(({key, item}) => {
|
|
162
|
-
key = this.remapKeyForNamingContainer(key);
|
|
163
|
-
return {key, item}
|
|
164
|
-
})
|
|
165
|
-
.each(({key, item}) => ret.append(key, item))
|
|
166
|
-
}
|
|
167
184
|
}
|
|
@@ -41,7 +41,7 @@ import {
|
|
|
41
41
|
STATE_EVT_TIMEOUT,
|
|
42
42
|
STD_ACCEPT,
|
|
43
43
|
URL_ENCODED,
|
|
44
|
-
VAL_AJAX
|
|
44
|
+
VAL_AJAX, IDENT_NONE
|
|
45
45
|
} from "../core/Const";
|
|
46
46
|
import {
|
|
47
47
|
resolveFinalUrl,
|
|
@@ -61,6 +61,7 @@ import {ResponseProcessor} from "./ResponseProcessor";
|
|
|
61
61
|
* a single ajax request into our queue
|
|
62
62
|
* and let the queue do the processing.
|
|
63
63
|
*
|
|
64
|
+
*
|
|
64
65
|
*/
|
|
65
66
|
|
|
66
67
|
export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
|
|
@@ -119,7 +120,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
|
|
|
119
120
|
let xhrObject = this.xhrObject;
|
|
120
121
|
|
|
121
122
|
let executesArr = () => {
|
|
122
|
-
return this.requestContext.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).get(
|
|
123
|
+
return this.requestContext.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).get(IDENT_NONE).value.split(/\s+/gi);
|
|
123
124
|
};
|
|
124
125
|
|
|
125
126
|
try {
|
|
@@ -131,7 +132,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
|
|
|
131
132
|
// whatever the formData object delivers
|
|
132
133
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
133
134
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
134
|
-
// anyway TODO
|
|
135
|
+
// anyway TODO reimplement the partial ids array, we still do not have it in jsf the way we need it
|
|
135
136
|
let formData: XhrFormData = new XhrFormData(this.sourceForm, resoveNamingContainerMapper(this.internalContext), executesArr(), this.partialIdsArray);
|
|
136
137
|
|
|
137
138
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
@@ -166,7 +166,7 @@ export module StandardInits {
|
|
|
166
166
|
</head>
|
|
167
167
|
<body>
|
|
168
168
|
<form id="blarg" enctype="multipart/form-data">
|
|
169
|
-
<input type="file" id="fíleupload"></input>
|
|
169
|
+
<input type="file" id="fíleupload" name="fíleupload"></input>
|
|
170
170
|
<input type="text" id="input_1" name="input_1" value="input_1_val"></input>
|
|
171
171
|
<input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
|
|
172
172
|
<input type="button" id="input_2" name="input_2" value="input_1_val"></input>
|
|
@@ -17,7 +17,7 @@ import {describe, it} from "mocha";
|
|
|
17
17
|
import * as sinon from "sinon";
|
|
18
18
|
import {expect} from "chai";
|
|
19
19
|
import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
|
|
20
|
-
import {DomQuery} from "mona-dish";
|
|
20
|
+
import {DomQuery, DQ} from "mona-dish";
|
|
21
21
|
import defaultFileForm = StandardInits.defaultFileForm;
|
|
22
22
|
import {Implementation} from "../../impl/AjaxImpl";
|
|
23
23
|
|
|
@@ -130,11 +130,12 @@ describe('Tests on the xhr core when it starts to call the request', function ()
|
|
|
130
130
|
const MULTIPART_FORM = "multipart/form-data";
|
|
131
131
|
const POST = "POST";
|
|
132
132
|
|
|
133
|
+
|
|
133
134
|
try {
|
|
134
135
|
let button = DomQuery.byId("input_1");
|
|
135
136
|
|
|
136
137
|
button.addEventListener("click", (event: Event) => {
|
|
137
|
-
faces.ajax.request(event.target, event, {render: '@all', execute: '
|
|
138
|
+
faces.ajax.request(event.target, event, {render: '@all', execute: '@none'});
|
|
138
139
|
}).click();
|
|
139
140
|
|
|
140
141
|
expect(this.requests.length).to.eq(1);
|
|
@@ -18,14 +18,41 @@ import {Implementation} from "../../impl/AjaxImpl";
|
|
|
18
18
|
import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
|
|
19
19
|
|
|
20
20
|
import protocolPage = StandardInits.protocolPage;
|
|
21
|
-
import {Config, DQ} from "mona-dish";
|
|
22
|
-
import {XhrFormData} from "../../impl/xhrCore/XhrFormData";
|
|
21
|
+
import {Config, DQ, Stream} from "mona-dish";
|
|
23
22
|
import {expect} from "chai";
|
|
24
|
-
import prefixPage = StandardInits.prefixEmbeddedPage;
|
|
25
|
-
import prefixEmbeddedPage = StandardInits.prefixEmbeddedPage;
|
|
26
23
|
import HTML_PREFIX_EMBEDDED_BODY = StandardInits.HTML_PREFIX_EMBEDDED_BODY;
|
|
27
24
|
import {it} from "mocha";
|
|
28
|
-
import {decodeEncodedValues
|
|
25
|
+
import {decodeEncodedValues} from "../../impl/util/FileUtils";
|
|
26
|
+
import {ExtConfig} from "../../impl/util/ExtDomQuery";
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* merges a list of key value entries into a target config
|
|
30
|
+
* @param target the target receiving the key value entries
|
|
31
|
+
* @param keyValueEntries a list of key value entries divided by =
|
|
32
|
+
* @param paramsMapper a key value remapper
|
|
33
|
+
*/
|
|
34
|
+
function mergeKeyValueEntries(target: Config, keyValueEntries: Stream<string[]>, paramsMapper = (key, value) => [key, value]) {
|
|
35
|
+
|
|
36
|
+
function fixKeyWithoutVal(keyVal: string[]) {
|
|
37
|
+
return keyVal.length < 3 ? [keyVal?.[0] ?? [], keyVal?.[1] ?? []] : keyVal;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
let toMerge = new ExtConfig({});
|
|
41
|
+
keyValueEntries
|
|
42
|
+
//special case of having keys without values
|
|
43
|
+
.map(keyVal => fixKeyWithoutVal(keyVal))
|
|
44
|
+
.map(keyVal => paramsMapper(keyVal[0] as string, keyVal[1]))
|
|
45
|
+
.each(keyVal => {
|
|
46
|
+
let value = keyVal?.splice(1)?.join("") ?? "";
|
|
47
|
+
if(toMerge.getIfPresent(keyVal[0]).isPresent()) {
|
|
48
|
+
toMerge.append(keyVal[0] as string).value = value;
|
|
49
|
+
} else {
|
|
50
|
+
toMerge.assign(keyVal[0] as string).value = value;
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
target.shallowMerge(toMerge);
|
|
55
|
+
}
|
|
29
56
|
|
|
30
57
|
function getFormData(requestBody: string): Config {
|
|
31
58
|
let ret = new Config({});
|
|
@@ -106,7 +133,7 @@ describe("test for proper request param patterns identical to the old implementa
|
|
|
106
133
|
//We check if the base64 encoded string matches the original
|
|
107
134
|
let formData = getFormData(requestBody);
|
|
108
135
|
|
|
109
|
-
expect(
|
|
136
|
+
expect(formData.getIf("jakarta.faces.ViewState").value == probe).to.be.true;
|
|
110
137
|
});
|
|
111
138
|
|
|
112
139
|
|
|
@@ -137,6 +164,7 @@ describe("test for proper request param patterns identical to the old implementa
|
|
|
137
164
|
it("must handle prefixed inputs properly (prefixes must be present) faces4", function (done) {
|
|
138
165
|
window.document.body.innerHTML = HTML_PREFIX_EMBEDDED_BODY;
|
|
139
166
|
|
|
167
|
+
global["debug_inp"] = true;
|
|
140
168
|
//we now run the tests here
|
|
141
169
|
try {
|
|
142
170
|
|
package/target/impl/AjaxImpl.js
CHANGED
|
@@ -26,7 +26,7 @@ const ErrorData_1 = require("./xhrCore/ErrorData");
|
|
|
26
26
|
const Lang_1 = require("./util/Lang");
|
|
27
27
|
const Const_1 = require("./core/Const");
|
|
28
28
|
const RequestDataResolver_1 = require("./xhrCore/RequestDataResolver");
|
|
29
|
-
const
|
|
29
|
+
const FileUtils_1 = require("./util/FileUtils");
|
|
30
30
|
/*
|
|
31
31
|
* allowed project stages
|
|
32
32
|
*/
|
|
@@ -458,7 +458,7 @@ var Implementation;
|
|
|
458
458
|
// fetch all non file input form elements
|
|
459
459
|
let formElements = element.deepElements.encodeFormElement();
|
|
460
460
|
// encode them! (file inputs are handled differently and are not part of the viewstate)
|
|
461
|
-
return (0,
|
|
461
|
+
return (0, FileUtils_1.encodeFormData)(formElements, (0, RequestDataResolver_1.resoveNamingContainerMapper)(dummyContext));
|
|
462
462
|
}
|
|
463
463
|
Implementation.getViewState = getViewState;
|
|
464
464
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AjaxImpl.js","sourceRoot":"","sources":["../../src/main/typescript/impl/AjaxImpl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AjaxImpl.js","sourceRoot":"","sources":["../../src/main/typescript/impl/AjaxImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
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
|
+
let assocValues = formData.value;
|
|
22
|
+
let entries = mona_dish_1.LazyStream.of(...Object.keys(assocValues))
|
|
23
|
+
.filter(key => assocValues.hasOwnProperty(key))
|
|
24
|
+
.flatMap(key => mona_dish_1.Stream.of(...assocValues[key]).map(val => paramsMapper(key, val)))
|
|
25
|
+
//we cannot encode file elements that is handled by multipart requests anyway
|
|
26
|
+
.filter(([, value]) => !(value instanceof ExtDomQuery_1.ExtDomQuery.global().File))
|
|
27
|
+
.map(keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`)
|
|
28
|
+
.collect(new mona_dish_1.ArrayCollector());
|
|
29
|
+
return entries.join("&");
|
|
30
|
+
}
|
|
31
|
+
exports.encodeFormData = encodeFormData;
|
|
32
|
+
/**
|
|
33
|
+
* splits and decodes encoded values into strings containing of key=value
|
|
34
|
+
* @param encoded encoded string
|
|
35
|
+
*/
|
|
36
|
+
function decodeEncodedValues(encoded) {
|
|
37
|
+
return mona_dish_1.Stream.of(...decodeURIComponent(encoded).split(/&/gi))
|
|
38
|
+
.filter(item => !!(item || '')
|
|
39
|
+
.replace(/\s+/g, ''))
|
|
40
|
+
.map(line => {
|
|
41
|
+
let index = line.indexOf("=");
|
|
42
|
+
if (index == -1) {
|
|
43
|
+
return [line];
|
|
44
|
+
}
|
|
45
|
+
return [line.substring(0, index), line.substring(index + 1)];
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
exports.decodeEncodedValues = decodeEncodedValues;
|
|
49
|
+
function resolveFiles(dataSource) {
|
|
50
|
+
return dataSource
|
|
51
|
+
.querySelectorAllDeep("input[type='file']")
|
|
52
|
+
.stream
|
|
53
|
+
.map(fileInput => [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)])
|
|
54
|
+
.flatMap(([key, files]) => {
|
|
55
|
+
return mona_dish_1.Stream.of(...files).map(file => [key, file]);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
exports.resolveFiles = resolveFiles;
|
|
59
|
+
function fixKeyWithoutVal(keyVal) {
|
|
60
|
+
var _a, _b;
|
|
61
|
+
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;
|
|
62
|
+
}
|
|
63
|
+
exports.fixKeyWithoutVal = fixKeyWithoutVal;
|
|
64
|
+
//# 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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"}
|