@lavalogic/scoria 0.0.39 → 0.0.41

package/dist/Components/QuerySelect.svelte

@@ -2,14 +2,13 @@
 
 <script lang="ts" module>
 	interface QuerySelectPropsAsObjectCommonProps<V extends object, VP extends ValueProp<V>> {
-		options: V[];
-
 		labelProp: NonNullableKey<V>;
 		valueProp: VP;
 
 		query: (value: string) => Promise<V[]>;
 		onchange: (newValue: V | null) => void;
 
+		options?: V[];
 		name?: string;
 		disabled?: boolean;
 		width?: string;
@@ -34,6 +33,7 @@
 		extends QuerySelectPropsAsObjectCommonProps<V, VP> {
 		valueAsObject: false;
 		value: V[VP] | null;
+		options: V[];
 	}
 
 	export type QuerySelectProps<V extends object, VP extends ValueProp<V>> =

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

@@ -1,9 +1,9 @@
 interface QuerySelectPropsAsObjectCommonProps<V extends object, VP extends ValueProp<V>> {
-    options: V[];
     labelProp: NonNullableKey<V>;
     valueProp: VP;
     query: (value: string) => Promise<V[]>;
     onchange: (newValue: V | null) => void;
+    options?: V[];
     name?: string;
     disabled?: boolean;
     width?: string;
@@ -24,6 +24,7 @@ export interface QuerySelectPropsAsObject<V extends object, VP extends ValueProp
 export interface QuerySelectPropsAsPrimitive<V extends object, VP extends ValueProp<V>> extends QuerySelectPropsAsObjectCommonProps<V, VP> {
     valueAsObject: false;
     value: V[VP] | null;
+    options: 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';

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

@@ -2,6 +2,7 @@
 
 <script lang="ts" module>
 	import QuerySelect from '../../../../QuerySelect.svelte';
+	import type { Column } from '../../../Types/Columns/Column.js';
 	import type { QueryDef } from '../../../Types/Columns/Definitions/Accessors/QueryDef.svelte.js';
 	import type { TableCell } from '../../../Types/Columns/TableCell.js';
 	import { TableContext } from '../../../Types/Context/TableContext.svelte.js';
@@ -10,8 +11,17 @@
 	import type { SelectOption } from '../../../../../Types/Internal/SelectOption.js';
 	import { Validity } from '../../../../../Types/Internal/Validity.js';
 	import { getContext, tick, untrack } from 'svelte';
+
+	export interface TableQueryColumn<T extends object> extends Column<T> {
+		columnDef: QueryDef<T>;
+	}
+
+	export interface TableQueryCell<T extends object> extends TableCell<T> {
+		column: TableQueryColumn<T>;
+	}
+
 	export interface TableQuerySelectProps<T extends object> {
-		cell: TableCell<T>;
+		cell: TableQueryCell<T>;
 	}
 </script>
 
@@ -22,6 +32,10 @@
 		(cell.getValue() ?? null) as SelectOption<unknown> | Promise<SelectOption<unknown>> | null
 	);
 
+	const visibleValue = $derived(
+		cell.column.columnDef.getDisplayValue(cell.row.original, cell.row.originalIndex)
+	);
+
 	let tdref = $state<HTMLTableCellElement | undefined>();
 
 	const columnDef: QueryDef<T> = $derived(cell.column.columnDef) as unknown as QueryDef<T>; // TODO stabilise and remove `as unknown`
@@ -269,7 +283,7 @@
 			}
 		}}
 	>
-		{#await value}
+		{#await visibleValue}
 			loading…
 		{:then v}
 			{v}

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

@@ -1,6 +1,14 @@
+import type { Column } from '../../../Types/Columns/Column.js';
+import type { QueryDef } from '../../../Types/Columns/Definitions/Accessors/QueryDef.svelte.js';
 import type { TableCell } from '../../../Types/Columns/TableCell.js';
+export interface TableQueryColumn<T extends object> extends Column<T> {
+    columnDef: QueryDef<T>;
+}
+export interface TableQueryCell<T extends object> extends TableCell<T> {
+    column: TableQueryColumn<T>;
+}
 export interface TableQuerySelectProps<T extends object> {
-    cell: TableCell<T>;
+    cell: TableQueryCell<T>;
 }
 declare function $$render<T extends object>(): {
     props: TableQuerySelectProps<T>;

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

@@ -1,7 +1,6 @@
 <svelte:options runes />
 
 <script lang="ts" module>
-	import { dev } from '$app/environment';
 	import SingleSelect from '../../../../SingleSelect.svelte';
 	import type { Column } from '../../../Types/Columns/Column.js';
 	import type { SelectDef } from '../../../Types/Columns/Definitions/Accessors/SelectDef.svelte.js';

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

@@ -5,10 +5,12 @@ import { AccessorDef } from './AccessorDef.svelte.js';
 export interface QueryDefProps<T extends object> extends ColumnDefProps<T> {
     valueAsObject: boolean;
     query: (queryString: string, item: T, index: number) => Promise<Array<SelectOption<unknown>>>;
+    getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
 }
 export declare class QueryDef<T extends object> extends AccessorDef<T, StringFilterValueType> {
     readonly accessorType: "Query";
     constructor(props: QueryDefProps<T>);
     readonly valueAsObject: boolean;
+    readonly getDisplayValue: (item: T, index: number) => string | null | Promise<string | null>;
     readonly query: (queryString: string, item: T, index: number) => Promise<Array<SelectOption<unknown>>>;
 }

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

@@ -6,7 +6,9 @@ export class QueryDef extends AccessorDef {
         super(props);
         this.valueAsObject = $derived(props.valueAsObject);
         this.query = $derived(props.query);
+        this.getDisplayValue = $derived(props.getDisplayValue);
     }
     valueAsObject;
+    getDisplayValue;
     query;
 }

package/package.json

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