use provider module of inversify in background script

src/background/clients/AddonEnabledClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 
 export interface AddonEnabledClient {
@@ -9,7 +9,7 @@ export interface AddonEnabledClient {
 
 export const AddonEnabledClient = Symbol("AddonEnabledClient");
 
-@injectable()
+@provide(AddonEnabledClient)
 export class AddonEnabledClientImpl implements AddonEnabledClient {
   async enable(tabId: number): Promise<void> {
     const sender = newSender(tabId);

src/background/clients/ConsoleClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ConsoleMessageSender";
 
 export interface ConsoleClient {
@@ -15,7 +15,7 @@ export interface ConsoleClient {
 
 export const ConsoleClient = Symbol("ConsoleClient");
 
-@injectable()
+@provide(ConsoleClient)
 export class ConsoleClientImpl implements ConsoleClient {
   async showCommand(tabId: number, command: string): Promise<void> {
     const sender = newSender(tabId);

src/background/clients/ConsoleFrameClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 
 export interface ConsoleFrameClient {
@@ -7,7 +7,7 @@ export interface ConsoleFrameClient {
 
 export const ConsoleFrameClient = Symbol("ConsoleFrameClient");
 
-@injectable()
+@provide(ConsoleFrameClient)
 export class ConsoleFrameClientImpl implements ConsoleFrameClient {
   async resize(tabId: number, width: number, height: number): Promise<void> {
     const sender = newSender(tabId);

src/background/clients/ContentMessageClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 
 export interface ContentMessageClient {
@@ -42,7 +42,7 @@ export interface ContentMessageClient {
 
 export const ContentMessageClient = Symbol("ContentMessageClient");
 
-@injectable()
+@provide(ContentMessageClient)
 export class ContentMessageClientImpl implements ContentMessageClient {
   async scrollTo(
     tabId: number,

src/background/clients/FindClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 import type { FindQuery } from "../../shared/findQuery";
 
@@ -12,7 +12,7 @@ export interface FindClient {
 
 export const FindClient = Symbol("FindClient");
 
-@injectable()
+@provide(FindClient)
 export class FindClientImpl implements FindClient {
   async findNext(
     tabId: number,

src/background/clients/FrameClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 
 export interface FrameClient {
@@ -7,7 +7,7 @@ export interface FrameClient {
 
 export const FrameClient = Symbol("FrameClient");
 
-@injectable()
+@provide(FrameClient)
 export class FrameClientImpl implements FrameClient {
   async notifyFrameId(tabId: number, frameId: number): Promise<void> {
     const sender = newSender(tabId, frameId);

src/background/clients/HintClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 import type { HTMLElementType } from "../../shared/HTMLElementType";
 
@@ -44,7 +44,7 @@ export interface HintClient {
 
 export const HintClient = Symbol("HintClient");
 
-@injectable()
+@provide(HintClient)
 export class HintClientImpl implements HintClient {
   async lookupTargets(
     tabId: number,

src/background/clients/ModeClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 import type { Mode } from "../../shared/mode";
 
@@ -8,7 +8,7 @@ export interface ModeClient {
 
 export const ModeClient = Symbol("ModeClient");
 
-@injectable()
+@provide(ModeClient)
 export class ModeClientImpl implements ModeClient {
   async setMode(tabId: number, mode: Mode): Promise<void> {
     const sender = newSender(tabId);

src/background/clients/NavigateClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 
 export interface NavigateClient {
@@ -13,7 +13,7 @@ export interface NavigateClient {
 
 export const NavigateClient = Symbol("NavigateClient");
 
-@injectable()
+@provide(NavigateClient)
 export class NavigateClientImpl implements NavigateClient {
   async historyNext(tabId: number): Promise<void> {
     const sender = newSender(tabId);

src/background/clients/TopFrameClient.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { newSender } from "./ContentMessageSender";
 
 export type Rect = {
@@ -19,7 +19,7 @@ export interface TopFrameClient {
 
 export const TopFrameClient = Symbol("TopFrameClient");
 
-@injectable()
+@provide(TopFrameClient)
 export class TopFrameClientImpl implements TopFrameClient {
   getWindowViewport(tabId: number): Promise<Rect> {
     const sender = newSender(tabId, 0);

src/background/di.ts

@@ -1,116 +1,55 @@
 /* eslint-disable max-len */
 
 import { Container } from "inversify";
-import {
-  LastSelectedTabRepository,
-  LastSelectedTabRepositoryImpl,
-} from "./repositories/LastSelectedTabRepository";
-import { Notifier, NotifierImpl } from "./presenters/Notifier";
-import {
-  ContentMessageClient,
-  ContentMessageClientImpl,
-} from "./clients/ContentMessageClient";
-import { NavigateClient, NavigateClientImpl } from "./clients/NavigateClient";
-import { ConsoleClient, ConsoleClientImpl } from "./clients/ConsoleClient";
+import { buildProviderModule } from "inversify-binding-decorators";
 import {
   BrowserSettingRepository,
   FirefoxBrowserSettingRepositoryImpl,
   ChromeBrowserSettingRepositoryImpl,
 } from "./repositories/BrowserSettingRepository";
-import {
-  RepeatRepository,
-  RepeatRepositoryImpl,
-} from "./repositories/RepeatRepository";
-import { FindClient, FindClientImpl } from "./clients/FindClient";
-import {
-  ConsoleFrameClient,
-  ConsoleFrameClientImpl,
-} from "./clients/ConsoleFrameClient";
-import {
-  FindRepository,
-  FindRepositoryImpl,
-} from "./repositories/FindRepository";
-import {
-  FindHistoryRepository,
-  FindHistoryRepositoryImpl,
-} from "./repositories/FindHistoryRepository";
-import {
-  ReadyFrameRepository,
-  ReadyFrameRepositoryImpl,
-} from "./repositories/ReadyFrameRepository";
 import {
   ClipboardRepository,
   FirefoxClipboardRepositoryImpl,
   ChromeClipboardRepositoryImpl,
 } from "./repositories/ClipboardRepository";
-import {
-  PropertySettings,
-  PropertySettingsImpl,
-} from "./settings/PropertySettings";
-import { StyleSettings, StyleSettingsImpl } from "./settings/StyleSettings";
-import {
-  SearchEngineSettings,
-  SearchEngineSettingsImpl,
-} from "./settings/SearchEngineSettings";
-import {
-  ModeRepository,
-  ModeRepositoryImpl,
-} from "./repositories/ModeRepository";
-import {
-  SettingsRepository,
-  PermanentSettingsRepository,
-  TransientSettingsRepositoryImpl,
-  PermanentSettingsRepositoryImpl,
-} from "./settings/SettingsRepository";
-import { ModeClient, ModeClientImpl } from "./clients/ModeClient";
-import {
-  MarkRepository,
-  MarkRepositoryImpl,
-} from "./repositories/MarkRepository";
-import { HintClient, HintClientImpl } from "./clients/HintClient";
-import {
-  HintRepository,
-  HintRepositoryImpl,
-} from "./repositories/HintRepository";
-import { FrameClient, FrameClientImpl } from "./clients/FrameClient";
-import { TopFrameClient, TopFrameClientImpl } from "./clients/TopFrameClient";
-import {
-  AddonEnabledRepository,
-  AddonEnabledRepositoryImpl,
-} from "./repositories/AddonEnabledRepository";
-import {
-  AddonEnabledClient,
-  AddonEnabledClientImpl,
-} from "./clients/AddonEnabledClient";
-import {
-  ToolbarPresenter,
-  ToolbarPresenterImpl,
-} from "./presenters/ToolbarPresenter";
-import { TabPresenter, TabPresenterImpl } from "./presenters/TabPresenter";
 import { createPropertyRegistry } from "./property";
-import { PropertyRegistry } from "./property/PropertyRegistry";
 import { CommandRegistryFactory } from "./command";
 import { CommandRegistry } from "./command/CommandRegistry";
 import { OperatorRegistryFactory } from "./operators";
 import { OperatorRegistry } from "./operators/OperatorRegistry";
-import {
-  HintActionFactory,
-  HintActionFactoryImpl,
-} from "./hint/HintActionFactory";
+import { PropertyRegistry } from "./property/PropertyRegistry";
+import "./clients/AddonEnabledClient";
+import "./clients/ConsoleClient";
+import "./clients/ConsoleFrameClient";
+import "./clients/ContentMessageClient";
+import "./clients/FindClient";
+import "./clients/FrameClient";
+import "./clients/HintClient";
+import "./clients/ModeClient";
+import "./clients/NavigateClient";
+import "./clients/TopFrameClient";
+import "./hint/HintActionFactory";
+import "./presenters/Notifier";
+import "./presenters/TabPresenter";
+import "./presenters/ToolbarPresenter";
+import "./repositories/AddonEnabledRepository";
+import "./repositories/FindHistoryRepository";
+import "./repositories/FindRepository";
+import "./repositories/HintRepository";
+import "./repositories/LastSelectedTabRepository";
+import "./repositories/MarkRepository";
+import "./repositories/ModeRepository";
+import "./repositories/ReadyFrameRepository";
+import "./repositories/RepeatRepository";
+import "./settings/PropertySettings";
+import "./settings/SearchEngineSettings";
+import "./settings/SettingsRepository";
+import "./settings/StyleSettings";
 
 const container = new Container({ autoBindInjectable: true });
 
-container.bind(LastSelectedTabRepository).to(LastSelectedTabRepositoryImpl);
-container.bind(Notifier).to(NotifierImpl);
-container.bind(RepeatRepository).to(RepeatRepositoryImpl);
-container.bind(FindRepository).to(FindRepositoryImpl);
-container.bind(FindHistoryRepository).to(FindHistoryRepositoryImpl);
-container.bind(FindClient).to(FindClientImpl);
-container.bind(ContentMessageClient).to(ContentMessageClientImpl);
-container.bind(NavigateClient).to(NavigateClientImpl);
-container.bind(ConsoleClient).to(ConsoleClientImpl);
-container.bind(ConsoleFrameClient).to(ConsoleFrameClientImpl);
-container.bind(ReadyFrameRepository).to(ReadyFrameRepositoryImpl);
+container.load(buildProviderModule());
+
 if (process.env.BROWSER === "firefox") {
   container.bind(ClipboardRepository).to(FirefoxClipboardRepositoryImpl);
   container
@@ -122,23 +61,6 @@ if (process.env.BROWSER === "firefox") {
     .bind(BrowserSettingRepository)
     .to(ChromeBrowserSettingRepositoryImpl);
 }
-container.bind(PropertySettings).to(PropertySettingsImpl);
-container.bind(StyleSettings).to(StyleSettingsImpl);
-container.bind(SearchEngineSettings).to(SearchEngineSettingsImpl);
-container.bind(ModeRepository).to(ModeRepositoryImpl);
-container.bind(MarkRepository).to(MarkRepositoryImpl);
-container.bind(ModeClient).to(ModeClientImpl);
-container.bind(HintClient).to(HintClientImpl);
-container.bind(HintRepository).to(HintRepositoryImpl);
-container.bind(FrameClient).to(FrameClientImpl);
-container.bind(TopFrameClient).to(TopFrameClientImpl);
-container.bind(AddonEnabledRepository).to(AddonEnabledRepositoryImpl);
-container.bind(AddonEnabledClient).to(AddonEnabledClientImpl);
-container.bind(ToolbarPresenter).to(ToolbarPresenterImpl);
-container.bind(TabPresenter).to(TabPresenterImpl);
-container.bind(PermanentSettingsRepository).to(PermanentSettingsRepositoryImpl);
-container.bind(SettingsRepository).to(TransientSettingsRepositoryImpl);
-container.bind(HintActionFactory).to(HintActionFactoryImpl);
 container.bind(PropertyRegistry).toConstantValue(createPropertyRegistry());
 container
   .bind(CommandRegistry)

src/background/hint/HintActionFactory.ts

@@ -1,4 +1,5 @@
-import { injectable, inject } from "inversify";
+import { inject } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { QuickHintAction } from "./QuickHintAction";
 import { OpenImageHintAction } from "./OpenImageHintAction";
 import { YankURLHintAction } from "./YankURLHintAction";
@@ -18,7 +19,7 @@ export interface HintActionFactory {
 
 export const HintActionFactory = Symbol("HintActionFactory");
 
-@injectable()
+@provide(HintActionFactory)
 export class HintActionFactoryImpl implements HintActionFactory {
   constructor(
     @inject(QuickHintAction)

src/background/presenters/Notifier.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 
 const NOTIFICATION_ID_UPDATE = "vimmatic-update";
 
@@ -8,7 +8,7 @@ export interface Notifier {
 
 export const Notifier = Symbol("Notifier");
 
-@injectable()
+@provide(Notifier)
 export class NotifierImpl implements NotifierImpl {
   async notifyUpdated(version: string, onclick: () => void): Promise<void> {
     const title = `Vimmatic ${version} has been installed`;

src/background/presenters/TabPresenter.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 
 export type Tab = chrome.tabs.Tab;
 
@@ -14,7 +14,7 @@ export interface TabPresenter {
 
 export const TabPresenter = Symbol("TabPresenter");
 
-@injectable()
+@provide(TabPresenter)
 export class TabPresenterImpl implements TabPresenter {
   async openToTab(url: string, tabId: number): Promise<void> {
     await chrome.tabs.update(tabId, { url });

src/background/presenters/ToolbarPresenter.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 
 export interface ToolbarPresenter {
   setEnabled(enabled: boolean): Promise<void>;
@@ -8,7 +8,7 @@ export interface ToolbarPresenter {
 
 export const ToolbarPresenter = Symbol("ToolbarPresenter");
 
-@injectable()
+@provide(ToolbarPresenter)
 export class ToolbarPresenterImpl {
   async setEnabled(enabled: boolean): Promise<void> {
     const path = enabled

src/background/repositories/AddonEnabledRepository.ts

@@ -1,4 +1,4 @@
-import { injectable } from "inversify";
+import { provide } from "inversify-binding-decorators";
 import { type LocalCache, LocalCacheImpl } from "../db/LocalStorage";
 
 export interface AddonEnabledRepository {
@@ -21,7 +21,7 @@ const listeners: OnChangeListener[] = [];
 
 export const AddonEnabledRepository = Symbol("AddonEnabledRepository");
 
-@injectable()
+@provide(AddonEnabledRepository)
 export class AddonEnabledRepositoryImpl implements AddonEnabledRepository {
   constructor(
     private readonly cache: LocalCache<boolean> = new LocalCacheImpl<boolean>(