@livenetworks/ashlar 1.6.0 → 2.0.0

package/{js → components}/ln-data-coordinator/src/ln-data-coordinator.js

@@ -1,15 +1,49 @@
-import { registerComponent, dispatch, buildDict, serializeForm, resolveFormMethod } from '../../ln-core';
-import { normalizeDataQuery, selectDataSource } from './data-read-policy';
+import { registerComponent, dispatch, buildDict, serializeForm, resolveFormMethod, createBatcher, attrSpec, defineAttrs } from '../../ln-core';
+import { normalizeDataQuery, selectDataSource, composeQuery, needsRemoteSupersede } from './data-read-policy';
 import { MutationReceipts } from './mutation-receipts';
 
 (function () {
 	const DOM_SELECTOR = 'data-ln-data-coordinator';
 	const DOM_ATTRIBUTE = 'lnDataCoordinator';
-	const DOM_ALIAS = 'lnCoordinator';
-	const SCOPE_ATTR = 'data-ln-form-scope';
-
+	const SCOPE_ATTR = 'data-ln-data-coordinator-scope';
+	const SEARCH_ATTR = 'data-ln-data-coordinator-search';
+	const FILTERS_ATTR = 'data-ln-data-coordinator-filters';
+	const SORT_FIELD_ATTR = 'data-ln-data-coordinator-sort-field';
+	const SORT_DIR_ATTR = 'data-ln-data-coordinator-sort-direction';
 	if (window[DOM_ATTRIBUTE] !== undefined) return;
 
+	// ─── Attribute Contract (SSOT) ──────────────────────────
+	function _applyMapper(el) {
+		const instance = el[DOM_ATTRIBUTE];
+		if (!instance) return;
+		instance.refreshMapper();
+	}
+
+	function _applyQuery(el) {
+		const instance = el[DOM_ATTRIBUTE];
+		if (!instance) return;
+		instance._queueQueryRefresh();
+	}
+
+	function _readName(el, name) {
+		return el.getAttribute(name) || el.id;
+	}
+
+	const ATTRIBUTES = {
+		'data-ln-data-coordinator':                { prop: '_name', type: 'string', read: _readName, description: 'Coordinator name or identifier for data routing' },
+		'data-ln-data-coordinator-scope':          { type: 'string', description: 'Scope name addressing the bound data store and connector' },
+		'data-ln-data-coordinator-mapper':         { type: 'string', effect: _applyMapper, description: 'Name of the registered data mapper transform' },
+		'data-ln-data-coordinator-search':         { type: 'string', effect: _applyQuery, description: 'Active search query term' },
+		'data-ln-data-coordinator-filters':        { type: 'string', effect: _applyQuery, description: 'Active encoded filter parameters' },
+		'data-ln-data-coordinator-sort-field':     { type: 'string', effect: _applyQuery, description: 'Active sort field property name' },
+		'data-ln-data-coordinator-sort-direction': { type: 'enum', values: ['asc', 'desc'], fallback: 'asc', effect: _applyQuery, description: 'Sort direction' },
+		'data-ln-data-coordinator-stale':          { type: 'marker', description: 'Flag indicating data needs re-synchronization' },
+		'data-ln-data-coordinator-no-autosync':    { type: 'boolean', description: 'Disables automatic synchronization upon state changes' },
+		'data-ln-data-coordinator-dict':           { type: 'marker', description: 'Marks dictionary container for coordinator translatable messages' }
+	};
+
+	const ATTR_SPEC = attrSpec(ATTRIBUTES);
+
 	// ─── Sync Orchestration Singleton ──────────────────────
 
 	const _coordinators = new Set();
@@ -23,14 +57,14 @@ import { MutationReceipts } from './mutation-receipts';
 		_globalSyncInstalled = true;
 
 		_onlineHandler = function () {
-			dispatch(document, 'ln-data-store:online', {});
+			dispatch(document, 'ln-data-coordinator:online', {});
 			_coordinators.forEach(function (coord) {
 				coord._maybeSync();
 			});
 		};
 
 		_offlineHandler = function () {
-			dispatch(document, 'ln-data-store:offline', {});
+			dispatch(document, 'ln-data-coordinator:offline', {});
 		};
 
 		_visibilityHandler = function () {
@@ -77,27 +111,42 @@ import { MutationReceipts } from './mutation-receipts';
 	}
 
 	// Connector response namespaces — generalized so writes work whether the
-	// paired connector is ln-api-connector or ln-couchdb-connector.
-	const CONNECTOR_RESPONSE_NAMESPACES = ['ln-api-connector', 'ln-couchdb-connector'];
+	// paired connector is ln-api-connector, ln-couchdb-connector or
+	// ln-websocket-connector. A socket beside a REST connector only pushes;
+	// its :fetched still arrives here.
+	const CONNECTOR_RESPONSE_NAMESPACES = ['ln-api-connector', 'ln-couchdb-connector', 'ln-websocket-connector'];
+
+	function _connectorNamespace(connectorEl) {
+		if (!connectorEl) return 'ln-api-connector';
+		if (connectorEl.hasAttribute('data-ln-couchdb-connector')) return 'ln-couchdb-connector';
+		if (connectorEl.hasAttribute('data-ln-websocket-connector')) return 'ln-websocket-connector';
+		return 'ln-api-connector';
+	}
 
 	// ─── Component Constructor ─────────────────────────────
 
 	function _component(dom) {
+		const self = this;
 		this.dom = dom;
-		this._name = dom.getAttribute(DOM_SELECTOR);
+		defineAttrs(this, dom, ATTR_SPEC);
+		if (!this._name) console.warn('[ln-data-coordinator] missing id — the coordinator cannot be addressed', dom);
 		dom[DOM_ATTRIBUTE] = this;
-		dom[DOM_ALIAS] = this;
 
+		this._destroyed = false;
 		this.mapper = null;
 		this._handlers = null;
 		this._boundQueries = new WeakMap();
 		this._boundDelivered = new WeakMap();
+		this._queryGens = new WeakMap();
 		this._mutationReceipts = new MutationReceipts();
 		this._dict = buildDict(dom, 'data-ln-data-coordinator-dict'); // flat key→string error-toast map; {} if none
 
-		this._parseStaleAttributes();
+		this._queueQueryRefresh = createBatcher(function () {
+			if (self._destroyed) return;
+			self._refreshAll(null, true);
+		});
 
-		this.refreshMapper();
+		this.refreshConfig();
 		_bindEvents(this);
 
 		_coordinators.add(this);
@@ -108,20 +157,31 @@ import { MutationReceipts } from './mutation-receipts';
 		return this;
 	}
 
-	// ─── Stale / No-Autosync Attribute Parsing ──────────────
-
-	_component.prototype._parseStaleAttributes = function () {
-		const children = this.findChildren();
-		const storeEl = children.storeEl;
+	// ─── Observable Live Attributes (Single Source of Truth) ──
+
+	Object.defineProperty(_component.prototype, '_staleThreshold', {
+		get: function () {
+			const children = this.findChildren();
+			const storeEl = children.storeEl;
+			const staleAttr = this.dom.getAttribute('data-ln-data-coordinator-stale')
+				|| (storeEl ? storeEl.getAttribute('data-ln-data-store-stale') : null);
+			if (staleAttr === 'never' || staleAttr === '-1') return -1;
+			const parsed = parseInt(staleAttr, 10);
+			return isNaN(parsed) ? 300 : parsed;
+		}
+	});
 
-		const staleAttr = this.dom.getAttribute('data-ln-data-coordinator-stale')
-			|| (storeEl ? storeEl.getAttribute('data-ln-data-store-stale') : null);
-		const parsed = parseInt(staleAttr, 10);
-		this._staleThreshold = (staleAttr === 'never' || staleAttr === '-1') ? -1 : (isNaN(parsed) ? 300 : parsed);
+	Object.defineProperty(_component.prototype, '_noAutosync', {
+		get: function () {
+			const children = this.findChildren();
+			const storeEl = children.storeEl;
+			return this.dom.hasAttribute('data-ln-data-coordinator-no-autosync')
+				|| (storeEl ? storeEl.hasAttribute('data-ln-data-store-no-autosync') : false);
+		}
+	});
 
-		const noAutosyncAttr = this.dom.hasAttribute('data-ln-data-coordinator-no-autosync')
-			|| (storeEl ? storeEl.hasAttribute('data-ln-data-store-no-autosync') : false);
-		this._noAutosync = !!noAutosyncAttr;
+	_component.prototype.refreshConfig = function () {
+		this.refreshMapper();
 	};
 
 	_component.prototype._isStale = function () {
@@ -150,6 +210,7 @@ import { MutationReceipts } from './mutation-receipts';
 		if (!store) return;
 
 		Promise.resolve(store.ready).then(function () {
+			if (self._destroyed) return;
 			const children = self.findChildren();
 			const currentStore = children.store;
 			if (currentStore && currentStore.initializationError) {
@@ -159,6 +220,7 @@ import { MutationReceipts } from './mutation-receipts';
 			if (!currentStore || !children.connector || self._noAutosync || currentStore.isSyncing) return;
 			if (!currentStore.hasCache || self._isStale()) currentStore.forceSync();
 		}).catch(function (error) {
+			if (self._destroyed) return;
 			self._reportReconciliationError('store-initialize', error, null);
 		});
 	};
@@ -175,7 +237,8 @@ import { MutationReceipts } from './mutation-receipts';
 		}
 
 		// 2. Resolve to registered external mapper
-		const mapperName = this.dom.getAttribute('data-ln-data-mapper') || this.dom.getAttribute('data-ln-data-coordinator');
+		const mapperName = this.dom.getAttribute('data-ln-data-coordinator-mapper')
+			|| this.dom.id;
 		if (mapperName && window.lnCore && typeof window.lnCore.getDataMapper === 'function') {
 			this.mapper = window.lnCore.getDataMapper(mapperName);
 		}
@@ -198,15 +261,18 @@ import { MutationReceipts } from './mutation-receipts';
 
 	_component.prototype.findChildren = function () {
 		const storeEl = this.dom.querySelector('[data-ln-data-store]');
-		const connectorEl = this.dom.querySelector('[data-ln-api-connector], [data-ln-couchdb-connector], [data-ln-websocket-connector], [data-ln-rest-connector]');
+		// Requests go to a REST/CouchDB connector when there is one; a socket
+		// takes them only when it is the sole transport.
+		const connectorEl = this.dom.querySelector('[data-ln-api-connector], [data-ln-couchdb-connector]')
+			|| this.dom.querySelector('[data-ln-websocket-connector]');
 		const queueEl = this.dom.querySelector('[data-ln-api-queue]');
 
 		return {
 			storeEl: storeEl,
 			connectorEl: connectorEl,
 			queueEl: queueEl,
-			store: storeEl ? (storeEl.lnDataStore || storeEl.lnStore) : null,
-			connector: connectorEl ? (connectorEl.lnConnector || connectorEl.lnApiConnector || connectorEl.lnCouchDbConnector) : null,
+			store: storeEl ? storeEl.lnDataStore : null,
+			connector: connectorEl ? (connectorEl.lnApiConnector || connectorEl.lnCouchDbConnector || connectorEl.lnWebsocketConnector) : null,
 			queue: queueEl ? queueEl.lnApiQueue : null
 		};
 	};
@@ -215,8 +281,8 @@ import { MutationReceipts } from './mutation-receipts';
 
 	_component.prototype._handleSubmitRecord = function (detail) {
 		const children = this.findChildren();
-		if (!children.storeEl) {
-			console.warn('[ln-data-coordinator] form submit claimed but no [data-ln-data-store] child found in "' + (this._name || '') + '"');
+		if (!children.storeEl && !children.connectorEl) {
+			console.warn('[ln-data-coordinator] form submit claimed but neither [data-ln-data-store] nor a connector child found in "' + (this._name || '') + '"');
 			return;
 		}
 
@@ -242,7 +308,9 @@ import { MutationReceipts } from './mutation-receipts';
 		this.refreshMapper();
 		const tempId = '_temp_' + _uuid();
 
-		dispatch(children.storeEl, 'ln-data-store:request-create', { tempId: tempId, data: data });
+		if (children.storeEl) {
+			dispatch(children.storeEl, 'ln-data-store:request-create', { tempId: tempId, data: data });
+		}
 
 		if (children.queue) {
 			dispatch(children.queueEl, 'ln-api-queue:request-enqueue', {
@@ -251,7 +319,7 @@ import { MutationReceipts } from './mutation-receipts';
 				meta: { tempId: tempId, action: action }
 			});
 		} else if (children.connector) {
-			dispatch(children.connectorEl, 'ln-api-connector:request-create', {
+			dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-create', {
 				data: this.mapper.egress(data), url: action,
 				meta: { entryId: _uuid(), queued: false, op: 'create', tempId: tempId }
 			});
@@ -261,7 +329,9 @@ import { MutationReceipts } from './mutation-receipts';
 	_component.prototype._fanOutUpdate = function (children, id, data, expectedVersion, action) {
 		this.refreshMapper();
 
-		dispatch(children.storeEl, 'ln-data-store:request-update', { id: id, data: data });
+		if (children.storeEl) {
+			dispatch(children.storeEl, 'ln-data-store:request-update', { id: id, data: data });
+		}
 
 		if (children.queue) {
 			dispatch(children.queueEl, 'ln-api-queue:request-enqueue', {
@@ -270,7 +340,7 @@ import { MutationReceipts } from './mutation-receipts';
 				meta: { id: id, action: action }
 			});
 		} else if (children.connector) {
-			dispatch(children.connectorEl, 'ln-api-connector:request-update', {
+			dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-update', {
 				id: id, data: this.mapper.egress(data), expected_version: expectedVersion, url: action,
 				meta: { entryId: _uuid(), queued: false, op: 'update', id: id }
 			});
@@ -280,14 +350,16 @@ import { MutationReceipts } from './mutation-receipts';
 	_component.prototype._fanOutDelete = function (children, id) {
 		this.refreshMapper();
 
-		dispatch(children.storeEl, 'ln-data-store:request-delete', { id: id });
+		if (children.storeEl) {
+			dispatch(children.storeEl, 'ln-data-store:request-delete', { id: id });
+		}
 
 		if (children.queue) {
 			dispatch(children.queueEl, 'ln-api-queue:request-enqueue', {
 				chainKey: id, op: 'delete', targetId: id, payload: null, expectedVersion: null, meta: { id: id }
 			});
 		} else if (children.connector) {
-			dispatch(children.connectorEl, 'ln-api-connector:request-delete', {
+			dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-delete', {
 				id: id, meta: { entryId: _uuid(), queued: false, op: 'delete', id: id }
 			});
 		}
@@ -297,14 +369,16 @@ import { MutationReceipts } from './mutation-receipts';
 		this.refreshMapper();
 		const bulkKey = ids.join(',');
 
-		dispatch(children.storeEl, 'ln-data-store:request-bulk-delete', { ids: ids });
+		if (children.storeEl) {
+			dispatch(children.storeEl, 'ln-data-store:request-bulk-delete', { ids: ids });
+		}
 
 		if (children.queue) {
 			dispatch(children.queueEl, 'ln-api-queue:request-enqueue', {
 				chainKey: bulkKey, op: 'bulk-delete', targetId: null, payload: { ids: ids }, expectedVersion: null, meta: { bulkKey: bulkKey, ids: ids }
 			});
 		} else if (children.connector) {
-			dispatch(children.connectorEl, 'ln-api-connector:request-bulk-delete', {
+			dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-bulk-delete', {
 				ids: ids, meta: { entryId: _uuid(), queued: false, op: 'bulk-delete', bulkKey: bulkKey }
 			});
 		}
@@ -314,21 +388,17 @@ import { MutationReceipts } from './mutation-receipts';
 
 	_component.prototype._toastFromMessage = function (message) {
 		if (!message) return;
-		window.dispatchEvent(new CustomEvent('ln-toast:enqueue', {
-			detail: {
-				type: message.type || 'success',
-				title: message.title || '',
-				message: message.body || ''
-			}
-		}));
+		dispatch(window, 'ln-toast:enqueue', {
+			type: message.type || 'success',
+			title: message.title || '',
+			message: message.body || ''
+		});
 	};
 
 	_component.prototype._toastFromDict = function (key) {
 		const text = this._dict[key];
 		if (!text) return;
-		window.dispatchEvent(new CustomEvent('ln-toast:enqueue', {
-			detail: { type: 'error', title: '', message: text }
-		}));
+		dispatch(window, 'ln-toast:enqueue', { type: 'error', title: '', message: text });
 	};
 
 	_component.prototype._requestStoreMutation = function (children, action, detail) {
@@ -337,15 +407,12 @@ import { MutationReceipts } from './mutation-receipts';
 
 		const requestId = _uuid();
 		const receipt = this._mutationReceipts.wait(requestId);
-		try {
-			dispatch(storeEl, 'ln-data-store:request-' + action, Object.assign({}, detail, { requestId }));
-		} catch (error) {
-			this._mutationReceipts.reject({ requestId, error });
-		}
+		dispatch(storeEl, 'ln-data-store:request-' + action, Object.assign({}, detail, { requestId }));
 		return receipt;
 	};
 
 	_component.prototype._reportReconciliationError = function (operation, error, meta) {
+		if (this._destroyed) return;
 		dispatch(this.dom, 'ln-data-coordinator:error', {
 			operation,
 			error,
@@ -364,30 +431,39 @@ import { MutationReceipts } from './mutation-receipts';
 					console.warn('[ln-data-coordinator] Cannot sync: store or connector not found in subtree');
 					return;
 				}
-				dispatch(children.connectorEl, 'ln-api-connector:request-sync', { since: e.detail.since, meta: { op: 'sync' } });
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-sync', { since: e.detail.since, meta: { op: 'sync' } });
+			},
+
+			requestPage: function (e) {
+				const children = self.findChildren();
+				if (!children.connectorEl) return;
+				const detail = e.detail || {};
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+					query: Object.assign({}, detail.query, {
+						offset: detail.offset,
+						limit: detail.limit,
+						queryGen: detail.queryGen
+					})
+				});
 			},
 
 			reqCreate: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				self._fanOutCreate(children, e.detail.data || {}, e.detail.action);
 			},
 
 			reqUpdate: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				self._fanOutUpdate(children, e.detail.id, e.detail.data || {}, e.detail.expected_version, e.detail.action);
 			},
 
 			reqDelete: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				self._fanOutDelete(children, e.detail.id);
 			},
 
 			reqBulkDelete: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				self._fanOutBulkDelete(children, e.detail.ids || []);
 			},
 
@@ -412,22 +488,22 @@ import { MutationReceipts } from './mutation-receipts';
 				const idempotencyKey = detail.idempotencyKey || entryId;
 
 				if (op === 'create') {
-					dispatch(children.connectorEl, 'ln-api-connector:request-create', {
+					dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-create', {
 						data: payload, url: resourceUrl, idempotencyKey: idempotencyKey,
 						meta: { entryId: entryId, queued: true, op: 'create', tempId: queueMeta.tempId }
 					});
 				} else if (op === 'update') {
-					dispatch(children.connectorEl, 'ln-api-connector:request-update', {
+					dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-update', {
 						id: targetId, data: payload, expected_version: expectedVersion, url: resourceUrl, idempotencyKey: idempotencyKey,
 						meta: { entryId: entryId, queued: true, op: 'update', id: targetId }
 					});
 				} else if (op === 'delete') {
-					dispatch(children.connectorEl, 'ln-api-connector:request-delete', {
+					dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-delete', {
 						id: targetId, idempotencyKey: idempotencyKey,
 						meta: { entryId: entryId, queued: true, op: 'delete', id: targetId }
 					});
 				} else if (op === 'bulk-delete') {
-					dispatch(children.connectorEl, 'ln-api-connector:request-bulk-delete', {
+					dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-bulk-delete', {
 						ids: (payload && payload.ids) ? payload.ids : [],
 						idempotencyKey: idempotencyKey,
 						meta: { entryId: entryId, queued: true, op: 'bulk-delete', bulkKey: queueMeta.bulkKey }
@@ -447,7 +523,7 @@ import { MutationReceipts } from './mutation-receipts';
 
 				let isMine;
 				if (scopeAttr) {
-					isMine = (scopeAttr === self._name);
+					isMine = self._owns(scopeAttr);
 				} else {
 					isMine = (form.closest('[data-ln-data-coordinator]') === self.dom);
 				}
@@ -488,8 +564,9 @@ import { MutationReceipts } from './mutation-receipts';
 				// 1. Pass fetched remote data strictly to ln-data-store (Single Source of Truth)
 				if (children.store && !children.store.initializationError) {
 					if (meta.kind) {
-						if (meta.kind === 'table' || meta.kind === 'list') {
+						if (meta.kind === 'table' || meta.kind === 'list' || meta.kind === 'chart') {
 							children.store.applyQuery(normalizedData, { total: e.detail.total }).then(function (decorated) {
+								if (meta.queryGen != null && !self._isCurrentGen(meta.targetEl, meta.queryGen)) return;
 								dispatch(meta.targetEl, 'ln-' + meta.kind + ':set-loading', { loading: false });
 								dispatch(meta.targetEl, 'ln-' + meta.kind + ':set-data', {
 									data: decorated,
@@ -504,10 +581,12 @@ import { MutationReceipts } from './mutation-receipts';
 							children.store.applyQuery(normalizedData, { total: e.detail.total }).then(function () {
 								return children.store.getAll({});
 							}).then(function (r) {
+								if (meta.queryGen != null && !self._isCurrentGen(meta.targetEl, meta.queryGen)) return;
 								dispatch(meta.targetEl, 'ln-options:set-data', { data: r.data });
 							});
 						} else if (meta.kind === 'stat') {
 							children.store.applyQuery(normalizedData, { total: e.detail.total }).then(function () {
+								if (meta.queryGen != null && !self._isCurrentGen(meta.targetEl, meta.queryGen)) return;
 								const count = e.detail.filtered !== undefined
 									? e.detail.filtered
 									: (e.detail.total !== undefined ? e.detail.total : normalizedData.length);
@@ -524,7 +603,7 @@ import { MutationReceipts } from './mutation-receipts';
 						});
 					}
 				} else if (meta.targetEl && meta.kind) {
-					if (meta.kind === 'table' || meta.kind === 'list') {
+					if (meta.kind === 'table' || meta.kind === 'list' || meta.kind === 'chart') {
 						dispatch(meta.targetEl, 'ln-' + meta.kind + ':set-loading', { loading: false });
 						dispatch(meta.targetEl, 'ln-' + meta.kind + ':set-data', {
 							data: normalizedData,
@@ -547,11 +626,13 @@ import { MutationReceipts } from './mutation-receipts';
 
 			connCreated: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				const meta = e.detail.meta || {};
 				const serverRecord = self.mapper.ingress(e.detail.record);
+				const reconciled = children.storeEl
+					? self._requestStoreMutation(children, 'update', { id: meta.tempId, data: serverRecord })
+					: Promise.resolve();
 
-				self._requestStoreMutation(children, 'update', { id: meta.tempId, data: serverRecord })
+				reconciled
 					.then(function () {
 						self._toastFromMessage(e.detail.message);
 						if (meta.queued && children.queue) {
@@ -569,11 +650,13 @@ import { MutationReceipts } from './mutation-receipts';
 
 			connUpdated: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				const meta = e.detail.meta || {};
 				const serverRecord = self.mapper.ingress(e.detail.record);
+				const reconciled = children.storeEl
+					? self._requestStoreMutation(children, 'update', { id: meta.id, data: serverRecord })
+					: Promise.resolve();
 
-				self._requestStoreMutation(children, 'update', { id: meta.id, data: serverRecord })
+				reconciled
 					.then(function () {
 						self._toastFromMessage(e.detail.message);
 						if (meta.queued && children.queue) {
@@ -587,7 +670,6 @@ import { MutationReceipts } from './mutation-receipts';
 
 			connDeleted: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				const meta = e.detail.meta || {};
 				// Optimistic delete already applied; no local reconciliation.
 				self._toastFromMessage(e.detail.message); // null on 204 → silent
@@ -598,7 +680,6 @@ import { MutationReceipts } from './mutation-receipts';
 
 			connBulkDeleted: function (e) {
 				const children = self.findChildren();
-				if (!children.storeEl) return;
 				const meta = e.detail.meta || {};
 				self._toastFromMessage(e.detail.message);
 				if (meta.queued && children.queue) {
@@ -610,7 +691,7 @@ import { MutationReceipts } from './mutation-receipts';
 				const detail = e.detail || {};
 				const meta = detail.meta || {};
 				const op = meta.op || detail.action;
-				const status = detail.status || 0;
+				const status = detail.status || (detail.error && detail.error.status) || 0;
 				const children = self.findChildren();
 
 				if (op === 'sync') {
@@ -635,11 +716,9 @@ import { MutationReceipts } from './mutation-receipts';
 					return;
 				}
 
-				if (!children.storeEl) return;
-
-				const isAuth      = status === 401 || status === 419;
+				const isAuth = status === 401 || status === 419;
 				const isTransient = status === 0 || status >= 500;
-				const isConflict  = status === 409;
+				const isConflict = status === 409 || status === 412;
 
 				// ── Auth: pause queue, keep local write ──
 				if (isAuth) {
@@ -666,12 +745,14 @@ import { MutationReceipts } from './mutation-receipts';
 				let reconciliation = Promise.resolve();
 				if (isConflict && op === 'update') {
 					const remote = detail.data && detail.data.remote ? self.mapper.ingress(detail.data.remote) : null;
-					if (remote) {
+					if (remote && children.storeEl) {
 						reconciliation = self._requestStoreMutation(children, 'update', { id: meta.id, data: remote });
 					}
 					self._toastFromDict('conflict');
 				} else if (op === 'create') {
-					reconciliation = self._requestStoreMutation(children, 'delete', { id: meta.tempId });
+					if (children.storeEl) {
+						reconciliation = self._requestStoreMutation(children, 'delete', { id: meta.tempId });
+					}
 					self._toastFromDict('rejected');
 				} else {
 					// update/delete/bulk generic 4xx (incl. 404): leave local, next sync reconciles
@@ -705,25 +786,83 @@ import { MutationReceipts } from './mutation-receipts';
 				}
 			},
 
+			// A (re)opened socket may have missed pushes — catch up with a delta
+			// sync over whichever connector takes requests.
+			socketConnected: function () {
+				const children = self.findChildren();
+				const store = children.store;
+				if (!store || store.initializationError || !children.connector || self._noAutosync || !store.isInitialized || store.isSyncing) return;
+				store.forceSync();
+			},
+
 			// ─── View Binder Handlers ─────────────────────────────
 			reqTableData: function (e) { self._serveData(e, 'table'); },
-			reqListData:  function (e) { self._serveData(e, 'list'); },
-			reqOptions:   function (e) { self._serveOptions(e); },
-			reqStat:      function (e) { self._serveStat(e); },
+			reqListData: function (e) { self._serveData(e, 'list'); },
+			reqChartData: function (e) { self._serveData(e, 'chart'); },
+			reqOptions: function (e) { self._serveOptions(e); },
+			reqStat: function (e) { self._serveStat(e); },
+			refreshQuery: function () { self._refreshAll(null, true); },
 			refresh: function (e) {
 				self._mutationReceipts.resolve(e.detail);
-				self._refreshAll();
+				self._refreshAll(null, false);
 			},
 			mutationError: function (e) {
 				self._mutationReceipts.reject(e.detail);
 			},
 			refreshSynced: function (e) {
-				if (e.detail && e.detail.changed) self._refreshAll(e.detail.meta);
+				if (e.detail && e.detail.changed) self._refreshAll(e.detail.meta, false);
+			},
+
+			searchChange: function (e) {
+				e.preventDefault();
+				const term = (e.detail && e.detail.term != null) ? e.detail.term : '';
+				if (term === (self.dom.getAttribute(SEARCH_ATTR) || '')) return;
+				self.dom.setAttribute(SEARCH_ATTR, term);
+			},
+
+			filterChange: function (e) {
+				e.preventDefault();
+				const key = e.detail && e.detail.key;
+				if (!key) return;
+				const values = (e.detail.values || []).slice();
+				const filters = self._currentQuery().filters;
+				const prev = filters[key];
+				const unchanged = prev
+					? (prev.length === values.length && prev.every((v, i) => v === values[i]))
+					: !values.length;
+				if (unchanged) return;
+				if (values.length) filters[key] = values;
+				else delete filters[key];
+				const params = new URLSearchParams();
+				Object.keys(filters).forEach(function (k) {
+					filters[k].forEach(function (v) { params.append(k, v); });
+				});
+				const next = params.toString();
+				if (next) self.dom.setAttribute(FILTERS_ATTR, next);
+				else self.dom.removeAttribute(FILTERS_ATTR);
+			},
+
+			sortChange: function (e) {
+				e.preventDefault();
+				const field = e.detail && e.detail.field;
+				const direction = e.detail && e.detail.direction;
+				const next = (field && direction && direction !== 'none') ? { field: field, direction: direction } : null;
+				const prev = self._currentQuery().sort;
+				const unchanged = (!prev && !next) || (prev && next && prev.field === next.field && prev.direction === next.direction);
+				if (unchanged) return;
+				if (next) {
+					self.dom.setAttribute(SORT_FIELD_ATTR, next.field);
+					self.dom.setAttribute(SORT_DIR_ATTR, next.direction);
+				} else {
+					self.dom.removeAttribute(SORT_FIELD_ATTR);
+					self.dom.removeAttribute(SORT_DIR_ATTR);
+				}
 			}
 		};
 
 		// Sync request bubbling up from the child store
 		self.dom.addEventListener('ln-data-store:request-remote-sync', self._handlers.sync);
+		self.dom.addEventListener('ln-data-store:request-page', self._handlers.requestPage);
 
 		// Coordinator-namespaced intake events (parallel fan-out)
 		self.dom.addEventListener('ln-data-coordinator:request-create', self._handlers.reqCreate);
@@ -737,6 +876,7 @@ import { MutationReceipts } from './mutation-receipts';
 
 		// Sync ownership — store initialization
 		self.dom.addEventListener('ln-data-store:initialized', self._handlers.storeInitialized);
+		self.dom.addEventListener('ln-websocket-connector:connected', self._handlers.socketConnected);
 
 		// Form write intake — native submit, document-level, bubble phase (never
 		// capture: ln-validate's own submit gate on the form must run first)
@@ -754,34 +894,64 @@ import { MutationReceipts } from './mutation-receipts';
 
 		// View binder — request handlers (document-level to reach tables/lists outside this subtree)
 		document.addEventListener('ln-table:request-data', self._handlers.reqTableData);
-		document.addEventListener('ln-list:request-data',  self._handlers.reqListData);
+		document.addEventListener('ln-list:request-data', self._handlers.reqListData);
+		document.addEventListener('ln-chart:request-data', self._handlers.reqChartData);
 		document.addEventListener('ln-options:request-data', self._handlers.reqOptions);
-		document.addEventListener('ln-stat:request-count',  self._handlers.reqStat);
+		document.addEventListener('ln-stat:request-count', self._handlers.reqStat);
 
 		// Store-change refresh — attach to self.dom so bubbling store events are caught
-		self.dom.addEventListener('ln-data-store:ready',   self._handlers.refresh);
+		self.dom.addEventListener('ln-data-store:ready', self._handlers.refresh);
 		self.dom.addEventListener('ln-data-store:created', self._handlers.refresh);
 		self.dom.addEventListener('ln-data-store:updated', self._handlers.refresh);
 		self.dom.addEventListener('ln-data-store:deleted', self._handlers.refresh);
 		self.dom.addEventListener('ln-data-store:mutation-error', self._handlers.mutationError);
-		self.dom.addEventListener('ln-data-store:synced',  self._handlers.refreshSynced);
+		self.dom.addEventListener('ln-data-store:synced', self._handlers.refreshSynced);
+		self.dom.addEventListener('ln-data-store:query-changed', self._handlers.refreshQuery);
+
+		// Query state — owned by the coordinator, written from the axis events
+		self.dom.addEventListener('ln-search:change', self._handlers.searchChange);
+		self.dom.addEventListener('ln-filter:change', self._handlers.filterChange);
+		self.dom.addEventListener('ln-sort:change', self._handlers.sortChange);
 	}
 
 	// ─── Store↔View Binder ───────────────────────────────────
 
-	_component.prototype._ownsStore = function (name) {
-		const children = this.findChildren();
-		if (children.store && children.store._name === name && name) return true;
-		if (this._name === name && name) return true;
-		return false;
+	_component.prototype._owns = function (name) {
+		return !!name && name === this._name;
+	};
+
+	// ─── Query State — owned by the coordinator, read live (§1 doctrine) ────
+
+	_component.prototype._currentQuery = function () {
+		const field = this.dom.getAttribute(SORT_FIELD_ATTR);
+		const direction = this.dom.getAttribute(SORT_DIR_ATTR);
+		const params = new URLSearchParams(this.dom.getAttribute(FILTERS_ATTR) || '');
+		const filters = {};
+		for (const key of new Set(params.keys())) filters[key] = params.getAll(key);
+		return {
+			search: this.dom.getAttribute(SEARCH_ATTR) || '',
+			filters: filters,
+			sort: (field && direction) ? { field: field, direction: direction } : null
+		};
+	};
+
+	_component.prototype._nextQueryGen = function (el) {
+		const gen = (this._queryGens.get(el) || 0) + 1;
+		this._queryGens.set(el, gen);
+		return gen;
+	};
+
+	_component.prototype._isCurrentGen = function (el, gen) {
+		return this._queryGens.get(el) === gen;
 	};
 
 	_component.prototype._serveData = function (e, kind) {
 		const el = e.target;
-		const attrName = kind === 'table' ? 'data-ln-table-store' : 'data-ln-list-store';
-		const storeName = el.getAttribute(attrName) || el.getAttribute('data-ln-table-source') || el.getAttribute('data-ln-list-source');
+		const attrName = kind === 'table' ? 'data-ln-table-source'
+			: (kind === 'list' ? 'data-ln-list-source' : 'data-ln-chart-source');
+		const storeName = el.getAttribute(attrName);
 		if (!storeName) return;
-		if (!this._ownsStore(storeName)) return;
+		if (!this._owns(storeName)) return;
 
 		const request = e.detail || {};
 		const query = normalizeDataQuery(request);
@@ -789,17 +959,22 @@ import { MutationReceipts } from './mutation-receipts';
 
 		const children = this.findChildren();
 		const self = this;
-		const isWindowed = request.offset != null;
 		const store = children.store;
 		const ready = store && store.ready ? store.ready : Promise.resolve();
 
 		return ready.then(function () {
-			const source = selectDataSource(store, children.connector, isWindowed);
+			if (self._destroyed) return;
+			const source = selectDataSource(store, children.connector);
+			const effective = composeQuery(query, self._currentQuery());
 			if (source === 'remote') {
+				// The source owns search/filter/sort even when it holds no rows yet —
+				// the view only contributes the page window, so the server must be
+				// asked with the composed query, not the view's request as it arrived.
+				const gen = self._nextQueryGen(el);
 				dispatch(el, 'ln-' + kind + ':set-loading', { loading: true });
-				dispatch(children.connectorEl, 'ln-api-connector:request-query', {
-					query: query,
-					meta: { targetEl: el, kind: kind, offset: query.offset, limit: query.limit }
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+					query: effective,
+					meta: { targetEl: el, kind: kind, offset: effective.offset, limit: effective.limit, queryGen: gen }
 				});
 				return;
 			}
@@ -809,18 +984,33 @@ import { MutationReceipts } from './mutation-receipts';
 				return;
 			}
 
-			return store.getAll(query).then(function (r) {
+			const supersede = needsRemoteSupersede(store, children.connector, source);
+			const gen = supersede ? self._nextQueryGen(el) : null;
+			if (supersede) {
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+					query: effective,
+					meta: { targetEl: el, kind: kind, offset: effective.offset, limit: effective.limit, queryGen: gen }
+				});
+			}
+
+			return store.getAll(effective).then(function (r) {
+				if (self._destroyed || !self._boundDelivered) return;
+				if (supersede && !self._isCurrentGen(el, gen)) return; // a newer request has already superseded this one
 				const detail = {
 					data: r.data,
 					total: r.total,
 					filtered: r.filtered,
 					offset: request.offset !== undefined ? request.offset : r.offset,
-					queryGen: request.queryGen !== undefined ? request.queryGen : r.queryGen
+					queryGen: request.queryGen !== undefined ? request.queryGen : r.queryGen,
+					// The store answered from its own records while the server query
+					// is still out; the view renders it but keeps the refresh showing.
+					provisional: supersede || r.provisional === true
 				};
 				dispatch(el, 'ln-' + kind + ':set-data', detail);
 				self._boundDelivered.set(el, true);
 			});
 		}).catch(function (error) {
+			if (self._destroyed) return;
 			dispatch(el, 'ln-' + kind + ':set-loading', { loading: false });
 			dispatch(self.dom, 'ln-data-coordinator:error', {
 				operation: 'query',
@@ -835,7 +1025,7 @@ import { MutationReceipts } from './mutation-receipts';
 	_component.prototype._serveOptions = function (e) {
 		const el = e.target;
 		const name = el.getAttribute('data-ln-options');
-		if (!this._ownsStore(name)) return;
+		if (!this._owns(name)) return;
 
 		const children = this.findChildren();
 		const store = children.store;
@@ -843,19 +1033,34 @@ import { MutationReceipts } from './mutation-receipts';
 		const self = this;
 
 		return ready.then(function () {
-			const source = selectDataSource(store, children.connector, false);
+			if (self._destroyed) return;
+			const source = selectDataSource(store, children.connector);
 			if (source === 'remote') {
-				dispatch(children.connectorEl, 'ln-api-connector:request-query', {
+				const gen = self._nextQueryGen(el);
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
 					query: {},
-					meta: { targetEl: el, kind: 'options' }
+					meta: { targetEl: el, kind: 'options', queryGen: gen }
 				});
 				return;
 			}
 			if (source !== 'store') return;
+
+			const supersede = needsRemoteSupersede(store, children.connector, source);
+			const gen = supersede ? self._nextQueryGen(el) : null;
+			if (supersede) {
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+					query: {},
+					meta: { targetEl: el, kind: 'options', queryGen: gen }
+				});
+			}
+
 			return store.getAll({}).then(function (r) {
+				if (self._destroyed) return;
+				if (supersede && !self._isCurrentGen(el, gen)) return;
 				dispatch(el, 'ln-options:set-data', { data: r.data });
 			});
 		}).catch(function (error) {
+			if (self._destroyed) return;
 			self._reportReconciliationError('options-query', error, { targetEl: el, kind: 'options' });
 		});
 	};
@@ -863,7 +1068,7 @@ import { MutationReceipts } from './mutation-receipts';
 	_component.prototype._serveStat = function (e) {
 		const el = e.target;
 		const name = el.getAttribute('data-ln-stat');
-		if (!this._ownsStore(name)) return;
+		if (!this._owns(name)) return;
 
 		const filters = e.detail && e.detail.filters ? e.detail.filters : null;
 		const children = this.findChildren();
@@ -872,36 +1077,56 @@ import { MutationReceipts } from './mutation-receipts';
 		const self = this;
 
 		return ready.then(function () {
-			const source = selectDataSource(store, children.connector, false);
+			if (self._destroyed) return;
+			const hasFilters = filters && Object.keys(filters).length > 0;
+			const requiresRemote = !!(children.connector && store && ((store.windowed && hasFilters) || store.noLocalQuery));
+			const source = requiresRemote ? 'remote' : selectDataSource(store, children.connector);
 			if (source === 'remote') {
-				dispatch(children.connectorEl, 'ln-api-connector:request-query', {
+				const gen = self._nextQueryGen(el);
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
 					query: { filters: filters },
-					meta: { targetEl: el, kind: 'stat' }
+					meta: { targetEl: el, kind: 'stat', queryGen: gen }
 				});
 				return;
 			}
 			if (source !== 'store') return;
+
+			const supersede = !requiresRemote && needsRemoteSupersede(store, children.connector, source);
+			const gen = supersede ? self._nextQueryGen(el) : null;
+			if (supersede) {
+				dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+					query: { filters: filters },
+					meta: { targetEl: el, kind: 'stat', queryGen: gen }
+				});
+			}
+
 			return store.count(filters).then(function (n) {
+				if (self._destroyed) return;
+				if (supersede && !self._isCurrentGen(el, gen)) return;
 				dispatch(el, 'ln-stat:set-count', { count: n });
 			});
 		}).catch(function (error) {
+			if (self._destroyed) return;
 			self._reportReconciliationError('stat-query', error, { targetEl: el, kind: 'stat' });
 		});
 	};
 
-	_component.prototype._refreshAll = function (syncMeta) {
+	_component.prototype._refreshAll = function (syncMeta, isQueryChange) {
 		const self = this;
-		const allBound = document.querySelectorAll('[data-ln-table-store],[data-ln-list-store],[data-ln-options],[data-ln-stat]');
+		const allBound = document.querySelectorAll('[data-ln-table-source],[data-ln-list-source],[data-ln-chart-source],[data-ln-options],[data-ln-stat]');
 		for (let i = 0; i < allBound.length; i++) {
 			const el = allBound[i];
 			let storeName, kind;
 
-			if (el.hasAttribute('data-ln-table-store')) {
-				storeName = el.getAttribute('data-ln-table-store');
+			if (el.hasAttribute('data-ln-table-source')) {
+				storeName = el.getAttribute('data-ln-table-source');
 				kind = 'table';
-			} else if (el.hasAttribute('data-ln-list-store')) {
-				storeName = el.getAttribute('data-ln-list-store');
+			} else if (el.hasAttribute('data-ln-list-source')) {
+				storeName = el.getAttribute('data-ln-list-source');
 				kind = 'list';
+			} else if (el.hasAttribute('data-ln-chart-source')) {
+				storeName = el.getAttribute('data-ln-chart-source');
+				kind = 'chart';
 			} else if (el.hasAttribute('data-ln-options')) {
 				storeName = el.getAttribute('data-ln-options');
 				kind = 'options';
@@ -910,36 +1135,71 @@ import { MutationReceipts } from './mutation-receipts';
 				kind = 'stat';
 			}
 
-			if (!this._ownsStore(storeName)) continue;
+			if (!self._owns(storeName)) continue;
 
-			const store = this.findChildren().store;
+			const children = self.findChildren();
+			const store = children.store;
 
 			if (kind === 'table' || kind === 'list') {
 				const windowAttr = kind === 'table' ? 'data-ln-table-window' : 'data-ln-list-window';
 				if (el.hasAttribute(windowAttr)) {
-					dispatch(el, 'ln-' + kind + ':request-revalidate', {});
+					// A windowed view holds no rows to re-serve — it is told to restart
+					// its window (query change) or refresh it in place (post-mutation),
+					// and pulls the pages back through request-data.
+					dispatch(el, 'ln-' + kind + (isQueryChange ? ':request-invalidate' : ':request-revalidate'), {});
 					continue;
 				}
+			}
+			if (kind === 'table' || kind === 'list' || kind === 'chart') {
 				const cached = self._boundQueries.get(el) || { sort: null, filters: {}, search: '' };
-				(function (capturedEl, capturedKind) {
-					store.getAll(cached).then(function (r) {
+				const effective = composeQuery(cached, self._currentQuery());
+
+				// Same read policy the view-initiated path applies. Without this the
+				// store-change refresh would query the cache even when the store has
+				// been told to leave queries to the server.
+				if (selectDataSource(store, children.connector) === 'remote') {
+					const gen = self._nextQueryGen(el);
+					dispatch(el, 'ln-' + kind + ':set-loading', { loading: true });
+					dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+						query: effective,
+						meta: { targetEl: el, kind: kind, offset: effective.offset, limit: effective.limit, queryGen: gen }
+					});
+					continue;
+				}
+
+				const supersede = needsRemoteSupersede(store, children.connector, selectDataSource(store, children.connector));
+				const gen = supersede ? self._nextQueryGen(el) : null;
+				if (supersede) {
+					dispatch(children.connectorEl, _connectorNamespace(children.connectorEl) + ':request-query', {
+						query: effective,
+						meta: { targetEl: el, kind: kind, offset: effective.offset, limit: effective.limit, queryGen: gen }
+					});
+				}
+
+				(function (capturedEl, capturedKind, capturedSupersede, capturedGen) {
+					store.getAll(effective).then(function (r) {
+						if (self._destroyed || !self._boundDelivered) return;
+						if (capturedSupersede && !self._isCurrentGen(capturedEl, capturedGen)) return;
 						const detail = {
 							data: r.data,
 							total: (syncMeta && syncMeta.total !== undefined) ? syncMeta.total : r.total,
 							filtered: (syncMeta && syncMeta.filtered !== undefined) ? syncMeta.filtered : r.filtered,
-							offset: (syncMeta && syncMeta.offset !== undefined) ? syncMeta.offset : cached.offset,
-							queryGen: (syncMeta && syncMeta.queryGen !== undefined) ? syncMeta.queryGen : cached.queryGen
+							offset: (r.offset !== undefined) ? r.offset
+								: ((syncMeta && syncMeta.offset !== undefined) ? syncMeta.offset : cached.offset),
+							queryGen: (r.queryGen !== undefined) ? r.queryGen
+								: ((syncMeta && syncMeta.queryGen !== undefined) ? syncMeta.queryGen : cached.queryGen)
 						};
 						dispatch(capturedEl, 'ln-' + capturedKind + ':set-loading', { loading: false });
 						dispatch(capturedEl, 'ln-' + capturedKind + ':set-data', detail);
 						self._boundDelivered.set(capturedEl, true);
-					});
-				})(el, kind);
+					}).catch(function () {});
+				})(el, kind, supersede, gen);
 			} else if (kind === 'options') {
 				(function (capturedEl) {
 					store.getAll({}).then(function (r) {
+						if (self._destroyed) return;
 						dispatch(capturedEl, 'ln-options:set-data', { data: r.data });
-					});
+					}).catch(function () {});
 				})(el);
 			} else if (kind === 'stat') {
 				const raw = el.getAttribute('data-ln-stat-filter');
@@ -947,16 +1207,19 @@ import { MutationReceipts } from './mutation-receipts';
 				if (raw) {
 					const colonIdx = raw.indexOf(':');
 					if (colonIdx !== -1) {
-						const field = raw.slice(0, colonIdx);
-						const val = raw.slice(colonIdx + 1);
-						filters = {};
-						filters[field] = [val];
+						const field = raw.slice(0, colonIdx).trim();
+						const val = raw.slice(colonIdx + 1).trim();
+						if (field) {
+							filters = {};
+							filters[field] = [val];
+						}
 					}
 				}
 				(function (capturedEl, capturedFilters) {
 					store.count(capturedFilters).then(function (n) {
+						if (self._destroyed) return;
 						dispatch(capturedEl, 'ln-stat:set-count', { count: n });
-					});
+					}).catch(function () {});
 				})(el, filters);
 			}
 		}
@@ -967,9 +1230,11 @@ import { MutationReceipts } from './mutation-receipts';
 	_component.prototype.destroy = function () {
 		if (!this.dom[DOM_ATTRIBUTE]) return;
 
+		this._destroyed = true;
 		const self = this;
 		if (self._handlers) {
 			self.dom.removeEventListener('ln-data-store:request-remote-sync', self._handlers.sync);
+			self.dom.removeEventListener('ln-data-store:request-page', self._handlers.requestPage);
 
 			self.dom.removeEventListener('ln-data-coordinator:request-create', self._handlers.reqCreate);
 			self.dom.removeEventListener('ln-data-coordinator:request-update', self._handlers.reqUpdate);
@@ -979,6 +1244,7 @@ import { MutationReceipts } from './mutation-receipts';
 			self.dom.removeEventListener('ln-api-queue:send', self._handlers.queueSend);
 			self.dom.removeEventListener('ln-api-queue:failed', self._handlers.queueFailed);
 			self.dom.removeEventListener('ln-data-store:initialized', self._handlers.storeInitialized);
+			self.dom.removeEventListener('ln-websocket-connector:connected', self._handlers.socketConnected);
 
 			document.removeEventListener('submit', self._handlers.formSubmit);
 
@@ -993,23 +1259,31 @@ import { MutationReceipts } from './mutation-receipts';
 
 			// View binder — document-level listeners
 			document.removeEventListener('ln-table:request-data', self._handlers.reqTableData);
-			document.removeEventListener('ln-list:request-data',  self._handlers.reqListData);
+			document.removeEventListener('ln-list:request-data', self._handlers.reqListData);
+			document.removeEventListener('ln-chart:request-data', self._handlers.reqChartData);
 			document.removeEventListener('ln-options:request-data', self._handlers.reqOptions);
-			document.removeEventListener('ln-stat:request-count',  self._handlers.reqStat);
+			document.removeEventListener('ln-stat:request-count', self._handlers.reqStat);
 
 			// Store-change listeners
-			self.dom.removeEventListener('ln-data-store:ready',   self._handlers.refresh);
+			self.dom.removeEventListener('ln-data-store:ready', self._handlers.refresh);
 			self.dom.removeEventListener('ln-data-store:created', self._handlers.refresh);
 			self.dom.removeEventListener('ln-data-store:updated', self._handlers.refresh);
 			self.dom.removeEventListener('ln-data-store:deleted', self._handlers.refresh);
 			self.dom.removeEventListener('ln-data-store:mutation-error', self._handlers.mutationError);
-			self.dom.removeEventListener('ln-data-store:synced',  self._handlers.refreshSynced);
+			self.dom.removeEventListener('ln-data-store:synced', self._handlers.refreshSynced);
+			self.dom.removeEventListener('ln-data-store:query-changed', self._handlers.refreshQuery);
+
+			self.dom.removeEventListener('ln-search:change', self._handlers.searchChange);
+			self.dom.removeEventListener('ln-filter:change', self._handlers.filterChange);
+			self.dom.removeEventListener('ln-sort:change', self._handlers.sortChange);
 
 			self._handlers = null;
 		}
 
 		self._boundQueries = null;
 		self._boundDelivered = null;
+		self._queryGens = null;
+		self._queueQueryRefresh = null;
 		self._mutationReceipts.close(new Error('Data coordinator destroyed'));
 		self._mutationReceipts = null;
 
@@ -1017,26 +1291,9 @@ import { MutationReceipts } from './mutation-receipts';
 		_uninstallGlobalSync();
 
 		delete this.dom[DOM_ATTRIBUTE];
-		delete this.dom[DOM_ALIAS];
 	};
 
-	// ─── Attribute Sync ────────────────────────────────────────
-
-	function _syncAttribute(el, attrName) {
-		const instance = el[DOM_ATTRIBUTE];
-		if (!instance) return;
-
-		if (attrName === 'data-ln-data-mapper') {
-			instance.refreshMapper();
-		}
-	}
-
-	// ─── Registration ──────────────────────────────────────
-
 	registerComponent(DOM_SELECTOR, DOM_ATTRIBUTE, _component, 'ln-data-coordinator', {
-		extraAttributes: [
-			'data-ln-data-mapper'
-		],
-		onAttributeChange: _syncAttribute
+		attributes: ATTRIBUTES
 	});
 })();