@schukai/monster 3.96.1 → 3.96.3

package/source/components/layout/tabs.mjs

@@ -921,8 +921,7 @@ function initTabButtons() {
 	this.setOption("marker", random());
 
 	return adjustButtonVisibility.call(this).then(() => {
-
-		if (!activeReference&& this.getOption("features.openFirst") === true) {
+		if (!activeReference && this.getOption("features.openFirst") === true) {
 			const firstButton = this.getOption("buttons.standard").find(
 				(button) => button.disabled !== true,
 			);

package/source/constants.mjs

@@ -12,7 +12,12 @@
  * SPDX-License-Identifier: AGPL-3.0
  */
 
-export { internalSymbol, internalStateSymbol, instanceSymbol };
+export {
+	internalSymbol,
+	internalStateSymbol,
+	instanceSymbol,
+	proxyInstanceMarker,
+};
 
 /**
  * @private
@@ -35,3 +40,11 @@ const internalStateSymbol = Symbol.for("@schukai/monster/state");
  * @type {symbol}
  */
 const instanceSymbol = Symbol.for("@schukai/monster/instance");
+
+/**
+ * @private
+ * @type {symbol}
+ */
+const proxyInstanceMarker = Symbol.for(
+	"@schukai/monster/proxy-instance-marker",
+);

package/source/data/extend.mjs

@@ -53,7 +53,8 @@ function extend(...args) {
 		for (const k in a) {
 			const v = a?.[k];
 
-			if (v === o?.[k]) {
+			if (k in o && v === o?.[k]) {
+				// k in o is for the case of undefined
 				continue;
 			}
 

package/source/data/transformer.mjs

@@ -265,9 +265,11 @@ function transform(value) {
 			validateString(value);
 			return value.toUpperCase();
 
+		case "to-string":
 		case "tostring":
 			return `${value}`;
 
+		case "to-integer":
 		case "tointeger":
 			const n = parseInt(value);
 			validateInteger(n);

package/source/dom/constants.mjs

@@ -216,7 +216,6 @@ const ATTRIBUTE_FORM_BIND = `${ATTRIBUTE_PREFIX}form-bind`;
  */
 const ATTRIBUTE_FORM_BIND_TYPE = `${ATTRIBUTE_PREFIX}form-bind-type`;
 
-
 /**
  * @type {string}
  * @license AGPLv3

package/source/dom/customelement.mjs

@@ -610,9 +610,13 @@ class CustomElement extends HTMLElement {
 			nodeList = elements;
 		}
 
-		this[updateCloneDataSymbol] = clone(
-			this[internalSymbol].getRealSubject()["options"],
-		);
+		try {
+			this[updateCloneDataSymbol] = clone(
+				this[internalSymbol].getRealSubject()["options"],
+			);
+		} catch (e) {
+			addAttributeToken(this, ATTRIBUTE_ERRORMESSAGE, e?.messages || `${e}`);
+		}
 
 		const cfg = {};
 		if (this.getOption("eventProcessing") === true) {

package/source/dom/updater.mjs

@@ -307,7 +307,11 @@ function getControlEventHandler() {
 		}
 
 		queueMicrotask(() => {
-			retrieveAndSetValue.call(this, element);
+			try {
+				retrieveAndSetValue.call(this, element);
+			} catch (e) {
+				addAttributeToken(element, ATTRIBUTE_ERRORMESSAGE, e.message || `${e}`);
+			}
 		});
 	};
 

package/source/monster.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright © schukai GmbH and all contributing authors, 2024. All rights reserved.
+ * Copyright © schukai GmbH and all contributing authors, 2025. All rights reserved.
  * Node module: @schukai/monster
  *
  * This source code is licensed under the GNU Affero General Public License version 3 (AGPLv3).

package/source/text/formatter.mjs

@@ -276,7 +276,10 @@ function format(text) {
  * @private
  * @license AGPLv3
  * @since 1.12.0
- * @param text
+ *
+ * @param {string} text
+ * @param {string} openMarker
+ * @param {string} closeMarker
  * @return {string}
  */
 function tokenize(text, openMarker, closeMarker) {
@@ -339,7 +342,7 @@ function tokenize(text, openMarker, closeMarker) {
 		const t1 = key.split("|").shift().trim(); // pipe symbol
 		const t2 = t1.split("::").shift().trim(); // key value delimiter
 		const t3 = t2.split(".").shift().trim(); // path delimiter
-		const prefix = this[workingDataSymbol]?.[t3] ? "path:" : "static:";
+		const prefix = t3 in this[workingDataSymbol] ? "path:" : "static:";
 
 		let command = "";
 		if (
@@ -362,7 +365,6 @@ function tokenize(text, openMarker, closeMarker) {
 		}
 
 		formatted.push(validateString(pipe.run(this[workingDataSymbol])));
-
 		text = text.substring(endIndex + closeMarker.length);
 	}
 

package/source/types/is.mjs

@@ -12,6 +12,8 @@
  * SPDX-License-Identifier: AGPL-3.0
  */
 
+import { proxyInstanceMarker } from "../constants.mjs";
+
 export {
 	isIterable,
 	isPrimitive,
@@ -23,8 +25,19 @@ export {
 	isArray,
 	isFunction,
 	isInteger,
+	isProxy,
 };
 
+/**
+ * Checks whether the value passed is a Proxy.
+ *
+ * @param {*} value
+ * @returns {boolean}
+ */
+function isProxy(value) {
+	return value?.[proxyInstanceMarker] === proxyInstanceMarker;
+}
+
 /**
  * With this function you can check if a value is iterable.
  *

package/source/types/proxyobserver.mjs

@@ -18,7 +18,7 @@ import { Observer } from "./observer.mjs";
 import { ObserverList } from "./observerlist.mjs";
 import { validateObject } from "./validate.mjs";
 import { extend } from "../data/extend.mjs";
-import { instanceSymbol } from "../constants.mjs";
+import { instanceSymbol, proxyInstanceMarker } from "../constants.mjs";
 import { clone } from "../util/clone.mjs";
 export { ProxyObserver };
 
@@ -74,7 +74,7 @@ class ProxyObserver extends Base {
 	/**
 	 * @since 1.24.0
 	 * @param {Object} obj
-	 * @return {Monster.Types.ProxyObserver}
+	 * @return {ProxyObserver}
 	 */
 	setSubject(obj) {
 		let i;
@@ -152,6 +152,11 @@ function getHandler() {
 	const handler = {
 		// https://262.ecma-international.org/9.0/#sec-proxy-object-internal-methods-and-internal-slots-get-p-receiver
 		get: function (target, key, receiver) {
+			// this is an internal hack to identify proxy
+			if (key === proxyInstanceMarker) {
+				return proxyInstanceMarker;
+			}
+
 			const value = Reflect.get(target, key, receiver);
 
 			if (typeof key === "symbol") {

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.95.2");
+	monsterVersion = new Version("3.96.2");
 
 	return monsterVersion;
 }

package/source/util/clone.mjs

@@ -13,7 +13,13 @@
  */
 
 import { getGlobal } from "../types/global.mjs";
-import { isArray, isFunction, isObject, isPrimitive } from "../types/is.mjs";
+import {
+	isArray,
+	isFunction,
+	isObject,
+	isPrimitive,
+	isProxy,
+} from "../types/is.mjs";
 import { typeOf } from "../types/typeof.mjs";
 import { validateObject } from "../types/validate.mjs";
 
@@ -71,8 +77,7 @@ function clone(obj) {
 
 		/** Do not clone DOM nodes */
 		if (typeof Element !== "undefined" && obj instanceof Element) return obj;
-		if (typeof HTMLDocument !== "undefined" && obj instanceof HTMLDocument)
-			return obj;
+		if (typeof Document !== "undefined" && obj instanceof Document) return obj;
 		if (
 			typeof DocumentFragment !== "undefined" &&
 			obj instanceof DocumentFragment
@@ -81,21 +86,11 @@ function clone(obj) {
 
 		/** Do not clone global objects */
 		if (obj === getGlobal()) return obj;
-		if (typeof globalContext !== "undefined" && obj === globalContext)
-			return obj;
 		if (typeof window !== "undefined" && obj === window) return obj;
 		if (typeof document !== "undefined" && obj === document) return obj;
 		if (typeof navigator !== "undefined" && obj === navigator) return obj;
 		if (typeof JSON !== "undefined" && obj === JSON) return obj;
-
-		// Handle Proxy-Object
-		try {
-			// try/catch because possible: TypeError: Function has non-object prototype 'undefined' in instanceof check
-			if (obj instanceof Proxy) {
-				return obj;
-			}
-		} catch (e) {}
-
+		if (isProxy(obj)) return obj; // Handle Proxy-Object
 		return cloneObject(obj);
 	}
 

package/test/cases/data/pathfinder.mjs

@@ -22,6 +22,24 @@ describe('Pathfinder', function () {
         return r;
     }
 
+    describe("value is not an integer issue #274", function () {
+        it("should not be fail with", function () {
+
+            const pf = new Pathfinder({
+                data: {}
+            });
+
+            try {
+                pf.setVia("data.age", 10);
+            } catch (e) {
+                expect(e).to.be.null;
+            }
+
+            expect(pf.getVia("data.age")).to.be.equal(10);
+
+        });
+    });
+
 
     describe('with Wildcard and Iterations', function () {
         let pf, obj;

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

package/test/cases/text/formatter.mjs

@@ -4,7 +4,27 @@ import {Formatter} from "../../../source/text/formatter.mjs";
 
 describe('Formatter', function () {
 
-    // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/47
+    // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/275
+    describe('change empty handling', function () {
+
+        it('modification 1', function () {
+
+            const  formatter = new Formatter({
+
+                a: null,
+                b: undefined,
+                c : 0
+
+
+            })
+
+            expect(formatter.format("${a | tostring}")).to.be.equal('null');
+            expect(formatter.format("${b | tostring}")).to.be.equal('undefined');
+            expect(formatter.format("${c | tostring}")).to.be.equal('0');
+        })
+    })
+
+        // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/47
     describe('examples', function () {
 
         it('rfc example should run', function () {

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.95.2</h1>
-  <div id="lastupdate" style='font-size:0.7em'>last update So 29. Dez 11:41:55 CET 2024</div>
+  <h1 style='margin-bottom: 0.1em;'>Monster 3.96.2</h1>
+  <div id="lastupdate" style='font-size:0.7em'>last update Fr 3. Jan 15:17:06 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>