@schukai/monster 4.73.0 → 4.73.2

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 
 
+## [4.73.2] - 2026-01-03
+
+### Bug Fixes
+
+- lookup [#360](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/360)
+
+
+
+## [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

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.73.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.2"}

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

@@ -66,6 +66,7 @@ const readRequestIdSymbol = Symbol("readRequestId");
 const writeRequestIdSymbol = Symbol("writeRequestId");
 const lookupCacheSymbol = Symbol("lookupCache");
 const lookupPendingSymbol = Symbol("lookupPending");
+const lookupPendingFetchSymbol = Symbol("lookupPendingFetch");
 
 /**
  * A rest api datasource
@@ -823,11 +824,31 @@ async function resolveRemoteLookup(requestId, name, cfg) {
 
 	const cache = getLookupCache.call(this, name);
 	const pending = getLookupPending.call(this, name);
+	const pendingFetches = getLookupPendingFetches.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) {
+		if (pending.size > 0) {
+			updateLookupRows.call(this, requestId, (rows) => {
+				if (!isString(cfg.loadingKey)) return;
+				for (const row of rows) {
+					if (pending.has(String(row[key]))) {
+						row[cfg.loadingKey] = true;
+					}
+				}
+			});
+
+			if (pendingFetches.size > 0) {
+				const fetches = Array.from(pendingFetches);
+				await Promise.all(fetches.map((promise) => promise.catch(() => null)));
+			}
+		}
 		applyLookupCache.call(this, requestId, cfg, cache);
 		return;
 	}
@@ -835,7 +856,7 @@ async function resolveRemoteLookup(requestId, name, cfg) {
 	updateLookupRows.call(this, requestId, (rows) => {
 		if (!isString(cfg.loadingKey)) return;
 		for (const row of rows) {
-			if (missingIds.includes(String(row[key]))) {
+			if (missingIds.includes(String(row[key])) || pending.has(String(row[key]))) {
 				row[cfg.loadingKey] = true;
 			}
 		}
@@ -843,7 +864,14 @@ async function resolveRemoteLookup(requestId, name, cfg) {
 
 	missingIds.forEach((id) => pending.add(id));
 
-	const response = await fetchLookupEntries.call(this, cfg, missingIds);
+	const fetchPromise = fetchLookupEntries.call(this, cfg, missingIds);
+	pendingFetches.add(fetchPromise);
+	let response;
+	try {
+		response = await fetchPromise;
+	} finally {
+		pendingFetches.delete(fetchPromise);
+	}
 	response.forEach((entry, id) => cache.set(id, entry));
 	missingIds.forEach((id) => pending.delete(id));
 
@@ -878,8 +906,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 [];
 	}
@@ -1133,6 +1161,21 @@ function getLookupPending(name) {
 	return this[lookupPendingSymbol].get(name);
 }
 
+/**
+ * @private
+ * @param {string} name
+ * @return {Set<Promise<Map<string, object>>>}
+ */
+function getLookupPendingFetches(name) {
+	if (!this[lookupPendingFetchSymbol]) {
+		this[lookupPendingFetchSymbol] = new Map();
+	}
+	if (!this[lookupPendingFetchSymbol].has(name)) {
+		this[lookupPendingFetchSymbol].set(name, new Set());
+	}
+	return this[lookupPendingFetchSymbol].get(name);
+}
+
 /**
  * @private
  * @return {string}

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 () {
         });
     });
 
-});
+});