@atscript/vue-table 0.1.139 → 0.1.141

package/dist/{use-table-state-Cnxv0w_E.cjs → use-table-state-CgXY-ruN.cjs}

@@ -1023,6 +1023,7 @@ function createPresetState(opts) {
 			apply(o, value, isSystem) {
 				if (!value && !isSystem) return;
 				o.filters.value = value ? { ...value } : {};
+				if (o.residualFilters?.value.length) o.residualFilters.value = [];
 			},
 			expandDefault: () => ({})
 		},
@@ -1100,8 +1101,25 @@ function createPresetState(opts) {
 			nextActiveId: id
 		};
 	}
+	/**
+	* The one write-side prune: drop what names a field this table cannot use,
+	* and report it. A no-op before the table definition loads — bootstrap
+	* waits for it, and the query gate covers any other early writer.
+	*/
+	function pruneForApply(snapshot, presetId) {
+		const known = opts.knownFields?.value;
+		if (!known) return snapshot;
+		const { snapshot: pruned, dropped } = (0, _atscript_ui_table.prunePresetSnapshot)(snapshot, known);
+		if (dropped) opts.onFieldsDropped?.({
+			...dropped,
+			source: "preset",
+			presetId: presetId ?? void 0
+		});
+		return pruned;
+	}
 	function apply(idOrSnapshot) {
-		const { snapshot, nextActiveId } = resolveSnapshot(idOrSnapshot);
+		const { snapshot: resolved, nextActiveId } = resolveSnapshot(idOrSnapshot);
+		const snapshot = pruneForApply(resolved, nextActiveId);
 		const isSystem = typeof idOrSnapshot === "string" && nextActiveId !== null && (0, _atscript_ui_table.isSystemPresetId)(nextActiveId);
 		for (const aspect of ownedAspects(nextActiveId)) {
 			const value = snapshot[aspect];
@@ -1142,7 +1160,8 @@ function createPresetState(opts) {
 		}
 		return out;
 	}
-	const activeSnapshot = (0, vue.computed)(() => {
+	/** The active preset's snapshot as stored — the base `saveActive` merges back into. */
+	const storedActiveSnapshot = (0, vue.computed)(() => {
 		const id = activeId.value;
 		if (!id) return {};
 		if ((0, _atscript_ui_table.isSystemPresetId)(id)) return expandSystemSnapshot(systemPresetsById.value.get(id)?.content ?? {}, id);
@@ -1151,7 +1170,25 @@ function createPresetState(opts) {
 		const wire = row.data?.content;
 		return wire ? (0, _atscript_ui_table.fromWireSnapshot)(wire) : {};
 	});
-	const isDirty = (0, vue.computed)(() => (0, _atscript_ui_table.isDirtyAgainst)(activeSnapshot.value, captureSnapshot()));
+	const prunedActive = (0, vue.computed)(() => {
+		const known = opts.knownFields?.value;
+		const stored = storedActiveSnapshot.value;
+		return known ? (0, _atscript_ui_table.prunePresetSnapshot)(stored, known) : {
+			snapshot: stored,
+			dropped: null
+		};
+	});
+	const activeSnapshot = (0, vue.computed)(() => prunedActive.value.snapshot);
+	const droppedFields = (0, vue.computed)(() => {
+		const dropped = prunedActive.value.dropped;
+		const presetId = activeId.value;
+		return dropped && presetId ? {
+			...dropped,
+			source: "preset",
+			presetId
+		} : null;
+	});
+	const isDirty = (0, vue.computed)(() => (0, _atscript_ui_table.isDirtyAgainst)(activeSnapshot.value, captureSnapshot()) || activeSnapshot.value.filterOps !== void 0 && !!opts.residualFilters?.value.length);
 	function requirePresets() {
 		if (!opts.presetsHandle) throw new Error("[vue-table] presets feature not configured (preset.url missing)");
 		return opts.presetsHandle;
@@ -1162,10 +1199,12 @@ function createPresetState(opts) {
 			const id = activeId.value;
 			if (!id) throw new Error("[vue-table] saveActive: no active preset");
 			if ((0, _atscript_ui_table.isSystemPresetId)(id)) throw new Error("[vue-table] saveActive: system presets cannot be overwritten");
-			const existing = activeSnapshot.value;
+			const existing = storedActiveSnapshot.value;
 			const mask = {};
 			for (const aspect of availableAspects) if (existing[aspect] !== void 0) mask[aspect] = true;
-			await handle.savePreset(captureSnapshot(mask));
+			const captured = captureSnapshot(mask);
+			const dropped = prunedActive.value.dropped;
+			await handle.savePreset(dropped ? (0, _atscript_ui_table.restoreDroppedEntries)(captured, dropped) : captured);
 			clearLocalDraft();
 		});
 	}
@@ -1224,20 +1263,25 @@ function createPresetState(opts) {
 	function bootstrap() {
 		if (!opts.presetsHandle) return;
 		const handle = opts.presetsHandle;
-		const stop = (0, vue.watch)(() => handle.loading.value, (loading) => {
-			if (loading) return;
-			stop();
+		const knownReady = () => !opts.knownFields || opts.knownFields.value !== null;
+		let done = false;
+		let stop;
+		stop = (0, vue.watch)(() => !handle.loading.value && knownReady(), (ready) => {
+			if (!ready || done) return;
+			done = true;
+			stop?.();
 			const id = resolveDefaultId();
 			const { snapshot, nextActiveId } = resolveSnapshot(id);
 			const base = (0, _atscript_ui_table.isSystemPresetId)(id) ? expandSystemSnapshot(snapshot, id) : snapshot;
 			const draftEnabled = !!(opts.draftHandle && opts.persistDrafts);
-			apply(draftEnabled ? opts.draftHandle.hydrate(base) : base);
+			apply(pruneForApply(draftEnabled ? opts.draftHandle.hydrate(base) : base, nextActiveId));
 			activeId.value = nextActiveId;
 			if (draftEnabled) opts.draftHandle.watchAndPersist(() => captureSnapshot(), () => activeSnapshot.value);
 			(0, vue.nextTick)(() => {
 				gate.value = true;
 			});
 		}, { immediate: true });
+		if (done) stop();
 	}
 	return {
 		slice: {
@@ -1253,6 +1297,7 @@ function createPresetState(opts) {
 			available,
 			activeId,
 			activeSnapshot,
+			droppedFields,
 			isDirty,
 			canSaveActive,
 			currentUser,
@@ -1594,6 +1639,10 @@ const cloneSorter = (s) => ({
 	field: s.field,
 	direction: s.direction
 });
+/** Same residual conditions, in the same (canonical) order. */
+function sameResidualFilters(a, b) {
+	return (0, _atscript_ui_table.arraysEqual)(a.map(_atscript_ui_table.filterExprKey), b.map(_atscript_ui_table.filterExprKey));
+}
 /**
 * The report for a restored URL's filter piece when nobody handles it
 * (`onUnsupportedFilter` / `@unsupported-filter`): a dev-mode warning.
@@ -1602,6 +1651,15 @@ function warnUnsupportedFilter(issue) {
 	if (!_atscript_ui_table.DEV) return;
 	console.warn(`[vue-table] URL filter left out (${issue.reason}): ${JSON.stringify(issue.expr)}. Field filters cannot express it, so the table shows more rows than the URL described.`);
 }
+/**
+* The report for fields the table left out when nobody handles it
+* (`onFieldsDropped` / `@fields-dropped`): a dev-mode warning.
+*/
+function warnFieldsDropped(report) {
+	if (!_atscript_ui_table.DEV) return;
+	const from = report.presetId ? `${report.source} "${report.presetId}"` : report.source;
+	console.warn(`[vue-table] Left out fields this table cannot use (${from}): ${report.fields.join(", ")}.`);
+}
 function createTableState(opts) {
 	const client = opts.client;
 	const modelOpts = opts.model;
@@ -1638,6 +1696,7 @@ function createTableState(opts) {
 	*/
 	const rowActionsPolicy = (0, vue.computed)(() => compileRowActionsConfig(rowActions.value));
 	const filters = (0, vue.shallowRef)({});
+	const residualFilters = (0, vue.shallowRef)([]);
 	const results = (0, vue.shallowRef)([]);
 	const resultsStart = (0, vue.ref)(0);
 	const querying = (0, vue.ref)(false);
@@ -1675,11 +1734,34 @@ function createTableState(opts) {
 	const configDialogOpen = (0, vue.ref)(false);
 	const configTab = (0, vue.ref)("columns");
 	const filterDialogColumn = (0, vue.ref)(null);
+	/**
+	* The paths the table can use, from its column list: every column, and the
+	* server-backed ones. `null` until the table definition loads. Presets,
+	* drafts, URLs and the query itself are all pruned against it.
+	*/
+	const knownFields = (0, vue.computed)(() => {
+		const all = allColumns.value;
+		if (all.length === 0) return null;
+		const columns = /* @__PURE__ */ new Set();
+		const server = /* @__PURE__ */ new Set();
+		for (const c of all) {
+			columns.add(c.path);
+			if (!c.local) server.add(c.path);
+		}
+		return {
+			columns,
+			server
+		};
+	});
+	function reportFieldsDropped(report) {
+		(queryOpts?.onFieldsDropped ?? warnFieldsDropped)(report);
+	}
 	const { slice: presetSlice, internals: presetInternals } = createPresetState({
 		columnNames,
 		columnWidths,
 		filterFields,
 		filters,
+		residualFilters,
 		sorters,
 		pagination,
 		allColumns,
@@ -1688,7 +1770,9 @@ function createTableState(opts) {
 		availableAspects: opts.preset?.availableAspects,
 		systemAspects: opts.preset?.systemAspects,
 		persistDrafts: opts.preset?.persistDrafts,
-		fallbackSystemPresets: opts.preset?.fallbackSystemPresets
+		fallbackSystemPresets: opts.preset?.fallbackSystemPresets,
+		knownFields,
+		onFieldsDropped: reportFieldsDropped
 	});
 	presetInternals.bootstrap();
 	const promptSlot = createRequestSlot(false);
@@ -1730,7 +1814,10 @@ function createTableState(opts) {
 	*/
 	const localColumnPaths = (0, vue.computed)(() => {
 		const out = /* @__PURE__ */ new Set();
-		for (const c of allColumns.value) if (c.local) out.add(c.path);
+		const known = knownFields.value;
+		if (known) {
+			for (const p of known.columns) if (!known.server.has(p)) out.add(p);
+		}
 		return out;
 	});
 	/**
@@ -1763,21 +1850,67 @@ function createTableState(opts) {
 		if (splitSorters.value.local.length === 0 || sortersIgnored()) return rows;
 		return (0, _atscript_ui_table.sortRowsLocally)(rows, queryOpts?.forceSorters?.length ? (0, _atscript_ui_table.mergeSorters)(queryOpts.forceSorters, sorters.value) : sorters.value, sortValueOf);
 	}
+	/**
+	* The query's view of the model, gated to the fields this caller can use.
+	* This is the guarantee that no table state sends a field the server does
+	* not expose: presets and URLs are pruned on apply, but `setFieldFilter`,
+	* `addFilterField`, `v-model` writes, `setResidualFilters` and the like
+	* write straight to the model. `$select` is gated by the column list
+	* (`knownFields.columns`, then client-owned columns are stripped); filters
+	* and residual conditions by the server-backed columns. `forceFilters` /
+	* `forceSorters` are app-authored and never gated. Memoized: pages,
+	* window blocks and exports reuse it.
+	*/
+	const queryModel = (0, vue.computed)(() => {
+		const model = {
+			columnNames: columnNames.value,
+			filters: filters.value,
+			sorters: splitSorters.value.server,
+			residual: residualFilters.value,
+			stripped: []
+		};
+		const known = knownFields.value;
+		if (!known) return model;
+		const { snapshot, dropped } = (0, _atscript_ui_table.prunePresetSnapshot)({
+			columns: { columnNames: model.columnNames },
+			filterOps: model.filters,
+			sorters: model.sorters
+		}, known);
+		const residual = (0, _atscript_ui_table.pruneResidualFilters)(model.residual, known.server);
+		return {
+			columnNames: model.columnNames,
+			filters: snapshot.filterOps,
+			sorters: snapshot.sorters,
+			residual: residual.kept,
+			stripped: [...new Set([...dropped?.fields ?? [], ...residual.dropped?.fields ?? []])]
+		};
+	});
+	/** Stripped path sets already warned about — one dev warning per set. */
+	const warnedStripped = /* @__PURE__ */ new Set();
 	function buildCurrentQuery(buildOpts) {
-		const available = tableDef.value?.fetchableFields ?? new Set(allColumns.value.map((c) => c.path));
+		const available = tableDef.value?.fetchableFields ?? knownFields.value?.columns ?? /* @__PURE__ */ new Set();
 		const extra = /* @__PURE__ */ new Set();
 		for (const c of columns.value) for (const p of c.selectWith ?? []) if (available.has(p)) extra.add(p);
 		if (queryOpts?.alwaysSelected) {
 			for (const p of queryOpts.alwaysSelected) if (available.has(p)) extra.add(p);
 		}
+		const model = queryModel.value;
+		if (_atscript_ui_table.DEV && model.stripped.length > 0) {
+			const key = model.stripped.join(",");
+			if (!warnedStripped.has(key)) {
+				warnedStripped.add(key);
+				console.warn(`[vue-table] Query leaves out fields this table cannot use: ${model.stripped.join(", ")}.`);
+			}
+		}
+		const known = knownFields.value;
 		const localPaths = localColumnPaths.value;
-		const requested = buildOpts?.columnPaths ?? columnNames.value;
 		return (0, _atscript_ui_table.buildTableQuery)({
-			visibleColumnPaths: localPaths.size ? requested.filter((p) => !localPaths.has(p)) : requested,
+			visibleColumnPaths: (buildOpts?.columnPaths ?? model.columnNames).filter((p) => !localPaths.has(p) && (!known || known.columns.has(p))),
 			extraSelect: extra.size ? [...extra] : void 0,
-			sorters: splitSorters.value.server,
+			sorters: model.sorters,
 			forceSorters: queryOpts?.forceSorters,
-			filters: filters.value,
+			filters: model.filters,
+			residualFilters: model.residual,
 			forceFilters: queryOpts?.forceFilters,
 			search: searchTerm.value || void 0,
 			ignoreSorters: sortersIgnored(),
@@ -1964,6 +2097,10 @@ function createTableState(opts) {
 			}
 		};
 	}
+	function setResidualFilters(exprs) {
+		const next = (0, _atscript_ui_table.normalizeResidualFilters)(exprs);
+		if (!sameResidualFilters(next, residualFilters.value)) residualFilters.value = next;
+	}
 	const state = {
 		tableDef,
 		loadingMetadata,
@@ -1973,6 +2110,7 @@ function createTableState(opts) {
 		columnWidths,
 		filterFields,
 		filters,
+		residualFilters,
 		sorters,
 		results,
 		resultsStart,
@@ -2047,8 +2185,14 @@ function createTableState(opts) {
 		loadingAt,
 		errorAt,
 		resetFilters() {
-			if (Object.keys(filters.value).length === 0) return;
-			filters.value = {};
+			if (Object.keys(filters.value).length > 0) filters.value = {};
+			if (residualFilters.value.length > 0) residualFilters.value = [];
+		},
+		setResidualFilters,
+		removeResidualFilter(index) {
+			const list = residualFilters.value;
+			if (index < 0 || index >= list.length) return;
+			residualFilters.value = list.filter((_, i) => i !== index);
 		},
 		showConfigDialog(tab) {
 			configTab.value = tab ?? "columns";
@@ -2099,6 +2243,7 @@ function createTableState(opts) {
 	function serializeStateForUrl() {
 		return (0, _atscript_ui_table.stateToUrlQueryString)({
 			filters: filters.value,
+			residualFilters: residualFilters.value,
 			sorters: sorters.value,
 			page: pagination.value.page,
 			itemsPerPage: pagination.value.itemsPerPage,
@@ -2129,6 +2274,8 @@ function createTableState(opts) {
 	}
 	const filtersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.filters);
 	const sortersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.sorters);
+	const residualSync = urlQuerySync?.residual !== false;
+	const urlOwnsResidual = (expr) => residualSync && (0, _atscript_ui_table.residualGateOwns)(filtersGate, expr);
 	let urlBaseline = null;
 	function captureUrlBaseline() {
 		if (urlBaseline) return;
@@ -2139,6 +2286,7 @@ function createTableState(opts) {
 		}
 		urlBaseline = {
 			filters: owned,
+			residual: residualFilters.value.filter(urlOwnsResidual),
 			sorters: sorters.value.filter((s) => (0, _atscript_ui_table.gateOwns)(sortersGate, s.field)).map(cloneSorter)
 		};
 	}
@@ -2156,12 +2304,30 @@ function createTableState(opts) {
 	function applyUrlQuery(urlString, opts) {
 		captureUrlBaseline();
 		if (urlsEquivalent(urlString, lastEmittedUrl)) return;
-		const cols = allColumns.value;
+		const known = knownFields.value;
 		const parsed = (0, _atscript_ui_table.urlQueryStringToState)(urlString, {
-			knownFields: cols.length > 0 ? cols.map((c) => c.path) : void 0,
+			knownFields: known?.server,
+			localFields: known ? localColumnPaths.value : void 0,
 			sync: urlQuerySync
 		});
 		for (const issue of parsed.unsupported ?? []) (queryOpts?.onUnsupportedFilter ?? warnUnsupportedFilter)(issue);
+		if (parsed.unknown || parsed.unknownSorters) {
+			const residual = parsed.unknown?.map((u) => u.expr) ?? [];
+			const sorters = parsed.unknownSorters ?? [];
+			const fields = new Set(parsed.unknown?.flatMap((u) => u.fields));
+			for (const s of sorters) fields.add(s.field);
+			reportFieldsDropped({
+				source: "url",
+				fields: [...fields],
+				columns: [],
+				filterFields: [],
+				filters: {},
+				residual,
+				sorters
+			});
+		}
+		const urlResidual = parsed.residual ?? [];
+		const residualPaths = new Set(urlResidual.flatMap((expr) => (0, _atscript_ui_table.filterExprFields)(expr)));
 		const base = (opts?.mode ? opts.mode === "replace" : parsed.snapshot === true) ? null : urlBaseline;
 		const currentItemsPerPage = pagination.value.itemsPerPage;
 		const skip = parsed.skip ?? 0;
@@ -2170,12 +2336,24 @@ function createTableState(opts) {
 		hydratingFromUrl = true;
 		if (filtersGate !== "none") {
 			const next = {};
+			const fromBase = (path) => !!base?.filters[path] && !residualPaths.has(path);
 			for (const path in filters.value) if (!(0, _atscript_ui_table.gateOwns)(filtersGate, path)) next[path] = filters.value[path];
-			else if (base?.filters[path]) next[path] = cloneConditions(base.filters[path]);
-			if (base) for (const path in base.filters) next[path] ??= cloneConditions(base.filters[path]);
+			else if (fromBase(path)) next[path] = cloneConditions(base.filters[path]);
+			if (base) {
+				for (const path in base.filters) if (fromBase(path)) next[path] ??= cloneConditions(base.filters[path]);
+			}
 			for (const path in parsed.filters) next[path] = parsed.filters[path];
 			filters.value = next;
 		}
+		if (residualSync) {
+			const mentioned = new Set([...Object.keys(parsed.filters), ...residualPaths]);
+			const next = residualFilters.value.filter((expr) => !urlOwnsResidual(expr));
+			if (base) {
+				for (const expr of base.residual) if (!(0, _atscript_ui_table.filterExprFields)(expr).some((f) => mentioned.has(f))) next.push(expr);
+			}
+			next.push(...urlResidual);
+			setResidualFilters(next);
+		}
 		let urlSortersChanged = false;
 		if (sortersGate !== "none") {
 			const urlSortFields = new Set(parsed.sorters.map((s) => s.field));
@@ -2220,7 +2398,11 @@ function createTableState(opts) {
 	const debouncedFilterQuery = (0, _atscript_ui_table.debounce)(() => {
 		if (queryDetected) scheduleQuery();
 	}, FILTER_DEBOUNCE_MS);
-	(0, vue.watch)([() => filters.value, () => searchTerm.value], () => {
+	(0, vue.watch)([
+		() => filters.value,
+		() => residualFilters.value,
+		() => searchTerm.value
+	], () => {
 		if (hydratingFromUrl) return;
 		if (!queryDetected) return;
 		mustRefresh.value = true;
@@ -2267,6 +2449,7 @@ function createTableState(opts) {
 	});
 	(0, vue.watch)([
 		() => filters.value,
+		() => residualFilters.value,
 		() => sorters.value,
 		() => searchTerm.value,
 		() => pagination.value,
@@ -2613,6 +2796,12 @@ Object.defineProperty(exports, "useTableContextOptional", {
 		return useTableContextOptional;
 	}
 });
+Object.defineProperty(exports, "warnFieldsDropped", {
+	enumerable: true,
+	get: function() {
+		return warnFieldsDropped;
+	}
+});
 Object.defineProperty(exports, "warnUnsupportedFilter", {
 	enumerable: true,
 	get: function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/vue-table",
-  "version": "0.1.139",
+  "version": "0.1.141",
   "description": "Type-driven table components for Atscript with Vue 3",
   "keywords": [
     "atscript",
@@ -117,6 +117,11 @@
       "import": "./dist/as-preset-picker.mjs",
       "require": "./dist/as-preset-picker.cjs"
     },
+    "./as-residual-filter": {
+      "types": "./dist/as-residual-filter.d.mts",
+      "import": "./dist/as-residual-filter.mjs",
+      "require": "./dist/as-residual-filter.cjs"
+    },
     "./as-row-actions": {
       "types": "./dist/as-row-actions.d.mts",
       "import": "./dist/as-row-actions.mjs",
@@ -162,15 +167,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@atscript/ui-table": "^0.1.139",
-    "@atscript/vue-form": "^0.1.139",
-    "@atscript/ui": "^0.1.139"
+    "@atscript/ui": "^0.1.141",
+    "@atscript/ui-table": "^0.1.141",
+    "@atscript/vue-form": "^0.1.141"
   },
   "devDependencies": {
-    "@atscript/db-client": "^0.1.132",
+    "@atscript/db-client": "^0.1.133",
     "@atscript/typescript": "^0.1.93",
     "@tanstack/vue-virtual": "^3.13.26",
-    "@uniqu/core": "^0.1.9",
+    "@uniqu/core": "^0.1.10",
+    "@uniqu/url": "^0.1.10",
     "@vitejs/plugin-vue": "^6",
     "@vue/test-utils": "^2",
     "@vueuse/core": "^14.3.0",
@@ -183,8 +189,9 @@
     "vunor": "^0.3.0"
   },
   "peerDependencies": {
-    "@atscript/db-client": "^0.1.132",
+    "@atscript/db-client": "^0.1.133",
     "@tanstack/vue-virtual": "^3.13.26",
+    "@uniqu/url": "^0.1.10",
     "@vueuse/core": "^14.3.0",
     "reka-ui": "^2.9.8",
     "vue": "^3"