jsf.js_next_gen 4.0.0-RC.27 → 4.0.0-RC.29
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 +23 -55
- 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 +23 -55
- 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 +3 -3
- package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts +1 -21
- package/src/main/typescript/impl/xhrCore/Response.ts +0 -1
- package/src/main/typescript/impl/xhrCore/XhrFormData.ts +18 -20
- package/src/main/typescript/impl/xhrCore/XhrRequest.ts +3 -14
- package/target/impl/xhrCore/RequestDataResolver.js +1 -21
- package/target/impl/xhrCore/RequestDataResolver.js.map +1 -1
- package/target/impl/xhrCore/Response.js.map +1 -1
- package/target/impl/xhrCore/XhrFormData.js +16 -19
- package/target/impl/xhrCore/XhrFormData.js.map +1 -1
- package/target/impl/xhrCore/XhrRequest.js +2 -11
- package/target/impl/xhrCore/XhrRequest.js.map +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.29",
|
|
4
4
|
"description": "A next generation typescript reimplementation of jsf.js",
|
|
5
5
|
"main": "dist/window/faces.js",
|
|
6
6
|
"scripts": {
|
|
@@ -42,12 +42,12 @@
|
|
|
42
42
|
"ts-loader": "^9.4.2",
|
|
43
43
|
"ts-node": "^10.9.1",
|
|
44
44
|
"typedoc": "^0.23.24",
|
|
45
|
-
"typescript": "^4.9.
|
|
45
|
+
"typescript": "^4.9.5",
|
|
46
46
|
"webpack": "^5.75.0",
|
|
47
47
|
"webpack-cli": "^5.0.1",
|
|
48
48
|
"webpack-dev-server": "^4.11.1"
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"mona-dish": "^0.24.
|
|
51
|
+
"mona-dish": "^0.24.6"
|
|
52
52
|
}
|
|
53
53
|
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import {
|
|
17
|
+
import {Config, DomQuery, DQ} from "mona-dish";
|
|
18
18
|
import {
|
|
19
19
|
$faces,
|
|
20
20
|
$nsp,
|
|
@@ -116,26 +116,6 @@ export function resoveNamingContainerMapper(internalContext: Config): (key: stri
|
|
|
116
116
|
return (key: string, value: any) => (key.indexOf(prefix) == 0) ? [key, value] : [prefix + key, value];
|
|
117
117
|
}
|
|
118
118
|
|
|
119
|
-
/**
|
|
120
|
-
* we provide the same for configs
|
|
121
|
-
* @param internalContext
|
|
122
|
-
*/
|
|
123
|
-
export function resoveConfigNamingContainerMapper(internalContext: Config): (config: Config) => ExtConfig {
|
|
124
|
-
const isNamedViewRoot = internalContext.getIf(NAMED_VIEWROOT).isPresent();
|
|
125
|
-
if(!isNamedViewRoot) {
|
|
126
|
-
return;
|
|
127
|
-
}
|
|
128
|
-
const partialId = internalContext.getIf(NAMING_CONTAINER_ID).value;
|
|
129
|
-
const SEP = $faces().separatorchar;
|
|
130
|
-
const prefix = partialId + SEP;
|
|
131
|
-
return (config: Config) => {
|
|
132
|
-
let assoc = config.stream
|
|
133
|
-
.map(([key, data]) => (key.indexOf(prefix) == 0) ? [key, data] : [prefix + key, data])
|
|
134
|
-
.collect(new AssocArrayCollector() as any);
|
|
135
|
-
return new ExtConfig(assoc);
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
|
|
139
119
|
export function resolveTimeout(options: Config): number {
|
|
140
120
|
let getCfg = ExtLang.getLocalOrGlobalConfig;
|
|
141
121
|
return options.getIf(CTX_OPTIONS_TIMEOUT).value ?? getCfg(options.value, CTX_OPTIONS_TIMEOUT, 0);
|
|
@@ -58,9 +58,9 @@ export class XhrFormData extends Config {
|
|
|
58
58
|
//a call from getViewState passes the form element as datasource,
|
|
59
59
|
//so we have two call points
|
|
60
60
|
// atm we basically encode twice, to keep the code leaner
|
|
61
|
-
// this will be later
|
|
62
|
-
// which are already covered by an external
|
|
63
|
-
// the encoding a second time, because they are overwritten by the
|
|
61
|
+
// this will be later optmized, practically elements
|
|
62
|
+
// which are already covered by an external viewstate do not need
|
|
63
|
+
// the encoding a second time, because they are overwritten by the viewstate again
|
|
64
64
|
if (isString(dataSource)) {
|
|
65
65
|
this.assignEncodedString(<string>this.dataSource);
|
|
66
66
|
} else {
|
|
@@ -114,9 +114,8 @@ export class XhrFormData extends Config {
|
|
|
114
114
|
private applyViewState(form: DQ) {
|
|
115
115
|
let viewStateElement = form.querySelectorAllDeep(`[name*='${$nsp(P_VIEWSTATE)}'`);
|
|
116
116
|
let viewState = viewStateElement.inputValue;
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
this.assignIf(viewState.isPresent(), viewStateName).value = [viewState.value];
|
|
117
|
+
// this.appendIf(viewState.isPresent(), P_VIEWSTATE).value = viewState.value;
|
|
118
|
+
this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
|
|
120
119
|
}
|
|
121
120
|
|
|
122
121
|
/**
|
|
@@ -124,7 +123,7 @@ export class XhrFormData extends Config {
|
|
|
124
123
|
* as key value entry
|
|
125
124
|
* @param encoded
|
|
126
125
|
*/
|
|
127
|
-
assignEncodedString(encoded: string
|
|
126
|
+
assignEncodedString(encoded: string) {
|
|
128
127
|
// this code filters out empty strings as key value pairs
|
|
129
128
|
let keyValueEntries = decodeURIComponent(encoded).split(/&/gi)
|
|
130
129
|
.filter(item => !!(item || '')
|
|
@@ -136,7 +135,7 @@ export class XhrFormData extends Config {
|
|
|
136
135
|
* assign a set of key value pairs passed as array ['key=val1', 'key2=val2']
|
|
137
136
|
* @param keyValueEntries
|
|
138
137
|
*/
|
|
139
|
-
assignString(keyValueEntries: string[]
|
|
138
|
+
assignString(keyValueEntries: string[]) {
|
|
140
139
|
let toMerge = new ExtConfig({});
|
|
141
140
|
|
|
142
141
|
function splitToKeyVal(line: string) {
|
|
@@ -156,7 +155,7 @@ export class XhrFormData extends Config {
|
|
|
156
155
|
toMerge.append(keyVal[0] as string).value = keyVal?.splice(1)?.join("") ?? "";
|
|
157
156
|
});
|
|
158
157
|
//merge with overwrite but no append! (aka no double entries are allowed)
|
|
159
|
-
this.shallowMerge(toMerge
|
|
158
|
+
this.shallowMerge(toMerge);
|
|
160
159
|
}
|
|
161
160
|
|
|
162
161
|
/**
|
|
@@ -186,15 +185,10 @@ export class XhrFormData extends Config {
|
|
|
186
185
|
}
|
|
187
186
|
let entries = LazyStream.of(...Object.keys(this.value))
|
|
188
187
|
.filter(key => this.value.hasOwnProperty(key))
|
|
189
|
-
.flatMap(key => Stream.of(...this.value[key])
|
|
190
|
-
.map(val => {
|
|
191
|
-
return this.paramsMapper(key, val)
|
|
192
|
-
}))
|
|
188
|
+
.flatMap(key => Stream.of(...this.value[key]).map(val => this.paramsMapper(key, val)))
|
|
193
189
|
//we cannot encode file elements that is handled by multipart requests anyway
|
|
194
190
|
.filter(([, value]) => !(value instanceof ExtDomQuery.global().File))
|
|
195
|
-
.map(keyVal => {
|
|
196
|
-
return `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
|
|
197
|
-
})
|
|
191
|
+
.map(keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`)
|
|
198
192
|
.collect(new ArrayCollector());
|
|
199
193
|
|
|
200
194
|
return entries.join("&")
|
|
@@ -257,18 +251,22 @@ export class XhrFormData extends Config {
|
|
|
257
251
|
|
|
258
252
|
//lets encode the form elements
|
|
259
253
|
let formElements = toEncode.deepElements.encodeFormElement();
|
|
260
|
-
const mapped = this.
|
|
254
|
+
const mapped = this.remapKeysForNamingCoontainer(formElements);
|
|
261
255
|
this.shallowMerge(mapped);
|
|
262
256
|
}
|
|
263
257
|
|
|
264
|
-
private
|
|
258
|
+
private remapKeysForNamingCoontainer(formElements: Config): Config {
|
|
265
259
|
let ret = new Config({});
|
|
266
|
-
formElements.stream
|
|
267
|
-
.map(([key, item]) => this.paramsMapper(key, item))
|
|
260
|
+
formElements.stream.map(([key, item]) => this.paramsMapper(key, item))
|
|
268
261
|
.each( ([key, item]) => {
|
|
269
262
|
ret.assign(key).value = item;
|
|
270
263
|
});
|
|
271
264
|
return ret;
|
|
265
|
+
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
private remapKeyForNamingContainer(key: string): string {
|
|
269
|
+
return this.paramsMapper(key, "")[0];
|
|
272
270
|
}
|
|
273
271
|
|
|
274
272
|
private appendInputs(ret: any) {
|
|
@@ -46,7 +46,7 @@ import {
|
|
|
46
46
|
import {
|
|
47
47
|
resolveFinalUrl,
|
|
48
48
|
resolveHandlerFunc,
|
|
49
|
-
resolveViewRootId,
|
|
49
|
+
resolveViewRootId,
|
|
50
50
|
resoveNamingContainerMapper
|
|
51
51
|
} from "./RequestDataResolver";
|
|
52
52
|
import failSaveExecute = ExtLang.failSaveExecute;
|
|
@@ -124,9 +124,6 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
|
|
|
124
124
|
|
|
125
125
|
try {
|
|
126
126
|
let formElement = this.sourceForm.getAsElem(0).value;
|
|
127
|
-
|
|
128
|
-
// by spec the viewstate must be called to provide
|
|
129
|
-
// decorated encoding capabilities
|
|
130
127
|
let viewState = $faces().getViewState(formElement);
|
|
131
128
|
|
|
132
129
|
// encoded we need to decode
|
|
@@ -137,12 +134,8 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
|
|
|
137
134
|
// whatever the formData object delivers
|
|
138
135
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
139
136
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
140
|
-
// anyway
|
|
141
|
-
|
|
142
|
-
// per spec every parameter sent into the request must be naming container
|
|
143
|
-
// prefixed
|
|
144
|
-
const namingContainerMapper = resoveNamingContainerMapper(this.internalContext);
|
|
145
|
-
let formData: XhrFormData = new XhrFormData(this.sourceForm, namingContainerMapper, viewState, executesArr(), this.partialIdsArray);
|
|
137
|
+
// anyway TODO remove the partial ids array
|
|
138
|
+
let formData: XhrFormData = new XhrFormData(this.sourceForm, resoveNamingContainerMapper(this.internalContext), viewState, executesArr(), this.partialIdsArray);
|
|
146
139
|
|
|
147
140
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
148
141
|
|
|
@@ -156,10 +149,6 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
|
|
|
156
149
|
// information
|
|
157
150
|
|
|
158
151
|
try {
|
|
159
|
-
// per spec every param sent down needs to be remapped
|
|
160
|
-
// and prefixed by the naming container id
|
|
161
|
-
let configNamingContainerMapper = resoveConfigNamingContainerMapper(this.internalContext);
|
|
162
|
-
// requestPassThroughParams = configNamingContainerMapper(requestPassThroughParams);
|
|
163
152
|
formData.shallowMerge(requestPassThroughParams, true, true);
|
|
164
153
|
} finally {
|
|
165
154
|
this.requestContext.$nspEnabled = true;
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.resolveDefaults = exports.getEventTarget = exports.resolveWindowId = exports.resolveDelay = exports.resolveTimeout = exports.
|
|
18
|
+
exports.resolveDefaults = exports.getEventTarget = exports.resolveWindowId = exports.resolveDelay = exports.resolveTimeout = exports.resoveNamingContainerMapper = exports.resolveViewRootId = exports.resolveViewId = exports.resolveForm = exports.resolveFinalUrl = exports.resolveTargetUrl = exports.resolveHandlerFunc = void 0;
|
|
19
19
|
const mona_dish_1 = require("mona-dish");
|
|
20
20
|
const Const_1 = require("../core/Const");
|
|
21
21
|
const Lang_1 = require("../util/Lang");
|
|
@@ -101,26 +101,6 @@ function resoveNamingContainerMapper(internalContext) {
|
|
|
101
101
|
return (key, value) => (key.indexOf(prefix) == 0) ? [key, value] : [prefix + key, value];
|
|
102
102
|
}
|
|
103
103
|
exports.resoveNamingContainerMapper = resoveNamingContainerMapper;
|
|
104
|
-
/**
|
|
105
|
-
* we provide the same for configs
|
|
106
|
-
* @param internalContext
|
|
107
|
-
*/
|
|
108
|
-
function resoveConfigNamingContainerMapper(internalContext) {
|
|
109
|
-
const isNamedViewRoot = internalContext.getIf(Const_1.NAMED_VIEWROOT).isPresent();
|
|
110
|
-
if (!isNamedViewRoot) {
|
|
111
|
-
return;
|
|
112
|
-
}
|
|
113
|
-
const partialId = internalContext.getIf(Const_1.NAMING_CONTAINER_ID).value;
|
|
114
|
-
const SEP = (0, Const_1.$faces)().separatorchar;
|
|
115
|
-
const prefix = partialId + SEP;
|
|
116
|
-
return (config) => {
|
|
117
|
-
let assoc = config.stream
|
|
118
|
-
.map(([key, data]) => (key.indexOf(prefix) == 0) ? [key, data] : [prefix + key, data])
|
|
119
|
-
.collect(new mona_dish_1.AssocArrayCollector());
|
|
120
|
-
return new ExtDomQuery_1.ExtConfig(assoc);
|
|
121
|
-
};
|
|
122
|
-
}
|
|
123
|
-
exports.resoveConfigNamingContainerMapper = resoveConfigNamingContainerMapper;
|
|
124
104
|
function resolveTimeout(options) {
|
|
125
105
|
var _a;
|
|
126
106
|
let getCfg = Lang_1.ExtLang.getLocalOrGlobalConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestDataResolver.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/RequestDataResolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"RequestDataResolver.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/RequestDataResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/Response.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,yCAAuC;AACvC,2DAAsD;AAGtD,yCAmBuB;AACvB,+DAA0E;AAC1E,qDAA8C;AAI9C,IAAc,QAAQ,
|
|
1
|
+
{"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/Response.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,yCAAuC;AACvC,2DAAsD;AAGtD,yCAmBuB;AACvB,+DAA0E;AAC1E,qDAA8C;AAI9C,IAAc,QAAQ,CA4LrB;AA5LD,WAAc,QAAQ;IAGlB;;;;;;;;;;OAUG;IACH,SAAgB,eAAe,CAAC,OAAuB,EAAE,OAAgB;QAErE,IAAI,GAAG,GAAG,uBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,EAAC,eAAe,EAAE,eAAe,EAAC,GAAG,IAAA,qCAAe,EAAC,OAAO,CAAC,CAAC;QAClE,IAAI,WAAW,GAAa,IAAA,wCAAkB,EAAC,GAAG,CAAC,CAAC;QACpD,IAAI,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,GAAG,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;QAErF,eAAe,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAC,KAAK,GAAG,WAAW,CAAC;QAEzD,mEAAmE;QACnE,WAAW,CAAC,gBAAgB,CAAC,4BAAoB,CAAC;aAC7C,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAW,IAAI,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;QAEzF,8FAA8F;QAC9F,iDAAiD;QACjD,kDAAkD;QAClD,kDAAkD;QAClD,qFAAqF;QACrF,sFAAsF;QACtF,iBAAiB,CAAC,wBAAwB,EAAE,CAAC;QAC7C,iBAAiB,CAAC,aAAa,EAAE,CAAC;QAClC,iBAAiB,CAAC,eAAe,EAAE,CAAC;QACpC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAE/B,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAzBe,wBAAe,kBAyB9B,CAAA;IAED;;OAEG;IACH,SAAS,iBAAiB,CAAC,IAAc,EAAE,iBAAqC,EAAE,eAAe;QAG7F;;;;;;WAMG;QACH,+HAA+H;QAC/H,iCAAiC;;QAEjC,IAAI,SAAS,GAAU,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,0CAAE,KAAK,CAAC;QACvC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,2BAAmB,CAAC,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,sBAAsB;QAEpG,8FAA8F;QAC9F,gBAAgB;QAChB,iBAAiB,CAAC,wBAAwB,EAAE,CAAC;QAE7C,MAAM,YAAY,GAAG,CAAC,qBAAa,EAAE,wBAAgB,EAAE,uBAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAElF,yCAAyC;QACzC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,IAAc,EAAE,EAAE;YACxD,QAAQ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACxB,KAAK,qBAAa;oBACd,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9B,MAAM;gBACV,KAAK,wBAAgB;oBACjB,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACjC,MAAM;gBACV,KAAK,uBAAe;oBAChB,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;oBAC3C,MAAM;aACb;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,aAAa,GAAG,UAAU,iBAAqC,EAAE,IAAc;QAC/E,mCAAmC;QACnC,IAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,sBAAc,EAAE,qBAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE;YACxE,iBAAiB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC7C;aAAM,EAAE,8BAA8B;YACnC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAClC;IAEL,CAAC,CAAC;IAEF;;;;;OAKG;IACH,SAAS,iBAAiB,CAAC,IAAc,EAAE,iBAAqC;QAC5E,MAAM,YAAY,GAAG,CAAC,sBAAc,EAAE,oBAAY,EAAE,sBAAc,EAAE,sBAAc,EAAE,0BAAkB,EAAE,yBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtI,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,IAAI,CACpC,CAAC,IAAc,EAAE,EAAE;YACf,QAAQ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACxB,KAAK,sBAAc;oBACf,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;oBAC1C,MAAM;gBAEV,KAAK,oBAAY;oBACb,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC7B,MAAM;gBAEV,KAAK,sBAAc;oBACf,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;oBACvC,MAAM;gBAEV,KAAK,sBAAc;oBACf,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC/B,MAAM;gBAEV,KAAK,0BAAkB;oBACnB,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACnC,MAAM;gBAEV,KAAK,yBAAiB;oBAClB,MAAM;aACb;QACL,CAAC,CACJ,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;;OAOG;IACH,SAAS,UAAU,CAAC,iBAAqC,EAAE,IAAc;QACrE,OAAO,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACnG,CAAC;IAED;;;;;;;OAOG;IACH,SAAS,gBAAgB,CAAC,IAAc,EAAE,iBAAqC;QAC3E,oEAAoE;QACpE,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE;YACtC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;SAChD;IACL,CAAC;IAED;;;;;OAKG;IACH,SAAS,mBAAmB,CAAC,IAAc,EAAE,iBAAqC;QAC9E,IAAI,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC;QACpC,QAAQ,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE;YACnB,KAAK,IAAA,YAAI,EAAC,kBAAU,CAAC;gBACjB,iBAAiB,CAAC,eAAe,CAAC,cAAE,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpG,MAAM;YAEV,KAAK,IAAA,YAAI,EAAC,kBAAU,CAAC;gBACjB,iBAAiB,CAAC,WAAW,CAAC,cAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzD,MAAM;YAEV,KAAK,IAAA,YAAI,EAAC,kBAAU,CAAC;gBACjB,iBAAiB,CAAC,WAAW,CAAC,cAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;gBACzD,MAAM;YAEV,KAAK,IAAA,YAAI,EAAC,kBAAU,CAAC;gBACjB,iBAAiB,CAAC,SAAS,CAAC,cAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;gBACtD,MAAM;YAEV,SAAQ,uBAAuB;gBAC3B,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC3C,MAAM;SACb;IACL,CAAC;AACL,CAAC,EA5La,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA4LrB"}
|
|
@@ -59,9 +59,9 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
59
59
|
//a call from getViewState passes the form element as datasource,
|
|
60
60
|
//so we have two call points
|
|
61
61
|
// atm we basically encode twice, to keep the code leaner
|
|
62
|
-
// this will be later
|
|
63
|
-
// which are already covered by an external
|
|
64
|
-
// the encoding a second time, because they are overwritten by the
|
|
62
|
+
// this will be later optmized, practically elements
|
|
63
|
+
// which are already covered by an external viewstate do not need
|
|
64
|
+
// the encoding a second time, because they are overwritten by the viewstate again
|
|
65
65
|
if (isString(dataSource)) {
|
|
66
66
|
this.assignEncodedString(this.dataSource);
|
|
67
67
|
}
|
|
@@ -113,15 +113,15 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
113
113
|
applyViewState(form) {
|
|
114
114
|
let viewStateElement = form.querySelectorAllDeep(`[name*='${(0, Const_1.$nsp)(Const_1.P_VIEWSTATE)}'`);
|
|
115
115
|
let viewState = viewStateElement.inputValue;
|
|
116
|
-
|
|
117
|
-
this.
|
|
116
|
+
// this.appendIf(viewState.isPresent(), P_VIEWSTATE).value = viewState.value;
|
|
117
|
+
this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
|
|
118
118
|
}
|
|
119
119
|
/**
|
|
120
120
|
* assigns an url encoded string to this xhrFormData object
|
|
121
121
|
* as key value entry
|
|
122
122
|
* @param encoded
|
|
123
123
|
*/
|
|
124
|
-
assignEncodedString(encoded
|
|
124
|
+
assignEncodedString(encoded) {
|
|
125
125
|
// this code filters out empty strings as key value pairs
|
|
126
126
|
let keyValueEntries = decodeURIComponent(encoded).split(/&/gi)
|
|
127
127
|
.filter(item => !!(item || '')
|
|
@@ -132,7 +132,7 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
132
132
|
* assign a set of key value pairs passed as array ['key=val1', 'key2=val2']
|
|
133
133
|
* @param keyValueEntries
|
|
134
134
|
*/
|
|
135
|
-
assignString(keyValueEntries
|
|
135
|
+
assignString(keyValueEntries) {
|
|
136
136
|
let toMerge = new ExtDomQuery_1.ExtConfig({});
|
|
137
137
|
function splitToKeyVal(line) {
|
|
138
138
|
return line.split(/=(.*)/gi);
|
|
@@ -151,7 +151,7 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
151
151
|
toMerge.append(keyVal[0]).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 : "";
|
|
152
152
|
});
|
|
153
153
|
//merge with overwrite but no append! (aka no double entries are allowed)
|
|
154
|
-
this.shallowMerge(toMerge
|
|
154
|
+
this.shallowMerge(toMerge);
|
|
155
155
|
}
|
|
156
156
|
/**
|
|
157
157
|
* @param paramsMapper ... pre encode the params if needed, default is to map them 1:1
|
|
@@ -179,15 +179,10 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
179
179
|
}
|
|
180
180
|
let entries = mona_dish_1.LazyStream.of(...Object.keys(this.value))
|
|
181
181
|
.filter(key => this.value.hasOwnProperty(key))
|
|
182
|
-
.flatMap(key => mona_dish_1.Stream.of(...this.value[key])
|
|
183
|
-
.map(val => {
|
|
184
|
-
return this.paramsMapper(key, val);
|
|
185
|
-
}))
|
|
182
|
+
.flatMap(key => mona_dish_1.Stream.of(...this.value[key]).map(val => this.paramsMapper(key, val)))
|
|
186
183
|
//we cannot encode file elements that is handled by multipart requests anyway
|
|
187
184
|
.filter(([, value]) => !(value instanceof ExtDomQuery_1.ExtDomQuery.global().File))
|
|
188
|
-
.map(keyVal => {
|
|
189
|
-
return `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
|
|
190
|
-
})
|
|
185
|
+
.map(keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`)
|
|
191
186
|
.collect(new mona_dish_1.ArrayCollector());
|
|
192
187
|
return entries.join("&");
|
|
193
188
|
}
|
|
@@ -243,18 +238,20 @@ class XhrFormData extends mona_dish_1.Config {
|
|
|
243
238
|
}
|
|
244
239
|
//lets encode the form elements
|
|
245
240
|
let formElements = toEncode.deepElements.encodeFormElement();
|
|
246
|
-
const mapped = this.
|
|
241
|
+
const mapped = this.remapKeysForNamingCoontainer(formElements);
|
|
247
242
|
this.shallowMerge(mapped);
|
|
248
243
|
}
|
|
249
|
-
|
|
244
|
+
remapKeysForNamingCoontainer(formElements) {
|
|
250
245
|
let ret = new mona_dish_1.Config({});
|
|
251
|
-
formElements.stream
|
|
252
|
-
.map(([key, item]) => this.paramsMapper(key, item))
|
|
246
|
+
formElements.stream.map(([key, item]) => this.paramsMapper(key, item))
|
|
253
247
|
.each(([key, item]) => {
|
|
254
248
|
ret.assign(key).value = item;
|
|
255
249
|
});
|
|
256
250
|
return ret;
|
|
257
251
|
}
|
|
252
|
+
remapKeyForNamingContainer(key) {
|
|
253
|
+
return this.paramsMapper(key, "")[0];
|
|
254
|
+
}
|
|
258
255
|
appendInputs(ret) {
|
|
259
256
|
mona_dish_1.Stream.ofAssoc(this.value)
|
|
260
257
|
.flatMap(([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XhrFormData.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrFormData.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yCAA+E;AAC/E,yCAAkF;AAClF,IAAO,QAAQ,GAAG,gBAAI,CAAC,QAAQ,CAAC;AAChC,qDAA2D;AAI3D,MAAM,mBAAmB,GAA8B,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAElF;;;;;;;;;;;GAWG;AACH,MAAa,WAAY,SAAQ,kBAAM;IAUnC;;;;;;;OAOG;IACH,YAAoB,UAAuB,EAAU,eAA0C,mBAAmB,EAAE,SAAkB,EAAE,QAAmB,EAAU,UAAqB;QACtL,KAAK,CAAC,EAAE,CAAC,CAAC;QADM,eAAU,GAAV,UAAU,CAAa;QAAU,iBAAY,GAAZ,YAAY,CAAiD;QAAmD,eAAU,GAAV,UAAU,CAAW;QAjB1L;;;;;;WAMG;QACH,uBAAkB,GAAY,KAAK,CAAC;QAYhC,0DAA0D;QAC1D,iEAAiE;QACjE,4BAA4B;QAC5B,yDAAyD;QACzD,
|
|
1
|
+
{"version":3,"file":"XhrFormData.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrFormData.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,8 +84,6 @@ class XhrRequest {
|
|
|
84
84
|
};
|
|
85
85
|
try {
|
|
86
86
|
let formElement = this.sourceForm.getAsElem(0).value;
|
|
87
|
-
// by spec the viewstate must be called to provide
|
|
88
|
-
// decorated encoding capabilities
|
|
89
87
|
let viewState = (0, Const_1.$faces)().getViewState(formElement);
|
|
90
88
|
// encoded we need to decode
|
|
91
89
|
// We generated a base representation of the current form
|
|
@@ -95,11 +93,8 @@ class XhrRequest {
|
|
|
95
93
|
// whatever the formData object delivers
|
|
96
94
|
// the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
|
|
97
95
|
// ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
|
|
98
|
-
// anyway
|
|
99
|
-
|
|
100
|
-
// prefixed
|
|
101
|
-
const namingContainerMapper = (0, RequestDataResolver_1.resoveNamingContainerMapper)(this.internalContext);
|
|
102
|
-
let formData = new XhrFormData_1.XhrFormData(this.sourceForm, namingContainerMapper, viewState, executesArr(), this.partialIdsArray);
|
|
96
|
+
// anyway TODO remove the partial ids array
|
|
97
|
+
let formData = new XhrFormData_1.XhrFormData(this.sourceForm, (0, RequestDataResolver_1.resoveNamingContainerMapper)(this.internalContext), viewState, executesArr(), this.partialIdsArray);
|
|
103
98
|
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
|
|
104
99
|
// next step the pass through parameters are merged in for post params
|
|
105
100
|
this.requestContext.$nspEnabled = false;
|
|
@@ -110,10 +105,6 @@ class XhrRequest {
|
|
|
110
105
|
// this can be used and is used in the impl to enrich the post request parameters with additional
|
|
111
106
|
// information
|
|
112
107
|
try {
|
|
113
|
-
// per spec every param sent down needs to be remapped
|
|
114
|
-
// and prefixed by the naming container id
|
|
115
|
-
let configNamingContainerMapper = (0, RequestDataResolver_1.resoveConfigNamingContainerMapper)(this.internalContext);
|
|
116
|
-
// requestPassThroughParams = configNamingContainerMapper(requestPassThroughParams);
|
|
117
108
|
formData.shallowMerge(requestPassThroughParams, true, true);
|
|
118
109
|
}
|
|
119
110
|
finally {
|
|
@@ -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,+DAK+B;AAC/B,IAAO,eAAe,GAAG,cAAO,CAAC,eAAe,CAAC;AAIjD;;;;;;;;GAQG;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,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzG,CAAC,CAAC;QAEF,IAAI;YACA,IAAI,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"XhrRequest.js","sourceRoot":"","sources":["../../../src/main/typescript/impl/xhrCore/XhrRequest.ts"],"names":[],"mappings":"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"}
|