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

package/dist/window/faces-development.js

@@ -2760,6 +2760,12 @@ class Config extends Optional {
     toJson() {
         return JSON.stringify(this.value);
     }
+    /**
+     * returns the first config level as streeam
+     */
+    get stream() {
+        return Stream_1.Stream.of(...Object.keys(this.value)).map(key => [key, this.value[key]]);
+    }
     getClass() {
         return Config;
     }
@@ -4478,6 +4484,7 @@ var Implementation;
         assignClientWindowId(form, requestCtx);
         assignExecute(options, requestCtx, form, elementId);
         assignRender(options, requestCtx, form, elementId);
+        assignNamingContainerData(internalCtx, form);
         //now we enqueue the request as asynchronous runnable into our request
         //queue and let the queue take over the rest
         Implementation.queueHandler.addRequestToQueue(elem, form, requestCtx, internalCtx, delay, timeout);
@@ -4650,7 +4657,9 @@ var Implementation;
         if (!element.isTag(Const_1.HTML_TAG_FORM)) {
             throw new Error(getMessage("ERR_VIEWSTATE"));
         }
-        let formData = new XhrFormData_1.XhrFormData(element);
+        const dummyContext = new mona_dish_1.Config({});
+        assignNamingContainerData(dummyContext, mona_dish_1.DQ.byId(form));
+        let formData = new XhrFormData_1.XhrFormData(element, (0, RequestDataResolver_1.resoveNamingContainerMapper)(dummyContext));
         return formData.toString();
     }
     Implementation.getViewState = getViewState;
@@ -4725,6 +4734,21 @@ var Implementation;
             targetContext.assign(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_CLIENT_WINDOW).value = clientWindow;
         }
     }
+    /**
+     * determines the current naming container
+     * and assigns it internally
+     *
+     * @param internalContext
+     * @param formElement
+     * @private
+     */
+    function assignNamingContainerData(internalContext, formElement) {
+        const viewRootId = (0, RequestDataResolver_1.resolveViewRootId)(formElement);
+        if (!!viewRootId) {
+            internalContext.assign(Const_1.NAMED_VIEWROOT).value = true;
+            internalContext.assign(Const_1.NAMING_CONTAINER_ID).value = viewRootId;
+        }
+    }
     /**
      * transforms the user values to the expected one
      * with the proper none all form and this handling
@@ -5175,7 +5199,7 @@ var PushImpl;
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-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 = exports.NAMED_VIEWROOT = exports.XML_ATTR_NAMED_VIEWROOT = void 0;
+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.NAMING_CONTAINER_ID = exports.P_PARTIAL_SOURCE = exports.NAMED_VIEWROOT = exports.XML_ATTR_NAMED_VIEWROOT = void 0;
 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 = exports.DELAY_NONE = exports.CTX_OPTIONS_DELAY = 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 = exports.UPDATE_FORMS = exports.XML_TAG_ATTR = void 0;
 /*
@@ -5184,7 +5208,7 @@ exports.$nsp = exports.$faces = exports.UNKNOWN = exports.MAX_RECONNECT_ATTEMPTS
 exports.XML_ATTR_NAMED_VIEWROOT = "namedViewRoot";
 exports.NAMED_VIEWROOT = "namedViewRoot";
 exports.P_PARTIAL_SOURCE = "jakarta.faces.source";
-exports.PARTIAL_ID = "partialId";
+exports.NAMING_CONTAINER_ID = "myfaces.partialId";
 exports.VIEW_ID = "myfaces.viewId";
 exports.P_VIEWSTATE = "jakarta.faces.ViewState";
 exports.P_CLIENT_WINDOW = "jakarta.faces.ClientWindow";
@@ -6507,7 +6531,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.resolveViewId = exports.resolveForm = exports.resolveFinalUrl = exports.resolveTargetUrl = exports.resolveHandlerFunc = void 0;
+exports.resolveDefaults = exports.getEventTarget = exports.resolveWindowId = exports.resolveDelay = exports.resolveTimeout = exports.resoveNamingContainerMapper = exports.resolveViewRootId = exports.resolveViewId = exports.resolveForm = exports.resolveFinalUrl = exports.resolveTargetUrl = exports.resolveHandlerFunc = void 0;
 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");
@@ -6528,6 +6552,7 @@ const Assertions_1 = __webpack_require__(/*! ../util/Assertions */ "./src/main/t
  * @param funcName
  */
 function resolveHandlerFunc(requestContext, responseContext, funcName) {
+    responseContext = responseContext || new mona_dish_1.Config({});
     return responseContext.getIf(funcName)
         .orElseLazy(() => requestContext.getIf(funcName).value)
         .orElse(Const_1.EMPTY_FUNC).value;
@@ -6566,6 +6591,32 @@ function resolveViewId(form) {
     return form.id.value.indexOf(viewStateViewId) === 0 ? viewStateViewId : "";
 }
 exports.resolveViewId = resolveViewId;
+function resolveViewRootId(form) {
+    const viewState = form.querySelectorAll(`input[type='hidden'][name*='${(0, Const_1.$nsp)(Const_1.P_VIEWSTATE)}']`).attr("name").orElse("").value;
+    const divider = (0, Const_1.$faces)().separatorchar;
+    const viewId = viewState.split(divider, 2)[0];
+    //different to the identifier the form id is never prepended to the viewstate
+    return viewId.indexOf((0, Const_1.$nsp)(Const_1.P_VIEWSTATE)) === -1 ? viewId : "";
+}
+exports.resolveViewRootId = resolveViewRootId;
+/**
+ * as per jsdoc before the request it must be ensured that every post argument
+ * is prefixed with the naming container id (there is an exception in mojarra with
+ * the element=element param, which we have to follow here as well.
+ * (inputs are prefixed by name anyway normally this only affects our standard parameters)
+ * @private
+ */
+function resoveNamingContainerMapper(internalContext) {
+    const isNamedViewRoot = internalContext.getIf(Const_1.NAMED_VIEWROOT).isPresent();
+    if (!isNamedViewRoot) {
+        return;
+    }
+    const partialId = internalContext.getIf(Const_1.NAMING_CONTAINER_ID).value;
+    const SEP = (0, Const_1.$faces)().separatorchar;
+    const prefix = partialId + SEP;
+    return (key, value) => (key.indexOf(prefix) == 0) ? [key, value] : [prefix + key, value];
+}
+exports.resoveNamingContainerMapper = resoveNamingContainerMapper;
 function resolveTimeout(options) {
     var _a;
     let getCfg = Lang_1.ExtLang.getLocalOrGlobalConfig;
@@ -6846,7 +6897,7 @@ var Response;
         // under or in body as identifier
         var _a;
         let partialId = (_a = node === null || node === void 0 ? void 0 : node.id) === null || _a === void 0 ? void 0 : _a.value;
-        internalContext.assignIf(!!partialId, Const_1.PARTIAL_ID).value = partialId; // second case mojarra
+        internalContext.assignIf(!!partialId, Const_1.NAMING_CONTAINER_ID).value = partialId; // second case mojarra
         // there must be at least one container viewstate element resembling the viewroot that we know
         // this is named
         responseProcessor.updateNamedViewRootState();
@@ -7243,7 +7294,7 @@ class ResponseProcessor {
     fixViewStates() {
         mona_dish_1.Stream.ofAssoc(this.internalContext.getIf(Const_1.APPLIED_VST).orElse({}).value)
             .each(([, value]) => {
-            const namingContainerId = this.internalContext.getIf(Const_1.PARTIAL_ID);
+            const namingContainerId = this.internalContext.getIf(Const_1.NAMING_CONTAINER_ID);
             const namedViewRoot = !!this.internalContext.getIf(Const_1.NAMED_VIEWROOT).value;
             const affectedForms = this.getContainerForms(namingContainerId)
                 .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
@@ -7257,7 +7308,7 @@ class ResponseProcessor {
     fixClientWindow() {
         mona_dish_1.Stream.ofAssoc(this.internalContext.getIf(Const_1.APPLIED_CLIENT_WINDOW).orElse({}).value)
             .each(([, value]) => {
-            const namingContainerId = this.internalContext.getIf(Const_1.PARTIAL_ID);
+            const namingContainerId = this.internalContext.getIf(Const_1.NAMING_CONTAINER_ID);
             const namedViewRoot = !!this.internalContext.getIf(Const_1.NAMED_VIEWROOT).value;
             const affectedForms = this.getContainerForms(namingContainerId)
                 .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
@@ -7265,7 +7316,7 @@ class ResponseProcessor {
         });
     }
     updateNamedViewRootState() {
-        let partialId = this.internalContext.getIf(Const_1.PARTIAL_ID);
+        let partialId = this.internalContext.getIf(Const_1.NAMING_CONTAINER_ID);
         let namedViewRoot = this.internalContext.getIf(Const_1.NAMED_VIEWROOT);
         if (partialId.isPresent() &&
             (namedViewRoot.isAbsent() ||
@@ -7465,6 +7516,7 @@ const mona_dish_1 = __webpack_require__(/*! mona-dish */ "./node_modules/mona-di
 const Const_1 = __webpack_require__(/*! ../core/Const */ "./src/main/typescript/impl/core/Const.ts");
 var isString = mona_dish_1.Lang.isString;
 const ExtDomQuery_1 = __webpack_require__(/*! ../util/ExtDomQuery */ "./src/main/typescript/impl/util/ExtDomQuery.ts");
+const defaultParamsMapper = (key, item) => [key, item];
 /**
  * A unified form data class
  * which builds upon our configuration.
@@ -7486,9 +7538,10 @@ class XhrFormData extends mona_dish_1.Config {
      * @param executes the executes id list for the elements to being processed
      * @param partialIds partial ids to collect, to reduce the data sent down
      */
-    constructor(dataSource, viewState, executes, partialIds) {
+    constructor(dataSource, paramsMapper = defaultParamsMapper, viewState, executes, partialIds) {
         super({});
         this.dataSource = dataSource;
+        this.paramsMapper = paramsMapper;
         this.partialIds = partialIds;
         /**
          * Checks if the given datasource is a multipart request source
@@ -7554,10 +7607,10 @@ class XhrFormData extends mona_dish_1.Config {
      * @param form the form holding the view state value
      */
     applyViewState(form) {
-        let viewStateElement = form.querySelectorAllDeep(`[name*='${Const_1.P_VIEWSTATE}'`);
+        let viewStateElement = form.querySelectorAllDeep(`[name*='${(0, Const_1.$nsp)(Const_1.P_VIEWSTATE)}'`);
         let viewState = viewStateElement.inputValue;
         // this.appendIf(viewState.isPresent(), P_VIEWSTATE).value = viewState.value;
-        this.appendIf(viewState.isPresent(), viewStateElement.name.value).value = viewState.value;
+        this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
     }
     /**
      * assigns an url encoded string to this xhrFormData object
@@ -7584,11 +7637,11 @@ class XhrFormData extends mona_dish_1.Config {
             var _a, _b;
             return keyVal.length < 3 ? [(_a = keyVal === null || keyVal === void 0 ? void 0 : keyVal[0]) !== null && _a !== void 0 ? _a : [], (_b = keyVal === null || keyVal === void 0 ? void 0 : keyVal[1]) !== null && _b !== void 0 ? _b : []] : keyVal;
         }
-        //TODO fix files...
         mona_dish_1.Stream.of(...keyValueEntries)
             .map(line => splitToKeyVal(line))
             //special case of having keys without values
             .map(keyVal => fixKeyWithoutVal(keyVal))
+            .map(keyVal => this.paramsMapper(keyVal[0], keyVal[1]))
             .each(keyVal => {
             var _a, _b;
             toMerge.append(keyVal[0]).value = (_b = (_a = keyVal === null || keyVal === void 0 ? void 0 : keyVal.splice(1)) === null || _a === void 0 ? void 0 : _a.join("")) !== null && _b !== void 0 ? _b : "";
@@ -7597,6 +7650,7 @@ class XhrFormData extends mona_dish_1.Config {
         this.shallowMerge(toMerge);
     }
     /**
+     * @param paramsMapper ... pre encode the params if needed, default is to map them 1:1
      * @returns a Form data representation, this is needed for file submits
      */
     toFormData() {
@@ -7621,10 +7675,12 @@ class XhrFormData extends mona_dish_1.Config {
         }
         let entries = mona_dish_1.LazyStream.of(...Object.keys(this.value))
             .filter(key => this.value.hasOwnProperty(key))
-            .flatMap(key => mona_dish_1.Stream.of(...this.value[key]).map(val => [key, val])
+            .flatMap(key => mona_dish_1.Stream.of(...this.value[key])
+            .map(val => {
+            return this.paramsMapper(key, val);
+        }))
             //we cannot encode file elements that is handled by multipart requests anyway
             .filter(([, value]) => !(value instanceof ExtDomQuery_1.ExtDomQuery.global().File))
-            .collect(new mona_dish_1.ArrayCollector()))
             .map(keyVal => {
             return `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
         })
@@ -7657,7 +7713,7 @@ class XhrFormData extends mona_dish_1.Config {
          *
          */
         this.encodeSubmittableFields(this, this.dataSource, this.partialIds);
-        if (this.getIf(Const_1.P_VIEWSTATE).isPresent()) {
+        if (this.getIf((0, Const_1.$nsp)(Const_1.P_VIEWSTATE)).isPresent()) {
             return;
         }
         this.applyViewState(this.dataSource);
@@ -7682,13 +7738,27 @@ class XhrFormData extends mona_dish_1.Config {
             toEncode = parentItem;
         }
         //lets encode the form elements
-        this.shallowMerge(toEncode.deepElements.encodeFormElement());
+        let formElements = toEncode.deepElements.encodeFormElement();
+        const mapped = this.remapKeysForNamingCoontainer(formElements);
+        this.shallowMerge(mapped);
+    }
+    remapKeysForNamingCoontainer(formElements) {
+        let ret = new mona_dish_1.Config({});
+        formElements.stream.map(([key, item]) => this.paramsMapper(key, item))
+            .each(([key, item]) => {
+            ret.assign(key).value = item;
+        });
+        return ret;
+    }
+    remapKeyForNamingContainer(key) {
+        return this.paramsMapper(key, "")[0];
     }
     appendInputs(ret) {
-        mona_dish_1.Stream.of(...Object.keys(this.value))
-            .each(key => {
-            mona_dish_1.Stream.of(...this.value[key]).each(item => ret.append(key, item));
-        });
+        mona_dish_1.Stream.ofAssoc(this.value)
+            .flatMap(([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
+            return { key, item };
+        }))
+            .each(({ key, item }) => ret.append(key, item));
     }
 }
 exports.XhrFormData = XhrFormData;
@@ -7798,7 +7868,7 @@ class XhrRequest {
             // the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
             // ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
             // anyway TODO remove the partial ids array
-            let formData = new XhrFormData_1.XhrFormData(this.sourceForm, viewState, executesArr(), this.partialIdsArray);
+            let formData = new XhrFormData_1.XhrFormData(this.sourceForm, (0, RequestDataResolver_1.resoveNamingContainerMapper)(this.internalContext), viewState, executesArr(), this.partialIdsArray);
             this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
             // next step the pass through parameters are merged in for post params
             this.requestContext.$nspEnabled = false;