@lavalogic/scoria 0.11.14 → 0.11.15

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

@@ -219,7 +219,7 @@ export class TableContext {
             void this.dataRepo?.data;
             (async () => {
                 const startTime = Date.now();
-                let currentTimerPromise;
+                let currentTimer;
                 const abortController = new AbortController();
                 try {
                     if (this.paginationRepo?.paginationType == PaginationType.Local) {
@@ -246,56 +246,66 @@ export class TableContext {
                         // 		console.warn(`key ${key} was already checked, new value:`, value);
                         // 	}
                         // });
-                        if (!filterState.length) {
-                            this.filteredIndices = data.map((_, index) => index) ?? [];
-                        }
-                        currentTimerPromise = this.filterTimer = this.filterTimer + 1;
+                        currentTimer = ++this.filterTimer;
                         await asyncSleep(150);
-                        const currentTimer = await currentTimerPromise;
-                        if (currentTimerPromise != this.filterTimer) {
+                        if (currentTimer != this.filterTimer) {
                             throw new Error('stale filter');
                         }
-                        let settled = false;
-                        const filterPromise = asyncFilterIndices(data, async (item, index) => {
-                            const row = this.createRow(item, index, index);
-                            return asyncAll(filterState, async (filter) => {
-                                abortController.signal.throwIfAborted();
-                                const def = this.columnDefsById.get(filter.id);
-                                if (!def) {
-                                    console.warn(`Could not find column def for filter with id ${filter.id}`);
-                                    return false;
-                                }
-                                if (def.filterFn) {
-                                    return def.filterFn(row, filter.id, filter.value);
+                        if (!filterState.length) {
+                            this.filteredIndices =
+                                data.map((item, index) => {
+                                    if (item == null) {
+                                        throw new Error(`found a nullish data item at index ${index}`);
+                                    }
+                                    return index;
+                                }) ?? [];
+                        }
+                        else {
+                            let settled = false;
+                            const filterPromise = asyncFilterIndices(data, async (item, index) => {
+                                if (item == null) {
+                                    throw new Error(`Found a nullish data item at async filter at index ${index}`);
                                 }
+                                const row = this.createRow(item, index, index);
+                                return asyncAll(filterState, async (filter) => {
+                                    abortController.signal.throwIfAborted();
+                                    const def = this.columnDefsById.get(filter.id);
+                                    if (!def) {
+                                        console.warn(`Could not find column def for filter with id ${filter.id}`);
+                                        return false;
+                                    }
+                                    if (def.filterFn) {
+                                        return def.filterFn(row, filter.id, filter.value);
+                                    }
+                                    if (dev) {
+                                        console.warn(`column ${def.id} did not have a filter function`);
+                                    }
+                                    return false;
+                                });
+                            });
+                            filterPromise
+                                .then((indices) => {
+                                this.filteredIndices = indices;
+                            })
+                                .catch((e) => {
                                 if (dev) {
-                                    console.warn(`column ${def.id} did not have a filter function`);
+                                    console.log(`caught filter rejection:`, e);
+                                    console.log(`iteration ${currentTimer} cancelled after ${Date.now() - startTime}ms`);
                                 }
-                                return false;
+                            })
+                                .finally(() => {
+                                settled = true;
                             });
-                        });
-                        filterPromise
-                            .then((indices) => {
-                            this.filteredIndices = indices;
-                        })
-                            .catch((e) => {
-                            if (dev) {
-                                console.log(`caught filter rejection:`, e);
-                                console.log(`iteration ${currentTimer} cancelled after ${Date.now() - startTime}ms`);
-                            }
-                        })
-                            .finally(() => {
-                            settled = true;
-                        });
-                        for (;;) {
-                            if (currentTimerPromise !== this.filterTimer) {
-                                abortController.abort('stale data');
-                            }
-                            if (settled) {
-                                console.log(`iteration ${await currentTimerPromise} finished ${Date.now() - startTime}ms`);
-                                return;
+                            for (;;) {
+                                if (currentTimer !== this.filterTimer) {
+                                    abortController.abort('stale data');
+                                }
+                                if (settled) {
+                                    console.log(`iteration ${currentTimer} finished ${Date.now() - startTime}ms`);
+                                    return;
+                                }
+                                await tick();
                             }
-                            await tick();
                         }
                     }
                 }
@@ -305,7 +315,7 @@ export class TableContext {
                         if (!message.toLocaleLowerCase().startsWith('stale')) {
                             console.error(e);
                         }
-                        console.log(`iteration ${await currentTimerPromise} cancelled after ${Date.now() - startTime}ms`);
+                        console.log(`iteration ${await currentTimer} cancelled after ${Date.now() - startTime}ms`);
                     }
                 }
             })();

package/package.json

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