@lavalogic/scoria 0.13.4 → 0.14.1

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;
 }

package/dist/Components/Table/ColumnDefinitions/ExampleItemColumnDefRepository.svelte.js

@@ -15,7 +15,7 @@ import { ProgressBarDef } from '../Types/Columns/Definitions/Display/ProgressBar
 import { ValidityDef } from '../Types/Columns/Definitions/Display/ValidityDef.svelte.js';
 import { ExpandDef } from '../Types/Columns/Definitions/Expand/ExpandDef.svelte.js';
 export function generateExampleItemColumnDefs(modal) {
-    const expandDef = new ExpandDef({
+    const expandDef = $state(new ExpandDef({
         accessorFn: (it) => [it],
         getInnerColumnDefs: () => generateExampleItemColumnDefs(modal),
         header: 'Expand Cell',
@@ -27,7 +27,34 @@ export function generateExampleItemColumnDefs(modal) {
             getUserId: () => '1'
         },
         isEnabled: () => true
-    });
+    }));
+    const selectDef = $state(new SelectDef({
+        id: 'someSelect',
+        header: 'Select Example',
+        optional: false,
+        getOptions: () => {
+            return [
+                {
+                    label: 'First Option',
+                    value: ExampleSelectEnum.FirstOption
+                },
+                {
+                    label: 'Second Option',
+                    value: ExampleSelectEnum.SecondOption
+                },
+                {
+                    label: 'Third Option',
+                    value: ExampleSelectEnum.ThirdOption
+                },
+                {
+                    label: 'Fourth Option',
+                    value: ExampleSelectEnum.FourthOption
+                }
+            ];
+        },
+        getDisplayValue: (item) => item.someSelect,
+        isEditable: () => true
+    }));
     let defs = $state([
         expandDef,
         new ValidityDef({
@@ -143,33 +170,7 @@ export function generateExampleItemColumnDefs(modal) {
             defaultHidden: true,
             showTime: true
         }),
-        new SelectDef({
-            id: 'someSelect',
-            header: 'Select Example',
-            optional: false,
-            getOptions: () => {
-                return [
-                    {
-                        label: 'First Option',
-                        value: ExampleSelectEnum.FirstOption
-                    },
-                    {
-                        label: 'Second Option',
-                        value: ExampleSelectEnum.SecondOption
-                    },
-                    {
-                        label: 'Third Option',
-                        value: ExampleSelectEnum.ThirdOption
-                    },
-                    {
-                        label: 'Fourth Option',
-                        value: ExampleSelectEnum.FourthOption
-                    }
-                ];
-            },
-            getDisplayValue: (item) => item.someSelect,
-            isEditable: () => true
-        }),
+        selectDef,
         new BubbleDef({
             header: 'Generated Bubble',
             id: 'generatedBubble',

package/dist/Components/Table/Misc/FilterInput.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 Button from '../../Button.svelte';
 	import MultiSelect from '../../MultiSelect.svelte';
@@ -26,7 +26,7 @@
 
 	const tableContext = getContext<TableContext<T, never>>(TableContext.identifier);
 
-	const { def, customFilters }: FilterInputProps<T, FilterValueType> = $props();
+	const { def, customFilters }: FilterInputProps<T, unknown> = $props();
 
 	const customFilter = $derived(customFilters?.get(def.id));
 
@@ -37,7 +37,7 @@
 	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 isNumeric = $derived(
 		def instanceof NumberInputDef || customFilter?.type === CustomFilterType.Number
@@ -108,7 +108,7 @@
 						if (def.debug) {
 							console.log('value:', $state.snapshot(x));
 						}
-						value = (x ?? null) as SelectOption<string | number> | null;
+						value = (x ?? null) as SelectOption<unknown> | null;
 					} else if (def.debug) {
 						console.log(
 							'filtering state value was undefined',
@@ -132,9 +132,7 @@
 					}
 					const x = opts.filter((it) => {
 						if (it.value != null && (typeof it.value == 'string' || typeof it.value == 'number')) {
-							return (filteringStateValue as Array<string | number> | undefined)?.includes(
-								it.value
-							);
+							return (filteringStateValue as Array<unknown> | undefined)?.includes(it.value);
 						}
 						return false;
 					});
@@ -234,7 +232,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 ?? null);
 			value = newValue ?? null;
@@ -242,7 +240,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;

package/dist/Components/Table/Misc/FilterInput.svelte.d.ts

@@ -1,25 +1,25 @@
 import type { FilterInputProps } from './FilterInputProps.js';
-declare function $$render<T extends object, FilterValueType>(): {
-    props: FilterInputProps<T, FilterValueType>;
+declare function $$render<T extends object>(): {
+    props: FilterInputProps<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 FilterInput: $$IsomorphicComponent;
-type FilterInput<T extends object, FilterValueType> = InstanceType<typeof FilterInput<T, FilterValueType>>;
+type FilterInput<T extends object> = InstanceType<typeof FilterInput<T>>;
 export default FilterInput;

package/dist/Components/Table/Misc/FilterInputProps.d.ts

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

package/dist/Components/Table/Misc/FilterPanelModal.svelte

@@ -18,7 +18,7 @@
 	const tableContext = getContext<TableContext<T, never>>(TableContext.identifier);
 
 	const { onclose }: FilterPanelModalProps = $props();
-	const refs: Array<FilterInput<T, unknown>> = $state([]);
+	const refs: Array<FilterInput<T>> = $state([]);
 
 	function reset() {
 		tableContext.paginationRepo?.resetFilters();

package/dist/Components/Table/Types/Columns/Column.d.ts

@@ -1,5 +1,5 @@
 import type { ColumnDef } from './Definitions/ColumnDef.svelte.js';
-export interface Column<T extends object, in FilterFnType> {
+export interface Column<T extends object, FilterFnType = unknown> {
     id: string;
     columnDef: ColumnDef<T, FilterFnType>;
     getCanSort: () => boolean;

package/dist/Components/Table/Types/Columns/Definitions/Accessors/AccessorDef.svelte.d.ts

@@ -1,9 +1,9 @@
 import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
 import type { AccessorType } from './AccessorType.js';
-export interface AccessorDefProps<T extends object, FilterFnType = undefined> extends ColumnDefProps<T, FilterFnType> {
+export interface AccessorDefProps<T extends object, FilterFnType = unknown> extends ColumnDefProps<T, FilterFnType> {
     readonly id: string & keyof T;
 }
-export declare abstract class AccessorDef<T extends object, FilterFnType = undefined> extends ColumnDef<T, FilterFnType> {
+export declare abstract class AccessorDef<T extends object, FilterFnType = unknown> extends ColumnDef<T, FilterFnType> {
     readonly columnType: "Accessor";
     abstract readonly accessorType: AccessorType;
 }

package/dist/Components/Table/Types/Columns/Definitions/Accessors/CheckboxDef.svelte.d.ts

@@ -1,11 +1,11 @@
 import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { BoolFilterValueType, FilterFn } from '../../../Filtering/FilterFn.js';
 import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
-export type CheckboxDefProps<T extends object> = AccessorDefProps<T, BoolFilterValueType>;
-export declare class CheckboxDef<T extends object> extends AccessorDef<T, BoolFilterValueType> {
+export type CheckboxDefProps<T extends object, FilterValueType = BoolFilterValueType> = AccessorDefProps<T, FilterValueType>;
+export declare class CheckboxDef<T extends object, FilterValueType = BoolFilterValueType> extends AccessorDef<T, FilterValueType> {
     readonly accessorType: "Checkbox";
-    constructor(props: CheckboxDefProps<T>);
+    constructor(props: CheckboxDefProps<T, FilterValueType>);
     private _filterFn;
-    get filterFn(): CustomFilterFn | FilterFn<T, BoolFilterValueType> | undefined;
-    set filterFn(v: CustomFilterFn | FilterFn<T, BoolFilterValueType> | undefined);
+    get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);
 }

package/dist/Components/Table/Types/Columns/Definitions/Accessors/DateInputDef.svelte.d.ts

@@ -1,14 +1,14 @@
 import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { DateFilterValueType, FilterFn } from '../../../Filtering/FilterFn.js';
 import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
-export interface DateInputDefProps<T extends object> extends AccessorDefProps<T, DateFilterValueType> {
+export interface DateInputDefProps<T extends object, FilterValueType = DateFilterValueType> extends AccessorDefProps<T, FilterValueType> {
     showTime?: boolean;
 }
-export declare class DateInputDef<T extends object> extends AccessorDef<T, DateFilterValueType> {
+export declare class DateInputDef<T extends object, FilterValueType = DateFilterValueType> extends AccessorDef<T, FilterValueType> {
     readonly accessorType: "Date";
-    constructor(props: DateInputDefProps<T>);
+    constructor(props: DateInputDefProps<T, FilterValueType>);
     private _filterFn;
-    get filterFn(): FilterFn<T, DateFilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, DateFilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
     readonly showTime: boolean;
 }

package/dist/Components/Table/Types/Columns/Definitions/Accessors/NumberInputDef.svelte.d.ts

@@ -2,16 +2,16 @@ import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn, NumberFilterValueType } from '../../../Filtering/FilterFn.js';
 import { type ColumnDefProps } from '../ColumnDef.svelte.js';
 import { AccessorDef } from './AccessorDef.svelte.js';
-export interface NumberInputDefProps<T extends object> extends ColumnDefProps<T, NumberFilterValueType> {
+export interface NumberInputDefProps<T extends object, FilterValueType = NumberFilterValueType> extends ColumnDefProps<T, FilterValueType> {
     min: number;
     max: number;
 }
-export declare class NumberInputDef<T extends object> extends AccessorDef<T, NumberFilterValueType> {
+export declare class NumberInputDef<T extends object, FilterValueType = NumberFilterValueType> extends AccessorDef<T, FilterValueType> {
     readonly accessorType: "Number";
-    constructor(props: NumberInputDefProps<T>);
+    constructor(props: NumberInputDefProps<T, FilterValueType>);
     readonly min: number;
     readonly max: number;
     private _filterFn;
-    get filterFn(): CustomFilterFn | FilterFn<T, NumberFilterValueType> | undefined;
-    set filterFn(v: CustomFilterFn | FilterFn<T, NumberFilterValueType> | undefined);
+    get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);
 }

package/dist/Components/Table/Types/Columns/Definitions/Accessors/QueryDef.svelte.d.ts

@@ -1,17 +1,17 @@
 import type { SelectOption } from '../../../../../../Types/Internal/SelectOption.js';
 import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
-import type { FilterFn, SelectFilterValueType } from '../../../Filtering/FilterFn.js';
+import type { FilterFn } from '../../../Filtering/FilterFn.js';
 import type { ColumnDefProps } from '../ColumnDef.svelte.js';
 import { AccessorDef } from './AccessorDef.svelte.js';
-export interface QueryDefProps<T extends object> extends ColumnDefProps<T, SelectFilterValueType<T>> {
+export interface QueryDefProps<T extends object, FilterValueType = unknown> extends ColumnDefProps<T, FilterValueType> {
     query: (queryString: string, item: T, index: number) => Promise<Array<SelectOption<unknown>>>;
     getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
     clearable?: boolean;
 }
-export declare class QueryDef<T extends object> extends AccessorDef<T, SelectFilterValueType<T>> {
+export declare class QueryDef<T extends object, FilterValueType = unknown> extends AccessorDef<T, FilterValueType> {
     readonly accessorType: "Query";
-    constructor(props: QueryDefProps<T>);
-    readonly filterFn: CustomFilterFn | FilterFn<T, SelectFilterValueType<T>> | undefined;
+    constructor(props: QueryDefProps<T, FilterValueType>);
+    readonly filterFn: CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
     getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
     readonly query: (queryString: string, item: T, index: number) => Promise<Array<SelectOption<unknown>>>;
     readonly clearable: boolean;

package/dist/Components/Table/Types/Columns/Definitions/Accessors/SelectDef.svelte.d.ts

@@ -3,24 +3,24 @@ import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn, SelectFilterValueType } from '../../../Filtering/FilterFn.js';
 import type { ColumnDefProps } from '../ColumnDef.svelte.js';
 import { AccessorDef } from './AccessorDef.svelte.js';
-export interface SelectDefProps<T extends object> extends ColumnDefProps<T, SelectFilterValueType<T>> {
-    getOptions: () => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;
+export interface SelectDefProps<T extends object, FilterValueType = unknown> extends ColumnDefProps<T, FilterValueType> {
+    getOptions: () => Array<SelectOption<FilterValueType>> | Promise<Array<SelectOption<FilterValueType>>>;
     getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
     sortingFn?: (a: T, b: T) => 1 | -1 | 0;
-    getSpecificOptions?: (item: T, index: number) => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;
+    getSpecificOptions?: (item: T, index: number) => Array<SelectOption<FilterValueType>> | Promise<Array<SelectOption<FilterValueType>>>;
     optional?: boolean;
     clearable?: boolean;
 }
-export declare class SelectDef<T extends object> extends AccessorDef<T, SelectFilterValueType<T>> {
-    constructor(props: SelectDefProps<T>);
+export declare class SelectDef<T extends object, FilterValueType = SelectFilterValueType<T>> extends AccessorDef<T, FilterValueType> {
+    constructor(props: SelectDefProps<T, FilterValueType>);
     readonly accessorType: "Select";
     private _filterFn;
-    get filterFn(): FilterFn<T, SelectFilterValueType<T>> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, SelectFilterValueType<T>> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
     readonly sortingFn?: (a: T, b: T) => 1 | -1 | 0;
     readonly optional: boolean;
     readonly clearable: boolean;
-    readonly getSpecificOptions?: (item: T, index: number) => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;
+    readonly getSpecificOptions?: (item: T, index: number) => Array<SelectOption<FilterValueType>> | Promise<Array<SelectOption<FilterValueType>>>;
     getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
-    getOptions: () => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;
+    getOptions: () => Array<SelectOption<FilterValueType>> | Promise<Array<SelectOption<FilterValueType>>>;
 }

package/dist/Components/Table/Types/Columns/Definitions/Accessors/TextInputDef.svelte.d.ts

@@ -1,13 +1,13 @@
 import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn, StringFilterValueType } from '../../../Filtering/FilterFn.js';
 import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
-export interface TextInputDefProps<T extends object> extends AccessorDefProps<T, StringFilterValueType> {
+export interface TextInputDefProps<T extends object, FilterValueType = StringFilterValueType> extends AccessorDefProps<T, FilterValueType> {
     filterValueType?: 'String';
 }
-export declare class TextInputDef<T extends object> extends AccessorDef<T, StringFilterValueType> {
+export declare class TextInputDef<T extends object, FilterValueType = StringFilterValueType> extends AccessorDef<T, FilterValueType> {
     readonly accessorType: "Text";
-    constructor(props: TextInputDefProps<T>);
+    constructor(props: TextInputDefProps<T, FilterValueType>);
     private _filterFn;
-    get filterFn(): CustomFilterFn | FilterFn<T, StringFilterValueType> | undefined;
-    set filterFn(v: CustomFilterFn | FilterFn<T, StringFilterValueType> | undefined);
+    get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);
 }

package/dist/Components/Table/Types/Columns/Definitions/Actions/ActionsDef.svelte.d.ts

@@ -1,13 +1,13 @@
 import type { ColourSet } from '../../../../../../scss/colours.js';
 import type { TableActionButton } from '../../TableActionButton.js';
-import { ColumnDef } from '../ColumnDef.svelte.js';
-export interface ActionsDefProps<T extends object> {
+import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
+export interface ActionsDefProps<T extends object, FilterValueType> extends Omit<ColumnDefProps<T, FilterValueType>, 'id' | 'header'> {
     actions: Array<TableActionButton<T>>;
     isEnabled?: (item: T, index: number, button: TableActionButton<T>) => boolean | Promise<boolean>;
     getColourSet?: (item: T, index: number, button: TableActionButton<T>) => ColourSet;
 }
-export declare class ActionsDef<T extends object> extends ColumnDef<T, undefined> {
-    constructor(props: ActionsDefProps<T>);
+export declare class ActionsDef<T extends object, FilterValueType> extends ColumnDef<T, FilterValueType> {
+    constructor(props: ActionsDefProps<T, FilterValueType>);
     readonly columnType: "Actions";
     readonly actions: Array<TableActionButton<T>>;
     readonly isEnabled?: (item: T, index: number, button: TableActionButton<T>) => boolean | Promise<boolean>;

package/dist/Components/Table/Types/Columns/Definitions/ColumnDef.svelte.d.ts

@@ -7,7 +7,7 @@ import type { FilterValueType } from '../../Filtering/FilterValueType.js';
 import { ColumnType } from '../ColumnType.js';
 import type { AccessorFn } from './AccessorFn.js';
 import type { ValidationFn } from './ValidationFn.js';
-export interface ColumnDefProps<T extends object, in FilterFnType> {
+export interface ColumnDefProps<T extends object, FilterFnType> {
     id: string;
     header: string | Snippet;
     debug?: boolean;
@@ -22,11 +22,11 @@ export interface ColumnDefProps<T extends object, in FilterFnType> {
     isValid?: ValidationFn<T>;
     filterFn?: FilterFn<T, FilterFnType> | CustomFilterFn;
     filterValueType?: FilterValueType;
-    getOptions?: () => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;
+    getOptions?: () => Array<SelectOption<FilterFnType>> | Promise<Array<SelectOption<FilterFnType>>>;
     accessorFn?: AccessorFn<T>;
     getDisplayValue?: (item: T, index: number) => string | null | Promise<string | null>;
 }
-export declare abstract class ColumnDef<T extends object, in FilterFnType> {
+export declare abstract class ColumnDef<T extends object, FilterFnType> {
     protected constructor(props: ColumnDefProps<T, FilterFnType>);
     readonly id: string;
     debug: boolean;
@@ -60,5 +60,5 @@ export declare abstract class ColumnDef<T extends object, in FilterFnType> {
     readonly isEditable: (item: T, index: number) => boolean | Promise<boolean>;
     readonly resizable: boolean;
     readonly header: string | Snippet;
-    readonly getOptions?: () => Array<SelectOption<unknown>> | Promise<Array<SelectOption<unknown>>>;
+    readonly getOptions?: () => Array<SelectOption<FilterFnType>> | Promise<Array<SelectOption<FilterFnType>>>;
 }

package/dist/Components/Table/Types/Columns/Definitions/Display/AbstractDisplayDef.svelte.d.ts

@@ -2,7 +2,7 @@ import type { Component } from 'svelte';
 import type { DisplayType } from '../../DisplayType.js';
 import type { TableCell } from '../../TableCell.js';
 import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
-export interface DisplayDefModalProps<T extends object, in FilterValueType> {
+export interface DisplayDefModalProps<T extends object, FilterValueType> {
     cell: TableCell<T, FilterValueType>;
     onclose: () => void;
     onsubmit: () => void;

package/dist/Components/Table/Types/Columns/Definitions/Display/BubbleDef.svelte.d.ts

@@ -2,14 +2,14 @@ import type { BubbleColour } from '../../../../../BubbleColour.js';
 import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn, StringFilterValueType } from '../../../Filtering/FilterFn.js';
 import { AbstractDisplayDef, type AbstractDisplayDefProps } from './AbstractDisplayDef.svelte.js';
-export interface BubbleDefProps<T extends object> extends AbstractDisplayDefProps<T, StringFilterValueType> {
+export interface BubbleDefProps<T extends object, FilterValueType = StringFilterValueType> extends AbstractDisplayDefProps<T, FilterValueType> {
     getColour?: (item: T, index: number, value: string) => BubbleColour | Promise<BubbleColour | null | undefined>;
 }
-export declare class BubbleDef<T extends object> extends AbstractDisplayDef<T, StringFilterValueType> {
+export declare class BubbleDef<T extends object, FilterValueType = StringFilterValueType> extends AbstractDisplayDef<T, FilterValueType> {
     readonly displayType: "Bubbles";
-    constructor(props: BubbleDefProps<T>);
+    constructor(props: BubbleDefProps<T, FilterValueType>);
     private _filterFn;
-    get filterFn(): FilterFn<T, StringFilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, StringFilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
     getColour: ((item: T, index: number, value: string) => BubbleColour | Promise<BubbleColour | null | undefined>) | undefined;
 }

package/dist/Components/Table/Types/Columns/Definitions/Display/DisplayDef.svelte.d.ts

@@ -5,7 +5,7 @@ import { AbstractDisplayDef, type AbstractDisplayDefProps } from './AbstractDisp
 export type DisplayDefProps<T extends object, FilterValueType = unknown> = AbstractDisplayDefProps<T, FilterValueType>;
 export declare class DisplayDef<T extends object, FilterValueType = unknown> extends AbstractDisplayDef<T, FilterValueType> {
     readonly displayType: DisplayType;
-    constructor(props: DisplayDefProps<T>);
+    constructor(props: DisplayDefProps<T, FilterValueType>);
     private _filterFn;
     get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
     set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);

package/dist/Components/Table/Types/Columns/Definitions/Display/ProgressBarDef.svelte.d.ts

@@ -2,14 +2,14 @@ import type { BubbleColour } from '../../../../../BubbleColour.js';
 import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn, NumberFilterValueType } from '../../../Filtering/FilterFn.js';
 import { AbstractDisplayDef, type AbstractDisplayDefProps } from './AbstractDisplayDef.svelte.js';
-export interface ProgressBarDefProps<T extends object> extends AbstractDisplayDefProps<T, NumberFilterValueType> {
+export interface ProgressBarDefProps<T extends object, FilterValueType = NumberFilterValueType> extends AbstractDisplayDefProps<T, FilterValueType> {
     getColour: (item: T, index: number, value: [number, number]) => BubbleColour | Promise<BubbleColour> | undefined;
 }
-export declare class ProgressBarDef<T extends object> extends AbstractDisplayDef<T, NumberFilterValueType> {
+export declare class ProgressBarDef<T extends object, FilterValueType = NumberFilterValueType> extends AbstractDisplayDef<T, FilterValueType> {
     readonly displayType: "Progress";
-    constructor(props: ProgressBarDefProps<T>);
+    constructor(props: ProgressBarDefProps<T, FilterValueType>);
     readonly getColour: (item: T, index: number, value: [number, number]) => BubbleColour | Promise<BubbleColour> | undefined;
     private _filterFn;
-    get filterFn(): FilterFn<T, NumberFilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, NumberFilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
 }

package/dist/Components/Table/Types/Columns/Definitions/Display/ValidityDef.svelte.d.ts

@@ -1,9 +1,9 @@
 import type { ValidationFn } from '../ValidationFn.js';
 import { AbstractDisplayDef, type AbstractDisplayDefProps } from './AbstractDisplayDef.svelte.js';
-export interface ValidityDefProps<T extends object, FilterValueType> extends AbstractDisplayDefProps<T, FilterValueType> {
+export interface ValidityDefProps<T extends object, FilterValueType = unknown> extends AbstractDisplayDefProps<T, FilterValueType> {
     isValid: ValidationFn<T>;
 }
-export declare class ValidityDef<T extends object, FilterValueType> extends AbstractDisplayDef<T, FilterValueType> {
+export declare class ValidityDef<T extends object, FilterValueType = unknown> extends AbstractDisplayDef<T, FilterValueType> {
     readonly displayType: "Validity";
     constructor(props: ValidityDefProps<T, FilterValueType>);
     readonly filterFn: undefined;