@lavalogic/scoria 0.25.2 → 0.26.0

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

@@ -1,4 +1,4 @@
-import { asyncSleep } from '../../../Helpers/Helpers.svelte.js';
+import { asyncSleep, generateShortUUID, getAccessorSortingFn, } from '../../../Helpers/Helpers.svelte.js';
 import { Colour } from '../../../scss/colours.js';
 import { ExampleSelectEnum } from '../../../Types/Examples/ExampleSelectEnum.js';
 import { Validity } from '../../../Types/Internal/Validity.js';
@@ -55,6 +55,16 @@ export function generateExampleItemColumnDefs(modal) {
         isEnabled: () => true,
         isValid,
     }));
+    const uuidByIndex = new Map();
+    const statusAccessorFn = async (item) => {
+        const foundByIndex = uuidByIndex.get(item.id);
+        if (foundByIndex) {
+            return foundByIndex;
+        }
+        const newlyMade = generateShortUUID();
+        uuidByIndex.set(item.id, newlyMade);
+        return newlyMade;
+    };
     let defs = $state([
         expandDef,
         new ValidityDef({
@@ -64,6 +74,26 @@ export function generateExampleItemColumnDefs(modal) {
             isValid,
             modal,
         }),
+        new DisplayDef({
+            id: 'orderLineStatus',
+            header: 'Order Line Status',
+            allowSorting: true,
+            debug: true,
+            accessorFn: statusAccessorFn,
+            filterValueType: 'Select',
+            getOptions: async () => {
+                void uuidByIndex.size;
+                const mapped = [
+                    { label: 'Pending', value: 'Pending' },
+                    ...[...uuidByIndex.values()].map((it) => {
+                        return { label: it, value: it };
+                    }),
+                ];
+                return mapped;
+            },
+            getSortingFn: (desc) => getAccessorSortingFn(statusAccessorFn, desc),
+            allowFiltering: true,
+        }),
         new DisplayDef({
             header: 'ID',
             id: 'id',

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

@@ -4,7 +4,6 @@ import { AccessorDef, type AccessorDefProps } from './AccessorDef.svelte.js';
 export interface SelectDefProps<T extends object, in FilterValueType, out SelectValueType> extends AccessorDefProps<T, FilterValueType, SelectValueType> {
     getOptions: () => Array<SelectOption<SelectValueType>> | Promise<Array<SelectOption<SelectValueType>>>;
     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<SelectValueType>> | Promise<Array<SelectOption<SelectValueType>>>;
     optional?: boolean;
     clearable?: boolean;
@@ -15,7 +14,6 @@ export declare class SelectDef<T extends object, in FilterValueType, out SelectV
     private _filterFn;
     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;
     readonly getSpecificOptions?: (item: T, index: number) => Array<SelectOption<SelectValueType>> | Promise<Array<SelectOption<SelectValueType>>>;

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

@@ -5,7 +5,6 @@ export class SelectDef extends AccessorDef {
         super(props);
         this.getSpecificOptions = $derived(props.getSpecificOptions); //done in the base class now
         // this.getOptions = $derived(props.getOptions); // done in the base class now
-        this.sortingFn = $derived(props.sortingFn);
         this.optional = $derived(props.optional ?? false);
         this.clearable = $derived(props.clearable ?? true);
         // this.getDisplayValue = $derived(props.getDisplayValue); //done in the base class now
@@ -19,7 +18,6 @@ export class SelectDef extends AccessorDef {
     set filterFn(v) {
         this._filterFn = v;
     }
-    sortingFn;
     optional;
     clearable;
     getSpecificOptions;

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

@@ -21,6 +21,7 @@ export interface ColumnDefProps<T extends object, in FilterFnType, out OptionsTy
     resizable?: boolean;
     isValid?: ValidationFn<T>;
     filterFn?: FilterFn<T, FilterFnType>;
+    getSortingFn?: (desc: boolean) => (a: T, b: T) => 1 | -1 | 0;
     filterValueType?: FilterValueType;
     getOptions?: () => Array<SelectOption<OptionsType>> | Promise<Array<SelectOption<OptionsType>>>;
     accessorFn?: AccessorFn<T>;
@@ -57,6 +58,7 @@ export declare abstract class ColumnDef<T extends object, in FilterFnType = neve
     set filterValueType(v: FilterValueType | undefined);
     readonly getDisplayValue: ((item: T, index: number) => string | null | Promise<string | null>) | undefined;
     toJSON(): ColumnJSONRepresentation;
+    readonly getSortingFn: ((desc: boolean) => (a: T, b: T) => 1 | -1 | 0) | undefined;
     readonly isEditable: (item: T, index: number) => boolean | Promise<boolean>;
     readonly resizable: boolean;
     readonly header: string | Snippet;

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

@@ -16,6 +16,7 @@ export class ColumnDef {
         this._filterValueType = $derived(props.filterValueType);
         this.getDisplayValue = $derived(props.getDisplayValue);
         this.debug = $derived(props.debug ?? false);
+        this.getSortingFn = $derived(props.getSortingFn);
         this.getOptions = $derived(props.getOptions);
     }
     id;
@@ -84,6 +85,7 @@ export class ColumnDef {
             filterValueType: this.filterValueType,
         };
     }
+    getSortingFn;
     isEditable;
     resizable;
     header;

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

@@ -725,6 +725,9 @@ export class TableContext {
         if (!def) {
             return undefined;
         }
+        if (def.getSortingFn != undefined) {
+            return def.getSortingFn(desc);
+        }
         if (def instanceof DisplayDef ||
             def instanceof TextInputDef ||
             def instanceof NumberInputDef ||
@@ -735,7 +738,7 @@ export class TableContext {
             return checkboxSortingFn(id, desc);
         }
         if (def instanceof SelectDef) {
-            return def.sortingFn ?? comparableSortingFn(id, desc);
+            return comparableSortingFn(id, desc);
         }
         if (def instanceof ProgressBarDef) {
             return progressSortingFn(id, desc);

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

@@ -64,3 +64,4 @@ export interface ICreateTableArgs<T extends object, RowIdType extends Primitive>
     selectionExtractor: (item: T) => RowIdType | Promise<RowIdType>;
 }
 export declare function createLocalTable<T extends object, RowIdType extends Primitive>(args: ICreateTableArgs<T, RowIdType>): TableContext<T, RowIdType>;
+export declare function getAccessorSortingFn<T, V>(accessorFn: (item: T) => V, desc: boolean): (a: T, b: T) => 1 | 0 | -1;

package/dist/Helpers/Helpers.svelte.js

@@ -421,3 +421,40 @@ export function createLocalTable(args) {
         getUserId: args.getUserId,
     });
 }
+export function getAccessorSortingFn(accessorFn, desc) {
+    return desc
+        ? (_a, _b) => {
+            const a = accessorFn(_a);
+            const b = accessorFn(_b);
+            if (a == undefined && b != undefined) {
+                return 1;
+            }
+            if (b == undefined && a != undefined) {
+                return -1;
+            }
+            if (a < b) {
+                return 1;
+            }
+            if (a > b) {
+                return -1;
+            }
+            return 0;
+        }
+        : (_a, _b) => {
+            const a = accessorFn(_a);
+            const b = accessorFn(_b);
+            if (a == undefined && b != undefined) {
+                return 1;
+            }
+            if (b == undefined && a != undefined) {
+                return -1;
+            }
+            if (a < b) {
+                return -1;
+            }
+            if (a > b) {
+                return 1;
+            }
+            return 0;
+        };
+}

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, 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 { asyncAll, asyncEvery, asyncFilter, asyncFilterIndices, asyncFlatMap, asyncForEach, asyncMap, asyncSleep, asyncSome, autoPluralise, createLocalTable, devCatch, generateShortUUID, generateUUID, getAccessorSortingFn, 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, createLocalTable, 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, getAccessorSortingFn, 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.25.2",
+  "version": "0.26.0",
   "publishConfig": {
     "access": "restricted"
   },