@lavalogic/scoria 0.16.4 → 0.17.1

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

@@ -1,11 +1,15 @@
 <svelte:options runes />
 
-<script lang="ts" module>
+<script
+	lang="ts"
+	module
+>
 	import Button from '../../Button.svelte';
 	import TouchModal from '../../Touch/TouchModal.svelte';
 	import { Size } from '../../../Types/Internal/Size.js';
 	import { Variant } from '../../../Types/Internal/Variant.js';
 	import { getContext } from 'svelte';
+	import type { ColumnDef } from '../Types/Columns/Definitions/ColumnDef.svelte.js';
 	import { TableContext } from '../Types/Context/TableContext.svelte.js';
 	import FilterInput from './FilterInput.svelte';
 
@@ -14,15 +18,20 @@
 	}
 </script>
 
-<script lang="ts" generics="T extends object">
+<script
+	lang="ts"
+	generics="T extends object"
+>
 	const tableContext = getContext<TableContext<T, never>>(TableContext.identifier);
 
 	const { onclose }: FilterPanelModalProps = $props();
-	const refs: Array<FilterInput<T>> = $state([]);
+	// const refs: Array<FilterInput<T, never, unknown>> = $state([]);
 
 	function reset() {
 		tableContext.paginationRepo?.resetFilters();
 	}
+
+	const defs = $derived(tableContext.columnDefs as Array<ColumnDef<T, unknown>>);
 </script>
 
 <TouchModal
@@ -33,8 +42,12 @@
 >
 	<div class="flex">
 		<div class="column-panel">
-			{#each tableContext.columnDefs as def, index (def)}
-				<FilterInput bind:this={refs[index]} {def} customFilters={tableContext.remoteFilters} />
+			{#each defs as def (def.id)}
+				<!-- bind:this={refs[index]} -->
+				<FilterInput
+					{def}
+					customFilters={tableContext.remoteFilters}
+				/>
 			{/each}
 
 			<div class="reset-button">

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

@@ -1,6 +1,9 @@
 <svelte:options runes />
 
-<script lang="ts" generics="T extends object">
+<script
+	lang="ts"
+	generics="T extends object"
+>
 	import Button from '../../Button.svelte';
 	import { devCatch } from '../../../Helpers/Helpers.svelte.js';
 	import { Side } from '../../../Types/Internal/Side.js';
@@ -21,7 +24,7 @@
 		[ExpandedPanel.None]: null,
 		[ExpandedPanel.Column]: ColumnPanel,
 		[ExpandedPanel.Filter]: FilterPanel,
-		[ExpandedPanel.Toolbox]: ToolboxPanel
+		[ExpandedPanel.Toolbox]: ToolboxPanel,
 	};
 
 	let expandedPanel = $state<ExpandedPanel | null>(null);
@@ -49,7 +52,10 @@
 	}
 </script>
 
-<svelte:window onclick={handleClickOutside} onkeydown={handleEscKey} />
+<svelte:window
+	onclick={handleClickOutside}
+	onkeydown={handleEscKey}
+/>
 
 {#if ExpandedPanelElement != null}
 	<SidePanel toolbarPosition={tableContext.toolbarPosition}>
@@ -70,7 +76,7 @@
 		iconTop={{
 			// colour: Colour.$alt,
 			name: 'assessment',
-			size: Size.Medium
+			size: Size.Medium,
 		}}
 		label="Quick Filter"
 	/>
@@ -85,7 +91,7 @@
 		iconTop={{
 			// colour: Colour.$alt,
 			name: 'filter-bars',
-			size: Size.Medium
+			size: Size.Medium,
 		}}
 		label="Advanced Filter"
 	/>
@@ -99,7 +105,7 @@
 		iconTop={{
 			// colour: Colour.$alt,
 			name: 'columns',
-			size: Size.Medium
+			size: Size.Medium,
 		}}
 		label="Modify Columns"
 	/>
@@ -113,7 +119,7 @@
 		iconTop={{
 			// colour: Colour.$alt,
 			name: 'category',
-			size: Size.Medium
+			size: Size.Medium,
 		}}
 		label="My Tool Box"
 	/>
@@ -130,7 +136,7 @@
 			iconTop={{
 				// colour: Colour.$alt,
 				name: 'refresh',
-				size: Size.Medium
+				size: Size.Medium,
 			}}
 			label="Refresh"
 		/>

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

@@ -1,6 +1,9 @@
 <svelte:options runes />
 
-<script lang="ts" generics="T extends object">
+<script
+	lang="ts"
+	generics="T extends object"
+>
 	import Checkbox from '../../Checkbox.svelte';
 	import DesktopModal from '../../DesktopModal.svelte';
 	import { getContext } from 'svelte';

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

@@ -1,7 +1,7 @@
 import type { ColumnDef } from './Definitions/ColumnDef.svelte.js';
-export interface Column<T extends object, in FilterFnType = unknown, out OptionsValueType = unknown> {
+export interface Column<T extends object, in FilterFnType = never, out FilterOptionsType = unknown> {
     id: string;
-    columnDef: ColumnDef<T, FilterFnType, OptionsValueType>;
+    columnDef: ColumnDef<T, FilterFnType, FilterOptionsType>;
     getCanSort: () => boolean;
     getToggleSortingHandler: () => ((e: MouseEvent) => void) | undefined;
     getIsSorted: () => 'asc' | 'desc' | 'none';

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

@@ -1,10 +1,10 @@
 import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
 import type { AccessorType } from './AccessorType.js';
-export interface AccessorDefProps<T extends object, in FilterValueType, out OptionsValueType> extends ColumnDefProps<T, FilterValueType, OptionsValueType> {
+export interface AccessorDefProps<T extends object, in FilterValueType, out FilterOptionsType> extends ColumnDefProps<T, FilterValueType, FilterOptionsType> {
     readonly id: string & keyof T;
 }
-export declare abstract class AccessorDef<T extends object, in FilterValueType, out OptionsValueType> extends ColumnDef<T, FilterValueType, OptionsValueType> {
-    constructor(props: AccessorDefProps<T, FilterValueType, OptionsValueType>);
+export declare abstract class AccessorDef<T extends object, in FilterValueType, out FilterOptionsType> extends ColumnDef<T, FilterValueType, FilterOptionsType> {
+    constructor(props: AccessorDefProps<T, FilterValueType, FilterOptionsType>);
     readonly columnType: "Accessor";
     abstract readonly accessorType: AccessorType;
 }

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

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

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

@@ -1,4 +1,3 @@
-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, in FilterValueType = DateFilterValueType, out SelectValueType = DateFilterValueType> extends AccessorDefProps<T, FilterValueType, SelectValueType> {
@@ -8,7 +7,7 @@ export declare class DateInputDef<T extends object, in FilterValueType = DateFil
     readonly accessorType: "Date";
     constructor(props: DateInputDefProps<T, FilterValueType, SelectValueType>);
     private _filterFn;
-    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | undefined);
     readonly showTime: boolean;
 }

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

@@ -1,4 +1,3 @@
-import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn, NumberFilterValueType } from '../../../Filtering/FilterFn.js';
 import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
 export interface NumberInputDefProps<T extends object, in FilterValueType = NumberFilterValueType, out OptionssValueType = NumberFilterValueType> extends AccessorDefProps<T, FilterValueType, OptionssValueType> {
@@ -11,6 +10,6 @@ export declare class NumberInputDef<T extends object, in FilterValueType = Numbe
     readonly min: number;
     readonly max: number;
     private _filterFn;
-    get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
-    set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | undefined);
 }

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

@@ -1,16 +1,15 @@
 import type { SelectOption } from '../../../../../../Types/Internal/SelectOption.js';
-import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn } from '../../../Filtering/FilterFn.js';
 import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
-export interface QueryDefProps<T extends object, in FilterValueType = unknown, out OptionsValueType = unknown> extends AccessorDefProps<T, FilterValueType, OptionsValueType> {
+export interface QueryDefProps<T extends object, in FilterValueType = unknown, out FilterOptionsType = unknown> extends AccessorDefProps<T, FilterValueType, FilterOptionsType> {
     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, FilterValueType = unknown, out OptionsValueType = unknown> extends AccessorDef<T, FilterValueType, OptionsValueType> {
+export declare class QueryDef<T extends object, FilterValueType = unknown, out FilterOptionsType = unknown> extends AccessorDef<T, FilterValueType, FilterOptionsType> {
     readonly accessorType: "Query";
-    constructor(props: QueryDefProps<T, FilterValueType, OptionsValueType>);
-    readonly filterFn: CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
+    constructor(props: QueryDefProps<T, FilterValueType, FilterOptionsType>);
+    readonly filterFn: 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

@@ -1,5 +1,4 @@
 import type { SelectOption } from '../../../../../../Types/Internal/SelectOption.js';
-import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn } from '../../../Filtering/FilterFn.js';
 import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
 export interface SelectDefProps<T extends object, in FilterValueType, out SelectValueType> extends AccessorDefProps<T, FilterValueType, SelectValueType> {
@@ -14,8 +13,8 @@ export declare class SelectDef<T extends object, in FilterValueType, out SelectV
     constructor(props: SelectDefProps<T, FilterValueType, SelectValueType>);
     readonly accessorType: "Select";
     private _filterFn;
-    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | undefined);
     readonly sortingFn?: (a: T, b: T) => 1 | -1 | 0;
     readonly optional: boolean;
     readonly clearable: boolean;

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

@@ -1,4 +1,3 @@
-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, in FilterValueType = StringFilterValueType, out SelectValueType = StringFilterValueType> extends AccessorDefProps<T, FilterValueType, SelectValueType> {
@@ -8,6 +7,6 @@ export declare class TextInputDef<T extends object, in FilterValueType = StringF
     readonly accessorType: "Text";
     constructor(props: TextInputDefProps<T, FilterValueType, SelectValueType>);
     private _filterFn;
-    get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
-    set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | undefined);
 }

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

@@ -1,12 +1,12 @@
 import type { ColourSet } from '../../../../../../scss/colours.js';
 import type { TableActionButton } from '../../TableActionButton.js';
 import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
-export interface ActionsDefProps<T extends object, in FilterValueType, out OptionsValueType = unknown> extends Omit<ColumnDefProps<T, FilterValueType, OptionsValueType>, 'id' | 'header'> {
+export interface ActionsDefProps<T extends object, in FilterValueType, out FilterOptionsType = unknown> extends Omit<ColumnDefProps<T, FilterValueType, FilterOptionsType>, '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, FilterValueType, out OptionsValueType = unknown> extends ColumnDef<T, FilterValueType, OptionsValueType> {
+export declare class ActionsDef<T extends object, FilterValueType, out FilterOptionsType = unknown> extends ColumnDef<T, FilterValueType, FilterOptionsType> {
     constructor(props: ActionsDefProps<T, FilterValueType>);
     readonly columnType: "Actions";
     readonly actions: Array<TableActionButton<T>>;

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

@@ -7,7 +7,7 @@ export class ActionsDef extends ColumnDef {
             id: `actions-${generateUUID()}`,
             header: 'Actions',
             allowSorting: false,
-            allowFiltering: false
+            allowFiltering: false,
         });
         this.actions = $derived(props.actions);
         this.isEnabled = $derived(props.isEnabled);

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

@@ -1,7 +1,6 @@
 import type { Pixels } from '../../../../../Types/Internal/Misc.js';
 import type { SelectOption } from '../../../../../Types/Internal/SelectOption.js';
 import type { Snippet } from 'svelte';
-import type { CustomFilterFn } from '../../Filtering/CustomFilterFn.js';
 import type { FilterFn } from '../../Filtering/FilterFn.js';
 import type { FilterValueType } from '../../Filtering/FilterValueType.js';
 import { ColumnType } from '../ColumnType.js';
@@ -20,13 +19,13 @@ export interface ColumnDefProps<T extends object, in FilterFnType, out OptionsTy
     isEditable?: (item: T, index: number) => boolean | Promise<boolean>;
     resizable?: boolean;
     isValid?: ValidationFn<T>;
-    filterFn?: FilterFn<T, FilterFnType> | CustomFilterFn;
+    filterFn?: FilterFn<T, FilterFnType>;
     filterValueType?: FilterValueType;
     getOptions?: () => Array<SelectOption<OptionsType>> | Promise<Array<SelectOption<OptionsType>>>;
     accessorFn?: AccessorFn<T>;
     getDisplayValue?: (item: T, index: number) => string | null | Promise<string | null>;
 }
-export declare abstract class ColumnDef<T extends object, in FilterFnType = unknown, out OptionsType = unknown> {
+export declare abstract class ColumnDef<T extends object, in FilterFnType = never, out OptionsType = unknown> {
     protected constructor(props: ColumnDefProps<T, FilterFnType, OptionsType>);
     readonly id: string;
     debug: boolean;
@@ -39,7 +38,7 @@ export declare abstract class ColumnDef<T extends object, in FilterFnType = unkn
     readonly allowFiltering: boolean;
     readonly isValid: ValidationFn<T> | undefined;
     readonly accessorFn: AccessorFn<T> | undefined;
-    abstract filterFn: FilterFn<T, FilterFnType> | CustomFilterFn | undefined;
+    abstract filterFn: FilterFn<T, FilterFnType> | undefined;
     private _minSize;
     get minSize(): Pixels;
     set minSize(v: Pixels);

package/dist/Components/Table/Types/Columns/Definitions/ColumnDefSet.d.ts

@@ -7,5 +7,5 @@ export interface ColumnDefSet<T extends object> {
     sortingState: SortingState;
     visibilityState: VisibilityState;
     columnPinningState: ColumnPinningState;
-    columnDefs: Array<ColumnDef<T>>;
+    columnDefs: Array<ColumnDef<T, never, unknown>>;
 }

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

@@ -2,17 +2,18 @@ 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 = unknown, out OptionsValueType = unknown> {
-    cell: TableCell<T, FilterValueType, OptionsValueType>;
+export interface DisplayDefModalProps<T extends object, in FilterValueType = never, out FilterOptionsType = unknown> {
+    cell: TableCell<T, FilterValueType, FilterOptionsType>;
     onclose: () => void;
     onsubmit: () => void;
 }
-export interface AbstractDisplayDefProps<T extends object, FilterFnType, out OptionsValueType = unknown> extends ColumnDefProps<T, FilterFnType, OptionsValueType> {
+export interface AbstractDisplayDefProps<T extends object, in FilterFnType, out FilterOptionsType> extends ColumnDefProps<T, FilterFnType, FilterOptionsType> {
     modal?: Component<any, any, any>;
 }
-export declare abstract class AbstractDisplayDef<T extends object, FilterValueType, out OptionsValueType = unknown> extends ColumnDef<T, FilterValueType, OptionsValueType> {
+export declare abstract class AbstractDisplayDef<T extends object, in FilterValueType = never, out FilterOptionsType = unknown> extends ColumnDef<T, FilterValueType, FilterOptionsType> {
     abstract readonly displayType: DisplayType;
-    constructor(props: AbstractDisplayDefProps<T, FilterValueType, OptionsValueType>);
+    constructor(props: AbstractDisplayDefProps<T, FilterValueType, FilterOptionsType>);
     readonly columnType: "Display";
-    readonly modal: Component<DisplayDefModalProps<T, FilterValueType>, any, any> | undefined;
+    readonly modal: //HACK out parameter. Need to check if it's possible to be strict
+    Component<DisplayDefModalProps<T>, any, any> | undefined;
 }

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

@@ -6,6 +6,5 @@ export class AbstractDisplayDef extends ColumnDef {
         this.modal = $derived(props.modal);
     }
     columnType = ColumnType.Display;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    modal; //HACK out parameter. Need to check if it's possible to be strict
+    modal;
 }

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

@@ -1,15 +1,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, FilterValueType = StringFilterValueType> extends AbstractDisplayDefProps<T, FilterValueType> {
+export interface BubbleDefProps<T extends object, in FilterValueType, out FilterOptionsType> extends AbstractDisplayDefProps<T, FilterValueType, FilterOptionsType> {
     getColour?: (item: T, index: number, value: string) => BubbleColour | Promise<BubbleColour | null | undefined>;
 }
-export declare class BubbleDef<T extends object, FilterValueType = StringFilterValueType> extends AbstractDisplayDef<T, FilterValueType> {
+export declare class BubbleDef<T extends object, in FilterValueType = StringFilterValueType, out FilterOptionsType = unknown> extends AbstractDisplayDef<T, FilterValueType, FilterOptionsType> {
     readonly displayType: "Bubbles";
-    constructor(props: BubbleDefProps<T, FilterValueType>);
+    constructor(props: BubbleDefProps<T, FilterValueType, FilterOptionsType>);
     private _filterFn;
-    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | 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

@@ -1,12 +1,12 @@
-import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn } from '../../../Filtering/FilterFn.js';
 import { DisplayType } from '../../DisplayType.js';
 import { AbstractDisplayDef, type AbstractDisplayDefProps } from './AbstractDisplayDef.svelte.js';
-export type DisplayDefProps<T extends object, FilterValueType = unknown> = AbstractDisplayDefProps<T, FilterValueType>;
-export declare class DisplayDef<T extends object, FilterValueType = unknown> extends AbstractDisplayDef<T, FilterValueType> {
+export interface DisplayDefProps<T extends object, in FilterValueType, out FilterOptionsType> extends AbstractDisplayDefProps<T, FilterValueType, FilterOptionsType> {
+}
+export declare class DisplayDef<T extends object, in FilterValueType, out FilterOptionsType> extends AbstractDisplayDef<T, FilterValueType, FilterOptionsType> {
     readonly displayType: DisplayType;
-    constructor(props: DisplayDefProps<T, FilterValueType>);
+    constructor(props: DisplayDefProps<T, FilterValueType, FilterOptionsType>);
     private _filterFn;
-    get filterFn(): CustomFilterFn | FilterFn<T, FilterValueType> | undefined;
-    set filterFn(v: CustomFilterFn | FilterFn<T, FilterValueType> | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | undefined);
 }

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

@@ -1,15 +1,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, FilterValueType = NumberFilterValueType> extends AbstractDisplayDefProps<T, FilterValueType> {
+export interface ProgressBarDefProps<T extends object, in FilterValueType, out FilterOptionsType> extends AbstractDisplayDefProps<T, FilterValueType, FilterOptionsType> {
     getColour: (item: T, index: number, value: [number, number]) => BubbleColour | Promise<BubbleColour> | undefined;
 }
-export declare class ProgressBarDef<T extends object, FilterValueType = NumberFilterValueType> extends AbstractDisplayDef<T, FilterValueType> {
+export declare class ProgressBarDef<T extends object, in FilterValueType = NumberFilterValueType, out FilterOptionsType = unknown> extends AbstractDisplayDef<T, FilterValueType, FilterOptionsType> {
     readonly displayType: "Progress";
-    constructor(props: ProgressBarDefProps<T, FilterValueType>);
+    constructor(props: ProgressBarDefProps<T, FilterValueType, FilterOptionsType>);
     readonly getColour: (item: T, index: number, value: [number, number]) => BubbleColour | Promise<BubbleColour> | undefined;
     private _filterFn;
-    get filterFn(): FilterFn<T, FilterValueType> | CustomFilterFn | undefined;
-    set filterFn(v: FilterFn<T, FilterValueType> | CustomFilterFn | undefined);
+    get filterFn(): FilterFn<T, FilterValueType> | undefined;
+    set filterFn(v: FilterFn<T, FilterValueType> | undefined);
 }

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

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

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

@@ -2,7 +2,7 @@ import type { IconProps } from '../../../../../IconProps.js';
 import type { Primitive, TableInitOptions } from '../../../Context/TableInitOptions.js';
 import type { DefsWrapper } from '../../DefsWrapper.js';
 import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
-export interface ExpandDefProps<T extends object, R extends object, InnterIdType extends Primitive = Primitive, in FilterValueType = unknown, out OptionsValueType = unknown> extends ColumnDefProps<T, FilterValueType, OptionsValueType> {
+export interface ExpandDefProps<T extends object, R extends object, InnterIdType extends Primitive = Primitive, in FilterValueType = unknown, out FilterOptionsType = unknown> extends ColumnDefProps<T, FilterValueType, FilterOptionsType> {
     isEnabled: (item: T, index: number) => boolean | Promise<boolean>;
     getInnerColumnDefs: (item: T, index: number) => DefsWrapper<R>;
     headerIcon: IconProps['name'];
@@ -10,9 +10,9 @@ export interface ExpandDefProps<T extends object, R extends object, InnterIdType
     innerTableOptions: TableInitOptions<R, InnterIdType>;
     accessorFn: (item: T, index: number) => ReadonlyArray<R> | Promise<ReadonlyArray<R>>;
 }
-export declare class ExpandDef<T extends object, R extends object, InnterIdType extends Primitive = Primitive, in FilterValueType = unknown, out OptionsValueType = unknown> extends ColumnDef<T, FilterValueType, OptionsValueType> {
+export declare class ExpandDef<T extends object, R extends object, InnterIdType extends Primitive = Primitive, in FilterValueType = unknown, out FilterOptionsType = unknown> extends ColumnDef<T, FilterValueType, FilterOptionsType> {
     readonly columnType: "Expand";
-    constructor(props: ExpandDefProps<T, R, InnterIdType, FilterValueType, OptionsValueType>);
+    constructor(props: ExpandDefProps<T, R, InnterIdType, FilterValueType, FilterOptionsType>);
     readonly accessorFn: (item: T, index: number) => ReadonlyArray<R> | Promise<ReadonlyArray<R>>;
     readonly filterFn: undefined;
     readonly innerTableName: string;

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

@@ -1,11 +1,10 @@
-import type { CustomFilterFn } from '../../../Filtering/CustomFilterFn.js';
 import type { FilterFn } from '../../../Filtering/FilterFn.js';
 import { ColumnType } from '../../ColumnType.js';
 import { ColumnDef, type ColumnDefProps } from '../ColumnDef.svelte.js';
-export interface FilterOnlyDefProps<T extends object, FilterFnType = unknown, out OptionsValueType = unknown> extends ColumnDefProps<T, FilterFnType, OptionsValueType> {
+export interface FilterOnlyDefProps<T extends object, FilterFnType = unknown, out FilterOptionsType = unknown> extends ColumnDefProps<T, FilterFnType, FilterOptionsType> {
 }
-export declare class FilterOnlyDef<T extends object, FilterFnType = unknown, out OptionsValueType = unknown> extends ColumnDef<T, FilterFnType, OptionsValueType> {
-    constructor(props: FilterOnlyDefProps<T, FilterFnType, OptionsValueType>);
+export declare class FilterOnlyDef<T extends object, FilterFnType = unknown, out FilterOptionsType = unknown> extends ColumnDef<T, FilterFnType, FilterOptionsType> {
+    constructor(props: FilterOnlyDefProps<T, FilterFnType, FilterOptionsType>);
     readonly columnType: ColumnType;
-    readonly filterFn: CustomFilterFn | FilterFn<T, FilterFnType> | undefined;
+    readonly filterFn: FilterFn<T, FilterFnType> | undefined;
 }

package/dist/Components/Table/Types/Columns/Definitions/JSONColumnDefSet.d.ts

@@ -7,5 +7,5 @@ export interface JSONColumnDefSet<T extends object> {
     sortingState: SortingState;
     visibilityState: VisibilityState;
     columnPinningState: JSONColumnPinningState;
-    columnDefs: Array<ColumnDef<T>>;
+    columnDefs: Array<ColumnDef<T, never, unknown>>;
 }

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

@@ -1,6 +1,7 @@
+import type { BoolFilterValueType } from '../../../Filtering/FilterFn.js';
 import { ColumnType } from '../../ColumnType.js';
 import { ColumnDef } from '../ColumnDef.svelte.js';
-export declare class RowSelectionDef<T extends object> extends ColumnDef<T> {
+export declare class RowSelectionDef<T extends object, in FilterValueType = BoolFilterValueType, out FilterOptionsType = undefined> extends ColumnDef<T, FilterValueType, FilterOptionsType> {
     readonly isSelectable: (item: T, index: number) => boolean | Promise<boolean>;
     readonly columnType: ColumnType;
     constructor(isSelectable: (item: T, index: number) => boolean | Promise<boolean>);

package/dist/Components/Table/Types/Columns/Definitions/RowSelection/RowSelectionDef.svelte.js

@@ -9,7 +9,7 @@ export class RowSelectionDef extends ColumnDef {
             id: `is-selectable-${generateUUID()}`,
             header: 'Row Selected',
             allowSorting: false,
-            allowFiltering: false
+            allowFiltering: false,
         });
         this.isSelectable = isSelectable;
     }

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

@@ -1,6 +1,6 @@
 import type { CustomRemoteFilters } from '../Filtering/CustomRemoteFilters.js';
 import type { ColumnDef } from './Definitions/ColumnDef.svelte.js';
-export interface DefsWrapper<T extends object, in FilterValueType = unknown> {
-    defs: Array<ColumnDef<T, FilterValueType>>;
+export interface DefsWrapper<T extends object> {
+    defs: Array<ColumnDef<T>>;
     remoteFilters?: CustomRemoteFilters<unknown>;
 }

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

@@ -1,7 +1,7 @@
 import type { Row } from '../Context/Row.js';
 import type { Column } from './Column.js';
-export interface TableCell<T extends object, in FilterValueType = unknown, out OptionsValueType = unknown> {
-    column: Column<T, FilterValueType, OptionsValueType>;
+export interface TableCell<T extends object, in FilterValueType = never, out FilterOptionsType = unknown> {
+    column: Column<T, FilterValueType, FilterOptionsType>;
     row: Row<T>;
     id: string;
     getValue: () => unknown | Promise<unknown>;

package/dist/Components/Table/Types/Context/Row.d.ts

@@ -5,7 +5,7 @@ export interface Row<T extends object> {
     visibleIndex: number;
     originalIndex: number;
     id: string;
-    getLeftVisibleCells: () => Array<TableCell<T>>;
-    getRightVisibleCells: () => Array<TableCell<T>>;
-    getCenterVisibleCells: () => Array<TableCell<T>>;
+    getLeftVisibleCells: () => Array<TableCell<T, never, unknown>>;
+    getRightVisibleCells: () => Array<TableCell<T, never, unknown>>;
+    getCenterVisibleCells: () => Array<TableCell<T, never, unknown>>;
 }

package/dist/Components/Table/Types/Context/TableContext.svelte.d.ts

@@ -235,4 +235,4 @@ export declare class TableContext<T extends object, RowIdType extends Primitive>
     private reassignDefsToPresets;
     private filteringLoop;
 }
-export declare function isSearchable<T extends object, CD extends ColumnDef<T>>(def: CD): def is CD & HasCustomFilterFunction;
+export declare function isSearchable<T extends object, FilterValueType, FilterOptionsType, CD extends ColumnDef<T, FilterValueType, FilterOptionsType>>(def: CD): def is CD & HasCustomFilterFunction;

package/dist/Components/Table/Types/Context/TableContext.svelte.js

@@ -207,7 +207,7 @@ export class TableContext {
                                         return false;
                                     }
                                     if (def.filterFn) {
-                                        return def.filterFn(row, filter.id, filter.value);
+                                        return def.filterFn(row, filter.id, filter.value); //HACK how much parsing will be needed to be type safe?
                                     }
                                     if (this.debug) {
                                         console.warn(`column ${def.id} did not have a filter function`);

package/dist/Components/Table/Types/DataRepository/IDataRepository.d.ts

@@ -16,7 +16,7 @@ export interface IDataRepository<T extends object> {
     updateSorting?: OnChangeFn<SortingState>;
     manualSorting?: boolean;
     sorting: SortingState;
-    filtering: ColumnFiltersState;
+    filtering: ColumnFiltersState<unknown>;
     filterModes: SvelteMap<string, FilterMode>;
     setFilterMode: (id: string, mode: FilterMode) => void;
     filterBy: (id: string, value: unknown) => void;

package/dist/Components/Table/Types/DataRepository/ILocalDataRepository.d.ts

@@ -9,7 +9,7 @@ export interface ILocalDataRepository<T extends object> extends IDataRepository<
     setPage: (page: number) => void;
     nextPage: () => void;
     prevPage: () => void;
-    filtering: ColumnFiltersState;
+    filtering: ColumnFiltersState<unknown>;
     filterModes: SvelteMap<string, FilterMode>;
     setFilterMode: (id: string, mode: FilterMode) => void;
     filterBy: (id: string, value: unknown) => void;

package/dist/Components/Table/Types/DataRepository/LocalTableDataRepository.svelte.d.ts

@@ -11,7 +11,7 @@ import type { ILocalDataRepository } from './ILocalDataRepository.js';
 import type { SortingState } from './SortingState.js';
 import { TableDataRepository } from './TableDataRepository.svelte.js';
 export declare const allowedEmptyFilterModes: SvelteSet<StringFilterMode | NumberDateFilterMode>;
-export declare class LocalTableDataRepository<T extends object> extends TableDataRepository<T> implements ILocalDataRepository<T> {
+export declare class LocalTableDataRepository<T extends object> extends TableDataRepository<T, unknown> implements ILocalDataRepository<T> {
     addEmptyRow?: (() => void) | undefined;
     private debug;
     readonly filterType: "Real";
@@ -30,8 +30,8 @@ export declare class LocalTableDataRepository<T extends object> extends TableDat
     private _totalRows;
     get totalRows(): number;
     private _filtering;
-    get filtering(): ColumnFiltersState;
-    set filtering(v: ColumnFiltersState);
+    get filtering(): ColumnFiltersState<unknown>;
+    set filtering(v: ColumnFiltersState<unknown>);
     updateSorting: OnChangeFn<SortingState>;
     readonly paginationType: "Local";
     readonly setFilterMode: (id: string, mode: FilterMode | undefined) => void;