Skip to content

fix(core): fix race condition in resource() #59851

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

Closed
alxhub wants to merge 1 commit into from
Closed

fix(core): fix race condition in resource() #59851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions goldens/public-api/core/index.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,6 +1447,7 @@ export type Predicate<T> = (value: T) => boolean;
// @public
export interface PromiseResourceOptions<T, R> extends BaseResourceOptions<T, R> {
loader: ResourceLoader<T, R>;
stream?: never;
}

// @public
Expand Down Expand Up @@ -1649,11 +1650,14 @@ export enum ResourceStatus {
}

// @public
export type ResourceStreamingLoader<T, R> = (param: ResourceLoaderParams<R>) => PromiseLike<Signal<{
export type ResourceStreamingLoader<T, R> = (param: ResourceLoaderParams<R>) => PromiseLike<Signal<ResourceStreamItem<T>>>;

// @public (undocumented)
export type ResourceStreamItem<T> = {
value: T;
} | {
error: unknown;
}>>;
};

// @public
export const RESPONSE_INIT: InjectionToken<ResponseInit | null>;
Expand Down Expand Up @@ -1771,6 +1775,7 @@ export type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvi

// @public
export interface StreamingResourceOptions<T, R> extends BaseResourceOptions<T, R> {
loader?: never;
stream: ResourceStreamingLoader<T, R>;
}

Expand Down
1 change: 1 addition & 0 deletions packages/core/rxjs-interop/src/rx_resource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export function rxResource<T, R>(opts: RxResourceOptions<T, R>): ResourceRef<T |
opts?.injector || assertInInjectionContext(rxResource);
return resource<T, R>({
...opts,
loader: undefined,
stream: (params) => {
let sub: Subscription;

Expand Down
17 changes: 16 additions & 1 deletion packages/core/src/resource/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export type ResourceLoader<T, R> = (param: ResourceLoaderParams<R>) => PromiseLi
*/
export type ResourceStreamingLoader<T, R> = (
param: ResourceLoaderParams<R>,
) => PromiseLike<Signal<{value: T} | {error: unknown}>>;
) => PromiseLike<Signal<ResourceStreamItem<T>>>;

/**
* Options to the `resource` function, for creating a resource.
Expand Down Expand Up @@ -212,6 +212,11 @@ export interface PromiseResourceOptions<T, R> extends BaseResourceOptions<T, R>
* Loading function which returns a `Promise` of the resource's value for a given request.
*/
loader: ResourceLoader<T, R>;

/**
* Cannot specify `stream` and `loader` at the same time.
*/
stream?: never;
}

/**
Expand All @@ -225,9 +230,19 @@ export interface StreamingResourceOptions<T, R> extends BaseResourceOptions<T, R
* request, which can change over time as new values are received from a stream.
*/
stream: ResourceStreamingLoader<T, R>;

/**
* Cannot specify `stream` and `loader` at the same time.
*/
loader?: never;
Comment thread
alxhub marked this conversation as resolved.
Outdated
}

/**
* @experimental
*/
export type ResourceOptions<T, R> = PromiseResourceOptions<T, R> | StreamingResourceOptions<T, R>;

/**
* @experimental
*/
export type ResourceStreamItem<T> = {value: T} | {error: unknown};
Loading