From cb83973a37f540038aecad920ead9495e1e181a6 Mon Sep 17 00:00:00 2001
From: Richard Marmorstein <richardm@stripe.com>
Date: Tue, 29 Nov 2022 10:44:14 -0800
Subject: [PATCH 1/5] Make id non-optional except for upcoming invoice

---
 types/Invoices.d.ts         | 2 +-
 types/InvoicesResource.d.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/Invoices.d.ts b/types/Invoices.d.ts
index ebab8c1b58..cf259360fd 100644
--- a/types/Invoices.d.ts
+++ b/types/Invoices.d.ts
@@ -40,7 +40,7 @@ declare module 'stripe' {
       /**
        * Unique identifier for the object. This property is always present unless the invoice is an upcoming invoice. See [Retrieve an upcoming invoice](https://stripe.com/docs/api/invoices/upcoming) for more details.
        */
-      id?: string;
+      id: string;
 
       /**
        * String representing the object's type. Objects of the same type share the same value.
diff --git a/types/InvoicesResource.d.ts b/types/InvoicesResource.d.ts
index 0764464bc3..417c9b2700 100644
--- a/types/InvoicesResource.d.ts
+++ b/types/InvoicesResource.d.ts
@@ -2168,10 +2168,10 @@ declare module 'stripe' {
       retrieveUpcoming(
         params?: InvoiceRetrieveUpcomingParams,
         options?: RequestOptions
-      ): Promise<Stripe.Response<Stripe.Invoice>>;
+      ): Promise<Stripe.Response<Omit<Stripe.Invoice, 'id'>>>;
       retrieveUpcoming(
         options?: RequestOptions
-      ): Promise<Stripe.Response<Stripe.Invoice>>;
+      ): Promise<Stripe.Response<Omit<Stripe.Invoice, 'id'>>>;
 
       /**
        * Search for invoices you've previously created using Stripe's [Search Query Language](https://stripe.com/docs/search#search-query-language).

From 6a2576bb1579af6034db69e0ef2310df394b77e2 Mon Sep 17 00:00:00 2001
From: Richard Marmorstein <richardm@stripe.com>
Date: Tue, 29 Nov 2022 22:43:42 -0800
Subject: [PATCH 2/5] add Stripe.UpcomingInvoice

---
 types/InvoicesResource.d.ts | 4 ++--
 types/UpcomingInvoices.d.ts | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 types/UpcomingInvoices.d.ts

diff --git a/types/InvoicesResource.d.ts b/types/InvoicesResource.d.ts
index 417c9b2700..a055886235 100644
--- a/types/InvoicesResource.d.ts
+++ b/types/InvoicesResource.d.ts
@@ -2168,10 +2168,10 @@ declare module 'stripe' {
       retrieveUpcoming(
         params?: InvoiceRetrieveUpcomingParams,
         options?: RequestOptions
-      ): Promise<Stripe.Response<Omit<Stripe.Invoice, 'id'>>>;
+      ): Promise<Stripe.Response<Stripe.UpcomingInvoice>>;
       retrieveUpcoming(
         options?: RequestOptions
-      ): Promise<Stripe.Response<Omit<Stripe.Invoice, 'id'>>>;
+      ): Promise<Stripe.Response<Stripe.UpcomingInvoice>>;
 
       /**
        * Search for invoices you've previously created using Stripe's [Search Query Language](https://stripe.com/docs/search#search-query-language).
diff --git a/types/UpcomingInvoices.d.ts b/types/UpcomingInvoices.d.ts
new file mode 100644
index 0000000000..c309ef56c9
--- /dev/null
+++ b/types/UpcomingInvoices.d.ts
@@ -0,0 +1,7 @@
+// File generated from our OpenAPI spec
+
+declare module 'stripe' {
+  namespace Stripe {
+    type UpcomingInvoice = Omit<Stripe.Invoice, 'id'>;
+  }
+}

From c85072c6990c3074a538ca2d6faf6c53881988c9 Mon Sep 17 00:00:00 2001
From: Richard Marmorstein <richardm@stripe.com>
Date: Tue, 29 Nov 2022 23:17:26 -0800
Subject: [PATCH 3/5] index.d.ts

---
 types/index.d.ts             | 1 +
 types/test/typescriptTest.ts | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/types/index.d.ts b/types/index.d.ts
index e1d31b5505..9903ffea28 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -7,6 +7,7 @@
 ///<reference path='./Errors.d.ts' />
 ///<reference path='./OAuth.d.ts' />
 ///<reference path='./Webhooks.d.ts' />
+///<reference path='./UpcomingInvoices.d.ts' />
 ///<reference path='./AccountsResource.d.ts' />
 ///<reference path='./AccountLinksResource.d.ts' />
 ///<reference path='./ApplePayDomainsResource.d.ts' />
diff --git a/types/test/typescriptTest.ts b/types/test/typescriptTest.ts
index 983ff53088..082e46d789 100644
--- a/types/test/typescriptTest.ts
+++ b/types/test/typescriptTest.ts
@@ -123,6 +123,10 @@ stripe = new Stripe('sk_test_123', {
       return undefined;
     });
 
+  // @ts-expect-error
+  (await stripe.invoices.retrieveUpcoming()).id;
+  (await stripe.invoices.retrieve('')).id;
+
   try {
     await stripe.paymentIntents.create({amount: 100, currency: 'USD'});
   } catch (err) {

From c6b9b93cf7c0e4bd9e0d6ebcc17d8189ec996f1b Mon Sep 17 00:00:00 2001
From: Richard Marmorstein <52928443+richardm-stripe@users.noreply.github.com>
Date: Thu, 1 Dec 2022 09:24:29 -0800
Subject: [PATCH 4/5] Update types/UpcomingInvoices.d.ts

---
 types/UpcomingInvoices.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/UpcomingInvoices.d.ts b/types/UpcomingInvoices.d.ts
index c309ef56c9..d78cb5e7d0 100644
--- a/types/UpcomingInvoices.d.ts
+++ b/types/UpcomingInvoices.d.ts
@@ -1,4 +1,3 @@
-// File generated from our OpenAPI spec
 
 declare module 'stripe' {
   namespace Stripe {

From f8fa70b96e42ad7e85387551f551d2e65572f6c8 Mon Sep 17 00:00:00 2001
From: Richard Marmorstein <52928443+richardm-stripe@users.noreply.github.com>
Date: Thu, 1 Dec 2022 12:30:32 -0800
Subject: [PATCH 5/5] Update types/UpcomingInvoices.d.ts

---
 types/UpcomingInvoices.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/UpcomingInvoices.d.ts b/types/UpcomingInvoices.d.ts
index d78cb5e7d0..02a5efc7d8 100644
--- a/types/UpcomingInvoices.d.ts
+++ b/types/UpcomingInvoices.d.ts
@@ -1,4 +1,3 @@
-
 declare module 'stripe' {
   namespace Stripe {
     type UpcomingInvoice = Omit<Stripe.Invoice, 'id'>;