cx 22.3.4 → 22.3.5

package/dist/data.js

@@ -13,23 +13,51 @@ import {
 	expandFatArrows
 } from "cx/util";
 
+function createAccessorModelProxy(chain) {
+	var _this = this;
+
+	if (chain === void 0) {
+		chain = "";
+	}
+
+	var proxy = new Proxy(function() {}, {
+		get: function get(target, name) {
+			if (name === "isAccessorChain") return true;
+			if (typeof name !== "string") return _this;
+			if (name === "toString" || name === "valueOf") return proxy;
+			var newChain = chain;
+			if (newChain.length > 0) newChain += ".";
+			newChain += name;
+			return createAccessorModelProxy(newChain);
+		},
+		apply: function apply() {
+			return chain;
+		}
+	});
+	proxy.isAccessorChain = true;
+	return proxy;
+}
+function isAccessorChain(value) {
+	return value != null && !!value.isAccessorChain;
+}
+
 var bindingCache = {};
 var Binding = /*#__PURE__*/ (function() {
 	function Binding(path) {
 		this.path = path;
 		this.parts = path.split(".");
-		var fstr = "return (x";
-		var cpath = "x";
+		var body = "return (x";
+		var selector = "x";
 
 		for (var i = 0; i < this.parts.length; i++) {
-			if (this.parts[i][0] >= "0" && this.parts[i][0] <= "9") cpath += "[" + this.parts[i] + "]";
-			else cpath += "." + this.parts[i];
-			if (i + 1 < this.parts.length) fstr += " && " + cpath;
-			else fstr += " ? " + cpath + " : undefined";
+			if (this.parts[i][0] >= "0" && this.parts[i][0] <= "9") selector += "[" + this.parts[i] + "]";
+			else selector += "." + this.parts[i];
+			if (i + 1 < this.parts.length) body += " && " + selector;
+			else body += " ? " + selector + " : undefined";
 		}
 
-		fstr += ")";
-		this.value = new Function("x", fstr);
+		body += ")";
+		this.value = new Function("x", body);
 	}
 
 	var _proto = Binding.prototype;
@@ -79,6 +107,7 @@ var Binding = /*#__PURE__*/ (function() {
 
 		if (isObject(path) && isString(path.bind)) return this.get(path.bind);
 		if (path instanceof Binding) return path;
+		if (isAccessorChain(path)) return this.get(path.toString());
 		throw new Error("Invalid binding definition provided.");
 	};
 
@@ -86,6 +115,7 @@ var Binding = /*#__PURE__*/ (function() {
 })();
 function isBinding(value) {
 	if (isObject(value) && isString(value.bind)) return true;
+	if (value && value.isAccessorChain) return true;
 	return value instanceof Binding;
 }
 
@@ -207,7 +237,7 @@ function computable() {
 
 	for (var i = 0; i + 1 < arguments.length; i++) {
 		a = i < 0 || arguments.length <= i ? undefined : arguments[i];
-		if (isString(a)) inputs.push(Binding.get(a).value);
+		if (isString(a) || isAccessorChain(a)) inputs.push(Binding.get(a.toString()).value);
 		else if (a.memoize) inputs.push(a.memoize());
 		else if (isFunction(a)) inputs.push(a);
 		else throw new Error("Invalid selector type '" + typeof a + "' received.");
@@ -652,7 +682,11 @@ var StoreRef = /*#__PURE__*/ (function(_Ref) {
 	_inheritsLoose(StoreRef, _Ref);
 
 	function StoreRef(config) {
-		return _Ref.call(this, config) || this;
+		var _this;
+
+		_this = _Ref.call(this, config) || this;
+		if (isAccessorChain(_this.path)) _this.path = _this.path.toString();
+		return _this;
 	}
 
 	var _proto = StoreRef.prototype;
@@ -726,8 +760,7 @@ var View = /*#__PURE__*/ (function() {
 	};
 
 	_proto.init = function init(path, value) {
-		if (path instanceof Binding) path = path.path;
-		else if (typeof path == "object" && path != null) {
+		if (typeof path == "object" && path != null) {
 			var changed = false;
 
 			for (var key in path) {
@@ -736,13 +769,14 @@ var View = /*#__PURE__*/ (function() {
 
 			return changed;
 		}
-		if (this.get(path) === undefined) return this.setItem(path, value);
+
+		var binding = Binding.get(path);
+		if (this.get(binding.path) === undefined) return this.setItem(binding.path, value);
 		return false;
 	};
 
 	_proto.set = function set(path, value) {
-		if (path instanceof Binding) path = path.path;
-		else if (typeof path == "object" && path != null) {
+		if (isObject(path)) {
 			var changed = false;
 
 			for (var key in path) {
@@ -751,7 +785,9 @@ var View = /*#__PURE__*/ (function() {
 
 			return changed;
 		}
-		return this.setItem(path, value);
+
+		var binding = Binding.get(path);
+		return this.setItem(binding.path, value);
 	};
 
 	_proto.copy = function copy(from, to) {
@@ -777,15 +813,15 @@ var View = /*#__PURE__*/ (function() {
 	_proto["delete"] = function _delete(path) {
 		var _this2 = this;
 
-		if (path instanceof Binding) path = path.path;
-		else if (arguments.length > 1) path = Array.from(arguments);
+		if (arguments.length > 1) path = Array.from(arguments);
 		if (isArray(path))
 			return path
 				.map(function(arg) {
-					return _this2.deleteItem(arg);
+					return _this2["delete"](arg);
 				})
 				.some(Boolean);
-		return this.deleteItem(path);
+		var binding = Binding.get(path);
+		return this.deleteItem(binding.path);
 	}; //protected
 
 	_proto.deleteItem = function deleteItem(path) {
@@ -817,6 +853,8 @@ var View = /*#__PURE__*/ (function() {
 			args[_key - 2] = arguments[_key];
 		}
 
+		if (arguments.length == 1 && isFunction(path))
+			return this.load(path.apply(null, [this.getData(), updateFn].concat(args)));
 		return this.set(path, updateFn.apply(null, [this.get(path)].concat(args)));
 	};
 
@@ -885,13 +923,21 @@ var View = /*#__PURE__*/ (function() {
 			delete: this["delete"].bind(this),
 			toggle: this.toggle.bind(this),
 			init: this.init.bind(this),
-			ref: this.ref.bind(this)
+			ref: this.ref.bind(this),
+			mutate: this.ref.bind(this)
 		};
 	};
 
 	return View;
 })();
 View.prototype.sealed = false; //indicate that data should be copied before virtual items are added
+//Immer integration point
+
+View.prototype.mutate = function() {
+	throw new Error(
+		"Mutate requires Immer. Please install 'immer' and 'cx-immer' packages and enable store mutation by calling enableImmerMutate()."
+	);
+};
 
 var SubscribableView = /*#__PURE__*/ (function(_View) {
 	_inheritsLoose(SubscribableView, _View);
@@ -1450,9 +1496,9 @@ function getSelector(config) {
 						return elementSelector(data);
 					});
 				};
-			}
+			} //toString converts accessor chains to binding paths
 
-			if (config.bind) return Binding.get(config.bind).value;
+			if (config.bind) return Binding.get(config.bind.toString()).value;
 			if (config.tpl) return StringTemplate.get(config.tpl);
 			if (config.expr) return Expression.get(config.expr);
 			if (config.get) return config.get;
@@ -1467,6 +1513,7 @@ function getSelector(config) {
 			return createStructuredSelector(selectors, constants);
 
 		case "function":
+			if (isAccessorChain(config)) return Binding.get(config.toString()).value;
 			return config;
 
 		default:
@@ -1528,7 +1575,12 @@ function getSelectorConfig(props, values, nameMap) {
 				constants[p] = v;
 			}
 		} else if (isFunction(v)) {
-			functions[p] = v;
+			if (isAccessorChain(v)) {
+				var path = v.toString();
+				nameMap[p] = path;
+				functions[p] = Binding.get(path).value;
+			} else functions[p] = v;
+
 			constant = false;
 		} else {
 			if (isUndefined(v)) {
@@ -1965,7 +2017,10 @@ function getComparer(sorters, dataAccessor, comparer) {
 		for (var i = 0; i < data.length; i++) {
 			d = data[i];
 			av = d.getter(a);
-			bv = d.getter(b);
+			bv = d.getter(b); // show nulls always on the bottom
+
+			if (av == null) return bv == null ? 0 : 1;
+			if (bv == null) return -1;
 			var r = d.compare(av, bv);
 			if (r == 0) continue;
 			return d.factor * r;
@@ -2325,6 +2380,18 @@ function getAccessor(accessor, options) {
 		}
 	}
 
+	if (isAccessorChain(accessor)) {
+		var _binding = Binding.get(accessor);
+
+		return {
+			get: _binding.value,
+			set: function set(v, store) {
+				return store.set(_binding.path, v);
+			},
+			isAccessor: true
+		};
+	}
+
 	if (isSelector(accessor)) {
 		var selector = getSelector(accessor);
 		if (accessor && accessor.set)
@@ -2375,6 +2442,7 @@ export {
 	ZoomIntoPropertyView,
 	append,
 	computable,
+	createAccessorModelProxy,
 	defaultCompare,
 	diffArrays,
 	enableFatArrowExpansion,
@@ -2388,6 +2456,7 @@ export {
 	insertElement,
 	invalidateExpressionCache,
 	invalidateStringTemplateCache,
+	isAccessorChain,
 	isBinding,
 	isSelector,
 	merge,