Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion packages/core/src/resource/resource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
}

private abortInProgressLoad(): void {
untracked(() => this.pendingController?.abort());
untracked(() => this.pendingController?.abort(getAbortReason()));
this.pendingController = undefined;

// Once the load is aborted, we no longer want to block stability on its resolution.
Expand All @@ -536,6 +536,16 @@ function saveToTransferState<R, T>(
}
}

let abortReason: DOMException | undefined;

/**
* Returns a shared `AbortError` reason, since `abort()` without a reason creates a new one (with a
* stack trace) on every call.
*/
function getAbortReason(): DOMException {
return (abortReason ??= new DOMException('The operation was aborted.', 'AbortError'));
}

/**
* Wraps an equality function to handle either value being `undefined`.
*/
Expand Down
25 changes: 25 additions & 0 deletions packages/core/test/resource/resource_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,31 @@ describe('resource', () => {
expect(aborted).toEqual([{counter: 0}]);
});

it('should reuse the same abort reason when destroying resources', async () => {
const signals: AbortSignal[] = [];
const injector = createEnvironmentInjector([], TestBed.inject(EnvironmentInjector));
const resources = [0, 1].map((id) =>
resource({
params: () => id,
loader: async ({params, abortSignal}) => {
signals.push(abortSignal);
return params;
},
injector,
}),
);

TestBed.tick();
await flushMicrotasks();

resources.forEach((res) => res.destroy());

expect(signals.length).toBe(2);
expect(signals[0].reason).toEqual(jasmine.any(DOMException));
expect(signals[0].reason.name).toBe('AbortError');
expect(signals[1].reason).toBe(signals[0].reason);
});

it('should not respond to reactive state changes in a loader', async () => {
const unrelated = signal('a');
const backend = new MockResponseCountingBackend();
Expand Down
Loading