jsf.js_next_gen 4.0.0-RC.24 → 4.0.0-RC.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.0-RC.24",
+  "version": "4.0.0-RC.27",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -30,10 +30,10 @@
     "compression-webpack-plugin": "^10.0.0",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
-    "jsdom": "^21.0.0",
+    "jsdom": "^21.1.0",
     "jsdom-global": "^3.0.2",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.6.2",
+    "npm-check-updates": "^16.6.3",
     "nyc": "^15.1.0",
     "replace-in-file": "^6.3.5",
     "rxjs": "^7.8.0",
@@ -48,6 +48,6 @@
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
-    "mona-dish": "^0.24.3"
+    "mona-dish": "^0.24.5"
   }
 }

package/src/main/typescript/impl/AjaxImpl.ts

@@ -48,13 +48,20 @@ import {
     P_WINDOW_ID,
     CTX_PARAM_RENDER,
     SOURCE,
-    HTML_TAG_FORM, CTX_OPTIONS_PARAMS, VIEW_ID, $faces, EMPTY_STR
+    HTML_TAG_FORM,
+    CTX_OPTIONS_PARAMS,
+    VIEW_ID,
+    $faces,
+    EMPTY_STR,
+    CTX_PARAM_MF_INTERNAL,
+    NAMED_VIEWROOT,
+    NAMING_CONTAINER_ID
 } from "./core/Const";
 import {
     resolveDefaults,
     resolveDelay,
     resolveForm,
-    resolveTimeout, resolveViewId
+    resolveTimeout, resolveViewId, resolveViewRootId, resoveNamingContainerMapper
 } from "./xhrCore/RequestDataResolver";
 
 /*
@@ -337,6 +344,7 @@ export module Implementation {
         assignClientWindowId(form, requestCtx);
         assignExecute(options, requestCtx, form, elementId);
         assignRender(options, requestCtx, form, elementId);
+        assignNamingContainerData(internalCtx, form);
 
         //now we enqueue the request as asynchronous runnable into our request
         //queue and let the queue take over the rest
@@ -522,7 +530,10 @@ export module Implementation {
             throw new Error(getMessage("ERR_VIEWSTATE"));
         }
 
-        let formData = new XhrFormData(element);
+        const dummyContext = new Config({});
+        assignNamingContainerData(dummyContext, DQ.byId(form))
+
+        let formData = new XhrFormData(element, resoveNamingContainerMapper(dummyContext));
         return formData.toString();
     }
 
@@ -603,6 +614,23 @@ export module Implementation {
         }
     }
 
+    /**
+     * determines the current naming container
+     * and assigns it internally
+     *
+     * @param internalContext
+     * @param formElement
+     * @private
+     */
+    function assignNamingContainerData(internalContext: Config, formElement: DQ) {
+        const viewRootId = resolveViewRootId(formElement);
+
+        if(!!viewRootId) {
+            internalContext.assign(NAMED_VIEWROOT).value = true;
+            internalContext.assign(NAMING_CONTAINER_ID).value = viewRootId;
+        }
+    }
+
     /**
      * transforms the user values to the expected one
      * with the proper none all form and this handling

package/src/main/typescript/impl/core/Const.ts

@@ -22,7 +22,7 @@ export const XML_ATTR_NAMED_VIEWROOT = "namedViewRoot";
 export const NAMED_VIEWROOT = "namedViewRoot";
 
 export const P_PARTIAL_SOURCE = "jakarta.faces.source";
-export const PARTIAL_ID = "partialId";
+export const NAMING_CONTAINER_ID = "myfaces.partialId";
 
 export const VIEW_ID = "myfaces.viewId";
 export const P_VIEWSTATE = "jakarta.faces.ViewState";

package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {Config, DomQuery, DQ} from "mona-dish";
+import {AssocArrayCollector, Config, DomQuery, DQ} from "mona-dish";
 import {
     $faces,
     $nsp,
@@ -23,7 +23,7 @@ import {
     DELAY_NONE,
     EMPTY_FUNC,
     EMPTY_STR,
-    ENCODED_URL,
+    ENCODED_URL, NAMED_VIEWROOT, NAMING_CONTAINER_ID,
     P_VIEWSTATE,
     REQ_TYPE_GET,
     REQ_TYPE_POST
@@ -50,6 +50,7 @@ import {Assertions} from "../util/Assertions";
  * @param funcName
  */
 export function resolveHandlerFunc(requestContext: Config, responseContext: Config, funcName: string) {
+    responseContext = responseContext || new Config({});
     return responseContext.getIf(funcName)
         .orElseLazy(() =>requestContext.getIf(funcName).value)
         .orElse(EMPTY_FUNC).value;
@@ -89,6 +90,52 @@ export function resolveViewId(form: DQ): string {
     return form.id.value.indexOf(viewStateViewId) === 0 ? viewStateViewId : "";
 }
 
+export function resolveViewRootId(form: DQ): string {
+    const viewState = form.querySelectorAll(`input[type='hidden'][name*='${$nsp(P_VIEWSTATE)}']`).attr("name").orElse("").value;
+    const divider = $faces().separatorchar;
+    const viewId = viewState.split(divider, 2)[0];
+    //different to the identifier the form id is never prepended to the viewstate
+    return viewId.indexOf($nsp(P_VIEWSTATE)) === -1 ? viewId : "";
+}
+
+/**
+ * as per jsdoc before the request it must be ensured that every post argument
+ * is prefixed with the naming container id (there is an exception in mojarra with
+ * the element=element param, which we have to follow here as well.
+ * (inputs are prefixed by name anyway normally this only affects our standard parameters)
+ * @private
+ */
+export function resoveNamingContainerMapper(internalContext: Config): (key: string, value: any) => [string, any] {
+    const isNamedViewRoot = internalContext.getIf(NAMED_VIEWROOT).isPresent();
+    if(!isNamedViewRoot) {
+        return;
+    }
+    const partialId = internalContext.getIf(NAMING_CONTAINER_ID).value;
+    const SEP = $faces().separatorchar;
+    const prefix = partialId + SEP;
+    return (key: string, value: any) => (key.indexOf(prefix) == 0) ? [key, value] : [prefix + key, value];
+}
+
+/**
+ * we provide the same for configs
+ * @param internalContext
+ */
+export function resoveConfigNamingContainerMapper(internalContext: Config): (config: Config) => ExtConfig {
+    const isNamedViewRoot = internalContext.getIf(NAMED_VIEWROOT).isPresent();
+    if(!isNamedViewRoot) {
+        return;
+    }
+    const partialId = internalContext.getIf(NAMING_CONTAINER_ID).value;
+    const SEP = $faces().separatorchar;
+    const prefix = partialId + SEP;
+    return (config: Config) => {
+        let assoc = config.stream
+            .map(([key, data]) => (key.indexOf(prefix) == 0) ? [key, data] : [prefix + key, data])
+            .collect(new AssocArrayCollector() as any);
+        return new ExtConfig(assoc);
+    }
+}
+
 export function resolveTimeout(options: Config): number {
     let getCfg = ExtLang.getLocalOrGlobalConfig;
     return options.getIf(CTX_OPTIONS_TIMEOUT).value ?? getCfg(options.value, CTX_OPTIONS_TIMEOUT, 0);

package/src/main/typescript/impl/xhrCore/Response.ts

@@ -32,7 +32,7 @@ import {
     P_VIEWBODY,
     P_VIEWHEAD,
     P_VIEWROOT,
-    PARTIAL_ID,
+    NAMING_CONTAINER_ID,
     XML_TAG_PARTIAL_RESP,
     RESPONSE_XML,
     XML_TAG_AFTER,
@@ -101,7 +101,8 @@ export module Response {
         // under or in body as identifier
 
         let partialId:string = node?.id?.value;
-        internalContext.assignIf(!!partialId, PARTIAL_ID).value = partialId; // second case mojarra
+        internalContext.assignIf(!!partialId, NAMING_CONTAINER_ID).value = partialId; // second case mojarra
+
         // there must be at least one container viewstate element resembling the viewroot that we know
         // this is named
         responseProcessor.updateNamedViewRootState();

package/src/main/typescript/impl/xhrCore/ResponseProcessor.ts

@@ -50,7 +50,7 @@ import {
     P_RENDER,
     P_RENDER_OVERRIDE,
     P_VIEWSTATE,
-    PARTIAL_ID,
+    NAMING_CONTAINER_ID,
     RESPONSE_XML,
     SEL_CLIENT_WINDOW_ELEM,
     SEL_VIEWSTATE_ELEM,
@@ -348,7 +348,7 @@ export class ResponseProcessor implements IResponseProcessor {
     fixViewStates() {
         Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_VST).orElse({}).value)
             .each(([, value]) => {
-                const namingContainerId = this.internalContext.getIf(PARTIAL_ID);
+                const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value
                 const affectedForms = this.getContainerForms(namingContainerId)
                     .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
@@ -366,7 +366,7 @@ export class ResponseProcessor implements IResponseProcessor {
     fixClientWindow() {
         Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_CLIENT_WINDOW).orElse({}).value)
             .each(([, value]) => {
-                const namingContainerId = this.internalContext.getIf(PARTIAL_ID);
+                const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value;
                 const affectedForms = this.getContainerForms(namingContainerId)
                     .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
@@ -376,7 +376,7 @@ export class ResponseProcessor implements IResponseProcessor {
     }
 
     updateNamedViewRootState() {
-        let partialId = this.internalContext.getIf(PARTIAL_ID);
+        let partialId = this.internalContext.getIf(NAMING_CONTAINER_ID);
         let namedViewRoot = this.internalContext.getIf(NAMED_VIEWROOT);
         if(partialId.isPresent() &&
             (namedViewRoot.isAbsent() ||

package/src/main/typescript/impl/xhrCore/XhrFormData.ts

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 import {ArrayCollector, Config, DQ, Lang, LazyStream, Stream} from "mona-dish";
-import {EMPTY_STR, IDENT_ALL, IDENT_FORM, P_VIEWSTATE} from "../core/Const";
+import {$nsp, EMPTY_STR, IDENT_ALL, IDENT_FORM, P_VIEWSTATE} from "../core/Const";
 import isString = Lang.isString;
 import {ExtConfig, ExtDomQuery} from "../util/ExtDomQuery";
 
 
+type ParamsMapper<V, K> = (key: V, item: K) => [V, K];
+const defaultParamsMapper: ParamsMapper<string, any> = (key, item) => [key, item];
+
 /**
  * A unified form data class
  * which builds upon our configuration.
@@ -49,15 +52,15 @@ export class XhrFormData extends Config {
      * @param executes the executes id list for the elements to being processed
      * @param partialIds partial ids to collect, to reduce the data sent down
      */
-    constructor(private dataSource: DQ | string, viewState?: string, executes?: string[], private partialIds?: string[]) {
+    constructor(private dataSource: DQ | string, private paramsMapper: ParamsMapper<string, any> = defaultParamsMapper, viewState?: string, executes?: string[], private partialIds?: string[]) {
         super({});
         //a call to getViewState before must pass the encoded line
         //a call from getViewState passes the form element as datasource,
         //so we have two call points
         // atm we basically encode twice, to keep the code leaner
-        // this will be later optmized, practically elements
-        // which are already covered by an external viewstate do not need
-        // the encoding a second time, because they are overwritten by the viewstate again
+        // this will be later optimized, practically elements
+        // which are already covered by an external ViewState do not need
+        // the encoding a second time, because they are overwritten by the ViewState again
         if (isString(dataSource)) {
             this.assignEncodedString(<string>this.dataSource);
         } else {
@@ -109,10 +112,11 @@ export class XhrFormData extends Config {
      * @param form the form holding the view state value
      */
     private applyViewState(form: DQ) {
-        let viewStateElement = form.querySelectorAllDeep(`[name*='${P_VIEWSTATE}'`);
+        let viewStateElement = form.querySelectorAllDeep(`[name*='${$nsp(P_VIEWSTATE)}'`);
         let viewState = viewStateElement.inputValue;
-        // this.appendIf(viewState.isPresent(), P_VIEWSTATE).value = viewState.value;
-        this.appendIf(viewState.isPresent(), viewStateElement.name.value).value = viewState.value;
+
+        let viewStateName = viewStateElement.name.value;
+        this.assignIf(viewState.isPresent(), viewStateName).value = [viewState.value];
     }
 
     /**
@@ -120,7 +124,7 @@ export class XhrFormData extends Config {
      * as key value entry
      * @param encoded
      */
-    assignEncodedString(encoded: string) {
+    assignEncodedString(encoded: string, overwrite = true) {
         // this code filters out empty strings as key value pairs
         let keyValueEntries = decodeURIComponent(encoded).split(/&/gi)
             .filter(item => !!(item || '')
@@ -132,7 +136,7 @@ export class XhrFormData extends Config {
      * assign a set of key value pairs passed as array ['key=val1', 'key2=val2']
      * @param keyValueEntries
      */
-    assignString(keyValueEntries: string[]) {
+    assignString(keyValueEntries: string[], overwrite = true) {
         let toMerge = new ExtConfig({});
 
         function splitToKeyVal(line: string) {
@@ -143,19 +147,20 @@ export class XhrFormData extends Config {
             return keyVal.length < 3 ? [keyVal?.[0] ?? [], keyVal?.[1] ?? []] : keyVal;
         }
 
-        //TODO fix files...
         Stream.of(...keyValueEntries)
             .map(line => splitToKeyVal(line))
             //special case of having keys without values
             .map(keyVal => fixKeyWithoutVal(keyVal))
+            .map(keyVal => this.paramsMapper(keyVal[0] as string, keyVal[1]))
             .each(keyVal => {
                 toMerge.append(keyVal[0] as string).value = keyVal?.splice(1)?.join("") ?? "";
             });
         //merge with overwrite but no append! (aka no double entries are allowed)
-        this.shallowMerge(toMerge);
+        this.shallowMerge(toMerge, overwrite);
     }
 
     /**
+     * @param paramsMapper ... pre encode the params if needed, default is to map them 1:1
      * @returns a Form data representation, this is needed for file submits
      */
     toFormData(): FormData {
@@ -175,17 +180,18 @@ export class XhrFormData extends Config {
      *
      * @param defaultStr optional default value if nothing is there to encode
      */
-    toString(defaultStr = EMPTY_STR): string {
+    toString( defaultStr = EMPTY_STR): string {
         if (this.isAbsent()) {
             return defaultStr;
         }
         let entries = LazyStream.of(...Object.keys(this.value))
             .filter(key => this.value.hasOwnProperty(key))
-            .flatMap(key => Stream.of(...this.value[key]).map(val => [key, val])
-                //we cannot encode file elements that is handled by multipart requests anyway
-                .filter(([, value]) => !(value instanceof ExtDomQuery.global().File))
-                .collect(new ArrayCollector()))
-
+            .flatMap(key => Stream.of(...this.value[key])
+                .map(val => {
+                    return this.paramsMapper(key, val)
+                }))
+            //we cannot encode file elements that is handled by multipart requests anyway
+            .filter(([, value]) => !(value instanceof ExtDomQuery.global().File))
             .map(keyVal => {
                 return `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
             })
@@ -222,8 +228,7 @@ export class XhrFormData extends Config {
          *
          */
         this.encodeSubmittableFields(this, <DQ>this.dataSource, this.partialIds);
-
-        if (this.getIf(P_VIEWSTATE).isPresent()) {
+        if (this.getIf($nsp(P_VIEWSTATE)).isPresent()) {
             return;
         }
 
@@ -251,13 +256,27 @@ export class XhrFormData extends Config {
         }
 
         //lets encode the form elements
-        this.shallowMerge(toEncode.deepElements.encodeFormElement());
+        let formElements = toEncode.deepElements.encodeFormElement();
+        const mapped = this.remapKeysForNamingContainer(formElements);
+        this.shallowMerge(mapped);
     }
 
-    private appendInputs(ret: any) {
-        Stream.of(...Object.keys(this.value))
-            .each(key => {
-                Stream.of(...this.value[key]).each(item => ret.append(key, item));
+    private remapKeysForNamingContainer(formElements: Config): Config {
+        let ret = new Config({});
+        formElements.stream
+            .map(([key, item]) => this.paramsMapper(key, item))
+            .each( ([key, item]) => {
+                ret.assign(key).value = item;
             });
+        return ret;
+    }
+
+    private appendInputs(ret: any) {
+        Stream.ofAssoc(this.value)
+            .flatMap(([key, item]) =>
+                Stream.of(...(item as Array<any>)).map(item => {
+                    return {key, item};
+                }))
+            .each(({key, item}) => ret.append(key, item))
     }
 }

package/src/main/typescript/impl/xhrCore/XhrRequest.ts

@@ -15,7 +15,7 @@
  */
 
 import {AsyncRunnable} from "../util/AsyncRunnable";
-import {Config, DQ, Stream} from "mona-dish";
+import {Config, DQ, DQ$, Stream} from "mona-dish";
 import {Implementation} from "../AjaxImpl";
 
 import {XhrFormData} from "./XhrFormData";
@@ -23,7 +23,7 @@ import {ErrorData} from "./ErrorData";
 import {EventData} from "./EventData";
 import {ExtLang} from "../util/Lang";
 import {
-    $faces,
+    $faces, $nsp,
     BEGIN,
     COMPLETE,
     CONTENT_TYPE,
@@ -31,10 +31,10 @@ import {
     CTX_PARAM_REQ_PASS_THR,
     ERROR,
     HEAD_FACES_REQ,
-    MALFORMEDXML,
+    MALFORMEDXML, NAMED_VIEWROOT,
     NO_TIMEOUT,
     ON_ERROR,
-    ON_EVENT, P_EXECUTE, P_PARTIAL_SOURCE,
+    ON_EVENT, P_EXECUTE, P_PARTIAL_SOURCE, P_VIEWSTATE, NAMING_CONTAINER_ID,
     REQ_ACCEPT,
     REQ_TYPE_GET,
     REQ_TYPE_POST, SOURCE,
@@ -43,9 +43,15 @@ import {
     URL_ENCODED,
     VAL_AJAX
 } from "../core/Const";
-import {resolveFinalUrl, resolveHandlerFunc} from "./RequestDataResolver";
+import {
+    resolveFinalUrl,
+    resolveHandlerFunc,
+    resolveViewRootId, resoveConfigNamingContainerMapper,
+    resoveNamingContainerMapper
+} from "./RequestDataResolver";
 import failSaveExecute = ExtLang.failSaveExecute;
 import {ExtConfig} from "../util/ExtDomQuery";
+import {ResponseProcessor} from "./ResponseProcessor";
 
 /**
  * Faces XHR Request Wrapper
@@ -115,10 +121,14 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         let executesArr = () => {
             return this.requestContext.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).get("none").value.split(/\s+/gi);
         };
-        try {
 
+        try {
             let formElement = this.sourceForm.getAsElem(0).value;
+
+            // by spec the viewstate must be called to provide
+            // decorated encoding capabilities
             let viewState = $faces().getViewState(formElement);
+
             // encoded we need to decode
             // We generated a base representation of the current form
             // in case someone has overloaded the viewState with additional decorators we merge
@@ -127,8 +137,12 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             // whatever the formData object delivers
             // the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
             // ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
-            // anyway TODO remove the partial ids array
-            let formData: XhrFormData = new XhrFormData(this.sourceForm, viewState, executesArr(), this.partialIdsArray);
+            // anyway
+
+            // per spec every parameter sent into the request must be naming container
+            // prefixed
+            const namingContainerMapper = resoveNamingContainerMapper(this.internalContext);
+            let formData: XhrFormData = new XhrFormData(this.sourceForm, namingContainerMapper, viewState, executesArr(), this.partialIdsArray);
 
             this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
 
@@ -142,6 +156,10 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             // information
 
             try {
+                // per spec every param sent down needs to be remapped
+                // and prefixed by the naming container id
+                let configNamingContainerMapper = resoveConfigNamingContainerMapper(this.internalContext);
+             //   requestPassThroughParams = configNamingContainerMapper(requestPassThroughParams);
                 formData.shallowMerge(requestPassThroughParams, true, true);
             } finally {
                 this.requestContext.$nspEnabled = true;
@@ -178,8 +196,9 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             // setting, they accept headers automatically
             ignoreErr(() => xhrObject.setRequestHeader(REQ_ACCEPT, STD_ACCEPT));
 
-            this.sendEvent(BEGIN);
 
+
+            this.sendEvent(BEGIN);
             this.sendRequest(formData);
 
         } catch (e) {
@@ -374,4 +393,5 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         Implementation.sendError(errorData, eventHandler);
     }
 
+
 }

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

@@ -66,6 +66,8 @@ describe('Tests on the xhr core when it starts to call the request', function ()
         const CONTENT_TYPE = "Content-Type";
         const POST = "POST";
 
+        global["debug_f"] = true;
+
         try {
 
             let button = DomQuery.byId("input_1");

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

@@ -174,11 +174,11 @@ describe('Namespacing tests', function () {
             let resultsMap = {};
             for (let val of arsArr) {
                 let keyVal = val.split("=");
-                resultsMap[keyVal[0]] = keyVal[1];
+                resultsMap[unescape(keyVal[0])] = unescape(keyVal[1]);
             }
-
-            expect(resultsMap["pass1"]).to.eq("pass1");
-            expect(resultsMap["pass2"]).to.eq("pass2");
+            const NAMING_CONTAINER_PREF = "jd_0:";
+            expect(resultsMap[NAMING_CONTAINER_PREF + "pass1"]).to.eq("pass1");
+            expect(resultsMap[NAMING_CONTAINER_PREF + "pass2"]).to.eq("pass2");
             expect(!!resultsMap["render"]).to.be.false;
             expect(!!resultsMap["execute"]).to.be.false;
 
@@ -191,10 +191,10 @@ describe('Namespacing tests', function () {
             let viewState = Stream.ofAssoc(resultsMap).filter(data => data[0].indexOf(P_VIEWSTATE) != -1).map(item => item[1]).first().value;
 
             expect(viewState).to.eq("booga");
-            expect(resultsMap[P_PARTIAL_SOURCE]).to.eq(escape("jd_0:input_2"));
-            expect(resultsMap[P_AJAX]).to.eq("true");
-            expect(resultsMap[P_RENDER]).to.eq(escape("jd_0:blarg jd_0:input_2"));
-            expect(resultsMap[P_EXECUTE]).to.eq(escape("jd_0:input_1 jd_0:input_2"));
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_PARTIAL_SOURCE]).to.eq("jd_0:input_2");
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_AJAX]).to.eq("true");
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_RENDER]).to.eq("jd_0:blarg jd_0:input_2");
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_EXECUTE]).to.eq("jd_0:input_1 jd_0:input_2");
         } finally {
             send.restore();
         }

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

@@ -225,7 +225,7 @@ describe('Tests of the various aspects of the response protocol functionality',
 
     });
 
-    it("must have updated the viewstates properly", function () {
+    it("must have updated the viewstates properly", function (done) {
         DQ.byId("cmd_eval").click();
         /*js full submit form, coming from the integration tests*/
         window.document.body.innerHTML = `<form id="j_id__v_0" name="j_id__v_0" method="post" action="/IntegrationJSTest/integrationtestsjasmine/test7-eventtest.jsf"
@@ -252,10 +252,11 @@ describe('Tests of the various aspects of the response protocol functionality',
             </changes>
         </partial-response>`);
 
-
-        expect(DQ$("[name*='jakarta.faces.ViewState']").isPresent()).to.be.true;
-
-        expect(DQ$("[name*='jakarta.faces.ViewState']").val == "RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD").to.be.true;
+        setTimeout(() => {
+            expect(DQ$("[name*='jakarta.faces.ViewState']").isPresent()).to.be.true;
+            expect(DQ$("[name*='jakarta.faces.ViewState']").val == "RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD").to.be.true;
+            done();
+        }, 100);
     });
 
 

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

@@ -228,7 +228,7 @@ describe('Tests of the various aspects of the response protocol functionality',
 
     });
 
-    it("must have updated the viewstates properly", function () {
+    it("must have updated the viewstates properly 2.3", function () {
         DQ.byId("cmd_eval").click();
         /*js full submit form, coming from the integration tests*/
         window.document.body.innerHTML = `<form id="j_id__v_0" name="j_id__v_0" method="post" action="/IntegrationJSTest/integrationtestsjasmine/test7-eventtest.jsf"
@@ -263,7 +263,7 @@ describe('Tests of the various aspects of the response protocol functionality',
     });
 
 
-    it("must have updated the viewstates properly with lenient update block", function () {
+    it("must have updated the viewstates properly with lenient update block 2.3", function () {
         DQ.byId("cmd_eval").click();
         /*js full submit form, coming from the integration tests*/
         window.document.body.innerHTML = `<form id="j_id__v_0" name="j_id__v_0" method="post" action="/IntegrationJSTest/integrationtestsjasmine/test7-eventtest.jsf"

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

@@ -84,6 +84,7 @@ describe('XhrFormData tests', function () {
       </div>
     </form>`;
 
+    global.debugf2=true;
     const xhrFormData = new XhrFormData(DQ.byId("page::form"));
     const formData = xhrFormData.toString();
 

package/target/impl/AjaxImpl.js

@@ -279,6 +279,7 @@ var Implementation;
         assignClientWindowId(form, requestCtx);
         assignExecute(options, requestCtx, form, elementId);
         assignRender(options, requestCtx, form, elementId);
+        assignNamingContainerData(internalCtx, form);
         //now we enqueue the request as asynchronous runnable into our request
         //queue and let the queue take over the rest
         Implementation.queueHandler.addRequestToQueue(elem, form, requestCtx, internalCtx, delay, timeout);
@@ -451,7 +452,9 @@ var Implementation;
         if (!element.isTag(Const_1.HTML_TAG_FORM)) {
             throw new Error(getMessage("ERR_VIEWSTATE"));
         }
-        let formData = new XhrFormData_1.XhrFormData(element);
+        const dummyContext = new mona_dish_1.Config({});
+        assignNamingContainerData(dummyContext, mona_dish_1.DQ.byId(form));
+        let formData = new XhrFormData_1.XhrFormData(element, (0, RequestDataResolver_1.resoveNamingContainerMapper)(dummyContext));
         return formData.toString();
     }
     Implementation.getViewState = getViewState;
@@ -526,6 +529,21 @@ var Implementation;
             targetContext.assign(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_CLIENT_WINDOW).value = clientWindow;
         }
     }
+    /**
+     * determines the current naming container
+     * and assigns it internally
+     *
+     * @param internalContext
+     * @param formElement
+     * @private
+     */
+    function assignNamingContainerData(internalContext, formElement) {
+        const viewRootId = (0, RequestDataResolver_1.resolveViewRootId)(formElement);
+        if (!!viewRootId) {
+            internalContext.assign(Const_1.NAMED_VIEWROOT).value = true;
+            internalContext.assign(Const_1.NAMING_CONTAINER_ID).value = viewRootId;
+        }
+    }
     /**
      * transforms the user values to the expected one
      * with the proper none all form and this handling