cx 24.3.7 → 24.3.8

package/dist/data.js

@@ -1503,17 +1503,28 @@ LastValue.prototype.result = null;
  }
  */
 
-function transform(o, f) {
-	var res = {};
-	for (var k in o) res[k] = f(o[k], k);
-	return res;
-}
 var Grouper = /*#__PURE__*/ (function () {
 	function Grouper(key, aggregates, dataGetter, nameGetter) {
-		this.keys = Object.keys(key).map(function (k) {
+		this.keys = Object.keys(key).map(function (keyField) {
+			var isSimpleField = keyField.indexOf(".") === -1;
+			var keySetter;
+			if (isSimpleField) {
+				// use simple field setter wherever possible
+				keySetter = function set(result, value) {
+					result[keyField] = value;
+					return result;
+				};
+			} else {
+				// for complex paths, use deep setter
+				var binding = Binding.get(keyField);
+				keySetter = function keySetter(result, value) {
+					return binding.set(result, value);
+				};
+			}
 			return {
-				name: k,
-				value: getSelector(key[k]),
+				name: keyField,
+				keySetter: keySetter,
+				value: getSelector(key[keyField]),
 			};
 		});
 		if (nameGetter) this.nameGetter = getSelector(nameGetter);
@@ -1524,11 +1535,12 @@ var Grouper = /*#__PURE__*/ (function () {
 			};
 		this.aggregates =
 			aggregates &&
-			transform(aggregates, function (prop) {
+			transformValues(aggregates, function (prop) {
+				var _prop$weight;
 				if (!AggregateFunction[prop.type]) throw new Error("Unknown aggregate function '" + prop.type + "'.");
 				return {
 					value: getSelector(prop.value),
-					weight: getSelector(prop.weight || 1),
+					weight: getSelector((_prop$weight = prop.weight) != null ? _prop$weight : 1),
 					type: prop.type,
 				};
 			});
@@ -1545,7 +1557,7 @@ var Grouper = /*#__PURE__*/ (function () {
 			indexes: [],
 			aggregates:
 				this.aggregates &&
-				transform(this.aggregates, function (prop) {
+				transformValues(this.aggregates, function (prop) {
 					var f = AggregateFunction[prop.type];
 					return {
 						processor: f(),
@@ -1590,16 +1602,18 @@ var Grouper = /*#__PURE__*/ (function () {
 		if (level == this.keys.length) {
 			var key = {};
 			this.keys.forEach(function (k, i) {
-				return (key[k.name] = path[i]);
+				key = k.keySetter(key, path[i]);
 			});
 			results.push({
 				key: key,
 				name: g.name,
 				records: g.records,
 				indexes: g.indexes,
-				aggregates: transform(g.aggregates, function (p) {
-					return p.processor.getResult();
-				}),
+				aggregates: resolveKeyPaths(
+					transformValues(g.aggregates, function (p) {
+						return p.processor.getResult();
+					}),
+				),
 			});
 		} else {
 			Object.keys(g).forEach(function (k) {
@@ -1616,6 +1630,23 @@ var Grouper = /*#__PURE__*/ (function () {
 	return Grouper;
 })();
 
+// transform object values using a function
+function transformValues(o, f) {
+	var res = {};
+	for (var k in o) res[k] = f(o[k], k);
+	return res;
+}
+
+// transform keys like 'a.b.c' into nested objects
+function resolveKeyPaths(o) {
+	var res = {};
+	for (var k in o) {
+		if (k.indexOf(".") > 0) res = Binding.get(k).set(res, o[k]);
+		else res[k] = o[k];
+	}
+	return res;
+}
+
 function defaultCompare(av, bv) {
 	if (av == null) {
 		if (bv == null) return 0;