Better ioctopus type-safety (calcom#23541)

Author: hariombalhara

packages/features/bookings/lib/di/containers/RegularBookingServiceContainer.ts

@@ -1,5 +1,4 @@
-import { createModule } from "@evyweb/ioctopus";
-
+import { createModule } from "@calcom/lib/di/di";
 import { DI_TOKENS } from "@calcom/lib/di/tokens";
 
 import { NoopRedisService } from "../NoopRedisService";

packages/features/bookings/lib/di/modules/RegularBookingServiceModule.ts

@@ -1,9 +1,10 @@
-import { createContainer } from "@evyweb/ioctopus";
-
 import { DI_TOKENS } from "@calcom/lib/di/tokens";
 
-import type { InstantBookingCreateService } from "../modules/InstantBookingCreateServiceModule";
-import { instantBookingCreateServiceModule } from "../modules/InstantBookingCreateServiceModule";
+import { createContainer } from "../../di";
+import {
+  type InstantBookingCreateService,
+  instantBookingCreateServiceModule,
+} from "../modules/InstantBookingCreateService.module";
 
 const container = createContainer();
 container.load(DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE_MODULE, instantBookingCreateServiceModule);

packages/features/redis/di/redisModule.ts

@@ -1,5 +1,3 @@
-import { createContainer } from "@evyweb/ioctopus";
-
 import { bookingRepositoryModule } from "@calcom/lib/di/modules/Booking";
 import { cacheModule } from "@calcom/lib/di/modules/Cache";
 import { checkBookingAndDurationLimitsModule } from "@calcom/lib/di/modules/CheckBookingAndDurationLimits";
@@ -8,8 +6,11 @@ import { featuresRepositoryModule } from "@calcom/lib/di/modules/Features";
 import { DI_TOKENS } from "@calcom/lib/di/tokens";
 import { prismaModule } from "@calcom/prisma/prisma.module";
 
-import type { RecurringBookingService } from "../modules/RecurringBookingServiceModule";
-import { recurringBookingServiceModule } from "../modules/RecurringBookingServiceModule";
+import { createContainer } from "../../di";
+import {
+  type RecurringBookingService,
+  recurringBookingServiceModule,
+} from "../modules/RecurringBookingService.module";
 
 const container = createContainer();
 container.load(DI_TOKENS.PRISMA_MODULE, prismaModule);

…/InstantBookingCreateServiceContainer.ts …InstantBookingCreateService.container.tspackages/features/bookings/lib/di/containers/InstantBookingCreateServiceContainer.ts renamed to packages/lib/di/bookings/containers/InstantBookingCreateService.container.ts packages/features/bookings/lib/di/containers/InstantBookingCreateServiceContainer.ts renamed to packages/lib/di/bookings/containers/InstantBookingCreateService.container.ts

@@ -0,0 +1,13 @@
+import { createContainer } from "../../di";
+import {
+  type RegularBookingService,
+  regularBookingServiceModule,
+} from "../modules/RegularBookingService.module";
+
+const regularBookingServiceContainer = createContainer();
+
+export function getRegularBookingService(): RegularBookingService {
+  regularBookingServiceModule.loadModule(regularBookingServiceContainer);
+
+  return regularBookingServiceContainer.get<RegularBookingService>(regularBookingServiceModule.token);
+}

…ners/RecurringBookingServiceContainer.ts …ers/RecurringBookingService.container.tspackages/features/bookings/lib/di/containers/RecurringBookingServiceContainer.ts renamed to packages/lib/di/bookings/containers/RecurringBookingService.container.ts packages/features/bookings/lib/di/containers/RecurringBookingServiceContainer.ts renamed to packages/lib/di/bookings/containers/RecurringBookingService.container.ts

@@ -1,8 +1,8 @@
-import { createModule } from "@evyweb/ioctopus";
-
 import { InstantBookingCreateService } from "@calcom/features/instant-meeting/handleInstantMeeting";
 import { DI_TOKENS } from "@calcom/lib/di/tokens";
 
+import { createModule } from "../../di";
+
 export const instantBookingCreateServiceModule = createModule();
 
 instantBookingCreateServiceModule

packages/lib/di/bookings/containers/RegularBookingService.container.ts

@@ -1,8 +1,7 @@
-import { createModule } from "@evyweb/ioctopus";
-
+import { RecurringBookingService } from "@calcom/features/bookings/lib/handleNewRecurringBooking";
 import { DI_TOKENS } from "@calcom/lib/di/tokens";
 
-import { RecurringBookingService } from "../../handleNewRecurringBooking";
+import { createModule } from "../../di";
 
 export const recurringBookingServiceModule = createModule();
 

…les/InstantBookingCreateServiceModule.ts …es/InstantBookingCreateService.module.tspackages/features/bookings/lib/di/modules/InstantBookingCreateServiceModule.ts renamed to packages/lib/di/bookings/modules/InstantBookingCreateService.module.ts packages/features/bookings/lib/di/modules/InstantBookingCreateServiceModule.ts renamed to packages/lib/di/bookings/modules/InstantBookingCreateService.module.ts

@@ -0,0 +1,35 @@
+import { RegularBookingService } from "@calcom/features/bookings/lib/handleNewBooking";
+import { moduleLoader as bookingRepositoryModuleLoader } from "@calcom/lib/di/modules/Booking";
+import { moduleLoader as cacheModuleLoader } from "@calcom/lib/di/modules/Cache";
+import { moduleLoader as checkBookingAndDurationLimitsModuleLoader } from "@calcom/lib/di/modules/CheckBookingAndDurationLimits";
+import { moduleLoader as checkBookingLimitsModuleLoader } from "@calcom/lib/di/modules/CheckBookingLimits";
+import { moduleLoader as featuresRepositoryModuleLoader } from "@calcom/lib/di/modules/Features";
+import { DI_TOKENS } from "@calcom/lib/di/tokens";
+import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+
+import { bindModuleToClassOnToken, createModule } from "../../di";
+
+const thisModule = createModule();
+const token = DI_TOKENS.REGULAR_BOOKING_SERVICE;
+const moduleToken = DI_TOKENS.REGULAR_BOOKING_SERVICE_MODULE;
+const loadModule = bindModuleToClassOnToken({
+  module: thisModule,
+  moduleToken,
+  token,
+  classs: RegularBookingService,
+  depsMap: {
+    cacheService: cacheModuleLoader,
+    checkBookingAndDurationLimitsService: checkBookingAndDurationLimitsModuleLoader,
+    prismaClient: prismaModuleLoader,
+    bookingRepository: bookingRepositoryModuleLoader,
+    featuresRepository: featuresRepositoryModuleLoader,
+    checkBookingLimitsService: checkBookingLimitsModuleLoader,
+  },
+});
+
+export const regularBookingServiceModule = {
+  token,
+  loadModule,
+};
+
+export type { RegularBookingService };

…modules/RecurringBookingServiceModule.ts …odules/RecurringBookingService.module.tspackages/features/bookings/lib/di/modules/RecurringBookingServiceModule.ts renamed to packages/lib/di/bookings/modules/RecurringBookingService.module.ts packages/features/bookings/lib/di/modules/RecurringBookingServiceModule.ts renamed to packages/lib/di/bookings/modules/RecurringBookingService.module.ts

@@ -0,0 +1,8 @@
+export const BOOKING_DI_TOKENS = {
+  REGULAR_BOOKING_SERVICE: Symbol("RegularBookingService"),
+  REGULAR_BOOKING_SERVICE_MODULE: Symbol("RegularBookingServiceModule"),
+  RECURRING_BOOKING_SERVICE: Symbol("RecurringBookingService"),
+  RECURRING_BOOKING_SERVICE_MODULE: Symbol("RecurringBookingServiceModule"),
+  INSTANT_BOOKING_CREATE_SERVICE: Symbol("InstantBookingCreateService"),
+  INSTANT_BOOKING_CREATE_SERVICE_MODULE: Symbol("InstantBookingCreateServiceModule"),
+};