npm - jsf.js_next_gen - Versions diffs - 4.0.1-beta.6 → 4.0.1-beta.7 - Mend

jsf.js_next_gen 4.0.1-beta.6 → 4.0.1-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (175) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.1-beta.6",
+  "version": "4.0.1-beta.7",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.14.6",
+    "@types/node": "^18.15.5",
     "@types/sinon": "^10.0.13",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "chai": "^4.3.7",
@@ -31,24 +31,24 @@
     "cross-env": "^7.0.3",
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
-    "jsdom": "^21.1.0",
+    "jsdom": "^21.1.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.7.10",
+    "npm-check-updates": "^16.7.13",
     "nyc": "^15.1.0",
     "replace-in-file": "^6.3.5",
     "rxjs": "^7.8.0",
-    "sinon": "^15.0.1",
+    "sinon": "^15.0.2",
     "terser-webpack-plugin": "^5.3.7",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.26",
-    "typescript": "^4.9.5",
-    "webpack": "^5.76.0",
+    "typedoc": "^0.23.28",
+    "typescript": "^5.0.2",
+    "webpack": "^5.76.2",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
+    "webpack-dev-server": "^4.13.1"
   },
   "dependencies": {
-    "mona-dish": "0.28.3"
+    "mona-dish": "0.28.7"
   }
 }

package/src/main/typescript/impl/xhrCore/XhrRequest.ts CHANGED Viewed

@@ -41,7 +41,7 @@ import {
     STATE_EVT_TIMEOUT,
     STD_ACCEPT,
     URL_ENCODED,
-    VAL_AJAX, IDENT_NONE, CTX_PARAM_SRC_FRM_ID, CTX_PARAM_SRC_CTL_ID, CTX_PARAM_PPS, SERVER_ERROR
+    VAL_AJAX, IDENT_NONE, CTX_PARAM_SRC_FRM_ID, CTX_PARAM_SRC_CTL_ID, CTX_PARAM_PPS
 } from "../core/Const";
 import {
     resolveFinalUrl,

package/src/main/typescript/test/frameworkBase/_ext/monadish/DomQueryTest.spec.ts CHANGED Viewed

@@ -567,7 +567,7 @@ describe('DOMQuery tests', function () {
         expect(content.byId("third").innerHTML).to.eq("hello world");
         expect(content.byId("fourth").innerHTML).to.eq("hello world");
-        expect(DomQuery.byTagName("head")
+        expect(DomQuery.byTagName("body")
             .querySelectorAll("link[rel='stylesheet'][href='./fixtures/blank.css']").length).to.eq(1);
         done();

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

@@ -145,6 +145,92 @@ export module StandardInits {
  </body>
 </html>`;
+    export const HTML_TOBAGO_SHEET_WITH_STYLE = `<!DOCTYPE html>
+<html lang='de'>
+<head>
+  <meta charset='UTF-8'>
+  <meta name='viewport' content='width=device-width, initial-scale=1.0'>
+  <title>Test
+  </title>
+  <link rel='stylesheet' href='./fixtures/css/tobago.css' type='text/css'>
+  <link rel='stylesheet' href='./fixtures/css/bootstrap-icons.css' type='text/css'>
+  <script src='./fixtures/jakarta.faces.resource/faces.js.jsf' type='text/javascript'></script>
+  <script src='./fixtures/js/tobago.js' type='module'></script>
+</head>
+<body>
+<tobago-page locale='de' class='container-fluid' id='page' focus-on-error='true' wait-overlay-delay-full='1000'
+             wait-overlay-delay-ajax='1000'>
+  <form action='/content/080-sheet/30-event/Sheet_Event.xhtml' id='page::form' method='post'
+        accept-charset='UTF-8' data-tobago-context-path=''>
+    <input type='hidden' name='javax.faces.source' id='javax.faces.source' disabled='disabled'>
+    <tobago-focus id='page::lastFocusId'>
+      <input type='hidden' name='page::lastFocusId' id='page::lastFocusId::field'>
+    </tobago-focus>
+    <input type='hidden' name='org.apache.myfaces.tobago.webapp.Secret' id='org.apache.myfaces.tobago.webapp.Secret'
+           value='secretValue'>
+    <div class='tobago-page-menuStore'>
+    </div>
+    <span id='page::jsf-state-container'><input type='hidden' name='javax.faces.ViewState'
+                                                id='j_id__v_0:javax.faces.ViewState:1'
+                                                value='viewStateValue' autocomplete='off'><input
+            type='hidden' name='javax.faces.RenderKitId' value='tobago'><input type='hidden'
+                                                                               id='j_id__v_0:javax.faces.ClientWindow:1'
+                                                                               name='javax.faces.ClientWindow'
+                                                                               value='clientWindowValue'></span>
+    <button type='button' id='page:ajaxButton' name='page:ajaxButton'
+            class='tobago-button btn btn-secondary tobago-auto-spacing'>
+      <tobago-behavior event='click' client-id='page:ajaxButton' execute='page:ajaxButton'
+                       render='page:s1'></tobago-behavior>
+      <span>Ajax</span></button>
+    <tobago-sheet id='page:s1' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='2'>
+      <style nonce='nonceValue' id='page:s1:j_id_4'>#page\\:s1 {
+        max-height: 500px;
+      }
+      </style>
+      <input id='page:s1::scrollPosition' name='page:s1::scrollPosition' type='hidden' value='[0,0]'>
+      <input id='page:s1::selected' name='page:s1::selected' type='hidden' value='[]'>
+      <div class='tobago-body'>
+        <table cellspacing='0' cellpadding='0' summary='' class='table'>
+          <thead>
+          <tr>
+            <th>
+              <span><tobago-out id='page:s1:_col0'><span class='form-control-plaintext'>Name</span></tobago-out></span>
+            </th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr row-index='0'>
+            <td>
+              <tobago-out id='page:s1:0:t_name'><span class='form-control-plaintext'>Earth</span></tobago-out>
+            </td>
+            <td>
+              <div>
+              </div>
+            </td>
+          </tr>
+          <tr row-index='1'>
+            <td>
+              <tobago-out id='page:s1:1:t_name'><span class='form-control-plaintext'>Moon</span></tobago-out>
+            </td>
+            <td>
+              <div>
+              </div>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </tobago-sheet>
+  </form>
+  <noscript>
+    <div class='tobago-page-noscript'>Diese Seite benötigt JavaScript, allerdings ist JavaScript in Ihrem Browser
+      derzeit deaktiviert. Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
+    </div>
+  </noscript>
+</tobago-page>
+</body>
+</html>`;
     /**
      * a page simulating basically a simple faces form
      */

package/src/main/typescript/test/frameworkBase/_ext/shared/XmlResponses.ts CHANGED Viewed

@@ -26,6 +26,59 @@ export class XmlResponses {
     </partial-response>
     `;
+    static UPDATE_TOBAGO_SHEET_WITH_STYLE = `<?xml version="1.0" encoding="UTF-8"?>
+<partial-response id='j_id__v_0'>
+  <changes>
+    <update id='page:s1'><![CDATA[
+      <tobago-sheet id='page:s1' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='2'>
+        <style nonce='nonceValue' id='page:s1:j_id_4'>#page\\:s1 {
+          max-height: 500px;
+        }
+        </style>
+        <input id='page:s1::scrollPosition' name='page:s1::scrollPosition' type='hidden' value='[0,0]'/>
+        <input id='page:s1::selected' name='page:s1::selected' type='hidden' value='[]'/>
+        <div class='tobago-body'>
+          <table cellspacing='0' cellpadding='0' summary='' class='table'>
+            <thead>
+            <tr>
+              <th>
+                <span><tobago-out id='page:s1:_col0'><span
+                        class='form-control-plaintext'>Name</span></tobago-out></span>
+              </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr row-index='0'>
+              <td>
+                <tobago-out id='page:s1:0:t_name'><span class='form-control-plaintext'>Earth</span></tobago-out>
+              </td>
+              <td>
+                <div>
+                </div>
+              </td>
+            </tr>
+            <tr row-index='1'>
+              <td>
+                <tobago-out id='page:s1:1:t_name'><span class='form-control-plaintext'>Moon</span></tobago-out>
+              </td>
+              <td>
+                <div>
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </tobago-sheet>
+      ]]>
+    </update>
+    <update id='j_id__v_0:javax.faces.ViewState:1'><![CDATA[viewStateValue]]>
+    </update>
+    <update id='j_id__v_0:javax.faces.ClientWindow:1'><![CDATA[clientWindowValue]]>
+    </update>
+  </changes>
+</partial-response>`;
     static SHADOW_DOM_UPDATE=`
         <partial-response>
             <changes><update id="shadowContent"><![CDATA[<div id="shadowContent">after update</div>]]></update></changes>

package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/css/bootstrap-icons.css ADDED Viewed

@@ -0,0 +1,15 @@
+/*! 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.
+*/

package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/css/tobago.css ADDED Viewed

@@ -0,0 +1,15 @@
+/*! 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.
+*/

package/src/main/typescript/test/frameworkBase/_ext/shared/fixtures/js/tobago.js ADDED Viewed

@@ -0,0 +1,15 @@
+/*! 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.
+*/

package/src/main/typescript/test/xhrCore/ErrorChainTest.spec.ts CHANGED Viewed

@@ -109,5 +109,28 @@ describe('Tests of the various aspects of the response protocol functionality',
         expect(DQ.byId("form1:out1").innerHTML).to.eq("5");
         done();
     })
+    it("must process the error chain properly with a standard Ajax Error", function (done) {
+        DQ.byId("form1:button1").click();
+        expect(Implementation.requestQueue.queue.length >= 4).to.be.true;
+        for (let cnt = 1; cnt <= 5; cnt++) {
+            if(!Implementation.requestQueue.queue.length) {
+                this.respond(XmlResponses.ERROR_CHAIN_RESPOND_OK(cnt));
+                break;
+            }
+            if (cnt == 3) {
+                //any error suffices
+                this.respond(XmlResponses.ERROR_1);
+            } else {
+                this.respond(XmlResponses.ERROR_CHAIN_RESPOND_OK(cnt))
+            }
+        }
+        expect(Implementation.requestQueue.queue.length).to.eq(0);
+        expect(DQ.byId("errorCalled").innerHTML).to.eq("1");
+        expect(DQ.byId("form1:out1").innerHTML).to.eq("5");
+        done();
+    })
 });

package/src/main/typescript/test/xhrCore/RequestParamsTest.spec.ts CHANGED Viewed

@@ -18,7 +18,7 @@ import {Implementation} from "../../impl/AjaxImpl";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 import protocolPage = StandardInits.protocolPage;
-import {Config, DQ, Stream} from "mona-dish";
+import {Config, DQ} from "mona-dish";
 import {expect} from "chai";
 import HTML_PREFIX_EMBEDDED_BODY = StandardInits.HTML_PREFIX_EMBEDDED_BODY;
 import {it} from "mocha";

package/src/main/typescript/test/xhrCore/ResponseTest23.spec.ts CHANGED Viewed

@@ -359,6 +359,24 @@ describe('Tests of the various aspects of the response protocol functionality',
         expect(DQ.byId("j_id__v_0:javax.faces.ClientWindow:1").isAbsent()).to.be.false;
     });
+    it("<style> element must be in <tobago-sheet> instead of <head>", function () {
+        window.document.documentElement.innerHTML = StandardInits.HTML_TOBAGO_SHEET_WITH_STYLE;
+        expect(DQ.querySelectorAll("head > style").length).to.be.eq(0);
+        expect(DQ.querySelectorAll("body tobago-page tobago-sheet > style").length).to.be.eq(1);
+        jsf.ajax.request(window.document.getElementById("page:ajaxButton"), null, {
+            "jakarta.faces.behavior.event": "click",
+            execute: "page:ajaxButton",
+            render: "page:s1"
+        });
+        this.respond(XmlResponses.UPDATE_TOBAGO_SHEET_WITH_STYLE);
+        expect(DQ.querySelectorAll("head > style").length).to.be.eq(0);
+        expect(DQ.querySelectorAll("body tobago-page tobago-sheet > style").length).to.be.eq(1);
+    });
     it("must pass named params properly (tobago testcase)", function(done) {
             window.document.body.innerHTML = HTML_PREFIX_EMBEDDED_BODY;

package/target/AssocArray.js ADDED Viewed

@@ -0,0 +1,281 @@
+"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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shallowMerge = exports.simpleShallowMerge = exports.deepCopy = exports.buildPath = exports.resolve = exports.appendIf = exports.assignIf = exports.append = exports.assign = void 0;
+const Es2019Array_1 = require("./Es2019Array");
+/**
+ * A nop as assign functionality (aka ignore assign)
+ */
+class IgnoreAssign {
+    constructor(parent) {
+        this.parent = parent;
+    }
+    set value(value) {
+    }
+    get value() {
+        return this.parent;
+    }
+}
+;
+/**
+ * uses the known pattern from config
+ * assign(target, key1, key2, key3).value = value;
+ * @param target
+ * @param keys
+ */
+function assign(target, ...accessPath) {
+    if (accessPath.length < 1) {
+        return new IgnoreAssign(target);
+    }
+    const lastPathItem = buildPath(target, ...accessPath);
+    let assigner = new (class {
+        set value(value) {
+            lastPathItem.target[lastPathItem.key] = value;
+        }
+        get value() {
+            return lastPathItem.target[lastPathItem.key];
+        }
+    })();
+    return assigner;
+}
+exports.assign = assign;
+function append(target, ...accessPath) {
+    if (accessPath.length < 1) {
+        return new IgnoreAssign(target);
+    }
+    const lastPathItem = buildPath(target, ...accessPath);
+    let appender = new (class {
+        set value(value) {
+            if (!Array.isArray(value)) {
+                value = [value];
+            }
+            if (!lastPathItem.target[lastPathItem.key]) {
+                lastPathItem.target[lastPathItem.key] = value;
+            }
+            else {
+                if (!Array.isArray(lastPathItem.target[lastPathItem.key])) {
+                    lastPathItem.target[lastPathItem.key] = [lastPathItem.target[lastPathItem.key]];
+                }
+                lastPathItem.target[lastPathItem.key].push(...value);
+            }
+        }
+    })();
+    return appender;
+}
+exports.append = append;
+/**
+ * uses the known pattern from config
+ * assign(target, key1, key2, key3).value = value;
+ * @param target
+ * @param keys
+ */
+function assignIf(condition, target, ...accessPath) {
+    if ((!condition) || accessPath.length < 1) {
+        return new IgnoreAssign(target);
+    }
+    return assign(target, ...accessPath);
+}
+exports.assignIf = assignIf;
+/**
+ * uses the known pattern from config
+ * assign(target, key1, key2, key3).value = value;
+ * @param target
+ * @param keys
+ */
+function appendIf(condition, target, ...accessPath) {
+    if ((!condition) || accessPath.length < 1) {
+        return new IgnoreAssign(target);
+    }
+    return append(target, ...accessPath);
+}
+exports.appendIf = appendIf;
+function resolve(target, ...accessPath) {
+    let ret = null;
+    accessPath = flattenAccessPath(accessPath);
+    let currPtr = target;
+    for (let cnt = 0; cnt < accessPath.length; cnt++) {
+        let accessKeyIndex = accessPath[cnt];
+        accessKeyIndex = arrayIndex(accessKeyIndex) != -1 ? arrayIndex(accessKeyIndex) : accessKeyIndex;
+        currPtr = currPtr === null || currPtr === void 0 ? void 0 : currPtr[accessKeyIndex];
+        if ('undefined' == typeof currPtr) {
+            return null;
+        }
+        ret = currPtr;
+    }
+    return currPtr;
+}
+exports.resolve = resolve;
+function keyVal(key) {
+    let start = key.indexOf("[");
+    if (start >= 0) {
+        return key.substring(0, start);
+    }
+    else {
+        return key;
+    }
+}
+function arrayIndex(key) {
+    let start = key.indexOf("[");
+    let end = key.indexOf("]");
+    if (start >= 0 && end > 0 && start < end) {
+        return parseInt(key.substring(start + 1, end));
+    }
+    else {
+        return -1;
+    }
+}
+function isArrayPos(currKey, arrPos) {
+    return currKey === "" && arrPos >= 0;
+}
+function isNoArray(arrPos) {
+    return arrPos == -1;
+}
+function alloc(arr, length, defaultVal = {}) {
+    let toAdd = [];
+    toAdd.length = length;
+    toAdd[length - 1] = defaultVal;
+    arr.push(...toAdd);
+}
+function flattenAccessPath(accessPath) {
+    return new Es2019Array_1.Es2019Array(...accessPath).flatMap(path => path.split("["))
+        .map(path => path.indexOf("]") != -1 ? "[" + path : path)
+        .filter(path => path != "");
+}
+/**
+ * builds up a path, only done if no data is present!
+ * @param target
+ * @param accessPath
+ * @returns the last assignable entry
+ */
+function buildPath(target, ...accessPath) {
+    accessPath = flattenAccessPath(accessPath);
+    //we now have a pattern of having the array accessors always in separate items
+    let parentPtr = target;
+    let parKeyArrPos = null;
+    let currKey = null;
+    let arrPos = -1;
+    for (let cnt = 0; cnt < accessPath.length; cnt++) {
+        currKey = keyVal(accessPath[cnt]);
+        arrPos = arrayIndex(accessPath[cnt]);
+        //it now is either key or arrPos
+        if (arrPos != -1) {
+            //case root(array)[5] -> root must be array and allocate 5 elements
+            //case root.item[5] root.item must be array and of 5 elements
+            if (!Array.isArray(parentPtr)) {
+                throw Error("Associative array referenced as index array in path reference");
+            }
+            //we need to look ahead for proper allocation
+            //not end reached
+            let nextArrPos = -1;
+            if (cnt < accessPath.length - 1) {
+                nextArrPos = arrayIndex(accessPath[cnt + 1]);
+            }
+            let dataPresent = 'undefined' != typeof (parentPtr === null || parentPtr === void 0 ? void 0 : parentPtr[arrPos]);
+            //no data present check here is needed, because alloc only reserves if not present
+            alloc(parentPtr, arrPos + 1, nextArrPos != -1 ? [] : {});
+            parKeyArrPos = arrPos;
+            //we now go to the reserved element
+            if (cnt == accessPath.length - 1) {
+                parentPtr[arrPos] = (dataPresent) ? parentPtr[arrPos] : null;
+            }
+            else {
+                parentPtr = parentPtr[arrPos];
+            }
+        }
+        else {
+            if (Array.isArray(parentPtr)) {
+                throw Error("Index array referenced as associative array in path reference");
+            }
+            //again look ahead whether the next value is an array or assoc array
+            let nextArrPos = -1;
+            if (cnt < accessPath.length - 1) {
+                nextArrPos = arrayIndex(accessPath[cnt + 1]);
+            }
+            parKeyArrPos = currKey;
+            let dataPresent = 'undefined' != typeof (parentPtr === null || parentPtr === void 0 ? void 0 : parentPtr[currKey]);
+            if (cnt == accessPath.length - 1) {
+                if (!dataPresent) {
+                    parentPtr[currKey] = null;
+                }
+            }
+            else {
+                if (!dataPresent) {
+                    parentPtr[currKey] = nextArrPos == -1 ? {} : [];
+                }
+                parentPtr = parentPtr[currKey];
+            }
+        }
+    }
+    return { target: parentPtr, key: parKeyArrPos };
+}
+exports.buildPath = buildPath;
+function deepCopy(fromAssoc) {
+    return JSON.parse(JSON.stringify(fromAssoc));
+}
+exports.deepCopy = deepCopy;
+/**
+ * simple left to right merge
+ *
+ * @param assocArrays
+ */
+function simpleShallowMerge(...assocArrays) {
+    return shallowMerge(true, false, ...assocArrays);
+}
+exports.simpleShallowMerge = simpleShallowMerge;
+/**
+ * Shallow merge as in config, but on raw associative arrays
+ *
+ * @param overwrite
+ * @param withAppend
+ * @param assocArrays
+ */
+function shallowMerge(overwrite = true, withAppend = false, ...assocArrays) {
+    let target = {};
+    new Es2019Array_1.Es2019Array(...assocArrays).map(arr => {
+        return { arr, keys: Object.keys(arr) };
+    }).forEach(({ arr, keys }) => {
+        keys.forEach(key => {
+            let toAssign = arr[key];
+            if (!Array.isArray(toAssign) && withAppend) {
+                toAssign = new Es2019Array_1.Es2019Array(...[toAssign]);
+            }
+            if (overwrite || !(target === null || target === void 0 ? void 0 : target[key])) {
+                if (!withAppend) {
+                    target[key] = arr[key];
+                }
+                else {
+                    if ('undefined' == typeof (target === null || target === void 0 ? void 0 : target[key])) {
+                        target[key] = toAssign;
+                    }
+                    else if (!Array.isArray(target[key])) {
+                        let oldVal = target[key];
+                        target[key] = new Es2019Array_1.Es2019Array(...[]);
+                        target[key].push(oldVal);
+                        target[key].push(...toAssign);
+                    }
+                    else {
+                        target[key].push(...toAssign);
+                    }
+                }
+            }
+        });
+    });
+    return target;
+}
+exports.shallowMerge = shallowMerge;
+//# sourceMappingURL=AssocArray.js.map

package/target/AssocArray.js.map ADDED Viewed

@@ -0,0 +1 @@

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