handle shadowed namespaces (#2753)

* handle shadowed namespaces

* add type test

Author: xavdid

src/resources/Checkout/Sessions.ts

@@ -2,7 +2,7 @@
 
 import {StripeResource} from '../../StripeResource.js';
 import {LineItem} from './../LineItems.js';
-import {Discount} from './../Discounts.js';
+import {Discount as _Discount} from './../Discounts.js';
 import {Subscription} from './../Subscriptions.js';
 import {Customer, DeletedCustomer} from './../Customers.js';
 import {Invoice} from './../Invoices.js';
@@ -3519,7 +3519,7 @@ export namespace Checkout {
            *
            * Related guide: [Applying discounts to subscriptions](https://docs.stripe.com/billing/subscriptions/discounts)
            */
-          discount: Discount;
+          discount: _Discount;
         }
 
         export interface Tax {

src/resources/CreditNotes.ts

@@ -2,7 +2,7 @@
 
 import {StripeResource} from '../StripeResource.js';
 import {CreditNoteLineItem} from './CreditNoteLineItems.js';
-import {Refund} from './Refunds.js';
+import {Refund as _Refund} from './Refunds.js';
 import {Customer, DeletedCustomer} from './Customers.js';
 import {CustomerBalanceTransaction} from './CustomerBalanceTransactions.js';
 import {Invoice} from './Invoices.js';
@@ -593,7 +593,7 @@ export namespace CreditNote {
     /**
      * ID of the refund.
      */
-    refund: string | Refund;
+    refund: string | _Refund;
 
     /**
      * Type of the refund, one of `refund` or `payment_record_refund`.

src/resources/LineItems.ts

@@ -1,6 +1,6 @@
 // File generated from our OpenAPI spec
 
-import {Discount} from './Discounts.js';
+import {Discount as _Discount} from './Discounts.js';
 import {Price} from './Prices.js';
 import {TaxRate} from './TaxRates.js';
 import {Metadata} from '../shared.js';
@@ -94,7 +94,7 @@ export namespace LineItem {
      *
      * Related guide: [Applying discounts to subscriptions](https://docs.stripe.com/billing/subscriptions/discounts)
      */
-    discount: Discount;
+    discount: _Discount;
   }
 
   export interface Tax {

src/resources/Quotes.ts

@@ -2,7 +2,7 @@
 
 import {StripeResource} from '../StripeResource.js';
 import {LineItem} from './LineItems.js';
-import {Discount} from './Discounts.js';
+import {Discount as _Discount} from './Discounts.js';
 import {Application, DeletedApplication} from './Applications.js';
 import {Customer, DeletedCustomer} from './Customers.js';
 import {TaxRate} from './TaxRates.js';
@@ -1059,7 +1059,7 @@ export interface Quote {
   /**
    * The discounts applied to this quote.
    */
-  discounts: Array<string | Discount>;
+  discounts: Array<string | _Discount>;
 
   /**
    * The date on which the quote will be canceled if in `open` or `draft` status. Measured in seconds since the Unix epoch.
@@ -1393,7 +1393,7 @@ export namespace Quote {
              *
              * Related guide: [Applying discounts to subscriptions](https://docs.stripe.com/billing/subscriptions/discounts)
              */
-            discount: Discount;
+            discount: _Discount;
           }
 
           export interface Tax {
@@ -1488,7 +1488,7 @@ export namespace Quote {
              *
              * Related guide: [Applying discounts to subscriptions](https://docs.stripe.com/billing/subscriptions/discounts)
              */
-            discount: Discount;
+            discount: _Discount;
           }
 
           export interface Tax {
@@ -1608,7 +1608,7 @@ export namespace Quote {
          *
          * Related guide: [Applying discounts to subscriptions](https://docs.stripe.com/billing/subscriptions/discounts)
          */
-        discount: Discount;
+        discount: _Discount;
       }
 
       export interface Tax {

src/resources/SubscriptionSchedules.ts

@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec
 
 import {StripeResource} from '../StripeResource.js';
-import {Discount} from './Discounts.js';
+import {Discount as _Discount} from './Discounts.js';
 import {Application, DeletedApplication} from './Applications.js';
 import {Customer, DeletedCustomer} from './Customers.js';
 import {Subscription} from './Subscriptions.js';
@@ -674,7 +674,7 @@ export namespace SubscriptionSchedule {
       /**
        * ID of an existing discount on the object (or one of its ancestors) to reuse.
        */
-      discount: string | Discount | null;
+      discount: string | _Discount | null;
 
       /**
        * ID of the promotion code to create a new discount for.
@@ -763,7 +763,7 @@ export namespace SubscriptionSchedule {
         /**
          * ID of an existing discount on the object (or one of its ancestors) to reuse.
          */
-        discount: string | Discount | null;
+        discount: string | _Discount | null;
 
         /**
          * ID of the promotion code to create a new discount for.
@@ -868,7 +868,7 @@ export namespace SubscriptionSchedule {
         /**
          * ID of an existing discount on the object (or one of its ancestors) to reuse.
          */
-        discount: string | Discount | null;
+        discount: string | _Discount | null;
 
         /**
          * ID of the promotion code to create a new discount for.

testProjects/types/typescriptTest.ts

@@ -389,6 +389,32 @@ event = stripe.webhooks.constructEvent(
   'secret'
 );
 
+// Verify that nested types with names matching imported types resolve correctly.
+// e.g. Checkout.Session.TotalDetails.Breakdown.Discount.discount should be
+// Stripe.Discount, not a self-referential Breakdown.Discount. (DEVSDK-3139)
+{
+  const session = {} as Stripe.Checkout.Session;
+  for (const item of session.total_details?.breakdown?.discounts ?? []) {
+    const discount: Stripe.Discount = item.discount as Stripe.Discount;
+    const promoCode: string | Stripe.PromotionCode | null =
+      discount.promotion_code;
+    const customer: string | Stripe.Customer | Stripe.DeletedCustomer | null =
+      discount.customer;
+    const start: number = discount.start;
+  }
+
+  const schedule = {} as Stripe.SubscriptionSchedule;
+  for (const phase of schedule.phases) {
+    for (const d of phase.discounts) {
+      if (typeof d.discount !== 'string' && d.discount) {
+        const promoCode: string | Stripe.PromotionCode | null =
+          d.discount.promotion_code;
+        const start: number = d.discount.start;
+      }
+    }
+  }
+}
+
 const v2AccountCreateParamConfiguration: Stripe.V2.Core.AccountCreateParams.Configuration = {};
 const checkoutSessionParam: Stripe.Checkout.SessionCreateParams = {};
 const v2EventListParams: Stripe.V2.Core.EventListParams = {};