@schukai/monster 4.72.0 → 4.73.1

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 
 
+## [4.73.1] - 2026-01-03
+
+### Bug Fixes
+
+- Enhance collectLookupIds with sourcePath parameter for flexibility
+### Changes
+
+- update tests
+
+
+
+## [4.73.0] - 2026-01-03
+
+### Add Features
+
+- Enhance lookup column functionality with templating and debugging options
+
+
+
 ## [4.72.0] - 2026-01-03
 
 ### Add Features

package/package.json

@@ -1 +1 @@
-{"author":"Volker Schukai","dependencies":{"@floating-ui/dom":"^1.7.4","@popperjs/core":"^2.11.8"},"description":"Monster is a simple library for creating fast, robust and lightweight websites.","homepage":"https://monsterjs.org/","keywords":["framework","web","dom","css","sass","mobile-first","app","front-end","templates","schukai","core","shopcloud","alvine","monster","buildmap","stack","observer","observable","uuid","node","nodelist","css-in-js","logger","log","theme"],"license":"AGPL 3.0","main":"source/monster.mjs","module":"source/monster.mjs","name":"@schukai/monster","repository":{"type":"git","url":"https://gitlab.schukai.com/oss/libraries/javascript/monster.git"},"type":"module","version":"4.72.0"}
+{"author":"Volker Schukai","dependencies":{"@floating-ui/dom":"^1.7.4","@popperjs/core":"^2.11.8"},"description":"Monster is a simple library for creating fast, robust and lightweight websites.","homepage":"https://monsterjs.org/","keywords":["framework","web","dom","css","sass","mobile-first","app","front-end","templates","schukai","core","shopcloud","alvine","monster","buildmap","stack","observer","observable","uuid","node","nodelist","css-in-js","logger","log","theme"],"license":"AGPL 3.0","main":"source/monster.mjs","module":"source/monster.mjs","name":"@schukai/monster","repository":{"type":"git","url":"https://gitlab.schukai.com/oss/libraries/javascript/monster.git"},"type":"module","version":"4.73.1"}

package/source/components/datatable/datasource/rest.mjs

@@ -179,6 +179,7 @@ class Rest extends Datasource {
 
 			lookups: {
 				enabled: false,
+				debug: false,
 				sourcePath: "dataset",
 				request: {
 					idsParam: "ids",
@@ -732,6 +733,14 @@ function handleValidationError(error) {
 		.catch(() => {});
 }
 
+/**
+ * @private
+ * @return {boolean}
+ */
+function lookupDebugEnabled() {
+	return this.getOption("lookups.debug", false) === true;
+}
+
 /**
  * @private
  * @param {number} requestId
@@ -815,7 +824,11 @@ async function resolveRemoteLookup(requestId, name, cfg) {
 	const cache = getLookupCache.call(this, name);
 	const pending = getLookupPending.call(this, name);
 
-	const ids = collectLookupIds.call(this, key);
+	const ids = collectLookupIds.call(
+		this,
+		key,
+		this.getOption("lookups.sourcePath", "dataset"),
+	);
 	const missingIds = ids.filter((id) => !cache.has(id) && !pending.has(id));
 
 	if (missingIds.length === 0) {
@@ -869,8 +882,8 @@ function applyLookupCache(requestId, cfg, cache) {
  * @param {string} key
  * @return {string[]}
  */
-function collectLookupIds(key) {
-	const rows = resolveLookupRows.call(this);
+function collectLookupIds(key, sourcePath) {
+	const rows = resolveLookupRows.call(this, undefined, sourcePath);
 	if (!isArray(rows)) {
 		return [];
 	}
@@ -906,9 +919,22 @@ async function fetchLookupEntries(cfg, ids) {
 
 	const init = isObject(request.init) ? request.init : {};
 	const url = buildLookupUrl(cfg.url, ids, request);
+	const debug = lookupDebugEnabled.call(this);
+	if (debug) {
+		console.debug("[monster-datasource-rest] lookup fetch", {
+			url,
+			ids,
+		});
+	}
 
 	const response = await fetch(url, init);
 	if (!response.ok) {
+		if (debug) {
+			console.debug("[monster-datasource-rest] lookup failed", {
+				url,
+				status: response.status,
+			});
+		}
 		return new Map();
 	}
 
@@ -916,6 +942,9 @@ async function fetchLookupEntries(cfg, ids) {
 	try {
 		payload = await response.json();
 	} catch (_error) {
+		if (debug) {
+			console.debug("[monster-datasource-rest] lookup invalid json", { url });
+		}
 		return new Map();
 	}
 
@@ -931,6 +960,12 @@ async function fetchLookupEntries(cfg, ids) {
 	}
 
 	if (!isArray(entries)) {
+		if (debug) {
+			console.debug("[monster-datasource-rest] lookup no entries", {
+				url,
+				path: responseConfig.path,
+			});
+		}
 		return new Map();
 	}
 
@@ -942,6 +977,12 @@ async function fetchLookupEntries(cfg, ids) {
 		}
 		result.set(String(entry[idKey]), entry);
 	}
+	if (debug) {
+		console.debug("[monster-datasource-rest] lookup resolved", {
+			url,
+			entries: result.size,
+		});
+	}
 
 	return result;
 }
@@ -955,8 +996,7 @@ async function fetchLookupEntries(cfg, ids) {
  */
 function buildLookupUrl(url, ids, request) {
 	const idsParam = request.idsParam || "ids";
-	const idsSeparator = request.idsSeparator || ",";
-	const idsValue = ids.join(idsSeparator);
+	const idsValue = buildLookupIdsValue(ids, request);
 
 	if (url.includes("${")) {
 		const formatter = new Formatter({ ids: idsValue });
@@ -969,6 +1009,33 @@ function buildLookupUrl(url, ids, request) {
 	)}`;
 }
 
+/**
+ * @private
+ * @param {string[]} ids
+ * @param {object} request
+ * @return {string}
+ */
+function buildLookupIdsValue(ids, request) {
+	if (isFunction(request.queryBuilder)) {
+		return request.queryBuilder(ids);
+	}
+
+	const idsTemplate = request.idsTemplate;
+	const idsSeparator = request.idsSeparator || ",";
+	const wrapOpen = request.wrapOpen || "";
+	const wrapClose = request.wrapClose || "";
+
+	let values = ids;
+	if (isString(idsTemplate) && idsTemplate !== "") {
+		values = ids.map((id) => {
+			const formatter = new Formatter({ id });
+			return formatter.format(idsTemplate);
+		});
+	}
+
+	return `${wrapOpen}${values.join(idsSeparator)}${wrapClose}`;
+}
+
 /**
  * @private
  * @param {object} cfg

package/test/cases/components/form/select.mjs

@@ -228,9 +228,16 @@ describe('Select', function () {
             ]);
             mocks.appendChild(select);
 
-            setTimeout(() => {
+            const startedAt = Date.now();
+            const poll = () => {
                 try {
                     const options = select.getOption('options');
+                    if (options?.[0]?.value !== 'Alpha') {
+                        if (Date.now() - startedAt < 1500) {
+                            return setTimeout(poll, 50);
+                        }
+                    }
+
                     expect(options[0].value).to.equal('Alpha');
                     expect(options[0].label).to.equal('Alpha');
                     expect(options[0].visibility).to.equal('visible');
@@ -245,7 +252,9 @@ describe('Select', function () {
                 }
 
                 done();
-            }, 350);
+            };
+
+            setTimeout(poll, 50);
         });
 
         it('should not parse options arrays with multiple string entries', function (done) {

package/test/cases/util/deadmansswitch.mjs

@@ -14,11 +14,11 @@ describe('DeadMansSwitch', function () {
                 const ms2 =  Date.now();
 
                 const diff = ms2 - ms1;
-                if (diff < 100) {
-                    done('to short ' + diff);
-                    return;
-                }
-                done();
+            if (diff < 90) {
+                done(new Error('to short ' + diff));
+                return;
+            }
+            done();
             })
 
 
@@ -42,7 +42,7 @@ describe('DeadMansSwitch', function () {
                     return;
                 }
 
-                if (diff < 600) {
+                if (diff < 550) {
                     done(new Error('to short ' + diff));
                     return;
                 }
@@ -68,4 +68,4 @@ describe('DeadMansSwitch', function () {
         });
     });
 
-});
+});