Skip to content

fix(resource): data racing #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
falentio wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(resource): data racing #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb1230f
fix(resource): fix data races in loading state of resource
falentio Nov 4, 2025
48bb2ef
chore: fix formatting;
falentio Nov 4, 2025
1608351
add changeset
huntabyte Nov 6, 2025
af9bc04
remove unused
huntabyte Nov 7, 2025
48d2ccd
Merge branch 'main' into fix/resource-data-race
huntabyte Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/flat-eggs-reply.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"runed": patch
---

fix(resource): ensure data does not race
11 changes: 7 additions & 4 deletions packages/runed/src/lib/utilities/resource/resource.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { watch } from "$lib/utilities/watch/index.js";
import type { Getter } from "$lib/internal/types.js";
import { SvelteMap } from "svelte/reactivity";

/**
* Configuration options for the resource function
Expand Down Expand Up @@ -150,7 +151,8 @@ function runResource<

// Create state
let current = $state<Awaited<ReturnType<Fetcher>> | undefined>(initialValue);
let loading = $state(false);
const loadings = new SvelteMap<number, boolean>();
let fetchId = $state(0);
let error = $state<Error | undefined>(undefined);
let cleanupFns = $state<Array<() => void>>([]);

Expand All @@ -171,8 +173,9 @@ function runResource<
previousValue: Source | undefined | Array<Source | undefined>,
refetching: RefetchInfo | boolean = false
): Promise<Awaited<ReturnType<Fetcher>> | undefined> => {
const currentFetchId = ++fetchId;
try {
loading = true;
loadings.set(currentFetchId, true);
error = undefined;
runCleanup();

Expand All @@ -196,7 +199,7 @@ function runResource<
}
return undefined;
} finally {
loading = false;
loadings.delete(currentFetchId);
}
};

Expand Down Expand Up @@ -232,7 +235,7 @@ function runResource<
return current;
},
get loading() {
return loading;
return loadings.get(fetchId) ?? false;
},
get error() {
return error;
Expand Down
24 changes: 24 additions & 0 deletions packages/runed/src/lib/utilities/resource/resource.test.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,30 @@ describe("resource", () => {
expect(fetchedValues).toEqual([1, 2]);
expect(promiseResource.current).toBe(2);
});

testWithEffect("no data race in loading state", async () => {
let input = $state(1);

const dataRaceResource = resource(
() => input,
async (input, _, { signal }): Promise<number> => {
return new Promise((resolve, reject) => {
signal.onabort = () => {
reject(new Error("Aborted " + input));
};
sleep(300).then(() => resolve(input));
});
}
);
for (let i = 0; i < 5; i++) {
await sleep(50);
expect(dataRaceResource.loading).toBe(true);
input += 1;
}

await sleep(500);
expect(dataRaceResource.loading).toBe(false);
});
});

describe("error handling", () => {
Expand Down