@atscript/vue-table 0.1.138 → 0.1.139

package/dist/{types-DvWLY5zQ.d.cts → types-CgdpcJdd.d.mts}

@@ -1,8 +1,8 @@
+import { ColumnDef, PaginationControl, SortControl, TableDef } from "@atscript/ui";
 import { Component, ComputedRef, MaybeRefOrGetter, Ref, ShallowRef } from "vue";
+import { AsPresetEntryRow, AspectMask, ColumnWidthsMap, ConfigTab, FieldFilters, PresetAspect, PresetCapabilities, PresetSnapshot, SelectionMode, SystemPreset, SystemPresetInput, TableStateMethods } from "@atscript/ui-table";
 import { ClientError, PageResult, TDbActionInfo, TDbActionProcessor, TDbDeleteResult } from "@atscript/db-client";
 import { Uniquery } from "@uniqu/core";
-import { ColumnDef, PaginationControl, SortControl, TableDef } from "@atscript/ui";
-import { AsPresetEntryRow, AspectMask, ColumnWidthsMap, ConfigTab, FieldFilters, PresetAspect, PresetCapabilities, PresetSnapshot, SelectionMode, SystemPreset, SystemPresetInput, TableStateMethods } from "@atscript/ui-table";
 
 //#region src/composables/state/intent-scope.d.ts
 interface ActionBuckets {
@@ -413,7 +413,10 @@ type TAsCellTypeComponents = {
  * @since 0.1.137
  */
 interface ApplyUrlQueryOptions {
-  /** `"merge"` (default) keeps them, `"replace"` clears them. */
+  /**
+   * Overrides what the URL itself decides (see `applyUrlQuery`): `"merge"`
+   * falls back to the table's starting values, `"replace"` clears them.
+   */
   mode?: "merge" | "replace";
 }
 /**
@@ -668,13 +671,21 @@ interface ReactiveTableState extends TableStateMethods {
    * bridge's own emissions. Does NOT call `query()` — root watchers refetch in
    * reaction to the writes.
    *
-   * `mode` decides what happens to filters and sorters the URL does NOT
-   * mention (search and pagination always take the URL's value):
-   * - `"merge"` (default) — they survive. This is mount-time deep-link
-   *   hydration, where the URL overlays a preset baseline it must not wipe.
-   * - `"replace"` (since 0.1.137) — they are cleared, within whatever the
-   *   `urlQuerySync` gates actually serialize. This is history navigation,
-   *   where the URL is a complete snapshot of the synced aspects.
+   * The URL decides what happens to filters and sorters it does NOT mention,
+   * within whatever the `urlQuerySync` gates serialize (search and pagination
+   * always take the URL's value; columns and other presentation state are
+   * never touched):
+   * - A URL carrying the `$snapshot` marker (`URL_SNAPSHOT_KEY` — every URL
+   *   the table writes) replaces: they are cleared, an empty `$sort`
+   *   included, so a reload or a shared link reproduces the table exactly.
+   * - Any other URL (an app deep link) merges: they fall back to the table's
+   *   boot baseline — the owned filters and sorters it had before the first
+   *   URL was applied (preset, persisted drafts, props). Every merge starts
+   *   from that baseline, not from the current state, so Back to a deep link
+   *   restores it as first opened. A preset switched to later does not move
+   *   the baseline.
+   *
+   * `opts.mode` overrides the marker either way. Since 0.1.139.
    */
   applyUrlQuery: (urlString: string, opts?: ApplyUrlQueryOptions) => void;
   /**

package/dist/{use-table-DRN4nlZs.mjs → use-table-DUwUfjSZ.mjs}

@@ -1,4 +1,4 @@
-import { n as createTableState, r as provideTableContext, s as DEFAULT_AVAILABLE_ASPECTS } from "./use-table-state-CqU1N4Q9.mjs";
+import { c as DEFAULT_AVAILABLE_ASPECTS, n as createTableState, r as provideTableContext } from "./use-table-state-BEwXQayO.mjs";
 import { n as useTableSelection } from "./use-table-selection-ULbKT2xW.mjs";
 import { createTableDef, getMetaEntry, resetMetaCache } from "@atscript/ui";
 import { computed, inject, isRef, ref, shallowRef, toValue, watch } from "vue";
@@ -434,7 +434,8 @@ function useTable(url, opts) {
 			ignoreSortersWhenSearched: typeof opts?.ignoreSortersWhenSearched === "boolean" ? opts.ignoreSortersWhenSearched : void 0,
 			urlQueryReady: opts?.urlQueryReady,
 			onUrlQueryChange: opts?.onUrlQueryChange,
-			urlQuerySync: opts?.urlQuerySync
+			urlQuerySync: opts?.urlQuerySync,
+			onUnsupportedFilter: opts?.onUnsupportedFilter
 		},
 		window: {
 			blockSize: opts?.blockSize,

package/dist/{use-table-JU7BAX4e.cjs → use-table-c4ku22Mx.cjs}

@@ -1,4 +1,4 @@
-const require_use_table_state = require("./use-table-state-CoVe_8NI.cjs");
+const require_use_table_state = require("./use-table-state-Cnxv0w_E.cjs");
 const require_use_table_selection = require("./use-table-selection-DtCV3rhu.cjs");
 let _atscript_ui = require("@atscript/ui");
 let vue = require("vue");
@@ -434,7 +434,8 @@ function useTable(url, opts) {
 			ignoreSortersWhenSearched: typeof opts?.ignoreSortersWhenSearched === "boolean" ? opts.ignoreSortersWhenSearched : void 0,
 			urlQueryReady: opts?.urlQueryReady,
 			onUrlQueryChange: opts?.onUrlQueryChange,
-			urlQuerySync: opts?.urlQuerySync
+			urlQuerySync: opts?.urlQuerySync,
+			onUnsupportedFilter: opts?.onUnsupportedFilter
 		},
 		window: {
 			blockSize: opts?.blockSize,

package/dist/{use-table-column-handlers-r47WDxEh.cjs → use-table-column-handlers-Do0Z-R9D.cjs}

@@ -1,4 +1,4 @@
-const require_use_table_state = require("./use-table-state-CoVe_8NI.cjs");
+const require_use_table_state = require("./use-table-state-Cnxv0w_E.cjs");
 let vue = require("vue");
 let _atscript_ui_table = require("@atscript/ui-table");
 //#region src/composables/use-row-actions-column.ts

package/dist/{use-table-column-handlers-DGn4ZW9j.mjs → use-table-column-handlers-eKHCfUm_.mjs}

@@ -1,4 +1,4 @@
-import { D as ROW_ACTIONS_TYPE, E as ROW_ACTIONS_PATH } from "./use-table-state-CqU1N4Q9.mjs";
+import { D as ROW_ACTIONS_PATH, O as ROW_ACTIONS_TYPE } from "./use-table-state-BEwXQayO.mjs";
 import { computed, watch } from "vue";
 import { reorderColumnNames } from "@atscript/ui-table";
 //#region src/composables/use-row-actions-column.ts

package/dist/{use-table-component-DIWiP_Vs.cjs → use-table-component-DbQDINoa.cjs}

@@ -1,4 +1,4 @@
-const require_use_table_state = require("./use-table-state-CoVe_8NI.cjs");
+const require_use_table_state = require("./use-table-state-Cnxv0w_E.cjs");
 //#region src/composables/use-table-component.ts
 /**
 * Resolve a single skin-slot component from the injected `controls` map,

package/dist/{use-table-component-VUFlxIk-.mjs → use-table-component-wfU13P3L.mjs}

@@ -1,4 +1,4 @@
-import { o as useTableContextOptional } from "./use-table-state-CqU1N4Q9.mjs";
+import { o as useTableContextOptional } from "./use-table-state-BEwXQayO.mjs";
 //#region src/composables/use-table-component.ts
 /**
 * Resolve a single skin-slot component from the injected `controls` map,

package/dist/{use-table-nav-bridge-BBtXE70x.cjs → use-table-nav-bridge-BLLVGR1r.cjs}

@@ -1,4 +1,4 @@
-const require_use_table_state = require("./use-table-state-CoVe_8NI.cjs");
+const require_use_table_state = require("./use-table-state-Cnxv0w_E.cjs");
 //#region src/composables/use-table-nav-bridge.ts
 function isPassthroughKey(event) {
 	const key = event.key;

package/dist/{use-table-nav-bridge-DT8oU-6r.mjs → use-table-nav-bridge-DRrvQxXq.mjs}

@@ -1,4 +1,4 @@
-import { o as useTableContextOptional } from "./use-table-state-CqU1N4Q9.mjs";
+import { o as useTableContextOptional } from "./use-table-state-BEwXQayO.mjs";
 //#region src/composables/use-table-nav-bridge.ts
 function isPassthroughKey(event) {
 	const key = event.key;

package/dist/{use-table-state-CqU1N4Q9.mjs → use-table-state-BEwXQayO.mjs}

@@ -1,7 +1,7 @@
 import { t as getCellValue } from "./get-cell-value-Cb3X8nUn.mjs";
 import { navigateHrefFor } from "@atscript/ui";
 import { computed, inject, nextTick, onBeforeUnmount, onScopeDispose, provide, ref, shallowRef, toValue, watch } from "vue";
-import { STANDARD_PRESET_ID, blockStartFor, buildTableQuery, cellAsString, debounce, derivePresetAspects, fromWireSnapshot, gateOwns, isDirtyAgainst, isFilled, isSystemPresetId, mergeDisplayColumns, mergeSorters, pageAlignedBlocksFor, planFetch, reconcileColumnWidthDefaults, resolveAspectGate, resolveSystemPresets, rowsToPks, sameColumnSet, sortRowsLocally, sortersEqual, stateToUrlQueryString, togglePk, urlQueryStringToState, walkBackwardAbsorb, walkForwardAbsorb } from "@atscript/ui-table";
+import { DEV, STANDARD_PRESET_ID, blockStartFor, buildTableQuery, cellAsString, debounce, derivePresetAspects, fromWireSnapshot, gateOwns, isDirtyAgainst, isFilled, isSystemPresetId, mergeDisplayColumns, mergeSorters, pageAlignedBlocksFor, planFetch, reconcileColumnWidthDefaults, resolveAspectGate, resolveSystemPresets, rowsToPks, sameColumnSet, sortRowsLocally, sortersEqual, stateToUrlQueryString, togglePk, urlQueryStringToState, walkBackwardAbsorb, walkForwardAbsorb } from "@atscript/ui-table";
 import { formatIdentifier } from "@atscript/db-client";
 //#region src/types.ts
 /** UI-side sentinel for the synthesised row-delete processor. */
@@ -1586,6 +1586,22 @@ function createRequestSlot(cancelValue) {
 		release
 	};
 }
+const cloneConditions = (conds) => conds.map((c) => ({
+	type: c.type,
+	value: [...c.value]
+}));
+const cloneSorter = (s) => ({
+	field: s.field,
+	direction: s.direction
+});
+/**
+* The report for a restored URL's filter piece when nobody handles it
+* (`onUnsupportedFilter` / `@unsupported-filter`): a dev-mode warning.
+*/
+function warnUnsupportedFilter(issue) {
+	if (!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.`);
+}
 function createTableState(opts) {
 	const client = opts.client;
 	const modelOpts = opts.model;
@@ -2111,31 +2127,61 @@ function createTableState(opts) {
 		lastEmittedUrl = next;
 		queryOpts.onUrlQueryChange(next);
 	}
+	const filtersGate = resolveAspectGate(urlQuerySync?.filters);
+	const sortersGate = resolveAspectGate(urlQuerySync?.sorters);
+	let urlBaseline = null;
+	function captureUrlBaseline() {
+		if (urlBaseline) return;
+		const owned = {};
+		for (const path in filters.value) {
+			if (!gateOwns(filtersGate, path)) continue;
+			owned[path] = cloneConditions(filters.value[path]);
+		}
+		urlBaseline = {
+			filters: owned,
+			sorters: sorters.value.filter((s) => gateOwns(sortersGate, s.field)).map(cloneSorter)
+		};
+	}
+	if (queryOpts?.onUrlQueryChange) {
+		const gate = queryOpts.urlQueryReady;
+		if (!gate || gate.value) lastEmittedUrl = serializeStateForUrl();
+		else {
+			const stop = watch(() => gate.value, () => {
+				captureUrlBaseline();
+				lastEmittedUrl = serializeStateForUrl();
+				stop();
+			}, { flush: "sync" });
+		}
+	}
 	function applyUrlQuery(urlString, opts) {
+		captureUrlBaseline();
 		if (urlsEquivalent(urlString, lastEmittedUrl)) return;
-		const replace = opts?.mode === "replace";
 		const cols = allColumns.value;
 		const parsed = urlQueryStringToState(urlString, {
 			knownFields: cols.length > 0 ? cols.map((c) => c.path) : void 0,
 			sync: urlQuerySync
 		});
+		for (const issue of parsed.unsupported ?? []) (queryOpts?.onUnsupportedFilter ?? warnUnsupportedFilter)(issue);
+		const base = (opts?.mode ? opts.mode === "replace" : parsed.snapshot === true) ? null : urlBaseline;
 		const currentItemsPerPage = pagination.value.itemsPerPage;
 		const skip = parsed.skip ?? 0;
 		const nextPage = skip > 0 && currentItemsPerPage > 0 ? Math.floor(skip / currentItemsPerPage) + 1 : 1;
 		const wasQueryDetected = queryDetected;
 		hydratingFromUrl = true;
-		const filtersGate = resolveAspectGate(urlQuerySync?.filters);
 		if (filtersGate !== "none") {
 			const next = {};
-			for (const path in filters.value) if (!replace || !gateOwns(filtersGate, path)) next[path] = filters.value[path];
+			for (const path in filters.value) if (!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]);
 			for (const path in parsed.filters) next[path] = parsed.filters[path];
 			filters.value = next;
 		}
-		const sortersGate = resolveAspectGate(urlQuerySync?.sorters);
 		let urlSortersChanged = false;
 		if (sortersGate !== "none") {
 			const urlSortFields = new Set(parsed.sorters.map((s) => s.field));
-			const merged = [...sorters.value.filter((s) => !(replace ? gateOwns(sortersGate, s.field) : urlSortFields.has(s.field))), ...parsed.sorters];
+			const start = sorters.value.filter((s) => !gateOwns(sortersGate, s.field));
+			if (base) start.push(...base.sorters.map(cloneSorter));
+			const merged = [...start.filter((s) => !urlSortFields.has(s.field)), ...parsed.sorters];
 			if (!sortersEqual(sorters.value, merged)) {
 				sorters.value = merged;
 				urlSortersChanged = true;
@@ -2405,4 +2451,4 @@ function useRegisterMainActionListener(state, listener, enabled) {
 	});
 }
 //#endregion
-export { isModClick as C, ROW_ACTIONS_TYPE as D, ROW_ACTIONS_PATH as E, intentToScope as S, triggerAction as T, ariaLabelFor as _, useTableContext as a, extractIdentifier as b, ASPECT_ICONS as c, readPresetLabel as d, INTERACTIVE_SELECTOR as f, applyRowsGate as g, applyRowGate as h, useRegisterMainActionListener as i, ASPECT_LABELS as l, rowActionHref as m, createTableState as n, useTableContextOptional as o, onSelectControlKeydown as p, provideTableContext as r, DEFAULT_AVAILABLE_ASPECTS as s, createStaticTableState as t, ownerNameOf as u, collectIdentifiers as v, isPlainLeftClick as w, intentClass as x, createNavigateGestures as y };
+export { intentToScope as C, ROW_ACTIONS_PATH as D, triggerAction as E, ROW_ACTIONS_TYPE as O, intentClass as S, isPlainLeftClick as T, applyRowsGate as _, useTableContext as a, createNavigateGestures as b, DEFAULT_AVAILABLE_ASPECTS as c, ownerNameOf as d, readPresetLabel as f, applyRowGate as g, rowActionHref as h, useRegisterMainActionListener as i, ASPECT_ICONS as l, onSelectControlKeydown as m, createTableState as n, useTableContextOptional as o, INTERACTIVE_SELECTOR as p, provideTableContext as r, warnUnsupportedFilter as s, createStaticTableState as t, ASPECT_LABELS as u, ariaLabelFor as v, isModClick as w, extractIdentifier as x, collectIdentifiers as y };

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

@@ -1586,6 +1586,22 @@ function createRequestSlot(cancelValue) {
 		release
 	};
 }
+const cloneConditions = (conds) => conds.map((c) => ({
+	type: c.type,
+	value: [...c.value]
+}));
+const cloneSorter = (s) => ({
+	field: s.field,
+	direction: s.direction
+});
+/**
+* The report for a restored URL's filter piece when nobody handles it
+* (`onUnsupportedFilter` / `@unsupported-filter`): a dev-mode warning.
+*/
+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.`);
+}
 function createTableState(opts) {
 	const client = opts.client;
 	const modelOpts = opts.model;
@@ -2111,31 +2127,61 @@ function createTableState(opts) {
 		lastEmittedUrl = next;
 		queryOpts.onUrlQueryChange(next);
 	}
+	const filtersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.filters);
+	const sortersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.sorters);
+	let urlBaseline = null;
+	function captureUrlBaseline() {
+		if (urlBaseline) return;
+		const owned = {};
+		for (const path in filters.value) {
+			if (!(0, _atscript_ui_table.gateOwns)(filtersGate, path)) continue;
+			owned[path] = cloneConditions(filters.value[path]);
+		}
+		urlBaseline = {
+			filters: owned,
+			sorters: sorters.value.filter((s) => (0, _atscript_ui_table.gateOwns)(sortersGate, s.field)).map(cloneSorter)
+		};
+	}
+	if (queryOpts?.onUrlQueryChange) {
+		const gate = queryOpts.urlQueryReady;
+		if (!gate || gate.value) lastEmittedUrl = serializeStateForUrl();
+		else {
+			const stop = (0, vue.watch)(() => gate.value, () => {
+				captureUrlBaseline();
+				lastEmittedUrl = serializeStateForUrl();
+				stop();
+			}, { flush: "sync" });
+		}
+	}
 	function applyUrlQuery(urlString, opts) {
+		captureUrlBaseline();
 		if (urlsEquivalent(urlString, lastEmittedUrl)) return;
-		const replace = opts?.mode === "replace";
 		const cols = allColumns.value;
 		const parsed = (0, _atscript_ui_table.urlQueryStringToState)(urlString, {
 			knownFields: cols.length > 0 ? cols.map((c) => c.path) : void 0,
 			sync: urlQuerySync
 		});
+		for (const issue of parsed.unsupported ?? []) (queryOpts?.onUnsupportedFilter ?? warnUnsupportedFilter)(issue);
+		const base = (opts?.mode ? opts.mode === "replace" : parsed.snapshot === true) ? null : urlBaseline;
 		const currentItemsPerPage = pagination.value.itemsPerPage;
 		const skip = parsed.skip ?? 0;
 		const nextPage = skip > 0 && currentItemsPerPage > 0 ? Math.floor(skip / currentItemsPerPage) + 1 : 1;
 		const wasQueryDetected = queryDetected;
 		hydratingFromUrl = true;
-		const filtersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.filters);
 		if (filtersGate !== "none") {
 			const next = {};
-			for (const path in filters.value) if (!replace || !(0, _atscript_ui_table.gateOwns)(filtersGate, path)) next[path] = filters.value[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]);
 			for (const path in parsed.filters) next[path] = parsed.filters[path];
 			filters.value = next;
 		}
-		const sortersGate = (0, _atscript_ui_table.resolveAspectGate)(urlQuerySync?.sorters);
 		let urlSortersChanged = false;
 		if (sortersGate !== "none") {
 			const urlSortFields = new Set(parsed.sorters.map((s) => s.field));
-			const merged = [...sorters.value.filter((s) => !(replace ? (0, _atscript_ui_table.gateOwns)(sortersGate, s.field) : urlSortFields.has(s.field))), ...parsed.sorters];
+			const start = sorters.value.filter((s) => !(0, _atscript_ui_table.gateOwns)(sortersGate, s.field));
+			if (base) start.push(...base.sorters.map(cloneSorter));
+			const merged = [...start.filter((s) => !urlSortFields.has(s.field)), ...parsed.sorters];
 			if (!(0, _atscript_ui_table.sortersEqual)(sorters.value, merged)) {
 				sorters.value = merged;
 				urlSortersChanged = true;
@@ -2567,3 +2613,9 @@ Object.defineProperty(exports, "useTableContextOptional", {
 		return useTableContextOptional;
 	}
 });
+Object.defineProperty(exports, "warnUnsupportedFilter", {
+	enumerable: true,
+	get: function() {
+		return warnUnsupportedFilter;
+	}
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/vue-table",
-  "version": "0.1.138",
+  "version": "0.1.139",
   "description": "Type-driven table components for Atscript with Vue 3",
   "keywords": [
     "atscript",
@@ -162,15 +162,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@atscript/ui": "^0.1.138",
-    "@atscript/ui-table": "^0.1.138",
-    "@atscript/vue-form": "^0.1.138"
+    "@atscript/ui-table": "^0.1.139",
+    "@atscript/vue-form": "^0.1.139",
+    "@atscript/ui": "^0.1.139"
   },
   "devDependencies": {
-    "@atscript/db-client": "^0.1.131",
+    "@atscript/db-client": "^0.1.132",
     "@atscript/typescript": "^0.1.93",
     "@tanstack/vue-virtual": "^3.13.26",
-    "@uniqu/core": "^0.1.8",
+    "@uniqu/core": "^0.1.9",
     "@vitejs/plugin-vue": "^6",
     "@vue/test-utils": "^2",
     "@vueuse/core": "^14.3.0",
@@ -183,7 +183,7 @@
     "vunor": "^0.3.0"
   },
   "peerDependencies": {
-    "@atscript/db-client": "^0.1.131",
+    "@atscript/db-client": "^0.1.132",
     "@tanstack/vue-virtual": "^3.13.26",
     "@vueuse/core": "^14.3.0",
     "reka-ui": "^2.9.8",