@schukai/monster 3.19.0 → 3.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schukai/monster",
-  "version": "3.19.0",
+  "version": "3.21.0",
   "description": "Monster is a simple library for creating fast, robust and lightweight websites.",
   "keywords": [
     "framework",

package/source/data/transformer.mjs

@@ -186,33 +186,33 @@ function transform(value) {
         case "tolowercase":
             validateString(value);
             return value.toLowerCase();
-            
+
         case "contains":
             if (isString(value)) {
-                return value.includes(args[0]);    
+                return value.includes(args[0]);
             }
-            
+
             if (isArray(value)) {
                 return value.includes(args[0]);
             }
-            
+
             if (isObject(value)) {
                 return value.hasOwnProperty(args[0]);
             }
-            
+
+            return false;
+
+        case "has-entries":
+        case "hasentries":
+            if (isObject(value)) {
+                return Object.keys(value).length > 0;
+            }
+
+            if (isArray(value)) {
+                return value.length > 0;
+            }
+
             return false;
-            
-            case "has-entries":
-            case "hasentries":
-                if (isObject(value)) {
-                    return Object.keys(value).length > 0;
-                }
-                
-                if (isArray(value)) {
-                    return value.length > 0;
-                }
-                
-                return false;
 
         case "isundefined":
         case "is-undefined":
@@ -576,7 +576,45 @@ function transform(value) {
 
             return map.get(value);
 
-        case "money":    
+        case "equals":
+
+            if (args.length === 0) {
+                throw new Error("missing value parameter");
+            }
+
+            validatePrimitive(value);
+
+            const equalsValue = args.shift();
+
+            /**
+             * The history of “typeof null”
+             * https://2ality.com/2013/10/typeof-null.html
+             * In JavaScript, typeof null is 'object', which incorrectly suggests
+             * that null is an object.
+             */
+            if (value === null) {
+                if (equalsValue === "null") {
+                    return true;
+                }
+                return false;
+            }
+
+            const typeOfValue = typeof value;
+
+            switch (typeOfValue) {
+                case "string":
+                    return value === equalsValue;
+                case "number":
+                    return value === parseFloat(equalsValue);
+                case "boolean":
+                    return value === (equalsValue === "true" || equalsValue === "on");
+                case "undefined":
+                    return equalsValue === "undefined";
+                default:
+                    throw new Error("type not supported");
+            }
+
+        case "money":
         case "currency":
 
             try {
@@ -584,24 +622,24 @@ function transform(value) {
             } catch (e) {
                 throw new Error("unsupported locale or missing format (" + e.message + ")");
             }
-            
+
             const currency = value.substring(0, 3);
-            if(!currency) {
+            if (!currency) {
                 throw new Error("missing currency parameter");
             }
-            
+
             const maximumFractionDigits = args?.[0] || 2;
             const roundingIncrement = args?.[1] || 5;
-            
+
             const nf = new Intl.NumberFormat(locale, {
                 style: "currency",
                 currency: currency,
                 maximumFractionDigits: maximumFractionDigits,
                 roundingIncrement: roundingIncrement,
             });
-            
+
             return nf.format(value.substring(3));
-            
+
         case "timestamp":
             date = new Date(value);
             timestamp = date.getTime();
@@ -637,7 +675,7 @@ function transform(value) {
             } catch (e) {
                 throw new Error("unsupported locale or missing format (" + e.message + ")");
             }
-            
+
         case "date":
             date = new Date(value);
             if (isNaN(date.getTime())) {
@@ -651,7 +689,7 @@ function transform(value) {
             } catch (e) {
                 throw new Error("unsupported locale or missing format (" + e.message + ")");
             }
-            
+
 
         case "year":
             date = new Date(value);

package/source/dom/constants.mjs

@@ -16,6 +16,7 @@ export {
     ATTRIBUTE_UPDATER_SELECT_THIS,
     ATTRIBUTE_UPDATER_REPLACE,
     ATTRIBUTE_UPDATER_INSERT,
+    ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID,
     ATTRIBUTE_UPDATER_INSERT_REFERENCE,
     ATTRIBUTE_UPDATER_REMOVE,
     ATTRIBUTE_UPDATER_BIND,
@@ -142,6 +143,14 @@ const ATTRIBUTE_UPDATER_REPLACE = `${ATTRIBUTE_PREFIX}replace`;
  */
 const ATTRIBUTE_UPDATER_INSERT = `${ATTRIBUTE_PREFIX}insert`;
 
+/**
+ * @memberOf Monster.DOM
+ * @type {string}
+ * @license AGPLv3
+ * @since 3.21.0
+ */
+const ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID = `${ATTRIBUTE_UPDATER_INSERT}-template-id`;
+
 /**
  * @memberOf Monster.DOM
  * @type {string}

package/source/dom/updater.mjs

@@ -5,10 +5,10 @@
  * License text available at https://www.gnu.org/licenses/agpl-3.0.en.html
  */
 
-import { internalSymbol } from "../constants.mjs";
-import { diff } from "../data/diff.mjs";
-import { Pathfinder } from "../data/pathfinder.mjs";
-import { Pipe } from "../data/pipe.mjs";
+import {internalSymbol} from "../constants.mjs";
+import {diff} from "../data/diff.mjs";
+import {Pathfinder} from "../data/pathfinder.mjs";
+import {Pipe} from "../data/pipe.mjs";
 import {
     ATTRIBUTE_ERRORMESSAGE,
     ATTRIBUTE_UPDATER_ATTRIBUTES,
@@ -18,22 +18,21 @@ import {
     ATTRIBUTE_UPDATER_REMOVE,
     ATTRIBUTE_UPDATER_REPLACE,
     ATTRIBUTE_UPDATER_SELECT_THIS,
-    customElementUpdaterLinkSymbol,
+    ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID
 } from "../dom/constants.mjs";
 
-import { Base } from "../types/base.mjs";
-import { isArray, 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 { addToObjectLink } from "./attributes.mjs";
-import { findTargetElementFromEvent } from "./events.mjs";
-import { findDocumentTemplate } from "./template.mjs";
-import { getDocument } from "./util.mjs";
+import {Base} from "../types/base.mjs";
+import {isArray, 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 {addToObjectLink} from "./attributes.mjs";
+import {findTargetElementFromEvent} from "./events.mjs";
+import {findDocumentTemplate} from "./template.mjs";
 
-export { Updater, addObjectWithUpdaterToElement };
+export {Updater, addObjectWithUpdaterToElement};
 
 /**
  * The updater class connects an object with the dom. In this way, structures and contents in the DOM can be programmatically adapted via attributes.
@@ -174,7 +173,7 @@ class Updater extends Base {
     run() {
         // the key __init__has no further meaning and is only
         // used to create the diff for empty objects.
-        this[internalSymbol].last = { __init__: true };
+        this[internalSymbol].last = {__init__: true};
         return this[internalSymbol].subject.notifyObservers();
     }
 
@@ -323,7 +322,7 @@ function retrieveAndSetValue(element) {
 
                 let options = element?.selectedOptions;
                 if (options === undefined) options = element.querySelectorAll(":scope option:checked");
-                value = Array.from(options).map(({ value }) => value);
+                value = Array.from(options).map(({value}) => value);
 
                 break;
         }
@@ -400,7 +399,6 @@ function removeElement(change) {
 function insertElement(change) {
     const self = this;
     const subject = self[internalSymbol].subject.getRealSubject();
-    const document = getDocument();
 
     let mem = new WeakSet();
     let wd = 0;
@@ -516,6 +514,30 @@ function insertElement(change) {
     }
 }
 
+function findTemplate(container, key, ref, path) {
+    
+    let templateID = key;
+    let template;
+    
+    if (container.hasAttribute(ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID)) {
+        templateID = container.getAttribute(ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID);
+        template = findDocumentTemplate(templateID, container);
+        if (template instanceof HTMLTemplateElement) {
+            return template;
+        }
+    }
+    
+    if (container.closest(`[${ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID}]`)) {
+        templateID = container.closest(`[${ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID}]`).getAttribute(ATTRIBUTE_UPDATER_INSERT_TEMPLATE_ID);
+        template = findDocumentTemplate(templateID, container);
+        if (template instanceof HTMLTemplateElement) {
+            return template;
+        }
+    }
+
+    return findDocumentTemplate(templateID, container);
+}
+
 /**
  *
  * @private
@@ -528,8 +550,9 @@ function insertElement(change) {
  * @throws {Error} no template was found with the specified key.
  */
 function appendNewDocumentFragment(container, key, ref, path) {
-    let template = findDocumentTemplate(key, container);
 
+    let template = findTemplate(container, key, ref, path);
+console.log(template);
     let nodes = template.createDocumentFragment();
     for (const [, node] of Object.entries(nodes.childNodes)) {
         if (node instanceof HTMLElement) {

package/source/types/version.mjs

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

package/test/cases/data/transformer.mjs

@@ -28,6 +28,26 @@ describe('Transformer', function () {
     describe('Transformer.run()', function () {
 
         [
+            ['equals:a', "a", true],
+            ['equals:a', "b", false],
+            ['equals:3', 3, true],
+            ['equals:3', 6, false],
+            ['equals:on', true, true],
+            ['equals:true', true, true],
+            ['equals:on', false, false],
+            ['equals:true', false, false],
+            ['equals:off', false, true],
+            ['equals:false', false, true],
+            ['equals:off', false, true],
+            ['equals:false', true, false],
+            ['equals:3', 3, true],
+            ['equals:3', 6, false],
+            ['equals:undefined', undefined, true],
+            ['equals:undefined', 3, false],
+            ['equals:null', null, true],
+            ['equals:null', 3, false],
+            ['equals:3', 6, false],
+            ['currency', "EUR0", "0,00 €"],
             ['currency:1:2', "EUR14.25", "14,2 €"],
             ['currency', "EUR14.25", "14,25 €"],
             ['datetime', "2023-02-14 14:12:10", "14.2.2023, 14:12:10"],

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.19.0")
+        monsterVersion = new Version("3.21.0")
 
         let m = getMonsterVersion();