jsf.js_next_gen 4.0.0-beta-20 → 4.0.0-beta-21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.0-beta-20",
+  "version": "4.0.0-beta-21",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -41,13 +41,13 @@
     "terser-webpack-plugin": "^5.3.6",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.19",
+    "typedoc": "^0.23.20",
     "typescript": "^4.8.4",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
-    "mona-dish": "0.22.24"
+    "mona-dish": "0.23.2"
   }
 }

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

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Config, IValueHolder, Optional, DomQuery, DQ, Stream, ArrayCollector} from "mona-dish";
+import {Config, IValueHolder, Optional, DomQuery, DQ, Stream, ArrayCollector, Lang} from "mona-dish";
 import {$nsp, P_WINDOW_ID} from "../core/Const";
+import equalsIgnoreCase = Lang.equalsIgnoreCase;
+import trim = Lang.trim;
 
 
 
@@ -175,9 +177,55 @@ export class ExtDomquery extends DQ {
         const whitelistFunc = (src: string): boolean => {
             return (whilteListed?.(src) ?? true) && !IS_FACES_SOURCE(src) && !IS_INTERNAL_SOURCE(src);
         };
-        return super.runScripts(false, whitelistFunc);
+        return super.runScripts(sticky, whitelistFunc);
     }
 
+    /**
+     * adds the elements in this ExtDomQuery to the head
+     *
+     * @param newElements the elements which need addition
+     */
+    runHeadInserts(suppressDoubleIncludes = true): void {
+        let head = ExtDomquery.byId(document.head);
+        //automated nonce handling
+        let processedScripts = [];
+
+        // the idea is only to run head inserts on resources
+        // which do not exist already, that way
+        // we can avoid double includes on subsequent resource
+        // requests.
+        function resourceIsNew(element: DomQuery) {
+            if(!suppressDoubleIncludes) {
+                return true;
+            }
+            const tagName = element.tagName.value;
+            if(!tagName) {
+                // textnode
+                return true;
+            }
+            let href = element.attr("href").orElse(element.attr("src").value);
+
+            if (!href.isPresent()) {
+                return true;
+            }
+            return !head.querySelectorAll(`${tagName}[href='${href.value}']`).length &&
+                !head.querySelectorAll(`${tagName}[src='${href.value}']`).length;
+        }
+
+        this
+            .filter(resourceIsNew)
+            .each(element => {
+                if(element.tagName.value != "SCRIPT") {
+                    //we need to run runScripts properly to deal with the rest
+                    new ExtDomquery(...processedScripts).runScripts(true);
+                    processedScripts = [];
+                    head.append(element);
+                } else {
+                    processedScripts.push(element);
+                }
+            });
+        new ExtDomquery(...processedScripts).runScripts(true);
+    }
 
 
     /**
@@ -192,6 +240,7 @@ export class ExtDomquery extends DQ {
         return new ExtDomquery(ret);
     }
 
+
 }
 
 export const ExtDQ = ExtDomquery;

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

@@ -315,7 +315,7 @@ export class ResponseProcessor implements IResponseProcessor {
     globalEval() {
         //  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);
-        this.runHeadInserts(insertHeadElems);
+        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);
@@ -485,26 +485,4 @@ export class ResponseProcessor implements IResponseProcessor {
     }
 
 
-    /**
-     * adds new elements to the head as per spec, we use it in a deferred way
-     * to have the html buildup first then the head inserts which run the head evals
-     * and then the body and css evals from the markup
-     *
-     * This is only performed upon a head replacement or resource insert
-     *
-     * @param newElements the elements which need addition
-     */
-    private runHeadInserts(newElements: ExtDomquery): void {
-        let head = ExtDomquery.byId(document.head);
-        //automated nonce handling
-        newElements.each(element => {
-            if(element.tagName.value != "SCRIPT" || element.attr("src").isPresent()) {
-                head.append(element);
-                return;
-            }
-            // special corner case
-            // embedded script code,
-            element.globalEvalSticky(element.innerHTML);
-        });
-    }
 }