refactor: rename to AccountModuleFacade

pkg/intermodule/adaptor/account.ts → pkg/intermodule/account.ts

@@ -1,13 +1,20 @@
 import { Result } from '@mikuroxina/mini-fn';
-import type { Account, AccountID } from '../../accounts/model/account.js';
-import type { FetchService } from '../../accounts/service/fetch.js';
-import type { FetchFollowService } from '../../accounts/service/fetchFollow.js';
 import type {
-  AccountModuleFacade,
-  PartialAccount,
-} from '../interfaces/account.js';
+  Account,
+  AccountID,
+  AccountName,
+} from '../accounts/model/account.js';
+import type { FetchService } from '../accounts/service/fetch.js';
+import type { FetchFollowService } from '../accounts/service/fetchFollow.js';
 
-export class AccountModule implements AccountModuleFacade {
+export interface PartialAccount {
+  id: AccountID;
+  name: AccountName;
+  nickname: string;
+  bio: string;
+}
+
+export class AccountModuleFacade {
   constructor(
     private readonly fetchService: FetchService,
     private readonly fetchFollowService: FetchFollowService,

pkg/intermodule/adaptor/timeline.ts → pkg/intermodule/timeline.ts

@@ -1,8 +1,8 @@
 import { Result } from '@mikuroxina/mini-fn';
-import type { Note } from '../../notes/model/note.js';
-import type { PushTimelineService } from '../../timeline/service/push.js';
+import type { Note } from '../notes/model/note.js';
+import type { PushTimelineService } from '../timeline/service/push.js';
 
-export class TimelineModule {
+export class TimelineModuleFacade {
   constructor(private readonly pushTimelineService: PushTimelineService) {}
 
   /*

pkg/notes/adaptor/controller/note.ts

@@ -3,7 +3,7 @@ import { Option, Result } from '@mikuroxina/mini-fn';
 
 import type { AccountID } from '../../../accounts/model/account.js';
 import type { MediumID } from '../../../drive/model/medium.js';
-import type { AccountModuleFacade } from '../../../intermodule/interfaces/account.js';
+import type { AccountModuleFacade } from '../../../intermodule/account.js';
 import type { NoteID, NoteVisibility } from '../../model/note.js';
 import type { CreateService } from '../../service/create.js';
 import type { FetchService } from '../../service/fetch.js';

pkg/notes/mod.ts

@@ -21,7 +21,7 @@ import {
 import { prismaClient } from '../adaptors/prisma.js';
 import { SnowflakeIDGenerator } from '../id/mod.js';
 import type { ID } from '../id/type.js';
-import { AccountModule } from '../intermodule/adaptor/account.js';
+import { AccountModuleFacade } from '../intermodule/account.js';
 import { BookmarkController } from './adaptor/controller/bookmark.js';
 import { NoteController } from './adaptor/controller/note.js';
 import {
@@ -91,10 +91,7 @@ const accountFollowRepository = isProduction
   ? prismaFollowRepo(prismaClient)
   : newFollowRepo();
 
-// const accountFetchService = new AccountFetchService(accountRepoObject);
-// const accountFetchFollowservice = new FetchFollowService();
-
-const accountModule = new AccountModule(
+const accountModule = new AccountModuleFacade(
   Ether.runEther(Cat.cat(fetch).feed(Ether.compose(accountRepository)).value),
   Ether.runEther(
     Cat.cat(fetchFollow)

pkg/notes/service/fetch.test.ts

@@ -8,7 +8,7 @@ import {
 import { Account, type AccountID } from '../../accounts/model/account.js';
 import { FetchService as AccountFetchService } from '../../accounts/service/fetch.js';
 import { FetchFollowService } from '../../accounts/service/fetchFollow.js';
-import { AccountModule } from '../../intermodule/adaptor/account.js';
+import { AccountModuleFacade } from '../../intermodule/account.js';
 import { InMemoryNoteRepository } from '../adaptor/repository/dummy.js';
 import { Note, type NoteID } from '../model/note.js';
 import { FetchService } from './fetch.js';
@@ -91,7 +91,7 @@ const accountRepository = new InMemoryAccountRepository([
   frozenAccount,
 ]);
 const accountFollowRepository = new InMemoryAccountFollowRepository();
-const accountModule = new AccountModule(
+const accountModule = new AccountModuleFacade(
   new AccountFetchService(accountRepository),
   new FetchFollowService(accountFollowRepository, accountRepository),
 );

pkg/notes/service/fetch.ts

@@ -1,6 +1,6 @@
 import { Option, Result } from '@mikuroxina/mini-fn';
 
-import type { AccountModuleFacade } from '../../intermodule/interfaces/account.js';
+import type { AccountModuleFacade } from '../../intermodule/account.js';
 import type { Note, NoteID } from '../model/note.js';
 import type { NoteRepository } from '../model/repository.js';
 

pkg/timeline/adaptor/controller/timeline.ts

@@ -2,7 +2,7 @@ import type { z } from '@hono/zod-openapi';
 import { Result } from '@mikuroxina/mini-fn';
 
 import type { Account, AccountID } from '../../../accounts/model/account.js';
-import type { AccountModuleFacade } from '../../../intermodule/interfaces/account.js';
+import type { AccountModuleFacade } from '../../../intermodule/account.js';
 import type { NoteID } from '../../../notes/model/note.js';
 import type { ListID } from '../../model/list.js';
 import type { AccountTimelineService } from '../../service/account.js';

pkg/timeline/mod.ts

@@ -9,7 +9,7 @@ import type { AccountID } from '../accounts/model/account.js';
 import { FetchService as AccountFetchService } from '../accounts/service/fetch.js';
 import { FetchFollowService } from '../accounts/service/fetchFollow.js';
 import { SnowflakeIDGenerator } from '../id/mod.js';
-import { AccountModule } from '../intermodule/adaptor/account.js';
+import { AccountModuleFacade } from '../intermodule/account.js';
 import { Note, type NoteID } from '../notes/model/note.js';
 import { TimelineController } from './adaptor/controller/timeline.js';
 import {
@@ -35,7 +35,7 @@ const idGenerator = new SnowflakeIDGenerator(0, {
 
 const accountRepository = new InMemoryAccountRepository([]);
 const accountFollowRepository = new InMemoryAccountFollowRepository();
-const accountModule = new AccountModule(
+const accountModule = new AccountModuleFacade(
   new AccountFetchService(accountRepository),
   new FetchFollowService(accountFollowRepository, accountRepository),
 );

pkg/timeline/service/account.test.ts

@@ -8,8 +8,8 @@ import {
 import { Account, type AccountID } from '../../accounts/model/account.js';
 import { FetchService as AccountFetchService } from '../../accounts/service/fetch.js';
 import { FetchFollowService } from '../../accounts/service/fetchFollow.js';
-import { AccountModule } from '../../intermodule/adaptor/account.js';
-import type { PartialAccount } from '../../intermodule/interfaces/account.js';
+import { AccountModuleFacade } from '../../intermodule/account.js';
+import type { PartialAccount } from '../../intermodule/account.js';
 import { Note, type NoteID } from '../../notes/model/note.js';
 import { InMemoryTimelineRepository } from '../adaptor/repository/dummy.js';
 import { AccountTimelineService } from './account.js';
@@ -18,7 +18,7 @@ import { NoteVisibilityService } from './noteVisibility.js';
 describe('AccountTimelineService', () => {
   const accountRepository = new InMemoryAccountRepository([]);
   const accountFollowRepository = new InMemoryAccountFollowRepository();
-  const accountModule = new AccountModule(
+  const accountModule = new AccountModuleFacade(
     new AccountFetchService(accountRepository),
     new FetchFollowService(accountFollowRepository, accountRepository),
   );

pkg/timeline/service/noteVisibility.test.ts

@@ -8,7 +8,7 @@ import {
 import type { AccountID } from '../../accounts/model/account.js';
 import { FetchService as AccountFetchService } from '../../accounts/service/fetch.js';
 import { FetchFollowService } from '../../accounts/service/fetchFollow.js';
-import { AccountModule } from '../../intermodule/adaptor/account.js';
+import { AccountModuleFacade } from '../../intermodule/account.js';
 import {
   dummyDirectNote,
   dummyFollowersNote,
@@ -21,7 +21,7 @@ import { NoteVisibilityService } from './noteVisibility.js';
 describe('NoteVisibilityService', () => {
   const accountRepository = new InMemoryAccountRepository([]);
   const accountFollowRepository = new InMemoryAccountFollowRepository();
-  const accountModule = new AccountModule(
+  const accountModule = new AccountModuleFacade(
     new AccountFetchService(accountRepository),
     new FetchFollowService(accountFollowRepository, accountRepository),
   );

pkg/timeline/service/noteVisibility.ts

@@ -1,7 +1,7 @@
 import { Ether, Option, Result } from '@mikuroxina/mini-fn';
 
 import type { AccountID } from '../../accounts/model/account.js';
-import type { AccountModuleFacade } from '../../intermodule/interfaces/account.js';
+import type { AccountModuleFacade } from '../../intermodule/account.js';
 import type { Note } from '../../notes/model/note.js';
 
 export interface NoteVisibilityCheckArgs {

pkg/timeline/service/push.test.ts

@@ -7,7 +7,7 @@ import {
 } from '../../accounts/adaptor/repository/dummy.js';
 import { FetchService as AccountFetchService } from '../../accounts/service/fetch.js';
 import { FetchFollowService } from '../../accounts/service/fetchFollow.js';
-import { AccountModule } from '../../intermodule/adaptor/account.js';
+import { AccountModuleFacade } from '../../intermodule/account.js';
 import { InMemoryTimelineCacheRepository } from '../adaptor/repository/dummyCache.js';
 import { dummyPublicNote, partialAccount1 } from '../testData/testData.js';
 import { NoteVisibilityService } from './noteVisibility.js';
@@ -16,7 +16,7 @@ import { PushTimelineService } from './push.js';
 describe('PushTimelineService', () => {
   const accountRepository = new InMemoryAccountRepository([]);
   const accountFollowRepository = new InMemoryAccountFollowRepository();
-  const accountModule = new AccountModule(
+  const accountModule = new AccountModuleFacade(
     new AccountFetchService(accountRepository),
     new FetchFollowService(accountFollowRepository, accountRepository),
   );

pkg/timeline/service/push.ts

@@ -1,6 +1,6 @@
 import { Result } from '@mikuroxina/mini-fn';
 
-import type { AccountModuleFacade } from '../../intermodule/interfaces/account.js';
+import type { AccountModuleFacade } from '../../intermodule/account.js';
 import type { Note } from '../../notes/model/note.js';
 import type { TimelineNotesCacheRepository } from '../model/repository.js';
 import type { NoteVisibilityService } from './noteVisibility.js';

pkg/timeline/testData/testData.ts

@@ -4,7 +4,7 @@
 import { Option } from '@mikuroxina/mini-fn';
 
 import { Account, type AccountID } from '../../accounts/model/account.js';
-import type { PartialAccount } from '../../intermodule/interfaces/account.js';
+import type { PartialAccount } from '../../intermodule/account.js';
 import { Note, type NoteID } from '../../notes/model/note.js';
 
 export const dummyPublicNote = Note.new({