@schukai/monster 4.143.4 → 4.143.6

package/package.json

@@ -1 +1 @@
-{"author":"Volker Schukai","dependencies":{"@floating-ui/dom":"^1.7.6"},"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.143.4"}
+{"author":"Volker Schukai","dependencies":{"@floating-ui/dom":"^1.7.6"},"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.143.6"}

package/source/components/datatable/filter.mjs

@@ -155,6 +155,18 @@ const debounceSizeSymbol = Symbol("debounceSize");
  */
 const hashChangeSymbol = Symbol("hashChange");
 
+/**
+ * @private
+ * @type {symbol}
+ */
+const pendingConfigWriteSymbol = Symbol("pendingConfigWrite");
+
+/**
+ * @private
+ * @type {symbol}
+ */
+const configWritePromiseSymbol = Symbol("configWritePromise");
+
 /**
  * The Filter component is used to show and handle the filter values.
  *
@@ -1089,6 +1101,10 @@ function initTabEvents() {
 					return host.getConfig(configKey);
 				})
 				.then((config) => {
+					if (!isObject(config)) {
+						return;
+					}
+
 					for (const [name, query] of Object.entries(config)) {
 						if (labels.includes(name)) {
 							continue;
@@ -1130,6 +1146,10 @@ function updateFilterTabs() {
 			return host.getConfig(configKey);
 		})
 		.then((config) => {
+			if (!isObject(config)) {
+				return;
+			}
+
 			for (const [name, query] of Object.entries(config)) {
 				const found = element.querySelector(
 					`[data-monster-button-label="${name}"]`,
@@ -1629,12 +1649,51 @@ function updateConfig() {
 	if (!(host && hasConfigIdentity.call(this))) {
 		return;
 	}
+
 	const configKey = getFilterConfigKey.call(this);
+	this[pendingConfigWriteSymbol] = {
+		key: configKey,
+		value: this[settingsSymbol].getOptions(),
+	};
+
+	if (this[configWritePromiseSymbol]) {
+		return;
+	}
+
+	writePendingConfig.call(this, host);
+}
+
+/**
+ * @private
+ * @param {Host} host
+ */
+function writePendingConfig(host) {
+	const pending = this[pendingConfigWriteSymbol];
+	delete this[pendingConfigWriteSymbol];
+
+	if (!pending) {
+		return;
+	}
 
 	try {
-		host.setConfig(configKey, this[settingsSymbol].getOptions());
+		this[configWritePromiseSymbol] = Promise.resolve(
+			host.setConfig(pending.key, pending.value),
+		)
+			.catch((error) => {
+				addAttributeToken(this, ATTRIBUTE_ERRORMESSAGE, error?.message || error);
+			})
+			.finally(() => {
+				delete this[configWritePromiseSymbol];
+				if (this[pendingConfigWriteSymbol]) {
+					writePendingConfig.call(this, host);
+				}
+			});
 	} catch (error) {
+		delete this[configWritePromiseSymbol];
 		addAttributeToken(this, ATTRIBUTE_ERRORMESSAGE, error?.message || error);
+		if (this[pendingConfigWriteSymbol]) {
+			writePendingConfig.call(this, host);
+		}
 	}
 }
 

package/source/text/bracketed-key-value-hash.mjs

@@ -82,6 +82,8 @@ function parseBracketedKeyValueHash(hashString) {
 	let inSelector = true;
 	let escaped = false;
 	let quotedValueStartChar = "";
+	let valueParenthesisDepth = 0;
+	let valueClosedByParenthesis = false;
 
 	for (let i = 0; i < cleanedHashString.length; i++) {
 		const c = cleanedHashString[i];
@@ -166,6 +168,19 @@ function parseBracketedKeyValueHash(hashString) {
 				continue;
 			}
 
+			if (c === "(") {
+				valueParenthesisDepth++;
+				currentValue += c;
+				continue;
+			}
+
+			if (c === ")" && valueParenthesisDepth > 0) {
+				valueParenthesisDepth--;
+				currentValue += c;
+				valueClosedByParenthesis = valueParenthesisDepth === 0;
+				continue;
+			}
+
 			if (c === ",") {
 				inValue = false;
 				inKey = true;
@@ -173,6 +188,8 @@ function parseBracketedKeyValueHash(hashString) {
 				addToResult(currentKey, decodedCurrentValue);
 				currentKey = "";
 				currentValue = "";
+				valueParenthesisDepth = 0;
+				valueClosedByParenthesis = false;
 				continue;
 			}
 
@@ -186,6 +203,8 @@ function parseBracketedKeyValueHash(hashString) {
 				currentKey = "";
 				currentValue = "";
 				currentSelector = "";
+				valueParenthesisDepth = 0;
+				valueClosedByParenthesis = false;
 				continue;
 			}
 
@@ -199,6 +218,12 @@ function parseBracketedKeyValueHash(hashString) {
 		return selectors;
 	}
 
+	if (inValue && valueParenthesisDepth === 0 && valueClosedByParenthesis) {
+		const decodedCurrentValue = decodeURIComponent(currentValue);
+		addToResult(currentKey, decodedCurrentValue);
+		return selectors;
+	}
+
 	return {};
 }
 

package/test/cases/text/bracketed-key-value-hash.mjs

@@ -106,6 +106,16 @@ describe("parseBracketedKeyValueHash", () => {
         expect(result).to.deep.equal({selector: {key1: 'value,1', key2: 'value,2'}});
     });
 
+    it('should keep unencoded parentheses inside a percent-encoded filter expression', () => {
+        const hashString = '#list-filter-nucleus-pim-product-variants-list(tags=tags%20IN%20(%22gustav-varianten%22)';
+        const result = parseBracketedKeyValueHash(hashString);
+        expect(result).to.deep.equal({
+            'list-filter-nucleus-pim-product-variants-list': {
+                tags: 'tags IN ("gustav-varianten")'
+            }
+        });
+    });
+
     it('should ignore leading hash symbol (#)', () => {
         const hashString = 'selector(key=value)';
         const result = parseBracketedKeyValueHash(hashString);
@@ -195,6 +205,18 @@ describe("parseBracketedKeyValueHash", () => {
             const result = createBracketedKeyValueHash(input, true);
             expect(result).to.deep.equal("#.example(color=r%22ed,font-size=14px);.other(background=blue)");
         });
+
+        it('should round-trip a filter expression with quotes and parentheses', () => {
+            const input = {
+                'list-filter-nucleus-pim-product-variants-list': {
+                    tags: 'tags IN ("gustav-varianten")'
+                }
+            };
+
+            const hashString = createBracketedKeyValueHash(input, true);
+            const result = parseBracketedKeyValueHash(hashString);
+            expect(result).to.deep.equal(input);
+        });
         
         it('should return an empty string for an empty object', () => {
             const input = {};