@lavalogic/scoria 0.13.4 → 0.14.0

package/dist/Components/QuerySelect.svelte

@@ -50,17 +50,10 @@
 	import { ToastContext } from '../Contexts/ToastContext.svelte.js';
 
 	import { dev } from '$app/environment';
-	import {
-		devCatch,
-		generateShortUUID,
-		getErrorMessage,
-		isErrorResponse,
-		vowels
-	} from '../Helpers/Helpers.svelte.js';
+	import { devCatch, generateShortUUID, vowels } from '../Helpers/Helpers.svelte.js';
 	import { Colour, ColourSet } from '../scss/colours.js';
 	import type { NonNullableKey, ValueProp } from '../Types/Internal/Misc.js';
 	import { Size } from '../Types/Internal/Size.js';
-	import { Validity } from '../Types/Internal/Validity.js';
 	import Svelecte from 'svelecte';
 	import { getContext, onMount, type Snippet, tick, untrack } from 'svelte';
 	import Action from './Action.svelte';
@@ -289,11 +282,7 @@
 					}
 				}
 			} catch (e) {
-				if (isErrorResponse(e)) {
-					toastContext.toast(e);
-				} else {
-					toastContext.toast({ message: getErrorMessage(e), result: Validity.Invalid });
-				}
+				toastContext.toast(e);
 			}
 		}
 	}

package/dist/Components/Table/Body/QuickSearchCell.svelte

@@ -1,6 +1,6 @@
 <svelte:options runes />
 
-<script lang="ts" generics="T extends object, FilterValueType">
+<script lang="ts" generics="T extends object">
 	import { dev } from '$app/environment';
 	import Action from '../../Action.svelte';
 	import Button from '../../Button.svelte';
@@ -36,9 +36,10 @@
 
 	const tableContext = getContext<TableContext<T, never>>(TableContext.identifier);
 
-	const { column, customFilters }: QuickSearchCellProps<T, FilterValueType> = $props();
+	const { column, customFilters }: QuickSearchCellProps<T, unknown> = $props();
 
 	const def = $derived(column.columnDef);
+
 	const customFilter = $derived(customFilters?.get(def.id));
 
 	const isSelect = $derived(
@@ -65,7 +66,7 @@
 			customFilter?.type === CustomFilterType.Number
 	);
 
-	function emptyOptsAndWarn(): Array<never> {
+	function emptyOptsAndWarn(): Array<SelectOption<unknown>> {
 		console.warn(`def ${def.id} is declared as a select filter but has no getOptions() function`);
 		return [];
 	}
@@ -83,12 +84,13 @@
 
 	const isSelectOpen = $derived(openedSelect?.value === selectSymbol);
 
-	let value: SelectOption<unknown> | string | number | null | undefined = $state(null);
+	// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+	let value: unknown | null = $state(null);
 	let valueMin: number | null = $state(null);
 	let valueMax: number | null = $state(null);
 
 	let selectedOptions: Array<SelectOption<unknown>> = $state([]);
-	let lastQueryOptions: Array<SelectOption<string | number>> = $state([]);
+	let lastQueryOptions: Array<SelectOption<unknown>> = $state([]);
 
 	const inputId = $derived(`${tableContext.tableName}-cell-quicksearch-${column.id}`);
 
@@ -122,9 +124,7 @@
 			}
 
 			untrack(() => {
-				const gotValue = filteringStateValue as
-					| Array<string | number | SelectOption<unknown>>
-					| undefined;
+				const gotValue = filteringStateValue as Array<unknown> | undefined;
 
 				try {
 					//  as unknown as string | number | undefined;
@@ -139,7 +139,7 @@
 						if (def.debug) {
 							console.log('value:', $state.snapshot(x));
 						}
-						value = (x ?? null) as SelectOption<unknown> | null;
+						value = x ?? null;
 					} else if (def.debug) {
 						console.log(
 							'filtering state value was undefined',
@@ -160,10 +160,11 @@
 				return;
 			}
 
-			const gotValue = filteringStateValue as
-				| Array<string | number | SelectOption<unknown>>
-				| undefined;
+			const gotValue = filteringStateValue as Array<unknown> | undefined;
 
+			function isSelectOption(it: unknown): it is SelectOption<unknown> {
+				return it != null && typeof it == 'object';
+			}
 			untrack(async () => {
 				try {
 					const opts = await options;
@@ -171,6 +172,9 @@
 						console.log('possible options:', $state.snapshot(opts));
 					}
 					const x = opts.filter((it) => {
+						if (!isSelectOption(it)) {
+							return false;
+						}
 						if (it.value == undefined) {
 							return true;
 						}
@@ -264,7 +268,7 @@
 	let showToDateModal = $state(false);
 
 	function generateOnChangeObject(label: string) {
-		return (newValue: SelectOption<string | number> | null) => {
+		return (newValue: SelectOption<unknown> | null) => {
 			tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
 			tableContext.dataRepo.__queryValues.set(label, newValue);
 			value = newValue;
@@ -272,7 +276,7 @@
 	}
 
 	function generateOnChangePrimitive(label: string) {
-		return (newValue: SelectOption<string | number> | null) => {
+		return (newValue: SelectOption<unknown> | null) => {
 			tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
 			tableContext.dataRepo.__queryValues.set(label, newValue?.value ?? null);
 			value = newValue?.value ?? null;
@@ -342,13 +346,14 @@
 
 						<!-- TODO: multiselect -->
 
+						<!-- FIXME: Most likely Unsafe -->
 						<QuerySelect
 							valueAsObject={false}
 							clearable
 							name={customFilter.objectName ?? 'Item'}
 							valueProp="value"
 							labelProp="label"
-							value={value as string | number | null}
+							value={value as null}
 							query={customFilter.query}
 							bind:options={lastQueryOptions}
 							onchange={generateOnChangePrimitive(label)}
@@ -468,7 +473,7 @@
 							<TextInput
 								data-type="quicksearch"
 								id={inputId}
-								bind:value
+								bind:value={value as string | null}
 								placeholder="Filter&hellip;"
 								variant={InputVariant.Table}
 								oninput={() => {
@@ -505,7 +510,7 @@
 								tableContext.paginationRepo?.filterBy(def.id, value);
 							}}
 							variant={InputVariant.Table}
-							bind:value
+							bind:value={value as string | null}
 							placeholder="Filter&hellip;"
 						/>
 					{/if}

package/dist/Components/Table/Body/QuickSearchCell.svelte.d.ts

@@ -1,25 +1,25 @@
 import type { QuickSearchCellProps } from './QuickSearchCellProps.js';
-declare function $$render<T extends object, FilterValueType>(): {
-    props: QuickSearchCellProps<T, FilterValueType>;
+declare function $$render<T extends object>(): {
+    props: QuickSearchCellProps<T, unknown>;
     exports: {};
     bindings: "";
     slots: {};
     events: {};
 };
-declare class __sveltets_Render<T extends object, FilterValueType> {
-    props(): ReturnType<typeof $$render<T, FilterValueType>>['props'];
-    events(): ReturnType<typeof $$render<T, FilterValueType>>['events'];
-    slots(): ReturnType<typeof $$render<T, FilterValueType>>['slots'];
+declare class __sveltets_Render<T extends object> {
+    props(): ReturnType<typeof $$render<T>>['props'];
+    events(): ReturnType<typeof $$render<T>>['events'];
+    slots(): ReturnType<typeof $$render<T>>['slots'];
     bindings(): "";
     exports(): {};
 }
 interface $$IsomorphicComponent {
-    new <T extends object, FilterValueType>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T, FilterValueType>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T, FilterValueType>['props']>, ReturnType<__sveltets_Render<T, FilterValueType>['events']>, ReturnType<__sveltets_Render<T, FilterValueType>['slots']>> & {
-        $$bindings?: ReturnType<__sveltets_Render<T, FilterValueType>['bindings']>;
-    } & ReturnType<__sveltets_Render<T, FilterValueType>['exports']>;
-    <T extends object, FilterValueType>(internal: unknown, props: ReturnType<__sveltets_Render<T, FilterValueType>['props']> & {}): ReturnType<__sveltets_Render<T, FilterValueType>['exports']>;
-    z_$$bindings?: ReturnType<__sveltets_Render<any, any>['bindings']>;
+    new <T extends object>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
+    } & ReturnType<__sveltets_Render<T>['exports']>;
+    <T extends object>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {}): ReturnType<__sveltets_Render<T>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
 }
 declare const QuickSearchCell: $$IsomorphicComponent;
-type QuickSearchCell<T extends object, FilterValueType> = InstanceType<typeof QuickSearchCell<T, FilterValueType>>;
+type QuickSearchCell<T extends object> = InstanceType<typeof QuickSearchCell<T>>;
 export default QuickSearchCell;

package/dist/Components/Table/Body/QuickSearchCellProps.d.ts

@@ -2,5 +2,5 @@ import type { Column } from '../Types/Columns/Column.js';
 import type { CustomRemoteFilters } from '../Types/Filtering/CustomRemoteFilters.js';
 export interface QuickSearchCellProps<T extends object, FilterValueType> {
     column: Column<T, FilterValueType>;
-    customFilters?: CustomRemoteFilters | undefined;
+    customFilters?: CustomRemoteFilters<FilterValueType> | undefined;
 }

package/dist/Components/Table/Body/Rows/Columns/ActionsColumn.d.ts

@@ -1,5 +1,5 @@
 import type { Column } from '../../../Types/Columns/Column.js';
 import type { ActionsDef } from '../../../Types/Columns/Definitions/Actions/ActionsDef.svelte.js';
 export interface ActionsColumn<T extends object, FilterValueType> extends Column<T, FilterValueType> {
-    columnDef: ActionsDef<T>;
+    columnDef: ActionsDef<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/ProgressCell.svelte

@@ -4,21 +4,20 @@
 	import ProgressBubble from '../../../../ProgressBubble.svelte';
 	import type { ProgressBarTableCell } from '../../../Types/Columns/ProgressBarTableCell.js';
 	import { TableContext } from '../../../Types/Context/TableContext.svelte.js';
-	import type { NumberFilterValueType } from '../../../Types/Filtering/FilterFn.js';
 	import { TableFocusDetails } from '../../../Types/Focus/TableFocusDetails.svelte.js';
 	import { ToastContext } from '../../../../../Contexts/ToastContext.svelte.js';
 	import { devCatch } from '../../../../../Helpers/Helpers.svelte.js';
 	import { Validity } from '../../../../../Types/Internal/Validity.js';
 	import { getContext, tick, untrack } from 'svelte';
 
-	export interface ProgressCellProps<T extends object> {
-		cell: ProgressBarTableCell<T>;
+	export interface ProgressCellProps<T extends object, FilterValueType> {
+		cell: ProgressBarTableCell<T, FilterValueType>;
 	}
 </script>
 
 <!-- TODO editable version of this should contain a multi select -->
-<script lang="ts" generics="T extends object">
-	const { cell }: ProgressCellProps<T> = $props();
+<script lang="ts" generics="T extends object, FilterValueType">
+	const { cell }: ProgressCellProps<T, FilterValueType> = $props();
 
 	const value: [number, number] = $derived(cell.getValue()) as [number, number];
 
@@ -28,7 +27,7 @@
 	// const previousRowIndex: number | undefined = $state(undefined);
 
 	const focusDetails = $derived(
-		new TableFocusDetails<T, NumberFilterValueType>(cell, tableContext, toast)
+		new TableFocusDetails<T, FilterValueType>(cell, tableContext, toast)
 	);
 
 	let previousValidity: Validity = $state(Validity.Valid);

package/dist/Components/Table/Body/Rows/Columns/ProgressCell.svelte.d.ts

@@ -1,28 +1,28 @@
 import type { ProgressBarTableCell } from '../../../Types/Columns/ProgressBarTableCell.js';
-export interface ProgressCellProps<T extends object> {
-    cell: ProgressBarTableCell<T>;
+export interface ProgressCellProps<T extends object, FilterValueType> {
+    cell: ProgressBarTableCell<T, FilterValueType>;
 }
-declare function $$render<T extends object>(): {
-    props: ProgressCellProps<T>;
+declare function $$render<T extends object, FilterValueType>(): {
+    props: ProgressCellProps<T, FilterValueType>;
     exports: {};
     bindings: "";
     slots: {};
     events: {};
 };
-declare class __sveltets_Render<T extends object> {
-    props(): ReturnType<typeof $$render<T>>['props'];
-    events(): ReturnType<typeof $$render<T>>['events'];
-    slots(): ReturnType<typeof $$render<T>>['slots'];
+declare class __sveltets_Render<T extends object, FilterValueType> {
+    props(): ReturnType<typeof $$render<T, FilterValueType>>['props'];
+    events(): ReturnType<typeof $$render<T, FilterValueType>>['events'];
+    slots(): ReturnType<typeof $$render<T, FilterValueType>>['slots'];
     bindings(): "";
     exports(): {};
 }
 interface $$IsomorphicComponent {
-    new <T extends object>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
-        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
-    } & ReturnType<__sveltets_Render<T>['exports']>;
-    <T extends object>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {}): ReturnType<__sveltets_Render<T>['exports']>;
-    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
+    new <T extends object, FilterValueType>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T, FilterValueType>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T, FilterValueType>['props']>, ReturnType<__sveltets_Render<T, FilterValueType>['events']>, ReturnType<__sveltets_Render<T, FilterValueType>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T, FilterValueType>['bindings']>;
+    } & ReturnType<__sveltets_Render<T, FilterValueType>['exports']>;
+    <T extends object, FilterValueType>(internal: unknown, props: ReturnType<__sveltets_Render<T, FilterValueType>['props']> & {}): ReturnType<__sveltets_Render<T, FilterValueType>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any, any>['bindings']>;
 }
 declare const ProgressCell: $$IsomorphicComponent;
-type ProgressCell<T extends object> = InstanceType<typeof ProgressCell<T>>;
+type ProgressCell<T extends object, FilterValueType> = InstanceType<typeof ProgressCell<T, FilterValueType>>;
 export default ProgressCell;

package/dist/Components/Table/Body/Rows/Columns/SelectColumn.d.ts

@@ -1,6 +1,6 @@
 import type { Column } from '../../../Types/Columns/Column.js';
 import type { SelectDef } from '../../../Types/Columns/Definitions/Accessors/SelectDef.svelte.js';
 import type { SelectFilterValueType } from '../../../Types/Filtering/FilterFn.js';
-export interface SelectColumn<T extends object> extends Column<T, SelectFilterValueType<T>> {
-    columnDef: SelectDef<T>;
+export interface SelectColumn<T extends object, FilterValueType = SelectFilterValueType<T>> extends Column<T, FilterValueType> {
+    columnDef: SelectDef<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/SelectTableCell.d.ts

@@ -1,5 +1,5 @@
 import type { TableCell } from '../../../Types/Columns/TableCell.js';
 import type { SelectColumn } from './SelectColumn.js';
-export interface SelectTableCell<T extends object> extends TableCell<T> {
-    column: SelectColumn<T>;
+export interface SelectTableCell<T extends object, FilterValueType> extends TableCell<T, FilterValueType> {
+    column: SelectColumn<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/TableColumn.svelte

@@ -23,29 +23,29 @@
 	import TableRowSelectionCheckbox from './TableRowSelectionCheckbox.svelte';
 	import ValidityCell from './ValidityCell.svelte';
 
-	export interface TableColumnProps<T extends object, FilterValueType> {
-		cell: TableCell<T, FilterValueType>;
-		expandedColumnDef: ExpandDef<T, object, Primitive, FilterValueType> | undefined;
-		onExpandChange: (columnDef: ExpandDef<T, object, Primitive, FilterValueType>) => void;
+	export interface TableColumnProps<T extends object> {
+		cell: TableCell<T>;
+		expandedColumnDef: ExpandDef<T, object, Primitive> | undefined;
+		onExpandChange: (columnDef: ExpandDef<T, object, Primitive>) => void;
 	}
 
 	function isProgressBarTableCell<T extends object>(
 		cell: TableCell<T>
-	): cell is ProgressBarTableCell<T> {
+	): cell is ProgressBarTableCell<T, unknown> {
 		return cell.column.columnDef instanceof ProgressBarDef;
 	}
 </script>
 
-<script lang="ts" generics="T extends object,FilterValueType">
+<script lang="ts" generics="T extends object">
 	import { dev } from '$app/environment';
 	import { RowSelectionDef } from '../../../Types/Columns/Definitions/RowSelection/RowSelectionDef.svelte.js';
 	import type { Primitive } from '../../../Types/Context/TableInitOptions.js';
 	import type { RowSelectionTableCell } from './RowSelectionTableCell.js';
 
-	let { cell, expandedColumnDef, onExpandChange }: TableColumnProps<T, FilterValueType> = $props();
+	let { cell, expandedColumnDef, onExpandChange }: TableColumnProps<T> = $props();
 
 	function isRowSelectionCell<T extends object>(
-		cell: TableCell<T, FilterValueType>
+		cell: TableCell<T>
 	): cell is RowSelectionTableCell<T> {
 		return cell.column.columnDef instanceof RowSelectionDef;
 	}
@@ -56,12 +56,12 @@
 		return typeof valueOrComponent === 'function';
 	}
 
-	function isActionsDef(cell: TableCell<T>): cell is ActionsTableCell<T, FilterValueType> {
+	function isActionsDef(cell: TableCell<T>): cell is ActionsTableCell<T, unknown> {
 		return cell.column.columnDef instanceof ActionsDef;
 	}
 	function isExpandTableCell(
 		cell: TableCell<T>
-	): cell is ExpandTableCell<T, object, Primitive, FilterValueType> {
+	): cell is ExpandTableCell<T, object, Primitive, unknown> {
 		return cell.column.columnDef instanceof ExpandDef;
 	}
 

package/dist/Components/Table/Body/Rows/Columns/TableColumn.svelte.d.ts

@@ -1,32 +1,32 @@
 import { ExpandDef } from '../../../Types/Columns/Definitions/Expand/ExpandDef.svelte.js';
 import type { TableCell } from '../../../Types/Columns/TableCell.js';
-export interface TableColumnProps<T extends object, FilterValueType> {
-    cell: TableCell<T, FilterValueType>;
-    expandedColumnDef: ExpandDef<T, object, Primitive, FilterValueType> | undefined;
-    onExpandChange: (columnDef: ExpandDef<T, object, Primitive, FilterValueType>) => void;
+export interface TableColumnProps<T extends object> {
+    cell: TableCell<T>;
+    expandedColumnDef: ExpandDef<T, object, Primitive> | undefined;
+    onExpandChange: (columnDef: ExpandDef<T, object, Primitive>) => void;
 }
 import type { Primitive } from '../../../Types/Context/TableInitOptions.js';
-declare function $$render<T extends object, FilterValueType>(): {
-    props: TableColumnProps<T, FilterValueType>;
+declare function $$render<T extends object>(): {
+    props: TableColumnProps<T>;
     exports: {};
     bindings: "";
     slots: {};
     events: {};
 };
-declare class __sveltets_Render<T extends object, FilterValueType> {
-    props(): ReturnType<typeof $$render<T, FilterValueType>>['props'];
-    events(): ReturnType<typeof $$render<T, FilterValueType>>['events'];
-    slots(): ReturnType<typeof $$render<T, FilterValueType>>['slots'];
+declare class __sveltets_Render<T extends object> {
+    props(): ReturnType<typeof $$render<T>>['props'];
+    events(): ReturnType<typeof $$render<T>>['events'];
+    slots(): ReturnType<typeof $$render<T>>['slots'];
     bindings(): "";
     exports(): {};
 }
 interface $$IsomorphicComponent {
-    new <T extends object, FilterValueType>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T, FilterValueType>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T, FilterValueType>['props']>, ReturnType<__sveltets_Render<T, FilterValueType>['events']>, ReturnType<__sveltets_Render<T, FilterValueType>['slots']>> & {
-        $$bindings?: ReturnType<__sveltets_Render<T, FilterValueType>['bindings']>;
-    } & ReturnType<__sveltets_Render<T, FilterValueType>['exports']>;
-    <T extends object, FilterValueType>(internal: unknown, props: ReturnType<__sveltets_Render<T, FilterValueType>['props']> & {}): ReturnType<__sveltets_Render<T, FilterValueType>['exports']>;
-    z_$$bindings?: ReturnType<__sveltets_Render<any, any>['bindings']>;
+    new <T extends object>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<T>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<T>['props']>, ReturnType<__sveltets_Render<T>['events']>, ReturnType<__sveltets_Render<T>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<T>['bindings']>;
+    } & ReturnType<__sveltets_Render<T>['exports']>;
+    <T extends object>(internal: unknown, props: ReturnType<__sveltets_Render<T>['props']> & {}): ReturnType<__sveltets_Render<T>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
 }
 declare const TableColumn: $$IsomorphicComponent;
-type TableColumn<T extends object, FilterValueType> = InstanceType<typeof TableColumn<T, FilterValueType>>;
+type TableColumn<T extends object> = InstanceType<typeof TableColumn<T>>;
 export default TableColumn;

package/dist/Components/Table/Body/Rows/Columns/TableQueryCell.d.ts

@@ -1,5 +1,5 @@
 import type { TableCell } from '../../../Types/Columns/TableCell.js';
 import type { TableQueryColumn } from './TableQueryColumn.js';
-export interface TableQueryCell<T extends object> extends TableCell<T> {
-    column: TableQueryColumn<T>;
+export interface TableQueryCell<T extends object, FilterValueType> extends TableCell<T, FilterValueType> {
+    column: TableQueryColumn<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/TableQueryColumn.d.ts

@@ -1,6 +1,6 @@
 import type { Column } from '../../../Types/Columns/Column.js';
 import type { QueryDef } from '../../../Types/Columns/Definitions/Accessors/QueryDef.svelte.js';
 import type { SelectFilterValueType } from '../../../Types/Filtering/FilterFn.js';
-export interface TableQueryColumn<T extends object> extends Column<T, SelectFilterValueType<T>> {
-    columnDef: QueryDef<T>;
+export interface TableQueryColumn<T extends object, FilterValueType = SelectFilterValueType<T>> extends Column<T, FilterValueType> {
+    columnDef: QueryDef<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/TableQuerySelect.svelte

@@ -1,11 +1,10 @@
 <svelte:options runes />
 
-<script lang="ts" generics="T extends object">
+<script lang="ts" generics="T extends object,">
 	import { dev } from '$app/environment';
 	import QuerySelect from '../../../../QuerySelect.svelte';
 	import type { QueryDef } from '../../../Types/Columns/Definitions/Accessors/QueryDef.svelte.js';
 	import { TableContext } from '../../../Types/Context/TableContext.svelte.js';
-	import type { SelectFilterValueType } from '../../../Types/Filtering/FilterFn.js';
 	import { TableFocusDetails } from '../../../Types/Focus/TableFocusDetails.svelte.js';
 	import { ToastContext } from '../../../../../Contexts/ToastContext.svelte.js';
 	import { devCatch } from '../../../../../Helpers/Helpers.svelte.js';
@@ -14,7 +13,7 @@
 	import { getContext, tick, untrack } from 'svelte';
 	import type { TableQuerySelectProps } from './TableQuerySelectProps.js';
 
-	const { cell }: TableQuerySelectProps<T> = $props();
+	const { cell }: TableQuerySelectProps<T, unknown> = $props();
 
 	const value = $derived((cell.getValue() ?? null) as unknown);
 
@@ -103,7 +102,7 @@
 		});
 	});
 
-	const focusDetails: TableFocusDetails<T, SelectFilterValueType<T>> = $derived(
+	const focusDetails: TableFocusDetails<T, unknown> = $derived(
 		new TableFocusDetails(cell, tableContext, toast)
 	);
 

package/dist/Components/Table/Body/Rows/Columns/TableQuerySelect.svelte.d.ts

@@ -1,6 +1,6 @@
 import type { TableQuerySelectProps } from './TableQuerySelectProps.js';
 declare function $$render<T extends object>(): {
-    props: TableQuerySelectProps<T>;
+    props: TableQuerySelectProps<T, unknown>;
     exports: {};
     bindings: "";
     slots: {};

package/dist/Components/Table/Body/Rows/Columns/TableQuerySelectProps.d.ts

@@ -1,4 +1,4 @@
 import type { TableQueryCell } from './TableQueryCell.js';
-export interface TableQuerySelectProps<T extends object> {
-    cell: TableQueryCell<T>;
+export interface TableQuerySelectProps<T extends object, FilterValueType> {
+    cell: TableQueryCell<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/TableSelect.svelte

@@ -4,7 +4,6 @@
 	import { dev } from '$app/environment';
 	import SingleSelect from '../../../../SingleSelect.svelte';
 	import { TableContext } from '../../../Types/Context/TableContext.svelte.js';
-	import type { SelectFilterValueType } from '../../../Types/Filtering/FilterFn.js';
 	import { TableFocusDetails } from '../../../Types/Focus/TableFocusDetails.svelte.js';
 	import { ToastContext } from '../../../../../Contexts/ToastContext.svelte.js';
 	import { devCatch } from '../../../../../Helpers/Helpers.svelte.js';
@@ -15,7 +14,7 @@
 </script>
 
 <script lang="ts" generics="T extends object">
-	const { cell }: TableSelectProps<T> = $props();
+	const { cell }: TableSelectProps<T, T> = $props();
 
 	let tdref = $state<HTMLTableCellElement | undefined>();
 
@@ -59,7 +58,7 @@
 		})().catch(devCatch);
 	});
 
-	const focusDetails: TableFocusDetails<T, SelectFilterValueType<T> | undefined> = $derived(
+	const focusDetails: TableFocusDetails<T, T> = $derived(
 		new TableFocusDetails(cell, tableContext, toast)
 	);
 
@@ -110,12 +109,10 @@
 	});
 
 	const optionsPromise = $derived(
-		(cell.column.columnDef.getSpecificOptions?.(
+		cell.column.columnDef.getSpecificOptions?.(
 			cell.row.original,
 			focusDetails.coordinates.column
-		) ?? cell.column.columnDef.getOptions()) as
-			| Array<SelectOption<T>>
-			| Promise<Array<SelectOption<T>>>
+		) ?? cell.column.columnDef.getOptions()
 	);
 
 	let previousValidity: Validity = $state(Validity.Valid);

package/dist/Components/Table/Body/Rows/Columns/TableSelect.svelte.d.ts

@@ -1,6 +1,6 @@
 import type { TableSelectProps } from './TableSelectProps.js';
 declare function $$render<T extends object>(): {
-    props: TableSelectProps<T>;
+    props: TableSelectProps<T, T>;
     exports: {};
     bindings: "";
     slots: {};

package/dist/Components/Table/Body/Rows/Columns/TableSelectProps.d.ts

@@ -1,4 +1,4 @@
 import type { SelectTableCell } from './SelectTableCell.js';
-export interface TableSelectProps<T extends object> {
-    cell: SelectTableCell<T>;
+export interface TableSelectProps<T extends object, FilterValueType> {
+    cell: SelectTableCell<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/Columns/TableTextInput.svelte

@@ -59,7 +59,7 @@
 	const tableContext = getContext<TableContext<T, never>>(TableContext.identifier);
 	const toastContext = getContext<ToastContext>(ToastContext.identifier);
 
-	const focusDetails: TableFocusDetails<T, never> = $derived(
+	const focusDetails: TableFocusDetails<T, FilterValueType> = $derived(
 		new TableFocusDetails(cell, tableContext, toastContext.toast)
 	);
 

package/dist/Components/Table/Body/Rows/Columns/ValidityCellProps.d.ts

@@ -1,4 +1,4 @@
 import type { TableCell } from '../../../Types/Columns/TableCell.js';
-export interface ValidityCellProps<T extends object, in FilterValueType> {
+export interface ValidityCellProps<T extends object, FilterValueType> {
     cell: TableCell<T, FilterValueType>;
 }

package/dist/Components/Table/Body/Rows/TableRow.svelte

@@ -20,7 +20,7 @@
 	const hoverable = $derived(tableContext.changeColourOnHover);
 
 	//HACK converted this from derived to state+deffect because otherwise this throws an unsafe mutation error deeper down the stack
-	const cells: Array<TableCell<T, unknown>> = $derived(
+	const cells: Array<TableCell<T>> = $derived(
 		side === 'left'
 			? row.getLeftVisibleCells()
 			: side === 'right'
@@ -28,7 +28,7 @@
 				: row.getCenterVisibleCells()
 	);
 
-	let expandedColumnDef: ExpandDef<T, object, Primitive, unknown> | undefined = $state();
+	let expandedColumnDef: ExpandDef<T, object, Primitive> | undefined = $state();
 
 	$effect(() => {
 		if (cells.length) {
@@ -45,7 +45,7 @@
 	let innerColumnDefs: DefsWrapper<object> = $state({ defs: [] });
 	let innerTableName: string | undefined = $state();
 
-	let prevExpandedColumnDef: ExpandDef<T, object, Primitive, unknown> | undefined = $state();
+	let prevExpandedColumnDef: ExpandDef<T, object, Primitive> | undefined = $state();
 
 	const rowIndex = $derived(cells.at(0) && cells[0].row.visibleIndex);
 	const highlighted = $derived(
@@ -84,7 +84,7 @@
 		});
 	});
 
-	function onExpandChange(columnDef: ExpandDef<T, object, Primitive, unknown>) {
+	function onExpandChange(columnDef: ExpandDef<T, object, Primitive>) {
 		if (expandedColumnDef?.id === columnDef.id) {
 			expandedColumnDef = undefined;
 		} else {

package/dist/Components/Table/Body/TableBodyProps.d.ts

@@ -3,6 +3,6 @@ import type { HeightData } from './HeightData.js';
 export interface TableBodyProps<T extends object> {
     side: 'left' | 'centre' | 'right';
     heights: Array<HeightData<T>>;
-    columns: Array<Column<T, unknown>>;
+    columns: Array<Column<T>>;
     includeHighlight: boolean;
 }