Skip to content
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

Jump to bottom

Swap order of r2 put types to fix type on onlyif #908

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Swap order of r2 put types to fix type on onlyif #908

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
3 changes: 2 additions & 1 deletion src/workerd/api/r2-bucket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,15 @@ class R2Bucket: public jsg::Object {

JSG_TS_ROOT();
JSG_TS_OVERRIDE({
// The order of these matters, since typescript tries to match function signatures in order
get(key: string, options: R2GetOptions & { onlyIf: R2BucketConditional | Headers }): Promise<R2ObjectBody | R2Object | null>;
get(key: string, options?: R2GetOptions): Promise<R2ObjectBody | null>;

put(key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob, options?: R2PutOptions): Promise<R2Object>;
put(
key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob,
options?: R2PutOptions & { onlyIf: R2BucketConditional | Headers }
): Promise<R2Object | null>;
put(key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob, options?: R2PutOptions): Promise<R2Object>;
});
// Exclude `R2Object` from `get` return type if `onlyIf` not specified, and exclude `null` from `put` return type

Expand Down
Loading