@schukai/monster 3.102.5 → 3.103.0

package/source/dom/updater.mjs

@@ -29,20 +29,33 @@ import {
 } from "./constants.mjs";
 
 import {Base} from "../types/base.mjs";
-import {isArray, isString, isInstance, isIterable} from "../types/is.mjs";
+import {isArray, isInteger, isString, isInstance, isIterable} from "../types/is.mjs";
 import {Observer} from "../types/observer.mjs";
 import {ProxyObserver} from "../types/proxyobserver.mjs";
 import {validateArray, validateInstance} from "../types/validate.mjs";
 import {clone} from "../util/clone.mjs";
 import {trimSpaces} from "../util/trimspaces.mjs";
 import {addAttributeToken, addToObjectLink} from "./attributes.mjs";
-import {CustomElement, updaterTransformerMethodsSymbol} from "./customelement.mjs";
+import {
+    CustomElement,
+    updaterTransformerMethodsSymbol,
+} from "./customelement.mjs";
 import {findTargetElementFromEvent} from "./events.mjs";
 import {findDocumentTemplate} from "./template.mjs";
 import {getWindow} from "./util.mjs";
+import {DeadMansSwitch} from "../util/deadmansswitch.mjs";
+import {addErrorAttribute, removeErrorAttribute} from "./error.mjs";
+
 
 export {Updater, addObjectWithUpdaterToElement};
 
+
+/**
+ * @private
+ * @type {symbol}
+ */
+const timerElementEventHandlerSymbol = Symbol("timerElementEventHandler");
+
 /**
  * The updater class connects an object with the DOM. In this way, structures and contents in the DOM can be
  * programmatically adapted via attributes.
@@ -306,11 +319,20 @@ function getControlEventHandler() {
             return;
         }
 
-        queueMicrotask(() => {
+        if (this[timerElementEventHandlerSymbol] instanceof DeadMansSwitch) {
+            try {
+                this[timerElementEventHandlerSymbol].touch();
+                return;
+            } catch (e) {
+                delete this[timerElementEventHandlerSymbol];
+            }
+        }
+
+        this[timerElementEventHandlerSymbol] = new DeadMansSwitch(50, () => {
             try {
                 retrieveAndSetValue.call(this, element);
             } catch (e) {
-                addAttributeToken(element, ATTRIBUTE_ERRORMESSAGE, e.message || `${e}`);
+                addErrorAttribute(element, e);
             }
         });
     };
@@ -380,62 +402,109 @@ function retrieveAndSetValue(element) {
         throw new Error("unsupported object");
     }
 
-    if (isString(value)) {
-        const type = element.getAttribute(ATTRIBUTE_UPDATER_BIND_TYPE);
-        switch (type) {
-            case "number":
-            case "int":
-            case "float":
-            case "integer":
-                value = Number(value);
-                if (isNaN(value)) {
-                    value = 0;
+    const type = element.getAttribute(ATTRIBUTE_UPDATER_BIND_TYPE);
+    switch (type) {
+        case "number":
+        case "int":
+        case "float":
+        case "integer":
+            value = Number(value);
+            if (isNaN(value)) {
+                value = 0;
+            }
+            break;
+        case "boolean":
+        case "bool":
+        case "checkbox":
+            value = value === "true" || value === "1" || value === "on" || value === true;
+            break;
+
+        case "string[]":
+            if (isString(value)) {
+
+                if (value.trim() === "") {
+                    value = [];
+                } else {
+                    value = value.split(",").map((v) => `${v}`);
                 }
-                break;
-            case "boolean":
-            case "bool":
-            case "checkbox":
-                value = value === "true" || value === "1" || value === "on";
-                break;
+            } else if (isInteger(value)) {
+                value = [`${value}`];
+            } else if (value === undefined || value === null) {
+                value = [];
+            } else if (isArray(value)) {
+                value = value.map((v) => `${v}`);
+            } else {
+                throw new Error("unsupported value");
+            }
+
+            break;
 
-            case "string[]":
-                if (value === "") {
+        case "int[]":
+        case "integer[]":
+
+            if (isString(value)) {
+
+                if (value.trim() === "") {
                     value = [];
+                } else {
+                    value = value.split(",").map((v) => {
+                        try {
+                            return parseInt(v, 10);
+                        } catch (e) {
+                        }
+                        return -1;
+                    }).filter((v) => v !== -1);
                 }
 
-                value = value.split(",").map((v) => `${v}`);
-                break;
+            } else if (isInteger(value)) {
+                value = [value];
+            } else if (value === undefined || value === null) {
+                value = [];
+            } else if (isArray(value)) {
+                value = value.split(",").map((v) => {
+                    try {
+                        return parseInt(v, 10);
+                    } catch (e) {
+                    }
+                    return -1;
+                }).filter((v) => v !== -1);
+            } else {
+                throw new Error("unsupported value");
+            }
+
+            break;
+        case "[]":
+        case "array":
+        case "list":
 
-            case "int[]":
-            case "integer[]":
-                if (value === "") {
+            if (isString(value)) {
+                if (value.trim() === "") {
                     value = [];
                 } else {
-                    value = value
-                        .split(",")
-                        .map((v) => {
-                            try {
-                                return parseInt(v, 10);
-                            } catch (e) {
-                            }
-                            return -1;
-                        })
-                        .filter((v) => v !== -1);
+                    value = value.split(",");
                 }
+            } else if (isInteger(value)) {
+                value = [value];
+            } else if (value === undefined || value === null) {
+                value = [];
+            } else if (isArray(value)) {
+                // nothing to do
+            } else {
+                throw new Error("unsupported value for array");
+            }
+            break;
+        case "object":
+        case "json":
 
-                break;
-            case "[]":
-            case "array":
-            case "list":
-                value = value.split(",");
-                break;
-            case "object":
-            case "json":
+            if (isString(value)) {
                 value = JSON.parse(value);
-                break;
-            default:
-                break;
-        }
+            } else {
+                throw new Error("unsupported value for object");
+            }
+
+            break;
+        default:
+            break;
     }
 
     const copy = clone(this[internalSymbol].subject.getRealSubject());
@@ -558,7 +627,7 @@ function insertElement(change) {
                     containerElement.removeAttribute(ATTRIBUTE_ERRORMESSAGE);
                     value = pipe.run(subject);
                 } catch (e) {
-                    containerElement.setAttribute(ATTRIBUTE_ERRORMESSAGE, e.message);
+                    addErrorAttribute(containerElement, e);
                 }
 
                 const dataPath = cmd.split(":").pop();
@@ -604,12 +673,7 @@ function insertElement(change) {
                         try {
                             containerElement.removeChild(node);
                         } catch (e) {
-                            containerElement.setAttribute(
-                                ATTRIBUTE_ERRORMESSAGE,
-                                `${containerElement.getAttribute(ATTRIBUTE_ERRORMESSAGE)}, ${
-                                    e.message
-                                }`.trim(),
-                            );
+                            addErrorAttribute(containerElement, e);
                         }
                     }
                 }
@@ -660,27 +724,32 @@ function appendNewDocumentFragment(container, key, ref, path) {
  * @return {void}
  */
 function applyRecursive(node, key, path) {
-    if (node instanceof HTMLElement) {
-        if (node.hasAttribute(ATTRIBUTE_UPDATER_REPLACE)) {
-            const value = node.getAttribute(ATTRIBUTE_UPDATER_REPLACE);
-            node.setAttribute(
-                ATTRIBUTE_UPDATER_REPLACE,
-                value.replaceAll(`path:${key}`, `path:${path}`),
-            );
-        }
+    if (!(node instanceof HTMLElement)) {
+        return
+    }
 
-        if (node.hasAttribute(ATTRIBUTE_UPDATER_ATTRIBUTES)) {
-            const value = node.getAttribute(ATTRIBUTE_UPDATER_ATTRIBUTES);
-            node.setAttribute(
-                ATTRIBUTE_UPDATER_ATTRIBUTES,
-                value.replaceAll(`path:${key}`, `path:${path}`),
-            );
-        }
+    if (node.hasAttribute(ATTRIBUTE_UPDATER_REPLACE)) {
+        const value = node.getAttribute(ATTRIBUTE_UPDATER_REPLACE);
+        node.setAttribute(
+            ATTRIBUTE_UPDATER_REPLACE,
+            value.replaceAll(`path:${key}`, `path:${path}`),
+        );
+    }
 
-        for (const [, child] of Object.entries(node.childNodes)) {
+    if (node.hasAttribute(ATTRIBUTE_UPDATER_ATTRIBUTES)) {
+        const value = node.getAttribute(ATTRIBUTE_UPDATER_ATTRIBUTES);
+        node.setAttribute(
+            ATTRIBUTE_UPDATER_ATTRIBUTES,
+            value.replaceAll(`path:${key}`, `path:${path}`),
+        );
+    }
+
+    for (const [, child] of Object.entries(node.childNodes)) {
+        if (child instanceof HTMLElement) {
             applyRecursive(child, key, path);
         }
     }
+
 }
 
 /**
@@ -768,12 +837,7 @@ function runUpdateContent(container, parts, subject) {
                 try {
                     element.appendChild(value);
                 } catch (e) {
-                    element.setAttribute(
-                        ATTRIBUTE_ERRORMESSAGE,
-                        `${element.getAttribute(ATTRIBUTE_ERRORMESSAGE)}, ${
-                            e.message
-                        }`.trim(),
-                    );
+                    addErrorAttribute(element, e);
                 }
             } else {
                 element.innerHTML = value;
@@ -854,7 +918,7 @@ function runUpdateAttributes(container, parts, subject) {
                     element.removeAttribute(ATTRIBUTE_ERRORMESSAGE);
                     value = pipe.run(subject);
                 } catch (e) {
-                    element.setAttribute(ATTRIBUTE_ERRORMESSAGE, e.message);
+                    addErrorAttribute(element, e);
                 }
 
                 if (value === undefined) {
@@ -879,7 +943,6 @@ function runUpdateAttributes(container, parts, subject) {
  */
 
 function handleInputControlAttributeUpdate(element, name, value) {
-
     if (element instanceof HTMLSelectElement) {
         switch (element.type) {
             case "select-multiple":
@@ -920,7 +983,6 @@ function handleInputControlAttributeUpdate(element, name, value) {
                     element.value = value === undefined ? "" : value;
                 }
                 break;
-
         }
     } else if (element instanceof HTMLTextAreaElement) {
         if (name === "value") {
@@ -979,18 +1041,13 @@ function addObjectWithUpdaterToElement(elements, symbol, object, config = {}) {
                 if (typeof callback === "function") {
                     updaterCallbacks.push([name, callback]);
                 } else {
-                    addAttributeToken(
-                        this,
-                        ATTRIBUTE_ERRORMESSAGE,
-                        `onUpdaterPipeCallbacks: ${name} is not a function`,
-                    );
+                    addErrorAttribute(this, `onUpdaterPipeCallbacks: ${name} is not a function`);
                 }
             }
         } else {
-            addAttributeToken(
+            addErrorAttribute(
                 this,
-                ATTRIBUTE_ERRORMESSAGE,
-                `onUpdaterPipeCallbacks do not return an object with functions`,
+                `onUpdaterPipeCallbacks do not return an object with functions`
             );
         }
     }

package/source/types/version.mjs

@@ -156,7 +156,7 @@ function getMonsterVersion() {
 	}
 
 	/** don't touch, replaced by make with package.json version */
-	monsterVersion = new Version("3.102.3");
+	monsterVersion = new Version("3.102.6");
 
 	return monsterVersion;
 }

package/test/cases/monster.mjs

@@ -7,7 +7,7 @@ describe('Monster', function () {
         let monsterVersion
 
         /** don´t touch, replaced by make with package.json version */
-        monsterVersion = new Version("3.102.3")
+        monsterVersion = new Version("3.102.6")
 
         let m = getMonsterVersion();
 

package/test/web/test.html

@@ -9,8 +9,8 @@
 </head>
 <body>
 <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
-  <h1 style='margin-bottom: 0.1em;'>Monster 3.102.3</h1>
-  <div id="lastupdate" style='font-size:0.7em'>last update Mi 29. Jan 14:48:17 CET 2025</div>
+  <h1 style='margin-bottom: 0.1em;'>Monster 3.102.6</h1>
+  <div id="lastupdate" style='font-size:0.7em'>last update So 2. Feb 23:18:18 CET 2025</div>
 </div>
 <div id="mocha-errors"
      style="color: red;font-weight: bold;display: flex;align-items: center;justify-content: center;flex-direction: column;margin:20px;"></div>