jsf.js_next_gen 1.0.0-beta-20 → 4.0.0-RC.1

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! 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
@@ -27,7 +27,7 @@ import {
 } from "../core/Const";
 import {XhrFormData} from "./XhrFormData";
 import {ExtLang} from "../util/Lang";
-import {ExtDomquery} from "../util/ExtDomQuery";
+import {ExtConfig, ExtDomQuery} from "../util/ExtDomQuery";
 
 /**
  * Resolver functions for various aspects of the request data
@@ -37,7 +37,7 @@ import {ExtDomquery} from "../util/ExtDomQuery";
  */
 
 /**
- * resolves the event handlers lazly
+ * resolves the event handlers lazily
  * so that if some decoration happens in between we can deal with it
  *
  * @param requestContext
@@ -95,12 +95,12 @@ export function resolveDelay(options: Config): number {
 }
 
 /**
- * resolves the window Id from various sources
+ * resolves the window-id from various sources
  *
  * @param options
  */
 export function resolveWindowId(options: Config) {
-    return options?.value?.windowId ?? ExtDomquery.windowId;
+    return options?.value?.windowId ?? ExtDomQuery.windowId;
 }
 
 /**
@@ -108,19 +108,20 @@ export function resolveWindowId(options: Config) {
  * browser save event resolution
  * @param evt the event object
  * (with a fallback for ie events if none is present)
+ * @deprecated soon will be removed
  */
 export function getEventTarget(evt: Event): Element {
-    //ie6 and 7 fallback
+    // ie6 and 7 fallback
     let finalEvent = evt;
-    /**
+    /*
      * evt source is defined in the jsf events
-     * seems like some component authors use our code
+     * seems like some component authors use our code,
      * so we add it here see also
      * https://issues.apache.org/jira/browse/MYFACES-2458
      * not entirely a bug but makes sense to add this
-     * behavior. I dont use it that way but nevertheless it
+     * behavior. I don´t use it that way but nevertheless it
      * does not break anything so why not
-     * */
+     */
     let t = finalEvent?.srcElement ?? finalEvent?.target ?? (<any>finalEvent)?.source;
     while ((t) && (t.nodeType != 1)) {
         t = t.parentNode;
@@ -131,7 +132,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
@@ -140,10 +141,10 @@ export function getEventTarget(evt: Event): Element {
 export function resolveDefaults(event: Event, opts: any = {}, el: Element | string = null) {
     //deep copy the options, so that further transformations to not backfire into the callers
     const resolvedEvent = event,
-        options = new Config(opts).deepCopy,
+        options = new ExtConfig(opts).deepCopy,
         elem = DQ.byId(el || <Element>resolvedEvent.target, true),
-        elementId = elem.id.value, requestCtx = new Config({}),
-        internalCtx = new Config({}), windowId = resolveWindowId(options),
+        elementId = elem.id.value, requestCtx = new ExtConfig({}),
+        internalCtx = new ExtConfig({}), windowId = resolveWindowId(options),
         isResetValues = true === options.value?.resetValues;
 
     return {resolvedEvent, options, elem, elementId, requestCtx, internalCtx, windowId, isResetValues};

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! 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
@@ -19,6 +19,7 @@ import {Config, Optional, XMLQuery} from "mona-dish";
 import {Assertions} from "../util/Assertions";
 import {DQ} from "mona-dish";
 import {
+    $nsp,
     CTX_PARAM_MF_INTERNAL,
     CTX_PARAM_SRC_CTL_ID,
     CTX_PARAM_SRC_FRM_ID,
@@ -26,8 +27,10 @@ import {
     SOURCE,
     TAG_FORM,
     UPDATE_ELEMS,
-    UPDATE_FORMS
+    UPDATE_FORMS,
+    DEFERRED_HEAD_INSERTS
 } from "../core/Const";
+import {ExtConfig} from "../util/ExtDomQuery";
 
 /**
  * Resolver functions for various aspects of the response data
@@ -42,19 +45,19 @@ import {
  *
  * @param request the request hosting the responseXML
  *
- * Throws an error in case of non existent or wrong xml data
+ * Throws an error in case of non-existent or wrong xml data
  *
  */
 export function resolveResponseXML(request: Config): XMLQuery {
-    let ret = new XMLQuery(request.getIf(SEL_RESPONSE_XML).value);
+    let ret = new XMLQuery($nsp(request.getIf(SEL_RESPONSE_XML).value));
     Assertions.assertValidXMLResponse(ret);
 
     return ret;
 }
 
 /**
- * Splits the incoming passthrough context apart
- * in an internal and an external nomalized context
+ * Splits the incoming pass-through context apart
+ * in an internal and an external normalized context
  * the internal one is just for our internal processing
  *
  * @param context the root context as associative array
@@ -64,25 +67,26 @@ export function resolveContexts(context: { [p: string]: any }): any {
      * we split the context apart into the external one and
      * some internal values
      */
-    let externalContext = Config.fromNullable(context);
+    let externalContext = ExtConfig.fromNullable(context);
     let internalContext = externalContext.getIf(CTX_PARAM_MF_INTERNAL);
     if (!internalContext.isPresent()) {
-        internalContext = Config.fromNullable({});
+        internalContext = ExtConfig.fromNullable({});
     }
 
     /**
      * prepare storage for some deferred operations
      */
+    internalContext.assign(DEFERRED_HEAD_INSERTS).value = [];
     internalContext.assign(UPDATE_FORMS).value = [];
     internalContext.assign(UPDATE_ELEMS).value = [];
     return {externalContext, internalContext};
 }
 
 /**
- * fetches the source element out of our conexts
+ * fetches the source element out of our contexts
  *
- * @param context the external context which shpuld host the source id
- * @param internalContext internal passthrough fall back
+ * @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 {

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! 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
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import {Config, DQ, XMLQuery} from "mona-dish";
+import {DQ, XMLQuery} from "mona-dish";
 import {ResponseProcessor} from "./ResponseProcessor";
 
 import {IResponseProcessor} from "./IResponseProcessor";
 import {
+    $nsp,
     CMD_ATTRIBUTES,
     CMD_CHANGES,
     CMD_DELETE,
@@ -27,7 +28,7 @@ import {
     CMD_EXTENSION,
     CMD_INSERT,
     CMD_REDIRECT,
-    CMD_UPDATE,
+    CMD_UPDATE, P_RESOURCE,
     P_VIEWBODY,
     P_VIEWHEAD,
     P_VIEWROOT,
@@ -38,6 +39,7 @@ import {
     TAG_BEFORE
 } from "../core/Const";
 import {resolveContexts, resolveResponseXML} from "./ResonseDataResolver";
+import {ExtConfig} from "../util/ExtDomQuery";
 
 
 
@@ -45,8 +47,8 @@ export module Response {
 
 
     /**
-     * Standardized jsf.js response
-     * this one is called straight from jsf.js.response
+     * Standardized faces.ts response
+     * this one is called straight from faces.ts.response
      *
      * The processing follows the spec by going for the responseXML
      * and processing its tags
@@ -57,23 +59,23 @@ export module Response {
      */
     export function processResponse(request: XMLHttpRequest, context: Context) {
 
-        let req = Config.fromNullable(request);
+        let req = ExtConfig.fromNullable(request);
         let {externalContext, internalContext} = resolveContexts(context);
         let responseXML: XMLQuery = resolveResponseXML(req);
         let responseProcessor = new ResponseProcessor(req, externalContext, internalContext);
 
         internalContext.assign(RESPONSE_XML).value = responseXML;
 
-        //we now process the partial tags, or in none given raise an error
+        // we now process the partial tags, or in none given raise an error
         responseXML.querySelectorAll(RESP_PARTIAL)
             .each(item => processPartialTag(<XMLQuery>item, responseProcessor, internalContext));
 
-        //we now process the viewstates, client windows and the evals deferred
-        //the reason for this is that often it is better
-        //to wait until the document has caught up before
-        //doing any evals even on embedded scripts
-        //usually this does not matter, the client window comes in almost last always anyway
-        //we maybe drop this deferred assignment in the future, but myfaces did it until now
+        // We now process the viewStates, client windows and the elements to be evaluated are delayed.
+        // The reason for this is that often it is better
+        // to wait until the document has caught up before
+        // doing any evaluations even on embedded scripts.
+        // Usually this does not matter, the client window comes in almost last always anyway
+        // we maybe drop this deferred assignment in the future, but myfaces did it until now.
         responseProcessor.fixViewStates();
         responseProcessor.fixClientWindow();
         responseProcessor.globalEval();
@@ -89,7 +91,7 @@ export module Response {
         internalContext.assign(PARTIAL_ID).value = node.id;
         const SEL_SUB_TAGS = [CMD_ERROR, CMD_REDIRECT, CMD_CHANGES].join(",");
 
-        //now we can process the main operations
+        // now we can process the main operations
         node.querySelectorAll(SEL_SUB_TAGS).each((node: XMLQuery) => {
             switch (node.tagName.value) {
                 case CMD_ERROR:
@@ -107,10 +109,10 @@ export module Response {
     }
 
     let processInsert = function (responseProcessor: IResponseProcessor, node: XMLQuery) {
-         //path1 insert after as child tags
+         // path1 insert after as child tags
          if(node.querySelectorAll([TAG_BEFORE, TAG_AFTER].join(",")).length) {
-             responseProcessor.insertWithSubtags(node);
-         } else { //insert before after with id
+             responseProcessor.insertWithSubTags(node);
+         } else { // insert before after with id
              responseProcessor.insert(node);
          }
 
@@ -169,14 +171,14 @@ export module Response {
 
     /**
      * branch tag update. drill further down into the updates
-     * special case viewstate in that case it is a leaf
-     * and the viewstate must be processed
+     * special case viewState in that case it is a leaf
+     * and the viewState must be processed
      *
      * @param node
      * @param responseProcessor
      */
      function processUpdateTag(node: XMLQuery, responseProcessor: IResponseProcessor) {
-         //early state storing, if no state we perform a normal update cycle
+         // early state storing, if no state we perform a normal update cycle
         if (!storeState(responseProcessor, node)) {
             handleElementUpdate(node, responseProcessor);
         }
@@ -191,19 +193,23 @@ export module Response {
      function handleElementUpdate(node: XMLQuery, responseProcessor: IResponseProcessor) {
         let cdataBlock = node.cDATAAsString;
         switch (node.id.value) {
-            case P_VIEWROOT :
+            case $nsp(P_VIEWROOT) :
                 responseProcessor.replaceViewRoot(DQ.fromMarkup(cdataBlock.substring(cdataBlock.indexOf("<html"))));
                 break;
 
-            case P_VIEWHEAD:
+            case $nsp(P_VIEWHEAD):
                 responseProcessor.replaceHead(DQ.fromMarkup(cdataBlock));
                 break;
 
-            case P_VIEWBODY:
+            case $nsp(P_VIEWBODY):
                 responseProcessor.replaceBody(DQ.fromMarkup(cdataBlock));
                 break;
 
-            default://htmlItem replacement
+            case $nsp(P_RESOURCE):
+                responseProcessor.addToHead(DQ.fromMarkup(cdataBlock))
+                break;
+
+            default:// htmlItem replacement
                 responseProcessor.update(node, cdataBlock);
                 break;
         }

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! 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
@@ -23,6 +23,7 @@ import {StateHolder} from "../core/ImplTypes";
 import {EventData} from "./EventData";
 
 import {
+    $nsp,
     APPLIED_CLIENT_WINDOW,
     APPLIED_VST,
     ATTR_ID,
@@ -50,10 +51,12 @@ import {
     TAG_FORM,
     TAG_HEAD,
     UPDATE_ELEMS,
-    UPDATE_FORMS
+    UPDATE_FORMS,
+    DEFERRED_HEAD_INSERTS
 } from "../core/Const";
 import trim = Lang.trim;
-import {ExtDomquery} from "../util/ExtDomQuery";
+import {ExtConfig, ExtDomQuery} from "../util/ExtDomQuery";
+
 
 /**
  * Response processor
@@ -84,7 +87,7 @@ export class ResponseProcessor implements IResponseProcessor {
             return;
         }
 
-        let oldHead = DQ.querySelectorAll(TAG_HEAD);
+        let oldHead = ExtDomQuery.querySelectorAll(TAG_HEAD);
 
         //delete all to avoid script and style overlays
         oldHead.querySelectorAll(SEL_SCRIPTS_STYLES).delete();
@@ -93,8 +96,17 @@ export class ResponseProcessor implements IResponseProcessor {
         // eval means the scripts will get attached (eval script attach method)
         // but this is done by DomQuery not in this code
         this.storeForEval(shadowHead);
+        //incoming either the outer head tag or its children
+        //shadowHead = (shadowHead.tagName.value === "HEAD") ? shadowHead.childNodes : shadowHead;
+        //this.addToHead(shadowHead);
+    }
+
+    addToHead(newElements: XMLQuery | DQ) {
+        this.internalContext.assign(DEFERRED_HEAD_INSERTS).value.push(newElements);
     }
 
+
+
     /**
      * replaces the body in the expected manner
      * which means the entire body content is refreshed
@@ -112,23 +124,24 @@ export class ResponseProcessor implements IResponseProcessor {
 
         let shadowInnerHTML: string = <string>shadowBody.html().value;
 
-        let resultingBody = <DQ>DQ.querySelectorAll(TAG_BODY).html(shadowInnerHTML);
+        let resultingBody = <DQ>ExtDomQuery.querySelectorAll(TAG_BODY).html(shadowInnerHTML);
         let updateForms = resultingBody.querySelectorAll(TAG_FORM);
 
         // main difference, we cannot replace the body itself, but only its content
-        // we need a separate step for post processing the incoming attributes, like classes, styles etc...
+        // we need a separate step for post-processing the incoming
+        // attributes, like classes, styles etc...
         resultingBody.copyAttrs(shadowBody);
 
         this.storeForPostProcessing(updateForms, resultingBody);
     }
 
     /**
-     * Leaf Tag eval... process whatever is in the evals cdata block
+     * Leaf Tag eval... process whatever is in the eval cdata block
      *
      * @param node the node to eval
      */
     eval(node: XMLQuery) {
-        DQ.globalEval(node.cDATAAsString);
+        ExtDomQuery.globalEval(node.cDATAAsString);
     }
 
     /**
@@ -145,7 +158,7 @@ export class ResponseProcessor implements IResponseProcessor {
          * <error>
          */
 
-        let mergedErrorData = new Config({});
+        let mergedErrorData = new ExtConfig({});
         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;
@@ -155,12 +168,12 @@ export class ResponseProcessor implements IResponseProcessor {
         //we now store the response xml also in the error data for further details
         mergedErrorData.assignIf(hasResponseXML, RESPONSE_XML).value = this.internalContext.getIf(RESPONSE_XML).value.get(0).value;
 
-        // error post processing and enrichment (standard messages from keys)
+        // error post-processing and enrichment (standard messages from keys)
         let errorData = ErrorData.fromServerError(mergedErrorData);
 
-        // we now trigger an internally stored onError function which might be a attached to the context
-        // either we haven an internal on error, or an on error has been bassed via params from the outside
-        // in both cases they are attached to our contexts
+        // we now trigger an internally stored onError function which might be an attached to the context
+        // either we do not have an internal on error, or an on error has been based via params from the outside.
+        // In both cases they are attached to our contexts
 
         this.triggerOnError(errorData);
         Implementation.sendError(errorData);
@@ -176,7 +189,7 @@ export class ResponseProcessor implements IResponseProcessor {
 
         let redirectUrl = trim(node.attr(ATTR_URL).value);
         if (redirectUrl != EMPTY_STR) {
-            (<any>window).location.href = redirectUrl;
+            window.location.href = redirectUrl;
         }
     }
 
@@ -186,7 +199,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @param cdataBlock the cdata block with the new html code
      */
     update(node: XMLQuery, cdataBlock: string) {
-        let result = ExtDomquery.byId(node.id.value, true).outerHTML(cdataBlock, false, false);
+        let result = ExtDomQuery.byId(node.id.value, true).outerHTML(cdataBlock, false, false);
         let sourceForm = result?.parents(TAG_FORM).orElseLazy(() => result.byTagName(TAG_FORM, true));
         if (sourceForm) {
             this.storeForPostProcessing(sourceForm, result);
@@ -194,7 +207,7 @@ export class ResponseProcessor implements IResponseProcessor {
     }
 
     /**
-     * Delete handler, simply deleetes the node referenced by the xml data
+     * Delete handler, simply deletes the node referenced by the xml data
      * @param node
      */
     delete(node: XMLQuery) {
@@ -252,7 +265,7 @@ export class ResponseProcessor implements IResponseProcessor {
      *
      * @param node the node hosting the insert data
      */
-    insertWithSubtags(node: XMLQuery) {
+    insertWithSubTags(node: XMLQuery) {
         let before = node.querySelectorAll(TAG_BEFORE);
         let after = node.querySelectorAll(TAG_AFTER);
 
@@ -277,13 +290,13 @@ export class ResponseProcessor implements IResponseProcessor {
 
     /**
      * Process the viewState update, update the affected
-     * forms with their respective new viewstate values
+     * forms with their respective new viewState values
      *
      */
     processViewState(node: XMLQuery): boolean {
         if (ResponseProcessor.isViewStateNode(node)) {
             let state = node.cDATAAsString;
-            this.internalContext.assign(APPLIED_VST, node.id.value).value = new StateHolder(node.id.value, state);
+            this.internalContext.assign(APPLIED_VST, node.id.value).value = new StateHolder($nsp(node.id.value), state);
             return true;
         }
         return false;
@@ -292,7 +305,7 @@ export class ResponseProcessor implements IResponseProcessor {
     processClientWindow(node: XMLQuery): boolean {
         if (ResponseProcessor.isClientWindowNode(node)) {
             let state = node.cDATAAsString;
-            this.internalContext.assign(APPLIED_CLIENT_WINDOW, node.id.value).value = new StateHolder(node.id.value, state);
+            this.internalContext.assign(APPLIED_CLIENT_WINDOW, node.id.value).value = new StateHolder($nsp(node.id.value), state);
             return true;
         }
     }
@@ -301,8 +314,14 @@ export class ResponseProcessor implements IResponseProcessor {
      * generic global eval which runs the embedded css and scripts
      */
     globalEval() {
-        let updateElems = new ExtDomquery(...this.internalContext.getIf(UPDATE_ELEMS).value);
+        //  phase one, if we have head inserts, we build up those before going into the script eval phase
+        let insertHeadElems = new ExtDomQuery(...this.internalContext.getIf(DEFERRED_HEAD_INSERTS).value);
+        insertHeadElems.runHeadInserts(true);
+
+        // phase 2 we run a script eval on all updated elements in the body
+        let updateElems = new ExtDomQuery(...this.internalContext.getIf(UPDATE_ELEMS).value);
         updateElems.runCss();
+        // phase 3, we do the same for the css
         updateElems.runScripts();
     }
 
@@ -352,24 +371,24 @@ export class ResponseProcessor implements IResponseProcessor {
     }
 
     /**
-     * proper viewstate -> form assignment
+     * proper viewState -> form assignment
      *
-     * @param forms the forms to append the viewstate to
-     * @param viewState the final viewstate
+     * @param forms the forms to append the viewState to
+     * @param viewState the final viewState
      */
     private appendViewStateToForms(forms: DQ, viewState: string) {
-        this.assignState(forms, SEL_VIEWSTATE_ELEM, viewState);
+        this.assignState(forms, $nsp(SEL_VIEWSTATE_ELEM), viewState);
     }
 
 
     /**
-     * proper clientwindow -> form assignment
+     * proper clientWindow -> form assignment
      *
-     * @param forms the forms to append the viewstate to
-     * @param clientWindow the final viewstate
+     * @param forms the forms to append the viewState to
+     * @param clientWindow the final viewState
      */
     private appendClientWindowToForms(forms: DQ, clientWindow: string) {
-        this.assignState(forms, SEL_CLIENT_WINDOW_ELEM, clientWindow);
+        this.assignState(forms, $nsp(SEL_CLIENT_WINDOW_ELEM), clientWindow);
     }
 
     /**
@@ -393,28 +412,28 @@ export class ResponseProcessor implements IResponseProcessor {
     /**
      * Helper to Create a new JSF ViewState Element
      *
-     * @param parent, the parent node to attach the viewstate element to
+     * @param parent, the parent node to attach the viewState element to
      * (usually a form node)
      */
     private static newViewStateElement(parent: DQ): DQ {
-        let newViewState = DQ.fromMarkup(HTML_VIEWSTATE);
+        let newViewState = DQ.fromMarkup($nsp(HTML_VIEWSTATE));
         newViewState.appendTo(parent);
         return newViewState;
     }
 
     /**
-     * Stores certain aspects of the dom for later post processing
+     * Stores certain aspects of the dom for later post-processing
      *
      * @param updateForms the update forms which should receive standardized internal jsf data
-     * @param toBeEvaled the resulting elements which should be evaled
+     * @param toBeEvaluated the resulting elements which should be evaluated
      */
-    private storeForPostProcessing(updateForms: DQ, toBeEvaled: DQ) {
+    private storeForPostProcessing(updateForms: DQ, toBeEvaluated: DQ) {
         this.storeForUpdate(updateForms);
-        this.storeForEval(toBeEvaled);
+        this.storeForEval(toBeEvaluated);
     }
 
     /**
-     * helper to store a given form for the update post processing (viewstate)
+     * helper to store a given form for the update post-processing (viewState)
      *
      * @param updateForms the dom query object pointing to the forms which need to be updated
      */
@@ -425,23 +444,23 @@ export class ResponseProcessor implements IResponseProcessor {
     /**
      * same for eval (js and css)
      *
-     * @param toBeEvaled
+     * @param toBeEvaluated
      */
-    private storeForEval(toBeEvaled: DQ) {
-        this.internalContext.assign(UPDATE_ELEMS).value.push(toBeEvaled);
+    private storeForEval(toBeEvaluated: DQ) {
+        this.internalContext.assign(UPDATE_ELEMS).value.push(toBeEvaluated);
     }
 
     /**
-     * check whether a given XMLQuery node is an explicit viewstate node
+     * check whether a given XMLQuery node is an explicit viewState node
      *
      * @param node the node to check
-     * @returns true of it ii
+     * @returns if it is a viewState node
      */
     private static isViewStateNode(node: XMLQuery): boolean {
-        let separatorChar = (<any>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);
+        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
+        return "undefined" != typeof node?.id?.value && (node?.id?.value == $nsp(P_VIEWSTATE) ||
+            node?.id?.value?.indexOf([separatorChar, $nsp(P_VIEWSTATE)].join(EMPTY_STR)) != -1 ||
+            node?.id?.value?.indexOf([$nsp(P_VIEWSTATE), separatorChar].join(EMPTY_STR)) != -1);
     }
 
     /**
@@ -451,14 +470,15 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns true of it ii
      */
     private static isClientWindowNode(node: XMLQuery): boolean {
-        let separatorChar = (<any>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);
+        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
+        return "undefined" != typeof node?.id?.value && (node?.id?.value == $nsp(P_CLIENT_WINDOW) ||
+            node?.id?.value?.indexOf([separatorChar, $nsp(P_CLIENT_WINDOW)].join(EMPTY_STR)) != -1 ||
+            node?.id?.value?.indexOf([$nsp(P_CLIENT_WINDOW), separatorChar].join(EMPTY_STR)) != -1);
     }
 
     private triggerOnError(errorData: ErrorData) {
         this.externalContext.getIf(ON_ERROR).orElse(this.internalContext.getIf(ON_ERROR).value).orElse(EMPTY_FUNC).value(errorData);
     }
 
+
 }