cx 24.3.7 → 24.3.9

package/dist/data.js

@@ -156,12 +156,6 @@ function _setPrototypeOf(o, p) {
 			};
 	return _setPrototypeOf(o, p);
 }
-function _assertThisInitialized(self) {
-	if (self === void 0) {
-		throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-	}
-	return self;
-}
 
 function computable() {
 	var _ref;
@@ -222,8 +216,7 @@ function computable() {
    let e = Expression.compile('_.min({data})');
  */
 
-var expCache = {},
-	helpers = {},
+var helpers = {},
 	helperNames = [],
 	helperValues = [],
 	expFatArrows = null;
@@ -287,7 +280,8 @@ function getExpr(expr) {
 }
 function expression(str) {
 	if (isFunction(str)) return getExpr(str);
-	var r = expCache[str];
+	var cache = getExpressionCache();
+	var r = cache[str];
 	if (r) return r;
 	var quote = false;
 	var termStart = -1,
@@ -382,7 +376,7 @@ function expression(str) {
 				})
 				.concat([compute]),
 		);
-		expCache[str] = selector;
+		cache[str] = selector;
 		return selector;
 	} catch (err) {
 		throw new Error("Failed to parse expression: '" + str + "'. Error: " + err.message);
@@ -409,12 +403,19 @@ function plugFatArrowExpansion(impl) {
 function invalidateExpressionCache() {
 	expCache = {};
 }
+var expCache = {};
+var getExpressionCache = function getExpressionCache() {
+	return expCache;
+};
+function setGetExpressionCacheCallback(callback) {
+	getExpressionCache = callback;
+}
 
 function plus(str) {
 	return str.length ? str + " + " : str;
 }
-var tplCache = {};
 function stringTemplate(str) {
+	var tplCache = getTplCache();
 	var expr = tplCache[str];
 	if (expr) return expr;
 	expr = "";
@@ -479,19 +480,26 @@ var StringTemplate = {
 		return stringTemplate(_format)(args);
 	},
 };
+var tplCache = {};
+var getTplCache = function getTplCache() {
+	return tplCache;
+};
 function invalidateStringTemplateCache() {
 	tplCache = {};
 }
+function setGetStringTemplateCacheCallback(callback) {
+	getTplCache = callback;
+}
 
 var Ref = /*#__PURE__*/ (function (_Component) {
-	_inheritsLoose(Ref, _Component);
 	function Ref(config) {
 		var _this;
 		_this = _Component.call(this, config) || this;
-		_this.get = _this.get.bind(_assertThisInitialized(_this));
-		if (_this.set) _this.set = _this.set.bind(_assertThisInitialized(_this));
+		_this.get = _this.get.bind(_this);
+		if (_this.set) _this.set = _this.set.bind(_this);
 		return _this;
 	}
+	_inheritsLoose(Ref, _Component);
 	var _proto = Ref.prototype;
 	_proto.get = function get() {
 		throw new Error("Ref's get method is not implemented.");
@@ -549,13 +557,13 @@ Ref.factory = function (alias, config, more) {
 };
 
 var StoreRef = /*#__PURE__*/ (function (_Ref) {
-	_inheritsLoose(StoreRef, _Ref);
 	function StoreRef(config) {
 		var _this;
 		_this = _Ref.call(this, config) || this;
 		if (isAccessorChain(_this.path)) _this.path = _this.path.toString();
 		return _this;
 	}
+	_inheritsLoose(StoreRef, _Ref);
 	var _proto = StoreRef.prototype;
 	_proto.get = function get() {
 		return this.store.get(this.path);
@@ -761,7 +769,6 @@ View.prototype.mutate = function () {
 };
 
 var SubscribableView = /*#__PURE__*/ (function (_View) {
-	_inheritsLoose(SubscribableView, _View);
 	function SubscribableView(config) {
 		var _this;
 		_this = _View.call(this, config) || this;
@@ -769,6 +776,7 @@ var SubscribableView = /*#__PURE__*/ (function (_View) {
 		_this.changes = [];
 		return _this;
 	}
+	_inheritsLoose(SubscribableView, _View);
 	var _proto = SubscribableView.prototype;
 	_proto.subscribe = function subscribe(callback) {
 		return this.subscribers.subscribe(callback);
@@ -813,7 +821,6 @@ var SubscribableView = /*#__PURE__*/ (function (_View) {
 SubscribableView.prototype.async = false;
 
 var Store = /*#__PURE__*/ (function (_SubscribableView) {
-	_inheritsLoose(Store, _SubscribableView);
 	function Store(config) {
 		var _this;
 		if (config === void 0) {
@@ -826,6 +833,7 @@ var Store = /*#__PURE__*/ (function (_SubscribableView) {
 		};
 		return _this;
 	}
+	_inheritsLoose(Store, _SubscribableView);
 	var _proto = Store.prototype;
 	_proto.getData = function getData() {
 		return this.data;
@@ -860,10 +868,10 @@ var Store = /*#__PURE__*/ (function (_SubscribableView) {
 Store.prototype.async = false;
 
 var ExposedRecordView = /*#__PURE__*/ (function (_View) {
-	_inheritsLoose(ExposedRecordView, _View);
 	function ExposedRecordView() {
 		return _View.apply(this, arguments) || this;
 	}
+	_inheritsLoose(ExposedRecordView, _View);
 	var _proto = ExposedRecordView.prototype;
 	_proto.getData = function getData() {
 		if (this.sealed && this.meta.version === this.cache.version && this.cache.itemIndex === this.itemIndex)
@@ -925,10 +933,10 @@ var ExposedRecordView = /*#__PURE__*/ (function (_View) {
 ExposedRecordView.prototype.immutable = false;
 
 var ExposedValueView = /*#__PURE__*/ (function (_View) {
-	_inheritsLoose(ExposedValueView, _View);
 	function ExposedValueView() {
 		return _View.apply(this, arguments) || this;
 	}
+	_inheritsLoose(ExposedValueView, _View);
 	var _proto = ExposedValueView.prototype;
 	_proto.getData = function getData() {
 		if (this.sealed && this.meta.version === this.cache.version && this.cache.key === this.key)
@@ -987,10 +995,10 @@ var ExposedValueView = /*#__PURE__*/ (function (_View) {
 ExposedValueView.prototype.immutable = false;
 
 var ReadOnlyDataView = /*#__PURE__*/ (function (_View) {
-	_inheritsLoose(ReadOnlyDataView, _View);
 	function ReadOnlyDataView() {
 		return _View.apply(this, arguments) || this;
 	}
+	_inheritsLoose(ReadOnlyDataView, _View);
 	var _proto = ReadOnlyDataView.prototype;
 	_proto.getData = function getData() {
 		if (this.sealed && this.meta.version === this.cache.version && this.cache.data === this.data)
@@ -1015,10 +1023,10 @@ var ReadOnlyDataView = /*#__PURE__*/ (function (_View) {
 ReadOnlyDataView.prototype.immutable = false;
 
 var AugmentedViewBase = /*#__PURE__*/ (function (_View) {
-	_inheritsLoose(AugmentedViewBase, _View);
 	function AugmentedViewBase() {
 		return _View.apply(this, arguments) || this;
 	}
+	_inheritsLoose(AugmentedViewBase, _View);
 	var _proto = AugmentedViewBase.prototype;
 	_proto.getData = function getData() {
 		if (this.meta.version === this.cache.version && this.sealed) return this.cache.result;
@@ -1077,10 +1085,10 @@ var AugmentedViewBase = /*#__PURE__*/ (function (_View) {
 AugmentedViewBase.prototype.immutable = false;
 
 var NestedDataView = /*#__PURE__*/ (function (_AugmentedViewBase) {
-	_inheritsLoose(NestedDataView, _AugmentedViewBase);
 	function NestedDataView() {
 		return _AugmentedViewBase.apply(this, arguments) || this;
 	}
+	_inheritsLoose(NestedDataView, _AugmentedViewBase);
 	var _proto = NestedDataView.prototype;
 	_proto.embedAugmentData = function embedAugmentData(result, parentStoreData) {
 		if (this.nestedData) {
@@ -1101,10 +1109,10 @@ var NestedDataView = /*#__PURE__*/ (function (_AugmentedViewBase) {
 })(AugmentedViewBase);
 
 var ZoomIntoPropertyView = /*#__PURE__*/ (function (_NestedDataView) {
-	_inheritsLoose(ZoomIntoPropertyView, _NestedDataView);
 	function ZoomIntoPropertyView() {
 		return _NestedDataView.apply(this, arguments) || this;
 	}
+	_inheritsLoose(ZoomIntoPropertyView, _NestedDataView);
 	var _proto = ZoomIntoPropertyView.prototype;
 	_proto.getBaseData = function getBaseData(parentStoreData) {
 		var x = this.binding.value(parentStoreData);
@@ -1503,17 +1511,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 +1543,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 +1565,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 +1610,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 +1638,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;
@@ -1858,10 +1897,10 @@ function diffArrays(oldArray, newArray, keyFn) {
 }
 
 var ArrayRef = /*#__PURE__*/ (function (_Ref) {
-	_inheritsLoose(ArrayRef, _Ref);
 	function ArrayRef() {
 		return _Ref.apply(this, arguments) || this;
 	}
+	_inheritsLoose(ArrayRef, _Ref);
 	var _proto = ArrayRef.prototype;
 	_proto.append = function append$1() {
 		for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -1899,18 +1938,18 @@ var ArrayRef = /*#__PURE__*/ (function (_Ref) {
 })(Ref);
 
 var StoreProxy = /*#__PURE__*/ (function (_View) {
-	_inheritsLoose(StoreProxy, _View);
 	function StoreProxy(getStore) {
 		var _this;
 		_this =
 			_View.call(this, {
 				store: getStore(),
 			}) || this;
-		Object.defineProperty(_assertThisInitialized(_this), "store", {
+		Object.defineProperty(_this, "store", {
 			get: getStore,
 		});
 		return _this;
 	}
+	_inheritsLoose(StoreProxy, _View);
 	var _proto = StoreProxy.prototype;
 	_proto.getData = function getData() {
 		return this.store.getData();
@@ -1919,10 +1958,10 @@ var StoreProxy = /*#__PURE__*/ (function (_View) {
 })(View);
 
 var ArrayElementView = /*#__PURE__*/ (function (_AugmentedViewBase) {
-	_inheritsLoose(ArrayElementView, _AugmentedViewBase);
 	function ArrayElementView() {
 		return _AugmentedViewBase.apply(this, arguments) || this;
 	}
+	_inheritsLoose(ArrayElementView, _AugmentedViewBase);
 	var _proto = ArrayElementView.prototype;
 	_proto.isExtraKey = function isExtraKey(key) {
 		return key == this.recordAlias || key == this.indexAlias || key == this.lengthAlias;
@@ -2059,6 +2098,8 @@ export {
 	moveElement,
 	plugFatArrowExpansion,
 	removeTreeNodes,
+	setGetExpressionCacheCallback,
+	setGetStringTemplateCacheCallback,
 	sorter,
 	stringTemplate,
 	updateArray,