jsf.js_next_gen 4.0.0-beta-4 → 4.0.0-beta-6

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

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Config, IValueHolder, Optional, DomQuery, DQ} from "mona-dish";
-import {P_WINDOW_ID} from "../core/Const";
+import {Config, IValueHolder, Optional, DomQuery, DQ, Stream, ArrayCollector} from "mona-dish";
+import {$nsp, P_WINDOW_ID} from "../core/Const";
 
 declare let window: any;
 
@@ -28,17 +28,16 @@ declare let window: any;
  */
 const IS_FACES_SOURCE = (source?: string): boolean => {
     //spec version smaller 4 we have to deal with the jsf namespace
-    if (window.jsf) {
-        // fallback into 2.3 api level
-        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);
-    }
+
     return source && !!(source?.search(/\/jakarta\.faces\.resource.*\/faces\.js.*/) != -1 ||
         source?.search(/\/faces-development\.js.*/) != -1 ||
         source?.search(/\/faces-uncompressed\.js.*/) != -1 ||
-        source?.search(/\/faces[^.]*\.js.*ln=jakarta.faces.*/gi) != -1);
+        source?.search(/\/faces[^.]*\.js.*ln=jakarta.faces.*/gi) != -1 ||
+        //fallback without check for jsf, that way we allow both bookmarks
+        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);
 }
 
 /**
@@ -50,10 +49,7 @@ const IS_FACES_SOURCE = (source?: string): boolean => {
  * @constructor
  */
 const IS_INTERNAL_SOURCE = (source: string): boolean => {
-    if (window?.jsf) {
-        return source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
-    }
-    return source.search(/\/faces[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
+    return source.search(/\/faces[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1 || source.search(/\/jsf[^.]*\.js.*ln=myfaces.testscripts.*/gi) != -1;
 }
 
 
@@ -109,7 +105,7 @@ export class ExtDomquery extends DQ {
     */
     get nonce(): string | null {
         //already processed
-        let myfacesConfig = new Config(window.myfaces);
+        let myfacesConfig = new ExtConfig(window.myfaces);
         let nonce: IValueHolder<string> = myfacesConfig.getIf("config", "cspMeta", "nonce");
         if (nonce.value) {
             return <string>nonce.value;
@@ -185,4 +181,81 @@ export class ExtDomquery extends DQ {
     }
 }
 
-export const ExtDQ = DQ;
+export const ExtDQ = ExtDomquery;
+
+/**
+ * in order to reduce the number of interception points for the fallbacks we add
+ * the namespace remapping straight to our config accessors
+ */
+export class ExtConfig extends  Config {
+
+    constructor(root: any) {
+        super(root);
+    }
+
+    assignIf(condition: boolean, ...accessPath): IValueHolder<any> {
+        const acessPathMapped = this.remap(accessPath);
+        return super.assignIf(condition, ...acessPathMapped);
+    }
+
+    assign(...accessPath): IValueHolder<any> {
+        const acessPathMapped = this.remap(accessPath);
+        return super.assign(...acessPathMapped);
+    }
+
+    append(...accessPath): IValueHolder<any> {
+        return super.append(...accessPath);
+    }
+
+    appendIf(condition: boolean, ...accessPath): IValueHolder<any> {
+        const acessPathMapped = this.remap(accessPath);
+        return super.appendIf(condition, ...acessPathMapped);
+    }
+
+    getIf(...accessPath): Config {
+        const acessPathMapped = this.remap(accessPath);
+        return super.getIf(...acessPathMapped);
+    }
+
+    get(defaultVal: any): Config {
+        return super.get($nsp(defaultVal));
+    }
+
+    delete(key: string): Config {
+        return super.delete($nsp(key));
+    }
+
+    /**
+     * creates a config from an initial value or null
+     * @param value
+     */
+    static fromNullable<T>(value?: T | null): Config {
+        return new ExtConfig(value);
+    }
+
+    protected getClass(): any {
+        return ExtConfig;
+    }
+
+    /**
+     * shallow copy getter, copies only the first level, references the deeper nodes
+     * in a shared manner
+     */
+    protected shallowCopy$(): Config {
+        const ret = super.shallowCopy$();
+        return new ExtConfig(ret);
+    }
+
+    /**
+     * deep copy, copies all config nodes
+     */
+    get deepCopy(): Config {
+        return new ExtConfig(super.deepCopy$());
+    }
+
+
+    private remap(accessPath: any[]) {
+        return Stream.of(...accessPath).map(key => $nsp(key)).collect(new ArrayCollector());
+    }
+
+}

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

@@ -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
@@ -140,10 +140,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

@@ -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,
@@ -28,6 +29,7 @@ import {
     UPDATE_ELEMS,
     UPDATE_FORMS
 } from "../core/Const";
+import {ExtConfig} from "../util/ExtDomQuery";
 
 /**
  * Resolver functions for various aspects of the response data
@@ -46,7 +48,7 @@ import {
  *
  */
 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;
@@ -64,10 +66,10 @@ 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({});
     }
 
     /**

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

@@ -19,6 +19,7 @@ import {ResponseProcessor} from "./ResponseProcessor";
 
 import {IResponseProcessor} from "./IResponseProcessor";
 import {
+    $nsp,
     CMD_ATTRIBUTES,
     CMD_CHANGES,
     CMD_DELETE,
@@ -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 faces.js response
-     * this one is called straight from faces.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,7 +59,7 @@ 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);
@@ -191,15 +193,15 @@ 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;
 

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

@@ -23,6 +23,7 @@ import {StateHolder} from "../core/ImplTypes";
 import {EventData} from "./EventData";
 
 import {
+    $nsp,
     APPLIED_CLIENT_WINDOW,
     APPLIED_VST,
     ATTR_ID,
@@ -53,7 +54,7 @@ import {
     UPDATE_FORMS
 } from "../core/Const";
 import trim = Lang.trim;
-import {ExtDomquery} from "../util/ExtDomQuery";
+import {ExtConfig, ExtDomquery} from "../util/ExtDomQuery";
 
 declare const window: any;
 
@@ -147,7 +148,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;
@@ -285,7 +286,7 @@ export class ResponseProcessor implements IResponseProcessor {
     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;
@@ -294,7 +295,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;
         }
     }
@@ -360,7 +361,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @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);
     }
 
 
@@ -371,7 +372,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @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);
     }
 
     /**
@@ -399,7 +400,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * (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;
     }
@@ -441,9 +442,9 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     private static isViewStateNode(node: XMLQuery): boolean {
         let separatorChar = (window?.faces ?? 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);
+        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);
     }
 
     /**
@@ -454,9 +455,9 @@ export class ResponseProcessor implements IResponseProcessor {
      */
     private static isClientWindowNode(node: XMLQuery): boolean {
         let separatorChar = (window?.faces ?? 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);
+        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) {

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

@@ -16,6 +16,7 @@
 import {ArrayCollector, Config, DQ, Lang, LazyStream, Stream} from "mona-dish";
 import {EMPTY_STR, IDENT_ALL, IDENT_FORM, P_VIEWSTATE} from "../core/Const";
 import isString = Lang.isString;
+import {ExtConfig} from "../util/ExtDomQuery";
 
 
 /**
@@ -121,7 +122,7 @@ export class XhrFormData extends Config {
      * @param keyValueEntries
      */
     assignString(keyValueEntries: string[]) {
-        let toMerge = new Config({});
+        let toMerge = new ExtConfig({});
 
         function splitToKeyVal(line: string) {
             return line.split(/=(.*)/gi);

package/src/main/typescript/myfaces/OamSubmit.ts

@@ -105,13 +105,14 @@ export module oam {
                 }
             } catch (e) {
                 window?.console.error(e);
+            } finally {
+                form.attr(ATTR_TARGET).value = oldTarget;
+                Stream.ofAssoc(params).each((param: [string, any]) => {
+                    myfaces.oam.clearHiddenInput(formName, param[0]);
+                });
+                myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
             }
 
-            form.attr(ATTR_TARGET).value = oldTarget;
-            Stream.ofAssoc(params).each((param: [string, any]) => {
-                myfaces.oam.clearHiddenInput(formName, param[0]);
-            });
-            myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
         });
         return false;
     };

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

@@ -16,10 +16,11 @@
 
 
 import {DomQuery} from "mona-dish";
-import {remapNamespacesFor23, remapNamespacesFor40} from "../../../../impl/core/Const";
+
 
 declare let global;
 declare let faces: any;
+declare let jsf: any;
 declare let myfaces: any;
 
 /**
@@ -216,7 +217,7 @@ export module StandardInits {
                onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'errors');"/>
 
         <input type="button" id="cmd_error_component" value="Error: no component given"
-               onclick="faces.ajax.request(null, event, {}); return false"/>
+               onclick="(window.faces || window.jsf).ajax.request(null, event, {}); return false"/>
 
     </form>
 
@@ -228,7 +229,7 @@ export module StandardInits {
         function emitPPR(source, event, action, useIframe, formName) {
             document.getElementById(formName || "form1").action = target;
 
-            faces.ajax.request(/*String|Dom Node*/ source, /*|EVENT|*/ (window.event) ? window.event : event, /*{|OPTIONS|}*/ {op: action});
+            (window?.faces ?? window.jsf).ajax.request(/*String|Dom Node*/ source, /*|EVENT|*/ (window.event) ? window.event : event, /*{|OPTIONS|}*/ {op: action});
         }
     </script>
 </div>
@@ -311,6 +312,7 @@ export module StandardInits {
         (<any>global).faces = data.faces;
         (<any>global).myfaces = data.myfaces;
         (<any>global).window.faces = data.faces;
+        debugger;
         (<any>global).window.myfaces = data.myfaces;
         (<any>global).Implementation = Implementation.Implementation;
         (<any>global).PushImpl = PushImpl.PushImpl;
@@ -323,6 +325,7 @@ export module StandardInits {
         (<any>global).jsf = data.jsf;
         (<any>global).myfaces = data.myfaces;
         (<any>global).window.jsf = data.jsf;
+        debugger;
         (<any>global).window.myfaces = data.myfaces;
         (<any>global).Implementation = Implementation.Implementation;
         (<any>global).window.Implementation = Implementation.Implementation;
@@ -379,7 +382,6 @@ export module StandardInits {
         delete (<any>global).myfaces;
         ((<any>global).Implementation) ? delete (<any>global).Implementation : null;
         delete (<any>global).PushImpl;
-        remapNamespacesFor40();
     };
 
     /**

package/src/main/typescript/test/myfaces/OamSubmit.spec.ts

@@ -62,9 +62,7 @@ describe('Tests on the xhr core when it starts to call the request', function ()
     it('submit form must work', function() {
         let FORM_ID = "blarg";
         let form = DomQuery.byId(FORM_ID);
-        let submitCalled;
-        (form.value.value as any).submit = () => {
-            submitCalled = true;
+        const submit_spy = Sinon.spy(() => {
             expect(form.querySelectorAll('input[name=\'booga1\']').isPresent()).to.eq(true);
             expect(form.querySelectorAll('input[name=\'booga1\']').length == 1).to.eq(true);
             expect(form.querySelectorAll('input[name=\'booga1\']').inputValue.value == 'val_booga1').to.eq(true);
@@ -75,7 +73,8 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).length == 1).to.eq(true);
             expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).inputValue.value == 'mylink').to.eq(true);
             expect(form.attr("target").value).to.eq('target1');
-        }
+        });
+        (form.value.value as any).submit = submit_spy;
 
 
         submitForm(FORM_ID, 'mylink', 'target1', {
@@ -83,27 +82,18 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             booga2: "val_booga2"
         });
 
-        expect(submitCalled).to.eq(true);
+        expect(submit_spy.called).to.eq(true);
         form = DomQuery.byId(FORM_ID);
         expect(form.querySelectorAll('input[name=\'booga1\']').isAbsent()).to.eq(true);
         expect(form.querySelectorAll('input[name=\'booga2\']').isAbsent()).to.eq(true);
         expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).isAbsent()).to.eq(true);
 
-       //const os_spy = Sinon.spy(form.getAsElem(0).value, 'onsubmit' as keyof Element);
-       const submit_spy = Sinon.spy(form.getAsElem(0).value, 'submit' as keyof Element);
-       expect
-
-        //we also have to interceot onsbumit
-       // expect(os_spy.called).to.eq(true);
-       // expect(submit_spy.called).to.eq(true);
     })
 
     it('onsubmit form must work', function() {
         let FORM_ID = "blarg";
         let form = DomQuery.byId(FORM_ID);
-        let onSubmitCalled;
-        (form.value.value as any).onsubmit = () => {
-            onSubmitCalled = true;
+        const onsumbit = () => {
             expect(form.querySelectorAll('input[name=\'booga1\']').isPresent()).to.eq(true);
             expect(form.querySelectorAll('input[name=\'booga1\']').length == 1).to.eq(true);
             expect(form.querySelectorAll('input[name=\'booga1\']').inputValue.value == 'val_booga1').to.eq(true);
@@ -114,7 +104,12 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).length == 1).to.eq(true);
             expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).inputValue.value == 'mylink').to.eq(true);
             expect(form.attr("target").value).to.eq('target1');
+            return false;
         }
+        const os_spy = Sinon.spy(onsumbit);
+        const submit_spy = Sinon.spy(() => {});
+        (form.value.value as any).onsubmit = os_spy;
+        (form.value.value as any).submit = submit_spy;
 
 
         submitForm(FORM_ID, 'mylink', 'target1', {
@@ -122,18 +117,14 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             booga2: "val_booga2"
         });
 
-        expect(onSubmitCalled).to.eq(true);
+        //we also have to interceot onsbumit
+        expect(os_spy.called).to.eq(true);
+        expect(submit_spy.called).to.eq(false);
+
         form = DomQuery.byId(FORM_ID);
         expect(form.querySelectorAll('input[name=\'booga1\']').isAbsent()).to.eq(true);
         expect(form.querySelectorAll('input[name=\'booga2\']').isAbsent()).to.eq(true);
         expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).isAbsent()).to.eq(true);
-
-        //const os_spy = Sinon.spy(form.getAsElem(0).value, 'onsubmit' as keyof Element);
-        const submit_spy = Sinon.spy(form.getAsElem(0).value, 'submit' as keyof Element);
-        expect
-
-        //we also have to interceot onsbumit
-        // expect(os_spy.called).to.eq(true);
         // expect(submit_spy.called).to.eq(true);
     })