@vonq/hapi-elements-types 1.5.0 → 1.6.0

package/src/_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/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 = {

package/src/_window/window.ts

@@ -1,8 +1,7 @@
-import { Logger } from "../common/logger/Logger"
 import { WindowHapiUtils } from "./utils.types"
 import { WindowHapiValidations } from "./validation.types"
 import { WindowHapiState } from "./state.types"
-import { WindowHapiInstances } from "./instances.types"
+import { WindowHapiInstance, WindowHapiInstances } from "./instances.types"
 import { WindowHapiRouting } from "./routing.types"
 import { WindowHapiAuth } from "./auth.types"
 import { WindowHapiEvents } from "./events.types"
@@ -10,47 +9,132 @@ import { WindowHapiUI } from "./ui.types"
 import { WindowHapiAPI } from "./api.types"
 import { WindowHapiSDK } from "./sdk.types"
 import { WindowHapiService } from "./service.types"
-import HapiInstance from "../common/instances/Instance"
 import { WindowHapiQA } from "./qa.types"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiLogger } from "../common/logger/types"
+import {
+    HapiWebComponent,
+    RecursivePartial,
+    WindowHapiSubmoduleName,
+} from "../common"
+import { DebugPanelPosition } from "./config.types"
+
+export type WindowHapiModuleWithConstructorArgs<Module, ConstructorArgs> =
+    Module & ConstructorArgs
+
+export type WindowHapiUtilsSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiUtils,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiValidationSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiValidations,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiStateSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiState,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiInstancesSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiInstances,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiRoutingSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiRouting,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiAuthSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiAuth,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiEventsSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiEvents,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiUISubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiUI,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiAPISubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiAPI,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiSDKSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiSDK,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiServiceSubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiService,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiQASubmodule = WindowHapiModuleWithConstructorArgs<
+    WindowHapiQA,
+    { readonly core: WindowHapiClassInterface }
+>
+
+export type WindowHapiConfigSubmodule = {
+    apiHost: string
+    initialState: RecursivePartial<any>
+    partnerId: string
+    clientId: string
+    clientToken: string
+    loadingSpinnerDefaultFillColor: string
+    appOrigin: string
+    enableLogs: boolean
+    webComponents: HapiWebComponent[]
+    isInvalidToken: boolean
+    useJWTAuthHeaders: boolean
+    addModal: boolean
+    addAlertBar: boolean
+    addDebugPanel: boolean
+    debugPanelPosition: DebugPanelPosition
+    datadogClientToken: string
+    env: string
+    appVersion: string
+    testMode: boolean
+    debugMode: boolean
+    htmlTemplates: Record<string, string>
+}
+
+export type WindowHapiClassInterface = {
+    logger: WindowHapiLogger
+    utils: WindowHapiUtilsSubmodule
+    validation: WindowHapiValidationSubmodule
+    state: WindowHapiStateSubmodule
+    instances: WindowHapiInstancesSubmodule
+    routing: WindowHapiRoutingSubmodule
+    auth: WindowHapiAuthSubmodule
+    events: WindowHapiEventsSubmodule
+    ui: WindowHapiUISubmodule
+    api: WindowHapiAPISubmodule
+    sdk: WindowHapiSDKSubmodule
+    service: WindowHapiServiceSubmodule
+    instance: WindowHapiInstance
+    qa: WindowHapiQASubmodule
+}
 
 export type WindowHapi = {
-    logger: Logger
-    utils: ModuleWithConstructorArgs<
-        WindowHapiUtils,
-        { readonly core: WindowHapi }
-    >
-    validation: ModuleWithConstructorArgs<
-        WindowHapiValidations,
-        { readonly core: WindowHapi }
-    >
-    state: ModuleWithConstructorArgs<
-        WindowHapiState,
-        { readonly core: WindowHapi }
-    >
-    instances: ModuleWithConstructorArgs<
-        WindowHapiInstances,
-        { readonly core: WindowHapi }
-    >
-    routing: ModuleWithConstructorArgs<
-        WindowHapiRouting,
-        { readonly core: WindowHapi }
-    >
-    auth: ModuleWithConstructorArgs<
-        WindowHapiAuth,
-        { readonly core: WindowHapi }
-    >
-    events: ModuleWithConstructorArgs<
-        WindowHapiEvents,
-        { readonly core: WindowHapi }
-    >
-    ui: ModuleWithConstructorArgs<WindowHapiUI, { readonly core: WindowHapi }>
-    api: ModuleWithConstructorArgs<WindowHapiAPI, { readonly core: WindowHapi }>
-    sdk: ModuleWithConstructorArgs<WindowHapiSDK, { readonly core: WindowHapi }>
-    service: ModuleWithConstructorArgs<
-        WindowHapiService,
-        { readonly core: WindowHapi }
-    >
-    instance: HapiInstance
-    qa: ModuleWithConstructorArgs<WindowHapiQA, { readonly core: WindowHapi }>
+    [WindowHapiSubmoduleName.api]: WindowHapiAPISubmodule
+    [WindowHapiSubmoduleName.auth]: WindowHapiAuthSubmodule
+    [WindowHapiSubmoduleName.config]: WindowHapiConfigSubmodule
+    [WindowHapiSubmoduleName.instances]: WindowHapiInstancesSubmodule
+    [WindowHapiSubmoduleName.qa]: WindowHapiQASubmodule
+    [WindowHapiSubmoduleName.routing]: WindowHapiRoutingSubmodule
+    [WindowHapiSubmoduleName.sdk]: WindowHapiSDKSubmodule
+    [WindowHapiSubmoduleName.service]: WindowHapiServiceSubmodule
+    [WindowHapiSubmoduleName.state]: WindowHapiStateSubmodule
+    [WindowHapiSubmoduleName.ui]: WindowHapiUISubmodule
+    [WindowHapiSubmoduleName.utils]: WindowHapiUtilsSubmodule
+    [WindowHapiSubmoduleName.validation]: WindowHapiValidationSubmodule
+    [WindowHapiSubmoduleName.events]: WindowHapiEventsSubmodule
+    [WindowHapiSubmoduleName.instance]: WindowHapiInstance
 }

package/src/alert/index.ts

@@ -1,9 +1,6 @@
 // created from 'create-ts-index'
 
-export * from './enums';
-export * from './functions.types';
-export * from './service.types';
-export * from './state.initial';
-export * from './state.types';
-export * from './state.validations';
-export * from './types';
+export * from "./enums"
+export * from "./service.types"
+export * from "./state.types"
+export * from "./types"

package/src/alert/service.types.ts

@@ -1,9 +1,9 @@
 import { AlertKey } from "./enums"
 import { AlertOptions } from "./types"
-import { ModuleWithConstructorArgs } from "../types"
 import { WindowHapiService } from "../_window/service.types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
-export type WindowHapiServiceAlert = ModuleWithConstructorArgs<
+export type WindowHapiServiceAlert = WindowHapiModuleWithConstructorArgs<
     {
         show: (
             key: AlertKey,

package/src/alert/state.types.ts

@@ -1,27 +1,9 @@
 import { Alert, AlertOptions } from "./types"
-export type AlertStoreState = {
-    /**
-     * List of alert objects to be shown
-     */
+export type AlertState = {
     alerts: Alert[]
-    /**
-     * Default options object for Toast (Snack) notifications. Contains options like duration, show/hide close button, position.
-     */
     defaultOptions: AlertOptions
-    /**
-     * Extends default options and sets the type to "success".  **This value is a computed getter meaning that it cannot be set from outside**
-     */
     successOptions: AlertOptions | null
-    /**
-     * Extends default options and sets the type to "info".  **This value is a computed getter meaning that it cannot be set from outside**
-     */
     infoOptions: AlertOptions | null
-    /**
-     * Extends default options and sets the type to "warning".  **This value is a computed getter meaning that it cannot be set from outside**
-     */
     warningOptions: AlertOptions | null
-    /**
-     * Extends default options and sets the type to "error".  **This value is a computed getter meaning that it cannot be set from outside**
-     */
     errorOptions: AlertOptions | null
 }

package/src/ats/api.types.ts

@@ -1,7 +1,7 @@
 import { AxiosRequestConfig } from "axios/index"
 import { ATSSettings } from "./types"
 import { WindowHapiAPI, WindowHapiAPIModule } from "../_window/api.types"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
 export type WindowHapiAPIATSConfigs = {
     getUserSettings: AxiosRequestConfig<any>
@@ -10,7 +10,7 @@ export type WindowHapiAPIATSConfigs = {
 export type WindowHapiAPIATSRequests = {
     getUserSettings: () => Promise<ATSSettings>
 }
-export type WindowHapiAPIATS = ModuleWithConstructorArgs<
+export type WindowHapiAPIATS = WindowHapiModuleWithConstructorArgs<
     WindowHapiAPIModule<WindowHapiAPIATSRequests, WindowHapiAPIATSConfigs>,
     { readonly api: WindowHapiAPI }
 >

package/src/ats/index.ts

@@ -1,9 +1,6 @@
 // created from 'create-ts-index'
 
-export * from './api.types';
-export * from './functions.types';
-export * from './service.types';
-export * from './state.initial';
-export * from './state.types';
-export * from './state.validations';
-export * from './types';
+export * from "./api.types"
+export * from "./service.types"
+export * from "./state.types"
+export * from "./types"

package/src/ats/service.types.ts

@@ -3,13 +3,13 @@ import {
     WindowHapiService,
 } from "../_window/service.types"
 import { ATSSettings } from "./types"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
 export type ATSServiceGetUserSettingsHandler = () => Promise<
     ATSSettings | undefined
 >
 
-export type WindowHapiServiceATS = ModuleWithConstructorArgs<
+export type WindowHapiServiceATS = WindowHapiModuleWithConstructorArgs<
     {
         getUserSettings: HapiServiceFunctionWithLifecycleHooks<ATSServiceGetUserSettingsHandler>
     },

package/src/ats/state.types.ts

@@ -1,5 +1,5 @@
 import { ATSSettings } from "./types"
 
-export type ATSStoreState = {
+export type ATSState = {
     userSettings: ATSSettings | null
 }

package/src/basket/index.ts

@@ -1,12 +1,7 @@
 // created from 'create-ts-index'
 
-export * from './consts';
-export * from './functions.types';
-export * from './service.types';
-export * from './state.initial';
-export * from './state.types';
-export * from './state.validations';
-export * from './types';
-export * from './utils';
-export * from './utils.types';
-export * from './validations.types';
+export * from "./service.types"
+export * from "./state.types"
+export * from "./types"
+export * from "./utils.types"
+export * from "./validations.types"

package/src/basket/service.types.ts

@@ -5,7 +5,7 @@ import {
     HapiServiceFunctionWithLifecycleHooks,
     WindowHapiService,
 } from "../_window/service.types"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
 export type BasketServiceGetProductsHandler = () => Promise<
     (Product | Contract)[]
@@ -18,7 +18,7 @@ export type BasketServiceRemoveProductOrContractByIdHandler = (
     contractOrProductId: string,
 ) => void
 
-export type WindowHapiServiceBasket = ModuleWithConstructorArgs<
+export type WindowHapiServiceBasket = WindowHapiModuleWithConstructorArgs<
     {
         setBasketProductsAndMetaByItemData: (
             basketItemData: (Contract | Product)[],

package/src/basket/state.types.ts

@@ -2,7 +2,7 @@ import { Product } from "../product/types"
 import { BasketProduct } from "./types"
 import { Contract } from "../contract/types"
 
-export type BasketStoreState = {
+export type BasketState = {
     /**
      * Array of `BasketProduct`s. The price or other properties of a Product or Contract may change therefore this variable only contains ID of Product or Contract and whether it is a Product or not; via the `isProduct: boolean` variable. Elements of this array then are fetched from the API with their latest information and then set as `products`.
      */

package/src/basket/utils.types.ts

@@ -1,8 +1,8 @@
 import { BasketProduct } from "./types"
-import { ModuleWithConstructorArgs } from "../types"
 import { WindowHapiUtils } from "../_window/utils.types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
-export type WindowHapiUtilsBasket = ModuleWithConstructorArgs<
+export type WindowHapiUtilsBasket = WindowHapiModuleWithConstructorArgs<
     {
         getInitialBasketProductsMeta: () => BasketProduct[]
     },

package/src/campaign/api.types.ts

@@ -7,7 +7,7 @@ import {
 import { ProductSupportingContractsComplete } from "../product/types"
 import { WindowHapiAPI, WindowHapiAPIModule } from "../_window/api.types"
 import { PaginatedAPIResponseV2 } from "../common/types"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
 export type WindowHapiAPICampaignConfigs = {
     getCampaigns: AxiosRequestConfig
@@ -36,7 +36,7 @@ export type WindowHapiAPICampaignRequests = {
     getSeniorities: () => Promise<TaxonomyEducationAndSeniorityLevel[]>
     orderCampaign: (postBody: CampaignOrderRequestBody) => Promise<Campaign>
 }
-export type WindowHapiAPICampaign = ModuleWithConstructorArgs<
+export type WindowHapiAPICampaign = WindowHapiModuleWithConstructorArgs<
     WindowHapiAPIModule<
         WindowHapiAPICampaignRequests,
         WindowHapiAPICampaignConfigs

package/src/campaign/index.ts

@@ -1,15 +1,10 @@
 // created from 'create-ts-index'
 
-export * from './api.types';
-export * from './consts';
-export * from './enums';
-export * from './functions.types';
-export * from './qa.types';
-export * from './service.types';
-export * from './state.initial';
-export * from './state.types';
-export * from './state.validations';
-export * from './types';
-export * from './utils';
-export * from './utils.types';
-export * from './validations.types';
+export * from "./api.types"
+export * from "./enums"
+export * from "./qa.types"
+export * from "./service.types"
+export * from "./state.types"
+export * from "./types"
+export * from "./utils.types"
+export * from "./validations.types"

package/src/campaign/qa.types.ts

@@ -1,10 +1,10 @@
-import { MockCampaignCreateForm } from "../consts"
-import { ModuleWithConstructorArgs } from "../types"
 import { WindowHapiQA } from "../_window/qa.types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
+import { CampaignCreateForm } from "./types"
 
-export type WindowHapiQACampaign = ModuleWithConstructorArgs<
+export type WindowHapiQACampaign = WindowHapiModuleWithConstructorArgs<
     {
-        useMockCampaignForm: () => MockCampaignCreateForm
+        useMockCampaignForm: () => CampaignCreateForm
         getRandomCampaignId: () => Promise<string>
         setCampaignFormDebuggerIsShown: (isEnabled: boolean) => boolean
     },

package/src/campaign/service.types.ts

@@ -5,7 +5,7 @@ import {
 import { ProductSupportingContractsComplete } from "../product/types"
 import { Campaign, TaxonomyEducationAndSeniorityLevel } from "./types"
 import { PaginatedAPIResponseV2 } from "../common/types"
-import { ModuleWithConstructorArgs } from "../types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
 export type CampaignServiceGetCampaignsHandler = (
     offset?: number,
@@ -33,7 +33,7 @@ export type CampaignServiceCopyCampaignHandler = (
     campaign: Campaign,
 ) => Promise<Campaign>
 
-export type WindowHapiServiceCampaign = ModuleWithConstructorArgs<
+export type WindowHapiServiceCampaign = WindowHapiModuleWithConstructorArgs<
     {
         getCampaigns: HapiServiceFunctionWithLifecycleHooks<CampaignServiceGetCampaignsHandler>
         getCampaignDetail: HapiServiceFunctionWithLifecycleHooks<CampaignServiceGetCampaignDetailHandler>

package/src/campaign/state.types.ts

@@ -7,7 +7,7 @@ import {
 } from "./types"
 import { PaginationResponseV2 } from "../common/types"
 
-export type CampaignStoreState = {
+export type CampaignState = {
     /* Campaign */
     /**
      * Array of Campaign Objects for listing in Campaigns Landing and Campaigns List (both Card and Accordion Table Layout) widgets

package/src/campaign/utils.types.ts

@@ -14,11 +14,11 @@ import {
 } from "./types"
 import { Product } from "../product/types"
 import { Contract } from "../contract/types"
-import { ModuleWithConstructorArgs } from "../types"
 import { BasketProduct } from "../basket/types"
 import { WindowHapiUtils } from "../_window/utils.types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
-export type WindowHapiUtilsCampaign = ModuleWithConstructorArgs<
+export type WindowHapiUtilsCampaign = WindowHapiModuleWithConstructorArgs<
     {
         getInitialCampaignForm: () => CampaignCreateForm
         mapCampaignsAndUpdateById: (

package/{enums.ts → src/common/enums.ts}

@@ -1,4 +1,4 @@
-export enum WindowHapiCoreModuleName {
+export enum WindowHapiSubmoduleName {
     "api" = "hapiApi",
     auth = "hapiAuth",
     config = "hapiConfig",
@@ -11,6 +11,7 @@ export enum WindowHapiCoreModuleName {
     ui = "hapiUI",
     utils = "hapiUtils",
     validation = "hapiValidation",
+    events = "hapiEvents",
     instance = "hapiInstance",
 }
 

package/src/common/events/types.ts

@@ -3,8 +3,8 @@ import {
     WindowHapiEventCommandNames,
     WindowHapiEventCommandStatus,
 } from "./EventCommand/types"
-import { Logger } from "../logger/Logger"
-import HapiInstance from "../instances/Instance"
+import { WindowHapiInstance } from "../../_window"
+import { WindowHapiLogger } from "../logger/types"
 
 export type WindowHapiEventStrategy = {
     handleEvent: (
@@ -13,8 +13,8 @@ export type WindowHapiEventStrategy = {
 }
 
 export type WindowHapiEventMediatorInstances = {
-    source: HapiInstance
-    targets: HapiInstance[]
+    source: WindowHapiInstance
+    targets: WindowHapiInstance[]
 }
 
 export type WindowHapiEventMediatorGetInstancesHandler =
@@ -26,8 +26,8 @@ export type WindowHapiEventCommand = {
     createdAt: string
     updatedAt: string | undefined
     status: WindowHapiEventCommandStatus
-    logger: Logger
-    instance?: HapiInstance
+    logger: WindowHapiLogger
+    instance?: WindowHapiInstance
     data: WindowHapiEventCommandData | undefined
     sourceInstanceName: string
     targetInstancesNames: string[]

package/src/common/index.ts

@@ -1,22 +1,7 @@
 // created from 'create-ts-index'
 
-export * from './events';
-export * from './instances';
-export * from './logger';
-export * from './logger-datadog';
-export * from './LocalStorage';
-export * from './browser';
-export * from './color';
-export * from './immutable';
-export * from './json';
-export * from './misc';
-export * from './promise';
-export * from './proxy';
-export * from './qa.types';
-export * from './regExTest';
-export * from './tree';
-export * from './types';
-export * from './utm';
-export * from './validations.types';
-export * from './validators';
-export * from './webComponents';
+export * from "./events"
+export * from "./qa.types"
+export * from "./types"
+export * from "./validations.types"
+export * from "./enums"

package/src/common/logger/types.ts

@@ -5,3 +5,14 @@ export type LogOutput = (
     level: LogLevel,
     ...objects: any[]
 ) => void
+
+export type WindowHapiLogger = {
+    id: string
+    setIsEnabled: (isEnabled: boolean) => void
+    debug: (...objects: any[]) => void
+    info: (...objects: any[]) => void
+    warn: (...objects: any[]) => void
+    error: (...objects: any[]) => void
+    timeStart: (message: string) => void
+    timeEnd: (message: string) => void
+}

package/src/common/qa.types.ts

@@ -1,7 +1,7 @@
-import { ModuleWithConstructorArgs } from "../types"
 import { WindowHapiQA } from "../_window/qa.types"
+import { WindowHapiModuleWithConstructorArgs } from "../_window"
 
-export type WindowHapiQACommon = ModuleWithConstructorArgs<
+export type WindowHapiQACommon = WindowHapiModuleWithConstructorArgs<
     {
         setComponentDebuggingIsEnabled: (isEnabled: boolean) => boolean
     },