@schukai/monster 4.91.1 → 4.92.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 
 
+## [4.92.0] - 2026-01-12
+
+### Add Features
+
+- Improve data resolution in form handling [#372](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/372)
+
+
+
 ## [4.91.1] - 2026-01-12
 
 ### Bug Fixes

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.91.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.92.0"}

package/source/components/form/repeat-field-set.mjs

@@ -1043,34 +1043,32 @@ function syncOptionData() {
  * @return {object}
  */
 function resolveFormRecord(form, datasource) {
-	let data = datasource?.data;
+	const { data, dataPath } = resolveDatasourceBasePath(form, datasource);
 	if (!isObject(data) && !isArray(data)) {
 		return {};
 	}
 
-	const mappingData = form.getOption?.("mapping.data");
-	if (isString(mappingData) && mappingData.trim() !== "") {
-		try {
-			data = new Pathfinder(data).getVia(mappingData.trim());
-		} catch {
-			data = {};
+	let resolvedData = data;
+	if (isObject(resolvedData) && !isArray(resolvedData)) {
+		if (isArray(resolvedData.data)) {
+			resolvedData = resolvedData.data;
+		} else if (isArray(resolvedData.dataset)) {
+			resolvedData = resolvedData.dataset;
+		} else if (dataPath === "") {
+			resolvedData = Object.values(resolvedData);
 		}
 	}
 
-	if (isObject(data)) {
-		data = Object.values(data);
-	}
-
 	const mappingIndex = form.getOption?.("mapping.index");
 	if (mappingIndex !== null && mappingIndex !== undefined) {
-		data = data?.[mappingIndex];
+		resolvedData = resolvedData?.[mappingIndex];
 	}
 
-	if (!isObject(data) && !isArray(data)) {
+	if (!isObject(resolvedData) && !isArray(resolvedData)) {
 		return {};
 	}
 
-	return data;
+	return resolvedData;
 }
 
 /**
@@ -1085,14 +1083,14 @@ function getDatasourceContext() {
 		return null;
 	}
 
-	const mappingData = form?.getOption?.("mapping.data");
 	const mappingIndex = form?.getOption?.("mapping.index");
+	const { dataPath } = resolveDatasourceBasePath(form, datasource);
 	const record = resolveFormRecord(form, datasource);
 	const normalizedPath = normalizePathForRecord(path, record);
 	let basePath = "";
 
-	if (isString(mappingData) && mappingData.trim() !== "") {
-		basePath = mappingData.trim();
+	if (isString(dataPath) && dataPath.trim() !== "") {
+		basePath = dataPath.trim();
 	}
 
 	if (mappingIndex !== null && mappingIndex !== undefined) {
@@ -1104,6 +1102,42 @@ function getDatasourceContext() {
 	return { target: datasource, path: finalPath };
 }
 
+/**
+ * @private
+ * @param {HTMLElement} form
+ * @param {HTMLElement} datasource
+ * @return {{data: object|Array, dataPath: string}}
+ */
+function resolveDatasourceBasePath(form, datasource) {
+	let data = datasource?.data;
+	if (!isObject(data) && !isArray(data)) {
+		return { data: {}, dataPath: "" };
+	}
+
+	let dataPath = "";
+	const mappingData = form?.getOption?.("mapping.data");
+	if (isString(mappingData) && mappingData.trim() !== "") {
+		const trimmed = mappingData.trim();
+		try {
+			const mapped = new Pathfinder(data).getVia(trimmed);
+			if (mapped !== undefined) {
+				data = mapped;
+				dataPath = trimmed;
+			}
+		} catch {}
+	}
+
+	if (dataPath === "" && isObject(data) && !isArray(data)) {
+		if (isArray(data.data)) {
+			dataPath = "data";
+		} else if (isArray(data.dataset)) {
+			dataPath = "dataset";
+		}
+	}
+
+	return { data, dataPath };
+}
+
 /**
  * @private
  * @return {string}