@lavalogic/scoria 0.0.34 → 0.0.35

package/dist/Components/QuerySelect.svelte

@@ -1,16 +1,17 @@
 <svelte:options runes />
 
 <script lang="ts" module>
-	interface commonProps<V extends object, VP extends string & keyof V> {
-		options?: V[];
-		name: string;
-		labelProp: string & keyof V;
+	interface QuerySelectPropsAsObjectCommonProps<V extends object, VP extends ValueProp<V>> {
+		options: V[];
+
+		labelProp: NonNullableKey<V>;
 		valueProp: VP;
+
 		query: (value: string) => Promise<V[]>;
-		onchange: (e: V | null) => void;
+		onchange: (newValue: V | null) => void;
 
+		name?: string;
 		disabled?: boolean;
-
 		width?: string;
 		height?: string;
 		label?: string;
@@ -23,25 +24,25 @@
 		isValid?: (item: V | null) => boolean;
 	}
 
-	export interface QuerySelectPropsAsObject<V extends object, VP extends string & keyof V>
-		extends commonProps<V, VP> {
+	export interface QuerySelectPropsAsObject<V extends object, VP extends ValueProp<V>>
+		extends QuerySelectPropsAsObjectCommonProps<V, VP> {
 		valueAsObject: true;
-		selectedValue: V | null;
+		value: V | null;
 	}
 
-	export interface QuerySelectPropsAsPrimitive<V extends object, VP extends string & keyof V>
-		extends commonProps<V, VP> {
+	export interface QuerySelectPropsAsPrimitive<V extends object, VP extends ValueProp<V>>
+		extends QuerySelectPropsAsObjectCommonProps<V, VP> {
 		valueAsObject: false;
-		selectedValue: V[VP] | null;
+		value: V[VP] | null;
 	}
 
-	export type QuerySelectProps<V extends object, VP extends string & keyof V> =
+	export type QuerySelectProps<V extends object, VP extends ValueProp<V>> =
 		| QuerySelectPropsAsObject<V, VP>
 		| QuerySelectPropsAsPrimitive<V, VP>;
 </script>
 
 <!-- #region Script -->
-<script lang="ts" generics="V extends object, VP extends string&keyof V">
+<script lang="ts" generics="V extends object, VP extends ValueProp<V>">
 	import { ToastContext } from '../Contexts/ToastContext.svelte.js';
 
 	import {
@@ -56,6 +57,7 @@
 	import Action from './Action.svelte';
 	import { Size } from '../Types/Internal/Size.js';
 	import { Validity } from '../Types/Internal/Validity.js';
+	import type { NonNullableKey, ValueProp } from '../Types/Internal/Misc.js';
 
 	let {
 		label,
@@ -65,15 +67,15 @@
 		required = false,
 		invalid = false,
 		valueAsObject,
-		name,
+		name = 'Item',
 		disabled,
 		query,
 		width,
 		height,
 		focusOnLoad = false,
 		inputId = generateShortUUID(),
-		selectedValue,
-		options = $bindable([]),
+		value: selectedValue,
+		options = $bindable<V[]>([]),
 		isValid,
 		onchange,
 		onfocus
@@ -86,11 +88,10 @@
 	let hasRegisteredListeners = $state(false);
 
 	$effect.pre(() => {
-		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-		selectedValue;
+		void selectedValue;
 		untrack(() => {
 			if (selectedValue != null) {
-				if (typeof selectedValue == 'object') {
+				if (valueAsObject) {
 					if (!options.some((opt: V) => opt[valueProp] === (selectedValue as V)[valueProp])) {
 						options.push(selectedValue! as V);
 					}
@@ -104,16 +105,12 @@
 		});
 	});
 
-	function valueIsObject(value: V | V[VP] | null): value is V {
-		return selectedValue == null || typeof selectedValue == 'object';
-	}
-
 	let isInvalid = $derived(
 		(required && !selectedValue) ||
 			invalid ||
 			isValid?.(
-				valueIsObject(selectedValue)
-					? selectedValue
+				valueAsObject
+					? (selectedValue as V)
 					: (options.find((a) => a[valueProp] === selectedValue) ?? null)
 			) === false
 	);

package/dist/Components/QuerySelect.svelte.d.ts

@@ -1,10 +1,10 @@
-interface commonProps<V extends object, VP extends string & keyof V> {
-    options?: V[];
-    name: string;
-    labelProp: string & keyof V;
+interface QuerySelectPropsAsObjectCommonProps<V extends object, VP extends ValueProp<V>> {
+    options: V[];
+    labelProp: NonNullableKey<V>;
     valueProp: VP;
     query: (value: string) => Promise<V[]>;
-    onchange: (e: V | null) => void;
+    onchange: (newValue: V | null) => void;
+    name?: string;
     disabled?: boolean;
     width?: string;
     height?: string;
@@ -17,23 +17,24 @@ interface commonProps<V extends object, VP extends string & keyof V> {
     clearable?: boolean;
     isValid?: (item: V | null) => boolean;
 }
-export interface QuerySelectPropsAsObject<V extends object, VP extends string & keyof V> extends commonProps<V, VP> {
+export interface QuerySelectPropsAsObject<V extends object, VP extends ValueProp<V>> extends QuerySelectPropsAsObjectCommonProps<V, VP> {
     valueAsObject: true;
-    selectedValue: V | null;
+    value: V | null;
 }
-export interface QuerySelectPropsAsPrimitive<V extends object, VP extends string & keyof V> extends commonProps<V, VP> {
+export interface QuerySelectPropsAsPrimitive<V extends object, VP extends ValueProp<V>> extends QuerySelectPropsAsObjectCommonProps<V, VP> {
     valueAsObject: false;
-    selectedValue: V[VP] | null;
+    value: V[VP] | null;
 }
-export type QuerySelectProps<V extends object, VP extends string & keyof V> = QuerySelectPropsAsObject<V, VP> | QuerySelectPropsAsPrimitive<V, VP>;
-declare function $$render<V extends object, VP extends string & keyof V>(): {
+export type QuerySelectProps<V extends object, VP extends ValueProp<V>> = QuerySelectPropsAsObject<V, VP> | QuerySelectPropsAsPrimitive<V, VP>;
+import type { NonNullableKey, ValueProp } from '../Types/Internal/Misc.js';
+declare function $$render<V extends object, VP extends ValueProp<V>>(): {
     props: QuerySelectProps<V, VP>;
     exports: {};
     bindings: "options";
     slots: {};
     events: {};
 };
-declare class __sveltets_Render<V extends object, VP extends string & keyof V> {
+declare class __sveltets_Render<V extends object, VP extends ValueProp<V>> {
     props(): ReturnType<typeof $$render<V, VP>>['props'];
     events(): ReturnType<typeof $$render<V, VP>>['events'];
     slots(): ReturnType<typeof $$render<V, VP>>['slots'];
@@ -41,12 +42,12 @@ declare class __sveltets_Render<V extends object, VP extends string & keyof V> {
     exports(): {};
 }
 interface $$IsomorphicComponent {
-    new <V extends object, VP extends string & keyof V>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<V, VP>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<V, VP>['props']>, ReturnType<__sveltets_Render<V, VP>['events']>, ReturnType<__sveltets_Render<V, VP>['slots']>> & {
+    new <V extends object, VP extends ValueProp<V>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<V, VP>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<V, VP>['props']>, ReturnType<__sveltets_Render<V, VP>['events']>, ReturnType<__sveltets_Render<V, VP>['slots']>> & {
         $$bindings?: ReturnType<__sveltets_Render<V, VP>['bindings']>;
     } & ReturnType<__sveltets_Render<V, VP>['exports']>;
-    <V extends object, VP extends string & keyof V>(internal: unknown, props: ReturnType<__sveltets_Render<V, VP>['props']> & {}): ReturnType<__sveltets_Render<V, VP>['exports']>;
+    <V extends object, VP extends ValueProp<V>>(internal: unknown, props: ReturnType<__sveltets_Render<V, VP>['props']> & {}): ReturnType<__sveltets_Render<V, VP>['exports']>;
     z_$$bindings?: ReturnType<__sveltets_Render<any, any>['bindings']>;
 }
 declare const QuerySelect: $$IsomorphicComponent;
-type QuerySelect<V extends object, VP extends string & keyof V> = InstanceType<typeof QuerySelect<V, VP>>;
+type QuerySelect<V extends object, VP extends ValueProp<V>> = InstanceType<typeof QuerySelect<V, VP>>;
 export default QuerySelect;

package/dist/Components/SingleSelect.svelte

@@ -9,13 +9,15 @@
 	import { onMount, tick } from 'svelte';
 	import Action from './Action.svelte';
 
-	interface commonProps<V extends object, VP extends ValueProp<V> = ValueProp<V>> {
+	interface SingleSelectCommonProps<V extends object, VP extends ValueProp<V>> {
 		options: V[];
 
 		labelProp: NonNullableKey<V>;
 		valueProp: VP;
 		// value: V | V[VP] | null;
 
+		onchange: (newValue: V | null) => void;
+
 		name?: string;
 		width?: string;
 		height?: string;
@@ -37,31 +39,26 @@
 		createFilter?: (value: string) => boolean;
 		onkeydown?: (e: KeyboardEvent) => void;
 		onfocus?: (target: HTMLInputElement) => void;
-		onchange: (newValue: V | null) => void;
 	}
 
-	export interface SingleSelectPropsAsObject<
-		V extends object,
-		VP extends ValueProp<V> = ValueProp<V>
-	> extends commonProps<V, VP> {
+	export interface SingleSelectPropsAsObject<V extends object, VP extends ValueProp<V>>
+		extends SingleSelectCommonProps<V, VP> {
 		valueAsObject: true;
 		value: V | null;
 	}
 
-	export interface SingleSelectPropsAsPrimitive<
-		V extends object,
-		VP extends ValueProp<V> = ValueProp<V>
-	> extends commonProps<V, VP> {
+	export interface SingleSelectPropsAsPrimitive<V extends object, VP extends ValueProp<V>>
+		extends SingleSelectCommonProps<V, VP> {
 		valueAsObject: false;
 		value: V[VP] | null;
 	}
 
-	export type SingleSelectProps<V extends object, VP extends ValueProp<V> = ValueProp<V>> =
+	export type SingleSelectProps<V extends object, VP extends ValueProp<V>> =
 		| SingleSelectPropsAsPrimitive<V, VP>
 		| SingleSelectPropsAsObject<V, VP>;
 </script>
 
-<script lang="ts" generics="V extends object, VP extends ValueProp<V> = ValueProp<V>">
+<script lang="ts" generics="V extends object, VP extends ValueProp<V>">
 	const {
 		label,
 		options,

package/dist/Components/SingleSelect.svelte.d.ts

@@ -1,8 +1,9 @@
 import type { NonNullableKey, ValueProp } from '../Types/Internal/Misc.js';
-interface commonProps<V extends object, VP extends ValueProp<V> = ValueProp<V>> {
+interface SingleSelectCommonProps<V extends object, VP extends ValueProp<V>> {
     options: V[];
     labelProp: NonNullableKey<V>;
     valueProp: VP;
+    onchange: (newValue: V | null) => void;
     name?: string;
     width?: string;
     height?: string;
@@ -24,25 +25,24 @@ interface commonProps<V extends object, VP extends ValueProp<V> = ValueProp<V>>
     createFilter?: (value: string) => boolean;
     onkeydown?: (e: KeyboardEvent) => void;
     onfocus?: (target: HTMLInputElement) => void;
-    onchange: (newValue: V | null) => void;
 }
-export interface SingleSelectPropsAsObject<V extends object, VP extends ValueProp<V> = ValueProp<V>> extends commonProps<V, VP> {
+export interface SingleSelectPropsAsObject<V extends object, VP extends ValueProp<V>> extends SingleSelectCommonProps<V, VP> {
     valueAsObject: true;
     value: V | null;
 }
-export interface SingleSelectPropsAsPrimitive<V extends object, VP extends ValueProp<V> = ValueProp<V>> extends commonProps<V, VP> {
+export interface SingleSelectPropsAsPrimitive<V extends object, VP extends ValueProp<V>> extends SingleSelectCommonProps<V, VP> {
     valueAsObject: false;
     value: V[VP] | null;
 }
-export type SingleSelectProps<V extends object, VP extends ValueProp<V> = ValueProp<V>> = SingleSelectPropsAsPrimitive<V, VP> | SingleSelectPropsAsObject<V, VP>;
-declare function $$render<V extends object, VP extends ValueProp<V> = ValueProp<V>>(): {
+export type SingleSelectProps<V extends object, VP extends ValueProp<V>> = SingleSelectPropsAsPrimitive<V, VP> | SingleSelectPropsAsObject<V, VP>;
+declare function $$render<V extends object, VP extends ValueProp<V>>(): {
     props: SingleSelectProps<V, VP>;
     exports: {};
     bindings: "";
     slots: {};
     events: {};
 };
-declare class __sveltets_Render<V extends object, VP extends ValueProp<V> = ValueProp<V>> {
+declare class __sveltets_Render<V extends object, VP extends ValueProp<V>> {
     props(): ReturnType<typeof $$render<V, VP>>['props'];
     events(): ReturnType<typeof $$render<V, VP>>['events'];
     slots(): ReturnType<typeof $$render<V, VP>>['slots'];
@@ -50,12 +50,12 @@ declare class __sveltets_Render<V extends object, VP extends ValueProp<V> = Valu
     exports(): {};
 }
 interface $$IsomorphicComponent {
-    new <V extends object, VP extends ValueProp<V> = ValueProp<V>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<V, VP>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<V, VP>['props']>, ReturnType<__sveltets_Render<V, VP>['events']>, ReturnType<__sveltets_Render<V, VP>['slots']>> & {
+    new <V extends object, VP extends ValueProp<V>>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<V, VP>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<V, VP>['props']>, ReturnType<__sveltets_Render<V, VP>['events']>, ReturnType<__sveltets_Render<V, VP>['slots']>> & {
         $$bindings?: ReturnType<__sveltets_Render<V, VP>['bindings']>;
     } & ReturnType<__sveltets_Render<V, VP>['exports']>;
-    <V extends object, VP extends ValueProp<V> = ValueProp<V>>(internal: unknown, props: ReturnType<__sveltets_Render<V, VP>['props']> & {}): ReturnType<__sveltets_Render<V, VP>['exports']>;
+    <V extends object, VP extends ValueProp<V>>(internal: unknown, props: ReturnType<__sveltets_Render<V, VP>['props']> & {}): ReturnType<__sveltets_Render<V, VP>['exports']>;
     z_$$bindings?: ReturnType<__sveltets_Render<any, any>['bindings']>;
 }
 declare const SingleSelect: $$IsomorphicComponent;
-type SingleSelect<V extends object, VP extends ValueProp<V> = ValueProp<V>> = InstanceType<typeof SingleSelect<V, VP>>;
+type SingleSelect<V extends object, VP extends ValueProp<V>> = InstanceType<typeof SingleSelect<V, VP>>;
 export default SingleSelect;

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

@@ -95,11 +95,6 @@
 	let valueMin: number | null = $state(null);
 	let valueMax: number | null = $state(null);
 
-	let selectedOption: SelectOption<string | number> | null = $state(
-		// HACK crappy bodge to get typescript to understand that this won't be always null
-		null as unknown as SelectOption<string | number>
-	);
-
 	let selectedOptions: Array<SelectOption<string | number>> = $state([]);
 	let lastQueryOptions: Array<SelectOption<unknown>> = $state([]);
 
@@ -116,15 +111,18 @@
 		return stringFilterTypes.find((it) => it.value === value)!;
 	});
 
-	function getFilteringStateValue(): unknown {
-		const gotValue = tableContext.paginationRepo?.filtering.find((it) => it.id === def.id)?.value;
-		return gotValue;
-	}
+	const filteringStateValue = $derived(
+		tableContext.paginationRepo?.filtering.find((it) => it.id === def.id)?.value
+	);
 
 	$effect(() => {
+		if (isRemoteSelect && !tableContext.paginationRepo?.filtering) {
+			return;
+		}
+		void filteringStateValue;
 		if (hasQuery) {
 			untrack(async () => {
-				const gotValue = getFilteringStateValue() as unknown as
+				const gotValue = filteringStateValue as unknown as
 					| Array<string | number | SelectOption<string | number>>
 					| undefined;
 
@@ -146,7 +144,7 @@
 				return;
 			}
 
-			const gotValue = getFilteringStateValue() as unknown as
+			const gotValue = filteringStateValue as unknown as
 				| Array<string | number | SelectOption<string | number>>
 				| undefined;
 
@@ -161,7 +159,7 @@
 				selectedNumberFilterType.value === NumberDateFilterMode.Between &&
 				tableContext.paginationRepo?.filtering
 			) {
-				const gotValue = getFilteringStateValue();
+				const gotValue = filteringStateValue;
 				if (gotValue != undefined) {
 					const [min, max] = gotValue as [number, number | undefined];
 					value = min;
@@ -171,7 +169,7 @@
 					value = valueMin = valueMax = null;
 				}
 			} else if (tableContext.paginationRepo?.filtering) {
-				const gotValue = getFilteringStateValue();
+				const gotValue = filteringStateValue;
 				if (gotValue != undefined) {
 					const [min] = gotValue as [number, number | undefined];
 					value = min;
@@ -182,7 +180,7 @@
 				}
 			}
 		} else if (tableContext.paginationRepo?.filtering) {
-			const gotValue = getFilteringStateValue();
+			const gotValue = filteringStateValue;
 			if (gotValue == null || typeof gotValue == 'string' || typeof gotValue == 'number') {
 				value = gotValue;
 			}
@@ -296,9 +294,9 @@
 							query={customFilter!.query!}
 							bind:options={lastQueryOptions}
 							onchange={(newValue) => {
-								console.log(newValue);
 								tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
 								tableContext.__queryValues.set(label, newValue);
+								value = newValue as SelectOption<string | number> | null;
 							}}
 						/>
 					{:else}

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

@@ -150,10 +150,8 @@
 	);
 
 	$effect(() => {
-		if (isRemoteSelect) {
-			if (!tableContext.paginationRepo?.filtering) {
-				return;
-			}
+		if (isRemoteSelect && !tableContext.paginationRepo?.filtering) {
+			return;
 		}
 		void filteringStateValue;
 
@@ -370,9 +368,9 @@
 								query={customFilter!.query!}
 								bind:options={lastQueryOptions}
 								onchange={(newValue) => {
-									console.log(newValue);
 									tableContext.paginationRepo?.filterBy(def.id, newValue?.value ?? null);
 									tableContext.__queryValues.set(label ?? _uuid, newValue);
+									value = newValue as SelectOption<string | number> | null;
 								}}
 							/>
 						{:else}

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

@@ -8,6 +8,7 @@ export interface ExpandDefProps<T extends object, R extends object> extends Colu
     headerIcon: IconProps['name'];
     innerTableName: string;
     innerTableOptions: TableInitOptions<R>;
+    accessorFn: (item: T, index: number) => R;
 }
 export declare class ExpandDef<T extends object, R extends object = object> extends ColumnDef<T> {
     readonly columnType: "Expand";

package/dist/Types/Internal/Misc.d.ts

@@ -1,5 +1,5 @@
 export type NonNullableKey<T> = T extends null ? never : string & keyof T;
-export type ValueProp<V> = keyof V & string;
+export type ValueProp<V> = V extends null ? never : keyof V & string;
 export type Unsubscriber = () => void;
 export type Pixels = number;
 export type BrandedString<T> = string & {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lavalogic/scoria",
   "description": "Svelte components used for the FloWMS Web Frontend",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "publishConfig": {
     "access": "restricted"
   },