🐛 fix: edit.use-case.ts, committier.ts

Author: iamyoki

src/application/use-cases/edit.use-case.ts

@@ -1,15 +1,23 @@
 import type { CommitMsgFileInterface } from "../interfaces/commit-msg-file.interface.ts";
 import type { FormatUseCase } from "./format.use-case.ts";
+import type { GetCommitFilesUseCase } from "./get-commit-files.use-case.ts";
 
 export class EditUseCase {
   constructor(
     private readonly formatUseCase: FormatUseCase,
     private readonly commitMsgFile: CommitMsgFileInterface,
+    private readonly getCommitFilesUseCase: GetCommitFilesUseCase,
   ) {}
 
   async execute(commitMsgFilePath: string): Promise<void> {
+    const commitFiles = await this.getCommitFilesUseCase.execute({
+      commitables: true,
+    });
     const rawMessage = await this.commitMsgFile.read(commitMsgFilePath);
-    const finalMessage = await this.formatUseCase.execute({ rawMessage });
+    const finalMessage = await this.formatUseCase.execute({
+      rawMessage,
+      commitFiles,
+    });
     await this.commitMsgFile.write(finalMessage);
   }
 }

src/bin/committier.ts

@@ -46,7 +46,17 @@ npx --no -- committier edit $1`,
       const configService = new ConfigService(configLoader);
       const config = await configService.getConfig();
       const format = new FormatUseCase(config);
-      const edit = new EditUseCase(format, commitMsgFile);
+      const commitFileRepository = new GitCommitFileRepository(
+        !!config.autoScope || !!config.defaultDescription,
+      );
+      const getCommitFilesUseCase = new GetCommitFilesUseCase(
+        commitFileRepository,
+      );
+      const edit = new EditUseCase(
+        format,
+        commitMsgFile,
+        getCommitFilesUseCase,
+      );
       await edit.execute(filePath);
     },
   )
@@ -73,7 +83,7 @@ npx --no -- committier edit $1`,
       const config = await configService.getConfig();
       const format = new FormatUseCase(config);
       const commitFileRepository = new GitCommitFileRepository(
-        !!config.autoScope,
+        !!config.autoScope || !!config.defaultDescription,
       );
       const getCommitFilesUseCase = new GetCommitFilesUseCase(
         commitFileRepository,