jsf.js_next_gen 1.0.0-beta-17 → 1.0.0-beta-19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "1.0.0-beta-17",
+  "version": "1.0.0-beta-19",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/jsf.js",
   "scripts": {

package/remap.js

@@ -31,7 +31,7 @@ var option = {
     //development
     files: 'dist/**/*.js',
     from: (buildStage == "-development") ? /jsf-development.js\.map/g : /jsf.js\.map/g,
-    to: "jsf".concat(buildStage, ".js.map\n//# sourceMappingURL=jsf").concat(buildStage, ".js.map.jsf?ln=scripts")
+    to: "jsf".concat(buildStage, ".js.map\n//# sourceMappingURL=jsf").concat(buildStage, ".js.map.jsf?ln=javax.faces")
 };
 try {
     var result = replace.sync(option);

package/remap.js.map

@@ -1 +1 @@
-{"version":3,"file":"remap.js","sourceRoot":"","sources":["remap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;GAKG;AAEH,2EAA2E;AAC3E,uDAAuD;AACvD,IAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE3C,sCAAsC;AACtC,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,sCAAsC;AACtC,IAAM,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;AACtE,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;AAEtD,IAAI,MAAM,GAAG;IACT,aAAa;IACb,KAAK,EAAE,cAAc;IACrB,IAAI,EAAE,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,cAAc;IAClF,EAAE,EAAE,aAAM,UAAU,8CAAoC,UAAU,2BAAwB;CAC7F,CAAA;AAED,IAAI;IACA,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;CAC/C;AAAC,OAAO,KAAK,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;CAC3C"}
+{"version":3,"file":"remap.js","sourceRoot":"","sources":["remap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;GAKG;AAEH,2EAA2E;AAC3E,uDAAuD;AACvD,IAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE3C,sCAAsC;AACtC,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,sCAAsC;AACtC,IAAM,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;AACtE,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;AAEtD,IAAI,MAAM,GAAG;IACT,aAAa;IACb,KAAK,EAAE,cAAc;IACrB,IAAI,EAAE,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,cAAc;IAClF,EAAE,EAAE,aAAM,UAAU,8CAAoC,UAAU,+BAA4B;CACjG,CAAA;AAED,IAAI;IACA,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;CAC/C;AAAC,OAAO,KAAK,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;CAC3C"}

package/remap.ts

@@ -35,7 +35,7 @@ let option = {
     //development
     files: 'dist/**/*.js',
     from: (buildStage == "-development") ? /jsf-development.js\.map/g : /jsf.js\.map/g,
-    to: `jsf${buildStage}.js.map\n//# sourceMappingURL=jsf${buildStage}.js.map.jsf?ln=scripts`
+    to: `jsf${buildStage}.js.map\n//# sourceMappingURL=jsf${buildStage}.js.map.jsf?ln=javax.faces`
 }
 
 try {

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

@@ -18,6 +18,8 @@
 
 import {Implementation} from "../impl/AjaxImpl";
 import {PushImpl} from "../impl/PushImpl";
+import {oam as _oam} from "../myfaces/OamSubmit";
+
 
 //declare const Implementation: any;
 
@@ -219,18 +221,9 @@ export module jsf {
         }
 
     }
-
-    //We hook the old namespace system into our npm system
-    //if ("undefined" == window.jsf) {
-    //    window.jsf = jsf;
-    //}
-
-
 }
 
-
-
-//fullfill the window contract
+//fullfill the window contract for the myfaces namespace
 export module myfaces {
 
     /**
@@ -258,6 +251,11 @@ export module myfaces {
 
         jsf.ajax.request(source, event, options);
     }
+
+    /**
+     * legacy oam functions
+     */
+    export const oam = _oam;
 }
 
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {IListener} from "./util/ListenerQueue";
+import {IListener} from "./util/IListener";
 import {Response} from "./xhrCore/Response";
 import {XhrRequest} from "./xhrCore/XhrRequest";
 import {AsynchronousQueue} from "./util/AsyncQueue";
@@ -95,6 +95,54 @@ 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 exernal
+ 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
+
+ b) Streams and lazystreams like java has, a pull like construct, ecmascript does not have anything like Lazystreams.
+ Another option would have been rxjs but that would have introduced a code dependency and probably more code. We might
+ move to RXJS if the need arises however. But for now I would rather stick with my small self grown library which works
+ quite well and where I can patch quickly (I have used it in several industrial projects, so it works well
+ and is heavily fortified by unit tests (140 testcases as time of writing this))
+
+ 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
+
+ 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;
+
+
+ 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;
+ }
+
+
+ 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
+
+ */
 
     import trim = Lang.trim;
     import getMessage = ExtLang.getMessage;
@@ -170,8 +218,9 @@ export module Implementation {
 
         return LazyStream.of(...funcs)
             .map(func => resolveAndExecute(source, event, func))
-            // we use the return false == stop as an early stop
+            // we use the return false == stop as an early stop, onElem stops at the first false
             .onElem((opResult: boolean) => opResult)
+            //last ensures we run until the first false is returned
             .last().value;
     }
 
@@ -208,17 +257,27 @@ export module Implementation {
 
         Assertions.assertRequestIntegrity(options, elem);
 
-        requestCtx.assignIf(!!windowId, P_WINDOW_ID).value = windowId;
+        /**
+         * fetch the parent form
+         *
+         * note we also add an override possibility here
+         * so that people can use dummy forms and work
+         * with detached objects
+         */
+        const form: DQ = resolveForm(requestCtx, elem, resolvedEvent);
+        const formId = form.id.value;
+        const delay: number = resolveDelay(options);
+        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;
 
         /**
          * ajax pass through context with the source
-         * onresolvedEvent and onerror
+         * onresolved Event and onerror Event
          */
-        requestCtx.assign(SOURCE).value = elementId.value;
+        requestCtx.assign(SOURCE).value = elementId;
 
         /**
          * on resolvedEvent and onError...
@@ -232,30 +291,17 @@ export module Implementation {
          * lets drag the myfaces config params also in
          */
         requestCtx.assign(MYFACES).value = options.value?.myfaces;
-        /**
-         * fetch the parent form
-         *
-         * note we also add an override possibility here
-         * so that people can use dummy forms and work
-         * with detached objects
-         */
-        let form: DQ = resolveForm(requestCtx, elem, resolvedEvent);
 
         /**
          * binding contract the javax.faces.source must be set
          */
-        requestCtx.assign(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value = elementId.value;
+        requestCtx.assign(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value = elementId;
 
         /**
          * javax.faces.partial.ajax must be set to true
          */
         requestCtx.assign(CTX_PARAM_PASS_THR, P_AJAX).value = true;
 
-        /**
-         * binding contract the javax.faces.source must be set
-         */
-        requestCtx.assign(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value = elementId.value;
-
         /**
          * if resetValues is set to true
          * then we have to set javax.faces.resetValues as well
@@ -265,27 +311,22 @@ export module Implementation {
          */
         requestCtx.assignIf(isResetValues, CTX_PARAM_PASS_THR, P_RESET_VALUES).value = true;
 
-        //additional meta information to speed things up, note internal non jsf
-        //pass through options are stored under _mfInternal in the context
-        internalCtx.assign(CTX_PARAM_SRC_FRM_ID).value = form.id.value;
-        internalCtx.assign(CTX_PARAM_SRC_CTL_ID).value = elementId.value;
+        // additional meta information to speed things up, note internal non jsf
+        // pass through options are stored under _mfInternal in the context
+        internalCtx.assign(CTX_PARAM_SRC_FRM_ID).value = formId;
+
+        // mojarra compatibility, mojarra is sending the form id as well
+        // this is not documented behavior but can be determined by running
+        // mojarra under blackbox conditions.
+        // I assume it does the same as our formId_submit=1 so leaving it out
+        // won't hurt but for the sake of compatibility we are going to add it
+        requestCtx.assign(CTX_PARAM_PASS_THR, formId).value = formId;
+        internalCtx.assign(CTX_PARAM_SRC_CTL_ID).value = elementId;
         internalCtx.assign(CTX_PARAM_TR_TYPE).value = REQ_TYPE_POST;
 
-        //mojarra compatibility, mojarra is sending the form id as well
-        //this is not documented behavior but can be determined by running
-        //mojarra under blackbox conditions
-        //i assume it does the same as our formId_submit=1 so leaving it out
-        //wont hurt but for the sake of compatibility we are going to add it
-
-        requestCtx.assign(CTX_PARAM_PASS_THR, form.id.value).value = form.id.value;
-
         assignClientWindowId(form, requestCtx);
-
-        assignExecute(options, requestCtx, form, elementId.value);
-        assignRender(options, requestCtx, form, elementId.value);
-
-        let delay: number = resolveDelay(options);
-        let timeout: number = resolveTimeout(options);
+        assignExecute(options, requestCtx, form, elementId);
+        assignRender(options, requestCtx, form, elementId);
 
         //now we enqueue the request as asynchronous runnable into our request
         //queue and let the queue take over the rest
@@ -308,7 +349,6 @@ export module Implementation {
      * @param errorListener the error listener handler
      */
     export function addOnError(errorListener: IListener<ErrorData>) {
-        /*error handling already done in the assert of the queue*/
         errorQueue.push(errorListener);
     }
 
@@ -318,7 +358,6 @@ export module Implementation {
      * @param eventListener the event listener handler
      */
     export function addOnEvent(eventListener: IListener<EventData>) {
-        /*error handling already done in the assert of the queue*/
         eventQueue.push(eventListener);
     }
 
@@ -480,7 +519,7 @@ export module Implementation {
 
     /**
      * this at the first sight looks like a weird construct, but we need to do it this way
-     * for testing, we cannot proxy addRequestToQueue from the testing frameworks directly
+     * for testing, we cannot proxy addRequestToQueue from the testing frameworks directly,
      * but we need to keep it under unit tests.
      */
     export let queueHandler = {
@@ -572,15 +611,12 @@ export module Implementation {
     function remapDefaultConstants(targetConfig: Config, targetKey: string, userValues: string, issuingForm: DQ, issuingElementId: string): Config {
         //a cleaner implementation of the transform list method
 
-        let iterValues = (userValues) ? trim(userValues).split(/\s+/gi) : [];
+        let iterValues: string[] = (userValues) ? trim(userValues).split(/\s+/gi) : [];
         let ret = [];
-        let processed = {};
+        let processed: {[key: string]: boolean} = {};
 
-        //the idea is simply to loop over all values and then replace
-        //their generic values and filter out doubles
-        //this is more readable than the old indexed based solution
-        //and not really slower because we had to build up the index in our old solution
-        //anyway
+        // in this case we do not use lazy stream because it wont bring any code reduction
+        // or speedup
         for (let cnt = 0; cnt < iterValues.length; cnt++) {
             //avoid doubles
             if (iterValues[cnt] in processed) {
@@ -649,7 +685,7 @@ export module Implementation {
             return (<Function>func).call(source, event) !== false;
         } else {
             //either a function or a string can be passed in case of a string we have to wrap it into another function
-            //it it is not a plain executable code but a definition
+            //it is not a plain executable code but a definition
             let sourceCode = trim(<string>func);
             if (sourceCode.indexOf("function ") == 0) {
                 sourceCode = `return ${sourceCode} (event)`;

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

@@ -1,3 +1,19 @@
+/* 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.
+ */
+
 /**
  * Typescript port of the jsf.push part in the myfaces implementation
  */

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

@@ -1,3 +1,18 @@
+/* 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 {Config, Lang, XMLQuery} from "mona-dish";
 
 import {DQ} from "mona-dish";

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

@@ -1,3 +1,18 @@
+/* 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 {AsyncRunnable} from "./AsyncRunnable";
 
 /**
@@ -6,7 +21,7 @@ import {AsyncRunnable} from "./AsyncRunnable";
  *
  * Every callback must be of async runnable
  * which is sort of an extended promise which has
- * added a decicated cancel and start point
+ * added a dedicated cancel and start point
  *
  * This interface can be used as wrapper contract
  * for normal promises if needed.
@@ -21,12 +36,15 @@ export class AsynchronousQueue<T extends AsyncRunnable<any>> {
     constructor() {
     }
 
+    /**
+     * simple is empty accessor, returns true if queue is empty atm
+     */
     get isEmpty(): boolean {
         return !this.runnableQueue.length;
     }
 
     /**
-     * enequeues an element and starts the
+     * enqueues an element and starts the
      * asynchronous work loop if not already running
      *
      * @param element the element to be queued and processed
@@ -46,15 +64,39 @@ export class AsynchronousQueue<T extends AsyncRunnable<any>> {
         }
     }
 
-    dequeue(): T {
+    /**
+     * fetches the next element from the queue (first in first out order)
+     */
+    dequeue(): T | undefined{
         return this.runnableQueue.shift();
     }
 
+    /**
+     * clears up all elements from the queue
+     */
     cleanup() {
         this.currentlyRunning = null;
         this.runnableQueue.length = 0;
     }
 
+    /**
+     * cancels the currently running element and then cleans up the queue
+     * aka cancel the queue entirely
+     */
+    cancel() {
+        try {
+            if (this.currentlyRunning) {
+                this.currentlyRunning.cancel();
+            }
+        } finally {
+            this.cleanup();
+        }
+    }
+
+    private callForNextElementToProcess() {
+        this.runEntry();
+    }
+
     private appendElement(element: T) {
         //only if the first element is added we start with a trigger
         //otherwise a process already is running and not finished yet at that
@@ -88,18 +130,4 @@ export class AsynchronousQueue<T extends AsyncRunnable<any>> {
                 () => this.callForNextElementToProcess()
             ).start();
     }
-
-    cancel() {
-        try {
-            if (this.currentlyRunning) {
-                this.currentlyRunning.cancel();
-            }
-        } finally {
-            this.cleanup();
-        }
-    }
-
-    private callForNextElementToProcess() {
-        this.runEntry();
-    }
 }

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

@@ -19,7 +19,9 @@
  * Ever object in the asynchronous queue needs to implement this interface
  *
  * the usage should be similar as a Promise from the outside.
- * but with a dedicated start point
+ * but with a dedicated start point. The problem why we cannot use
+ * promises here, is mostly related to the needed cancel functionality
+ * and that the queue expects a runnable as entry.
  *
  * from the implementation side it is mostly registering callbacks
  * and calling them at the appropriate time.
@@ -36,8 +38,8 @@ export interface AsyncRunnable<T> {
     cancel();
 
     /**
-     * callback for then functinality
-     * triggered when the asynch run is complete
+     * callback for then functionality
+     * triggered when the async run is complete
      *
      * the async runnable must register the passed function
      * and then triggers all the registered thens

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

@@ -1,5 +1,20 @@
+/* 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 {Config, IValueHolder, Optional, DomQuery, DQ} from "mona-dish";
-import {EMPTY_STR, P_WINDOW_ID} from "../core/Const";
+import {P_WINDOW_ID} from "../core/Const";
 
 declare let window: any;
 
@@ -13,9 +28,9 @@ declare let window: any;
  */
 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);
+        source?.search(/\/jsf-development\.js.*/) != -1 ||
+        source?.search(/\/jsf-uncompressed\.js.*/) != -1 ||
+        source?.search(/\/jsf[^.]*\.js.*ln=javax.faces.*/gi) != -1);
 }
 
 /**
@@ -27,7 +42,7 @@ const IS_JSF_SOURCE = (source?: string): boolean => {
  * @constructor
  */
 const IS_INTERNAL_SOURCE = (source: string): boolean => {
-    return  source.search(/\/jsf[^\.]\.js.*ln\=myfaces.testscripts.*/gi) != -1;
+    return  source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
 }
 
 
@@ -131,7 +146,7 @@ export class ExtDomquery extends DQ {
     }
 
     globalEval(code: string, nonce ?: string): DQ {
-        return super.globalEval(code, nonce ?? this.nonce);
+        return new ExtDomquery(super.globalEval(code, nonce ?? this.nonce));
     }
 
     /**
@@ -150,12 +165,12 @@ export class ExtDomquery extends DQ {
      * byId producer
      *
      * @param selector id
+     * @param deep whether the search should go into embedded shadow dom elements
      * @return a DomQuery containing the found elements
      */
     static byId(selector: string | DomQuery | Element, deep = false): DomQuery {
         const ret = DomQuery.byId(selector, deep);
-        //return new ExtDomquery(ret);
-        return ret;
+        return new ExtDomquery(ret);
     }
 }
 

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

@@ -0,0 +1,18 @@
+/* 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.
+ */
+export interface IListener<T> {
+    (data: T): void;
+}

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

@@ -1,3 +1,18 @@
+/* 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 {
     EMPTY_STR,
     ERROR_MESSAGE,

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

@@ -1,3 +1,18 @@
+/* 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 {Config, DQ} from "mona-dish";
 import {BEGIN, CTX_PARAM_PASS_THR, EVENT, P_PARTIAL_SOURCE, SOURCE} from "../core/Const";
 
@@ -17,8 +32,8 @@ export class EventData {
         eventData.status = name;
 
         let sourceId: string = context.getIf(SOURCE)
-            .orElse(context.getIf(P_PARTIAL_SOURCE).value)
-            .orElse(context.getIf(CTX_PARAM_PASS_THR, P_PARTIAL_SOURCE).value).value;
+            .orElseLazy(() => context.getIf(P_PARTIAL_SOURCE).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/IResponseProcessor.ts

@@ -1,3 +1,18 @@
+/* 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 {XMLQuery} from "mona-dish";
 // noinspection TypeScriptPreferShortImport
 import {DQ} from "mona-dish";

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

@@ -46,7 +46,7 @@ import {ExtDomquery} from "../util/ExtDomQuery";
  */
 export function resolveHandlerFunc(requestContext: Config, responseContext: Config, funcName: string) {
     return responseContext.getIf(funcName)
-        .orElse(requestContext.getIf(funcName).value)
+        .orElseLazy(() =>requestContext.getIf(funcName).value)
         .orElse(EMPTY_FUNC).value;
 }
 
@@ -72,7 +72,7 @@ export function resolveFinalUrl(sourceForm: DomQuery, formData: XhrFormData, aja
  * @param event
  */
 export function resolveForm(requestCtx: Config, elem: DQ, event: Event): DQ {
-    const configId = requestCtx.value?.myfaces?.form ?? MF_NONE; //requestCtx.getIf(MYFACES, "form").orElse(MF_NONE).value;
+    const configId = requestCtx.value?.myfaces?.form ?? MF_NONE;
     return DQ
         .byId(configId, true)
         .orElseLazy(() => ExtLang.getForm(elem.getAsElem(0).value, event));
@@ -142,7 +142,7 @@ export function resolveDefaults(event: Event, opts: any = {}, el: Element | stri
     const resolvedEvent = event,
         options = new Config(opts).deepCopy,
         elem = DQ.byId(el || <Element>resolvedEvent.target, true),
-        elementId = elem.id, requestCtx = new Config({}),
+        elementId = elem.id.value, requestCtx = new Config({}),
         internalCtx = new Config({}), windowId = resolveWindowId(options),
         isResetValues = true === options.value?.resetValues;