@vonq/hapi-elements-types 1.5.0 → 1.7.0

package/{src/_window → _window}/api.types.ts

@@ -1,21 +1,23 @@
-import { Logger } from "../common/logger/Logger"
 import {
     AxiosRequestConfig,
     AxiosResponse,
     RawAxiosRequestConfig,
     RawAxiosRequestHeaders,
 } from "axios"
-import { ModuleWithConstructorArgs } from "../types"
-import { WindowHapiModuleName } from "../../enums"
+import { WindowHapiModuleName } from "../common/enums"
 import { WindowHapiAPIATS } from "../ats/api.types"
 import { WindowHapiAPICampaign } from "../campaign/api.types"
 import { WindowHapiAPIContract } from "../contract/api.types"
 import { WindowHapiAPIProduct } from "../product/api.types"
 import { WindowHapiAPIWallet } from "../wallet/api.types"
-import { WindowHapi } from "./window"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
+import { WindowHapiLogger } from "../common/logger/types"
 
 export type WindowHapiAPIModule<ModuleType, ModuleConfig> = {
-    logger: Logger
+    logger: WindowHapiLogger
     configs: ModuleConfig
     setBaseURL: (url: string) => void
     setBaseConfig: (config: Record<string, RawAxiosRequestConfig>) => void
@@ -27,7 +29,7 @@ export type WindowHapiAPIModule<ModuleType, ModuleConfig> = {
 export type HapiRequestConfig<T> = Omit<AxiosRequestConfig<T>, "headers"> & {
     headers?: any
 }
-export type WindowHapiAPI = ModuleWithConstructorArgs<
+export type WindowHapiAPI = WindowHapiModuleWithConstructorArgs<
     {
         /* Common */
         request: <T = any, R = AxiosResponse<T>, D = any>(
@@ -55,5 +57,5 @@ export type WindowHapiAPI = ModuleWithConstructorArgs<
             [WindowHapiModuleName.ats]: WindowHapiAPIATS
         }
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >

package/_window/auth.types.ts

@@ -0,0 +1,13 @@
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
+
+export type WindowHapiAuth = WindowHapiModuleWithConstructorArgs<
+    {
+        partnerId: string | undefined
+        clientId: string | undefined
+        clientToken: string | undefined
+    },
+    { readonly core: WindowHapiClassInterface }
+>

package/_window/config.types.ts

@@ -0,0 +1,5 @@
+export type DebugPanelPosition =
+    | "bottom-left"
+    | "bottom-right"
+    | "top-left"
+    | "top-right"

package/{src/_window → _window}/events.types.ts

@@ -1,4 +1,3 @@
-import { ModuleWithConstructorArgs } from "../types"
 import {
     WindowHapiEventCommandNames,
     WindowHapiEventCommandStatus,
@@ -10,14 +9,16 @@ import {
     WindowHapiEventMediatorInstances,
     WindowHapiEventCommand,
     WindowHapiEventStrategy,
+    WindowHapiEventListener,
 } from "../common/events/types"
-import { WindowHapi } from "./window"
-import WindowHapiInstance from "../common/instances/Instance"
-import { WindowHapiCoreModuleName } from "../../enums"
-import EventListener from "../../../common/events/EventListener"
-import WindowHapiEventListener from "../../../common/events/EventListener"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
+import { WindowHapiSubmoduleName } from "../common/enums"
+import { WindowHapiInstance } from "./instances.types"
 
-export type WindowHapiEventFactory = ModuleWithConstructorArgs<
+export type WindowHapiEventFactory = WindowHapiModuleWithConstructorArgs<
     {
         findEventsPendingResolveOrReject: (
             events: WindowHapiEventCommand[],
@@ -48,7 +49,7 @@ export type WindowHapiEventMediatorCreateAndDispatchHandler = (
     status?: WindowHapiEventCommandStatus,
 ) => Promise<WindowHapiEventCommand | undefined>
 
-export type WindowHapiEventMediator = ModuleWithConstructorArgs<
+export type WindowHapiEventMediator = WindowHapiModuleWithConstructorArgs<
     {
         createAndDispatch: WindowHapiEventMediatorCreateAndDispatchHandler
         createAndDispatchDebounced: (
@@ -79,12 +80,12 @@ export type WindowHapiEventMediator = ModuleWithConstructorArgs<
         getEventListener: (
             name: WindowHapiEventCommandNames,
             id?: string,
-        ) => EventListener | undefined
+        ) => WindowHapiEventListener | undefined
         addEventListener: (
             name: WindowHapiEventCommandNames,
             callback: WindowHapiEventCommandCallbackHandler,
             id?: string,
-        ) => EventListener
+        ) => WindowHapiEventListener
         removeEventListener: (eventId: string) => void
     },
     {
@@ -102,7 +103,7 @@ export type WindowHapiEventMediator = ModuleWithConstructorArgs<
     }
 >
 
-export type WindowHapiEventStorage = ModuleWithConstructorArgs<
+export type WindowHapiEventStorage = WindowHapiModuleWithConstructorArgs<
     {
         cache: (WindowHapiEventCommand | WindowHapiEventListener)[]
         listeners: WindowHapiEventListener[]
@@ -121,7 +122,7 @@ export type WindowHapiEventStorage = ModuleWithConstructorArgs<
     { readonly getInstances: WindowHapiEventMediatorGetInstancesHandler }
 >
 
-export type WindowHapiEvents = ModuleWithConstructorArgs<
+export type WindowHapiEvents = WindowHapiModuleWithConstructorArgs<
     {
         hasAddedWindowMessageEvent: boolean
         addInternalEventListeners: () => void
@@ -150,8 +151,8 @@ export type WindowHapiEvents = ModuleWithConstructorArgs<
         }
         handleEventWithDataRequest: (
             event: WindowHapiEventCommand,
-            coreModuleName: WindowHapiCoreModuleName,
+            coreModuleName: WindowHapiSubmoduleName,
         ) => Promise<void>
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >

package/_window/instances.types.ts

@@ -0,0 +1,27 @@
+import {
+    WindowHapiClassInterface,
+    WindowHapiModuleWithConstructorArgs,
+} from "./window"
+import { WindowHapiLogger } from "../common/logger/types"
+
+export type WindowHapiInstances = WindowHapiModuleWithConstructorArgs<
+    {
+        instances: WindowHapiInstance[]
+        getFrameWindowByName: (name: string) => Window | undefined
+        hasInstance: (instanceName: string) => boolean
+        getInstanceByName: (
+            instanceName: string,
+        ) => WindowHapiInstance | undefined
+        addInstanceByName: (instanceName: string, window: Window) => void
+        addInstance: (instance: WindowHapiInstance) => void
+        removeInstance: (instanceName: string) => void
+        onAfterAddInstance: (instance: WindowHapiInstance) => void
+        onAfterRemoveInstance: (instance: WindowHapiInstance) => void
+    },
+    { readonly core: WindowHapiClassInterface }
+>
+export type WindowHapiInstance = {
+    logger: WindowHapiLogger
+    name: string
+    window?: Window
+}

package/{src/_window → _window}/qa.types.ts

@@ -1,6 +1,8 @@
-import { WindowHapiModuleName } from "../../enums"
-import { ModuleWithConstructorArgs } from "../types"
-import { WindowHapi } from "./window"
+import { WindowHapiModuleName } from "../common/enums"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
 import { WindowHapiQACampaign } from "../campaign/qa.types"
 import { WindowHapiQACommon } from "../common/qa.types"
 import { WindowHapiQAOrderJourney } from "../orderJourney/qa.types"
@@ -9,7 +11,7 @@ import { WindowHapiQATheming } from "../theming/qa.types"
 import { WindowHapiQALanguage } from "../language/qa.types"
 import { WindowHapiQAProduct } from "../product/qa.types"
 
-export type WindowHapiQA = ModuleWithConstructorArgs<
+export type WindowHapiQA = WindowHapiModuleWithConstructorArgs<
     {
         [WindowHapiModuleName.campaign]: WindowHapiQACampaign
         [WindowHapiModuleName.product]: WindowHapiQAProduct
@@ -24,5 +26,5 @@ export type WindowHapiQA = ModuleWithConstructorArgs<
         addDebugPanelToDOM: () => void
         setDebugPanelPosition: (buttonEl: HTMLElement | null) => void
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >

package/{src/_window → _window}/routing.types.ts

@@ -1,9 +1,11 @@
-import { ModuleWithConstructorArgs } from "../types"
-import { WindowHapi } from "./window"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
 
 export type WindowHapiRoutingQueryParams = Record<string, string | string[]>
 
-export type WindowHapiRouting = ModuleWithConstructorArgs<
+export type WindowHapiRouting = WindowHapiModuleWithConstructorArgs<
     {
         locationChangeInterval: number | undefined
         currentPathname: string
@@ -17,5 +19,5 @@ export type WindowHapiRouting = ModuleWithConstructorArgs<
         setQueryParams: (params: WindowHapiRoutingQueryParams) => void
         onRouteChange: () => void
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >

package/{src/_window → _window}/sdk.types.ts

@@ -1,29 +1,28 @@
-import { WindowHapiModuleName } from "../../enums"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleName } from "../common/enums"
 import { WindowHapiServiceAlert } from "../alert/service.types"
 import { WindowHapiStateModule } from "./state.types"
-import { AlertStoreState } from "../alert/state.types"
+import { AlertState } from "../alert/state.types"
 import { WindowHapiServiceBasket } from "../basket/service.types"
-import { BasketStoreState } from "../basket/state.types"
+import { BasketState } from "../basket/state.types"
 import { WindowHapiUtilsBasket } from "../basket/utils.types"
 import { WindowHapiServiceCampaign } from "../campaign/service.types"
-import { CampaignStoreState } from "../campaign/state.types"
+import { CampaignState } from "../campaign/state.types"
 import { WindowHapiUtilsCampaign } from "../campaign/utils.types"
 import { WindowHapiServiceContract } from "../contract/service.types"
-import { ContractStoreState } from "../contract/state.types"
+import { ContractState } from "../contract/state.types"
 import { WindowHapiUtilsContract } from "../contract/utils.types"
-import { DebuggingStoreState } from "../debugging/state.types"
-import { LanguageStoreState } from "../language/state.types"
+import { DebuggingState } from "../debugging/state.types"
+import { LanguageState } from "../language/state.types"
 import { WindowHapiServiceModal } from "../modal/service.types"
-import { ModalStoreState } from "../modal/state.types"
-import { OrderJourneyStoreState } from "../orderJourney/state.types"
+import { ModalState } from "../modal/state.types"
+import { OrderJourneyState } from "../orderJourney/state.types"
 import { WindowHapiUtilsOrderJourney } from "../orderJourney/utils.types"
 import { WindowHapiServiceProduct } from "../product/service.types"
-import { ProductStoreState } from "../product/state.types"
+import { ProductState } from "../product/state.types"
 import { WindowHapiUtilsProduct } from "../product/utils.types"
-import { ThemeStoreState } from "../theming/state.types"
+import { ThemingState } from "../theming/state.types"
 import { WindowHapiServiceWallet } from "../wallet/service.types"
-import { WalletStoreState } from "../wallet/state.types"
+import { WalletState } from "../wallet/state.types"
 import { WindowHapiValidationsBasket } from "../basket/validations.types"
 import { WindowHapiValidationsCampaign } from "../campaign/validations.types"
 import { WindowHapiValidationsContract } from "../contract/validations.types"
@@ -36,7 +35,10 @@ import { WindowHapiAPICampaign } from "../campaign/api.types"
 import { WindowHapiAPIContract } from "../contract/api.types"
 import { WindowHapiAPIProduct } from "../product/api.types"
 import { WindowHapiAPIWallet } from "../wallet/api.types"
-import { WindowHapi } from "./window"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
 import { WindowHapiServiceUI } from "../ui/service.types"
 
 export type WindowHapiSDKModule<
@@ -57,66 +59,66 @@ export type WindowHapiSDKAlert = WindowHapiSDKModule<
     undefined,
     WindowHapiServiceAlert,
     undefined,
-    WindowHapiStateModule<AlertStoreState>
+    WindowHapiStateModule<AlertState>
 >
 export type WindowHapiSDKBasket = WindowHapiSDKModule<
     undefined,
     WindowHapiServiceBasket,
     WindowHapiValidationsBasket,
-    WindowHapiStateModule<BasketStoreState>,
+    WindowHapiStateModule<BasketState>,
     WindowHapiUtilsBasket
 >
 export type WindowHapiSDKCampaign = WindowHapiSDKModule<
     WindowHapiAPICampaign,
     WindowHapiServiceCampaign,
     WindowHapiValidationsCampaign,
-    WindowHapiStateModule<CampaignStoreState>,
+    WindowHapiStateModule<CampaignState>,
     WindowHapiUtilsCampaign
 >
 export type WindowHapiSDKContract = WindowHapiSDKModule<
     WindowHapiAPIContract,
     WindowHapiServiceContract,
     WindowHapiValidationsContract,
-    WindowHapiStateModule<ContractStoreState>,
+    WindowHapiStateModule<ContractState>,
     WindowHapiUtilsContract
 >
 export type WindowHapiSDKDebugging = WindowHapiSDKModule<
     undefined,
     undefined,
     undefined,
-    WindowHapiStateModule<DebuggingStoreState>
+    WindowHapiStateModule<DebuggingState>
 >
 export type WindowHapiSDKLanguage = WindowHapiSDKModule<
     undefined,
     undefined,
     WindowHapiValidationsLanguage,
-    WindowHapiStateModule<LanguageStoreState>
+    WindowHapiStateModule<LanguageState>
 >
 export type WindowHapiSDKOrderJourney = WindowHapiSDKModule<
     undefined,
     undefined,
     WindowHapiValidationsOrderJourney,
-    WindowHapiStateModule<OrderJourneyStoreState>,
+    WindowHapiStateModule<OrderJourneyState>,
     WindowHapiUtilsOrderJourney
 >
 export type WindowHapiSDKProduct = WindowHapiSDKModule<
     WindowHapiAPIProduct,
     WindowHapiServiceProduct,
     WindowHapiValidationsProduct,
-    WindowHapiStateModule<ProductStoreState>,
+    WindowHapiStateModule<ProductState>,
     WindowHapiUtilsProduct
 >
 export type WindowHapiSDKTheming = WindowHapiSDKModule<
     undefined,
     undefined,
     WindowHapiValidationsTheming,
-    WindowHapiStateModule<ThemeStoreState>
+    WindowHapiStateModule<ThemingState>
 >
 export type WindowHapiSDKWallet = WindowHapiSDKModule<
     WindowHapiAPIWallet,
     WindowHapiServiceWallet,
     WindowHapiValidationsWallet,
-    WindowHapiStateModule<WalletStoreState>
+    WindowHapiStateModule<WalletState>
 >
 export type WindowHapiSDKUI = WindowHapiSDKModule<
     undefined,
@@ -124,7 +126,7 @@ export type WindowHapiSDKUI = WindowHapiSDKModule<
     undefined,
     undefined
 >
-export type WindowHapiSDK = ModuleWithConstructorArgs<
+export type WindowHapiSDK = WindowHapiModuleWithConstructorArgs<
     {
         [WindowHapiModuleName.contract]: WindowHapiSDKContract
         [WindowHapiModuleName.basket]: WindowHapiSDKBasket
@@ -137,11 +139,11 @@ export type WindowHapiSDK = ModuleWithConstructorArgs<
         [WindowHapiModuleName.debugging]: WindowHapiSDKDebugging
         [WindowHapiModuleName.alert]: WindowHapiSDKAlert
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >
 export type WindowHapiSDKModal = WindowHapiSDKModule<
     undefined,
     WindowHapiServiceModal,
     undefined,
-    WindowHapiStateModule<ModalStoreState>
+    WindowHapiStateModule<ModalState>
 >

package/{src/_window → _window}/service.types.ts

@@ -1,5 +1,4 @@
-import { WindowHapiModuleName } from "../../enums"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleName } from "../common/enums"
 import { WindowHapiServiceAlert } from "../alert/service.types"
 import { WindowHapiServiceBasket } from "../basket/service.types"
 import { WindowHapiServiceCampaign } from "../campaign/service.types"
@@ -9,8 +8,11 @@ import { WindowHapiServiceWallet } from "../wallet/service.types"
 import { WindowHapiServiceModal } from "../modal/service.types"
 import { WindowHapiServiceUI } from "../ui/service.types"
 import { WindowHapiServiceATS } from "../ats/service.types"
-import { Logger } from "../common/logger/Logger"
-import { WindowHapi } from "./window"
+import {
+    WindowHapiClassInterface,
+    WindowHapiModuleWithConstructorArgs,
+} from "./window"
+import { WindowHapiLogger } from "../common/logger/types"
 
 export type HapiServiceFunctionLifecycleHookCallbackHandler = () =>
     | void
@@ -31,10 +33,10 @@ export type HapiServiceFunctionWithLifecycleHooks<HandlerType> = {
 
 export type HapiServiceBase = {
     __serviceName: WindowHapiModuleName
-    logger: Logger
+    logger: WindowHapiLogger
     init: () => void
 }
-export type WindowHapiService = ModuleWithConstructorArgs<
+export type WindowHapiService = WindowHapiModuleWithConstructorArgs<
     {
         [WindowHapiModuleName.alert]: WindowHapiServiceAlert
         [WindowHapiModuleName.basket]: WindowHapiServiceBasket
@@ -63,5 +65,5 @@ export type WindowHapiService = ModuleWithConstructorArgs<
             fn: HandlerType,
         ) => HapiServiceFunctionWithLifecycleHooks<HandlerType>
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >

package/{src/_window → _window}/state.types.ts

@@ -1,19 +1,21 @@
-import { AlertStoreState } from "../alert/state.types"
-import { BasketStoreState } from "../basket/state.types"
-import { CampaignStoreState } from "../campaign/state.types"
-import { ContractStoreState } from "../contract/state.types"
-import { DebuggingStoreState } from "../debugging/state.types"
-import { LanguageStoreState } from "../language/state.types"
-import { ProductStoreState } from "../product/state.types"
-import { ThemeStoreState } from "../theming/state.types"
-import { OrderJourneyStoreState } from "../orderJourney/state.types"
-import { WalletStoreState } from "../wallet/state.types"
-import { ModalStoreState } from "../modal/state.types"
+import { AlertState } from "../alert/state.types"
+import { BasketState } from "../basket/state.types"
+import { CampaignState } from "../campaign/state.types"
+import { ContractState } from "../contract/state.types"
+import { DebuggingState } from "../debugging/state.types"
+import { LanguageState } from "../language/state.types"
+import { ProductState } from "../product/state.types"
+import { ThemingState } from "../theming/state.types"
+import { OrderJourneyState } from "../orderJourney/state.types"
+import { WalletState } from "../wallet/state.types"
+import { ModalState } from "../modal/state.types"
 import { WindowHapiEventCommandCallbackHandler } from "../common/events/types"
-import { WindowHapiModuleName } from "../../enums"
-import { ATSStoreState } from "../ats/state.types"
-import { ModuleWithConstructorArgs } from "../types"
-import { WindowHapi } from "./window"
+import { WindowHapiModuleName } from "../common/enums"
+import { ATSState } from "../ats/state.types"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
 import { WindowHapiValidationsCommon } from "../common/validations.types"
 import { WindowHapiValidationsBasket } from "../basket/validations.types"
 import { WindowHapiValidationsCampaign } from "../campaign/validations.types"
@@ -25,57 +27,57 @@ import { WindowHapiValidationsOrderJourney } from "../orderJourney/validations.t
 import { WindowHapiValidationsWallet } from "../wallet/validations.types"
 import { WindowHapiValidations } from "./validation.types"
 
-export type WindowHapiState = ModuleWithConstructorArgs<
+export type WindowHapiState = WindowHapiModuleWithConstructorArgs<
     {
-        [WindowHapiModuleName.alert]: WindowHapiStateModule<AlertStoreState>
-        [WindowHapiModuleName.basket]: WindowHapiStateModule<BasketStoreState>
-        [WindowHapiModuleName.campaign]: WindowHapiStateModule<CampaignStoreState>
-        [WindowHapiModuleName.contract]: WindowHapiStateModule<ContractStoreState>
-        [WindowHapiModuleName.debugging]: WindowHapiStateModule<DebuggingStoreState>
-        [WindowHapiModuleName.language]: WindowHapiStateModule<LanguageStoreState>
-        [WindowHapiModuleName.product]: WindowHapiStateModule<ProductStoreState>
-        [WindowHapiModuleName.theming]: WindowHapiStateModule<ThemeStoreState>
-        [WindowHapiModuleName.orderJourney]: WindowHapiStateModule<OrderJourneyStoreState>
-        [WindowHapiModuleName.wallet]: WindowHapiStateModule<WalletStoreState>
-        [WindowHapiModuleName.modal]: WindowHapiStateModule<ModalStoreState>
-        [WindowHapiModuleName.ats]: WindowHapiStateModule<ATSStoreState>
+        [WindowHapiModuleName.alert]: WindowHapiStateModule<AlertState>
+        [WindowHapiModuleName.basket]: WindowHapiStateModule<BasketState>
+        [WindowHapiModuleName.campaign]: WindowHapiStateModule<CampaignState>
+        [WindowHapiModuleName.contract]: WindowHapiStateModule<ContractState>
+        [WindowHapiModuleName.debugging]: WindowHapiStateModule<DebuggingState>
+        [WindowHapiModuleName.language]: WindowHapiStateModule<LanguageState>
+        [WindowHapiModuleName.product]: WindowHapiStateModule<ProductState>
+        [WindowHapiModuleName.theming]: WindowHapiStateModule<ThemingState>
+        [WindowHapiModuleName.orderJourney]: WindowHapiStateModule<OrderJourneyState>
+        [WindowHapiModuleName.wallet]: WindowHapiStateModule<WalletState>
+        [WindowHapiModuleName.modal]: WindowHapiStateModule<ModalState>
+        [WindowHapiModuleName.ats]: WindowHapiStateModule<ATSState>
         getModuleByName: (
             name: string,
         ) => WindowHapiStateModule<any> | undefined
         handleDefaultStateFromQueryParams: (params: string | string[]) => void
         shouldPreventStateDispatch: boolean
         stores: {
-            alert: WindowHapiStateModule<AlertStoreState>
-            basket: WindowHapiStateModule<BasketStoreState>
-            campaign: WindowHapiStateModule<CampaignStoreState>
-            contract: WindowHapiStateModule<ContractStoreState>
-            debugging: WindowHapiStateModule<DebuggingStoreState>
-            language: WindowHapiStateModule<LanguageStoreState>
-            product: WindowHapiStateModule<ProductStoreState>
-            theming: WindowHapiStateModule<ThemeStoreState>
-            orderJourney: WindowHapiStateModule<OrderJourneyStoreState>
-            wallet: WindowHapiStateModule<WalletStoreState>
-            modal: WindowHapiStateModule<ModalStoreState>
-            ats: WindowHapiStateModule<ATSStoreState>
+            alert: WindowHapiStateModule<AlertState>
+            basket: WindowHapiStateModule<BasketState>
+            campaign: WindowHapiStateModule<CampaignState>
+            contract: WindowHapiStateModule<ContractState>
+            debugging: WindowHapiStateModule<DebuggingState>
+            language: WindowHapiStateModule<LanguageState>
+            product: WindowHapiStateModule<ProductState>
+            theming: WindowHapiStateModule<ThemingState>
+            orderJourney: WindowHapiStateModule<OrderJourneyState>
+            wallet: WindowHapiStateModule<WalletState>
+            modal: WindowHapiStateModule<ModalState>
+            ats: WindowHapiStateModule<ATSState>
         }
         toJSON: Record<string, any>
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >
 
 export type WindowHapiStatesJSON = {
-    [WindowHapiModuleName.alert]: AlertStoreState
-    [WindowHapiModuleName.basket]: BasketStoreState
-    [WindowHapiModuleName.campaign]: CampaignStoreState
-    [WindowHapiModuleName.contract]: ContractStoreState
-    [WindowHapiModuleName.debugging]: DebuggingStoreState
-    [WindowHapiModuleName.language]: LanguageStoreState
-    [WindowHapiModuleName.product]: ProductStoreState
-    [WindowHapiModuleName.theming]: ThemeStoreState
-    [WindowHapiModuleName.orderJourney]: OrderJourneyStoreState
-    [WindowHapiModuleName.wallet]: WalletStoreState
-    [WindowHapiModuleName.modal]: ModalStoreState
-    [WindowHapiModuleName.ats]: ATSStoreState
+    [WindowHapiModuleName.alert]: AlertState
+    [WindowHapiModuleName.basket]: BasketState
+    [WindowHapiModuleName.campaign]: CampaignState
+    [WindowHapiModuleName.contract]: ContractState
+    [WindowHapiModuleName.debugging]: DebuggingState
+    [WindowHapiModuleName.language]: LanguageState
+    [WindowHapiModuleName.product]: ProductState
+    [WindowHapiModuleName.theming]: ThemingState
+    [WindowHapiModuleName.orderJourney]: OrderJourneyState
+    [WindowHapiModuleName.wallet]: WalletState
+    [WindowHapiModuleName.modal]: ModalState
+    [WindowHapiModuleName.ats]: ATSState
 }
 
 export type WindowHapiStateBase = {

package/_window/ui.types.ts

@@ -0,0 +1,15 @@
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
+
+export type WindowHapiUI = WindowHapiModuleWithConstructorArgs<
+    {
+        addUIElementToBody: (
+            elementName: "he-ui-modals" | "he-ui-alertbar",
+        ) => void
+        toggleModal: () => void
+        toggleAlertbar: () => void
+    },
+    { readonly core: WindowHapiClassInterface }
+>

package/{src/_window → _window}/utils.types.ts

@@ -1,13 +1,15 @@
-import { WindowHapiModuleName } from "../../enums"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleName } from "../common/enums"
 import { WindowHapiUtilsProduct } from "../product/utils.types"
 import { WindowHapiUtilsContract } from "../contract/utils.types"
 import { WindowHapiUtilsCampaign } from "../campaign/utils.types"
 import { WindowHapiUtilsBasket } from "../basket/utils.types"
 import { WindowHapiUtilsOrderJourney } from "../orderJourney/utils.types"
-import { WindowHapi } from "./window"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
 
-export type WindowHapiUtils = ModuleWithConstructorArgs<
+export type WindowHapiUtils = WindowHapiModuleWithConstructorArgs<
     {
         isObject: (item: any) => boolean
         mergeDeepOverwriteArrays: (
@@ -30,5 +32,5 @@ export type WindowHapiUtils = ModuleWithConstructorArgs<
             [WindowHapiModuleName.orderJourney]: WindowHapiUtilsOrderJourney
         }
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >

package/{src/_window → _window}/validation.types.ts

@@ -1,7 +1,9 @@
 import { z } from "zod"
-import { WindowHapiModuleName } from "../../enums"
-import { ModuleWithConstructorArgs } from "../types"
-import { WindowHapi } from "./window"
+import { WindowHapiModuleName } from "../common/enums"
+import {
+    WindowHapiModuleWithConstructorArgs,
+    WindowHapiClassInterface,
+} from "./window"
 import { WindowHapiValidationsCommon } from "../common/validations.types"
 import { WindowHapiValidationsProduct } from "../product/validations.types"
 import { WindowHapiValidationsContract } from "../contract/validations.types"
@@ -12,7 +14,7 @@ import { WindowHapiValidationsTheming } from "../theming/validations.types"
 import { WindowHapiValidationsLanguage } from "../language/validations.types"
 import { WindowHapiValidationsOrderJourney } from "../orderJourney/validations.types"
 
-export type WindowHapiValidations = ModuleWithConstructorArgs<
+export type WindowHapiValidations = WindowHapiModuleWithConstructorArgs<
     {
         validator: typeof z
         messages: Record<string, string | Function>
@@ -35,7 +37,7 @@ export type WindowHapiValidations = ModuleWithConstructorArgs<
         ) => void
         runSDKEventsValidations: (callback: Function) => void
     },
-    { readonly core: WindowHapi }
+    { readonly core: WindowHapiClassInterface }
 >
 
 export type ValidationSubmoduleConstructorArgs = {