jsf.js_next_gen 4.0.0-RC.31 → 4.0.0-RC.32

package/dist/window/faces-development.js

@@ -6159,7 +6159,7 @@ exports.ExtConfig = ExtConfig;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.fixKeyWithoutVal = exports.resolveFiles = exports.decodeEncodedValues = exports.encodeFormData = void 0;
+exports.getFormInputsAsStream = exports.fixKeyWithoutVal = exports.resolveFiles = exports.decodeEncodedValues = exports.encodeFormData = void 0;
 const mona_dish_1 = __webpack_require__(/*! mona-dish */ "./node_modules/mona-dish/src/main/typescript/index_core.ts");
 const ExtDomQuery_1 = __webpack_require__(/*! ./ExtDomQuery */ "./src/main/typescript/impl/util/ExtDomQuery.ts");
 const Const_1 = __webpack_require__(/*! ../core/Const */ "./src/main/typescript/impl/core/Const.ts");
@@ -6177,13 +6177,17 @@ function encodeFormData(formData, paramsMapper = (inStr, inVal) => [inStr, inVal
     if (formData.isAbsent()) {
         return defaultStr;
     }
-    let assocValues = formData.value;
-    let entries = mona_dish_1.LazyStream.of(...Object.keys(assocValues))
-        .filter(key => assocValues.hasOwnProperty(key))
-        .flatMap(key => mona_dish_1.Stream.of(...assocValues[key]).map(val => paramsMapper(key, val)))
+    const assocValues = formData.value;
+    const expandValueArrAndRename = key => mona_dish_1.Stream.of(...assocValues[key]).map(val => paramsMapper(key, val));
+    const isPropertyKey = key => assocValues.hasOwnProperty(key);
+    const isNotFile = ([, value]) => !(value instanceof ExtDomQuery_1.ExtDomQuery.global().File);
+    const mapIntoUrlParam = keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
+    const entries = mona_dish_1.LazyStream.of(...Object.keys(assocValues))
+        .filter(isPropertyKey)
+        .flatMap(expandValueArrAndRename)
         //we cannot encode file elements that is handled by multipart requests anyway
-        .filter(([, value]) => !(value instanceof ExtDomQuery_1.ExtDomQuery.global().File))
-        .map(keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`)
+        .filter(isNotFile)
+        .map(mapIntoUrlParam)
         .collect(new mona_dish_1.ArrayCollector());
     return entries.join("&");
 }
@@ -6193,16 +6197,18 @@ exports.encodeFormData = encodeFormData;
  * @param encoded encoded string
  */
 function decodeEncodedValues(encoded) {
-    return mona_dish_1.Stream.of(...decodeURIComponent(encoded).split(/&/gi))
-        .filter(item => !!(item || '')
-        .replace(/\s+/g, ''))
-        .map(line => {
+    const filterBlanks = item => !!(item || '').replace(/\s+/g, '');
+    const splitKeyValuePair = line => {
         let index = line.indexOf("=");
         if (index == -1) {
             return [line];
         }
         return [line.substring(0, index), line.substring(index + 1)];
-    });
+    };
+    let requestParamEntries = decodeURIComponent(encoded).split(/&/gi);
+    return mona_dish_1.Stream.of(...requestParamEntries)
+        .filter(filterBlanks)
+        .map(splitKeyValuePair);
 }
 exports.decodeEncodedValues = decodeEncodedValues;
 function resolveFiles(dataSource) {
@@ -6220,6 +6226,23 @@ function fixKeyWithoutVal(keyVal) {
     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;
 }
 exports.fixKeyWithoutVal = fixKeyWithoutVal;
+/**
+ * gets all the inputs under the form parentItem
+ * as stream
+ * @param parentItem
+ */
+function getFormInputsAsStream(parentItem) {
+    //encoded String
+    const viewStateStr = (0, Const_1.$faces)().getViewState(parentItem.getAsElem(0).value);
+    // we now need to decode it and then merge it into the target buf
+    // which hosts already our overrides (aka do not override what is already there(
+    // after that we need to deal with form elements on a separate level
+    const standardInputs = decodeEncodedValues(viewStateStr);
+    const fileInputs = resolveFiles(parentItem);
+    const allInputs = standardInputs.concat(fileInputs);
+    return allInputs;
+}
+exports.getFormInputsAsStream = getFormInputsAsStream;
 
 
 /***/ }),
@@ -7677,7 +7700,6 @@ exports.XhrFormData = 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 ExtDomQuery_1 = __webpack_require__(/*! ../util/ExtDomQuery */ "./src/main/typescript/impl/util/ExtDomQuery.ts");
 const FileUtils_1 = __webpack_require__(/*! ../util/FileUtils */ "./src/main/typescript/impl/util/FileUtils.ts");
 const defaultParamsMapper = (key, item) => [key, item];
 /**
@@ -7688,9 +7710,6 @@ const defaultParamsMapper = (key, item) => [key, item];
  * due to api constraints on the HTML Form object in IE11
  * and due to the url encoding constraint given by the faces.js spec
  *
- * probably only one needed and one overlay!
- * the entire file input storing probably is redundant now
- * that dom query has been fixed
  *
  * internal storage format
  * every value is stored as an array
@@ -7729,40 +7748,15 @@ class XhrFormData extends mona_dish_1.Config {
         this.encodeSubmittableFields(this.dataSource, this.partialIds);
         this.applyViewState(this.dataSource);
     }
-    /**
-     * generic post init code, for now, this performs some post assign data post-processing
-     * @param executes the executable dom nodes which need to be processed into the form data, which we can send
-     * in our ajax request
-     */
-    resolveRequestType(rootElement, executes) {
-        if (!executes || executes.indexOf(Const_1.IDENT_NONE) != -1) {
-            return;
-        }
-        this.isMultipartRequest = rootElement.isMultipartCandidate(true);
-    }
-    /**
-     * special case view state handling
-     *
-     * @param form the form holding the view state value
-     */
-    applyViewState(form) {
-        if (this.getIf((0, Const_1.$nsp)(Const_1.P_VIEWSTATE)).isPresent()) {
-            return;
-        }
-        let viewStateElement = form.querySelectorAllDeep(`[name*='${(0, Const_1.$nsp)(Const_1.P_VIEWSTATE)}'`);
-        let viewState = viewStateElement.inputValue;
-        this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
-    }
     /**
      * @returns a Form data representation, this is needed for file submits
      */
     toFormData() {
-        let ret = new FormData();
         /*
          * expands key: [item1, item2]
          * to: [{key: item1}, {key, item2}]
          */
-        let expandArrayedData = ([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
+        let expandAssocArray = ([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
             return { key, item };
         });
         /*
@@ -7776,11 +7770,12 @@ class XhrFormData extends mona_dish_1.Config {
         /*
          * collects everything into a FormData object
          */
+        let ret = new FormData();
         let collectFormData = ({ key, item }) => {
             ret.append(key, item);
         };
         mona_dish_1.Stream.ofAssoc(this.value)
-            .flatMap(expandArrayedData)
+            .flatMap(expandAssocArray)
             .map(remapForNamingContainer)
             .each(collectFormData);
         return ret;
@@ -7793,6 +7788,30 @@ class XhrFormData extends mona_dish_1.Config {
     toString(defaultStr = Const_1.EMPTY_STR) {
         return (0, FileUtils_1.encodeFormData)(this, this.paramsMapper, defaultStr);
     }
+    /**
+     * generic post init code, for now, this performs some post assign data post-processing
+     * @param executes the executable dom nodes which need to be processed into the form data, which we can send
+     * in our ajax request
+     */
+    resolveRequestType(rootElement, executes) {
+        if (!executes || executes.indexOf(Const_1.IDENT_NONE) != -1) {
+            return;
+        }
+        this.isMultipartRequest = rootElement.isMultipartCandidate(true);
+    }
+    /**
+     * special case view state handling
+     *
+     * @param form the form holding the view state value
+     */
+    applyViewState(form) {
+        if (this.getIf((0, Const_1.$nsp)(Const_1.P_VIEWSTATE)).isPresent()) {
+            return;
+        }
+        let viewStateElement = form.querySelectorAllDeep(`[name*='${(0, Const_1.$nsp)(Const_1.P_VIEWSTATE)}'`);
+        let viewState = viewStateElement.inputValue;
+        this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
+    }
     /**
      * determines fields to submit
      * @param {Object} targetBuf - the target form buffer receiving the data
@@ -7800,22 +7819,11 @@ class XhrFormData extends mona_dish_1.Config {
      * @param {Array} partialIds - ids fo PPS
      */
     encodeSubmittableFields(parentItem, partialIds) {
-        //encoded String
-        let viewStateStr = (0, Const_1.$faces)().getViewState(parentItem.getAsElem(0).value);
-        // we now need to decode it and then merge it into the target buf
-        // which hosts already our overrides (aka do not override what is already there(
-        // after that we need to deal with form elements on a separate level
-        const keyValueEntries = (0, FileUtils_1.decodeEncodedValues)(viewStateStr);
-        const fileEntries = (0, FileUtils_1.resolveFiles)(parentItem);
-        const concatted = keyValueEntries.concat(fileEntries);
-        const formData = new ExtDomQuery_1.ExtConfig({});
-        concatted
+        const formInputs = (0, FileUtils_1.getFormInputsAsStream)(parentItem);
+        formInputs
             .map(FileUtils_1.fixKeyWithoutVal)
-            .map(keyVal => this.paramsMapper(keyVal[0], keyVal[1]))
-            .each((entry) => {
-            formData.append(entry[0]).value = entry[1];
-        });
-        this.shallowMerge(formData, true, true);
+            .map(([key, value]) => this.paramsMapper(key, value))
+            .each(([key, value]) => this.append(key).value = value);
     }
     remapKeyForNamingContainer(key) {
         return this.paramsMapper(key, "")[0];