chore: optimise imports

Author: descorp

src/components/AdyenCheckout.tsx

@@ -7,35 +7,33 @@ import React, {
   useMemo,
 } from 'react';
 import { type EmitterSubscription, NativeEventEmitter } from 'react-native';
-import { Event } from '../core/constants';
-import type { AdyenComponent } from '../core/AdyenNativeModules';
-import {
-  SessionHelper,
-  type SessionContext,
-} from '../modules/session/SessionHelperModule';
 import type {
+  AddressLookup,
+  AddressLookupItem,
+  AdyenActionComponent,
+  AdyenComponent,
   AdyenError,
+  Configuration,
+  Order,
+  PartialPaymentComponent,
+  PaymentDetailsData,
+  PaymentMethodData,
   PaymentMethodsResponse,
+  RemovesStoredPayment,
   SessionConfiguration,
-  PaymentMethodData,
-  PaymentDetailsData,
+  SessionsResult,
   StoredPaymentMethod,
   SubmitModel,
-  Order,
-  SessionsResult,
-  RemovesStoredPayment,
-} from '../core/types';
-import type { Configuration } from '../core/configurations/Configuration';
-import { checkPaymentMethodsResponse, checkConfiguration } from '../core/utils';
-import type { AdyenActionComponent } from '../core/AdyenNativeModules';
-import type {
-  AddressLookup,
-  AddressLookupItem,
-} from '../core/configurations/AddressLookup';
+} from '../core';
+import { Event } from '../core';
 import { AdyenCheckoutContext } from '../hooks/useAdyenCheckout';
-import type { PartialPaymentComponent } from '../core/configurations/PartialPaymentConfiguration';
 import { getWrapper } from '../modules/base/getWrapper';
 import type { EventListenerWrapper } from '../modules/base/EventListenerWrapper';
+import {
+  SessionHelper,
+  type SessionContext,
+} from '../modules/session/SessionHelperModule';
+import { checkConfiguration, checkPaymentMethodsResponse } from './utils';
 
 /**
  * Props for AdyenCheckout
@@ -135,7 +133,7 @@ export const AdyenCheckout: React.FC<AdyenCheckoutProps> = ({
   }, [session, sessionContext, config, onError, setSessionContext]);
 
   const startEventListeners = useCallback(
-    (nativeComponent: EventListenerWrapper) => {
+    (nativeComponent: EventListenerWrapper & AdyenComponent) => {
       removeEventListeners();
       const eventEmitter = new NativeEventEmitter(nativeComponent);
 
@@ -156,14 +154,14 @@ export const AdyenCheckout: React.FC<AdyenCheckoutProps> = ({
           submitPayment(response.paymentData, response.extra)
         ),
         eventEmitter.addListener(Event.onError, (error: AdyenError) =>
-          onError?.(error, nativeComponent as unknown as AdyenComponent)
+          onError?.(error, nativeComponent)
         ),
       ];
 
       if (nativeComponent.isSupported(Event.onComplete)) {
         subscriptions.current.push(
           eventEmitter.addListener(Event.onComplete, (data: any) =>
-            onComplete?.(data, nativeComponent as unknown as AdyenComponent)
+            onComplete?.(data, nativeComponent)
           )
         );
       }

src/core/utils.ts src/components/utils.tssrc/core/utils.ts renamed to src/components/utils.ts

@@ -1,6 +1,5 @@
 import { Platform } from 'react-native';
-import type { Configuration } from './configurations/Configuration';
-import type { PaymentMethodsResponse } from './types';
+import type { Configuration, PaymentMethodsResponse } from '../core';
 
 export const checkPaymentMethodsResponse = (
   paymentMethodsResponse: PaymentMethodsResponse | undefined

src/core/AdyenNativeModules.tsx

@@ -1,5 +1,9 @@
-import type { AdyenComponent } from '../AdyenNativeModules';
-import type { Balance, Order, PaymentMethodData } from '../types';
+import type {
+  AdyenComponent,
+  Balance,
+  Order,
+  PaymentMethodData,
+} from '../types';
 
 export interface PartialPaymentConfiguration {
   /**

src/core/configurations/PartialPaymentConfiguration.ts

@@ -1,6 +1,3 @@
-export const MISSING_CONTEXT_ERROR =
-  'useAdyenCheckout must be used within an AdyenCheckout';
-
 /** Collection of events that components can trigger. */
 export enum Event {
   /** Event handler, called when the shopper selects the Pay button and payment details are valid. */

src/core/constants.ts

@@ -1,2 +1,2 @@
 export { useAdyenCheckout } from './useAdyenCheckout';
-export type { AdyenCheckoutContextValue } from './useAdyenCheckout';
+export type { AdyenCheckoutContextType } from './useAdyenCheckout';

src/hooks/index.ts

@@ -1,12 +1,10 @@
 import { createContext, useContext } from 'react';
-import type { PaymentMethodsResponse } from '../core/types';
-import type { Configuration } from '../core/configurations';
-import { MISSING_CONTEXT_ERROR } from '../core/constants';
+import type { PaymentMethodsResponse, Configuration } from '../core';
 
 /**
  * Shape of the AdyenCheckout context value.
  */
-export interface AdyenCheckoutContextValue {
+export interface AdyenCheckoutContextType {
   /** Start payment with Drop-in or any payment method available in `paymentMethods` collection. */
   start: (typeName: string) => void;
 
@@ -21,15 +19,18 @@ export interface AdyenCheckoutContextValue {
 }
 
 export const AdyenCheckoutContext =
-  createContext<AdyenCheckoutContextValue | null>(null);
+  createContext<AdyenCheckoutContextType | null>(null);
 
 /**
  * Returns AdyenCheckout context. This context allows you to initiate payment with Drop-in or any payment method available in `paymentMethods` collection.
  */
-export const useAdyenCheckout = (): AdyenCheckoutContextValue => {
+export const useAdyenCheckout = (): AdyenCheckoutContextType => {
   const context = useContext(AdyenCheckoutContext);
   if (context !== null) {
     return context;
   }
   throw new Error(MISSING_CONTEXT_ERROR);
 };
+
+const MISSING_CONTEXT_ERROR =
+  'useAdyenCheckout must be used within an AdyenCheckout';

src/hooks/useAdyenCheckout.ts

@@ -1,6 +1,9 @@
 import type { NativeModule } from 'react-native';
-import type { BaseConfiguration } from '../../core/configurations';
-import type { PaymentAction, PaymentDetailsData } from '../../core/types';
+import type {
+  BaseConfiguration,
+  PaymentAction,
+  PaymentDetailsData,
+} from '../../core';
 import type { ActionModule } from './AdyenAction';
 
 /** Native module interface specific to Action */

…c/modules/action/ActionModuleWrapper.tsx src/modules/action/ActionModuleWrapper.tssrc/modules/action/ActionModuleWrapper.tsx renamed to src/modules/action/ActionModuleWrapper.ts src/modules/action/ActionModuleWrapper.tsx renamed to src/modules/action/ActionModuleWrapper.ts

@@ -1,8 +1,11 @@
 import { NativeModules } from 'react-native';
-import type { PaymentAction, PaymentDetailsData } from '../../core/types';
-import type { BaseConfiguration } from '../../core/configurations';
-import { ActionModuleWrapper } from './ActionModuleWrapper';
+import type {
+  BaseConfiguration,
+  PaymentAction,
+  PaymentDetailsData,
+} from '../../core';
 import { ModuleMock } from '../base/ModuleMock';
+import { ActionModuleWrapper } from './ActionModuleWrapper';
 
 /** Describes a native module capable of handling actions standalone. */
 export interface ActionModule {

src/modules/action/AdyenAction.ts

@@ -1,5 +1,5 @@
 import { NativeModules } from 'react-native';
-import type { ConditionalPaymentComponent } from '../../core/types';
+import type { ConditionalPaymentComponent } from '../../core';
 import { ModuleMock } from '../base/ModuleMock';
 import { ApplePayWrapper } from './ApplePayWrapper';