jsf.js_next_gen 4.0.1-beta.6 → 4.0.1-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.1-beta.6",
+  "version": "4.0.1-beta.8",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.14.6",
+    "@types/node": "^18.15.11",
     "@types/sinon": "^10.0.13",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "chai": "^4.3.7",
@@ -31,24 +31,24 @@
     "cross-env": "^7.0.3",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
-    "jsdom": "^21.1.0",
+    "jsdom": "^21.1.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.7.10",
+    "npm-check-updates": "^16.9.0",
     "nyc": "^15.1.0",
     "replace-in-file": "^6.3.5",
     "rxjs": "^7.8.0",
-    "sinon": "^15.0.1",
+    "sinon": "^15.0.3",
     "terser-webpack-plugin": "^5.3.7",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.26",
-    "typescript": "^4.9.5",
-    "webpack": "^5.76.0",
+    "typedoc": "^0.23.28",
+    "typescript": "^5.0.3",
+    "webpack": "^5.77.0",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
+    "webpack-dev-server": "^4.13.1"
   },
   "dependencies": {
-    "mona-dish": "0.28.3"
+    "mona-dish": "0.28.9"
   }
 }

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

@@ -480,18 +480,18 @@ export module Implementation {
         /*
          * lazy helper to fetch the window id from the included faces.js
          */
-        let fetchWindowIdFromJSFJS = () => ExtDomQuery.searchJsfJsFor(/jfwid=([^&;]*)/).orElse(null).value;
+        let fetchWindowIdFromJSFJS = (): Optional<string> => ExtDomQuery.searchJsfJsFor(/jfwid=([^&;]*)/).orElse(null);
 
         /*
          * fetch window id from the url
          */
-        let fetchWindowIdFromURL = function () {
+        let fetchWindowIdFromURL = function (): Optional<string> {
             const href = window.location.href, windowId = "jfwid";
             const regex = new RegExp("[\\?&]" + windowId + "=([^&#\\;]*)");
             const results = regex.exec(href);
             //initial trial over the url and a regexp
-            if (results != null) return results[1];
-            return null;
+            if (results != null) return Optional.fromNullable(results[1]);
+            return Optional.fromNullable(null);
         };
 
         /*
@@ -532,7 +532,7 @@ export module Implementation {
         /*
          * return the window id or null
          */
-        return formWindowId != INIT ? formWindowId : (fetchWindowIdFromURL() || fetchWindowIdFromJSFJS());
+        return formWindowId != INIT ? formWindowId : (fetchWindowIdFromURL() || fetchWindowIdFromJSFJS()).value;
     }
 
     /**

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

@@ -67,15 +67,15 @@ const ATTR_SRC = 'src';
  */
 export class ExtDomQuery extends DQ {
 
-    static get windowId() {
+    static get windowId(): Optional<string> {
         return new ExtDomQuery(document.body).windowId;
     }
 
-    static get nonce(): string {
+    static get nonce(): Optional<string> {
         return new ExtDomQuery(document.body).nonce;
     }
 
-    get windowId(): string | null {
+    get windowId(): Optional<string> {
 
         const fetchWindowIdFromURL = function (): string | null {
             let href = window.location.href;
@@ -94,9 +94,9 @@ export class ExtDomQuery extends DQ {
                 throw Error("Multiple different windowIds found in document");
             }
 
-            return (result.isPresent()) ? (<HTMLInputElement>result.getAsElem(0).value).value : fetchWindowIdFromURL();
+            return Optional.fromNullable((result.isPresent()) ? (<HTMLInputElement>result.getAsElem(0).value).value : fetchWindowIdFromURL());
         } else {
-            return fetchWindowIdFromURL();
+            return Optional.fromNullable(fetchWindowIdFromURL());
         }
     }
 
@@ -104,31 +104,29 @@ export class ExtDomQuery extends DQ {
     * determines the faces.js nonce and adds them to the namespace
     * this is done once and only lazily
     */
-    get nonce(): string | null {
+    get nonce(): Optional<string> {
         //already processed
         let myfacesConfig = new ExtConfig(window.myfaces);
-        let nonce: IValueHolder<string> = myfacesConfig.getIf("config", "cspMeta", "nonce");
-        if (nonce.value) {
-            return <string>nonce.value;
+        let globalNonce: IValueHolder<string> = myfacesConfig.getIf("config", "cspMeta", "nonce");
+        if (!!globalNonce.value) {
+            return Optional.fromNullable(globalNonce.value as string) as Optional<string>;
         }
 
         let curScript = new DQ(document.currentScript);
         //since our baseline atm is ie11 we cannot use document.currentScript globally
-        if (!!this.extractNonce(curScript)) {
+        let nonce = curScript.nonce;
+        if (nonce.isPresent()) {
             // fast-path for modern browsers
-            return this.extractNonce(curScript);
+            return nonce;
         }
         // fallback if the currentScript method fails, we just search the jsf tags for nonce, this is
         // the last possibility
-        let nonceScript = Optional.fromNullable(DQ
+        let nonceScript: Optional<DomQuery> = Optional.fromNullable(DQ
             .querySelectorAll("script[src], link[src]").asArray
-            .filter((item) => this.extractNonce(item)  && item.attr(ATTR_SRC) != null)
+            .filter((item) => item.nonce.isPresent()  && item.attr(ATTR_SRC) != null)
             .filter(item => IS_FACES_SOURCE(item.attr(ATTR_SRC).value))?.[0]);
 
-        if (nonceScript.isPresent()) {
-            return this.extractNonce(nonceScript.value);
-        }
-        return null;
+        return Optional.fromNullable(nonceScript.value?.nonce?.value);
     }
 
     static searchJsfJsFor(item: RegExp): Optional<String> {
@@ -152,13 +150,13 @@ export class ExtDomQuery extends DQ {
     }
 
     globalEval(code: string, nonce ?: string): DQ {
-        return new ExtDomQuery(super.globalEval(code, nonce ?? this.nonce));
+        return new ExtDomQuery(super.globalEval(code, nonce ?? this.nonce.value));
     }
 
     // called from base class runScripts, do not delete
     // noinspection JSUnusedGlobalSymbols
     globalEvalSticky(code: string, nonce ?: string): DQ {
-        return new ExtDomQuery(super.globalEvalSticky(code, nonce ?? this.nonce));
+        return new ExtDomQuery(super.globalEvalSticky(code, nonce ?? this.nonce.value));
     }
 
     /**
@@ -238,9 +236,6 @@ export class ExtDomQuery extends DQ {
         return new ExtDomQuery(ret);
     }
 
-    private extractNonce(curScript: DomQuery) {
-        return (curScript.getAsElem(0).value as HTMLElement)?.nonce ?? curScript.attr("nonce").value;
-    }
 
     filter(func: (item: DomQuery) => boolean): ExtDomQuery {
         return new ExtDomQuery(super.filter(func));

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

@@ -143,8 +143,8 @@ export function resolveDelay(options: Config): number {
  *
  * @param options
  */
-export function resolveWindowId(options: Config) {
-    return options?.value?.windowId ?? ExtDomQuery.windowId;
+export function resolveWindowId(options: Config): string | null {
+    return options?.value?.windowId ?? ExtDomQuery.windowId.value;
 }
 
 /**

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

@@ -41,7 +41,7 @@ import {
     STATE_EVT_TIMEOUT,
     STD_ACCEPT,
     URL_ENCODED,
-    VAL_AJAX, IDENT_NONE, CTX_PARAM_SRC_FRM_ID, CTX_PARAM_SRC_CTL_ID, CTX_PARAM_PPS, SERVER_ERROR
+    VAL_AJAX, IDENT_NONE, CTX_PARAM_SRC_FRM_ID, CTX_PARAM_SRC_CTL_ID, CTX_PARAM_PPS
 } from "../core/Const";
 import {
     resolveFinalUrl,

package/src/main/typescript/test/frameworkBase/_ext/monadish/DomQueryTest.spec.ts

@@ -567,7 +567,7 @@ describe('DOMQuery tests', function () {
         expect(content.byId("third").innerHTML).to.eq("hello world");
         expect(content.byId("fourth").innerHTML).to.eq("hello world");
 
-        expect(DomQuery.byTagName("head")
+        expect(DomQuery.byTagName("body")
             .querySelectorAll("link[rel='stylesheet'][href='./fixtures/blank.css']").length).to.eq(1);
         done();
 

package/src/main/typescript/test/frameworkBase/_ext/shared/StandardInits.ts

@@ -145,6 +145,92 @@ export module StandardInits {
  </body>
 </html>`;
 
+    export const HTML_TOBAGO_SHEET_WITH_STYLE = `<!DOCTYPE html>
+<html lang='de'>
+<head>
+  <meta charset='UTF-8'>
+  <meta name='viewport' content='width=device-width, initial-scale=1.0'>
+  <title>Test
+  </title>
+  <link rel='stylesheet' href='./fixtures/css/tobago.css' type='text/css'>
+  <link rel='stylesheet' href='./fixtures/css/bootstrap-icons.css' type='text/css'>
+  <script src='./fixtures/jakarta.faces.resource/faces.js.jsf' type='text/javascript'></script>
+  <script src='./fixtures/js/tobago.js' type='module'></script>
+</head>
+<body>
+<tobago-page locale='de' class='container-fluid' id='page' focus-on-error='true' wait-overlay-delay-full='1000'
+             wait-overlay-delay-ajax='1000'>
+  <form action='/content/080-sheet/30-event/Sheet_Event.xhtml' id='page::form' method='post'
+        accept-charset='UTF-8' data-tobago-context-path=''>
+    <input type='hidden' name='javax.faces.source' id='javax.faces.source' disabled='disabled'>
+    <tobago-focus id='page::lastFocusId'>
+      <input type='hidden' name='page::lastFocusId' id='page::lastFocusId::field'>
+    </tobago-focus>
+    <input type='hidden' name='org.apache.myfaces.tobago.webapp.Secret' id='org.apache.myfaces.tobago.webapp.Secret'
+           value='secretValue'>
+    <div class='tobago-page-menuStore'>
+    </div>
+    <span id='page::jsf-state-container'><input type='hidden' name='javax.faces.ViewState'
+                                                id='j_id__v_0:javax.faces.ViewState:1'
+                                                value='viewStateValue' autocomplete='off'><input
+            type='hidden' name='javax.faces.RenderKitId' value='tobago'><input type='hidden'
+                                                                               id='j_id__v_0:javax.faces.ClientWindow:1'
+                                                                               name='javax.faces.ClientWindow'
+                                                                               value='clientWindowValue'></span>
+    <button type='button' id='page:ajaxButton' name='page:ajaxButton'
+            class='tobago-button btn btn-secondary tobago-auto-spacing'>
+      <tobago-behavior event='click' client-id='page:ajaxButton' execute='page:ajaxButton'
+                       render='page:s1'></tobago-behavior>
+      <span>Ajax</span></button>
+    <tobago-sheet id='page:s1' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='2'>
+      <style nonce='nonceValue' id='page:s1:j_id_4'>#page\\:s1 {
+        max-height: 500px;
+      }
+      </style>
+      <input id='page:s1::scrollPosition' name='page:s1::scrollPosition' type='hidden' value='[0,0]'>
+      <input id='page:s1::selected' name='page:s1::selected' type='hidden' value='[]'>
+      <div class='tobago-body'>
+        <table cellspacing='0' cellpadding='0' summary='' class='table'>
+          <thead>
+          <tr>
+            <th>
+              <span><tobago-out id='page:s1:_col0'><span class='form-control-plaintext'>Name</span></tobago-out></span>
+            </th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr row-index='0'>
+            <td>
+              <tobago-out id='page:s1:0:t_name'><span class='form-control-plaintext'>Earth</span></tobago-out>
+            </td>
+            <td>
+              <div>
+              </div>
+            </td>
+          </tr>
+          <tr row-index='1'>
+            <td>
+              <tobago-out id='page:s1:1:t_name'><span class='form-control-plaintext'>Moon</span></tobago-out>
+            </td>
+            <td>
+              <div>
+              </div>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </tobago-sheet>
+  </form>
+  <noscript>
+    <div class='tobago-page-noscript'>Diese Seite benötigt JavaScript, allerdings ist JavaScript in Ihrem Browser
+      derzeit deaktiviert. Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
+    </div>
+  </noscript>
+</tobago-page>
+</body>
+</html>`;
+
     /**
      * a page simulating basically a simple faces form
      */

package/src/main/typescript/test/frameworkBase/_ext/shared/XmlResponses.ts

@@ -26,6 +26,59 @@ export class XmlResponses {
     </partial-response>
     `;
 
+    static UPDATE_TOBAGO_SHEET_WITH_STYLE = `<?xml version="1.0" encoding="UTF-8"?>
+<partial-response id='j_id__v_0'>
+  <changes>
+    <update id='page:s1'><![CDATA[
+      <tobago-sheet id='page:s1' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='2'>
+        <style nonce='nonceValue' id='page:s1:j_id_4'>#page\\:s1 {
+          max-height: 500px;
+        }
+        </style>
+        <input id='page:s1::scrollPosition' name='page:s1::scrollPosition' type='hidden' value='[0,0]'/>
+        <input id='page:s1::selected' name='page:s1::selected' type='hidden' value='[]'/>
+        <div class='tobago-body'>
+          <table cellspacing='0' cellpadding='0' summary='' class='table'>
+            <thead>
+            <tr>
+              <th>
+                <span><tobago-out id='page:s1:_col0'><span
+                        class='form-control-plaintext'>Name</span></tobago-out></span>
+              </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr row-index='0'>
+              <td>
+                <tobago-out id='page:s1:0:t_name'><span class='form-control-plaintext'>Earth</span></tobago-out>
+              </td>
+              <td>
+                <div>
+                </div>
+              </td>
+            </tr>
+            <tr row-index='1'>
+              <td>
+                <tobago-out id='page:s1:1:t_name'><span class='form-control-plaintext'>Moon</span></tobago-out>
+              </td>
+              <td>
+                <div>
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </tobago-sheet>
+      ]]>
+    </update>
+    <update id='j_id__v_0:javax.faces.ViewState:1'><![CDATA[viewStateValue]]>
+    </update>
+    <update id='j_id__v_0:javax.faces.ClientWindow:1'><![CDATA[clientWindowValue]]>
+    </update>
+  </changes>
+</partial-response>`;
+
     static SHADOW_DOM_UPDATE=`
         <partial-response>
             <changes><update id="shadowContent"><![CDATA[<div id="shadowContent">after update</div>]]></update></changes>

package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/css/bootstrap-icons.css

@@ -0,0 +1,15 @@
+/*! 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.
+*/

package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/css/tobago.css

@@ -0,0 +1,15 @@
+/*! 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.
+*/

package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/js/tobago.js

@@ -0,0 +1,15 @@
+/*! 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.
+*/

package/src/main/typescript/test/xhrCore/ErrorChainTest.spec.ts

@@ -109,5 +109,28 @@ describe('Tests of the various aspects of the response protocol functionality',
         expect(DQ.byId("form1:out1").innerHTML).to.eq("5");
         done();
     })
+
+
+    it("must process the error chain properly with a standard Ajax Error", function (done) {
+        DQ.byId("form1:button1").click();
+        expect(Implementation.requestQueue.queue.length >= 4).to.be.true;
+
+        for (let cnt = 1; cnt <= 5; cnt++) {
+            if(!Implementation.requestQueue.queue.length) {
+                this.respond(XmlResponses.ERROR_CHAIN_RESPOND_OK(cnt));
+                break;
+            }
+            if (cnt == 3) {
+                //any error suffices
+                this.respond(XmlResponses.ERROR_1);
+            } else {
+                this.respond(XmlResponses.ERROR_CHAIN_RESPOND_OK(cnt))
+            }
+        }
+        expect(Implementation.requestQueue.queue.length).to.eq(0);
+        expect(DQ.byId("errorCalled").innerHTML).to.eq("1");
+        expect(DQ.byId("form1:out1").innerHTML).to.eq("5");
+        done();
+    })
 });
 

package/src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts

@@ -18,7 +18,7 @@ import {Implementation} from "../../impl/AjaxImpl";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 
 import protocolPage = StandardInits.protocolPage;
-import {Config, DQ, Stream} from "mona-dish";
+import {Config, DQ} from "mona-dish";
 import {expect} from "chai";
 import HTML_PREFIX_EMBEDDED_BODY = StandardInits.HTML_PREFIX_EMBEDDED_BODY;
 import {it} from "mocha";

package/src/main/typescript/test/xhrCore/ResponseTest23.spec.ts

@@ -359,6 +359,25 @@ describe('Tests of the various aspects of the response protocol functionality',
         expect(DQ.byId("j_id__v_0:javax.faces.ClientWindow:1").isAbsent()).to.be.false;
     });
 
+    it("<style> element must be in <tobago-sheet> instead of <head>", function () {
+        window.document.documentElement.innerHTML = StandardInits.HTML_TOBAGO_SHEET_WITH_STYLE;
+
+        expect(DQ.querySelectorAll("head > style").length).to.be.eq(0);
+        expect(DQ.querySelectorAll("body tobago-page tobago-sheet > style").length).to.be.eq(1);
+
+        jsf.ajax.request(window.document.getElementById("page:ajaxButton"), null, {
+            "jakarta.faces.behavior.event": "click",
+            execute: "page:ajaxButton",
+            render: "page:s1"
+        });
+
+        this.respond(XmlResponses.UPDATE_TOBAGO_SHEET_WITH_STYLE);
+
+        expect(DQ.querySelectorAll("head > style").length).to.be.eq(0);
+        expect(DQ.querySelectorAll("body tobago-page tobago-sheet > style").length).to.be.eq(1);
+        expect(DQ.querySelectorAll("body tobago-page tobago-sheet > style").nonce.value).to.be.eq("nonceValue");
+    });
+
     
     it("must pass named params properly (tobago testcase)", function(done) {
             window.document.body.innerHTML = HTML_PREFIX_EMBEDDED_BODY;