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

package/dist/window/faces-development.js

@@ -340,6 +340,12 @@ class DomQuery {
     set val(value) {
         this.inputValue.value = value;
     }
+    get nodeId() {
+        return this.id.value;
+    }
+    set nodeId(value) {
+        this.id.value = value;
+    }
     get checked() {
         return Stream_1.Stream.of(...this.values).allMatch(el => !!el.checked);
     }
@@ -4076,7 +4082,7 @@ var myfaces;
             options[(0, Const_1.$nsp)(Const_1.P_BEHAVIOR_EVENT)] = eventName;
         }
         if (execute) {
-            options[Const_1.CTX_PARAM_EXECUTE] = execute;
+            options[Const_1.CTX_OPTIONS_EXECUTE] = execute;
         }
         if (render) {
             options[Const_1.CTX_PARAM_RENDER] = render;
@@ -4305,7 +4311,9 @@ var Implementation;
      */
     function request(el, event, opts) {
         var _a, _b, _c;
-        const { resolvedEvent, options, elem, elementId, requestCtx, internalCtx, windowId, isResetValues } = (0, RequestDataResolver_1.resolveDefaults)(event, opts, el);
+        const { options, elem, elementId, windowId, isResetValues } = (0, RequestDataResolver_1.resolveDefaults)(event, opts, el);
+        const requestCtx = new ExtDomQuery_1.ExtConfig({});
+        const internalCtx = new ExtDomQuery_1.ExtConfig({});
         Assertions_1.Assertions.assertRequestIntegrity(options, elem);
         /**
          * fetch the parent form
@@ -4314,22 +4322,24 @@ var Implementation;
          * so that people can use dummy forms and work
          * with detached objects
          */
-        const form = (0, RequestDataResolver_1.resolveForm)(requestCtx, elem, resolvedEvent);
+        const form = (0, RequestDataResolver_1.resolveForm)(elem, event);
+        const viewId = (0, RequestDataResolver_1.resolveViewId)(form);
         const formId = form.id.value;
         const delay = (0, RequestDataResolver_1.resolveDelay)(options);
         const timeout = (0, RequestDataResolver_1.resolveTimeout)(options);
         requestCtx.assignIf(!!windowId, Const_1.P_WINDOW_ID).value = windowId;
         // old non spec behavior will be removed after it is clear whether the removal breaks any code
-        requestCtx.assign(Const_1.CTX_PARAM_PASS_THR).value = filterPassThroughValues(options.value);
+        requestCtx.assign(Const_1.CTX_PARAM_REQ_PASS_THR).value = extractLegacyParams(options.value);
         // spec conform behavior, all passthrough params must be under "passthrough
-        const params = remapArrayToAssocArr(options.getIf(Const_1.CTX_PARAM_SPEC_PARAMS).orElse({}).value);
-        requestCtx.getIf(Const_1.CTX_PARAM_PASS_THR).shallowMerge(new mona_dish_1.Config(params), true);
-        requestCtx.assignIf(!!resolvedEvent, Const_1.CTX_PARAM_PASS_THR, Const_1.P_EVT).value = resolvedEvent === null || resolvedEvent === void 0 ? void 0 : resolvedEvent.type;
+        const params = remapArrayToAssocArr(options.getIf(Const_1.CTX_OPTIONS_PARAMS).orElse({}).value);
+        requestCtx.getIf(Const_1.CTX_PARAM_REQ_PASS_THR).shallowMerge(new mona_dish_1.Config(params), true);
+        requestCtx.assignIf(!!event, Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EVT).value = event === null || event === void 0 ? void 0 : event.type;
         /**
          * ajax pass through context with the source
          * onresolved Event and onerror Event
          */
         requestCtx.assign(Const_1.SOURCE).value = elementId;
+        requestCtx.assign(Const_1.VIEW_ID).value = viewId;
         /**
          * on resolvedEvent and onError...
          * those values will be traversed later on
@@ -4344,11 +4354,11 @@ var Implementation;
         /**
          * binding contract the jakarta.faces.source must be set
          */
-        requestCtx.assign(Const_1.CTX_PARAM_PASS_THR, Const_1.P_PARTIAL_SOURCE).value = elementId;
+        requestCtx.assign(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_PARTIAL_SOURCE).value = elementId;
         /**
          * jakarta.faces.partial.ajax must be set to true
          */
-        requestCtx.assign(Const_1.CTX_PARAM_PASS_THR, Const_1.P_AJAX).value = true;
+        requestCtx.assign(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_AJAX).value = true;
         /**
          * if resetValues is set to true
          * then we have to set jakarta.faces.resetValues as well
@@ -4356,7 +4366,7 @@ var Implementation;
          * the value has to be explicitly true, according to
          * the specs jsdoc
          */
-        requestCtx.assignIf(isResetValues, Const_1.CTX_PARAM_PASS_THR, Const_1.P_RESET_VALUES).value = true;
+        requestCtx.assignIf(isResetValues, Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_RESET_VALUES).value = true;
         // additional meta information to speed things up, note internal non jsf
         // pass through options are stored under _mfInternal in the context
         internalCtx.assign(Const_1.CTX_PARAM_SRC_FRM_ID).value = formId;
@@ -4365,9 +4375,8 @@ var Implementation;
         // mojarra under blackbox conditions.
         // I assume it does the same as our formId_submit=1 so leaving it out
         // won't hurt but for the sake of compatibility we are going to add it
-        requestCtx.assign(Const_1.CTX_PARAM_PASS_THR, formId).value = formId;
+        requestCtx.assign(Const_1.CTX_PARAM_REQ_PASS_THR, formId).value = formId;
         internalCtx.assign(Const_1.CTX_PARAM_SRC_CTL_ID).value = elementId;
-        internalCtx.assign(Const_1.CTX_PARAM_TR_TYPE).value = Const_1.REQ_TYPE_POST;
         assignClientWindowId(form, requestCtx);
         assignExecute(options, requestCtx, form, elementId);
         assignRender(options, requestCtx, form, elementId);
@@ -4540,7 +4549,7 @@ var Implementation;
          *  because it makes it easier to detect bugs
          */
         let element = mona_dish_1.DQ.byId(form, true);
-        if (!element.isTag(Const_1.TAG_FORM)) {
+        if (!element.isTag(Const_1.HTML_TAG_FORM)) {
             throw new Error(getMessage("ERR_VIEWSTATE"));
         }
         let formData = new XhrFormData_1.XhrFormData(element);
@@ -4578,7 +4587,7 @@ var Implementation;
      */
     function assignRender(requestOptions, targetContext, issuingForm, sourceElementId) {
         if (requestOptions.getIf(Const_1.CTX_PARAM_RENDER).isPresent()) {
-            remapDefaultConstants(targetContext.getIf(Const_1.CTX_PARAM_PASS_THR).get({}), Const_1.P_RENDER, requestOptions.getIf(Const_1.CTX_PARAM_RENDER).value, issuingForm, sourceElementId);
+            remapDefaultConstants(targetContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR).get({}), Const_1.P_RENDER, requestOptions.getIf(Const_1.CTX_PARAM_RENDER).value, issuingForm, sourceElementId, targetContext.getIf(Const_1.VIEW_ID).value);
         }
     }
     /**
@@ -4594,16 +4603,16 @@ var Implementation;
      * @param sourceElementId the executing element triggering the faces.ajax.request (id of it)
      */
     function assignExecute(requestOptions, targetContext, issuingForm, sourceElementId) {
-        if (requestOptions.getIf(Const_1.CTX_PARAM_EXECUTE).isPresent()) {
+        if (requestOptions.getIf(Const_1.CTX_OPTIONS_EXECUTE).isPresent()) {
             /*the options must be a blank delimited list of strings*/
             /*compliance with Mojarra which automatically adds @this to an execute
              * the spec rev 2.0a however states, if none is issued nothing at all should be sent down
              */
-            requestOptions.assign(Const_1.CTX_PARAM_EXECUTE).value = [requestOptions.getIf(Const_1.CTX_PARAM_EXECUTE).value, Const_1.IDENT_THIS].join(" ");
-            remapDefaultConstants(targetContext.getIf(Const_1.CTX_PARAM_PASS_THR).get({}), Const_1.P_EXECUTE, requestOptions.getIf(Const_1.CTX_PARAM_EXECUTE).value, issuingForm, sourceElementId);
+            requestOptions.assign(Const_1.CTX_OPTIONS_EXECUTE).value = [requestOptions.getIf(Const_1.CTX_OPTIONS_EXECUTE).value, Const_1.IDENT_THIS].join(" ");
+            remapDefaultConstants(targetContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR).get({}), Const_1.P_EXECUTE, requestOptions.getIf(Const_1.CTX_OPTIONS_EXECUTE).value, issuingForm, sourceElementId, targetContext.getIf(Const_1.VIEW_ID).value);
         }
         else {
-            targetContext.assign(Const_1.CTX_PARAM_PASS_THR, Const_1.P_EXECUTE).value = sourceElementId;
+            targetContext.assign(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EXECUTE).value = sourceElementId;
         }
     }
     /**
@@ -4613,16 +4622,15 @@ var Implementation;
      * @param targetContext the target context receiving the value
      */
     function assignClientWindowId(form, targetContext) {
-        var _a;
-        let clientWindow = ((_a = window === null || window === void 0 ? void 0 : window.faces) !== null && _a !== void 0 ? _a : window === null || window === void 0 ? void 0 : window.jsf).getClientWindow(form.getAsElem(0).value);
+        let clientWindow = (0, Const_1.$faces)().getClientWindow(form.getAsElem(0).value);
         if (clientWindow) {
-            targetContext.assign(Const_1.CTX_PARAM_PASS_THR, Const_1.P_CLIENT_WINDOW).value = clientWindow;
+            targetContext.assign(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_CLIENT_WINDOW).value = clientWindow;
         }
     }
     /**
      * transforms the user values to the expected one
      * with the proper none all form and this handling
-     * (note we also could use a simple string replace but then
+     * (note we also could use a simple string replace, but then
      * we would have had double entries under some circumstances)
      *
      * there are several standardized constants which need a special treatment
@@ -4633,12 +4641,52 @@ var Implementation;
      * @param userValues the passed user values (aka input string which needs to be transformed)
      * @param issuingForm the form where the issuing element originates
      * @param issuingElementId the issuing element
+     * @param rootNamingContainerId the naming container id ("" default if none is given)
      */
-    function remapDefaultConstants(targetConfig, targetKey, userValues, issuingForm, issuingElementId) {
+    function remapDefaultConstants(targetConfig, targetKey, userValues, issuingForm, issuingElementId, rootNamingContainerId = "") {
         //a cleaner implementation of the transform list method
+        const SEP = (0, Const_1.$faces)().separatorchar;
         let iterValues = (userValues) ? trim(userValues).split(/\s+/gi) : [];
         let ret = [];
         let processed = {};
+        /**
+         * remaps the client ids for the portlet case so that the server
+         * can deal with them either prefixed ir not
+         * also resolves the absolute id case (it was assumed the server does this, but
+         * apparently the RI does not, so we have to follow the RI behavior here)
+         * @param componentIdToTransform the componentId which needs post processing
+         */
+        const remapNamingContainer = componentIdToTransform => {
+            // pattern :<anything> must be prepended by viewRoot if there is one,
+            // otherwise we are in a not namespaced then only the id has to match
+            const rootNamingContainerPrefix = (rootNamingContainerId.length) ? rootNamingContainerId + SEP : Const_1.EMPTY_STR;
+            let formClientId = issuingForm.id.value;
+            // nearest parent naming container relative to the form
+            const nearestNamingContainer = formClientId.substring(0, formClientId.lastIndexOf(SEP));
+            const nearestNamingContainerPrefix = (nearestNamingContainer.length) ? nearestNamingContainer + SEP : Const_1.EMPTY_STR;
+            // Absolute search expressions, always start with SEP or the name of the root naming container
+            const hasLeadingSep = componentIdToTransform.indexOf(SEP) === 0;
+            const isAbsolutSearchExpr = hasLeadingSep || (rootNamingContainerId.length
+                && componentIdToTransform.indexOf(rootNamingContainerPrefix) == 0);
+            if (isAbsolutSearchExpr) {
+                //we cut off the leading sep if there is one
+                componentIdToTransform = hasLeadingSep ? componentIdToTransform.substring(1) : componentIdToTransform;
+                componentIdToTransform = componentIdToTransform.indexOf(rootNamingContainerPrefix) == 0 ? componentIdToTransform.substring(rootNamingContainerPrefix.length) : componentIdToTransform;
+                //now we prepend either the prefix or "" from the cut-off string to get the final result
+                return [rootNamingContainerPrefix, componentIdToTransform].join(Const_1.EMPTY_STR);
+            }
+            else { //relative search according to the javadoc
+                //we cut off the root naming container id from the form
+                if (formClientId.indexOf(rootNamingContainerPrefix) == 0) {
+                    formClientId = formClientId.substring(rootNamingContainerPrefix.length);
+                }
+                //If prependId = true, the outer form id must be present in the id if same form
+                let hasPrependId = componentIdToTransform.indexOf(formClientId) == 0;
+                return hasPrependId ?
+                    [rootNamingContainerPrefix, componentIdToTransform].join(Const_1.EMPTY_STR) :
+                    [nearestNamingContainerPrefix, componentIdToTransform.substring(componentIdToTransform.lastIndexOf(SEP) + 1)].join(Const_1.EMPTY_STR);
+            }
+        };
         // in this case we do not use lazy stream because it wont bring any code reduction
         // or speedup
         for (let cnt = 0; cnt < iterValues.length; cnt++) {
@@ -4656,38 +4704,37 @@ var Implementation;
                     return targetConfig;
                 //@form pushes the issuing form id into our list
                 case Const_1.IDENT_FORM:
-                    ret.push(issuingForm.id.value);
+                    ret.push(remapNamingContainer(issuingForm.id.value));
                     processed[issuingForm.id.value] = true;
                     break;
                 //@this is replaced with the current issuing element id
                 case Const_1.IDENT_THIS:
                     if (!(issuingElementId in processed)) {
-                        ret.push(issuingElementId);
+                        ret.push(remapNamingContainer(issuingElementId));
                         processed[issuingElementId] = true;
                     }
                     break;
                 default:
-                    ret.push(iterValues[cnt]);
+                    ret.push(remapNamingContainer(iterValues[cnt]));
                     processed[iterValues[cnt]] = true;
             }
         }
-        //We now add the target as joined list
         targetConfig.assign(targetKey).value = ret.join(" ");
         return targetConfig;
     }
     /**
      * Filter the options given with a blacklist, so that only
-     * the values required for pass-through are processed in the ajax request
+     * the values required for params-through are processed in the ajax request
      *
      * Note this is a bug carried over from the old implementation
      * the spec conform behavior is to use params for passthrough values
-     * this will be removed soon, after it is cleared up wheter removing
+     * this will be removed soon, after it is cleared up whether removing
      * it breaks any legacy code
      *
      * @param {Context} mappedOpts the options to be filtered
      * @deprecated
      */
-    function filterPassThroughValues(mappedOpts) {
+    function extractLegacyParams(mappedOpts) {
         //we now can use the full code reduction given by our stream api
         //to filter
         return mona_dish_1.Stream.ofAssoc(mappedOpts)
@@ -5024,14 +5071,15 @@ var PushImpl;
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.CTX_PARAM_TR_TYPE = exports.CTX_PARAM_SRC_CTL_ID = exports.CTX_PARAM_SRC_FRM_ID = exports.CTX_PARAM_MF_INTERNAL = exports.TIMEOUT_EVENT = exports.CLIENT_ERROR = exports.SERVER_ERROR = exports.MALFORMEDXML = exports.EMPTY_RESPONSE = exports.HTTPERROR = exports.RESPONSE_XML = exports.RESPONSE_TEXT = exports.ERROR_MESSAGE = exports.ERROR_NAME = exports.STATUS = exports.SOURCE = exports.SUCCESS = exports.COMPLETE = exports.BEGIN = exports.ON_EVENT = exports.ON_ERROR = exports.EVENT = exports.ERROR = exports.WINDOW_ID = exports.CTX_PARAM_RENDER = exports.P_BEHAVIOR_EVENT = exports.P_WINDOW_ID = exports.P_RESET_VALUES = exports.P_EVT = exports.P_RENDER_OVERRIDE = exports.P_RENDER = exports.P_EXECUTE = exports.P_AJAX = exports.IDENT_FORM = exports.IDENT_THIS = exports.IDENT_NONE = exports.IDENT_ALL = exports.HTML_CLIENT_WINDOW = exports.HTML_VIEWSTATE = exports.EMPTY_MAP = exports.EMPTY_STR = exports.EMPTY_FUNC = exports.P_RESOURCE = exports.P_VIEWBODY = exports.P_VIEWHEAD = exports.P_VIEWROOT = exports.P_CLIENT_WINDOW = exports.P_VIEWSTATE = exports.PARTIAL_ID = exports.P_PARTIAL_SOURCE = void 0;
-exports.MYFACES = exports.DEFERRED_HEAD_INSERTS = exports.UPDATE_ELEMS = exports.UPDATE_FORMS = exports.CMD_REDIRECT = exports.CMD_EXTENSION = exports.CMD_ATTRIBUTES = exports.CMD_ERROR = exports.CMD_EVAL = exports.CMD_INSERT = exports.CMD_DELETE = exports.CMD_UPDATE = exports.CMD_CHANGES = exports.RESP_PARTIAL = exports.ATTR_ID = exports.ATTR_VALUE = exports.ATTR_NAME = exports.ATTR_URL = exports.ERR_NO_PARTIAL_RESPONSE = exports.PHASE_PROCESS_RESPONSE = exports.SEL_RESPONSE_XML = exports.SEL_CLIENT_WINDOW_ELEM = exports.SEL_VIEWSTATE_ELEM = exports.TAG_ATTR = exports.TAG_AFTER = exports.TAG_BEFORE = exports.TAG_BODY = exports.TAG_FORM = exports.TAG_HEAD = exports.STD_ACCEPT = exports.NO_TIMEOUT = exports.MULTIPART = exports.URL_ENCODED = exports.STATE_EVT_COMPLETE = exports.STATE_EVT_TIMEOUT = exports.STATE_EVT_BEGIN = exports.REQ_TYPE_POST = exports.REQ_TYPE_GET = exports.ENCODED_URL = exports.VAL_AJAX = exports.REQ_ACCEPT = exports.HEAD_FACES_REQ = exports.CONTENT_TYPE = exports.STAGE_DEVELOPMENT = exports.CTX_PARAM_EXECUTE = exports.CTX_PARAM_RST = exports.CTX_PARAM_TIMEOUT = exports.CTX_PARAM_DELAY = exports.CTX_PARAM_SPEC_PARAMS = exports.CTX_PARAM_PASS_THR = void 0;
-exports.$nsp = exports.UNKNOWN = exports.MAX_RECONNECT_ATTEMPTS = exports.RECONNECT_INTERVAL = exports.APPLIED_CLIENT_WINDOW = exports.APPLIED_VST = exports.REASON_EXPIRED = exports.MF_NONE = exports.SEL_SCRIPTS_STYLES = void 0;
+exports.DELAY_NONE = exports.CTX_OPTIONS_DELAY = exports.CTX_OPTIONS_PARAMS = exports.TIMEOUT_EVENT = exports.CLIENT_ERROR = exports.SERVER_ERROR = exports.MALFORMEDXML = exports.EMPTY_RESPONSE = exports.HTTPERROR = exports.RESPONSE_XML = exports.RESPONSE_TEXT = exports.ERROR_MESSAGE = exports.ERROR_NAME = exports.STATUS = exports.SOURCE = exports.SUCCESS = exports.COMPLETE = exports.BEGIN = exports.ON_EVENT = exports.ON_ERROR = exports.EVENT = exports.ERROR = exports.WINDOW_ID = exports.CTX_PARAM_RENDER = exports.P_BEHAVIOR_EVENT = exports.P_WINDOW_ID = exports.P_RESET_VALUES = exports.P_EVT = exports.P_RENDER_OVERRIDE = exports.P_RENDER = exports.P_EXECUTE = exports.P_AJAX = exports.IDENT_FORM = exports.IDENT_THIS = exports.IDENT_NONE = exports.IDENT_ALL = exports.HTML_CLIENT_WINDOW = exports.HTML_VIEWSTATE = exports.EMPTY_MAP = exports.EMPTY_STR = exports.EMPTY_FUNC = exports.P_RESOURCE = exports.P_VIEWBODY = exports.P_VIEWHEAD = exports.P_VIEWROOT = exports.P_CLIENT_WINDOW = exports.P_VIEWSTATE = exports.VIEW_ID = exports.PARTIAL_ID = exports.P_PARTIAL_SOURCE = void 0;
+exports.UPDATE_FORMS = exports.XML_TAG_ATTR = exports.XML_TAG_AFTER = exports.XML_TAG_BEFORE = exports.XML_TAG_REDIRECT = exports.XML_TAG_EXTENSION = exports.XML_TAG_ATTRIBUTES = exports.XML_TAG_ERROR = exports.XML_TAG_EVAL = exports.XML_TAG_INSERT = exports.XML_TAG_DELETE = exports.XML_TAG_UPDATE = exports.XML_TAG_CHANGES = exports.XML_TAG_PARTIAL_RESP = exports.ATTR_ID = exports.ATTR_VALUE = exports.ATTR_NAME = exports.ATTR_URL = exports.ERR_NO_PARTIAL_RESPONSE = exports.PHASE_PROCESS_RESPONSE = exports.SEL_RESPONSE_XML = exports.SEL_CLIENT_WINDOW_ELEM = exports.SEL_VIEWSTATE_ELEM = exports.HTML_TAG_STYLE = exports.HTML_TAG_SCRIPT = exports.HTML_TAG_LINK = exports.HTML_TAG_BODY = exports.HTML_TAG_FORM = exports.HTML_TAG_HEAD = exports.STD_ACCEPT = exports.NO_TIMEOUT = exports.MULTIPART = exports.URL_ENCODED = exports.STATE_EVT_COMPLETE = exports.STATE_EVT_TIMEOUT = exports.STATE_EVT_BEGIN = exports.REQ_TYPE_POST = exports.REQ_TYPE_GET = exports.ENCODED_URL = exports.VAL_AJAX = exports.REQ_ACCEPT = exports.HEAD_FACES_REQ = exports.CONTENT_TYPE = exports.CTX_PARAM_REQ_PASS_THR = exports.CTX_PARAM_SRC_CTL_ID = exports.CTX_PARAM_SRC_FRM_ID = exports.CTX_PARAM_MF_INTERNAL = exports.CTX_OPTIONS_EXECUTE = exports.CTX_OPTIONS_RESET = exports.CTX_OPTIONS_TIMEOUT = void 0;
+exports.$nsp = exports.$faces = exports.UNKNOWN = exports.MAX_RECONNECT_ATTEMPTS = exports.RECONNECT_INTERVAL = exports.APPLIED_CLIENT_WINDOW = exports.APPLIED_VST = exports.REASON_EXPIRED = exports.MF_NONE = exports.MYFACES = exports.DEFERRED_HEAD_INSERTS = exports.UPDATE_ELEMS = void 0;
 /*
  * [export const] constants
  */
 exports.P_PARTIAL_SOURCE = "jakarta.faces.source";
 exports.PARTIAL_ID = "partialId";
+exports.VIEW_ID = "myfaves.viewId";
 exports.P_VIEWSTATE = "jakarta.faces.ViewState";
 exports.P_CLIENT_WINDOW = "jakarta.faces.ClientWindow";
 exports.P_VIEWROOT = "jakarta.faces.ViewRoot";
@@ -5083,17 +5131,16 @@ exports.MALFORMEDXML = "malformedXML";
 exports.SERVER_ERROR = "serverError";
 exports.CLIENT_ERROR = "clientError";
 exports.TIMEOUT_EVENT = "timeout";
-exports.CTX_PARAM_MF_INTERNAL = "_mfInternal";
-exports.CTX_PARAM_SRC_FRM_ID = "_mfSourceFormId";
-exports.CTX_PARAM_SRC_CTL_ID = "_mfSourceControlId";
-exports.CTX_PARAM_TR_TYPE = "_mfTransportType";
-exports.CTX_PARAM_PASS_THR = "passThrgh";
-exports.CTX_PARAM_SPEC_PARAMS = "params";
-exports.CTX_PARAM_DELAY = "delay";
-exports.CTX_PARAM_TIMEOUT = "timeout";
-exports.CTX_PARAM_RST = "resetValues";
-exports.CTX_PARAM_EXECUTE = "execute";
-exports.STAGE_DEVELOPMENT = "Development";
+exports.CTX_OPTIONS_PARAMS = "params";
+exports.CTX_OPTIONS_DELAY = "delay";
+exports.DELAY_NONE = 'none';
+exports.CTX_OPTIONS_TIMEOUT = "timeout";
+exports.CTX_OPTIONS_RESET = "resetValues";
+exports.CTX_OPTIONS_EXECUTE = "execute";
+exports.CTX_PARAM_MF_INTERNAL = "myfaces.internal";
+exports.CTX_PARAM_SRC_FRM_ID = "myfaces.source.formId";
+exports.CTX_PARAM_SRC_CTL_ID = "myfaces.source.controlId";
+exports.CTX_PARAM_REQ_PASS_THR = "myfaces.request.passThrough";
 exports.CONTENT_TYPE = "Content-Type";
 exports.HEAD_FACES_REQ = "Faces-Request";
 exports.REQ_ACCEPT = "Accept";
@@ -5108,12 +5155,12 @@ exports.URL_ENCODED = "application/x-www-form-urlencoded";
 exports.MULTIPART = "multipart/form-data";
 exports.NO_TIMEOUT = 0;
 exports.STD_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
-exports.TAG_HEAD = "HEAD";
-exports.TAG_FORM = "FORM";
-exports.TAG_BODY = "BODY";
-exports.TAG_BEFORE = "before";
-exports.TAG_AFTER = "after";
-exports.TAG_ATTR = "attribute";
+exports.HTML_TAG_HEAD = "HEAD";
+exports.HTML_TAG_FORM = "FORM";
+exports.HTML_TAG_BODY = "BODY";
+exports.HTML_TAG_LINK = "LINK";
+exports.HTML_TAG_SCRIPT = "SCRIPT";
+exports.HTML_TAG_STYLE = "STYLE";
 exports.SEL_VIEWSTATE_ELEM = "[name='" + exports.P_VIEWSTATE + "']";
 exports.SEL_CLIENT_WINDOW_ELEM = "[name='" + exports.P_CLIENT_WINDOW + "']";
 exports.SEL_RESPONSE_XML = "responseXML";
@@ -5124,29 +5171,31 @@ exports.ATTR_NAME = "name";
 exports.ATTR_VALUE = "value";
 exports.ATTR_ID = "id";
 /*partial response types*/
-exports.RESP_PARTIAL = "partial-response";
+exports.XML_TAG_PARTIAL_RESP = "partial-response";
 /*partial commands*/
-exports.CMD_CHANGES = "changes";
-exports.CMD_UPDATE = "update";
-exports.CMD_DELETE = "delete";
-exports.CMD_INSERT = "insert";
-exports.CMD_EVAL = "eval";
-exports.CMD_ERROR = "error";
-exports.CMD_ATTRIBUTES = "attributes";
-exports.CMD_EXTENSION = "extension";
-exports.CMD_REDIRECT = "redirect";
+exports.XML_TAG_CHANGES = "changes";
+exports.XML_TAG_UPDATE = "update";
+exports.XML_TAG_DELETE = "delete";
+exports.XML_TAG_INSERT = "insert";
+exports.XML_TAG_EVAL = "eval";
+exports.XML_TAG_ERROR = "error";
+exports.XML_TAG_ATTRIBUTES = "attributes";
+exports.XML_TAG_EXTENSION = "extension";
+exports.XML_TAG_REDIRECT = "redirect";
+exports.XML_TAG_BEFORE = "before";
+exports.XML_TAG_AFTER = "after";
+exports.XML_TAG_ATTR = "attribute";
 /*other constants*/
-exports.UPDATE_FORMS = "_updateForms";
-exports.UPDATE_ELEMS = "_updateElems";
+exports.UPDATE_FORMS = "myfaces.updateForms";
+exports.UPDATE_ELEMS = "myfaces.updateElems";
 //we want the head elements to be processed before we process the body
 //but after the inner html is done
-exports.DEFERRED_HEAD_INSERTS = "_headElems";
+exports.DEFERRED_HEAD_INSERTS = "myfaces.headElems";
 exports.MYFACES = "myfaces";
-exports.SEL_SCRIPTS_STYLES = "script, style, link";
 exports.MF_NONE = "__mf_none__";
 exports.REASON_EXPIRED = "Expired";
-exports.APPLIED_VST = "appliedViewState";
-exports.APPLIED_CLIENT_WINDOW = "appliedClientWindow";
+exports.APPLIED_VST = "myfaces.appliedViewState";
+exports.APPLIED_CLIENT_WINDOW = "myfaces.appliedClientWindow";
 exports.RECONNECT_INTERVAL = 500;
 exports.MAX_RECONNECT_ATTEMPTS = 25;
 exports.UNKNOWN = "UNKNOWN";
@@ -5157,6 +5206,11 @@ exports.UNKNOWN = "UNKNOWN";
  * To take the compatibility layer out this method just has to be
  * changed to a simple value passthrough
  */
+function $faces() {
+    var _a;
+    return ((_a = window === null || window === void 0 ? void 0 : window.faces) !== null && _a !== void 0 ? _a : window === null || window === void 0 ? void 0 : window.jsf);
+}
+exports.$faces = $faces;
 function $nsp(inputNamespace) {
     if ((!inputNamespace) || !(inputNamespace === null || inputNamespace === void 0 ? void 0 : inputNamespace.replace)) {
         return inputNamespace;
@@ -5394,7 +5448,7 @@ var Assertions;
     function assertValidXMLResponse(responseXML) {
         assert(!responseXML.isAbsent(), Const_1.EMPTY_RESPONSE, Const_1.PHASE_PROCESS_RESPONSE);
         assert(!responseXML.isXMLParserError(), responseXML.parserErrorText(Const_1.EMPTY_STR), Const_1.PHASE_PROCESS_RESPONSE);
-        assert(responseXML.querySelectorAll(Const_1.RESP_PARTIAL).isPresent(), Const_1.ERR_NO_PARTIAL_RESPONSE, Const_1.PHASE_PROCESS_RESPONSE);
+        assert(responseXML.querySelectorAll(Const_1.XML_TAG_PARTIAL_RESP).isPresent(), Const_1.ERR_NO_PARTIAL_RESPONSE, Const_1.PHASE_PROCESS_RESPONSE);
     }
     Assertions.assertValidXMLResponse = assertValidXMLResponse;
     /**
@@ -5757,8 +5811,8 @@ class ExtDomQuery extends mona_dish_1.DQ {
                 return true;
             }
             let reference = element.attr("href")
-                .orElse(element.attr("src").value)
-                .orElse(element.attr("rel").value);
+                .orElseLazy(() => element.attr("src").value)
+                .orElseLazy(() => element.attr("rel").value);
             if (!reference.isPresent()) {
                 return true;
             }
@@ -5871,6 +5925,73 @@ class ExtConfig extends mona_dish_1.Config {
 exports.ExtConfig = ExtConfig;
 
 
+/***/ }),
+
+/***/ "./src/main/typescript/impl/util/HiddenInputBuilder.ts":
+/*!*************************************************************!*\
+  !*** ./src/main/typescript/impl/util/HiddenInputBuilder.ts ***!
+  \*************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.HiddenInputBuilder = void 0;
+const mona_dish_1 = __webpack_require__(/*! mona-dish */ "./node_modules/mona-dish/src/main/typescript/index_core.ts");
+const Const_1 = __webpack_require__(/*! ../core/Const */ "./src/main/typescript/impl/core/Const.ts");
+/**
+ * Builder for hidden inputs.
+ * ATM only ViewState and Client window
+ * are supported (per spec)
+ *
+ * Improves readability in the response processor!
+ */
+class HiddenInputBuilder {
+    constructor(selector) {
+        this.selector = selector;
+        const isViewState = selector.indexOf((0, Const_1.$nsp)(Const_1.P_VIEWSTATE)) != -1;
+        this.name = isViewState ? Const_1.P_VIEWSTATE : Const_1.P_CLIENT_WINDOW;
+        this.template = isViewState ? Const_1.HTML_VIEWSTATE : Const_1.HTML_CLIENT_WINDOW;
+    }
+    withNamingContainerId(namingContainer) {
+        this.namingContainerId = namingContainer;
+        return this;
+    }
+    withParent(parent) {
+        this.parent = parent;
+        return this;
+    }
+    build() {
+        var _a, _b;
+        //TODO naming container id?
+        const cnt = (0, mona_dish_1.DQ$)(`[name='${(0, Const_1.$nsp)(this.name)}']`).length;
+        const SEP = (0, Const_1.$faces)().separatorchar;
+        const newElement = mona_dish_1.DQ.fromMarkup((0, Const_1.$nsp)(this.template));
+        newElement.id.value = (((_a = this.namingContainerId) === null || _a === void 0 ? void 0 : _a.length) ?
+            [this.namingContainerId, (0, Const_1.$nsp)(this.name), cnt] :
+            [(0, Const_1.$nsp)(this.name), cnt]).join(SEP);
+        (_b = this === null || this === void 0 ? void 0 : this.parent) === null || _b === void 0 ? void 0 : _b.append(newElement);
+        return newElement;
+    }
+}
+exports.HiddenInputBuilder = HiddenInputBuilder;
+
+
 /***/ }),
 
 /***/ "./src/main/typescript/impl/util/Lang.ts":
@@ -5895,8 +6016,6 @@ exports.ExtConfig = ExtConfig;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * todo replace singleton with module definition
- *
  */
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ExtLang = void 0;
@@ -6038,21 +6157,21 @@ var ExtLang;
     function getForm(elem, event) {
         let queryElem = new mona_dish_1.DQ(elem);
         let eventTarget = (event) ? new mona_dish_1.DQ((0, RequestDataResolver_1.getEventTarget)(event)) : mona_dish_1.DomQuery.absent;
-        if (queryElem.isTag(Const_1.TAG_FORM)) {
+        if (queryElem.isTag(Const_1.HTML_TAG_FORM)) {
             return queryElem;
         }
         //html 5 for handling
-        if (queryElem.attr(Const_1.TAG_FORM).isPresent()) {
-            let formId = queryElem.attr(Const_1.TAG_FORM).value;
+        if (queryElem.attr(Const_1.HTML_TAG_FORM).isPresent()) {
+            let formId = queryElem.attr(Const_1.HTML_TAG_FORM).value;
             let foundForm = mona_dish_1.DQ.byId(formId, true);
             if (foundForm.isPresent()) {
                 return foundForm;
             }
         }
-        let form = queryElem.firstParent(Const_1.TAG_FORM)
-            .orElseLazy(() => queryElem.byTagName(Const_1.TAG_FORM, true))
-            .orElseLazy(() => eventTarget.firstParent(Const_1.TAG_FORM))
-            .orElseLazy(() => eventTarget.byTagName(Const_1.TAG_FORM))
+        let form = queryElem.firstParent(Const_1.HTML_TAG_FORM)
+            .orElseLazy(() => queryElem.byTagName(Const_1.HTML_TAG_FORM, true))
+            .orElseLazy(() => eventTarget.firstParent(Const_1.HTML_TAG_FORM))
+            .orElseLazy(() => eventTarget.byTagName(Const_1.HTML_TAG_FORM))
             .first();
         assertFormExists(form);
         return form;
@@ -6214,7 +6333,7 @@ class EventData {
         eventData.status = name;
         let sourceId = context.getIf(Const_1.SOURCE)
             .orElseLazy(() => context.getIf(Const_1.P_PARTIAL_SOURCE).value)
-            .orElseLazy(() => context.getIf(Const_1.CTX_PARAM_PASS_THR, Const_1.P_PARTIAL_SOURCE).value)
+            .orElseLazy(() => context.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_PARTIAL_SOURCE).value)
             .value;
         if (sourceId) {
             eventData.source = mona_dish_1.DQ.byId(sourceId, true).first().value.value;
@@ -6255,7 +6374,7 @@ exports.EventData = EventData;
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.resolveDefaults = exports.getEventTarget = exports.resolveWindowId = exports.resolveDelay = exports.resolveTimeout = exports.resolveForm = exports.resolveFinalUrl = exports.resolveTargetUrl = exports.resolveHandlerFunc = void 0;
+exports.resolveDefaults = exports.getEventTarget = exports.resolveWindowId = exports.resolveDelay = exports.resolveTimeout = exports.resolveViewId = exports.resolveForm = exports.resolveFinalUrl = exports.resolveTargetUrl = exports.resolveHandlerFunc = void 0;
 const mona_dish_1 = __webpack_require__(/*! mona-dish */ "./node_modules/mona-dish/src/main/typescript/index_core.ts");
 const Const_1 = __webpack_require__(/*! ../core/Const */ "./src/main/typescript/impl/core/Const.ts");
 const Lang_1 = __webpack_require__(/*! ../util/Lang */ "./src/main/typescript/impl/util/Lang.ts");
@@ -6297,22 +6416,27 @@ exports.resolveFinalUrl = resolveFinalUrl;
  * it is either the id or the parent form of the element or an embedded form
  * of the element
  *
- * @param requestCtx
  * @param elem
  * @param event
  */
-function resolveForm(requestCtx, elem, event) {
-    var _a, _b, _c;
-    const configId = (_c = (_b = (_a = requestCtx.value) === null || _a === void 0 ? void 0 : _a.myfaces) === null || _b === void 0 ? void 0 : _b.form) !== null && _c !== void 0 ? _c : Const_1.MF_NONE;
-    return mona_dish_1.DQ
-        .byId(configId, true)
-        .orElseLazy(() => Lang_1.ExtLang.getForm(elem.getAsElem(0).value, event));
+function resolveForm(elem, event) {
+    return Lang_1.ExtLang.getForm(elem.getAsElem(0).value, event);
 }
 exports.resolveForm = resolveForm;
+function resolveViewId(form) {
+    const viewState = form.querySelectorAll(`input[type='hidden'][name*='${(0, Const_1.$nsp)(Const_1.P_VIEWSTATE)}']`).id.orElse("").value;
+    const divider = (0, Const_1.$faces)().separatorchar;
+    const viewId = viewState.split(divider, 2)[0];
+    if (viewId.indexOf((0, Const_1.$nsp)(Const_1.P_VIEWSTATE)) === -1) {
+        return viewId;
+    }
+    return "";
+}
+exports.resolveViewId = resolveViewId;
 function resolveTimeout(options) {
     var _a;
     let getCfg = Lang_1.ExtLang.getLocalOrGlobalConfig;
-    return (_a = options.getIf(Const_1.CTX_PARAM_TIMEOUT).value) !== null && _a !== void 0 ? _a : getCfg(options.value, Const_1.CTX_PARAM_TIMEOUT, 0);
+    return (_a = options.getIf(Const_1.CTX_OPTIONS_TIMEOUT).value) !== null && _a !== void 0 ? _a : getCfg(options.value, Const_1.CTX_OPTIONS_TIMEOUT, 0);
 }
 exports.resolveTimeout = resolveTimeout;
 /**
@@ -6321,14 +6445,12 @@ exports.resolveTimeout = resolveTimeout;
  * @param options ... the options object, in most cases it will host the delay value
  */
 function resolveDelay(options) {
-    var _a;
-    let getCfg = Lang_1.ExtLang.getLocalOrGlobalConfig;
-    // null or non undefined will automatically be mapped to 0 aka no delay
-    let ret = (_a = options.getIf(Const_1.CTX_PARAM_DELAY).value) !== null && _a !== void 0 ? _a : getCfg(options.value, Const_1.CTX_PARAM_DELAY, 0);
+    // null, 'none', or undefined will automatically be mapped to 0 aka no delay
+    // the config delay will be dropped not needed anymore, it does not really
+    // make sense anymore now that it is part of a local spec
+    let ret = options.getIf(Const_1.CTX_OPTIONS_DELAY).orElse(0).value;
     // if delay === none, no delay must be used, aka delay 0
-    if ('none' === ret) {
-        ret = 0;
-    }
+    ret = (Const_1.DELAY_NONE === ret) ? 0 : ret;
     // negative, or invalid values will automatically get a js exception
     Assertions_1.Assertions.assertDelay(ret);
     return ret;
@@ -6383,8 +6505,15 @@ exports.getEventTarget = getEventTarget;
 function resolveDefaults(event, opts, el = null) {
     var _a;
     //deep copy the options, so that further transformations to not backfire into the callers
-    const resolvedEvent = event, options = new ExtDomQuery_1.ExtConfig(opts).deepCopy, elem = mona_dish_1.DQ.byId(el || resolvedEvent.target, true), elementId = elem.id.value, requestCtx = new ExtDomQuery_1.ExtConfig({}), internalCtx = new ExtDomQuery_1.ExtConfig({}), windowId = resolveWindowId(options), isResetValues = true === ((_a = options.value) === null || _a === void 0 ? void 0 : _a.resetValues);
-    return { resolvedEvent, options, elem, elementId, requestCtx, internalCtx, windowId, isResetValues };
+    const elem = mona_dish_1.DQ.byId(el || event.target, true);
+    const options = new ExtDomQuery_1.ExtConfig(opts).deepCopy;
+    return {
+        options: options,
+        elem: elem,
+        elementId: elem.id.value,
+        windowId: resolveWindowId(options),
+        isResetValues: true === ((_a = options.value) === null || _a === void 0 ? void 0 : _a.resetValues)
+    };
 }
 exports.resolveDefaults = resolveDefaults;
 
@@ -6490,9 +6619,9 @@ exports.resolveSourceElement = resolveSourceElement;
 function resolveSourceForm(internalContext, elem) {
     let sourceFormId = internalContext.getIf(Const_1.CTX_PARAM_SRC_FRM_ID);
     let sourceForm = new mona_dish_2.DQ(sourceFormId.isPresent() ? document.forms[sourceFormId.value] : null);
-    sourceForm = sourceForm.orElseLazy(() => elem.firstParent(Const_1.TAG_FORM))
-        .orElseLazy(() => elem.querySelectorAll(Const_1.TAG_FORM))
-        .orElseLazy(() => mona_dish_2.DQ.querySelectorAll(Const_1.TAG_FORM));
+    sourceForm = sourceForm.orElseLazy(() => elem.firstParent(Const_1.HTML_TAG_FORM))
+        .orElseLazy(() => elem.querySelectorAll(Const_1.HTML_TAG_FORM))
+        .orElseLazy(() => mona_dish_2.DQ.querySelectorAll(Const_1.HTML_TAG_FORM));
     return sourceForm;
 }
 exports.resolveSourceForm = resolveSourceForm;
@@ -6554,7 +6683,7 @@ var Response;
         let responseProcessor = new ResponseProcessor_1.ResponseProcessor(req, externalContext, internalContext);
         internalContext.assign(Const_1.RESPONSE_XML).value = responseXML;
         // we now process the partial tags, or in none given raise an error
-        responseXML.querySelectorAll(Const_1.RESP_PARTIAL)
+        responseXML.querySelectorAll(Const_1.XML_TAG_PARTIAL_RESP)
             .each(item => processPartialTag(item, responseProcessor, internalContext));
         // We now process the viewStates, client windows and the elements to be evaluated are delayed.
         // The reason for this is that often it is better
@@ -6573,17 +6702,17 @@ var Response;
      */
     function processPartialTag(node, responseProcessor, internalContext) {
         internalContext.assign(Const_1.PARTIAL_ID).value = node.id;
-        const SEL_SUB_TAGS = [Const_1.CMD_ERROR, Const_1.CMD_REDIRECT, Const_1.CMD_CHANGES].join(",");
+        const SEL_SUB_TAGS = [Const_1.XML_TAG_ERROR, Const_1.XML_TAG_REDIRECT, Const_1.XML_TAG_CHANGES].join(",");
         // now we can process the main operations
         node.querySelectorAll(SEL_SUB_TAGS).each((node) => {
             switch (node.tagName.value) {
-                case Const_1.CMD_ERROR:
+                case Const_1.XML_TAG_ERROR:
                     responseProcessor.error(node);
                     break;
-                case Const_1.CMD_REDIRECT:
+                case Const_1.XML_TAG_REDIRECT:
                     responseProcessor.redirect(node);
                     break;
-                case Const_1.CMD_CHANGES:
+                case Const_1.XML_TAG_CHANGES:
                     processChangesTag(node, responseProcessor);
                     break;
             }
@@ -6591,7 +6720,7 @@ var Response;
     }
     let processInsert = function (responseProcessor, node) {
         // path1 insert after as child tags
-        if (node.querySelectorAll([Const_1.TAG_BEFORE, Const_1.TAG_AFTER].join(",")).length) {
+        if (node.querySelectorAll([Const_1.XML_TAG_BEFORE, Const_1.XML_TAG_AFTER].join(",")).length) {
             responseProcessor.insertWithSubTags(node);
         }
         else { // insert before after with id
@@ -6605,25 +6734,25 @@ var Response;
      * @param responseProcessor
      */
     function processChangesTag(node, responseProcessor) {
-        const ALLOWED_TAGS = [Const_1.CMD_UPDATE, Const_1.CMD_EVAL, Const_1.CMD_INSERT, Const_1.CMD_DELETE, Const_1.CMD_ATTRIBUTES, Const_1.CMD_EXTENSION].join(", ");
+        const ALLOWED_TAGS = [Const_1.XML_TAG_UPDATE, Const_1.XML_TAG_EVAL, Const_1.XML_TAG_INSERT, Const_1.XML_TAG_DELETE, Const_1.XML_TAG_ATTRIBUTES, Const_1.XML_TAG_EXTENSION].join(", ");
         node.querySelectorAll(ALLOWED_TAGS).each((node) => {
             switch (node.tagName.value) {
-                case Const_1.CMD_UPDATE:
+                case Const_1.XML_TAG_UPDATE:
                     processUpdateTag(node, responseProcessor);
                     break;
-                case Const_1.CMD_EVAL:
+                case Const_1.XML_TAG_EVAL:
                     responseProcessor.eval(node);
                     break;
-                case Const_1.CMD_INSERT:
+                case Const_1.XML_TAG_INSERT:
                     processInsert(responseProcessor, node);
                     break;
-                case Const_1.CMD_DELETE:
+                case Const_1.XML_TAG_DELETE:
                     responseProcessor.delete(node);
                     break;
-                case Const_1.CMD_ATTRIBUTES:
+                case Const_1.XML_TAG_ATTRIBUTES:
                     responseProcessor.attributes(node);
                     break;
-                case Const_1.CMD_EXTENSION:
+                case Const_1.XML_TAG_EXTENSION:
                     break;
             }
         });
@@ -6716,8 +6845,9 @@ const ErrorData_1 = __webpack_require__(/*! ./ErrorData */ "./src/main/typescrip
 const ImplTypes_1 = __webpack_require__(/*! ../core/ImplTypes */ "./src/main/typescript/impl/core/ImplTypes.ts");
 const EventData_1 = __webpack_require__(/*! ./EventData */ "./src/main/typescript/impl/xhrCore/EventData.ts");
 const Const_1 = __webpack_require__(/*! ../core/Const */ "./src/main/typescript/impl/core/Const.ts");
-var trim = mona_dish_1.Lang.trim;
 const ExtDomQuery_1 = __webpack_require__(/*! ../util/ExtDomQuery */ "./src/main/typescript/impl/util/ExtDomQuery.ts");
+const HiddenInputBuilder_1 = __webpack_require__(/*! ../util/HiddenInputBuilder */ "./src/main/typescript/impl/util/HiddenInputBuilder.ts");
+var trim = mona_dish_1.Lang.trim;
 /**
  * Response processor
  *
@@ -6743,24 +6873,26 @@ class ResponseProcessor {
      * the data incoming must represent the html representation of the head itself one way or the other
      */
     replaceHead(shadowDocument) {
-        let shadowHead = shadowDocument.querySelectorAll(Const_1.TAG_HEAD);
+        const shadowHead = shadowDocument.querySelectorAll(Const_1.HTML_TAG_HEAD);
         if (!shadowHead.isPresent()) {
             return;
         }
-        let head = ExtDomQuery_1.ExtDomQuery.querySelectorAll(Const_1.TAG_HEAD);
+        const head = ExtDomQuery_1.ExtDomQuery.querySelectorAll(Const_1.HTML_TAG_HEAD);
         // full replace we delete everything
         head.childNodes.delete();
         this.addToHead(shadowHead);
+        //we copy the attributes as well (just in case myfaces introduces the id in head)
+        head.copyAttrs(shadowHead);
     }
     addToHead(shadowHead) {
         const mappedHeadData = new ExtDomQuery_1.ExtDomQuery(shadowHead);
-        const postProcessTags = ["STYLE", "LINK", "SCRIPT"];
+        const postProcessTags = [Const_1.HTML_TAG_STYLE, Const_1.HTML_TAG_LINK, Const_1.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 mona_dish_1.DomQueryCollector());
         this.addToHeadDeferred(evalElements);
@@ -6777,17 +6909,17 @@ class ResponseProcessor {
      * @param shadowDocument .. an incoming shadow document hosting the new nodes
      */
     replaceBody(shadowDocument) {
-        let shadowBody = shadowDocument.querySelectorAll(Const_1.TAG_BODY);
+        const shadowBody = shadowDocument.querySelectorAll(Const_1.HTML_TAG_BODY);
         if (!shadowBody.isPresent()) {
             return;
         }
-        let shadowInnerHTML = shadowBody.html().value;
-        let resultingBody = ExtDomQuery_1.ExtDomQuery.querySelectorAll(Const_1.TAG_BODY).html(shadowInnerHTML);
-        let updateForms = resultingBody.querySelectorAll(Const_1.TAG_FORM);
+        const shadowInnerHTML = shadowBody.innerHTML;
+        const resultingBody = ExtDomQuery_1.ExtDomQuery.querySelectorAll(Const_1.HTML_TAG_BODY);
+        const updateForms = resultingBody.querySelectorAll(Const_1.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).copyAttrs(shadowBody);
         this.externalContext.assign((0, Const_1.$nsp)(Const_1.P_RENDER_OVERRIDE)).value = "@all";
         this.storeForPostProcessing(updateForms, resultingBody);
     }
@@ -6812,15 +6944,15 @@ class ResponseProcessor {
          *      <error-message><![CDATA[message]]></error-message>
          * <error>
          */
-        let mergedErrorData = new ExtDomQuery_1.ExtConfig({});
+        const mergedErrorData = new ExtDomQuery_1.ExtConfig({});
         mergedErrorData.assign(Const_1.SOURCE).value = this.externalContext.getIf(Const_1.P_PARTIAL_SOURCE).get(0).value;
         mergedErrorData.assign(Const_1.ERROR_NAME).value = node.querySelectorAll(Const_1.ERROR_NAME).textContent(Const_1.EMPTY_STR);
         mergedErrorData.assign(Const_1.ERROR_MESSAGE).value = node.querySelectorAll(Const_1.ERROR_MESSAGE).cDATAAsString;
-        let hasResponseXML = this.internalContext.get(Const_1.RESPONSE_XML).isPresent();
+        const hasResponseXML = this.internalContext.get(Const_1.RESPONSE_XML).isPresent();
         //we now store the response xml also in the error data for further details
         mergedErrorData.assignIf(hasResponseXML, Const_1.RESPONSE_XML).value = this.internalContext.getIf(Const_1.RESPONSE_XML).value.get(0).value;
         // error post-processing and enrichment (standard messages from keys)
-        let errorData = ErrorData_1.ErrorData.fromServerError(mergedErrorData);
+        const errorData = ErrorData_1.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.
         // In both cases they are attached to our contexts
@@ -6834,7 +6966,7 @@ class ResponseProcessor {
      */
     redirect(node) {
         Assertions_1.Assertions.assertUrlExists(node);
-        let redirectUrl = trim(node.attr(Const_1.ATTR_URL).value);
+        const redirectUrl = trim(node.attr(Const_1.ATTR_URL).value);
         if (redirectUrl != Const_1.EMPTY_STR) {
             window.location.href = redirectUrl;
         }
@@ -6845,8 +6977,8 @@ class ResponseProcessor {
      * @param cdataBlock the cdata block with the new html code
      */
     update(node, cdataBlock) {
-        let result = ExtDomQuery_1.ExtDomQuery.byId(node.id.value, true).outerHTML(cdataBlock, false, false);
-        let sourceForm = result === null || result === void 0 ? void 0 : result.firstParent(Const_1.TAG_FORM).orElseLazy(() => result.byTagName(Const_1.TAG_FORM, true));
+        const result = ExtDomQuery_1.ExtDomQuery.byId(node.id.value, true).outerHTML(cdataBlock, false, false);
+        const sourceForm = result === null || result === void 0 ? void 0 : result.firstParent(Const_1.HTML_TAG_FORM).orElseLazy(() => result.byTagName(Const_1.HTML_TAG_FORM, true));
         if (sourceForm) {
             this.storeForPostProcessing(sourceForm, result);
         }
@@ -6864,8 +6996,8 @@ class ResponseProcessor {
      * @param node
      */
     attributes(node) {
-        let elem = mona_dish_1.DQ.byId(node.id.value, true);
-        node.byTagName(Const_1.TAG_ATTR).each((item) => {
+        const elem = mona_dish_1.DQ.byId(node.id.value, true);
+        node.byTagName(Const_1.XML_TAG_ATTR).each((item) => {
             elem.attr(item.attr(Const_1.ATTR_NAME).value).value = item.attr(Const_1.ATTR_VALUE).value;
         });
     }
@@ -6883,15 +7015,15 @@ class ResponseProcessor {
      */
     insert(node) {
         //let insertId = node.id; //not used atm
-        let before = node.attr(Const_1.TAG_BEFORE);
-        let after = node.attr(Const_1.TAG_AFTER);
-        let insertNodes = mona_dish_1.DQ.fromMarkup(node.cDATAAsString);
+        const before = node.attr(Const_1.XML_TAG_BEFORE);
+        const after = node.attr(Const_1.XML_TAG_AFTER);
+        const insertNodes = mona_dish_1.DQ.fromMarkup(node.cDATAAsString);
         if (before.isPresent()) {
             mona_dish_1.DQ.byId(before.value, true).insertBefore(insertNodes);
             this.internalContext.assign(Const_1.UPDATE_ELEMS).value.push(insertNodes);
         }
         if (after.isPresent()) {
-            let domQuery = mona_dish_1.DQ.byId(after.value, true);
+            const domQuery = mona_dish_1.DQ.byId(after.value, true);
             domQuery.insertAfter(insertNodes);
             this.internalContext.assign(Const_1.UPDATE_ELEMS).value.push(insertNodes);
         }
@@ -6902,19 +7034,19 @@ class ResponseProcessor {
      * @param node the node hosting the insert data
      */
     insertWithSubTags(node) {
-        let before = node.querySelectorAll(Const_1.TAG_BEFORE);
-        let after = node.querySelectorAll(Const_1.TAG_AFTER);
+        const before = node.querySelectorAll(Const_1.XML_TAG_BEFORE);
+        const after = node.querySelectorAll(Const_1.XML_TAG_AFTER);
         before.each(item => {
-            let insertId = item.attr(Const_1.ATTR_ID);
-            let insertNodes = mona_dish_1.DQ.fromMarkup(item.cDATAAsString);
+            const insertId = item.attr(Const_1.ATTR_ID);
+            const insertNodes = mona_dish_1.DQ.fromMarkup(item.cDATAAsString);
             if (insertId.isPresent()) {
                 mona_dish_1.DQ.byId(insertId.value, true).insertBefore(insertNodes);
                 this.internalContext.assign(Const_1.UPDATE_ELEMS).value.push(insertNodes);
             }
         });
         after.each(item => {
-            let insertId = item.attr(Const_1.ATTR_ID);
-            let insertNodes = mona_dish_1.DQ.fromMarkup(item.cDATAAsString);
+            const insertId = item.attr(Const_1.ATTR_ID);
+            const insertNodes = mona_dish_1.DQ.fromMarkup(item.cDATAAsString);
             if (insertId.isPresent()) {
                 mona_dish_1.DQ.byId(insertId.value, true).insertAfter(insertNodes);
                 this.internalContext.assign(Const_1.UPDATE_ELEMS).value.push(insertNodes);
@@ -6928,7 +7060,7 @@ class ResponseProcessor {
      */
     processViewState(node) {
         if (ResponseProcessor.isViewStateNode(node)) {
-            let state = node.cDATAAsString;
+            const state = node.cDATAAsString;
             this.internalContext.assign(Const_1.APPLIED_VST, node.id.value).value = new ImplTypes_1.StateHolder((0, Const_1.$nsp)(node.id.value), state);
             return true;
         }
@@ -6936,7 +7068,7 @@ class ResponseProcessor {
     }
     processClientWindow(node) {
         if (ResponseProcessor.isClientWindowNode(node)) {
-            let state = node.cDATAAsString;
+            const state = node.cDATAAsString;
             this.internalContext.assign(Const_1.APPLIED_CLIENT_WINDOW, node.id.value).value = new ImplTypes_1.StateHolder((0, Const_1.$nsp)(node.id.value), state);
             return true;
         }
@@ -6962,13 +7094,11 @@ class ResponseProcessor {
      */
     fixViewStates() {
         mona_dish_1.Stream.ofAssoc(this.internalContext.getIf(Const_1.APPLIED_VST).orElse({}).value)
-            .each((item) => {
-            let value = item[1];
-            let namingContainerId = this.internalContext.getIf(Const_1.PARTIAL_ID);
-            let affectedForms;
-            affectedForms = this.getContainerForms(namingContainerId)
-                .filter(affectedForm => this.executeOrRenderFilter(affectedForm));
-            this.appendViewStateToForms(affectedForms, value.value);
+            .each(([, value]) => {
+            const namingContainerId = this.internalContext.getIf(Const_1.PARTIAL_ID);
+            const affectedForms = this.getContainerForms(namingContainerId)
+                .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
+            this.appendViewStateToForms(affectedForms, value.value, namingContainerId.orElse("").value);
         });
     }
     /**
@@ -6977,22 +7107,20 @@ class ResponseProcessor {
      */
     fixClientWindow() {
         mona_dish_1.Stream.ofAssoc(this.internalContext.getIf(Const_1.APPLIED_CLIENT_WINDOW).orElse({}).value)
-            .each((item) => {
-            const value = item[1];
+            .each(([, value]) => {
             const namingContainerId = this.internalContext.getIf(Const_1.PARTIAL_ID);
-            let affectedForms;
-            affectedForms = this.getContainerForms(namingContainerId)
-                .filter(affectedForm => this.executeOrRenderFilter(affectedForm));
-            this.appendClientWindowToForms(affectedForms, value.value);
+            const affectedForms = this.getContainerForms(namingContainerId)
+                .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
+            this.appendClientWindowToForms(affectedForms, value.value, namingContainerId.orElse("").value);
         });
     }
     /**
      * all processing done we can close the request and send the appropriate events
      */
     done() {
-        let eventData = EventData_1.EventData.createFromRequest(this.request.value, this.externalContext, Const_1.SUCCESS);
+        const eventData = EventData_1.EventData.createFromRequest(this.request.value, this.externalContext, Const_1.SUCCESS);
         //because some frameworks might decorate them over the context in the response
-        let eventHandler = this.externalContext.getIf(Const_1.ON_EVENT).orElseLazy(() => this.internalContext.getIf(Const_1.ON_EVENT).value).orElse(Const_1.EMPTY_FUNC).value;
+        const eventHandler = this.externalContext.getIf(Const_1.ON_EVENT).orElseLazy(() => this.internalContext.getIf(Const_1.ON_EVENT).value).orElse(Const_1.EMPTY_FUNC).value;
         AjaxImpl_1.Implementation.sendEvent(eventData, eventHandler);
     }
     /**
@@ -7000,18 +7128,20 @@ class ResponseProcessor {
      *
      * @param forms the forms to append the viewState to
      * @param viewState the final viewState
+     * @param namingContainerId
      */
-    appendViewStateToForms(forms, viewState) {
-        this.assignState(forms, (0, Const_1.$nsp)(Const_1.SEL_VIEWSTATE_ELEM), viewState);
+    appendViewStateToForms(forms, viewState, namingContainerId = "") {
+        this.assignState(forms, (0, Const_1.$nsp)(Const_1.SEL_VIEWSTATE_ELEM), viewState, namingContainerId);
     }
     /**
      * proper clientWindow -> form assignment
      *
      * @param forms the forms to append the viewState to
      * @param clientWindow the final viewState
+     * @param namingContainerId
      */
-    appendClientWindowToForms(forms, clientWindow) {
-        this.assignState(forms, (0, Const_1.$nsp)(Const_1.SEL_CLIENT_WINDOW_ELEM), clientWindow);
+    appendClientWindowToForms(forms, clientWindow, namingContainerId = "") {
+        this.assignState(forms, (0, Const_1.$nsp)(Const_1.SEL_CLIENT_WINDOW_ELEM), clientWindow, namingContainerId);
     }
     /**
      * generic append state which appends a certain state as hidden element to an existing set of forms
@@ -7020,41 +7150,26 @@ class ResponseProcessor {
      * @param selector the selector for the state
      * @param state the state itself which needs to be assigned
      *
+     * @param namingContainerId
      * @private
      */
-    assignState(forms, selector, state) {
-        forms.each((form) => {
-            let stateHolders = form.querySelectorAll(selector)
-                .orElseLazy(() => {
-                return selector.indexOf("ViewState") != -1 ?
-                    ResponseProcessor.newViewStateElement(form) :
-                    ResponseProcessor.newClientWindowElement(form);
-            });
-            stateHolders.attr("value").value = state;
+    assignState(forms, selector, state, namingContainerId) {
+        /**
+         * creates the viewState or client window id element
+         * @param form
+         */
+        const createAndAppendHiddenInput = (form) => {
+            return new HiddenInputBuilder_1.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)
-     */
-    static newViewStateElement(parent) {
-        let newElement = mona_dish_1.DQ.fromMarkup((0, Const_1.$nsp)(Const_1.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)
-     */
-    static newClientWindowElement(parent) {
-        let newElement = mona_dish_1.DQ.fromMarkup((0, Const_1.$nsp)(Const_1.HTML_CLIENT_WINDOW));
-        newElement.appendTo(parent);
-        return newElement;
-    }
     /**
      * Stores certain aspects of the dom for later post-processing
      *
@@ -7088,11 +7203,11 @@ class ResponseProcessor {
      * @returns if it is a viewState node
      */
     static isViewStateNode(node) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        let separatorChar = ((_a = window === null || window === void 0 ? void 0 : window.faces) !== null && _a !== void 0 ? _a : window === null || window === void 0 ? void 0 : window.jsf).separatorchar;
-        return "undefined" != typeof ((_b = node === null || node === void 0 ? void 0 : node.id) === null || _b === void 0 ? void 0 : _b.value) && (((_c = node === null || node === void 0 ? void 0 : node.id) === null || _c === void 0 ? void 0 : _c.value) == (0, Const_1.$nsp)(Const_1.P_VIEWSTATE) ||
-            ((_e = (_d = node === null || node === void 0 ? void 0 : node.id) === null || _d === void 0 ? void 0 : _d.value) === null || _e === void 0 ? void 0 : _e.indexOf([separatorChar, (0, Const_1.$nsp)(Const_1.P_VIEWSTATE)].join(Const_1.EMPTY_STR))) != -1 ||
-            ((_g = (_f = node === null || node === void 0 ? void 0 : node.id) === null || _f === void 0 ? void 0 : _f.value) === null || _g === void 0 ? void 0 : _g.indexOf([(0, Const_1.$nsp)(Const_1.P_VIEWSTATE), separatorChar].join(Const_1.EMPTY_STR))) != -1);
+        var _a, _b, _c, _d, _e, _f;
+        const SEP = (0, Const_1.$faces)().separatorchar;
+        return "undefined" != typeof ((_a = node === null || node === void 0 ? void 0 : node.id) === null || _a === void 0 ? void 0 : _a.value) && (((_b = node === null || node === void 0 ? void 0 : node.id) === null || _b === void 0 ? void 0 : _b.value) == (0, Const_1.$nsp)(Const_1.P_VIEWSTATE) ||
+            ((_d = (_c = node === null || node === void 0 ? void 0 : node.id) === null || _c === void 0 ? void 0 : _c.value) === null || _d === void 0 ? void 0 : _d.indexOf([SEP, (0, Const_1.$nsp)(Const_1.P_VIEWSTATE)].join(Const_1.EMPTY_STR))) != -1 ||
+            ((_f = (_e = node === null || node === void 0 ? void 0 : node.id) === null || _e === void 0 ? void 0 : _e.value) === null || _f === void 0 ? void 0 : _f.indexOf([(0, Const_1.$nsp)(Const_1.P_VIEWSTATE), SEP].join(Const_1.EMPTY_STR))) != -1);
     }
     /**
      * incoming client window node also needs special processing
@@ -7101,11 +7216,11 @@ class ResponseProcessor {
      * @returns true of it ii
      */
     static isClientWindowNode(node) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        let separatorChar = ((_a = window === null || window === void 0 ? void 0 : window.faces) !== null && _a !== void 0 ? _a : window === null || window === void 0 ? void 0 : window.jsf).separatorchar;
-        return "undefined" != typeof ((_b = node === null || node === void 0 ? void 0 : node.id) === null || _b === void 0 ? void 0 : _b.value) && (((_c = node === null || node === void 0 ? void 0 : node.id) === null || _c === void 0 ? void 0 : _c.value) == (0, Const_1.$nsp)(Const_1.P_CLIENT_WINDOW) ||
-            ((_e = (_d = node === null || node === void 0 ? void 0 : node.id) === null || _d === void 0 ? void 0 : _d.value) === null || _e === void 0 ? void 0 : _e.indexOf([separatorChar, (0, Const_1.$nsp)(Const_1.P_CLIENT_WINDOW)].join(Const_1.EMPTY_STR))) != -1 ||
-            ((_g = (_f = node === null || node === void 0 ? void 0 : node.id) === null || _f === void 0 ? void 0 : _f.value) === null || _g === void 0 ? void 0 : _g.indexOf([(0, Const_1.$nsp)(Const_1.P_CLIENT_WINDOW), separatorChar].join(Const_1.EMPTY_STR))) != -1);
+        var _a, _b, _c, _d, _e, _f;
+        const SEP = (0, Const_1.$faces)().separatorchar;
+        return "undefined" != typeof ((_a = node === null || node === void 0 ? void 0 : node.id) === null || _a === void 0 ? void 0 : _a.value) && (((_b = node === null || node === void 0 ? void 0 : node.id) === null || _b === void 0 ? void 0 : _b.value) == (0, Const_1.$nsp)(Const_1.P_CLIENT_WINDOW) ||
+            ((_d = (_c = node === null || node === void 0 ? void 0 : node.id) === null || _c === void 0 ? void 0 : _c.value) === null || _d === void 0 ? void 0 : _d.indexOf([SEP, (0, Const_1.$nsp)(Const_1.P_CLIENT_WINDOW)].join(Const_1.EMPTY_STR))) != -1 ||
+            ((_f = (_e = node === null || node === void 0 ? void 0 : node.id) === null || _e === void 0 ? void 0 : _e.value) === null || _f === void 0 ? void 0 : _f.indexOf([(0, Const_1.$nsp)(Const_1.P_CLIENT_WINDOW), SEP].join(Const_1.EMPTY_STR))) != -1);
     }
     triggerOnError(errorData) {
         this.externalContext.getIf(Const_1.ON_ERROR).orElseLazy(() => this.internalContext.getIf(Const_1.ON_ERROR).value).orElse(Const_1.EMPTY_FUNC).value(errorData);
@@ -7115,24 +7230,21 @@ class ResponseProcessor {
      * @param affectedForm
      * @private
      */
-    executeOrRenderFilter(affectedForm) {
-        let executes = this.externalContext.getIf((0, Const_1.$nsp)(Const_1.P_EXECUTE)).orElse("@none").value.split(/\s+/gi);
-        let renders = this.externalContext.getIf(Const_1.P_RENDER_OVERRIDE)
+    isInExecuteOrRender(affectedForm) {
+        const executes = this.externalContext.getIf((0, Const_1.$nsp)(Const_1.P_EXECUTE)).orElse("@none").value.split(/\s+/gi);
+        const renders = this.externalContext.getIf(Const_1.P_RENDER_OVERRIDE)
             .orElseLazy(() => this.externalContext.getIf((0, Const_1.$nsp)(Const_1.P_RENDER)).value)
-            .orElse("@none").value.split(/\s+/gi);
-        let executeAndRenders = executes.concat(...renders);
+            .orElse(Const_1.IDENT_NONE).value.split(/\s+/gi);
+        const executeAndRenders = executes.concat(...renders);
         return mona_dish_1.LazyStream.of(...executeAndRenders).filter(nameOrId => {
-            if (nameOrId == "@all") {
-                return true;
-            }
-            if (nameOrId == "@none") {
+            if ([Const_1.IDENT_ALL, Const_1.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();
     }
     /**
@@ -7143,17 +7255,19 @@ class ResponseProcessor {
     getContainerForms(namingContainerId) {
         if (namingContainerId.isPresent()) {
             //naming container mode, all forms under naming container id must be processed
-            return mona_dish_1.DQ.byId(namingContainerId.value)
-                .orElse((0, mona_dish_1.DQ$)(`form[id='${namingContainerId.value}'], form[name='${namingContainerId.value}']`))
+            return (0, mona_dish_1.DQ$)(this.getNameOrIdSelector(namingContainerId.value))
                 // missing condition if the naming container is not present we have to
                 // use the body as fallback
-                .orElse(mona_dish_1.DQ.byTagName(Const_1.TAG_BODY))
-                .byTagName(Const_1.TAG_FORM, true);
+                .orElseLazy(() => mona_dish_1.DQ.byTagName(Const_1.HTML_TAG_BODY))
+                .byTagName(Const_1.HTML_TAG_FORM, true);
         }
         else {
-            return mona_dish_1.DQ.byTagName(Const_1.TAG_FORM);
+            return mona_dish_1.DQ.byTagName(Const_1.HTML_TAG_FORM);
         }
     }
+    getNameOrIdSelector(nameOrId) {
+        return `[id='${nameOrId}'], [name='${nameOrId}']`;
+    }
 }
 exports.ResponseProcessor = ResponseProcessor;
 
@@ -7277,7 +7391,7 @@ class XhrFormData extends mona_dish_1.Config {
      * @param form the form holding the view state value
      */
     applyViewState(form) {
-        let viewState = form.byId(Const_1.P_VIEWSTATE, true).inputValue;
+        let viewState = form.querySelectorAllDeep(`[name*='${Const_1.P_VIEWSTATE}'`).inputValue;
         this.appendIf(viewState.isPresent(), Const_1.P_VIEWSTATE).value = viewState.value;
     }
     /**
@@ -7502,15 +7616,14 @@ class XhrRequest {
         });
     }
     start() {
-        var _a;
         let ignoreErr = failSaveExecute;
         let xhrObject = this.xhrObject;
         let executesArr = () => {
-            return this.requestContext.getIf(Const_1.CTX_PARAM_PASS_THR, Const_1.P_EXECUTE).get("none").value.split(/\s+/gi);
+            return this.requestContext.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_EXECUTE).get("none").value.split(/\s+/gi);
         };
         try {
             let formElement = this.sourceForm.getAsElem(0).value;
-            let viewState = ((_a = window === null || window === void 0 ? void 0 : window.faces) !== null && _a !== void 0 ? _a : window === null || window === void 0 ? void 0 : window.jsf).getViewState(formElement);
+            let viewState = (0, Const_1.$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
@@ -7524,12 +7637,12 @@ class XhrRequest {
             this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
             // next step the pass through parameters are merged in for post params
             let requestContext = this.requestContext;
-            let passThroughParams = requestContext.getIf(Const_1.CTX_PARAM_PASS_THR);
+            let requestPassThroughParams = requestContext.getIf(Const_1.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);
-            this.responseContext = passThroughParams.deepCopy;
+            formData.shallowMerge(requestPassThroughParams, true, true);
+            this.responseContext = requestPassThroughParams.deepCopy;
             // we have to shift the internal passthroughs around to build up our response context
             let responseContext = this.responseContext;
             responseContext.assign(Const_1.CTX_PARAM_MF_INTERNAL).value = this.internalContext.value;
@@ -7647,7 +7760,7 @@ class XhrRequest {
         reject();
     }
     onSuccess(resolve) {
-        var _a, _b, _c;
+        var _a, _b;
         this.sendEvent(Const_1.COMPLETE);
         // malformed responses always result in empty response xml
         // per spec a valid response cannot be empty
@@ -7655,7 +7768,7 @@ class XhrRequest {
             this.handleMalFormedXML(resolve);
             return;
         }
-        ((_b = window === null || window === void 0 ? void 0 : window.faces) !== null && _b !== void 0 ? _b : window.jsf).ajax.response(this.xhrObject, (_c = this.responseContext.value) !== null && _c !== void 0 ? _c : {});
+        (0, Const_1.$faces)().ajax.response(this.xhrObject, (_b = this.responseContext.value) !== null && _b !== void 0 ? _b : {});
     }
     handleMalFormedXML(resolve) {
         var _a;