jsf.js_next_gen 4.0.0-RC.13 → 4.0.0-RC.14

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

@@ -20,23 +20,23 @@ import {ResponseProcessor} from "./ResponseProcessor";
 import {IResponseProcessor} from "./IResponseProcessor";
 import {
     $nsp,
-    CMD_ATTRIBUTES,
-    CMD_CHANGES,
-    CMD_DELETE,
-    CMD_ERROR,
-    CMD_EVAL,
-    CMD_EXTENSION,
-    CMD_INSERT,
-    CMD_REDIRECT,
-    CMD_UPDATE, P_RESOURCE,
+    XML_TAG_ATTRIBUTES,
+    XML_TAG_CHANGES,
+    XML_TAG_DELETE,
+    XML_TAG_ERROR,
+    XML_TAG_EVAL,
+    XML_TAG_EXTENSION,
+    XML_TAG_INSERT,
+    XML_TAG_REDIRECT,
+    XML_TAG_UPDATE, P_RESOURCE,
     P_VIEWBODY,
     P_VIEWHEAD,
     P_VIEWROOT,
     PARTIAL_ID,
-    RESP_PARTIAL,
+    XML_TAG_PARTIAL_RESP,
     RESPONSE_XML,
-    TAG_AFTER,
-    TAG_BEFORE
+    XML_TAG_AFTER,
+    XML_TAG_BEFORE
 } from "../core/Const";
 import {resolveContexts, resolveResponseXML} from "./ResonseDataResolver";
 import {ExtConfig} from "../util/ExtDomQuery";
@@ -67,7 +67,7 @@ export module Response {
         internalContext.assign(RESPONSE_XML).value = responseXML;
 
         // we now process the partial tags, or in none given raise an error
-        responseXML.querySelectorAll(RESP_PARTIAL)
+        responseXML.querySelectorAll(XML_TAG_PARTIAL_RESP)
             .each(item => processPartialTag(<XMLQuery>item, responseProcessor, internalContext));
 
         // We now process the viewStates, client windows and the elements to be evaluated are delayed.
@@ -89,18 +89,18 @@ export module Response {
      function processPartialTag(node: XMLQuery, responseProcessor: IResponseProcessor, internalContext) {
 
         internalContext.assign(PARTIAL_ID).value = node.id;
-        const SEL_SUB_TAGS = [CMD_ERROR, CMD_REDIRECT, CMD_CHANGES].join(",");
+        const SEL_SUB_TAGS = [XML_TAG_ERROR, XML_TAG_REDIRECT, XML_TAG_CHANGES].join(",");
 
         // now we can process the main operations
         node.querySelectorAll(SEL_SUB_TAGS).each((node: XMLQuery) => {
             switch (node.tagName.value) {
-                case CMD_ERROR:
+                case XML_TAG_ERROR:
                     responseProcessor.error(node);
                     break;
-                case CMD_REDIRECT:
+                case XML_TAG_REDIRECT:
                     responseProcessor.redirect(node);
                     break;
-                case CMD_CHANGES:
+                case XML_TAG_CHANGES:
                     processChangesTag(node, responseProcessor);
                     break;
             }
@@ -110,7 +110,7 @@ export module Response {
 
     let processInsert = function (responseProcessor: IResponseProcessor, node: XMLQuery) {
          // path1 insert after as child tags
-         if(node.querySelectorAll([TAG_BEFORE, TAG_AFTER].join(",")).length) {
+         if(node.querySelectorAll([XML_TAG_BEFORE, XML_TAG_AFTER].join(",")).length) {
              responseProcessor.insertWithSubTags(node);
          } else { // insert before after with id
              responseProcessor.insert(node);
@@ -125,31 +125,31 @@ export module Response {
      * @param responseProcessor
      */
      function processChangesTag(node: XMLQuery, responseProcessor: IResponseProcessor): boolean {
-        const ALLOWED_TAGS = [CMD_UPDATE, CMD_EVAL, CMD_INSERT, CMD_DELETE, CMD_ATTRIBUTES, CMD_EXTENSION].join(", ");
+        const ALLOWED_TAGS = [XML_TAG_UPDATE, XML_TAG_EVAL, XML_TAG_INSERT, XML_TAG_DELETE, XML_TAG_ATTRIBUTES, XML_TAG_EXTENSION].join(", ");
         node.querySelectorAll(ALLOWED_TAGS).each(
             (node: XMLQuery) => {
                 switch (node.tagName.value) {
-                    case CMD_UPDATE:
+                    case XML_TAG_UPDATE:
                         processUpdateTag(node, responseProcessor);
                         break;
 
-                    case CMD_EVAL:
+                    case XML_TAG_EVAL:
                         responseProcessor.eval(node);
                         break;
 
-                    case CMD_INSERT:
+                    case XML_TAG_INSERT:
                         processInsert(responseProcessor, node);
                         break;
 
-                    case CMD_DELETE:
+                    case XML_TAG_DELETE:
                         responseProcessor.delete(node);
                         break;
 
-                    case CMD_ATTRIBUTES:
+                    case XML_TAG_ATTRIBUTES:
                         responseProcessor.attributes(node);
                         break;
 
-                    case CMD_EXTENSION:
+                    case XML_TAG_EXTENSION:
                         break;
                 }
             }

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {Config, DomQueryCollector, DQ, DQ$, Lang, LazyStream, Stream, XMLQuery} from "mona-dish";
+import {Config, DomQuery, DomQueryCollector, DQ, DQ$, Lang, LazyStream, Stream, XMLQuery} from "mona-dish";
 import {Implementation} from "../AjaxImpl";
 import {Assertions} from "../util/Assertions";
 import {IResponseProcessor} from "./IResponseProcessor";
@@ -23,6 +23,7 @@ import {StateHolder} from "../core/ImplTypes";
 import {EventData} from "./EventData";
 
 import {
+    $faces,
     $nsp,
     APPLIED_CLIENT_WINDOW,
     APPLIED_VST,
@@ -30,31 +31,40 @@ import {
     ATTR_NAME,
     ATTR_URL,
     ATTR_VALUE,
+    DEFERRED_HEAD_INSERTS,
     EMPTY_FUNC,
     EMPTY_STR,
     ERROR_MESSAGE,
     ERROR_NAME,
-    HTML_VIEWSTATE,
+    HTML_TAG_BODY,
+    HTML_TAG_FORM,
+    HTML_TAG_HEAD,
+    HTML_TAG_LINK,
+    HTML_TAG_SCRIPT,
+    HTML_TAG_STYLE, IDENT_ALL, IDENT_NONE,
     ON_ERROR,
-    ON_EVENT, P_CLIENT_WINDOW,
+    ON_EVENT,
+    P_CLIENT_WINDOW,
+    P_EXECUTE,
     P_PARTIAL_SOURCE,
+    P_RENDER,
+    P_RENDER_OVERRIDE,
     P_VIEWSTATE,
-    RESPONSE_XML, SEL_CLIENT_WINDOW_ELEM,
+    PARTIAL_ID,
+    RESPONSE_XML,
+    SEL_CLIENT_WINDOW_ELEM,
     SEL_VIEWSTATE_ELEM,
     SOURCE,
     SUCCESS,
-    TAG_AFTER,
-    TAG_ATTR,
-    TAG_BEFORE,
-    TAG_BODY,
-    TAG_FORM,
-    TAG_HEAD,
     UPDATE_ELEMS,
     UPDATE_FORMS,
-    DEFERRED_HEAD_INSERTS, PARTIAL_ID, P_EXECUTE, P_RENDER, HTML_CLIENT_WINDOW, P_RENDER_OVERRIDE
+    XML_TAG_AFTER,
+    XML_TAG_ATTR,
+    XML_TAG_BEFORE
 } from "../core/Const";
-import trim = Lang.trim;
 import {ExtConfig, ExtDomQuery} from "../util/ExtDomQuery";
+import {HiddenInputBuilder} from "../util/HiddenInputBuilder";
+import trim = Lang.trim;
 
 
 /**
@@ -81,11 +91,11 @@ export class ResponseProcessor implements IResponseProcessor {
      * the data incoming must represent the html representation of the head itself one way or the other
      */
     replaceHead(shadowDocument: XMLQuery | DQ) {
-        let shadowHead = shadowDocument.querySelectorAll(TAG_HEAD);
+        const shadowHead = shadowDocument.querySelectorAll(HTML_TAG_HEAD);
         if (!shadowHead.isPresent()) {
             return;
         }
-        let head = ExtDomQuery.querySelectorAll(TAG_HEAD);
+        const head = ExtDomQuery.querySelectorAll(HTML_TAG_HEAD);
         // full replace we delete everything
         head.childNodes.delete();
         this.addToHead(shadowHead);
@@ -93,14 +103,14 @@ export class ResponseProcessor implements IResponseProcessor {
 
     addToHead(shadowHead: XMLQuery | DQ) {
         const mappedHeadData = new ExtDomQuery(shadowHead);
-        const postProcessTags = ["STYLE", "LINK", "SCRIPT"];
+        const postProcessTags = [HTML_TAG_STYLE, HTML_TAG_LINK, HTML_TAG_SCRIPT];
         const nonExecutables = mappedHeadData.filter(item => postProcessTags.indexOf(item.tagName.orElse("").value) == -1);
         nonExecutables.runHeadInserts(true);
 
         //incoming either the outer head tag or its children
         const nodesToAdd = (shadowHead.tagName.value === "HEAD") ? shadowHead.childNodes : shadowHead;
-        // this is stored for post processing
-        // after the rest of the "pyhsical build up", head before body
+        // this is stored for "post" processing
+        // after the rest of the "physical build up", head before body
         const evalElements = nodesToAdd.stream
             .filter(item => postProcessTags.indexOf(item.tagName.orElse("").value) != -1).collect(new DomQueryCollector());
         this.addToHeadDeferred(evalElements);
@@ -120,20 +130,20 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     replaceBody(shadowDocument: XMLQuery | DQ) {
 
-        let shadowBody = shadowDocument.querySelectorAll(TAG_BODY);
+        const shadowBody = shadowDocument.querySelectorAll(HTML_TAG_BODY);
         if (!shadowBody.isPresent()) {
             return;
         }
 
-        let shadowInnerHTML: string = <string>shadowBody.html().value;
+        const shadowInnerHTML: string = <string>shadowBody.innerHTML;
 
-        let resultingBody = <DQ>ExtDomQuery.querySelectorAll(TAG_BODY).html(shadowInnerHTML);
-        let updateForms = resultingBody.querySelectorAll(TAG_FORM);
+        const resultingBody = <DQ>ExtDomQuery.querySelectorAll(HTML_TAG_BODY);
+        const updateForms = resultingBody.querySelectorAll(HTML_TAG_FORM);
 
         // main difference, we cannot replace the body itself, but only its content
         // we need a separate step for post-processing the incoming
         // attributes, like classes, styles etc...
-        resultingBody.copyAttrs(shadowBody);
+        (resultingBody.html(shadowInnerHTML) as DQ).copyAttrs(shadowBody);
         this.externalContext.assign($nsp(P_RENDER_OVERRIDE)).value = "@all";
         this.storeForPostProcessing(updateForms, resultingBody);
     }
@@ -161,18 +171,18 @@ export class ResponseProcessor implements IResponseProcessor {
          * <error>
          */
 
-        let mergedErrorData = new ExtConfig({});
+        const mergedErrorData = new ExtConfig({});
         mergedErrorData.assign(SOURCE).value = this.externalContext.getIf(P_PARTIAL_SOURCE).get(0).value;
         mergedErrorData.assign(ERROR_NAME).value = node.querySelectorAll(ERROR_NAME).textContent(EMPTY_STR);
         mergedErrorData.assign(ERROR_MESSAGE).value = node.querySelectorAll(ERROR_MESSAGE).cDATAAsString;
 
-        let hasResponseXML = this.internalContext.get(RESPONSE_XML).isPresent();
+        const hasResponseXML = this.internalContext.get(RESPONSE_XML).isPresent();
 
         //we now store the response xml also in the error data for further details
         mergedErrorData.assignIf(hasResponseXML, RESPONSE_XML).value = this.internalContext.getIf(RESPONSE_XML).value.get(0).value;
 
         // error post-processing and enrichment (standard messages from keys)
-        let errorData = ErrorData.fromServerError(mergedErrorData);
+        const errorData = ErrorData.fromServerError(mergedErrorData);
 
         // we now trigger an internally stored onError function which might be an attached to the context
         // either we do not have an internal on error, or an on error has been based via params from the outside.
@@ -190,7 +200,7 @@ export class ResponseProcessor implements IResponseProcessor {
     redirect(node: XMLQuery) {
         Assertions.assertUrlExists(node);
 
-        let redirectUrl = trim(node.attr(ATTR_URL).value);
+        const redirectUrl = trim(node.attr(ATTR_URL).value);
         if (redirectUrl != EMPTY_STR) {
             window.location.href = redirectUrl;
         }
@@ -202,8 +212,8 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param cdataBlock the cdata block with the new html code
      */
     update(node: XMLQuery, cdataBlock: string) {
-        let result = ExtDomQuery.byId(node.id.value, true).outerHTML(cdataBlock, false, false);
-        let sourceForm = result?.firstParent(TAG_FORM).orElseLazy(() => result.byTagName(TAG_FORM, true));
+        const result = ExtDomQuery.byId(node.id.value, true).outerHTML(cdataBlock, false, false);
+        const sourceForm = result?.firstParent(HTML_TAG_FORM).orElseLazy(() => result.byTagName(HTML_TAG_FORM, true));
         if (sourceForm) {
             this.storeForPostProcessing(sourceForm, result);
         }
@@ -223,9 +233,9 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param node
      */
     attributes(node: XMLQuery) {
-        let elem = DQ.byId(node.id.value, true);
+        const elem = DQ.byId(node.id.value, true);
 
-        node.byTagName(TAG_ATTR).each((item: XMLQuery) => {
+        node.byTagName(XML_TAG_ATTR).each((item: XMLQuery) => {
             elem.attr(item.attr(ATTR_NAME).value).value = item.attr(ATTR_VALUE).value;
         });
     }
@@ -246,17 +256,17 @@ export class ResponseProcessor implements IResponseProcessor {
     insert(node: XMLQuery) {
         //let insertId = node.id; //not used atm
 
-        let before = node.attr(TAG_BEFORE);
-        let after = node.attr(TAG_AFTER);
+        const before = node.attr(XML_TAG_BEFORE);
+        const after = node.attr(XML_TAG_AFTER);
 
-        let insertNodes = DQ.fromMarkup(<any>node.cDATAAsString);
+        const insertNodes = DQ.fromMarkup(<any>node.cDATAAsString);
 
         if (before.isPresent()) {
             DQ.byId(before.value, true).insertBefore(insertNodes);
             this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
         }
         if (after.isPresent()) {
-            let domQuery = DQ.byId(after.value, true);
+            const domQuery = DQ.byId(after.value, true);
             domQuery.insertAfter(insertNodes);
 
             this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
@@ -269,12 +279,12 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param node the node hosting the insert data
      */
     insertWithSubTags(node: XMLQuery) {
-        let before = node.querySelectorAll(TAG_BEFORE);
-        let after = node.querySelectorAll(TAG_AFTER);
+        const before = node.querySelectorAll(XML_TAG_BEFORE);
+        const after = node.querySelectorAll(XML_TAG_AFTER);
 
         before.each(item => {
-            let insertId = item.attr(ATTR_ID);
-            let insertNodes = DQ.fromMarkup(<any>item.cDATAAsString);
+            const insertId = item.attr(ATTR_ID);
+            const insertNodes = DQ.fromMarkup(<any>item.cDATAAsString);
             if (insertId.isPresent()) {
                 DQ.byId(insertId.value, true).insertBefore(insertNodes);
                 this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
@@ -282,8 +292,8 @@ export class ResponseProcessor implements IResponseProcessor {
         });
 
         after.each(item => {
-            let insertId = item.attr(ATTR_ID);
-            let insertNodes = DQ.fromMarkup(<any>item.cDATAAsString);
+            const insertId = item.attr(ATTR_ID);
+            const insertNodes = DQ.fromMarkup(<any>item.cDATAAsString);
             if (insertId.isPresent()) {
                 DQ.byId(insertId.value, true).insertAfter(insertNodes);
                 this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
@@ -298,7 +308,7 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     processViewState(node: XMLQuery): boolean {
         if (ResponseProcessor.isViewStateNode(node)) {
-            let state = node.cDATAAsString;
+            const state = node.cDATAAsString;
             this.internalContext.assign(APPLIED_VST, node.id.value).value = new StateHolder($nsp(node.id.value), state);
             return true;
         }
@@ -307,7 +317,7 @@ export class ResponseProcessor implements IResponseProcessor {
 
     processClientWindow(node: XMLQuery): boolean {
         if (ResponseProcessor.isClientWindowNode(node)) {
-            let state = node.cDATAAsString;
+            const state = node.cDATAAsString;
             this.internalContext.assign(APPLIED_CLIENT_WINDOW, node.id.value).value = new StateHolder($nsp(node.id.value), state);
             return true;
         }
@@ -336,15 +346,12 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     fixViewStates() {
         Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_VST).orElse({}).value)
-            .each((item: Array<any>) => {
-                let value: StateHolder = item[1];
-                let namingContainerId = this.internalContext.getIf(PARTIAL_ID);
-                let affectedForms;
-
-                affectedForms = this.getContainerForms(namingContainerId)
-                    .filter(affectedForm => this.executeOrRenderFilter(affectedForm));
+            .each(([, value]) => {
+                const namingContainerId = this.internalContext.getIf(PARTIAL_ID);
+                const affectedForms = this.getContainerForms(namingContainerId)
+                    .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
 
-                this.appendViewStateToForms(affectedForms, value.value);
+                this.appendViewStateToForms(affectedForms, value.value, namingContainerId.orElse("").value);
             });
     }
 
@@ -356,15 +363,12 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     fixClientWindow() {
         Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_CLIENT_WINDOW).orElse({}).value)
-            .each((item: Array<any>) => {
-                const value: StateHolder = item[1];
+            .each(([, value]) => {
                 const namingContainerId = this.internalContext.getIf(PARTIAL_ID);
-                let affectedForms;
-
-                affectedForms = this.getContainerForms(namingContainerId)
-                    .filter(affectedForm => this.executeOrRenderFilter(affectedForm));
+                const affectedForms = this.getContainerForms(namingContainerId)
+                    .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
 
-                this.appendClientWindowToForms(affectedForms, value.value);
+                this.appendClientWindowToForms(affectedForms, value.value, namingContainerId.orElse("").value);
             });
     }
 
@@ -372,10 +376,10 @@ export class ResponseProcessor implements IResponseProcessor {
      * all processing done we can close the request and send the appropriate events
      */
     done() {
-        let eventData = EventData.createFromRequest(this.request.value, this.externalContext, SUCCESS);
+        const eventData = EventData.createFromRequest(this.request.value, this.externalContext, SUCCESS);
 
         //because some frameworks might decorate them over the context in the response
-        let eventHandler = this.externalContext.getIf(ON_EVENT).orElseLazy(() => this.internalContext.getIf(ON_EVENT).value).orElse(EMPTY_FUNC).value;
+        const eventHandler = this.externalContext.getIf(ON_EVENT).orElseLazy(() => this.internalContext.getIf(ON_EVENT).value).orElse(EMPTY_FUNC).value;
         Implementation.sendEvent(eventData, eventHandler);
     }
 
@@ -384,9 +388,10 @@ export class ResponseProcessor implements IResponseProcessor {
      *
      * @param forms the forms to append the viewState to
      * @param viewState the final viewState
+     * @param namingContainerId
      */
-    private appendViewStateToForms(forms: DQ, viewState: string) {
-        this.assignState(forms, $nsp(SEL_VIEWSTATE_ELEM), viewState);
+    private appendViewStateToForms(forms: DQ, viewState: string, namingContainerId = "") {
+        this.assignState(forms, $nsp(SEL_VIEWSTATE_ELEM), viewState, namingContainerId);
     }
 
 
@@ -395,9 +400,10 @@ export class ResponseProcessor implements IResponseProcessor {
      *
      * @param forms the forms to append the viewState to
      * @param clientWindow the final viewState
+     * @param namingContainerId
      */
-    private appendClientWindowToForms(forms: DQ, clientWindow: string) {
-        this.assignState(forms, $nsp(SEL_CLIENT_WINDOW_ELEM), clientWindow);
+    private appendClientWindowToForms(forms: DQ, clientWindow: string, namingContainerId = "") {
+        this.assignState(forms, $nsp(SEL_CLIENT_WINDOW_ELEM), clientWindow, namingContainerId);
     }
 
     /**
@@ -407,45 +413,28 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param selector the selector for the state
      * @param state the state itself which needs to be assigned
      *
+     * @param namingContainerId
      * @private
      */
-    private assignState(forms: DQ, selector: string, state: string) {
-        forms.each((form: DQ) => {
-            let stateHolders = form.querySelectorAll(selector)
-                .orElseLazy(() => {
-                    return selector.indexOf("ViewState") != -1 ?
-                        ResponseProcessor.newViewStateElement(form):
-                        ResponseProcessor.newClientWindowElement(form);
-                });
-
-            stateHolders.attr("value").value = state;
+    private assignState(forms: DQ, selector: string, state: string, namingContainerId: string) {
+        /**
+         * creates the viewState or client window id element
+         * @param form
+         */
+        const createAndAppendHiddenInput = (form: DomQuery)  => {
+            return new HiddenInputBuilder(selector)
+                .withNamingContainerId(namingContainerId)
+                .withParent(form)
+                .build();
+        };
+
+        forms.each(form => {
+            const hiddenInput = form.querySelectorAll(selector)
+                .orElseLazy(() => createAndAppendHiddenInput(form));
+            hiddenInput.val = state;
         });
     }
 
-    /**
-     * Helper to Create a new JSF ViewState Element
-     *
-     * @param parent, the parent node to attach the viewState element to
-     * (usually a form node)
-     */
-    private static newViewStateElement(parent: DQ): DQ {
-        let newElement = DQ.fromMarkup($nsp(HTML_VIEWSTATE));
-        newElement.appendTo(parent);
-        return newElement;
-    }
-
-    /**
-     * Helper to Create a new JSF ViewState Element
-     *
-     * @param parent, the parent node to attach the viewState element to
-     * (usually a form node)
-     */
-    private static newClientWindowElement(parent: DQ): DQ {
-        let newElement = DQ.fromMarkup($nsp(HTML_CLIENT_WINDOW));
-        newElement.appendTo(parent);
-        return newElement;
-    }
-
     /**
      * Stores certain aspects of the dom for later post-processing
      *
@@ -482,10 +471,10 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns if it is a viewState node
      */
     private static isViewStateNode(node: XMLQuery): boolean {
-        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
+        const SEP = $faces().separatorchar;
         return "undefined" != typeof node?.id?.value && (node?.id?.value == $nsp(P_VIEWSTATE) ||
-            node?.id?.value?.indexOf([separatorChar, $nsp(P_VIEWSTATE)].join(EMPTY_STR)) != -1 ||
-            node?.id?.value?.indexOf([$nsp(P_VIEWSTATE), separatorChar].join(EMPTY_STR)) != -1);
+            node?.id?.value?.indexOf([SEP, $nsp(P_VIEWSTATE)].join(EMPTY_STR)) != -1 ||
+            node?.id?.value?.indexOf([$nsp(P_VIEWSTATE), SEP].join(EMPTY_STR)) != -1);
     }
 
     /**
@@ -495,10 +484,10 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns true of it ii
      */
     private static isClientWindowNode(node: XMLQuery): boolean {
-        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
+        const SEP =  $faces().separatorchar;
         return "undefined" != typeof node?.id?.value && (node?.id?.value == $nsp(P_CLIENT_WINDOW) ||
-            node?.id?.value?.indexOf([separatorChar, $nsp(P_CLIENT_WINDOW)].join(EMPTY_STR)) != -1 ||
-            node?.id?.value?.indexOf([$nsp(P_CLIENT_WINDOW), separatorChar].join(EMPTY_STR)) != -1);
+            node?.id?.value?.indexOf([SEP, $nsp(P_CLIENT_WINDOW)].join(EMPTY_STR)) != -1 ||
+            node?.id?.value?.indexOf([$nsp(P_CLIENT_WINDOW), SEP].join(EMPTY_STR)) != -1);
     }
 
     private triggerOnError(errorData: ErrorData) {
@@ -510,25 +499,22 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param affectedForm
      * @private
      */
-    private executeOrRenderFilter(affectedForm) {
-        let executes = this.externalContext.getIf($nsp(P_EXECUTE)).orElse("@none").value.split(/\s+/gi);
-        let renders = this.externalContext.getIf(P_RENDER_OVERRIDE)
+    private isInExecuteOrRender(affectedForm) {
+        const executes = this.externalContext.getIf($nsp(P_EXECUTE)).orElse("@none").value.split(/\s+/gi);
+        const renders = this.externalContext.getIf(P_RENDER_OVERRIDE)
             .orElseLazy(() => this.externalContext.getIf($nsp(P_RENDER)).value)
-            .orElse("@none").value.split(/\s+/gi);
-        let executeAndRenders = executes.concat(...renders);
+            .orElse(IDENT_NONE).value.split(/\s+/gi);
+        const executeAndRenders = executes.concat(...renders);
         return LazyStream.of(...executeAndRenders).filter(nameOrId => {
-            if (nameOrId == "@all") {
-                return true;
-            }
-            if (nameOrId == "@none") {
+            if ([IDENT_ALL, IDENT_NONE].indexOf(nameOrId) != -1) {
                 return true;
             }
 
-            const nameOrIdSelector = `[id='${nameOrId}'], [name='#${nameOrId}']`;
+            const NAME_OR_ID = this.getNameOrIdSelector(nameOrId);
             //either the form directly is in execute or render or one of its children or one of its parents
-            return affectedForm.matchesSelector(nameOrIdSelector) ||
-                affectedForm.querySelectorAll(nameOrIdSelector).isPresent() ||
-                affectedForm.firstParent(nameOrIdSelector).isPresent();
+            return affectedForm.matchesSelector(NAME_OR_ID) ||
+                affectedForm.querySelectorAll(NAME_OR_ID).isPresent() ||
+                affectedForm.firstParent(NAME_OR_ID).isPresent();
         }).first().isPresent();
     }
 
@@ -540,14 +526,17 @@ export class ResponseProcessor implements IResponseProcessor {
     private getContainerForms(namingContainerId: Config) {
         if (namingContainerId.isPresent()) {
             //naming container mode, all forms under naming container id must be processed
-            return DQ.byId(namingContainerId.value)
-                .orElse(DQ$(`form[id='${namingContainerId.value}'], form[name='${namingContainerId.value}']`))
+            return DQ$(this.getNameOrIdSelector(namingContainerId.value))
                 // missing condition if the naming container is not present we have to
                 // use the body as fallback
-                .orElse(DQ.byTagName(TAG_BODY))
-                .byTagName(TAG_FORM, true);
+                .orElseLazy(() => DQ.byTagName(HTML_TAG_BODY))
+                .byTagName(HTML_TAG_FORM, true);
         } else {
-            return DQ.byTagName(TAG_FORM);
+            return DQ.byTagName(HTML_TAG_FORM);
         }
     }
+
+    private getNameOrIdSelector(nameOrId) {
+        return `[id='${nameOrId}'], [name='${nameOrId}']`;
+    }
 }

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

@@ -109,7 +109,7 @@ export class XhrFormData extends Config {
      * @param form the form holding the view state value
      */
     private applyViewState(form: DQ) {
-        let viewState = form.byId(P_VIEWSTATE, true).inputValue;
+        let viewState = form.querySelectorAllDeep(`[name*='${P_VIEWSTATE}'`).inputValue;
         this.appendIf(viewState.isPresent(), P_VIEWSTATE).value = viewState.value;
     }
 

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

@@ -23,11 +23,12 @@ import {ErrorData} from "./ErrorData";
 import {EventData} from "./EventData";
 import {ExtLang} from "../util/Lang";
 import {
+    $faces,
     BEGIN,
     COMPLETE,
     CONTENT_TYPE,
     CTX_PARAM_MF_INTERNAL,
-    CTX_PARAM_PASS_THR,
+    CTX_PARAM_REQ_PASS_THR,
     ERROR,
     HEAD_FACES_REQ,
     MALFORMEDXML,
@@ -111,12 +112,12 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         let xhrObject = this.xhrObject;
 
         let executesArr = () => {
-            return this.requestContext.getIf(CTX_PARAM_PASS_THR, P_EXECUTE).get("none").value.split(/\s+/gi);
+            return this.requestContext.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).get("none").value.split(/\s+/gi);
         };
         try {
 
             let formElement = this.sourceForm.getAsElem(0).value;
-            let viewState = (window?.faces ?? window?.jsf).getViewState(formElement);
+            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
@@ -132,14 +133,14 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
 
             // next step the pass through parameters are merged in for post params
             let requestContext = this.requestContext;
-            let passThroughParams = requestContext.getIf(CTX_PARAM_PASS_THR);
+            let requestPassThroughParams = requestContext.getIf(CTX_PARAM_REQ_PASS_THR);
 
             // this is an extension where we allow pass through parameters to be sent down additionally
             // this can be used and is used in the impl to enrich the post request parameters with additional
             // information
-            formData.shallowMerge(passThroughParams, true, true);
+            formData.shallowMerge(requestPassThroughParams, true, true);
 
-            this.responseContext = passThroughParams.deepCopy;
+            this.responseContext = requestPassThroughParams.deepCopy;
 
             // we have to shift the internal passthroughs around to build up our response context
             let responseContext = this.responseContext;
@@ -290,7 +291,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             return;
         }
 
-        (window?.faces ?? window.jsf).ajax.response(this.xhrObject, this.responseContext.value ?? {});
+        $faces().ajax.response(this.xhrObject, this.responseContext.value ?? {});
     }
 
     private handleMalFormedXML(resolve: Function) {