jsf.js_next_gen 4.1.0-beta.2 → 4.1.0-beta.21

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

@@ -25,14 +25,13 @@ import {Es2019Array} from "mona-dish";
 export namespace ExtLang {
 
     let installedLocale: Messages;
-    let nameSpace = "impl/util/Lang/";
+    const nameSpace = "impl/util/Lang/";
 
     export function getLanguage(): string {
         //TODO global config override
 
-        let language: string = (navigator as any).languages?.[0] ?? navigator?.language;
-        language = language.split("-")[0];
-        return language;
+        const language: string = (navigator as any).languages?.[0] ?? navigator?.language ?? "en";
+        return language.split("-")[0];
     }
 
     //should be in lang, but for now here to avoid recursive imports, not sure if typescript still has a problem with those
@@ -53,7 +52,7 @@ export namespace ExtLang {
      * @param defaultValue an optional default value if the producer fails to produce anything
      * @returns an Optional of the produced value
      */
-    export function failSaveResolve<T>(resolverProducer: () => T, defaultValue: T = null): Optional<T> {
+    export function failSaveResolve<T>(resolverProducer: () => T, defaultValue: T | null = null): Optional<T | null> {
         return LangBase.saveResolve(resolverProducer, defaultValue);
     }
 
@@ -66,7 +65,7 @@ export namespace ExtLang {
      * @param resolverProducer a producer function which produces a value in the non error case
      * @param defaultValue the default value in case of a fail of the function
      */
-    export function failSaveExecute<T>(resolverProducer: () => any, defaultValue: T = null): void {
+    export function failSaveExecute<T>(resolverProducer: () => any, defaultValue: T | null = null): void {
         LangBase.saveResolve(resolverProducer, defaultValue);
     }
 
@@ -85,12 +84,10 @@ export namespace ExtLang {
     export function getMessage(key: string, defaultMessage?: string, ...templateParams: Array<string>): string {
         installedLocale = installedLocale ?? new Messages();
 
-        let msg = installedLocale[key] ?? defaultMessage ?? key;
+        let msg = (installedLocale as any)[key] ?? defaultMessage ?? key;
         templateParams.forEach((param, cnt) => {
             msg = msg.replace(new RegExp(["\\{", cnt, "\\}"].join(EMPTY_STR), "g"), param);
-        })
-
-
+        });
         return msg;
     }
 
@@ -100,7 +97,7 @@ export namespace ExtLang {
      * @param val the value
      * @param delimiter the delimiter
      */
-    export function keyValToStr(key: string, val: string, delimiter: string = "\n") {
+    export function keyValToStr(key: string, val: string, delimiter: string = "\n"): string {
         return [key, val].join(delimiter);
     }
 
@@ -158,8 +155,8 @@ export namespace ExtLang {
      */
     export function getForm(elem: Element, event ?: Event): DQ | never {
 
-        let queryElem = new DQ(elem);
-        let eventTarget = (event) ?  new DQ(getEventTarget(event)) : DomQuery.absent;
+        const queryElem = new DQ(elem);
+        const eventTarget = (event) ?  new DQ(getEventTarget(event)) : DomQuery.absent;
 
         if (queryElem.isTag(HTML_TAG_FORM)) {
             return queryElem;
@@ -167,8 +164,8 @@ export namespace ExtLang {
 
         //html 5 for handling
         if (queryElem.attr(HTML_TAG_FORM).isPresent()) {
-            let formId = queryElem.attr(HTML_TAG_FORM).value;
-            let foundForm = DQ.byId(formId, true);
+            const formId = queryElem.attr(HTML_TAG_FORM).value;
+            const foundForm = DQ.byId(formId as any, true);
             if (foundForm.isPresent()) {
                 return foundForm;
             }
@@ -214,12 +211,12 @@ export namespace ExtLang {
      * expands an associative array into an array of key value tuples
      * @param value
      */
-    export function ofAssoc(value: {[key: string]: any}) {
+    export function ofAssoc(value: {[key: string]: any}): Array<[string, any]> {
         return new Es2019Array(...Object.keys(value))
-            .map(key => [key, value[key]]);
+            .map((key: string) => [key, value[key]]);
     }
 
-    export function collectAssoc(target: any, item: any) {
+    export function collectAssoc(target: any, item: any): any {
         target[item[0]] = item[1];
         return target;
     }
@@ -229,7 +226,7 @@ export namespace ExtLang {
      * Since we only use it in the XhrController
      * we can use a local module variable here
      */
-    let activeTimeouts = {};
+    let activeTimeouts: {[key: string]: ReturnType<typeof setTimeout>} = {};
 
 
 
@@ -242,7 +239,7 @@ export namespace ExtLang {
      * @param runnable a runnable which should go under debounce control
      * @param timeout a timeout for the debounce window
      */
-    export function debounce(key, runnable, timeout) {
+    export function debounce(key: string, runnable: Function, timeout: number): void {
         function clearActiveTimeout() {
             clearTimeout(activeTimeouts[key]);
             delete activeTimeouts[key];
@@ -271,7 +268,7 @@ export namespace ExtLang {
      */
     function assertOnlyOneFormExists(forms: DomQuery): void | never {
         if (forms.isAbsent() || forms.length > 1) {
-            throw makeException(new Error(), null, null, "Impl", "getForm", getMessage("ERR_FORM"));
+            throw makeException(new Error(), null as any, null as any, "Impl", "getForm", getMessage("ERR_FORM"));
         }
     }
-}
+}

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

@@ -1,3 +1,19 @@
+/*! 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 {IAsyncRunnable} from "./AsyncRunnable";
 import {ExtLang} from "./Lang";
 const debounce = ExtLang.debounce;
@@ -8,10 +24,16 @@ const debounce = ExtLang.debounce;
  * Faces enforces for the XHR handling
  */
 export class XhrQueueController<T extends IAsyncRunnable<any>> {
-    queue = [];
+    queue: IAsyncRunnable<any>[] = [];
     taskRunning = false;
 
+    // Each instance needs its own debounce key: a shared key would cause enqueues
+    // on separate instances to cancel each other's debounce window.
+    private static instanceCount = 0;
+    private readonly debounceKey: string;
+
     constructor() {
+        this.debounceKey = `xhrQueue_${XhrQueueController.instanceCount++}`;
     }
 
     /**
@@ -21,7 +43,7 @@ export class XhrQueueController<T extends IAsyncRunnable<any>> {
      * until the debounce window for the timeout is closed.
      */
     enqueue(runnable: T, timeOut: number = 0) {
-        debounce("xhrQueue", () => {
+        debounce(this.debounceKey, () => {
             const requestHandler = this.enrichRunnable(runnable);
             if (!this.taskRunning) {
                 this.signalTaskRunning();
@@ -95,4 +117,4 @@ export class XhrQueueController<T extends IAsyncRunnable<any>> {
         this.taskRunning = !this.isEmpty;
     }
 
-}
+}

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

@@ -46,7 +46,7 @@ export enum ErrorType {
  * everything into the same attributes,
  * I will add deprecated myfaces backwards compatibility attributes as well
  */
-export class ErrorData extends EventData implements IErrorData {
+export class ErrorData extends EventData {
 
     type: string = "error";
     source: string | Element;
@@ -57,14 +57,15 @@ export class ErrorData extends EventData implements IErrorData {
     responseText: string;
     responseXML: any;
 
-    status: string;
+    status: string | null;
     typeDetails: ErrorType;
 
-    serverErrorName: string;
-    serverErrorMessage: string;
+    serverErrorName!: string;
+    serverErrorMessage!: string;
     description: string;
 
-    constructor(source: string | Element, errorName: string, errorMessage: string, responseText: string = null, responseXML: Document = null, responseCode: number = -1, statusOverride: string = null,  type = ErrorType.CLIENT_ERROR) {
+    /** @internal */
+    constructor(source: string | Element, errorName: string, errorMessage: string, responseText: string | null = null, responseXML: Document | null = null, responseCode: number = -1, statusOverride: string | null = null,  type = ErrorType.CLIENT_ERROR) {
         super();
 
         ///MYFACES-4676 error payload expects an element if possible
@@ -76,7 +77,7 @@ export class ErrorData extends EventData implements IErrorData {
         //tck requires that the type is prefixed to the message itself (jsdoc also) in case of a server error
         this.errorMessage = (type == ErrorType.SERVER_ERROR) ? type + ": " + errorMessage : errorMessage;
         this.responseCode = responseCode;
-        this.responseText = responseText;
+        this.responseText = responseText as any;
         this.responseXML = responseXML;
 
         this.status = statusOverride;
@@ -91,15 +92,18 @@ export class ErrorData extends EventData implements IErrorData {
         }
     }
 
+    /** @internal */
     static fromClient(e: Error): ErrorData {
         return new ErrorData((e as any)?.source ?? "client", e?.name ?? EMPTY_STR, e?.message ?? EMPTY_STR, e?.stack ?? EMPTY_STR);
     }
 
-    static fromHttpConnection(source: any, name: string, message: string, responseText: string, responseXML: Document, responseCode: number, status: string = EMPTY_STR): ErrorData {
+    /** @internal */
+    static fromHttpConnection(source: any, name: string, message: string, responseText: string, responseXML: Document | null, responseCode: number, status: string = EMPTY_STR): ErrorData {
         return new ErrorData(source, name, message, responseText, responseXML, responseCode, status, ErrorType.HTTP_ERROR);
     }
 
-    static fromGeneric(context: Config, errorCode: number, errorType: ErrorType = ErrorType.SERVER_ERROR): ErrorData {
+    /** @internal */
+    static fromGeneric(context: any, errorCode: number, errorType: ErrorType = ErrorType.SERVER_ERROR): ErrorData {
 
         let getMsg = this.getMsg;
 
@@ -108,18 +112,19 @@ export class ErrorData extends EventData implements IErrorData {
         let errorMessage = getMsg(context, ERROR_MESSAGE);
         let status = getMsg(context, STATUS);
         let responseText = getMsg(context, RESPONSE_TEXT);
-        let responseXML: Document = context.getIf(RESPONSE_XML).value;
+        let responseXML: Document | null = context.getIf(RESPONSE_XML).value;
 
 
         return new ErrorData(source, errorName, errorMessage, responseText, responseXML, errorCode, status, errorType);
     }
 
-    private static getMsg(context, param) {
+    private static getMsg(context: any, param: string) {
         return getMessage(context.getIf(param).orElse(EMPTY_STR).value);
     }
 
-    static fromServerError(context: Config): ErrorData {
+    /** @internal */
+    static fromServerError(context: any): ErrorData {
         return this.fromGeneric(context, -1);
     }
 
-}
+}

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

@@ -16,15 +16,16 @@
 import {Config, DQ} from "mona-dish";
 import {BEGIN, CTX_PARAM_REQ_PASS_THR, EVENT, P_AJAX_SOURCE, SOURCE} from "../core/Const";
 
-export class EventData implements IEventData{
-    type: string;
-    status: string;
+export class EventData {
+    type!: string;
+    status!: string | null;
     source: any;
-    responseCode: number;
-    responseText: string;
-    responseXML: Document;
+    responseCode!: number;
+    responseText!: string;
+    responseXML!: Document | null;
 
-    static createFromRequest(request: XMLHttpRequest, internalContext: Config, context: Config, /*event name*/ name: string): EventData {
+    /** @internal */
+    static createFromRequest(request: XMLHttpRequest, internalContext: any, context: any, /*event name*/ name: string): EventData {
 
         let eventData = new EventData();
         let internalSource = "_internal._source";

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

@@ -116,7 +116,7 @@ export interface IResponseProcessor {
      * insert with before, after sub-tags
      * @param node
      */
-    insertWithSubTags(node: XMLQuery);
+    insertWithSubTags(node: XMLQuery): void;
 
     /**
      * process the viewState update, update the affected
@@ -155,5 +155,5 @@ export interface IResponseProcessor {
      * check whether we still are in a named view root
      * (can change after a navigation)
      */
-    updateNamedViewRootState();
-}
+    updateNamedViewRootState(): void;
+}

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

@@ -57,9 +57,10 @@ export function resolveHandlerFunc(requestContext: Config, responseContext: Conf
 }
 
 export function resolveTargetUrl(srcFormElement: HTMLFormElement) {
-    return (typeof srcFormElement.elements[ENCODED_URL] == 'undefined') ?
+    const formElements = srcFormElement.elements as HTMLFormControlsCollection & {[key: string]: HTMLInputElement};
+    return (typeof formElements[ENCODED_URL] == 'undefined') ?
         srcFormElement.action :
-        srcFormElement.elements[ENCODED_URL].value;
+        formElements[ENCODED_URL].value;
 }
 
 export function resolveFinalUrl(sourceForm: DomQuery, formData: XhrFormData, ajaxType = REQ_TYPE_POST) {
@@ -76,7 +77,7 @@ export function resolveFinalUrl(sourceForm: DomQuery, formData: XhrFormData, aja
  * @param elem
  * @param event
  */
-export function resolveForm(elem: DQ, event: Event): DQ {
+export function resolveForm(elem: DQ, event?: Event): DQ {
     return ExtLang.getForm(elem.getAsElem(0).value, event);
 }
 
@@ -182,9 +183,9 @@ export function getEventTarget(evt: Event): Element {
  * @param opts
  * @param el
  */
-export function resolveDefaults(event: Event, opts: Options | [[string, any]] , el: Element | string = null): any {
+export function resolveDefaults(event?: Event, opts?: Options | [[string, any]] , el: Element | string | null = null): any {
     //deep copy the options, so that further transformations to not backfire into the callers
-    const elem = DQ.byId(el || <Element>event.target, true);
+    const elem = DQ.byId(el || (event as Event).target as Element, true);
     const options = new ExtConfig(opts).deepCopy as ExtConfig;
     return {
         options: options,
@@ -193,4 +194,4 @@ export function resolveDefaults(event: Event, opts: Options | [[string, any]] ,
         windowId: resolveWindowId(options),
         isResetValues: true === options.value?.resetValues
     };
-}
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {DQ, XMLQuery} from "mona-dish";
+import {Config, DQ, XMLQuery} from "mona-dish";
 import {ResponseProcessor} from "./ResponseProcessor";
 
 import {IResponseProcessor} from "./IResponseProcessor";
@@ -87,7 +87,7 @@ export namespace Response {
     /**
      * highest node partial-response from there the main operations are triggered
      */
-    function processPartialTag(node: XMLQuery, responseProcessor: IResponseProcessor, internalContext) {
+    function processPartialTag(node: XMLQuery, responseProcessor: IResponseProcessor, internalContext: Config) {
 
 
         /*
@@ -231,4 +231,4 @@ export namespace Response {
                 break;
         }
     }
-}
+}

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

@@ -81,41 +81,3 @@ export function resolveContexts(context: { [p: string]: any }): any {
     internalContext.assign(UPDATE_ELEMS).value = [];
     return {externalContext, internalContext};
 }
-
-/**
- * fetches the source element out of our contexts
- *
- * @param context the external context which should host the source id
- * @param internalContext internal pass-through fall back
- *
- */
-export function resolveSourceElement(context: Config, internalContext: Config): DQ {
-    let elemId = resolveSourceElementId(context, internalContext);
-    return DQ.byId(elemId.value, true);
-}
-
-/**
- * fetches the source form if it still exists
- * also embedded forms and parent forms are taken into consideration
- * as fallbacks
- *
- * @param internalContext
- * @param elem
- */
-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(HTML_TAG_FORM))
-        .orElseLazy(() => elem.querySelectorAll(HTML_TAG_FORM))
-        .orElseLazy(() => DQ.querySelectorAll(HTML_TAG_FORM));
-
-    return sourceForm;
-}
-
-function resolveSourceElementId(context: Config, internalContext: Config): Optional<string> {
-    //?internal context?? used to be external one
-    return internalContext.getIf(CTX_PARAM_SRC_CTL_ID)
-        .orElseLazy(() => context.getIf(SOURCE, "id").value);
-}
-

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

@@ -39,9 +39,8 @@ import {
     HTML_TAG_BODY,
     HTML_TAG_FORM,
     HTML_TAG_HEAD,
-    HTML_TAG_LINK,
     HTML_TAG_SCRIPT,
-    HTML_TAG_STYLE, IDENT_ALL, IDENT_NONE, NAMED_VIEWROOT,
+    IDENT_ALL, IDENT_NONE, NAMED_VIEWROOT,
     ON_ERROR,
     ON_EVENT,
     P_CLIENT_WINDOW,
@@ -204,7 +203,7 @@ export class ResponseProcessor implements IResponseProcessor {
     redirect(node: XMLQuery) {
         Assertions.assertUrlExists(node);
 
-        const redirectUrl = trim(node.attr(ATTR_URL).value);
+        const redirectUrl = trim(node.attr(ATTR_URL).value as any);
         if (redirectUrl != EMPTY_STR) {
             window.location.href = redirectUrl;
         }
@@ -240,7 +239,7 @@ export class ResponseProcessor implements IResponseProcessor {
         const elem = DQ.byId(node.id.value, true);
 
         node.byTagName(XML_TAG_ATTR).each((item: XMLQuery) => {
-            elem.attr(item.attr(ATTR_NAME).value).value = item.attr(ATTR_VALUE).value;
+            elem.attr(item.attr(ATTR_NAME).value as any).value = item.attr(ATTR_VALUE).value as any;
         });
     }
 
@@ -265,11 +264,11 @@ export class ResponseProcessor implements IResponseProcessor {
         const insertNodes = DQ.fromMarkup(node.cDATAAsString as any);
 
         if (before.isPresent()) {
-            DQ.byId(before.value, true).insertBefore(insertNodes);
+            DQ.byId(before.value as any, true).insertBefore(insertNodes);
             this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
         }
         if (after.isPresent()) {
-            const domQuery = DQ.byId(after.value, true);
+            const domQuery = DQ.byId(after.value as any, true);
             domQuery.insertAfter(insertNodes);
 
             this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
@@ -289,7 +288,7 @@ export class ResponseProcessor implements IResponseProcessor {
             const insertId = item.attr(ATTR_ID);
             const insertNodes = DQ.fromMarkup(item.cDATAAsString as any);
             if (insertId.isPresent()) {
-                DQ.byId(insertId.value, true).insertBefore(insertNodes);
+                DQ.byId(insertId.value as any, true).insertBefore(insertNodes);
                 this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
             }
         });
@@ -298,7 +297,7 @@ export class ResponseProcessor implements IResponseProcessor {
             const insertId = item.attr(ATTR_ID);
             const insertNodes = DQ.fromMarkup(item.cDATAAsString as any);
             if (insertId.isPresent()) {
-                DQ.byId(insertId.value, true).insertAfter(insertNodes);
+                DQ.byId(insertId.value as any, true).insertAfter(insertNodes);
                 this.internalContext.assign(UPDATE_ELEMS).value.push(insertNodes);
             }
         });
@@ -324,6 +323,7 @@ export class ResponseProcessor implements IResponseProcessor {
             this.internalContext.assign(APPLIED_CLIENT_WINDOW, node.id.value).value = new StateHolder($nsp(node.id.value), state);
             return true;
         }
+        return false;
     }
 
     /**
@@ -349,7 +349,7 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     fixViewStates() {
         ofAssoc(this.internalContext.getIf(APPLIED_VST).orElse({}).value)
-            .forEach(([, value]) => {
+            .forEach(([, value]: [string, Config]) => {
                 const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value
                 const affectedForms = this.getContainerForms(namingContainerId)
@@ -367,7 +367,7 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     fixClientWindow() {
         ofAssoc(this.internalContext.getIf(APPLIED_CLIENT_WINDOW).orElse({}).value)
-            .forEach(([, value]) => {
+            .forEach(([, value]: [string, Config]) => {
                 const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value;
                 const affectedForms = this.getContainerForms(namingContainerId)
@@ -385,7 +385,7 @@ export class ResponseProcessor implements IResponseProcessor {
                 !namedViewRoot.value)) {
             const SEP = $faces().separatorchar;
             this.internalContext.assign(NAMED_VIEWROOT).value = (!!document.getElementById(partialId.value)) || DQ$(`input[name*='${$nsp(P_VIEWSTATE)}']`)
-                .filter(node => node.attr("name").value.indexOf(partialId.value + SEP) == 0).length > 0;
+                .filter(node => (node.attr("name").value as any).indexOf(partialId.value + SEP) == 0).length > 0;
         }
     }
 
@@ -404,6 +404,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * proper viewState -> form assignment
      *
      * @param forms the forms to append the viewState to
+     * @param namedViewRoot if set to true, the name is also prefixed
      * @param viewState the final viewState
      * @param namingContainerId
      */
@@ -416,6 +417,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * proper clientWindow -> form assignment
      *
      * @param forms the forms to append the viewState to
+     * @param namedViewRoot if set to true, the name is also prefixed
      * @param clientWindow the final viewState
      * @param namingContainerId
      */
@@ -518,13 +520,13 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param affectedForm
      * @private
      */
-    private isInExecuteOrRender(affectedForm) {
+    private isInExecuteOrRender(affectedForm: DQ) {
         const executes = this.externalContext.getIf($nsp(P_EXECUTE)).orElse("@none").value.split(/\s+/gi);
         const renders = this.externalContext.getIf(P_RENDER_OVERRIDE)
             .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 [...executeAndRenders].filter((nameOrId: string) => {
             if ([IDENT_ALL, IDENT_NONE].indexOf(nameOrId) != -1) {
                 return true;
             }
@@ -555,7 +557,7 @@ export class ResponseProcessor implements IResponseProcessor {
         }
     }
 
-    private getNameOrIdSelector(nameOrId) {
+    private getNameOrIdSelector(nameOrId: string) {
         return `[id='${nameOrId}'], [name='${nameOrId}']`;
     }
-}
+}