@atscript/vue-table 0.1.147 → 0.1.148

package/dist/{use-table-state-1OZfdhQi.mjs → use-table-state-CIoWhwTD.mjs}

@@ -1,7 +1,7 @@
 import { t as getCellValue } from "./get-cell-value-Cb3X8nUn.mjs";
 import { navigateHrefFor, setByPath } from "@atscript/ui";
 import { computed, inject, nextTick, onBeforeUnmount, onScopeDispose, provide, ref, shallowRef, toValue, watch } from "vue";
-import { DEV, STANDARD_PRESET_ID, arraysEqual, blockStartFor, buildTableQuery, canonicalPresetSnapshot, cellAsString, compactFieldFilters, debounce, derivePresetAspects, filterExprFields, filterExprKey, fromWireSnapshot, gateOwns, isDirtyAgainst, isFilled, isSystemPresetId, mergeDisplayColumns, mergeSorters, normalizeResidualFilters, pageAlignedBlocksFor, planFetch, prunePresetSnapshot, pruneResidualFilters, reconcileColumnWidthDefaults, residualGateOwns, resolveAspectGate, resolveSystemPresets, restoreDroppedEntries, rowsToPks, sameColumnSet, selectionQueryOf, selectionSignature, sortRowsLocally, sortersEqual, stateToUrlQueryString, togglePk, urlQueryStringToState, walkBackwardAbsorb, walkForwardAbsorb } from "@atscript/ui-table";
+import { DEV, STANDARD_PRESET_ID, arraysEqual, blockStartFor, buildTableQuery, canonicalPresetSnapshot, cellAsString, columnFilterKind, compactFieldFilters, createColumnValueEncoder, debounce, derivePresetAspects, filterExprFields, filterExprKey, fromWireSnapshot, gateOwns, isDirtyAgainst, isFilled, isSystemPresetId, isTemporalKind, mergeDisplayColumns, mergeSorters, normalizeResidualFilters, pageAlignedBlocksFor, planFetch, prunePresetSnapshot, pruneResidualFilters, reconcileColumnWidthDefaults, residualGateOwns, resolveAspectGate, resolveSystemPresets, restoreDroppedEntries, rowsToPks, sameColumnSet, selectionQueryOf, selectionSignature, sortRowsLocally, sortersEqual, stableValueKey, 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. */
@@ -2359,10 +2359,33 @@ function createTableState(opts) {
 	}
 	/** Reads the value a sorter orders by — a display column's `sortValue` wins. */
 	const sortValueOf = createSortValueReader(opts.displayColumns);
+	/** The app-authored scope, read live — the query, local sort and chrome all go through these. */
+	const forceFilters = computed(() => toValue(queryOpts?.forceFilters));
+	const timeZone = computed(() => toValue(queryOpts?.timeZone));
+	const weekStart = computed(() => toValue(queryOpts?.weekStart));
+	/**
+	* Turns a typed filter value into what the server accepts (date periods in
+	* `timeZone`, boolean text → boolean). Rebuilt when the columns, the zone or
+	* the week start change; "today" is read at each query build.
+	*/
+	const encodeCondition = computed(() => createColumnValueEncoder(allColumns.value, {
+		timeZone: timeZone.value,
+		weekStart: weekStart.value
+	}));
+	const forceSorters = computed(() => toValue(queryOpts?.forceSorters) ?? []);
+	/** Whether a date filter is set — the only filters a zone or week-start change affects. */
+	function hasFilledTemporalFilter() {
+		for (const c of allColumns.value) {
+			if (!c.valueKind || !isTemporalKind(columnFilterKind(c))) continue;
+			if (filters.value[c.path]?.some(isFilled)) return true;
+		}
+		return false;
+	}
 	function applyLocalSort(rows) {
 		if (queryOpts?.preSorted) return rows;
 		if (splitSorters.value.local.length === 0 || sortersIgnored()) return rows;
-		return sortRowsLocally(rows, queryOpts?.forceSorters?.length ? mergeSorters(queryOpts.forceSorters, sorters.value) : sorters.value, sortValueOf);
+		const forced = forceSorters.value;
+		return sortRowsLocally(rows, forced.length ? mergeSorters(forced, sorters.value) : sorters.value, sortValueOf);
 	}
 	/**
 	* The query's view of the model, gated to the fields this caller can use.
@@ -2405,9 +2428,7 @@ function createTableState(opts) {
 		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);
-		}
+		for (const p of toValue(queryOpts?.alwaysSelected) ?? []) if (available.has(p)) extra.add(p);
 		const def = tableDef.value;
 		if (def?.identifierFields && def.identifierFields !== def.preferredId) {
 			for (const p of def.identifierFields) if (available.has(p) && !def.preferredId.includes(p)) extra.add(p);
@@ -2426,10 +2447,11 @@ function createTableState(opts) {
 			visibleColumnPaths: (buildOpts?.columnPaths ?? model.columnNames).filter((p) => !localPaths.has(p) && (!known || known.columns.has(p))),
 			extraSelect: extra.size ? [...extra] : void 0,
 			sorters: model.sorters,
-			forceSorters: queryOpts?.forceSorters,
+			forceSorters: forceSorters.value,
 			filters: model.filters,
+			encodeCondition: encodeCondition.value,
 			residualFilters: model.residual,
-			forceFilters: queryOpts?.forceFilters,
+			forceFilters: forceFilters.value,
 			search: searchTerm.value || void 0,
 			ignoreSorters: sortersIgnored(),
 			includeActions: buildOpts?.includeActions ?? includeActions.value
@@ -2714,6 +2736,9 @@ function createTableState(opts) {
 		metadataError,
 		lastError,
 		mustRefresh,
+		forceFilters,
+		forceSorters,
+		timeZone,
 		searchTerm,
 		ignoreSortersWhenSearched,
 		configDialogOpen,
@@ -3006,6 +3031,27 @@ function createTableState(opts) {
 		resetPagination();
 		debouncedFilterQuery();
 	});
+	const readScope = () => ({
+		filter: stableValueKey(forceFilters.value ?? null),
+		sorters: stableValueKey(forceSorters.value),
+		selected: (toValue(queryOpts?.alwaysSelected) ?? []).join("\0"),
+		zone: `${timeZone.value ?? ""}|${weekStart.value ?? ""}`
+	});
+	let scope = readScope();
+	watch(() => Object.values(readScope()).join("
"), () => {
+		const prev = scope;
+		scope = readScope();
+		if (!queryDetected) return;
+		const filterChanged = scope.filter !== prev.filter;
+		if (!filterChanged && scope.sorters === prev.sorters && scope.selected === prev.selected && (scope.zone === prev.zone || !hasFilledTemporalFilter())) return;
+		mustRefresh.value = true;
+		if (hydratingFromUrl) {
+			if (filterChanged && urlQuerySync?.pagination === false) resetPagination();
+			return;
+		}
+		if (filterChanged) resetPagination();
+		scheduleQuery();
+	});
 	watch(() => sorters.value, (next, prev) => {
 		if (hydratingFromUrl) return;
 		if (sortersEqual(prev, next)) return;
@@ -3114,6 +3160,7 @@ function createStaticTableState(opts) {
 			itemsPerPage: size,
 			pages: 1
 		});
+		if (opts.remote) return opts.remote({ searchTerm: _state.searchTerm.value }, page, size);
 		fetcher ??= buildStaticQueryFn(opts, _state);
 		return fetcher(q, page, size);
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/vue-table",
-  "version": "0.1.147",
+  "version": "0.1.148",
   "description": "Type-driven table components for Atscript with Vue 3",
   "keywords": [
     "atscript",
@@ -167,17 +167,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@atscript/ui": "^0.1.147",
-    "@atscript/vue-form": "^0.1.147",
-    "@atscript/ui-table": "^0.1.147"
+    "@atscript/ui": "^0.1.148",
+    "@atscript/ui-table": "^0.1.148",
+    "@atscript/vue-form": "^0.1.148"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.99",
-    "@atscript/db-client": "^0.1.147",
-    "@atscript/typescript": "^0.1.99",
+    "@atscript/core": "^0.1.100",
+    "@atscript/db-client": "^0.1.148",
+    "@atscript/typescript": "^0.1.100",
     "@tanstack/vue-virtual": "^3.13.26",
-    "@uniqu/core": "^0.1.12",
-    "@uniqu/url": "^0.1.12",
+    "@uniqu/core": "^0.1.13",
+    "@uniqu/url": "^0.1.13",
     "@vitejs/plugin-vue": "^6",
     "@vue/test-utils": "^2",
     "@vueuse/core": "^14.3.0",
@@ -190,9 +190,9 @@
     "vunor": "^0.3.2"
   },
   "peerDependencies": {
-    "@atscript/db-client": "^0.1.147",
+    "@atscript/db-client": "^0.1.148",
     "@tanstack/vue-virtual": "^3.13.26",
-    "@uniqu/url": "^0.1.12",
+    "@uniqu/url": "^0.1.13",
     "@vueuse/core": "^14.3.0",
     "reka-ui": "^2.9.8",
     "vue": "^3"

package/dist/as-filter-input-BM23TNeh.mjs

@@ -1,101 +0,0 @@
-import { Fragment, computed, createCommentVNode, createElementBlock, createElementVNode, defineComponent, openBlock } from "vue";
-import { NULL_OPS, hasSecondValue } from "@atscript/ui-table";
-//#region src/components/defaults/as-filter-input.vue?vue&type=script&setup=true&lang.ts
-const _hoisted_1 = {
-	key: 0,
-	class: "as-filter-input-disabled",
-	"aria-hidden": "true"
-};
-const _hoisted_2 = ["value"];
-const _hoisted_3 = { class: "as-filter-input-range" };
-const _hoisted_4 = ["type", "value"];
-const _hoisted_5 = ["type", "value"];
-const _hoisted_6 = [
-	"type",
-	"value",
-	"placeholder"
-];
-//#endregion
-//#region src/components/defaults/as-filter-input.vue
-var as_filter_input_default = /* @__PURE__ */ defineComponent({
-	__name: "as-filter-input",
-	props: {
-		column: {
-			type: Object,
-			required: true
-		},
-		condition: {
-			type: Object,
-			required: true
-		},
-		filterType: {
-			type: String,
-			required: true
-		}
-	},
-	emits: ["update:condition"],
-	setup(__props, { emit: __emit }) {
-		const props = __props;
-		const emit = __emit;
-		const needsInput = computed(() => !NULL_OPS.has(props.condition.type));
-		const isBetween = computed(() => hasSecondValue(props.condition.type));
-		function updateValue(index, raw) {
-			const value = [...props.condition.value];
-			value[index] = props.filterType === "number" ? Number(raw) : raw;
-			emit("update:condition", {
-				...props.condition,
-				value
-			});
-		}
-		function onBoolSelect(val) {
-			const boolVal = val === "true";
-			emit("update:condition", {
-				...props.condition,
-				value: [boolVal]
-			});
-		}
-		const inputType = computed(() => {
-			if (props.filterType === "number") return "number";
-			if (props.filterType === "date") return "date";
-			return "text";
-		});
-		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock(Fragment, null, [createCommentVNode(" Null/notNull: render a plain layer-1 box the size of a filter input, no text. "), !needsInput.value ? (openBlock(), createElementBlock("div", _hoisted_1)) : __props.filterType === "boolean" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [createCommentVNode(" Boolean select "), createElementVNode("select", {
-				class: "as-filter-input as-filter-select",
-				value: String(__props.condition.value[0] ?? ""),
-				onChange: _cache[0] || (_cache[0] = ($event) => onBoolSelect($event.target.value))
-			}, [..._cache[4] || (_cache[4] = [
-				createElementVNode("option", {
-					value: "",
-					disabled: ""
-				}, "Select...", -1),
-				createElementVNode("option", { value: "true" }, "true", -1),
-				createElementVNode("option", { value: "false" }, "false", -1)
-			])], 40, _hoisted_2)], 2112)) : isBetween.value ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [createCommentVNode(" Between: two inputs "), createElementVNode("div", _hoisted_3, [
-				createElementVNode("input", {
-					class: "as-filter-input",
-					type: inputType.value,
-					value: __props.condition.value[0] ?? "",
-					placeholder: "From",
-					onInput: _cache[1] || (_cache[1] = ($event) => updateValue(0, $event.target.value))
-				}, null, 40, _hoisted_4),
-				_cache[5] || (_cache[5] = createElementVNode("span", { class: "as-filter-input-range-sep" }, "–", -1)),
-				createElementVNode("input", {
-					class: "as-filter-input",
-					type: inputType.value,
-					value: __props.condition.value[1] ?? "",
-					placeholder: "To",
-					onInput: _cache[2] || (_cache[2] = ($event) => updateValue(1, $event.target.value))
-				}, null, 40, _hoisted_5)
-			])], 2112)) : (openBlock(), createElementBlock(Fragment, { key: 3 }, [createCommentVNode(" Default: single input "), createElementVNode("input", {
-				class: "as-filter-input",
-				type: inputType.value,
-				value: __props.condition.value[0] ?? "",
-				placeholder: __props.filterType === "date" ? "" : "Value...",
-				onInput: _cache[3] || (_cache[3] = ($event) => updateValue(0, $event.target.value))
-			}, null, 40, _hoisted_6)], 2112))], 2112);
-		};
-	}
-});
-//#endregion
-export { as_filter_input_default as t };

package/dist/as-filter-input-DJu2k9gO.cjs

@@ -1,106 +0,0 @@
-let vue = require("vue");
-let _atscript_ui_table = require("@atscript/ui-table");
-//#region src/components/defaults/as-filter-input.vue?vue&type=script&setup=true&lang.ts
-const _hoisted_1 = {
-	key: 0,
-	class: "as-filter-input-disabled",
-	"aria-hidden": "true"
-};
-const _hoisted_2 = ["value"];
-const _hoisted_3 = { class: "as-filter-input-range" };
-const _hoisted_4 = ["type", "value"];
-const _hoisted_5 = ["type", "value"];
-const _hoisted_6 = [
-	"type",
-	"value",
-	"placeholder"
-];
-//#endregion
-//#region src/components/defaults/as-filter-input.vue
-var as_filter_input_default = /* @__PURE__ */ (0, vue.defineComponent)({
-	__name: "as-filter-input",
-	props: {
-		column: {
-			type: Object,
-			required: true
-		},
-		condition: {
-			type: Object,
-			required: true
-		},
-		filterType: {
-			type: String,
-			required: true
-		}
-	},
-	emits: ["update:condition"],
-	setup(__props, { emit: __emit }) {
-		const props = __props;
-		const emit = __emit;
-		const needsInput = (0, vue.computed)(() => !_atscript_ui_table.NULL_OPS.has(props.condition.type));
-		const isBetween = (0, vue.computed)(() => (0, _atscript_ui_table.hasSecondValue)(props.condition.type));
-		function updateValue(index, raw) {
-			const value = [...props.condition.value];
-			value[index] = props.filterType === "number" ? Number(raw) : raw;
-			emit("update:condition", {
-				...props.condition,
-				value
-			});
-		}
-		function onBoolSelect(val) {
-			const boolVal = val === "true";
-			emit("update:condition", {
-				...props.condition,
-				value: [boolVal]
-			});
-		}
-		const inputType = (0, vue.computed)(() => {
-			if (props.filterType === "number") return "number";
-			if (props.filterType === "date") return "date";
-			return "text";
-		});
-		return (_ctx, _cache) => {
-			return (0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, null, [(0, vue.createCommentVNode)(" Null/notNull: render a plain layer-1 box the size of a filter input, no text. "), !needsInput.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("div", _hoisted_1)) : __props.filterType === "boolean" ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 1 }, [(0, vue.createCommentVNode)(" Boolean select "), (0, vue.createElementVNode)("select", {
-				class: "as-filter-input as-filter-select",
-				value: String(__props.condition.value[0] ?? ""),
-				onChange: _cache[0] || (_cache[0] = ($event) => onBoolSelect($event.target.value))
-			}, [..._cache[4] || (_cache[4] = [
-				(0, vue.createElementVNode)("option", {
-					value: "",
-					disabled: ""
-				}, "Select...", -1),
-				(0, vue.createElementVNode)("option", { value: "true" }, "true", -1),
-				(0, vue.createElementVNode)("option", { value: "false" }, "false", -1)
-			])], 40, _hoisted_2)], 2112)) : isBetween.value ? ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 2 }, [(0, vue.createCommentVNode)(" Between: two inputs "), (0, vue.createElementVNode)("div", _hoisted_3, [
-				(0, vue.createElementVNode)("input", {
-					class: "as-filter-input",
-					type: inputType.value,
-					value: __props.condition.value[0] ?? "",
-					placeholder: "From",
-					onInput: _cache[1] || (_cache[1] = ($event) => updateValue(0, $event.target.value))
-				}, null, 40, _hoisted_4),
-				_cache[5] || (_cache[5] = (0, vue.createElementVNode)("span", { class: "as-filter-input-range-sep" }, "–", -1)),
-				(0, vue.createElementVNode)("input", {
-					class: "as-filter-input",
-					type: inputType.value,
-					value: __props.condition.value[1] ?? "",
-					placeholder: "To",
-					onInput: _cache[2] || (_cache[2] = ($event) => updateValue(1, $event.target.value))
-				}, null, 40, _hoisted_5)
-			])], 2112)) : ((0, vue.openBlock)(), (0, vue.createElementBlock)(vue.Fragment, { key: 3 }, [(0, vue.createCommentVNode)(" Default: single input "), (0, vue.createElementVNode)("input", {
-				class: "as-filter-input",
-				type: inputType.value,
-				value: __props.condition.value[0] ?? "",
-				placeholder: __props.filterType === "date" ? "" : "Value...",
-				onInput: _cache[3] || (_cache[3] = ($event) => updateValue(0, $event.target.value))
-			}, null, 40, _hoisted_6)], 2112))], 2112);
-		};
-	}
-});
-//#endregion
-Object.defineProperty(exports, "as_filter_input_default", {
-	enumerable: true,
-	get: function() {
-		return as_filter_input_default;
-	}
-});