From 54314192409a7c5e2074b236087d1428079921bd Mon Sep 17 00:00:00 2001 From: Frederik Baetens Date: Mon, 24 Jul 2023 20:12:11 +0100 Subject: [PATCH] change order of r2 put types --- src/workerd/api/r2-bucket.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/workerd/api/r2-bucket.h b/src/workerd/api/r2-bucket.h index de088ce2224..57f3cbf66df 100644 --- a/src/workerd/api/r2-bucket.h +++ b/src/workerd/api/r2-bucket.h @@ -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; get(key: string, options?: R2GetOptions): Promise; - put(key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob, options?: R2PutOptions): Promise; put( key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob, options?: R2PutOptions & { onlyIf: R2BucketConditional | Headers } ): Promise; + put(key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob, options?: R2PutOptions): Promise; }); // Exclude `R2Object` from `get` return type if `onlyIf` not specified, and exclude `null` from `put` return type