jsf.js_next_gen 4.0.0-RC.33 → 4.0.0-RC.35

package/dist/window/faces-development.js

@@ -2936,6 +2936,13 @@ var ITERATION_STATUS;
     ITERATION_STATUS["EO_STRM"] = "__EO_STRM__";
     ITERATION_STATUS["BEF_STRM"] = "___BEF_STRM__";
 })(ITERATION_STATUS = exports.ITERATION_STATUS || (exports.ITERATION_STATUS = {}));
+function calculateSkips(next_strm) {
+    let pos = 1;
+    while (next_strm.lookAhead(pos) != ITERATION_STATUS.EO_STRM) {
+        pos++;
+    }
+    return --pos;
+}
 class MultiStreamDatasource {
     constructor(first, ...strms) {
         this.first = first;
@@ -2966,33 +2973,22 @@ class MultiStreamDatasource {
         }
         return hasNext ? cnt : -1;
     }
-    lookAhead(cnt) {
-        let posPtr = 1;
-        let strmPos = this.selectedPos;
-        let valueFound = null;
-        if (this.strms[strmPos].lookAhead(cnt) != ITERATION_STATUS.EO_STRM) {
-            //speedup
-            return this.strms[strmPos].lookAhead(cnt);
+    lookAhead(cnt = 1) {
+        //lets clone
+        const strms = this.strms.slice(this.selectedPos);
+        if (!strms.length) {
+            return ITERATION_STATUS.EO_STRM;
         }
-        for (let loop = posPtr; loop <= cnt; loop++) {
-            if (!this.strms[strmPos]) {
-                return ITERATION_STATUS.EO_STRM;
-            }
-            let val = (posPtr > 0) ? this.strms[strmPos].lookAhead(posPtr) : this.strms[strmPos].current();
-            valueFound = val;
-            if (val != ITERATION_STATUS.EO_STRM) {
-                posPtr++;
-            }
-            else {
-                if (strmPos >= this.strms.length) {
-                    return ITERATION_STATUS.EO_STRM;
-                }
-                strmPos++;
-                posPtr = 1;
-                loop--; //empty iteration
+        const all_strms = [...strms];
+        while (all_strms.length) {
+            let next_strm = all_strms.shift();
+            let lookAhead = next_strm.lookAhead(cnt);
+            if (lookAhead != ITERATION_STATUS.EO_STRM) {
+                return lookAhead;
             }
+            cnt = cnt - calculateSkips(next_strm);
         }
-        return valueFound;
+        return ITERATION_STATUS.EO_STRM;
     }
     next() {
         if (this.activeStrm.hasNext()) {
@@ -3207,29 +3203,13 @@ class FlatMapStreamDataSource {
     }
     lookAhead(cnt = 1) {
         var _a;
-        //easy access trial
-        if ((this === null || this === void 0 ? void 0 : this.activeDataSource) && ((_a = this === null || this === void 0 ? void 0 : this.activeDataSource) === null || _a === void 0 ? void 0 : _a.lookAhead(cnt)) != ITERATION_STATUS.EO_STRM) {
+        let lookAhead = (_a = this === null || this === void 0 ? void 0 : this.activeDataSource) === null || _a === void 0 ? void 0 : _a.lookAhead(cnt);
+        if ((this === null || this === void 0 ? void 0 : this.activeDataSource) && lookAhead != ITERATION_STATUS.EO_STRM) {
             //this should cover 95% of all cases
-            return this === null || this === void 0 ? void 0 : this.activeDataSource.lookAhead(cnt);
-        }
-        /**
-         * we only can determine how many elems datasource has by going up
-         * (for now this suffices, however not ideal, we might have to introduce a numElements or so)
-         * @param datasource
-         */
-        function howManyElems(datasource) {
-            let cnt = 1;
-            while (datasource.lookAhead(cnt) !== ITERATION_STATUS.EO_STRM) {
-                cnt++;
-            }
-            return cnt - 1;
-        }
-        function readjustSkip(dataSource) {
-            let skippedElems = (dataSource) ? howManyElems(dataSource) : 0;
-            cnt = cnt - skippedElems;
+            return lookAhead;
         }
         if (this.activeDataSource) {
-            readjustSkip(this.activeDataSource);
+            cnt -= calculateSkips(this.activeDataSource);
         }
         //the idea is basically to look into the streams sub-sequentially for a match
         //after each stream we have to take into consideration that the skipCnt is
@@ -3255,9 +3235,8 @@ class FlatMapStreamDataSource {
             }
             //reduce the next lookahead by the number of elements
             //we are now skipping in the current data source
-            readjustSkip(currentDataSource);
+            cnt -= calculateSkips(currentDataSource);
         }
-        return ITERATION_STATUS.EO_STRM;
     }
     toDatasource(mapped) {
         let ds = Array.isArray(mapped) ? new ArrayStreamDataSource(...mapped) : mapped;
@@ -6179,7 +6158,7 @@ exports.ExtConfig = ExtConfig;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getFormInputsAsStream = exports.fixKeyWithoutVal = exports.resolveFiles = exports.decodeEncodedValues = exports.encodeFormData = void 0;
+exports.getFormInputsAsStream = exports.fixEmmptyParameters = 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");
@@ -6231,36 +6210,45 @@ function decodeEncodedValues(encoded) {
         .map(splitKeyValuePair);
 }
 exports.decodeEncodedValues = decodeEncodedValues;
+/**
+ * gets all the input files and their corresponding file objects
+ * @param dataSource
+ */
 function resolveFiles(dataSource) {
+    const expandFilesArr = ([key, files]) => mona_dish_1.Stream.of(...files).map(file => [key, file]);
+    const remapFileInput = fileInput => [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)];
     return dataSource
         .querySelectorAllDeep("input[type='file']")
         .stream
-        .map(fileInput => [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)])
-        .flatMap(([key, files]) => {
-        return mona_dish_1.Stream.of(...files).map(file => [key, file]);
-    });
+        .map(remapFileInput)
+        .flatMap(expandFilesArr);
 }
 exports.resolveFiles = resolveFiles;
-function fixKeyWithoutVal(keyVal) {
+function fixEmmptyParameters(keyVal) {
     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;
+    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;
+exports.fixEmmptyParameters = fixEmmptyParameters;
 /**
- * gets all the inputs under the form parentItem
- * as stream
+ * returns the decoded viewState from parentItem
  * @param parentItem
  */
-function getFormInputsAsStream(parentItem) {
-    //encoded String
+function resolveViewState(parentItem) {
     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);
+    return decodeEncodedValues(viewStateStr);
+}
+/**
+ * gets all the inputs under the form parentItem
+ * as stream
+ * @param parentItem
+ */
+function getFormInputsAsStream(parentItem) {
+    const standardInputs = resolveViewState(parentItem);
     const fileInputs = resolveFiles(parentItem);
-    const allInputs = standardInputs.concat(fileInputs);
-    return allInputs;
+    return standardInputs.concat(fileInputs);
 }
 exports.getFormInputsAsStream = getFormInputsAsStream;
 
@@ -7774,31 +7762,26 @@ class XhrFormData extends mona_dish_1.Config {
     toFormData() {
         /*
          * expands key: [item1, item2]
-         * to: [{key: item1}, {key, item2}]
+         * to: [{key: key,  value: item1}, {key: key, value: item2}]
          */
-        let expandAssocArray = ([key, item]) => mona_dish_1.Stream.of(...item).map(item => {
-            return { key, item };
+        let expandAssocArray = ([key, item]) => mona_dish_1.Stream.of(...item).map(value => {
+            return { key, value };
         });
         /*
          * remaps the incoming {key, value} tuples
          * to naming container prefixed keys and values
          */
-        let remapForNamingContainer = ({ key, item }) => {
+        let remapForNamingContainer = ({ key, value }) => {
             key = this.remapKeyForNamingContainer(key);
-            return { key, item };
+            return { key, value };
         };
         /*
          * 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)
+        return mona_dish_1.Stream.ofAssoc(this.value)
             .flatMap(expandAssocArray)
             .map(remapForNamingContainer)
-            .each(collectFormData);
-        return ret;
+            .collect(new mona_dish_1.FormDataCollector());
     }
     /**
      * returns an encoded string representation of our xhr form data
@@ -7840,10 +7823,12 @@ class XhrFormData extends mona_dish_1.Config {
      */
     encodeSubmittableFields(parentItem, partialIds) {
         const formInputs = (0, FileUtils_1.getFormInputsAsStream)(parentItem);
+        const mergeIntoThis = ([key, value]) => this.append(key).value = value;
+        const namingContainerRemap = ([key, value]) => this.paramsMapper(key, value);
         formInputs
-            .map(FileUtils_1.fixKeyWithoutVal)
-            .map(([key, value]) => this.paramsMapper(key, value))
-            .each(([key, value]) => this.append(key).value = value);
+            .map(FileUtils_1.fixEmmptyParameters)
+            .map(namingContainerRemap)
+            .each(mergeIntoThis);
     }
     remapKeyForNamingContainer(key) {
         return this.paramsMapper(key, "")[0];