diff --git a/src/main/modules/App.ts b/src/main/App.ts similarity index 79% rename from src/main/modules/App.ts rename to src/main/App.ts index ff870ba..acde0e4 100644 --- a/src/main/modules/App.ts +++ b/src/main/App.ts @@ -1,8 +1,7 @@ -import { injectable, inject } from "inversify" -import Setting from "./setting" -import DB from "./db" +import { inject } from "inversify" +import Setting from "./modules/setting" +import DB from "./modules/db" -@injectable() class App { private _setting: Setting private _db: DB diff --git a/src/main/base/base.ts b/src/main/base/base.ts index 44849ab..8e1c804 100644 --- a/src/main/base/base.ts +++ b/src/main/base/base.ts @@ -1,3 +1,4 @@ -abstract class Base { - constructor() {} -} +abstract class Base {} + +export { Base } +export default Base diff --git a/src/main/index.ts b/src/main/index.ts index 00dc8e4..34beb5b 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -3,8 +3,8 @@ import { app, shell, BrowserWindow, ipcMain } from "electron" import { join } from "path" import { electronApp, optimizer, is } from "@electron-toolkit/utils" import icon from "res/icon.png?asset" -import { container } from "vc/modules" -import { App } from "vc/modules/App" +import { container } from "vc/modules/ioc" +import { App } from "vc/App" container.get(App).init() diff --git a/src/main/modules/index.ts b/src/main/modules/index.ts deleted file mode 100644 index 19c142e..0000000 --- a/src/main/modules/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Container } from "inversify" -import module from "./module" - -const container = new Container() - -container.load(module) - -export default container -export { container } diff --git a/src/main/modules/module.ts b/src/main/modules/ioc.ts similarity index 63% rename from src/main/modules/module.ts rename to src/main/modules/ioc.ts index da41a5f..b769180 100644 --- a/src/main/modules/module.ts +++ b/src/main/modules/ioc.ts @@ -1,7 +1,8 @@ +import { Container } from "inversify" import { ContainerModule } from "inversify" import { Setting } from "./setting" import { DB } from "./db" -import App from "./App" +import App from "../App" const module = new ContainerModule(bind => { bind(Setting).toConstantValue(new Setting()) @@ -9,5 +10,9 @@ const module = new ContainerModule(bind => { bind(App).toSelf().inSingletonScope() }) -export default module -export { module } +const container = new Container() + +container.load(module) + +export default container +export { container } diff --git a/src/main/modules/setting/index.ts b/src/main/modules/setting/index.ts index 9b0d92c..915dd0c 100644 --- a/src/main/modules/setting/index.ts +++ b/src/main/modules/setting/index.ts @@ -58,7 +58,6 @@ function isEmptyDir(fPath: string) { class Setting { constructor() { console.log(`Setting inited`) - this.#init() } #cb: [IT, IOnFunc][] = []