Merge pull request #595 from recurly/dt-changes

Restructures types for DT
recurly · Apr 15, 2020 · c1f2546 · c1f2546
2 parents 438785c + 4edc81d
commit c1f2546
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 41 deletions.
diff --git a/test/types/paypal.ts b/test/types/paypal.ts
@@ -22,5 +22,10 @@ export default function paypal() {
   paypal.on('fake-event', () => {});
 
   paypal.start();
+  paypal.start({
+    options: {
+      description: "description"
+    }
+  });
   paypal.destroy();
 }
diff --git a/types/emitter.ts b/types/emitter.ts
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -5,28 +5,30 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1
 
-import { Recurly } from './recurly';
+import { Recurly } from './lib/recurly';
 
 declare global {
   interface Window {
     recurly: Recurly;
   }
+
+  const recurly: Recurly;
 }
 
-export * from './pricing/checkout';
-export * from './pricing/promise';
-export * from './pricing/subscription';
-export * from './pricing';
-export * from './3d-secure';
-export * from './address';
-export * from './adyen';
-export * from './apple-pay';
-export * from './bank-account';
-export * from './configure';
-export * from './elements';
-export * from './error';
-export * from './gift-card';
-export * from './paypal';
-export * from './recurly';
-export * from './token';
-export * from './validate';
+export * from './lib/pricing/checkout';
+export * from './lib/pricing/promise';
+export * from './lib/pricing/subscription';
+export * from './lib/pricing/index';
+export * from './lib/3d-secure';
+export * from './lib/address';
+export * from './lib/adyen';
+export * from './lib/apple-pay';
+export * from './lib/bank-account';
+export * from './lib/configure';
+export * from './lib/elements';
+export * from './lib/error';
+export * from './lib/gift-card';
+export * from './lib/paypal';
+export * from './lib/recurly';
+export * from './lib/token';
+export * from './lib/validate';
diff --git a/types/3d-secure.ts → types/lib/3d-secure.ts b/types/3d-secure.ts → types/lib/3d-secure.ts
diff --git a/types/address.ts → types/lib/address.ts b/types/address.ts → types/lib/address.ts
diff --git a/types/adyen.ts → types/lib/adyen.ts b/types/adyen.ts → types/lib/adyen.ts
diff --git a/types/apple-pay.ts → types/lib/apple-pay.ts b/types/apple-pay.ts → types/lib/apple-pay.ts
diff --git a/types/bank-account.ts → types/lib/bank-account.ts b/types/bank-account.ts → types/lib/bank-account.ts
diff --git a/types/configure.ts → types/lib/configure.ts b/types/configure.ts → types/lib/configure.ts
diff --git a/types/elements.ts → types/lib/elements.ts b/types/elements.ts → types/lib/elements.ts
diff --git a/types/lib/emitter.ts b/types/lib/emitter.ts
@@ -0,0 +1,10 @@
+type Listener = (...args: any[]) => void;
+
+export interface Emitter<Event = string> {
+  on(event: Event, listener: Listener): Emitter<Event>;
+  once(event: Event, listener: Listener): Emitter<Event>;
+  off(event?: Event, listener?: Listener): Emitter<Event>;
+  emit(event: Event, ...args: any[]): Emitter<Event>;
+  listeners(event: Event): Listener[];
+  hasListeners(event: Event): boolean;
+}
diff --git a/types/error.ts → types/lib/error.ts b/types/error.ts → types/lib/error.ts
diff --git a/types/gift-card.ts → types/lib/gift-card.ts b/types/gift-card.ts → types/lib/gift-card.ts
@@ -1,4 +1,4 @@
-import { RecurlyError } from './';
+import { RecurlyError } from './error';
 
 export type GiftCardOptions = {
   code: string;

diff --git a/types/paypal.ts → types/lib/paypal.ts b/types/paypal.ts → types/lib/paypal.ts
@@ -17,8 +17,14 @@ export type PayPalConfig = BraintreeConfig | DirectConfig;
 
 export type PayPalEvent = 'error' | 'token';
 
+export type PayPalStartOptions = {
+  options: {
+    description: string;
+  }
+};
+
 export interface PayPalInstance extends Emitter<PayPalEvent> {
-  start: VoidFunction;
+  start: (payPalStartOptions?: PayPalStartOptions) => void;
   token: TokenHandler;
   destroy: VoidFunction;
 }

diff --git a/types/pricing/checkout.ts → types/lib/pricing/checkout.ts b/types/pricing/checkout.ts → types/lib/pricing/checkout.ts
@@ -76,7 +76,7 @@ export interface CheckoutPricingMethods {
   giftCard: (giftcard: string) => CheckoutPricingPromise;
   shippingAddress: (address: Address) => CheckoutPricingPromise;
   tax: (tax: Tax) => CheckoutPricingPromise;
-  subscription: (subscriptionPricing: SubscriptionPricingState | void) => CheckoutPricingPromise;
+  subscription: (subscriptionPricing: SubscriptionPricingState) => CheckoutPricingPromise;
 }
 
 export interface CheckoutPricingInstance extends CheckoutPricingMethods, PricingInstance<CheckoutPricingPromise> {

diff --git a/types/pricing/index.ts → types/lib/pricing/index.ts b/types/pricing/index.ts → types/lib/pricing/index.ts
diff --git a/types/pricing/promise.ts → types/lib/pricing/promise.ts b/types/pricing/promise.ts → types/lib/pricing/promise.ts
diff --git a/types/pricing/subscription.ts → types/lib/pricing/subscription.ts b/types/pricing/subscription.ts → types/lib/pricing/subscription.ts
diff --git a/types/recurly.ts → types/lib/recurly.ts b/types/recurly.ts → types/lib/recurly.ts
@@ -26,15 +26,3 @@ export interface Recurly extends Emitter<RecurlyEvent> {
   token: Token;
   validate: Validate;
 }
-
-declare global {
-  interface Window {
-    recurly: Recurly;
-  }
-
-  namespace Recurly {
-    type recurly = Recurly;
-  }
-
-  const recurly: Recurly;
-}
diff --git a/types/token.ts → types/lib/token.ts b/types/token.ts → types/lib/token.ts
diff --git a/types/validate.ts → types/lib/validate.ts b/types/validate.ts → types/lib/validate.ts