MYFACES-4744 fix, 5.x

api/pom.xml

@@ -242,12 +242,12 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.12.1</version>
+                <version>1.15.0</version>
                 <!-- Use the latest released version:
                 https://repo1.maven.org/maven2/com/github/eirslett/frontend-maven-plugin/ -->
                 <configuration>
-                    <nodeVersion>v16.13.1</nodeVersion>
-                    <npmVersion>8.1.2</npmVersion>
+                    <nodeVersion>v24.12.0</nodeVersion>
+                    <npmVersion>11.6.2</npmVersion>
                     <installDirectory>./target/node</installDirectory>
                     <workingDirectory>src/client</workingDirectory>
                 </configuration>

api/src/client/package.json

@@ -24,7 +24,7 @@
     "html-webpack-plugin": "^5.5.1",
     "jsdom": "^21.1.1",
     "jsdom-global": "^3.0.2",
-    "jsf.js_next_gen": "4.0.5-beta.2",
+    "jsf.js_next_gen": "4.0.5-beta.6",
     "mocha": "^10.8.2",
     "npm-check-updates": "^19.3.2",
     "nyc": "^15.1.0",

api/src/client/typescript/faces/impl/AjaxImpl.ts

@@ -109,48 +109,48 @@ enum BlockFilter {
  * however a dedicated api makes sense for readability reasons
  */
 export module Implementation {
-/*
- Small internal explanation, this code is optimized for readability
- and cuts off a ton of old legacy code.
- Aka older browsers are not supported anymore.
- We use a self written helper library to keep the number of external
- code dependencies down.
- The library is called mona-dish and started as a small sideproject of mine
- it provides following
+    /*
+     Small internal explanation, this code is optimized for readability
+     and cuts off a ton of old legacy code.
+     Aka older browsers are not supported anymore.
+     We use a self written helper library to keep the number of external
+     code dependencies down.
+     The library is called mona-dish and started as a small sideproject of mine
+     it provides following
 
- a) Monad like structures for querying because this keeps the code denser and adds abstractions
- that always was the strong point of jQuery, and it still is better in this regard than what ecmascript provides
+     a) Monad like structures for querying because this keeps the code denser and adds abstractions
+     that always was the strong point of jQuery, and it still is better in this regard than what ecmascript provides
 
- c) A neutral json like configuration which allows assignments of arbitrary values with reduce code which then can be
- transformed into different data representations
+     c) A neutral json like configuration which allows assignments of arbitrary values with reduce code which then can be
+     transformed into different data representations
 
- examples:
- internalCtx.assign(MYPARAM, CTX_PARAM_SRC_FRM_ID).value = form.id.value;
- passes a value into context.MYPARAM.CTX_PARAM_SRC_FRM_ID
+     examples:
+     internalCtx.assign(MYPARAM, CTX_PARAM_SRC_FRM_ID).value = form.id.value;
+     passes a value into context.MYPARAM.CTX_PARAM_SRC_FRM_ID
 
- basically an abbreviation for
+     basically an abbreviation for
 
- internalCtxt[MYPARAM] = internalCtxt?.[MYPARAM] ?  internalCtxt[MYPARAM] : {};
- internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = internalCtxt?.[MYPARAM][CTX_PARAM_SRC_FRM_ID] ?  internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] : {};
- internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = form.id.value;
+     internalCtxt[MYPARAM] = internalCtxt?.[MYPARAM] ?  internalCtxt[MYPARAM] : {};
+     internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = internalCtxt?.[MYPARAM][CTX_PARAM_SRC_FRM_ID] ?  internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] : {};
+     internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = form.id.value;
 
 
- internalCtx.assign(condition, MYPARAM, CTX_PARAM_SRC_FRM_ID).value = form.id.value;
- passes a value into context.MYPARAM.CTX_PARAM_SRC_FRM_ID if condition === true otherwise it is ignored
+     internalCtx.assign(condition, MYPARAM, CTX_PARAM_SRC_FRM_ID).value = form.id.value;
+     passes a value into context.MYPARAM.CTX_PARAM_SRC_FRM_ID if condition === true otherwise it is ignored
 
- abbreviates:
- if(condition) {
-    internalCtxt[MYPARAM] = internalCtxt?.[MYPARAM] ?  internalCtxt[MYPARAM] : {};
-    internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = internalCtxt?.[MYPARAM][CTX_PARAM_SRC_FRM_ID] ?  internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] : {};
-    internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = form.id.value;
- }
+     abbreviates:
+     if(condition) {
+        internalCtxt[MYPARAM] = internalCtxt?.[MYPARAM] ?  internalCtxt[MYPARAM] : {};
+        internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = internalCtxt?.[MYPARAM][CTX_PARAM_SRC_FRM_ID] ?  internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] : {};
+        internalCtxt[MYPARAM][CTX_PARAM_SRC_FRM_ID] = form.id.value;
+     }
 
 
- d) Optional constructs, while under heavy debate we only use them lightly where the api requires it from mona-dish
+     d) Optional constructs, while under heavy debate we only use them lightly where the api requires it from mona-dish
 
- Note the inclusion of this library uses a reduced build which only includes the part of it, which we really use
+     Note the inclusion of this library uses a reduced build which only includes the part of it, which we really use
 
- */
+     */
 
     const trim = Lang.trim;
     const getMessage = ExtLang.getMessage;

api/src/client/typescript/faces/test/frameworkBase/_ext/monadish/LangTest.spec.ts

@@ -16,10 +16,12 @@
 
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { Lang } from "mona-dish";
+import pkg from 'mona-dish';
+const { Lang } = pkg;
 
-const jsdom = require("jsdom");
+import jsdom from "jsdom";
 const { JSDOM } = jsdom;
+
 const dom = new JSDOM(`
     <!DOCTYPE html>
 <html lang="en">

api/src/client/typescript/faces/test/frameworkBase/_ext/monadish/MonadTest.spec.ts

@@ -16,9 +16,9 @@
 
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { Config, Optional } from "mona-dish";
+import pkg from 'mona-dish';
+const { Config, Optional } = pkg;
 
-//TODO saveResolveTest
 describe('optional tests', () => {
     it('fromnullable null', () => {
         expect(Optional.fromNullable(null).isPresent()).to.be.false;

api/src/client/typescript/faces/test/xhrCore/FileUploadTest.spec.ts

@@ -83,7 +83,6 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             button.addEventListener("click", (event: Event) => {
                 faces.ajax.request(event.target, event, {render: '@all', execute: '@form'})
             }).click();
-            //this.response("ok");
 
             expect(this.requests.length).to.eq(1);
             let request = this.requests[0];
@@ -113,7 +112,6 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             button.addEventListener("click", (event: Event) => {
                 faces.ajax.request(event.target, event, {render: '@all', execute: 'input_1 fíleupload'})
             }).click();
-            //this.response("ok");
 
             expect(this.requests.length).to.eq(1);
             let request = this.requests[0];

api/src/client/typescript/faces/test/xhrCore/OamSubmitTest.spec.ts

@@ -147,7 +147,7 @@ describe('Tests for the MyFaces specific oam submit', function () {
             return false;
         };
         try {
-        myfaces.oam.submitForm("blarg", "bla");
+            myfaces.oam.submitForm("blarg", "bla");
         } catch(e) {
             done(e);
         }

api/src/client/typescript/faces/test/xhrCore/ResponseTest23.spec.ts

@@ -248,12 +248,12 @@ describe('Tests of the various aspects of the response protocol functionality',
         (global as any)["MF_23"] = true;
         // language=XML
         this.respond(`<?xml version="1.0" encoding="UTF-8"?>
-            <partial-response id="j_id__v_0">
-                <changes>
-                    <update id="updatePanel"><![CDATA[<span id="updatePanel">hello world</span>]]></update>
-                    <update id="j_id__v_0:javax.faces.ViewState:1"><![CDATA[RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD]]></update>
-                </changes>
-            </partial-response>`);
+        <partial-response id="j_id__v_0">
+            <changes>
+                <update id="updatePanel"><![CDATA[<span id="updatePanel">hello world</span>]]></update>
+                <update id="j_id__v_0:javax.faces.ViewState:1"><![CDATA[RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD]]></update>
+            </changes>
+        </partial-response>`);
 
 
         expect(DQ$("[name*='javax.faces.ViewState']").isAbsent()).to.be.false;
@@ -283,14 +283,14 @@ describe('Tests of the various aspects of the response protocol functionality',
 
         // language=XML
         this.respond(`<?xml version="1.0" encoding="UTF-8"?>
-            <partial-response id="j_id__v_0">
-                <changes>
-                    <update id="updatePanel"><![CDATA[<span id="updatePanel">hello world</span>]]></update>
-                    <update id="j_id__v_0:javax.faces.ViewState:1"><![CDATA[RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD]]><!-- 
+        <partial-response id="j_id__v_0">
+            <changes>
+                <update id="updatePanel"><![CDATA[<span id="updatePanel">hello world</span>]]></update>
+                <update id="j_id__v_0:javax.faces.ViewState:1"><![CDATA[RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD]]><!-- 
                         Some random junk which is sent by the server
                     --></update>
-                </changes>
-            </partial-response>`);
+            </changes>
+        </partial-response>`);
 
 
         expect(DQ$("[name*='javax.faces.ViewState']").isAbsent()).to.be.false;
@@ -378,9 +378,9 @@ describe('Tests of the various aspects of the response protocol functionality',
         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;
+        window.document.body.innerHTML = HTML_PREFIX_EMBEDDED_BODY;
         try {
 
             let event = {
@@ -407,9 +407,7 @@ describe('Tests of the various aspects of the response protocol functionality',
         expect(requestBody.indexOf("javax.faces.behavior.event")).to.not.eq(-1);
         expect(requestBody.indexOf("javax.faces.behavior.event=change")).to.not.eq(-1);
         expect(requestBody.indexOf("page%3Ainput=input_value")).to.not.eq(-1);
-            done();
+        done();
 
     });
-
-
 });

api/src/client/typescript/mona_dish/Lang.ts

@@ -22,7 +22,7 @@ import {Es2019Array} from "./Es2019Array";
  * Lang helpers crossported from the apache myfaces project
  */
 export module Lang {
-    
+
 
     //should be in lang, but for now here to avoid recursive imports, not sure if typescript still has a problem with those
     /**

api/src/client/typescript/mona_dish/index_esm_compat.ts

@@ -0,0 +1,27 @@
+/*!
+ * 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.
+ */
+
+/**
+ * Compatibility wrapper that provides a default export of the full namespace.
+ * Used by the tsconfig paths alias so that `import pkg from 'mona-dish'`
+ * works in tests and consumer projects that import from source, mirroring
+ * the behaviour of the built UMD bundle with esModuleInterop enabled.
+ */
+import * as allExports from "./index";
+
+export * from "./index";
+export default allExports;