jsf.js_next_gen 4.0.0-RC.3 → 4.0.0-RC.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.0-RC.3",
+  "version": "4.0.0-RC.6",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -21,29 +21,29 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/chai": "^4.3.3",
+    "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.11.9",
     "@types/sinon": "^10.0.13",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "compression-webpack-plugin": "^10.0.0",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
     "jsdom": "^20.0.2",
     "jsdom-global": "^3.0.2",
     "mocha": "^10.1.0",
-    "npm-check-updates": "^16.3.16",
+    "npm-check-updates": "^16.3.18",
     "nyc": "^15.1.0",
     "replace-in-file": "^6.3.5",
     "rxjs": "^7.5.7",
-    "sinon": "^14.0.1",
+    "sinon": "^14.0.2",
     "terser-webpack-plugin": "^5.3.6",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
     "typedoc": "^0.23.20",
     "typescript": "^4.8.4",
-    "webpack": "^5.74.0",
+    "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },

package/src/main/typescript/@types/definitions/index.d.ts

@@ -23,17 +23,20 @@
 declare global {
 
     type Consumer<T> = (s?: T) => void;
+    type Tuple<V,K> = [V, K];
+    type Tuples<V,K> = [Tuple<V, K>];
     type AssocArr<T> = { [key: string]: T };
     type EvalFuncs = Array<Function | string>;
 
 
     type Options = {
-        execute ?: string, //space separated list of client ids
-        onevent ?: Function, // event handler callback
-        onerror ?: Function, // error handler callback
-        params ?: {[key: string]: any} | [[string, any]], //passthrough params
-        delay ?: number, // delay in milliseconds
-        resetValues ?: boolean, //if set to true jakarta.faces.partial.resetValues is sent
+        render ?: string,
+        execute ?: string,          //space separated list of client ids
+        onevent ?: Function,        // event handler callback
+        onerror ?: Function,        // error handler callback
+        params ?: AssocArr<any>,    // passthrough params
+        delay ?: number,            // delay in milliseconds
+        resetValues ?: boolean,     // if set to true jakarta.faces.partial.resetValues is sent
         /* @deprecated non-spec conform fallback behavior that anything can be passed and is used as passthrough */
         [key: string]: any
     }
@@ -118,7 +121,7 @@ declare global {
     interface OAM {
         clearHiddenInput(formName: string, name: string): void;
         setHiddenInput(formName: string, name: string, value: string): void;
-        submitForm(formName: string, linkId: string, target: string, params: { [key: string]: any }): boolean;
+        submitForm(formName: string, linkId?: string |null, target?: string | null, params?: AssocArr<any> |Tuples<string, any> | null): boolean;
     }
 
     interface MyFacesAPI {

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

@@ -62,18 +62,22 @@ export module oam {
         DQ.byId(element).delete();
     };
 
-    // noinspection JSUnusedGlobalSymbols
+    // noinspection JSUnusedGlobalSymbols,JSUnusedLocalSymbols
     /**
      * does special form submit remapping
      * re-maps the issuing command link into something,
-     * a decode of the command link on the server can understand
+     * the "decode" of the command link on the server can understand
      *
      * @param formName
      * @param linkId
      * @param target
      * @param params
      */
-    export const submitForm = function (formName: string, linkId: string, target: string, params: { [key: string]: any }): boolean {
+    export const submitForm = function (formName: string, linkId: string | null = null, target: string |null = null, params: AssocArr<any> | Tuples<string, any> | null = {} ): boolean {
+
+        //handle a possible incoming null, not sure if this is used that way anywhere, but we allow it
+        params = (!params) ? {} : params;
+
         let clearFn = 'clearFormHiddenParams_' + formName.replace(/-/g, '\$:').replace(/:/g, '_');
         window?.[clearFn]?.(formName);
 
@@ -81,14 +85,14 @@ export module oam {
         if (window?.myfaces?.core?.config?.autoScroll && (window as any)?.getScrolling) {
             myfaces.oam.setHiddenInput(formName, 'autoScroll', (window as any)?.getScrolling());
         }
-        Stream.ofAssoc(params).each((param: [string, any]) => {
-            myfaces.oam.setHiddenInput(formName, param[0], param[1]);
-        });
+        let paramsStream: Stream<[string, any]> = Array.isArray(params) ? Stream.of(...params) : Stream.ofAssoc(params);
+        paramsStream.each(([key, data]) => myfaces.oam.setHiddenInput(formName, key, data));
 
         //we call the namespaced function, to allow decoration, via a direct call we would
-        myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId);
+        myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId ?? '');
+
 
-        DQ.byId(document.forms[formName]).each(form => {
+        DQ.byId(document.forms?.[formName] ?? document.getElementById(formName)).each(form => {
             const ATTR_TARGET = "target";
             const formElement = form.getAsElem(0).value as HTMLFormElement;
             const oldTarget = form.attr(ATTR_TARGET).value;
@@ -104,8 +108,9 @@ export module oam {
                 window?.console.error(e);
             } finally {
                 form.attr(ATTR_TARGET).value = oldTarget;
-                Stream.ofAssoc(params).each((param: [string, any]) => {
-                    myfaces.oam.clearHiddenInput(formName, param[0]);
+                // noinspection JSUnusedLocalSymbols
+                paramsStream.each(([key, data]) => {
+                    myfaces.oam.clearHiddenInput(formName, key);
                 });
                 myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
             }

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

@@ -0,0 +1,177 @@
+/*! 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 {describe} from "mocha";
+import * as sinon from "sinon";
+import {Implementation} from "../../impl/AjaxImpl";
+import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
+import defaultMyFaces = StandardInits.defaultMyFaces;
+import {DQ, DQ$} from "mona-dish";
+import {expect} from "chai";
+
+describe('Tests for the MyFaces specifig oam submit', function () {
+
+    beforeEach(async function () {
+
+        let waitForResult = defaultMyFaces();
+
+        return waitForResult.then((close) => {
+
+            this.xhr = sinon.useFakeXMLHttpRequest();
+            this.requests = [];
+            this.xhr.onCreate = (xhr) => {
+                this.requests.push(xhr);
+            };
+            (<any>global).XMLHttpRequest = this.xhr;
+            window.XMLHttpRequest = this.xhr;
+
+            this.jsfAjaxResponse = sinon.spy((<any>global).faces.ajax, "response");
+
+            this.closeIt = () => {
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
+                this.jsfAjaxResponse.restore();
+                Implementation.reset();
+                close();
+            }
+        });
+    });
+
+    afterEach(function () {
+        this.closeIt();
+    });
+
+    it(("must handle oam submit correctly, tuples"), (done) => {
+
+        let options = [["booga1", "value1"], ["booga2", "value2"]];
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ$("#blarg #booga1").inputValue.value).to.eq("value1");
+            expect(DQ$("#blarg #booga2").inputValue.value).to.eq("value2");
+            done();
+            return false;
+        };
+
+        myfaces.oam.submitForm("blarg", null, null, options);
+
+    });
+    it(("must handle oam submit correctly, associative array"), (done) => {
+
+        let options = {"booga1": "value1", "booga2": "value2"};
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ$("#blarg #booga1").inputValue.value).to.eq("value1");
+            expect(DQ$("#blarg #booga2").inputValue.value).to.eq("value2");
+            done();
+            return false;
+        };
+
+        myfaces.oam.submitForm("blarg", null, null, options);
+
+    });
+
+    it(("all hidden inputs must be cleared post submit"), (done) => {
+
+        let options = {"booga1": "value1", "booga2": "value2"};
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ$("#blarg #booga1").length).to.eq(1);
+            expect(DQ$("#blarg #booga2").length).to.eq(1);
+            return false;
+        };
+
+        myfaces.oam.submitForm("blarg", null, null, options);
+
+        expect(DQ$("#blarg #booga1").length).to.eq(0);
+        expect(DQ$("#blarg #booga2").length).to.eq(0);
+        done();
+    });
+
+    it(("must handle linkid correctly, associative array"), (done) => {
+
+        let options = {"booga1": "value1", "booga2": "value2"};
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ.byId(`blarg:_idcl`).inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+
+        myfaces.oam.submitForm("blarg", "bla", null, options);
+
+    });
+
+    it(("must handle target correctly, associative array"), (done) => {
+
+        let options = {"booga1": "value1", "booga2": "value2"};
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ$(`#blarg`).attr("target").value).to.eq("target1");
+            done();
+            return false;
+        };
+        myfaces.oam.submitForm("blarg", "bla", "target1", options);
+
+    });
+
+    it(("must handle limited parameters"), (done) => {
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ.byId(`blarg:_idcl`).inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        try {
+        myfaces.oam.submitForm("blarg", "bla");
+        } catch(e) {
+            done(e);
+        }
+
+    });
+    it(("must handle limited parameters 2"), (done) => {
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ.byId(`blarg:_idcl`).inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        try {
+            myfaces.oam.submitForm("blarg", "bla", null);
+        } catch(e) {
+            done(e);
+        }
+    });
+    it(("must handle limited parameters 3"), (done) => {
+
+        (DQ.byId("blarg")
+            .getAsElem(0).value as HTMLFormElement).onsubmit = (evt) => {
+            expect(DQ.byId(`blarg:_idcl`).inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        try {
+            myfaces.oam.submitForm("blarg", "bla", null, null);
+        } catch(e) {
+            done(e);
+        }
+    });
+
+});

package/target/myfaces/OamSubmit.js

@@ -64,11 +64,11 @@ var oam;
         }
         mona_dish_1.DQ.byId(element).delete();
     };
-    // noinspection JSUnusedGlobalSymbols
+    // noinspection JSUnusedGlobalSymbols,JSUnusedLocalSymbols
     /**
      * does special form submit remapping
      * re-maps the issuing command link into something,
-     * a decode of the command link on the server can understand
+     * the "decode" of the command link on the server can understand
      *
      * @param formName
      * @param linkId
@@ -76,19 +76,26 @@ var oam;
      * @param params
      */
     oam.submitForm = function (formName, linkId, target, params) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
+        if (linkId === void 0) { linkId = null; }
+        if (target === void 0) { target = null; }
+        if (params === void 0) { params = {}; }
+        //handle a possible incoming null, not sure if this is used that way anywhere, but we allow it
+        params = (!params) ? {} : params;
         var clearFn = 'clearFormHiddenParams_' + formName.replace(/-/g, '\$:').replace(/:/g, '_');
         (_a = window === null || window === void 0 ? void 0 : window[clearFn]) === null || _a === void 0 ? void 0 : _a.call(window, formName);
         //autoscroll code
         if (((_d = (_c = (_b = window === null || window === void 0 ? void 0 : window.myfaces) === null || _b === void 0 ? void 0 : _b.core) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.autoScroll) && (window === null || window === void 0 ? void 0 : window.getScrolling)) {
             myfaces.oam.setHiddenInput(formName, 'autoScroll', window === null || window === void 0 ? void 0 : window.getScrolling());
         }
-        mona_dish_1.Stream.ofAssoc(params).each(function (param) {
-            myfaces.oam.setHiddenInput(formName, param[0], param[1]);
+        var paramsStream = Array.isArray(params) ? mona_dish_1.Stream.of.apply(mona_dish_1.Stream, params) : mona_dish_1.Stream.ofAssoc(params);
+        paramsStream.each(function (_a) {
+            var key = _a[0], data = _a[1];
+            return myfaces.oam.setHiddenInput(formName, key, data);
         });
         //we call the namespaced function, to allow decoration, via a direct call we would
-        myfaces.oam.setHiddenInput(formName, "".concat(formName, ":_idcl"), linkId);
-        mona_dish_1.DQ.byId(document.forms[formName]).each(function (form) {
+        myfaces.oam.setHiddenInput(formName, "".concat(formName, ":_idcl"), linkId !== null && linkId !== void 0 ? linkId : '');
+        mona_dish_1.DQ.byId((_f = (_e = document.forms) === null || _e === void 0 ? void 0 : _e[formName]) !== null && _f !== void 0 ? _f : document.getElementById(formName)).each(function (form) {
             var _a;
             var ATTR_TARGET = "target";
             var formElement = form.getAsElem(0).value;
@@ -105,8 +112,10 @@ var oam;
             }
             finally {
                 form.attr(ATTR_TARGET).value = oldTarget;
-                mona_dish_1.Stream.ofAssoc(params).each(function (param) {
-                    myfaces.oam.clearHiddenInput(formName, param[0]);
+                // noinspection JSUnusedLocalSymbols
+                paramsStream.each(function (_a) {
+                    var key = _a[0], data = _a[1];
+                    myfaces.oam.clearHiddenInput(formName, key);
                 });
                 myfaces.oam.clearHiddenInput(formName, "".concat(formName, ":_idcl"));
             }

package/target/myfaces/OamSubmit.js.map

@@ -1 +1 @@
-{"version":3,"file":"OamSubmit.js","sourceRoot":"","sources":["../../src/main/typescript/myfaces/OamSubmit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OamSubmit.js","sourceRoot":"","sources":["../../src/main/typescript/myfaces/OamSubmit.ts"],"names":[],"mappings":"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"}

package/target/test/xhrCore/OamSubmitTest.spec.js

@@ -0,0 +1,211 @@
+"use strict";
+/*! 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.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var mocha_1 = require("mocha");
+var sinon = __importStar(require("sinon"));
+var AjaxImpl_1 = require("../../impl/AjaxImpl");
+var StandardInits_1 = require("../frameworkBase/_ext/shared/StandardInits");
+var defaultMyFaces = StandardInits_1.StandardInits.defaultMyFaces;
+var mona_dish_1 = require("mona-dish");
+var chai_1 = require("chai");
+(0, mocha_1.describe)('Tests for the MyFaces specifig oam submit', function () {
+    beforeEach(function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var waitForResult;
+            var _this = this;
+            return __generator(this, function (_a) {
+                waitForResult = defaultMyFaces();
+                return [2 /*return*/, waitForResult.then(function (close) {
+                        _this.xhr = sinon.useFakeXMLHttpRequest();
+                        _this.requests = [];
+                        _this.xhr.onCreate = function (xhr) {
+                            _this.requests.push(xhr);
+                        };
+                        global.XMLHttpRequest = _this.xhr;
+                        window.XMLHttpRequest = _this.xhr;
+                        _this.jsfAjaxResponse = sinon.spy(global.faces.ajax, "response");
+                        _this.closeIt = function () {
+                            global.XMLHttpRequest = window.XMLHttpRequest = _this.xhr.restore();
+                            _this.jsfAjaxResponse.restore();
+                            AjaxImpl_1.Implementation.reset();
+                            close();
+                        };
+                    })];
+            });
+        });
+    });
+    afterEach(function () {
+        this.closeIt();
+    });
+    it(("must handle oam submit correctly, tuples"), function (done) {
+        var options = [["booga1", "value1"], ["booga2", "value2"]];
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga1").inputValue.value).to.eq("value1");
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga2").inputValue.value).to.eq("value2");
+            done();
+            return false;
+        };
+        myfaces.oam.submitForm("blarg", null, null, options);
+    });
+    it(("must handle oam submit correctly, associative array"), function (done) {
+        var options = { "booga1": "value1", "booga2": "value2" };
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga1").inputValue.value).to.eq("value1");
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga2").inputValue.value).to.eq("value2");
+            done();
+            return false;
+        };
+        myfaces.oam.submitForm("blarg", null, null, options);
+    });
+    it(("all hidden inputs must be cleared post submit"), function (done) {
+        var options = { "booga1": "value1", "booga2": "value2" };
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga1").length).to.eq(1);
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga2").length).to.eq(1);
+            return false;
+        };
+        myfaces.oam.submitForm("blarg", null, null, options);
+        (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga1").length).to.eq(0);
+        (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg #booga2").length).to.eq(0);
+        done();
+    });
+    it(("must handle linkid correctly, associative array"), function (done) {
+        var options = { "booga1": "value1", "booga2": "value2" };
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)(mona_dish_1.DQ.byId("blarg:_idcl").inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        myfaces.oam.submitForm("blarg", "bla", null, options);
+    });
+    it(("must handle target correctly, associative array"), function (done) {
+        var options = { "booga1": "value1", "booga2": "value2" };
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)((0, mona_dish_1.DQ$)("#blarg").attr("target").value).to.eq("target1");
+            done();
+            return false;
+        };
+        myfaces.oam.submitForm("blarg", "bla", "target1", options);
+    });
+    it(("must handle limited parameters"), function (done) {
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)(mona_dish_1.DQ.byId("blarg:_idcl").inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        try {
+            myfaces.oam.submitForm("blarg", "bla");
+        }
+        catch (e) {
+            done(e);
+        }
+    });
+    it(("must handle limited parameters 2"), function (done) {
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)(mona_dish_1.DQ.byId("blarg:_idcl").inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        try {
+            myfaces.oam.submitForm("blarg", "bla", null);
+        }
+        catch (e) {
+            done(e);
+        }
+    });
+    it(("must handle limited parameters 3"), function (done) {
+        mona_dish_1.DQ.byId("blarg")
+            .getAsElem(0).value.onsubmit = function (evt) {
+            (0, chai_1.expect)(mona_dish_1.DQ.byId("blarg:_idcl").inputValue.value).to.eq("bla");
+            done();
+            return false;
+        };
+        try {
+            myfaces.oam.submitForm("blarg", "bla", null, null);
+        }
+        catch (e) {
+            done(e);
+        }
+    });
+});
+//# sourceMappingURL=OamSubmitTest.spec.js.map

package/target/test/xhrCore/OamSubmitTest.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OamSubmitTest.spec.js","sourceRoot":"","sources":["../../../src/main/typescript/test/xhrCore/OamSubmitTest.spec.ts"],"names":[],"mappings":"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"}