jsf.js_next_gen 4.0.1-alpha.0 → 4.0.1-beta.2

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

@@ -26,7 +26,7 @@
  * from the implementation side it is mostly registering callbacks
  * and calling them at the appropriate time.
  */
-export interface IAsyncRunnable<T> {
+export interface AsyncRunnable<T> {
     /**
      * starts the runnable
      */
@@ -45,9 +45,9 @@ export interface IAsyncRunnable<T> {
      * and then triggers all the registered then functions
      * when it is complete
      *
-     * @param func the then functor
+     * @param func
      */
-    then(func: (data: any) => any): IAsyncRunnable<T>;
+    then(func: (data: any) => any): AsyncRunnable<T>;
 
     /**
      * callback for catch functionality
@@ -59,7 +59,7 @@ export interface IAsyncRunnable<T> {
      *
      * @param func
      */
-    catch(func: (data: any) => any): IAsyncRunnable<T>;
+    catch(func: (data: any) => any): AsyncRunnable<T>;
 
 
     /**
@@ -68,80 +68,5 @@ export interface IAsyncRunnable<T> {
      * and once the finally time for the promise has
      * come the finally functions must be performed
      */
-    finally(func: () => void): IAsyncRunnable<T>;
-}
-
-
-/**
- * pretty much the same as cancellable Promise, but given
- * we do not have that on browser level yet this is sort
- * of a non - intrusive Shim!
- */
-export abstract class AsyncRunnable<T> implements IAsyncRunnable<T>{
-    /**
-     * helper support so that we do not have to drag in Promise shims
-     */
-    private catchFunctions: Array<Function> = [];
-    private thenFunctions: Array<Function> = [];
-
-    /**
-     * cancel the run of the runnable (which then depending on the implementation
-     * either triggers indirectly resolve or reject)
-     */
-    abstract cancel(): void;
-
-    /**
-     * extended functionality start to trigger the runnable
-     */
-    abstract start(): void;
-
-    /**
-     * resolve handler function which calls the then chain
-     * and after that finally
-     * @param data
-     */
-    resolve(data: any) {
-        this.thenFunctions.reduce((inputVal: any, thenFunc: any) => {
-            return thenFunc(inputVal);
-        }, data)
-    }
-
-    /**
-     * reject handler function which triggers the catch chain
-     * @param data
-     */
-    reject(data: any) {
-        this.catchFunctions.reduce((inputVal: any, catchFunc: any) => {
-            return catchFunc(inputVal);
-        }, data);
-    }
-
-    /**
-     * register a catch functor
-     * @param func the functor for the catch monad
-     */
-    catch(func: (data: any) => any): IAsyncRunnable<T> {
-        this.catchFunctions.push(func);
-        return this;
-    }
-
-    /**
-     * registers a finally functor
-     * @param func the functor for the finally handling chanin
-     */
-    finally(func: () => void): IAsyncRunnable<T> {
-        // no ie11 support we probably are going to revert to shims for that one
-        this.catchFunctions.push(func);
-        this.thenFunctions.push(func);
-        return this;
-    }
-
-    /**
-     * @param func then functor similar to promise
-     */
-    then(func: (data: any) => any): IAsyncRunnable<T> {
-        this.thenFunctions.push(func);
-        return this;
-    }
-}
-
+    finally(func: () => void): AsyncRunnable<T>;
+}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Config, IValueHolder, Optional, DomQuery, DQ} from "mona-dish";
+import {Config, IValueHolder, Optional, DomQuery, DQ, Stream, ArrayCollector} from "mona-dish";
 import {$nsp, P_WINDOW_ID} from "../core/Const";
 
 
@@ -120,10 +120,12 @@ export class ExtDomQuery extends DQ {
         }
         // fallback if the currentScript method fails, we just search the jsf tags for nonce, this is
         // the last possibility
-        let nonceScript = Optional.fromNullable(DQ
-            .querySelectorAll("script[src], link[src]").asArray
+        let nonceScript = DQ
+            .querySelectorAll("script[src], link[src]")
+            .lazyStream
             .filter((item) => this.extractNonce(item)  && item.attr(ATTR_SRC) != null)
-            .filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))?.[0]);
+            .filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))
+            .first();
 
         if (nonceScript.isPresent()) {
             return this.extractNonce(nonceScript.value);
@@ -142,13 +144,13 @@ export class ExtDomQuery extends DQ {
      */
     searchJsfJsFor(regExp: RegExp): Optional<string> {
         //perfect application for lazy stream
-        return Optional.fromNullable(DQ.querySelectorAll("script[src], link[src]").asArray
+        return DQ.querySelectorAll("script[src], link[src]").lazyStream
             .filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))
             .map(item => item.attr(ATTR_SRC).value.match(regExp))
             .filter(item => item != null && item.length > 1)
             .map((result: string[]) => {
                 return decodeURIComponent(result[1]);
-            })?.[0]);
+            }).first();
     }
 
     globalEval(code: string, nonce ?: string): DQ {
@@ -330,6 +332,6 @@ export class ExtConfig extends  Config {
         if(!this.$nspEnabled) {
             return accessPath;
         }
-        return [...accessPath].map(key => $nsp(key));
+        return Stream.of(...accessPath).map(key => $nsp(key)).collect(new ArrayCollector());
     }
 }

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

@@ -1,4 +1,4 @@
-import {Config, DomQuery, DQ} from "mona-dish";
+import {ArrayCollector, Config, DomQuery, DQ, LazyStream, Stream} from "mona-dish";
 import {ExtDomQuery} from "./ExtDomQuery";
 import {$faces, EMPTY_STR} from "../core/Const";
 
@@ -22,24 +22,27 @@ export function encodeFormData(formData: Config,
     }
     const assocValues = formData.value;
 
-    const expandValueArrAndRename = key => assocValues[key].map(val => paramsMapper(key, val));
+    const expandValueArrAndRename = key => Stream.of(...assocValues[key]).map(val => paramsMapper(key, val));
     const isPropertyKey = key => assocValues.hasOwnProperty(key);
     const isNotFile = ([, value]) => !(value instanceof ExtDomQuery.global().File);
     const mapIntoUrlParam = keyVal => `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
 
-    return Object.keys(assocValues)
+    const entries = LazyStream.of(...Object.keys(assocValues))
         .filter(isPropertyKey)
         .flatMap(expandValueArrAndRename)
+        //we cannot encode file elements that is handled by multipart requests anyway
         .filter(isNotFile)
         .map(mapIntoUrlParam)
-        .join("&");
+        .collect(new ArrayCollector());
+
+    return entries.join("&")
 }
 
 /**
  * splits and decodes encoded values into strings containing of key=value
  * @param encoded encoded string
  */
-export function decodeEncodedValues(encoded: string): string[][] {
+export function decodeEncodedValues(encoded: string): Stream<string[]> {
     const filterBlanks = item => !!(item || '').replace(/\s+/g, '');
     const splitKeyValuePair = line => {
         let index = line.indexOf("=");
@@ -50,7 +53,9 @@ export function decodeEncodedValues(encoded: string): string[][] {
     };
 
     let requestParamEntries = decodeURIComponent(encoded).split(/&/gi);
-    return requestParamEntries.filter(filterBlanks).map(splitKeyValuePair);
+    return Stream.of(...requestParamEntries)
+        .filter(filterBlanks)
+        .map(splitKeyValuePair)
 }
 
 
@@ -58,28 +63,19 @@ export function decodeEncodedValues(encoded: string): string[][] {
  * gets all the input files and their corresponding file objects
  * @param dataSource
  */
-export function resolveFiles(dataSource: DQ): [string, File][] {
-
-    const expandFilesArr = ([key, files]) => {
-        return [...files].map(file => [key, file]);
-    }
-    const remapFileInput = fileInput => {
-        return [fileInput.name.value || fileInput.id.value, fileInput.filesFromElem(0)];
-    }
+export function resolveFiles(dataSource: DQ): Stream<[string, File]> {
 
-    const files = dataSource
+    const expandFilesArr = ([key, files]) => 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']")
-        .asArray;
-
-    const ret = files
+        .stream
         .map(remapFileInput)
         .flatMap(expandFilesArr);
-
-    return ret as any;
 }
 
 
-export function fixEmptyParameters(keyVal: any[]): [string, any] {
+export function fixEmmptyParameters(keyVal: any[]): [string, any] {
     return (keyVal.length < 3 ? [keyVal?.[0] ?? [], keyVal?.[1] ?? []] : keyVal) as [string, any];
 }
 
@@ -87,7 +83,7 @@ export function fixEmptyParameters(keyVal: any[]): [string, any] {
  * returns the decoded viewState from parentItem
  * @param parentItem
  */
-function resolveViewState(parentItem: DomQuery): string[][] | [string, File][] {
+function resolveViewState(parentItem: DomQuery): Stream<string[] | [string, File]> {
     const viewStateStr = $faces().getViewState(parentItem.getAsElem(0).value);
 
     // we now need to decode it and then merge it into the target buf
@@ -98,11 +94,11 @@ function resolveViewState(parentItem: DomQuery): string[][] | [string, File][] {
 
 /**
  * gets all the inputs under the form parentItem
- * as array
+ * as stream
  * @param parentItem
  */
-export function getFormInputsAsArr(parentItem: DomQuery): string[][] | [string, File][] {
-    const standardInputs: any = resolveViewState(parentItem);
+export function getFormInputsAsStream(parentItem: DomQuery): Stream<string[] | [string, File]> {
+    const standardInputs = resolveViewState(parentItem);
     const fileInputs = resolveFiles(parentItem);
-    return standardInputs.concat(...fileInputs)
+    return  standardInputs.concat(fileInputs as any)
 }

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

@@ -58,17 +58,13 @@ export class HiddenInputBuilder {
         const SEP = $faces().separatorchar;
 
         let existingStates = DQ$(`[name*='${$nsp(this.name)}']`);
-        let cnt = existingStates.asArray.map(state => {
+        let cnt = existingStates.stream.map(state => {
             let ident: string = state.id.orElse("-1").value;
             ident = ident.substring(ident.lastIndexOf(SEP)+1);
             return parseInt(ident);
         })
-            .filter(item => {
-                return !isNaN(item);
-            })
-            .reduce((item1, item2) => {
-                return Math.max(item1, item2);
-            }, -1);
+            .filter(item => !isNaN(item))
+            .reduce((item1, item2) => Math.max(item1, item2), -1).value;
         //the maximum  new ident is the current max + 1
         cnt++;
 

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

@@ -15,7 +15,7 @@
  *
  */
 
-import {Lang as LangBase, Config, Optional, DomQuery, DQ} from "mona-dish";
+import {Lang as LangBase, Config, Optional, DomQuery, DQ, Stream} from "mona-dish";
 import {Messages} from "../i18n/Messages";
 import {EMPTY_STR, HTML_TAG_FORM} from "../core/Const";
 import {getEventTarget} from "../xhrCore/RequestDataResolver";
@@ -85,10 +85,10 @@ export module ExtLang {
         installedLocale = installedLocale ?? new Messages();
 
         let msg = installedLocale[key] ?? defaultMessage ?? key;
-        templateParams.forEach((param, cnt) => {
-            msg = msg.replace(new RegExp(["\\{", cnt, "\\}"].join(EMPTY_STR), "g"), param);
-        })
 
+        Stream.of(...templateParams).each((param, cnt) => {
+            msg = msg.replace(new RegExp(["\\{", cnt, "\\}"].join(EMPTY_STR), "g"), param);
+        });
 
         return msg;
     }
@@ -202,61 +202,6 @@ export module ExtLang {
             defaultValue;
     }
 
-    /**
-     * expands an associative array into an array of key value tuples
-     * @param value
-     */
-    export function ofAssoc(value: {[key: string]: any}) {
-        return Object.keys(value)
-            .map(key => [key, value[key]]);
-    }
-
-    export function collectAssoc(target: any, item: any) {
-        target[item[0]] = item[1];
-        return target;
-    }
-
-    /**
-     * The active timeout for the "debounce".
-     * Since we only use it in the XhrController
-     * we can use a local module variable here
-     */
-    let activeTimeouts = {};
-
-
-
-
-    /**
-     * a simple debounce function
-     * which waits until a timeout is reached and
-     * if something comes in in between debounces
-     *
-     * @param runnable a runnable which should go under debounce control
-     * @param timeout a timeout for the debounce window
-     */
-    export function debounce(key, runnable, timeout) {
-        function clearActiveTimeout() {
-            clearTimeout(activeTimeouts[key]);
-            delete activeTimeouts[key];
-        }
-
-        if (!!(activeTimeouts?.[key])) {
-            clearActiveTimeout();
-        }
-        if (timeout > 0) {
-            activeTimeouts[key] = setTimeout(() => {
-                try {
-                    runnable();
-                } finally {
-                    clearActiveTimeout();
-                }
-            }, timeout);
-        } else {
-            runnable();
-        }
-    }
-
-
     /**
      * assert that the form exists and throw an exception in the case it does not
      *
@@ -267,6 +212,4 @@ export module ExtLang {
             throw makeException(new Error(), null, null, "Impl", "getForm", getMessage("ERR_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_REQ_PASS_THR, EVENT, P_AJAX_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;
@@ -32,8 +32,8 @@ export class EventData implements IEventData{
         eventData.status = name;
 
         let sourceId: string = context.getIf(SOURCE)
-            .orElseLazy(() => context.getIf(P_AJAX_SOURCE).value)
-            .orElseLazy(() => context.getIf(CTX_PARAM_REQ_PASS_THR, P_AJAX_SOURCE).value)
+            .orElseLazy(() => context.getIf(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/ResponseProcessor.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {Config, DomQuery, DomQueryCollector, DQ, DQ$, Lang, XMLQuery} from "mona-dish";
+import {Config, DomQuery, DomQueryCollector, DQ, DQ$, Lang, LazyStream, Stream, XMLQuery} from "mona-dish";
 import {Implementation} from "../AjaxImpl";
 import {Assertions} from "../util/Assertions";
 import {IResponseProcessor} from "./IResponseProcessor";
@@ -46,7 +46,7 @@ import {
     ON_EVENT,
     P_CLIENT_WINDOW,
     P_EXECUTE,
-    P_AJAX_SOURCE,
+    P_PARTIAL_SOURCE,
     P_RENDER,
     P_RENDER_OVERRIDE,
     P_VIEWSTATE,
@@ -65,8 +65,6 @@ import {
 import {ExtConfig, ExtDomQuery} from "../util/ExtDomQuery";
 import {HiddenInputBuilder} from "../util/HiddenInputBuilder";
 import trim = Lang.trim;
-import {ExtLang} from "../util/Lang";
-import ofAssoc = ExtLang.ofAssoc;
 
 
 /**
@@ -176,7 +174,7 @@ export class ResponseProcessor implements IResponseProcessor {
          */
 
         const mergedErrorData = new ExtConfig({});
-        mergedErrorData.assign(SOURCE).value = this.externalContext.getIf(P_AJAX_SOURCE).get(0).value;
+        mergedErrorData.assign(SOURCE).value = this.externalContext.getIf(P_PARTIAL_SOURCE).get(0).value;
         mergedErrorData.assign(ERROR_NAME).value = node.querySelectorAll(ERROR_NAME).textContent(EMPTY_STR);
         mergedErrorData.assign(ERROR_MESSAGE).value = node.querySelectorAll(ERROR_MESSAGE).cDATAAsString;
 
@@ -348,15 +346,15 @@ export class ResponseProcessor implements IResponseProcessor {
      * as last lifecycle step, before going into the next request.
      */
     fixViewStates() {
-        ofAssoc(this.internalContext.getIf(APPLIED_VST).orElse({}).value)
-            .forEach(([, value]) => {
+        Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_VST).orElse({}).value)
+            .each(([, value]) => {
                 const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value
                 const affectedForms = this.getContainerForms(namingContainerId)
                     .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
 
                 this.appendViewStateToForms(affectedForms, namedViewRoot, value.value, namingContainerId.orElse("").value);
-            })
+            });
     }
 
 
@@ -366,8 +364,8 @@ export class ResponseProcessor implements IResponseProcessor {
      * is done.
      */
     fixClientWindow() {
-       ofAssoc(this.internalContext.getIf(APPLIED_CLIENT_WINDOW).orElse({}).value)
-            .forEach(([, value]) => {
+        Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_CLIENT_WINDOW).orElse({}).value)
+            .each(([, value]) => {
                 const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value;
                 const affectedForms = this.getContainerForms(namingContainerId)
@@ -524,7 +522,7 @@ export class ResponseProcessor implements IResponseProcessor {
             .orElseLazy(() => this.externalContext.getIf($nsp(P_RENDER)).value)
             .orElse(IDENT_NONE).value.split(/\s+/gi);
         const executeAndRenders = executes.concat(...renders);
-        return [...executeAndRenders].filter(nameOrId => {
+        return LazyStream.of(...executeAndRenders).filter(nameOrId => {
             if ([IDENT_ALL, IDENT_NONE].indexOf(nameOrId) != -1) {
                 return true;
             }
@@ -534,7 +532,7 @@ export class ResponseProcessor implements IResponseProcessor {
             return affectedForm.matchesSelector(NAME_OR_ID) ||
                 affectedForm.querySelectorAll(NAME_OR_ID).isPresent() ||
                 affectedForm.firstParent(NAME_OR_ID).isPresent();
-        }).length > 0;
+        }).first().isPresent();
     }
 
     /**

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

@@ -13,20 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Config, DQ} from "mona-dish";
+import {Config, DQ, FormDataCollector, Stream} from "mona-dish";
 import {$nsp, EMPTY_STR, IDENT_NONE, P_VIEWSTATE} from "../core/Const";
 
 import {
     encodeFormData,
-    fixEmptyParameters, getFormInputsAsArr
+    fixEmmptyParameters, getFormInputsAsStream
 } from "../util/FileUtils";
-import {ExtLang} from "../util/Lang";
-import ofAssoc = ExtLang.ofAssoc;
 
 
 type ParamsMapper<V, K> = (key: V, item: K) => [V, K];
 const defaultParamsMapper: ParamsMapper<string, any> = (key, item) => [key, item];
 
+
 /**
  * A unified form data class
  * which builds upon our configuration.
@@ -77,17 +76,13 @@ export class XhrFormData extends Config {
      */
     toFormData(): FormData {
         /*
-           * expands key: [item1, item2]
-           * to: [{key: key,  value: item1}, {key: key, value: item2}]
-           */
-        let expandValueArrays = ([key, item]) => {
-            if (Array.isArray(item)) {
-                return item.map(value => {
-                    return {key, value}
-                })
-            }
-            return [{key, value: item}]
-        }
+         * expands key: [item1, item2]
+         * to: [{key: key,  value: item1}, {key: key, value: item2}]
+         */
+        let expandAssocArray = ([key, item]) =>
+            Stream.of(...(item as Array<any>)).map(value => {
+                return {key, value};
+            });
 
         /*
          * remaps the incoming {key, value} tuples
@@ -101,13 +96,10 @@ export class XhrFormData extends Config {
         /*
          * collects everything into a FormData object
          */
-        return ofAssoc(this.value)
-            .flatMap(expandValueArrays)
+        return  Stream.ofAssoc(this.value)
+            .flatMap(expandAssocArray)
             .map(remapForNamingContainer)
-            .reduce((formData: FormData, {key, value}: any) => {
-                formData.append(key, value);
-                return formData;
-            }, new FormData()) as FormData;
+            .collect(new FormDataCollector() as any);
     }
 
     /**
@@ -121,7 +113,6 @@ export class XhrFormData extends Config {
 
     /**
      * generic post init code, for now, this performs some post assign data post-processing
-     * @param rootElement the root element which knows the request type (usually a form)
      * @param executes the executable dom nodes which need to be processed into the form data, which we can send
      * in our ajax request
      */
@@ -148,24 +139,20 @@ export class XhrFormData extends Config {
 
     /**
      * determines fields to submit
+     * @param {Object} targetBuf - the target form buffer receiving the data
      * @param {Node} parentItem - form element item is nested in
      * @param {Array} partialIds - ids fo PPS
      */
-    private encodeSubmittableFields(parentItem: DQ, partialIds: string[] = []) {
+    private encodeSubmittableFields(parentItem: DQ, partialIds ?: string[]) {
 
+        const formInputs = getFormInputsAsStream(parentItem);
         const mergeIntoThis = ([key, value]) => this.append(key).value = value;
         const namingContainerRemap = ([key, value]) => this.paramsMapper(key as string, value);
 
-        const remappedPartialIds = partialIds.map(partialId => this.remapKeyForNamingContainer(partialId));
-        const partialIdsFilter = ([key, value]) => (!remappedPartialIds.length || key.indexOf("@") == 0) ? true :
-            remappedPartialIds.indexOf(key) != -1;
-
-        let inputs = getFormInputsAsArr(parentItem);
-        inputs
-            .map(fixEmptyParameters)
+        formInputs
+            .map(fixEmmptyParameters)
             .map(namingContainerRemap)
-            .filter(partialIdsFilter)
-            .forEach(mergeIntoThis);
+            .each(mergeIntoThis);
     }
 
     private remapKeyForNamingContainer(key: string): string {