jsf.js_next_gen 1.0.0-beta-20 → 4.0.0-beta-2

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "1.0.0-beta-20",
+  "version": "4.0.0-beta-2",
   "description": "A next generation typescript reimplementation of jsf.js",
-  "main": "dist/window/jsf.js",
+  "main": "dist/window/faces.js",
   "scripts": {
     "doc": "npx typedoc --tsconfig src/main/typescript/tsconfig-typedoc.json",
     "test": "env TS_NODE_PROJECT=./src/main/typescript/tsconfig.json mocha",

package/src/main/types/typedefs.d.ts

@@ -64,3 +64,5 @@ declare interface EventData {
     status: String;
     source: any;
 }
+
+

package/src/main/typescript/api/{Jsf.ts → faces.ts}

@@ -23,13 +23,13 @@ import {oam as _oam} from "../myfaces/OamSubmit";
 
 //declare const Implementation: any;
 
-export module jsf {
+export module faces {
     "use strict";
 
     /*
-     * Version of the implementation for the jsf.js.
+     * Version of the implementation for the faces.js.
      * <p />
-     * as specified within the jsf specifications jsf.html:
+     * as specified within the jsf specifications faces.html:
      * <ul>
      * <li>left two digits major release number</li>
      * <li>middle two digits minor spec release number</li>
@@ -37,7 +37,7 @@ export module jsf {
      * </ul>
      * @constant
      */
-    export var specversion = 220000;
+    export var specversion = 400000;
     /**
      * Implementation version as specified within the jsf specification.
      * <p />
@@ -67,7 +67,7 @@ export module jsf {
      * </li>
      *
      * @return {String} the current project state emitted by the server side method:
-     * <i>javax.faces.application.Application.getProjectStage()</i>
+     * <i>jakarta.faces.application.Application.getProjectStage()</i>
      */
     export function getProjectStage(): string {
         return Implementation.getProjectStage();
@@ -75,7 +75,7 @@ export module jsf {
 
     /**
      * collect and encode data for a given form element (must be of type form)
-     * find the javax.faces.ViewState element and encode its value as well!
+     * find the jakarta.faces.ViewState element and encode its value as well!
      * return a concatenated string of the encoded values!
      *
      * @throws an exception in case of the given element not being of type form!
@@ -233,14 +233,18 @@ export module myfaces {
      *
      * @param source the event source
      * @param event the event
-     * @param eventName event name for java.javax.faces.behavior.evemnt
-     * @param execute execute list as passed down in jsf.ajax.request
+     * @param eventName event name for java.jakarta.faces.behavior.evemnt
+     * @param execute execute list as passed down in faces.ajax.request
      * @param render
      * @param options
      */
     export function ab(source: Element, event: Event, eventName: string, execute: string, render: string, options: Context = {}) {
         if (eventName) {
-            options["javax.faces.behavior.event"] = eventName;
+            if(!(window as any)?.jsf) {
+                options["jakarta.faces.behavior.event"] = eventName;
+            } else {
+                options["javax.faces.behavior.event"] = eventName;
+            }
         }
         if (execute) {
             options["execute"] = execute;
@@ -249,7 +253,7 @@ export module myfaces {
             options["render"] = render;
         }
 
-        jsf.ajax.request(source, event, options);
+        faces.ajax.request(source, event, options);
     }
 
     /**

package/src/main/typescript/api/jsf.ts

@@ -0,0 +1,30 @@
+/* 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 {faces} from "./faces";
+import {remapNamespacesFor23} from "../impl/core/Const";
+
+declare const window: any;
+
+/**
+ * jsf.js back compatibility shim layer
+ * the entire namespace for jsf and javax still is provided
+ */
+if(!window.jsf) {
+    window['jsf'] = (window as any)?.jsf ?? faces;
+    window.jsf.specversion = 230000;
+    remapNamespacesFor23();
+}
+export var jsf = window.jsf;

package/src/main/typescript/impl/AjaxImpl.ts

@@ -59,7 +59,7 @@ import {
 } from "./xhrCore/RequestDataResolver";
 
 
-declare var jsf: any;
+declare var faces: any;
 
 /*
  * allowed project stages
@@ -149,7 +149,7 @@ export module Implementation {
     import getGlobalConfig = ExtLang.getGlobalConfig;
     import assert = Assertions.assert;
 
-
+    declare const window: any;
 
     let projectStage: string = null;
     let separator: string = null;
@@ -185,7 +185,7 @@ export module Implementation {
     /**
      * @return the project stage also emitted by the server:
      * it cannot be cached and must be delivered over the server
-     * The value for it comes from the requestInternal parameter of the jsf.js script called "stage".
+     * The value for it comes from the requestInternal parameter of the faces.js script called "stage".
      */
     export function getProjectStage(): string | null {
         return resolveGlobalConfig()?.projectStage ??
@@ -199,13 +199,13 @@ export module Implementation {
      */
     export function resolveProjectStateFromURL(): string | null {
 
-        /* run through all script tags and try to find the one that includes jsf.js */
+        /* run through all script tags and try to find the one that includes faces.js */
         const foundStage = ExtDomquery.searchJsfJsFor(/stage=([^&;]*)/).value as string;
         return (foundStage in ProjectStages) ? foundStage : null;
     }
 
     /**
-     * implementation of the jsf.util.chain functionality
+     * implementation of the faces.util.chain functionality
      *
      * @param source
      * @param event
@@ -270,6 +270,7 @@ export module Implementation {
         const timeout: number = resolveTimeout(options);
 
         requestCtx.assignIf(!!windowId, P_WINDOW_ID).value = windowId;
+
         requestCtx.assign(CTX_PARAM_PASS_THR).value = filterPassthroughValues(options.value);
         requestCtx.assignIf(!!resolvedEvent, CTX_PARAM_PASS_THR, P_EVT).value = resolvedEvent?.type;
 
@@ -293,18 +294,18 @@ export module Implementation {
         requestCtx.assign(MYFACES).value = options.value?.myfaces;
 
         /**
-         * binding contract the javax.faces.source must be set
+         * binding contract the jakarta.faces.source must be set
          */
         requestCtx.assign(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value = elementId;
 
         /**
-         * javax.faces.partial.ajax must be set to true
+         * jakarta.faces.partial.ajax must be set to true
          */
         requestCtx.assign(CTX_PARAM_PASS_THR, P_AJAX).value = true;
 
         /**
          * if resetValues is set to true
-         * then we have to set javax.faces.resetValues as well
+         * then we have to set jakarta.faces.resetValues as well
          * as pass through parameter
          * the value has to be explicitly true, according to
          * the specs jsdoc
@@ -435,7 +436,7 @@ export module Implementation {
     }
 
     /**
-     * @node optional element or id defining a rootnode where an element with the id "javax.faces.windowId" is hosted
+     * @node optional element or id defining a rootnode where an element with the id "jakarta.faces.windowId" is hosted
      * @return the client window id of the current window, if one is given if none is found, null is returned
      */
     export function getClientWindow(node ?: Element | string): string | null {
@@ -496,7 +497,7 @@ export module Implementation {
 
     /**
      * collect and encode data for a given form element (must be of type form)
-     * find the javax.faces.ViewState element and encode its value as well!
+     * find the jakarta.faces.ViewState element and encode its value as well!
      * @return a concatenated string of the encoded values!
      *
      * @throws Error in case of the given element not being of type form!
@@ -543,10 +544,10 @@ export module Implementation {
      *
      * This function does it for the render parameters
      *
-     * @param requestOptions the source options coming in as options object from jsf.ajax.request (options parameter)
+     * @param requestOptions the source options coming in as options object from faces.ajax.request (options parameter)
      * @param targetContext the receiving target context
      * @param issuingForm the issuing form
-     * @param sourceElementId the executing element triggering the jsf.ajax.request (id of it)
+     * @param sourceElementId the executing element triggering the faces.ajax.request (id of it)
      */
     function assignRender(requestOptions: Config, targetContext: Config, issuingForm: DQ, sourceElementId: string) {
         if (requestOptions.getIf(RENDER).isPresent()) {
@@ -561,10 +562,10 @@ export module Implementation {
      *
      * This function does it for the execute parameters
      *
-     * @param requestOptions the source options coming in as options object from jsf.ajax.request (options parameter)
+     * @param requestOptions the source options coming in as options object from faces.ajax.request (options parameter)
      * @param targetContext the receiving target context
      * @param issuingForm the issuing form
-     * @param sourceElementId the executing element triggering the jsf.ajax.request (id of it)
+     * @param sourceElementId the executing element triggering the faces.ajax.request (id of it)
      */
     function assignExecute(requestOptions: Config, targetContext: Config, issuingForm: DQ, sourceElementId: string) {
 
@@ -587,7 +588,8 @@ export module Implementation {
      * @param targetContext the target context receiving the value
      */
     function assignClientWindowId(form: DQ, targetContext: Config) {
-        let clientWindow = jsf.getClientWindow(form.getAsElem(0).value);
+
+        let clientWindow = (window?.faces ?? window?.jsf).getClientWindow(form.getAsElem(0).value);
         if (clientWindow) {
             targetContext.assign(CTX_PARAM_PASS_THR, P_CLIENT_WINDOW).value = clientWindow;
         }

package/src/main/typescript/impl/PushImpl.ts

@@ -15,14 +15,14 @@
  */
 
 /**
- * Typescript port of the jsf.push part in the myfaces implementation
+ * Typescript port of the faces.push part in the myfaces implementation
  */
 
 //TODO still work in progress
 //this is a 1:1 port for the time being
-import {jsf} from "../api/Jsf";
 import {MAX_RECONNECT_ATTEMPTS, REASON_EXPIRED, RECONNECT_INTERVAL} from "./core/Const";
 
+declare const window: any;
 
 /**
  * Implementation class for the push functionality
@@ -99,7 +99,7 @@ export module PushImpl {
         }
 
         if (autoconnect) {
-            jsf.push.open(socketClientId);
+            (window?.faces ?? window?.jsf).push.open(socketClientId);
         }
     }
 

package/src/main/typescript/impl/core/Const.ts

@@ -17,13 +17,13 @@
 /*
  * [export const] constants
  */
+export let P_PARTIAL_SOURCE = "jakarta.faces.source";
+export let PARTIAL_ID = "partialId";
+export let P_VIEWSTATE = "jakarta.faces.ViewState";
+export let P_VIEWROOT = "jakarta.faces.ViewRoot";
+export let P_VIEWHEAD = "jakarta.faces.ViewHead";
+export let P_VIEWBODY = "jakarta.faces.ViewBody";
 
-export const P_PARTIAL_SOURCE = "javax.faces.source";
-export const PARTIAL_ID = "partialId";
-export const P_VIEWSTATE = "javax.faces.ViewState";
-export const P_VIEWROOT = "javax.faces.ViewRoot";
-export const P_VIEWHEAD = "javax.faces.ViewHead";
-export const P_VIEWBODY = "javax.faces.ViewBody";
 
 /*some useful definitions*/
 
@@ -42,14 +42,14 @@ export const IDENT_THIS = "@this";
 export const IDENT_FORM = "@form";
 
 
-export const P_AJAX = "javax.faces.partial.ajax";
-export const P_EXECUTE = "javax.faces.partial.execute";
-export const P_RENDER = "javax.faces.partial.render";
-export const P_EVT = "javax.faces.partial.event";
-export const P_CLIENT_WINDOW = "javax.faces.ClientWindow";
-export const P_RESET_VALUES = "javax.faces.partial.resetValues";
+export let P_AJAX = "jakarta.faces.partial.ajax";
+export let P_EXECUTE = "jakarta.faces.partial.execute";
+export let P_RENDER = "jakarta.faces.partial.render";
+export let P_EVT = "jakarta.faces.partial.event";
+export let P_CLIENT_WINDOW = "jakarta.faces.ClientWindow";
+export let P_RESET_VALUES = "jakarta.faces.partial.resetValues";
+export let P_WINDOW_ID = "jakarta.faces.windowId";
 
-export const P_WINDOW_ID = "javax.faces.windowId";
 
 export const RENDER = "render";
 export const WINDOW_ID = "windowId";
@@ -103,7 +103,7 @@ export const CONTENT_TYPE = "Content-Type";
 export const HEAD_FACES_REQ = "Faces-Request";
 export const REQ_ACCEPT = "Accept";
 export const VAL_AJAX = "partial/ajax";
-export const ENCODED_URL = "javax.faces.encodedURL";
+export let ENCODED_URL = "jakarta.faces.encodedURL";
 export const REQ_TYPE_GET = "GET";
 export const REQ_TYPE_POST = "POST";
 export const STATE_EVT_BEGIN = "begin"; //TODO remove this
@@ -171,3 +171,41 @@ export const RECONNECT_INTERVAL = 500;
 export const MAX_RECONNECT_ATTEMPTS = 25;
 
 export const UNKNOWN = "UNKNOWN";
+
+
+/**
+ * helper to remap the namespaces variables for 2.3
+ * from 2.3 to 4.0 every javax namespace has been changed
+ * to faces
+ */
+export function remapNamespacesFor23() {
+     P_PARTIAL_SOURCE = "javax.faces.source";
+     P_VIEWSTATE = "javax.faces.ViewState";
+     P_VIEWROOT = "javax.faces.ViewRoot";
+     P_VIEWHEAD = "javax.faces.ViewHead";
+     P_VIEWBODY = "javax.faces.ViewBody";
+     P_AJAX = "javax.faces.partial.ajax";
+     P_EXECUTE = "javax.faces.partial.execute";
+     P_RENDER = "javax.faces.partial.render";
+     P_EVT = "javax.faces.partial.event";
+     P_CLIENT_WINDOW = "javax.faces.ClientWindow";
+     P_RESET_VALUES = "javax.faces.partial.resetValues";
+     P_WINDOW_ID = "javax.faces.windowId";
+    ENCODED_URL = "javax.faces.encodedURL";
+}
+
+export function remapNamespacesFor40() {
+     P_PARTIAL_SOURCE = "jakarta.faces.source";
+     P_VIEWSTATE = "jakarta.faces.ViewState";
+     P_VIEWROOT = "jakarta.faces.ViewRoot";
+     P_VIEWHEAD = "jakarta.faces.ViewHead";
+     P_VIEWBODY = "jakarta.faces.ViewBody";
+     P_AJAX = "jakarta.faces.partial.ajax";
+     P_EXECUTE = "jakarta.faces.partial.execute";
+     P_RENDER = "jakarta.faces.partial.render";
+     P_EVT = "jakarta.faces.partial.event";
+     P_CLIENT_WINDOW = "jakarta.faces.ClientWindow";
+     P_RESET_VALUES = "jakarta.faces.partial.resetValues";
+     P_WINDOW_ID = "jakarta.faces.windowId";
+     ENCODED_URL = "jakarta.faces.encodedURL";
+}

package/src/main/typescript/impl/i18n/Messages.ts

@@ -43,7 +43,7 @@ export class Messages {
     /** @constant */
     ERR_FORM = "Sourceform could not be determined, either because element is not attached to a form or we have multiple forms with named elements of the same identifier or name, stopping the ajax processing";
     /** @constant */
-    ERR_VIEWSTATE = "jsf.viewState= param value not of type form!";
+    ERR_VIEWSTATE = "faces.viewState= param value not of type form!";
     /** @constant */
     ERR_TRANSPORT = "Transport type {0} does not exist";
     /** @constant */

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

@@ -43,7 +43,7 @@ export module Assertions {
         assertFunction(options.getIf(ON_EVENT).value);
         //improve the error messages if an empty elem is passed
         //Assertions.assertElementExists(elem);
-        assert(elem.isPresent(), getMessage("ERR_MUST_BE_PROVIDED1", "{0}: source  must be provided or exist", "source element id"), "jsf.ajax.request", "ArgNotSet",  )
+        assert(elem.isPresent(), getMessage("ERR_MUST_BE_PROVIDED1", "{0}: source  must be provided or exist", "source element id"), "faces.ajax.request", "ArgNotSet",  )
     }
 
     export function assertUrlExists(node: XMLQuery): void | never {

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

@@ -20,29 +20,40 @@ declare let window: any;
 
 
 /**
- * detects whether a source is a jsf.js request
+ * detects whether a source is a faces.js request
  *
- * @param source the source string for the jsf.js request
- * @return true if a jsf.js loading pattern is detected
+ * @param source the source string for the faces.js request
+ * @return true if a faces.js loading pattern is detected
  * @constructor
  */
-const IS_JSF_SOURCE = (source?: string): boolean => {
-    return source && !!(source?.search(/\/javax\.faces\.resource.*\/jsf\.js.*/) != -1 ||
-        source?.search(/\/jsf-development\.js.*/) != -1 ||
-        source?.search(/\/jsf-uncompressed\.js.*/) != -1 ||
-        source?.search(/\/jsf[^.]*\.js.*ln=javax.faces.*/gi) != -1);
+const IS_FACES_SOURCE = (source?: string): boolean => {
+    //spec version smaller 4 we have to deal with the jsf namespace
+    if (window.jsf) {
+        // fallback into 2.3 api level
+        return source && !!(source?.search(/\/javax\.faces\.resource.*\/jsf\.js.*/) != -1 ||
+            source?.search(/\/jsf-development\.js.*/) != -1 ||
+            source?.search(/\/jsf-uncompressed\.js.*/) != -1 ||
+            source?.search(/\/jsf[^.]*\.js.*ln=javax.faces.*/gi) != -1);
+    }
+    return source && !!(source?.search(/\/jakarta\.faces\.resource.*\/faces\.js.*/) != -1 ||
+        source?.search(/\/faces-development\.js.*/) != -1 ||
+        source?.search(/\/faces-uncompressed\.js.*/) != -1 ||
+        source?.search(/\/faces[^.]*\.js.*ln=jakarta.faces.*/gi) != -1);
 }
 
 /**
  * namespace myfaces.testscripts can be used as extension point for internal
- * tests, those will be handled similarly to jsf.js regarding
+ * tests, those will be handled similarly to faces.js regarding
  * reload blocking on ajax requests
  *
  * @param source the source to check
  * @constructor
  */
 const IS_INTERNAL_SOURCE = (source: string): boolean => {
-    return  source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
+    if (window?.jsf) {
+        return source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
+    }
+    return source.search(/\/faces[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
 }
 
 
@@ -82,7 +93,7 @@ export class ExtDomquery extends DQ {
         //byId ($)
         if (this.value.isPresent()) {
             let result = this.querySelectorAll("form input[name='" + P_WINDOW_ID + "']");
-            if (result.length > 0) {
+            if (result.length > 1) {
                 throw Error("Multiple different windowIds found in document");
             }
 
@@ -93,7 +104,7 @@ export class ExtDomquery extends DQ {
     }
 
     /*
-    * determines the jsf.js nonce and adds them to the namespace
+    * determines the faces.js nonce and adds them to the namespace
     * this is done once and only lazily
     */
     get nonce(): string | null {
@@ -116,7 +127,7 @@ export class ExtDomquery extends DQ {
             .querySelectorAll("script[src], link[src]")
             .lazyStream
             .filter((item) => item.attr("nonce").value != null && item.attr(ATTR_SRC) != null)
-            .map(item => IS_JSF_SOURCE(item.attr(ATTR_SRC).value))
+            .map(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))
             .first();
 
         if (nonceScript.isPresent()) {
@@ -130,19 +141,19 @@ export class ExtDomquery extends DQ {
     }
 
     /**
-     * searches the embedded jsf.js for items like separator char etc..
+     * searches the embedded faces.js for items like separator char etc..
      * expects a match as variable under position 1 in the result match
      * @param rexp
      */
     searchJsfJsFor(rexp: RegExp): Optional<string> {
         //perfect application for lazy stream
         return DQ.querySelectorAll("script[src], link[src]").lazyStream
-                .filter(item => IS_JSF_SOURCE(item.attr(ATTR_SRC).value))
-                .map(item => item.attr(ATTR_SRC).value.match(rexp))
-                .filter(item => item != null && item.length > 1)
-                .map((result: string[]) => {
-                    return decodeURIComponent(result[1]);
-                }).first();
+            .filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))
+            .map(item => item.attr(ATTR_SRC).value.match(rexp))
+            .filter(item => item != null && item.length > 1)
+            .map((result: string[]) => {
+                return decodeURIComponent(result[1]);
+            }).first();
     }
 
     globalEval(code: string, nonce ?: string): DQ {
@@ -156,7 +167,7 @@ export class ExtDomquery extends DQ {
      */
     runScripts(whilteListed?: (src: string) => boolean): DomQuery {
         const whitelistFunc = (src: string): boolean => {
-            return (whilteListed?.(src) ?? true) && !IS_JSF_SOURCE(src)  && !IS_INTERNAL_SOURCE(src);
+            return (whilteListed?.(src) ?? true) && !IS_FACES_SOURCE(src) && !IS_INTERNAL_SOURCE(src);
         };
         return super.runScripts(whitelistFunc);
     }

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

@@ -33,7 +33,8 @@ export class EventData {
 
         let sourceId: string = context.getIf(SOURCE)
             .orElseLazy(() => context.getIf(P_PARTIAL_SOURCE).value)
-            .orElseLazy(() => context.getIf(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value).value;
+            .orElseLazy(() => context.getIf(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value)
+            .value;
         if (sourceId) {
             eventData.source = DQ.byId(sourceId, true).first().value.value;
         }

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

@@ -131,7 +131,7 @@ export function getEventTarget(evt: Event): Element {
 /**
  * resolves a bunch of default values
  * which can be further processed from the given
- * call parameters of jsf.ajax.request
+ * call parameters of faces.ajax.request
  *
  * @param event
  * @param opts

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

@@ -45,8 +45,8 @@ export module Response {
 
 
     /**
-     * Standardized jsf.js response
-     * this one is called straight from jsf.js.response
+     * Standardized faces.js response
+     * this one is called straight from faces.js.response
      *
      * The processing follows the spec by going for the responseXML
      * and processing its tags

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

@@ -55,6 +55,8 @@ import {
 import trim = Lang.trim;
 import {ExtDomquery} from "../util/ExtDomQuery";
 
+declare const window: any;
+
 /**
  * Response processor
  *
@@ -438,7 +440,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns true of it ii
      */
     private static isViewStateNode(node: XMLQuery): boolean {
-        let separatorChar = (<any>window).jsf.separatorchar;
+        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
         return "undefined" != typeof node?.id?.value && (node?.id?.value == P_VIEWSTATE ||
             node?.id?.value?.indexOf([separatorChar, P_VIEWSTATE].join(EMPTY_STR)) != -1 ||
             node?.id?.value?.indexOf([P_VIEWSTATE, separatorChar].join(EMPTY_STR)) != -1);
@@ -451,7 +453,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns true of it ii
      */
     private static isClientWindowNode(node: XMLQuery): boolean {
-        let separatorChar = (<any>window).jsf.separatorchar;
+        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
         return "undefined" != typeof node?.id?.value && (node?.id?.value == P_CLIENT_WINDOW ||
             node?.id?.value?.indexOf([separatorChar, P_CLIENT_WINDOW].join(EMPTY_STR)) != -1 ||
             node?.id?.value?.indexOf([P_CLIENT_WINDOW, separatorChar].join(EMPTY_STR)) != -1);

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

@@ -24,7 +24,7 @@ import isString = Lang.isString;
  *
  * We cannot use standard html5 forms everywhere
  * due to api constraints on the HTML Form object in IE11
- * and due to the url encoding constraint given by the jsf.js spec
+ * 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
@@ -201,7 +201,7 @@ export class XhrFormData extends Config {
         /*
          * Spec. 13.3.1
          * Collect and encode input elements.
-         * Additionally the hidden element javax.faces.ViewState
+         * Additionally the hidden element jakarta.faces.ViewState
          * Enhancement partial page submit
          *
          */

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

@@ -46,7 +46,7 @@ import {resolveFinalUrl, resolveHandlerFunc} from "./RequestDataResolver";
 import failSaveExecute = ExtLang.failSaveExecute;
 
 /**
- * JSFed XHR Request Wrapper
+ * Faces XHR Request Wrapper
  * as Asyncrunnable for our Asynchronous queue
  *
  * The idea is that we basically just enqueue
@@ -54,8 +54,7 @@ import failSaveExecute = ExtLang.failSaveExecute;
  * and let the queue do the processing.
  *
  */
-
-declare let jsf: any;
+declare const window: any;
 
 export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
 
@@ -118,7 +117,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         try {
 
             let formElement = this.sourceForm.getAsElem(0).value;
-            let viewState = jsf.getViewState(formElement);
+            let viewState = (window?.faces ?? window?.jsf).getViewState(formElement);
             //encoded we need to decode
             //We generated a base representation of the current form
             //in case someone has overloaded the viewstate with addtional decorators we merge
@@ -275,7 +274,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             return;
         }
 
-        jsf.ajax.response(this.xhrObject, this.responseContext.value ?? {});
+        (window?.faces ?? window.jsf).ajax.response(this.xhrObject, this.responseContext.value ?? {});
     }
 
     private handleMalFormedXML(resolve: Function) {

package/src/main/typescript/myfaces/OamSubmit.ts

@@ -30,7 +30,6 @@ import {DQ, Stream} from "mona-dish";
 declare const window: any;
 declare const myfaces: any;
 
-//TODO add unit tests to check all this here that it works just as before
 export module oam {
     /**
      * sets a hidden input field