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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.0-RC.13",
+  "version": "4.0.0-RC.14",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/chai": "^4.3.4",
-    "@types/mocha": "^10.0.0",
+    "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.9",
     "@types/sinon": "^10.0.13",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -37,7 +37,7 @@
     "nyc": "^15.1.0",
     "replace-in-file": "^6.3.5",
     "rxjs": "^7.5.7",
-    "sinon": "^14.0.2",
+    "sinon": "^15.0.0",
     "terser-webpack-plugin": "^5.3.6",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
@@ -48,6 +48,6 @@
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
-    "mona-dish": "^0.23.9"
+    "mona-dish": "^0.23.10"
   }
 }

package/src/main/typescript/@types/definitions/index.d.ts

@@ -134,6 +134,8 @@ declare global {
         };
     }
 
+
+
     /*
      * Global namespaces type definitions
      */

package/src/main/typescript/api/_api.ts

@@ -16,7 +16,7 @@
 import {Implementation} from "../impl/AjaxImpl";
 import {PushImpl} from "../impl/PushImpl";
 import {oam as _oam} from "../myfaces/OamSubmit";
-import {$nsp, CTX_PARAM_EXECUTE, CTX_PARAM_RENDER, P_BEHAVIOR_EVENT} from "../impl/core/Const";
+import {$nsp, CTX_OPTIONS_EXECUTE, CTX_PARAM_RENDER, P_BEHAVIOR_EVENT} from "../impl/core/Const";
 import {ErrorData} from "../impl/xhrCore/ErrorData";
 import {EventData} from "../impl/xhrCore/EventData";
 
@@ -257,7 +257,7 @@ export module myfaces {
            options[$nsp(P_BEHAVIOR_EVENT)] = eventName;
         }
         if (execute) {
-            options[CTX_PARAM_EXECUTE] = execute;
+            options[CTX_OPTIONS_EXECUTE] = execute;
         }
         if (render) {
             options[CTX_PARAM_RENDER] = render;

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

@@ -27,11 +27,10 @@ import {EventData} from "./xhrCore/EventData";
 import {ExtLang} from "./util/Lang";
 
 import {
-    CTX_PARAM_EXECUTE,
-    CTX_PARAM_PASS_THR,
+    CTX_OPTIONS_EXECUTE,
+    CTX_PARAM_REQ_PASS_THR,
     CTX_PARAM_SRC_CTL_ID,
     CTX_PARAM_SRC_FRM_ID,
-    CTX_PARAM_TR_TYPE,
     IDENT_ALL,
     IDENT_FORM,
     IDENT_NONE,
@@ -48,15 +47,14 @@ import {
     P_RESET_VALUES,
     P_WINDOW_ID,
     CTX_PARAM_RENDER,
-    REQ_TYPE_POST,
     SOURCE,
-    TAG_FORM, CTX_PARAM_SPEC_PARAMS
+    HTML_TAG_FORM, CTX_OPTIONS_PARAMS, VIEW_ID, $faces
 } from "./core/Const";
 import {
     resolveDefaults,
     resolveDelay,
     resolveForm,
-    resolveTimeout
+    resolveTimeout, resolveViewId
 } from "./xhrCore/RequestDataResolver";
 
 /*
@@ -263,6 +261,7 @@ export module Implementation {
          * with detached objects
          */
         const form: DQ = resolveForm(requestCtx, elem, resolvedEvent);
+        const viewId: string = resolveViewId(form);
         const formId = form.id.value;
         const delay: number = resolveDelay(options);
         const timeout: number = resolveTimeout(options);
@@ -270,12 +269,12 @@ export module Implementation {
         requestCtx.assignIf(!!windowId, P_WINDOW_ID).value = windowId;
 
         // old non spec behavior will be removed after it is clear whether the removal breaks any code
-        requestCtx.assign(CTX_PARAM_PASS_THR).value = filterPassThroughValues(options.value);
+        requestCtx.assign(CTX_PARAM_REQ_PASS_THR).value = filterPassThroughValues(options.value);
 
         // spec conform behavior, all passthrough params must be under "passthrough
-        const params = remapArrayToAssocArr(options.getIf(CTX_PARAM_SPEC_PARAMS).orElse({}).value);
-        requestCtx.getIf(CTX_PARAM_PASS_THR).shallowMerge(new Config(params), true);
-        requestCtx.assignIf(!!resolvedEvent, CTX_PARAM_PASS_THR, P_EVT).value = resolvedEvent?.type;
+        const params = remapArrayToAssocArr(options.getIf(CTX_OPTIONS_PARAMS).orElse({}).value);
+        requestCtx.getIf(CTX_PARAM_REQ_PASS_THR).shallowMerge(new Config(params), true);
+        requestCtx.assignIf(!!resolvedEvent, CTX_PARAM_REQ_PASS_THR, P_EVT).value = resolvedEvent?.type;
 
         /**
          * ajax pass through context with the source
@@ -283,6 +282,8 @@ export module Implementation {
          */
         requestCtx.assign(SOURCE).value = elementId;
 
+        requestCtx.assign(VIEW_ID).value = viewId;
+
         /**
          * on resolvedEvent and onError...
          * those values will be traversed later on
@@ -299,12 +300,12 @@ export module Implementation {
         /**
          * binding contract the jakarta.faces.source must be set
          */
-        requestCtx.assign(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value = elementId;
+        requestCtx.assign(CTX_PARAM_REQ_PASS_THR, P_PARTIAL_SOURCE).value = elementId;
 
         /**
          * jakarta.faces.partial.ajax must be set to true
          */
-        requestCtx.assign(CTX_PARAM_PASS_THR, P_AJAX).value = true;
+        requestCtx.assign(CTX_PARAM_REQ_PASS_THR, P_AJAX).value = true;
 
         /**
          * if resetValues is set to true
@@ -313,7 +314,7 @@ export module Implementation {
          * the value has to be explicitly true, according to
          * the specs jsdoc
          */
-        requestCtx.assignIf(isResetValues, CTX_PARAM_PASS_THR, P_RESET_VALUES).value = true;
+        requestCtx.assignIf(isResetValues, CTX_PARAM_REQ_PASS_THR, 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
@@ -324,9 +325,8 @@ export module 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(CTX_PARAM_PASS_THR, formId).value = formId;
+        requestCtx.assign(CTX_PARAM_REQ_PASS_THR, formId).value = formId;
         internalCtx.assign(CTX_PARAM_SRC_CTL_ID).value = elementId;
-        internalCtx.assign(CTX_PARAM_TR_TYPE).value = REQ_TYPE_POST;
 
         assignClientWindowId(form, requestCtx);
         assignExecute(options, requestCtx, form, elementId);
@@ -512,7 +512,7 @@ export module Implementation {
          */
 
         let element: DQ = DQ.byId(form, true);
-        if (!element.isTag(TAG_FORM)) {
+        if (!element.isTag(HTML_TAG_FORM)) {
             throw new Error(getMessage("ERR_VIEWSTATE"));
         }
 
@@ -553,7 +553,7 @@ export module Implementation {
      */
     function assignRender(requestOptions: Config, targetContext: Config, issuingForm: DQ, sourceElementId: string) {
         if (requestOptions.getIf(CTX_PARAM_RENDER).isPresent()) {
-            remapDefaultConstants(targetContext.getIf(CTX_PARAM_PASS_THR).get({}), P_RENDER, <string>requestOptions.getIf(CTX_PARAM_RENDER).value, issuingForm, <any>sourceElementId);
+            remapDefaultConstants(targetContext.getIf(CTX_PARAM_REQ_PASS_THR).get({}), P_RENDER, <string>requestOptions.getIf(CTX_PARAM_RENDER).value, issuingForm, <any>sourceElementId, targetContext.getIf(VIEW_ID).value);
         }
     }
 
@@ -571,15 +571,15 @@ export module Implementation {
      */
     function assignExecute(requestOptions: Config, targetContext: Config, issuingForm: DQ, sourceElementId: string) {
 
-        if (requestOptions.getIf(CTX_PARAM_EXECUTE).isPresent()) {
+        if (requestOptions.getIf(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(CTX_PARAM_EXECUTE).value = [requestOptions.getIf(CTX_PARAM_EXECUTE).value, IDENT_THIS].join(" ");
-            remapDefaultConstants(targetContext.getIf(CTX_PARAM_PASS_THR).get({}), P_EXECUTE, <string>requestOptions.getIf(CTX_PARAM_EXECUTE).value, issuingForm, <any>sourceElementId);
+            requestOptions.assign(CTX_OPTIONS_EXECUTE).value = [requestOptions.getIf(CTX_OPTIONS_EXECUTE).value, IDENT_THIS].join(" ");
+            remapDefaultConstants(targetContext.getIf(CTX_PARAM_REQ_PASS_THR).get({}), P_EXECUTE, <string>requestOptions.getIf(CTX_OPTIONS_EXECUTE).value, issuingForm, <any>sourceElementId, targetContext.getIf(VIEW_ID).value);
         } else {
-            targetContext.assign(CTX_PARAM_PASS_THR, P_EXECUTE).value = sourceElementId;
+            targetContext.assign(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).value = sourceElementId;
         }
     }
 
@@ -591,9 +591,9 @@ export module Implementation {
      */
     function assignClientWindowId(form: DQ, targetContext: Config) {
 
-        let clientWindow = (window?.faces ?? window?.jsf).getClientWindow(form.getAsElem(0).value);
+        let clientWindow = $faces().getClientWindow(form.getAsElem(0).value);
         if (clientWindow) {
-            targetContext.assign(CTX_PARAM_PASS_THR, P_CLIENT_WINDOW).value = clientWindow;
+            targetContext.assign(CTX_PARAM_REQ_PASS_THR, P_CLIENT_WINDOW).value = clientWindow;
         }
     }
 
@@ -611,14 +611,25 @@ export module 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 viewId the naming container id ("" default if none is given)
      */
-    function remapDefaultConstants(targetConfig: Config, targetKey: string, userValues: string, issuingForm: DQ, issuingElementId: string): Config {
+    function remapDefaultConstants(targetConfig: Config, targetKey: string, userValues: string, issuingForm: DQ, issuingElementId: string, viewId: string = ""): Config {
         //a cleaner implementation of the transform list method
-
+        const SEP = $faces().separatorchar;
         let iterValues: string[] = (userValues) ? trim(userValues).split(/\s+/gi) : [];
         let ret = [];
         let processed: {[key: string]: boolean} = {};
 
+        //TODO check if this is right
+        const remapNamingContainer = item => {
+            if(item.indexOf(SEP) === 0 && viewId !== "") {
+                item = [viewId, SEP, item.substring(1)].join("");
+            } else if(item.indexOf(SEP) === 0) {
+                item = item.substring(1);
+            }
+            return item;
+        };
+
         // 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++) {
@@ -636,22 +647,22 @@ export module Implementation {
                     return targetConfig;
                 //@form pushes the issuing form id into our list
                 case 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 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;
     }

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

@@ -17,8 +17,11 @@
 /*
  * [export const] constants
  */
+
+
 export const P_PARTIAL_SOURCE = "jakarta.faces.source";
 export const PARTIAL_ID = "partialId";
+export const VIEW_ID = "myfaves.viewId";
 export const P_VIEWSTATE = "jakarta.faces.ViewState";
 export const P_CLIENT_WINDOW = "jakarta.faces.ClientWindow";
 export const P_VIEWROOT = "jakarta.faces.ViewRoot";
@@ -91,21 +94,16 @@ export const SERVER_ERROR = "serverError";
 export const CLIENT_ERROR = "clientError";
 export const TIMEOUT_EVENT = "timeout";
 
-export const CTX_PARAM_MF_INTERNAL = "_mfInternal";
-
-export const CTX_PARAM_SRC_FRM_ID = "_mfSourceFormId";
-export const CTX_PARAM_SRC_CTL_ID = "_mfSourceControlId";
-export const CTX_PARAM_TR_TYPE = "_mfTransportType";
-export const CTX_PARAM_PASS_THR = "passThrgh";
-export const CTX_PARAM_SPEC_PARAMS = "params";
-
-export const CTX_PARAM_DELAY = "delay";
-export const CTX_PARAM_TIMEOUT = "timeout";
-export const CTX_PARAM_RST = "resetValues";
-export const CTX_PARAM_EXECUTE = "execute";
-
-export const STAGE_DEVELOPMENT = "Development";
+export const CTX_OPTIONS_PARAMS = "params";
+export const CTX_OPTIONS_DELAY = "delay";
+export const CTX_OPTIONS_TIMEOUT = "timeout";
+export const CTX_OPTIONS_RESET = "resetValues";
+export const CTX_OPTIONS_EXECUTE = "execute";
 
+export const CTX_PARAM_MF_INTERNAL = "myfaces.internal";
+export const CTX_PARAM_SRC_FRM_ID = "myfaces.source.formId";
+export const CTX_PARAM_SRC_CTL_ID = "myfaces.source.controlId";
+export const CTX_PARAM_REQ_PASS_THR = "myfaces.request.passThrough";
 
 export const CONTENT_TYPE = "Content-Type";
 export const HEAD_FACES_REQ = "Faces-Request";
@@ -122,13 +120,12 @@ export const MULTIPART = "multipart/form-data";
 export const NO_TIMEOUT = 0;
 export const STD_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
 
-export const TAG_HEAD = "HEAD";
-export const TAG_FORM = "FORM";
-export const TAG_BODY = "BODY";
-export const TAG_BEFORE = "before";
-export const TAG_AFTER = "after";
-
-export const TAG_ATTR = "attribute";
+export const HTML_TAG_HEAD = "HEAD";
+export const HTML_TAG_FORM = "FORM";
+export const HTML_TAG_BODY = "BODY";
+export const HTML_TAG_LINK = "LINK";
+export const HTML_TAG_SCRIPT = "SCRIPT";
+export const HTML_TAG_STYLE = "STYLE";
 
 
 export const SEL_VIEWSTATE_ELEM = "[name='" + P_VIEWSTATE + "']";
@@ -146,38 +143,40 @@ export const ATTR_VALUE = "value";
 export const ATTR_ID = "id";
 
 /*partial response types*/
-export const RESP_PARTIAL = "partial-response";
+export const XML_TAG_PARTIAL_RESP = "partial-response";
 
 /*partial commands*/
-export const CMD_CHANGES = "changes";
-export const CMD_UPDATE = "update";
-export const CMD_DELETE = "delete";
-export const CMD_INSERT = "insert";
-export const CMD_EVAL = "eval";
-export const CMD_ERROR = "error";
-export const CMD_ATTRIBUTES = "attributes";
-export const CMD_EXTENSION = "extension";
-export const CMD_REDIRECT = "redirect";
+export const XML_TAG_CHANGES = "changes";
+export const XML_TAG_UPDATE = "update";
+export const XML_TAG_DELETE = "delete";
+export const XML_TAG_INSERT = "insert";
+export const XML_TAG_EVAL = "eval";
+export const XML_TAG_ERROR = "error";
+export const XML_TAG_ATTRIBUTES = "attributes";
+export const XML_TAG_EXTENSION = "extension";
+export const XML_TAG_REDIRECT = "redirect";
+export const XML_TAG_BEFORE = "before";
+export const XML_TAG_AFTER = "after";
+export const XML_TAG_ATTR = "attribute";
+
 
 /*other constants*/
 
-export const UPDATE_FORMS = "_updateForms";
-export const UPDATE_ELEMS = "_updateElems";
+export const UPDATE_FORMS = "myfaces.updateForms";
+export const UPDATE_ELEMS = "myfaces.updateElems";
 
 //we want the head elements to be processed before we process the body
 //but after the inner html is done
-export const DEFERRED_HEAD_INSERTS = "_headElems";
+export const DEFERRED_HEAD_INSERTS = "myfaces.headElems";
 
 export const MYFACES = "myfaces";
 
-export const SEL_SCRIPTS_STYLES = "script, style, link";
-
 export const MF_NONE = "__mf_none__";
 
 export const REASON_EXPIRED = "Expired";
 
-export const APPLIED_VST = "appliedViewState";
-export const APPLIED_CLIENT_WINDOW = "appliedClientWindow";
+export const APPLIED_VST = "myfaces.appliedViewState";
+export const APPLIED_CLIENT_WINDOW = "myfaces.appliedClientWindow";
 
 export const RECONNECT_INTERVAL = 500;
 export const MAX_RECONNECT_ATTEMPTS = 25;
@@ -192,6 +191,10 @@ export const UNKNOWN = "UNKNOWN";
  * changed to a simple value passthrough
  */
 
+export function $faces(): FacesAPI {
+     return (window?.faces ?? window?.jsf) as FacesAPI;
+}
+
 export function $nsp(inputNamespace?: any): any {
      if((!inputNamespace) || !inputNamespace?.replace) {
           return inputNamespace;

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

@@ -0,0 +1,19 @@
+import {Config} from "mona-dish";
+
+
+
+export class Context {
+    P_PARTIAL_SOURCE?: string;
+    PARTIAL_ID?: string;
+    P_WINDOW_ID?:string;
+    VIEW_ID?: string;
+    P_VIEWSTATE?: string;
+    P_CLIENT_WINDOW?: string;
+    SOURCE: string;
+    CTX_PARAM_SRC_FRM_ID?: string;
+    CTX_PARAM_SRC_CTL_ID?: string;
+    ON_EVENT ?: (HTMLEvent) => boolean | void;
+    ON_ERROR ?: (HTMLEvent) => boolean | void;
+    MYFACES ?: Config;
+    CTX_PARAM_REQ_PASS_THR = {};
+}

package/src/main/typescript/impl/util/Assertions.ts

@@ -23,7 +23,7 @@ import {
     ON_ERROR,
     ON_EVENT,
     PHASE_PROCESS_RESPONSE,
-    RESP_PARTIAL
+    XML_TAG_PARTIAL_RESP
 } from "../core/Const";
 import {ExtLang} from "./Lang";
 
@@ -60,7 +60,7 @@ export module Assertions {
     export function assertValidXMLResponse(responseXML: XMLQuery) : void | never  {
         assert(!responseXML.isAbsent(), EMPTY_RESPONSE, PHASE_PROCESS_RESPONSE);
         assert(!responseXML.isXMLParserError(),  responseXML.parserErrorText(EMPTY_STR), PHASE_PROCESS_RESPONSE);
-        assert(responseXML.querySelectorAll(RESP_PARTIAL).isPresent(), ERR_NO_PARTIAL_RESPONSE, PHASE_PROCESS_RESPONSE);
+        assert(responseXML.querySelectorAll(XML_TAG_PARTIAL_RESP).isPresent(), ERR_NO_PARTIAL_RESPONSE, PHASE_PROCESS_RESPONSE);
     }
 
     /**

package/src/main/typescript/impl/util/ExtDomQuery.ts

@@ -201,8 +201,8 @@ export class ExtDomQuery extends 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;

package/src/main/typescript/impl/util/HiddenInputBuilder.ts

@@ -0,0 +1,63 @@
+/*! 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.
+ *
+ */
+
+import {DomQuery, DQ, DQ$} from "mona-dish";
+import {$faces, $nsp, HTML_CLIENT_WINDOW, HTML_VIEWSTATE, P_CLIENT_WINDOW, P_VIEWSTATE} from "../core/Const";
+
+/**
+ * Builder for hidden inputs.
+ * ATM only ViewState and Client window
+ * are supported (per spec)
+ *
+ * Improves readability in the response processor!
+ */
+export class HiddenInputBuilder {
+    private namingContainerId?: string;
+    private parent?: DomQuery;
+    private readonly name: string;
+    private readonly template: string;
+
+    constructor(private selector: string) {
+        const isViewState = selector.indexOf($nsp(P_VIEWSTATE)) != -1;
+        this.name = isViewState ? P_VIEWSTATE : P_CLIENT_WINDOW
+        this.template = isViewState ? HTML_VIEWSTATE : HTML_CLIENT_WINDOW
+    }
+
+    withNamingContainerId(namingContainer: string): HiddenInputBuilder {
+        this.namingContainerId = namingContainer;
+        return this;
+    }
+
+    withParent(parent: DomQuery): HiddenInputBuilder {
+        this.parent = parent;
+        return this;
+    }
+
+
+    build(): DomQuery {
+        //TODO naming container id?
+        const cnt = DQ$(`[name='${$nsp(this.name)}']`).length;
+        const SEP = $faces().separatorchar;
+        const newElement = DQ.fromMarkup($nsp(this.template));
+        newElement.id.value = ((this.namingContainerId?.length) ?
+            [this.namingContainerId,  $nsp(this.name),  cnt]:
+            [$nsp(this.name),  cnt]).join(SEP);
+
+        this?.parent?.append(newElement);
+        return newElement;
+    }
+}

package/src/main/typescript/impl/util/Lang.ts

@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * todo replace singleton with module definition
- *
  */
 
 import {Lang as LangBase, Config, Optional, DomQuery, DQ, Stream} from "mona-dish";
 import {Messages} from "../i18n/Messages";
-import {EMPTY_STR, TAG_FORM} from "../core/Const";
+import {EMPTY_STR, HTML_TAG_FORM} from "../core/Const";
 import {getEventTarget} from "../xhrCore/RequestDataResolver";
 
 
@@ -162,23 +160,23 @@ export module ExtLang {
         let queryElem = new DQ(elem);
         let eventTarget = (event) ?  new DQ(getEventTarget(event)) : DomQuery.absent;
 
-        if (queryElem.isTag(TAG_FORM)) {
+        if (queryElem.isTag(HTML_TAG_FORM)) {
             return queryElem;
         }
 
         //html 5 for handling
-        if (queryElem.attr(TAG_FORM).isPresent()) {
-            let formId = queryElem.attr(TAG_FORM).value;
+        if (queryElem.attr(HTML_TAG_FORM).isPresent()) {
+            let formId = queryElem.attr(HTML_TAG_FORM).value;
             let foundForm = DQ.byId(formId, true);
             if (foundForm.isPresent()) {
                 return foundForm;
             }
         }
 
-        let form = queryElem.firstParent(TAG_FORM)
-            .orElseLazy(() => queryElem.byTagName(TAG_FORM, true))
-            .orElseLazy(() => eventTarget.firstParent(TAG_FORM))
-            .orElseLazy(() => eventTarget.byTagName(TAG_FORM))
+        let form = queryElem.firstParent(HTML_TAG_FORM)
+            .orElseLazy(() => queryElem.byTagName(HTML_TAG_FORM, true))
+            .orElseLazy(() => eventTarget.firstParent(HTML_TAG_FORM))
+            .orElseLazy(() => eventTarget.byTagName(HTML_TAG_FORM))
             .first();
 
         assertFormExists(form);

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import {Config, DQ} from "mona-dish";
-import {BEGIN, CTX_PARAM_PASS_THR, EVENT, P_PARTIAL_SOURCE, SOURCE} from "../core/Const";
+import {BEGIN, CTX_PARAM_REQ_PASS_THR, EVENT, P_PARTIAL_SOURCE, SOURCE} from "../core/Const";
 
 export class EventData implements IEventData{
     type: string;
@@ -33,7 +33,7 @@ export class EventData implements IEventData{
 
         let sourceId: string = context.getIf(SOURCE)
             .orElseLazy(() => context.getIf(P_PARTIAL_SOURCE).value)
-            .orElseLazy(() => context.getIf(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value)
+            .orElseLazy(() => context.getIf(CTX_PARAM_REQ_PASS_THR, P_PARTIAL_SOURCE).value)
             .value;
         if (sourceId) {
             eventData.source = DQ.byId(sourceId, true).first().value.value;

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

@@ -16,12 +16,14 @@
 
 import {AssocArrayCollector, Config, DomQuery, DQ, Stream} from "mona-dish";
 import {
-    CTX_PARAM_DELAY,
-    CTX_PARAM_TIMEOUT,
+    $faces,
+    $nsp,
+    CTX_OPTIONS_DELAY,
+    CTX_OPTIONS_TIMEOUT,
     EMPTY_FUNC,
     EMPTY_STR,
     ENCODED_URL,
-    MF_NONE,
+    MF_NONE, P_VIEWSTATE,
     REQ_TYPE_GET,
     REQ_TYPE_POST
 } from "../core/Const";
@@ -80,9 +82,19 @@ export function resolveForm(requestCtx: Config, elem: DQ, event: Event): DQ {
         .orElseLazy(() => ExtLang.getForm(elem.getAsElem(0).value, event));
 }
 
+export function resolveViewId(form: DQ): string {
+    let viewState = form.querySelectorAll(`input[type='hidden'][name*='${$nsp(P_VIEWSTATE)}']`).id.orElse("").value;
+    let divider = $faces().separatorchar;
+    let viewId = viewState.split(divider, 2)[0];
+    if(viewId.indexOf($nsp(P_VIEWSTATE)) === -1) {
+        return viewId;
+    }
+    return "";
+}
+
 export function resolveTimeout(options: Config): number {
     let getCfg = ExtLang.getLocalOrGlobalConfig;
-    return options.getIf(CTX_PARAM_TIMEOUT).value ?? getCfg(options.value, CTX_PARAM_TIMEOUT, 0);
+    return options.getIf(CTX_OPTIONS_TIMEOUT).value ?? getCfg(options.value, CTX_OPTIONS_TIMEOUT, 0);
 }
 
 /**
@@ -94,7 +106,7 @@ export function resolveDelay(options: Config): number {
     let getCfg = ExtLang.getLocalOrGlobalConfig;
 
     // null or non undefined will automatically be mapped to 0 aka no delay
-    let ret = options.getIf(CTX_PARAM_DELAY).value ?? getCfg(options.value, CTX_PARAM_DELAY, 0);
+    let ret = options.getIf(CTX_OPTIONS_DELAY).value ?? getCfg(options.value, CTX_OPTIONS_DELAY, 0);
     // if delay === none, no delay must be used, aka delay 0
     if('none' === ret) {
         ret = 0;

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

@@ -25,7 +25,7 @@ import {
     CTX_PARAM_SRC_FRM_ID,
     SEL_RESPONSE_XML,
     SOURCE,
-    TAG_FORM,
+    HTML_TAG_FORM,
     UPDATE_ELEMS,
     UPDATE_FORMS,
     DEFERRED_HEAD_INSERTS
@@ -106,9 +106,9 @@ export function resolveSourceForm(internalContext: Config, elem: DQ): DQ {
     let sourceFormId = internalContext.getIf(CTX_PARAM_SRC_FRM_ID);
     let sourceForm = new DQ(sourceFormId.isPresent() ? document.forms[sourceFormId.value] : null);
 
-    sourceForm = sourceForm.orElseLazy(() => elem.firstParent(TAG_FORM))
-        .orElseLazy(() => elem.querySelectorAll(TAG_FORM))
-        .orElseLazy(() => DQ.querySelectorAll(TAG_FORM));
+    sourceForm = sourceForm.orElseLazy(() => elem.firstParent(HTML_TAG_FORM))
+        .orElseLazy(() => elem.querySelectorAll(HTML_TAG_FORM))
+        .orElseLazy(() => DQ.querySelectorAll(HTML_TAG_FORM));
 
     return sourceForm;
 }