@lavalogic/scoria 0.22.4 → 0.22.6

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

@@ -1,4 +1,4 @@
 import type { DimensionInputProps } from './DimensionInputProps.js';
-declare const DimensionInput: import("svelte").Component<DimensionInputProps, {}, "x" | "z" | "y" | "inputRef">;
+declare const DimensionInput: import("svelte").Component<DimensionInputProps, {}, "x" | "y" | "z" | "inputRef">;
 type DimensionInput = ReturnType<typeof DimensionInput>;
 export default DimensionInput;

package/dist/Components/QuerySelect.svelte

@@ -1,6 +1,9 @@
 <svelte:options runes />
 
-<script lang="ts" module>
+<script
+	lang="ts"
+	module
+>
 	interface QuerySelectPropsAsObjectCommonProps<V extends object, VP extends ValueProp<V>> {
 		labelProp: NonNullableKey<V>;
 		valueProp: VP;
@@ -25,7 +28,7 @@
 
 	export interface QuerySelectPropsAsObject<
 		V extends object,
-		VP extends ValueProp<V>
+		VP extends ValueProp<V>,
 	> extends QuerySelectPropsAsObjectCommonProps<V, VP> {
 		valueAsObject: true;
 		value: V | null;
@@ -33,11 +36,10 @@
 
 	export interface QuerySelectPropsAsPrimitive<
 		V extends object,
-		VP extends ValueProp<V>
+		VP extends ValueProp<V>,
 	> extends QuerySelectPropsAsObjectCommonProps<V, VP> {
 		valueAsObject: false;
 		value: V[VP] | null;
-		options: Array<V>;
 	}
 
 	export type QuerySelectProps<V extends object, VP extends ValueProp<V>> =
@@ -46,7 +48,10 @@
 </script>
 
 <!-- #region Script -->
-<script lang="ts" generics="V extends object, VP extends ValueProp<V>">
+<script
+	lang="ts"
+	generics="V extends object, VP extends ValueProp<V>"
+>
 	import { ToastContext } from '../Contexts/ToastContext.svelte.js';
 
 	import { dev } from '$app/environment';
@@ -77,7 +82,7 @@
 		options = $bindable<Array<V>>([]),
 		isValid,
 		onchange,
-		onfocus
+		onfocus,
 	}: QuerySelectProps<V, VP> = $props();
 
 	export function forceQuery() {
@@ -120,7 +125,7 @@
 						//best-effort solution. Not a good one
 						// eslint-disable-next-line @typescript-eslint/no-base-to-string
 						[labelProp]: selectedValue.toString(),
-						[valueProp]: selectedValue
+						[valueProp]: selectedValue,
 					} as V);
 				}
 			}
@@ -372,7 +377,7 @@
 					}}
 					icon={{
 						name: 'close-menu-cross',
-						colour: Colour['$ui-blue-9']
+						colour: Colour['$ui-blue-9'],
 					}}
 				/>
 			{/if}
@@ -384,7 +389,7 @@
 				size={Size.Small}
 				icon={{
 					name: isExpanded ? 'chevron-up' : 'chevron-down',
-					colour: Colour['$ui-blue-9']
+					colour: Colour['$ui-blue-9'],
 				}}
 			/>
 		</div>

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

@@ -24,7 +24,6 @@ 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: Array<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/Types/Columns/Definitions/ColumnDef.svelte.d.ts

@@ -1,12 +1,12 @@
 import type { Pixels } from '../../../../../Types/Internal/Misc.js';
 import type { SelectOption } from '../../../../../Types/Internal/SelectOption.js';
 import type { Snippet } from 'svelte';
+import type { MemoryColumnIndex } from '../../Coordinates/ColumnIndices.js';
 import type { FilterFn } from '../../Filtering/FilterFn.js';
 import type { FilterValueType } from '../../Filtering/FilterValueType.js';
 import { ColumnType } from '../ColumnType.js';
 import type { AccessorFn } from './AccessorFn.js';
 import type { ValidationFn } from './ValidationFn.js';
-import type { MemoryColumnIndex } from '../../Coordinates/ColumnIndices.js';
 export interface ColumnDefProps<T extends object, in FilterFnType, out OptionsType> {
     id: string;
     header: string | Snippet;
@@ -56,9 +56,15 @@ export declare abstract class ColumnDef<T extends object, in FilterFnType = neve
     get filterValueType(): FilterValueType | undefined;
     set filterValueType(v: FilterValueType | undefined);
     readonly getDisplayValue: ((item: T, index: number) => string | null | Promise<string | null>) | undefined;
-    toJSON(): object;
+    toJSON(): ColumnJSONRepresentation;
     readonly isEditable: (item: T, index: number) => Promise<boolean>;
     readonly resizable: boolean;
     readonly header: string | Snippet;
     readonly getOptions?: () => Array<SelectOption<OptionsType>> | Promise<Array<SelectOption<OptionsType>>>;
 }
+export interface ColumnJSONRepresentation {
+    columnType: ColumnType;
+    id: string;
+    header: string;
+    filterValueType: FilterValueType | undefined;
+}

package/dist/Components/Table/Types/Columns/Definitions/ColumnDef.svelte.js

@@ -66,7 +66,7 @@ export class ColumnDef {
             console.warn(`Column ${this.id} is not sortable`);
             return;
         }
-        this._isResizing = v;
+        this._visible = v;
     }
     _filterValueType;
     get filterValueType() {
@@ -77,7 +77,12 @@ export class ColumnDef {
     }
     getDisplayValue;
     toJSON() {
-        return { columnType: this.columnType, id: this.id, header: this.header };
+        return {
+            columnType: this.columnType,
+            id: this.id,
+            header: this.header.toString(),
+            filterValueType: this.filterValueType,
+        };
     }
     isEditable;
     resizable;

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

@@ -1,11 +1,11 @@
 import type { SortingState } from '../../DataRepository/SortingState.js';
 import type { JSONColumnPinningState } from '../JSONColumnPinningState.js';
 import type { VisibilityState } from '../VisibilityState.js';
-import type { ColumnDef } from './ColumnDef.svelte.js';
-export interface JSONColumnDefSet<T extends object> {
+import type { ColumnJSONRepresentation } from './ColumnDef.svelte.js';
+export interface JSONColumnDefSet {
     name: string;
     sortingState: SortingState;
     visibilityState: VisibilityState;
     columnPinningState: JSONColumnPinningState;
-    columnDefs: Array<ColumnDef<T>>;
+    columnDefs: Array<ColumnJSONRepresentation>;
 }

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

@@ -1,6 +1,9 @@
 import type { TableCell } from '../Columns/TableCell.js';
 export interface Row<T extends object> {
-    getValue: (columnId: string) => Promise<unknown>;
+    getValue: {
+        <K extends keyof T>(columnId: K): T[K] | Promise<T[K]>;
+        (columnId: string): unknown | Promise<unknown>;
+    };
     original: T;
     visibleIndex: number;
     originalIndex: number;

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

@@ -1,5 +1,5 @@
 import { browser, dev } from '$app/environment';
-import { asyncAll, asyncForEach, asyncMap, devCatch, getCanvasContext, } from '../../../../Helpers/Helpers.svelte.js';
+import { asyncAll, asyncForEach, asyncMap, devCatch, getCanvasContext, isKeyOf, } from '../../../../Helpers/Helpers.svelte.js';
 import { tick, untrack } from 'svelte';
 import { SvelteMap } from 'svelte/reactivity';
 import { ColumnType } from '../Columns/ColumnType.js';
@@ -345,6 +345,9 @@ export class TableContext {
                         if (presets[0] && areDefsEquivalent(defs, presets[0].columnDefs)) {
                             return this.reassignDefsToPresets(presets).then((p) => p);
                         }
+                        else if (dev && presets[0]) {
+                            console.warn(`invalid presets:`, presets);
+                        }
                     }
                 }
                 return null;
@@ -1163,7 +1166,7 @@ export class TableContext {
         }
     };
     resetSelectedItems = () => {
-        this._selectedItems = new SvelteMap();
+        this._selectedItems.clear();
     };
     selectAllInCurrentPage = async () => {
         void this.paginationRepo?.pageStartIndex;
@@ -1173,18 +1176,20 @@ export class TableContext {
             ? Math.min(this.paginationRepo.pageEndIndexExclusive, sortedData.length)
             : sortedData.length;
         // Will be doing one full reassignment to this.selectedItems to avoid svelteMap redraws
-        const cloned = new SvelteMap(this.selectedItems);
+        // const cloned = new SvelteMap(this.selectedItems);
+        const sel = this.selectedItems; // HACK: keep the same svelteMap going so that we can support setSelectionMap()
+        // if this is deemed problematic, we'll need to find another way to ask for a new map from the context consumer
         const pending = [];
         if (this.allSelectedInCurrentPage) {
             for (let i = pageStartIndex; i < pageEndIndexExclusive; i++) {
                 const raw = this._cachedKey(sortedData[i]);
                 if (raw instanceof Promise) {
                     pending.push(raw.then((key) => {
-                        cloned.delete(key);
+                        sel.delete(key);
                     }));
                 }
                 else {
-                    cloned.delete(raw);
+                    sel.delete(raw);
                 }
             }
         }
@@ -1202,10 +1207,10 @@ export class TableContext {
                         const raw = this._cachedKey(item);
                         if (raw instanceof Promise) {
                             return raw.then((key) => {
-                                cloned.set(key, item);
+                                sel.set(key, item);
                             });
                         }
-                        cloned.set(raw, item);
+                        sel.set(raw, item);
                     };
                     const r = s instanceof Promise ? s.then(doSet) : doSet(s);
                     if (r instanceof Promise) {
@@ -1219,11 +1224,11 @@ export class TableContext {
                     const raw = this._cachedKey(item);
                     if (raw instanceof Promise) {
                         pending.push(raw.then((key) => {
-                            cloned.set(key, item);
+                            sel.set(key, item);
                         }));
                     }
                     else {
-                        cloned.set(raw, item);
+                        sel.set(raw, item);
                     }
                 }
             }
@@ -1231,7 +1236,8 @@ export class TableContext {
         if (pending.length > 0) {
             await Promise.all(pending);
         }
-        this._selectedItems = cloned;
+        // HACK
+        // this._selectedItems = cloned;
     };
     onHighlightAll = () => {
         if (this.allHighlighted) {
@@ -1956,6 +1962,9 @@ export class TableContext {
         const jsonFriendly = newPresets.map((preset) => {
             return {
                 ...preset,
+                columnDefs: preset.columnDefs.map((it) => {
+                    return { ...it.toJSON(), header: it.header.toString() };
+                }),
                 columnPinningState: {
                     left: [...(preset.columnPinningState.left?.entries() ?? [])],
                     right: [...(preset.columnPinningState.right?.entries() ?? [])],
@@ -1978,12 +1987,15 @@ export class TableContext {
     // #region private methods
     createRow(item, index, unsortedIndex) {
         const row = {
-            getValue: async (key) => {
-                const gotValue = await this.columnDefsById.get(key)?.accessorFn?.(item, unsortedIndex);
+            getValue: (key) => {
+                const gotValue = this.columnDefsById.get(key)?.accessorFn?.(item, unsortedIndex);
                 if (gotValue !== undefined) {
                     return gotValue;
                 }
-                return item[key];
+                if (isKeyOf(key, item)) {
+                    return item[key];
+                }
+                throw new Error(`Row had neither an accessor function or an id that can index the item object`);
             },
             original: item,
             visibleIndex: index,
@@ -2516,14 +2528,14 @@ export class TableContext {
             return {
                 ...preset,
                 columnPinningState: adaptJSONPinningState(preset.columnPinningState),
-                columnDefs: preset.columnDefs.map((def, index) => {
+                columnDefs: preset.columnDefs.map((def) => {
                     const realDef = def.columnType == ColumnType.RowSelect || def.columnType == ColumnType.Actions
                         ? adjustedDefs.find((it) => it.columnType === def.columnType)
                         : asMap.get(def.id);
                     if (!realDef) {
                         throw new Error('Could not find equivalent column def:', { cause: def });
                     }
-                    return (preset.columnDefs[index] = realDef);
+                    return realDef;
                 }),
             };
         });

package/dist/Components/Table/Types/DataRepository/LocalTableDataRepository.svelte.js

@@ -211,16 +211,16 @@ export class LocalTableDataRepository extends TableDataRepository {
     numberFilter = async (row, columnId, // & keyof T,
     values) => {
         const columnValue = await row.getValue(columnId);
-        const filterType = this.filterModes.get(columnId) ?? NumberDateFilterMode.In;
+        const mode = this.filterModes.get(columnId) ?? NumberDateFilterMode.In;
         const isValueInvalid = columnValue == null || typeof columnValue != 'number' || isNaN(columnValue);
-        if (filterType == NumberDateFilterMode.null) {
+        if (mode == NumberDateFilterMode.null) {
             // TODO test
             return isValueInvalid;
         }
         if (isValueInvalid || typeof columnValue != 'number') {
-            return inclusiveFilterModes.has(filterType);
+            return inclusiveFilterModes.has(mode);
         }
-        switch (filterType) {
+        switch (mode) {
             case NumberDateFilterMode.Equals: {
                 const [min] = TableDataRepository.getMinMax(values);
                 return min == undefined || columnValue === min;

package/dist/Helpers/Helpers.svelte.d.ts

@@ -1,3 +1,6 @@
+import type { DefsWrapper } from '../Components/Table/Types/Columns/DefsWrapper.js';
+import { TableContext } from '../Components/Table/Types/Context/TableContext.svelte.js';
+import type { Primitive } from '../Components/Table/Types/Context/TableInitOptions.js';
 import type { CustomFilter } from '../Components/Table/Types/Filtering/CustomFilter.js';
 import type { InputDate, InputDateWithTime, SQLDate } from '../Types/Internal/Misc.js';
 import type { RefWrapper } from '../Types/Internal/RefWrapper.js';
@@ -52,3 +55,12 @@ export declare function isDateTuple(value: unknown): value is [Date | null, Date
 export declare function isNumericArray(value: unknown): value is Array<number | null>;
 export declare function isValidityTuple(v: Validity | ValidityWrapper | undefined): v is ValidityWrapper;
 export declare const loadingText = "loading\u2026";
+export declare function isKeyOf<T extends object>(key: string, obj: T): key is string & keyof T;
+export interface ICreateTableArgs<T extends object, RowIdType extends Primitive> {
+    name: string;
+    defs: DefsWrapper<T>;
+    data: RefWrapper<Array<T>>;
+    getUserId: () => string | undefined;
+    selectionExtractor: (item: T) => RowIdType | Promise<RowIdType>;
+}
+export declare function createLocalTable<T extends object, RowIdType extends Primitive>(args: ICreateTableArgs<T, RowIdType>): TableContext<T, RowIdType>;

package/dist/Helpers/Helpers.svelte.js

@@ -1,4 +1,6 @@
 import { dev } from '$app/environment';
+import { TableContext } from '../Components/Table/Types/Context/TableContext.svelte.js';
+import { LocalTableDataRepository } from '../Components/Table/Types/DataRepository/LocalTableDataRepository.svelte.js';
 import { CustomFilterType } from '../Components/Table/Types/Filtering/CustomFilterType.js';
 import { Sizing } from '../scss/sizing.js';
 import { untrack } from 'svelte';
@@ -75,10 +77,12 @@ export function SQLFriendly(date) {
 }
 export function SQLFriendlyWithLocalTime(date, timeDate) {
     if (typeof date === 'string') {
-        date = new SvelteDate(date);
+        // eslint-disable-next-line svelte/prefer-svelte-reactivity
+        date = new Date(date);
     }
     if (typeof timeDate === 'string') {
-        timeDate = new SvelteDate(date);
+        // eslint-disable-next-line svelte/prefer-svelte-reactivity
+        timeDate = new Date(timeDate);
     }
     return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
         .getDate()
@@ -407,3 +411,13 @@ export function isValidityTuple(v) {
     return v != null && typeof v == 'object';
 }
 export const loadingText = 'loading…';
+export function isKeyOf(key, obj) {
+    return key in obj;
+}
+export function createLocalTable(args) {
+    const localRepo = new LocalTableDataRepository(args.name, args.data, args.getUserId);
+    return TableContext.init(args.defs, args.name, localRepo, {
+        selectionExtractor: args.selectionExtractor,
+        getUserId: args.getUserId,
+    });
+}

package/dist/index.d.ts

@@ -132,7 +132,7 @@ export { TooltipContext } from './Contexts/TooltipContext.svelte.js';
 export { UntypedInputContext } from './Contexts/UntypedInputContext.svelte.js';
 export { Delay } from './Delay/Delay.js';
 export { DATAMatrix } from './Helpers/Datamatrix.js';
-export { asyncAll, asyncEvery, asyncFilter, asyncFilterIndices, asyncFlatMap, asyncForEach, asyncMap, asyncSleep, asyncSome, autoPluralise, devCatch, generateShortUUID, generateUUID, getCanvasContext, getErrorMessage, gridItem, isDateTuple, isNumericArray, isValidEmailAddress, loadingText, localTimeFormat, passthrough, refWrapper, SQLFriendly, SQLFriendlyWithLocalTime, vowels, } from './Helpers/Helpers.svelte.js';
+export { asyncAll, asyncEvery, asyncFilter, asyncFilterIndices, asyncFlatMap, asyncForEach, asyncMap, asyncSleep, asyncSome, autoPluralise, createLocalTable, devCatch, generateShortUUID, generateUUID, getCanvasContext, getErrorMessage, gridItem, isDateTuple, isNumericArray, isValidEmailAddress, loadingText, localTimeFormat, passthrough, refWrapper, SQLFriendly, SQLFriendlyWithLocalTime, vowels, type ICreateTableArgs, } from './Helpers/Helpers.svelte.js';
 export { type INamed } from './Helpers/INamed.js';
 export { AttributeOperation } from './Types/Internal/AttributeOperation.js';
 export { type BigRadioOption } from './Types/Internal/BigRadioOption.js';

package/dist/index.js

@@ -132,7 +132,7 @@ export { TooltipContext } from './Contexts/TooltipContext.svelte.js';
 export { UntypedInputContext } from './Contexts/UntypedInputContext.svelte.js';
 export { Delay } from './Delay/Delay.js';
 export { DATAMatrix } from './Helpers/Datamatrix.js';
-export { asyncAll, asyncEvery, asyncFilter, asyncFilterIndices, asyncFlatMap, asyncForEach, asyncMap, asyncSleep, asyncSome, autoPluralise, devCatch, generateShortUUID, generateUUID, getCanvasContext, getErrorMessage, gridItem, isDateTuple, isNumericArray, isValidEmailAddress, loadingText, localTimeFormat, passthrough, refWrapper, SQLFriendly, SQLFriendlyWithLocalTime, vowels, } from './Helpers/Helpers.svelte.js';
+export { asyncAll, asyncEvery, asyncFilter, asyncFilterIndices, asyncFlatMap, asyncForEach, asyncMap, asyncSleep, asyncSome, autoPluralise, createLocalTable, devCatch, generateShortUUID, generateUUID, getCanvasContext, getErrorMessage, gridItem, isDateTuple, isNumericArray, isValidEmailAddress, loadingText, localTimeFormat, passthrough, refWrapper, SQLFriendly, SQLFriendlyWithLocalTime, vowels, } from './Helpers/Helpers.svelte.js';
 export {} from './Helpers/INamed.js';
 export { AttributeOperation } from './Types/Internal/AttributeOperation.js';
 export {} from './Types/Internal/BigRadioOption.js';

package/package.json

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