vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 2.0k Packages Projects Releases Wiki Activity

Better ioctopus type-safety (#23541)

Browse Source
This commit is contained in:
Hariom Balhara
2025-09-10 17:10:25 +05:30
committed by GitHub
parent 13add03479
commit b9074aeb81
48 changed files with 227 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/features/bookings/lib/di/containers/RegularBookingServiceContainer.ts
-20
View File
@@ -1,20 +0,0 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import type { RegularBookingService } from "../modules/RegularBookingServiceModule";
import {
regularBookingServiceModule,
loadModuleDeps,
moduleToken,
} from "../modules/RegularBookingServiceModule";
const regularBookingServiceContainer = createContainer();
regularBookingServiceContainer.load(DI_TOKENS.REGULAR_BOOKING_SERVICE_MODULE, regularBookingServiceModule);
export function getRegularBookingService(): RegularBookingService {
loadModuleDeps(regularBookingServiceContainer);
return regularBookingServiceContainer.get<RegularBookingService>(moduleToken);
}
packages/features/bookings/lib/di/modules/RegularBookingServiceModule.ts
-39
View File
@@ -1,39 +0,0 @@
import type { Container } from "@evyweb/ioctopus";
import { createModule } 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";
import { checkBookingLimitsModule } from "@calcom/lib/di/modules/CheckBookingLimits";
import { featuresRepositoryModule } from "@calcom/lib/di/modules/Features";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import { RegularBookingService } from "../../handleNewBooking";
export const regularBookingServiceModule = createModule();
const moduleToken = DI_TOKENS.REGULAR_BOOKING_SERVICE;
regularBookingServiceModule.bind(moduleToken).toClass(RegularBookingService, {
cacheService: DI_TOKENS.CACHE_SERVICE,
checkBookingAndDurationLimitsService: DI_TOKENS.CHECK_BOOKING_AND_DURATION_LIMITS_SERVICE,
prismaClient: DI_TOKENS.PRISMA_CLIENT,
bookingRepository: DI_TOKENS.BOOKING_REPOSITORY,
featuresRepository: DI_TOKENS.FEATURES_REPOSITORY,
checkBookingLimitsService: DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE,
});
// Load the dependencies defined for the module above
function loadModuleDeps(container: Container) {
container.load(DI_TOKENS.CACHE_SERVICE_MODULE, cacheModule);
container.load(
DI_TOKENS.CHECK_BOOKING_AND_DURATION_LIMITS_SERVICE_MODULE,
checkBookingAndDurationLimitsModule
);
container.load(DI_TOKENS.PRISMA_MODULE, prismaModule);
container.load(DI_TOKENS.BOOKING_REPOSITORY_MODULE, bookingRepositoryModule);
container.load(DI_TOKENS.FEATURES_REPOSITORY_MODULE, featuresRepositoryModule);
container.load(DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE_MODULE, checkBookingLimitsModule);
}
export { loadModuleDeps, moduleToken };
export type { RegularBookingService };
packages/features/redis/di/redisModule.ts
+1 -2
View File
@@ -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/containers/InstantBookingCreateServiceContainer.ts → packages/lib/di/bookings/containers/InstantBookingCreateService.container.ts
+5 -4
View File
@@ -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/bookings/lib/di/containers/RecurringBookingServiceContainer.ts → packages/lib/di/bookings/containers/RecurringBookingService.container.ts
+5 -4
View File
@@ -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);
packages/lib/di/bookings/containers/RegularBookingService.container.ts
+13
View File
@@ -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);
}
packages/features/bookings/lib/di/modules/InstantBookingCreateServiceModule.ts → packages/lib/di/bookings/modules/InstantBookingCreateService.module.ts
+2 -2
View File
@@ -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/features/bookings/lib/di/modules/RecurringBookingServiceModule.ts → packages/lib/di/bookings/modules/RecurringBookingService.module.ts
+2 -3
View File
@@ -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();
packages/lib/di/bookings/modules/RegularBookingService.module.ts
+35
View File
@@ -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 };
packages/lib/di/bookings/tokens.ts
+8
View File
@@ -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"),
};
packages/lib/di/containers/AvailableSlots.ts
+1 -2
View File
@@ -1,10 +1,9 @@
import { createContainer } from "@evyweb/ioctopus";
import { redisModule } from "@calcom/features/redis/di/redisModule";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { AvailableSlotsService } from "@calcom/trpc/server/routers/viewer/slots/util";
import { createContainer } from "../di";
import { availableSlotsModule } from "../modules/AvailableSlots";
import { bookingRepositoryModule } from "../modules/Booking";
import { busyTimesModule } from "../modules/BusyTimes";
packages/lib/di/containers/BookingLimits.ts
+1 -2
View File
@@ -1,10 +1,9 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { CheckBookingAndDurationLimitsService } from "../../../features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
import type { CheckBookingLimitsService } from "../../intervalLimits/server/checkBookingLimits";
import { createContainer } from "../di";
import { bookingRepositoryModule } from "../modules/Booking";
import { checkBookingAndDurationLimitsModule } from "../modules/CheckBookingAndDurationLimits";
import { checkBookingLimitsModule } from "../modules/CheckBookingLimits";
packages/lib/di/containers/BusyTimes.ts
+1 -2
View File
@@ -1,9 +1,8 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { BusyTimesService } from "../../getBusyTimes";
import { createContainer } from "../di";
import { bookingRepositoryModule } from "../modules/Booking";
import { busyTimesModule } from "../modules/BusyTimes";
packages/lib/di/containers/Cache.ts
+1 -2
View File
@@ -1,9 +1,8 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { CacheService } from "../../../features/calendar-cache/lib/getShouldServeCache";
import { createContainer } from "../di";
import { cacheModule } from "../modules/Cache";
import { featuresRepositoryModule } from "../modules/Features";
packages/lib/di/containers/FilterHosts.ts
+1 -2
View File
@@ -1,9 +1,8 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { FilterHostsService } from "../../bookings/filterHostsBySameRoundRobinHost";
import { createContainer } from "../di";
import { bookingRepositoryModule } from "../modules/Booking";
import { filterHostsModule } from "../modules/FilterHosts";
packages/lib/di/containers/GetUserAvailability.ts
+1 -2
View File
@@ -1,10 +1,9 @@
import { createContainer } from "@evyweb/ioctopus";
import { redisModule } from "@calcom/features/redis/di/redisModule";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { UserAvailabilityService } from "../../getUserAvailability";
import { createContainer } from "../di";
import { bookingRepositoryModule } from "../modules/Booking";
import { busyTimesModule } from "../modules/BusyTimes";
import { eventTypeRepositoryModule } from "../modules/EventType";
packages/lib/di/containers/InsightsBooking.ts
+1 -2
View File
@@ -1,5 +1,3 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import type {
InsightsBookingServicePublicOptions,
@@ -9,6 +7,7 @@ import type {
import type { InsightsBookingService } from "@calcom/lib/server/service/InsightsBookingDIService";
import { prismaModule } from "@calcom/prisma/prisma.module";
import { createContainer } from "../di";
import { insightsBookingModule } from "../modules/InsightsBooking";
export function getInsightsBookingService({
packages/lib/di/containers/InsightsRouting.ts
+1 -2
View File
@@ -1,5 +1,3 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import type {
InsightsRoutingServicePublicOptions,
@@ -9,6 +7,7 @@ import type {
import type { InsightsRoutingService } from "@calcom/lib/server/service/InsightsRoutingDIService";
import { prismaModule } from "@calcom/prisma/prisma.module";
import { createContainer } from "../di";
import { insightsRoutingModule } from "../modules/InsightsRouting";
export function getInsightsRoutingService({
packages/lib/di/containers/LuckyUser.ts
+1 -2
View File
@@ -1,9 +1,8 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import type { LuckyUserService } from "@calcom/lib/server/getLuckyUser";
import { prismaModule } from "@calcom/prisma/prisma.module";
import { createContainer } from "../di";
import { attributeRepositoryModule } from "../modules/Attribute";
import { bookingRepositoryModule } from "../modules/Booking";
import { hostRepositoryModule } from "../modules/Host";
packages/lib/di/containers/NoSlotsNotification.ts
+1 -2
View File
@@ -1,10 +1,9 @@
import { createContainer } from "@evyweb/ioctopus";
import { redisModule } from "@calcom/features/redis/di/redisModule";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { NoSlotsNotificationService } from "@calcom/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots";
import { createContainer } from "../di";
import { membershipRepositoryModule } from "../modules/Membership";
import { noSlotsNotificationModule } from "../modules/NoSlotsNotification";
import { teamRepositoryModule } from "../modules/Team";
packages/lib/di/containers/QualifiedHosts.ts
+1 -2
View File
@@ -1,9 +1,8 @@
import { createContainer } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prismaModule } from "@calcom/prisma/prisma.module";
import type { QualifiedHostsService } from "../../bookings/findQualifiedHostsWithDelegationCredentials";
import { createContainer } from "../di";
import { bookingRepositoryModule } from "../modules/Booking";
import { filterHostsModule } from "../modules/FilterHosts";
import { qualifiedHostsModule } from "../modules/QualifiedHosts";
packages/lib/di/di.ts
+38
View File
@@ -0,0 +1,38 @@
import type { Container, Module } from "@evyweb/ioctopus";
import { createContainer, createModule } from "@evyweb/ioctopus";
/**
* A type-safe alternative to module.bind(token).toClass(classs, deps) that automatically ensures that all dependencies required by the Class are provided.
* It assumes that dependencies are stored under the `deps` property of the Class, which is a good convention to follow anyway
*
* @returns A function that can be used to load the dependencies into the container automatically.
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function bindModuleToClassOnToken<TClass extends new (...args: any[]) => any>({
module,
token,
classs,
depsMap,
moduleToken,
}: {
module: Module;
moduleToken: string | symbol;
token: string | symbol;
classs: TClass;
depsMap: Record<
keyof InstanceType<TClass>["deps"],
{ token: string | symbol; loadModule: (container: Container) => void }
>;
}) {
const depsObject = Object.fromEntries(Object.entries(depsMap).map(([key, value]) => [key, value.token]));
module.bind(token).toClass(classs, depsObject);
return function loadModule(container: Container) {
container.load(moduleToken, module);
for (const key in depsMap) {
const loadModule = depsMap[key as keyof typeof depsMap].loadModule;
loadModule(container);
}
};
}
export { createContainer, createModule, type Container, type Module };
packages/lib/di/modules/Attribute.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
import { createModule } from "../di";
export const attributeRepositoryModule = createModule();
attributeRepositoryModule
.bind(DI_TOKENS.ATTRIBUTE_REPOSITORY)
packages/lib/di/modules/AvailableSlots.ts
+1 -2
View File
@@ -1,8 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import type { IAvailableSlotsService } from "@calcom/trpc/server/routers/viewer/slots/util";
import { AvailableSlotsService } from "@calcom/trpc/server/routers/viewer/slots/util";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const availableSlotsModule = createModule();
packages/lib/di/modules/Booking.ts
+12 -5
View File
@@ -1,9 +1,16 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { BookingRepository } from "@calcom/lib/server/repository/booking";
import { type Container, createModule } from "../di";
export const bookingRepositoryModule = createModule();
bookingRepositoryModule
.bind(DI_TOKENS.BOOKING_REPOSITORY)
.toClass(BookingRepository, [DI_TOKENS.PRISMA_CLIENT]);
const token = DI_TOKENS.BOOKING_REPOSITORY;
const moduleToken = DI_TOKENS.BOOKING_REPOSITORY_MODULE;
bookingRepositoryModule.bind(token).toClass(BookingRepository, [DI_TOKENS.PRISMA_CLIENT]);
export const moduleLoader = {
token,
loadModule: function (container: Container) {
container.load(moduleToken, bookingRepositoryModule);
},
};
packages/lib/di/modules/BusyTimes.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { createModule } from "@evyweb/ioctopus";
import type { IBusyTimesService } from "../../getBusyTimes";
import { BusyTimesService } from "../../getBusyTimes";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const busyTimesModule = createModule();
packages/lib/di/modules/Cache.ts
+11 -3
View File
@@ -1,11 +1,19 @@
import { createModule } from "@evyweb/ioctopus";
import type { ICacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
import { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
import { type Container, createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const cacheModule = createModule();
cacheModule.bind(DI_TOKENS.CACHE_SERVICE).toClass(CacheService, {
const token = DI_TOKENS.CACHE_SERVICE;
const moduleToken = DI_TOKENS.CACHE_SERVICE_MODULE;
cacheModule.bind(token).toClass(CacheService, {
featuresRepository: DI_TOKENS.FEATURES_REPOSITORY,
} satisfies Record<keyof ICacheService, symbol>);
export const moduleLoader = {
token,
loadModule: (container: Container) => {
container.load(moduleToken, cacheModule);
},
};
packages/lib/di/modules/CheckBookingAndDurationLimits.ts
+13 -7
View File
@@ -1,13 +1,19 @@
import { createModule } from "@evyweb/ioctopus";
import type { ICheckBookingAndDurationLimitsService } from "@calcom/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
import { CheckBookingAndDurationLimitsService } from "@calcom/features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
import { type Container, createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const checkBookingAndDurationLimitsModule = createModule();
checkBookingAndDurationLimitsModule
.bind(DI_TOKENS.CHECK_BOOKING_AND_DURATION_LIMITS_SERVICE)
.toClass(CheckBookingAndDurationLimitsService, {
checkBookingLimitsService: DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE,
} satisfies Record<keyof ICheckBookingAndDurationLimitsService, symbol>);
const token = DI_TOKENS.CHECK_BOOKING_AND_DURATION_LIMITS_SERVICE;
const moduleToken = DI_TOKENS.CHECK_BOOKING_AND_DURATION_LIMITS_SERVICE_MODULE;
checkBookingAndDurationLimitsModule.bind(token).toClass(CheckBookingAndDurationLimitsService, {
checkBookingLimitsService: DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE,
} satisfies Record<keyof ICheckBookingAndDurationLimitsService, symbol>);
export const moduleLoader = {
token,
loadModule: (container: Container) => {
container.load(moduleToken, checkBookingAndDurationLimitsModule);
},
};
packages/lib/di/modules/CheckBookingLimits.ts
+12 -3
View File
@@ -1,9 +1,18 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits";
import { type Container, createModule } from "../di";
const token = DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE;
const moduleToken = DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE_MODULE;
export const checkBookingLimitsModule = createModule();
checkBookingLimitsModule
.bind(DI_TOKENS.CHECK_BOOKING_LIMITS_SERVICE)
.bind(token)
.toClass(CheckBookingLimitsService, { bookingRepo: DI_TOKENS.BOOKING_REPOSITORY });
export const moduleLoader = {
token,
loadModule: (container: Container) => {
container.load(moduleToken, checkBookingLimitsModule);
},
};
packages/lib/di/modules/EventType.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository";
import { createModule } from "../di";
export const eventTypeRepositoryModule = createModule();
eventTypeRepositoryModule
.bind(DI_TOKENS.EVENT_TYPE_REPOSITORY)
packages/lib/di/modules/Features.ts
+12 -5
View File
@@ -1,9 +1,16 @@
import { createModule } from "@evyweb/ioctopus";
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { type Container, createModule } from "../di";
export const featuresRepositoryModule = createModule();
featuresRepositoryModule
.bind(DI_TOKENS.FEATURES_REPOSITORY)
.toClass(FeaturesRepository, [DI_TOKENS.PRISMA_CLIENT]);
const token = DI_TOKENS.FEATURES_REPOSITORY;
const moduleToken = DI_TOKENS.FEATURES_REPOSITORY_MODULE;
featuresRepositoryModule.bind(token).toClass(FeaturesRepository, [DI_TOKENS.PRISMA_CLIENT]);
export const moduleLoader = {
token,
loadModule: (container: Container) => {
container.load(moduleToken, featuresRepositoryModule);
},
};
packages/lib/di/modules/FilterHosts.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { createModule } from "@evyweb/ioctopus";
import type { IFilterHostsService } from "../../bookings/filterHostsBySameRoundRobinHost";
import { FilterHostsService } from "../../bookings/filterHostsBySameRoundRobinHost";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const filterHostsModule = createModule();
packages/lib/di/modules/GetUserAvailability.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { createModule } from "@evyweb/ioctopus";
import type { IUserAvailabilityService } from "../../getUserAvailability";
import { UserAvailabilityService } from "../../getUserAvailability";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const getUserAvailabilityModule = createModule();
packages/lib/di/modules/Host.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { HostRepository } from "@calcom/lib/server/repository/host";
import { createModule } from "../di";
export const hostRepositoryModule = createModule();
hostRepositoryModule.bind(DI_TOKENS.HOST_REPOSITORY).toClass(HostRepository, [DI_TOKENS.PRISMA_CLIENT]);
packages/lib/di/modules/InsightsBooking.ts
+1 -2
View File
@@ -1,8 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import type { IInsightsBookingService } from "@calcom/lib/server/service/InsightsBookingDIService";
import { InsightsBookingService } from "@calcom/lib/server/service/InsightsBookingDIService";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const insightsBookingModule = createModule();
packages/lib/di/modules/InsightsRouting.ts
+1 -2
View File
@@ -1,8 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import type { IInsightsRoutingService } from "@calcom/lib/server/service/InsightsRoutingDIService";
import { InsightsRoutingService } from "@calcom/lib/server/service/InsightsRoutingDIService";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const insightsRoutingModule = createModule();
packages/lib/di/modules/LuckyUser.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { LuckyUserService } from "@calcom/lib/server/getLuckyUser";
import { createModule } from "../di";
export const luckyUserServiceModule = createModule();
luckyUserServiceModule.bind(DI_TOKENS.LUCKY_USER_SERVICE).toClass(LuckyUserService, {
bookingRepository: DI_TOKENS.BOOKING_REPOSITORY,
packages/lib/di/modules/Membership.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { MembershipRepository } from "@calcom/lib/server/repository/membership";
import { createModule } from "../di";
export const membershipRepositoryModule = createModule();
membershipRepositoryModule
.bind(DI_TOKENS.MEMBERSHIP_REPOSITORY)
packages/lib/di/modules/NoSlotsNotification.ts
+1 -2
View File
@@ -1,8 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import type { INoSlotsNotificationService } from "@calcom/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots";
import { NoSlotsNotificationService } from "@calcom/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const noSlotsNotificationModule = createModule();
packages/lib/di/modules/Ooo.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";
import { createModule } from "../di";
export const oooRepositoryModule = createModule();
oooRepositoryModule.bind(DI_TOKENS.OOO_REPOSITORY).toClass(PrismaOOORepository, [DI_TOKENS.PRISMA_CLIENT]);
packages/lib/di/modules/QualifiedHosts.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { createModule } from "@evyweb/ioctopus";
import type { IQualifiedHostsService } from "../../bookings/findQualifiedHostsWithDelegationCredentials";
import { QualifiedHostsService } from "../../bookings/findQualifiedHostsWithDelegationCredentials";
import { createModule } from "../di";
import { DI_TOKENS } from "../tokens";
export const qualifiedHostsModule = createModule();
packages/lib/di/modules/RoutingFormResponse.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";
import { createModule } from "../di";
export const routingFormResponseRepositoryModule = createModule();
routingFormResponseRepositoryModule
.bind(DI_TOKENS.ROUTING_FORM_RESPONSE_REPOSITORY)
packages/lib/di/modules/Schedule.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { ScheduleRepository } from "@calcom/lib/server/repository/schedule";
import { createModule } from "../di";
export const scheduleRepositoryModule = createModule();
scheduleRepositoryModule
.bind(DI_TOKENS.SCHEDULE_REPOSITORY)
packages/lib/di/modules/SelectedSlots.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { PrismaSelectedSlotRepository } from "@calcom/lib/server/repository/PrismaSelectedSlotRepository";
import { createModule } from "../di";
export const selectedSlotsRepositoryModule = createModule();
selectedSlotsRepositoryModule
.bind(DI_TOKENS.SELECTED_SLOT_REPOSITORY)
packages/lib/di/modules/Team.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { TeamRepository } from "@calcom/lib/server/repository/team";
import { createModule } from "../di";
export const teamRepositoryModule = createModule();
teamRepositoryModule.bind(DI_TOKENS.TEAM_REPOSITORY).toClass(TeamRepository, [DI_TOKENS.PRISMA_CLIENT]);
packages/lib/di/modules/User.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { createModule } from "@evyweb/ioctopus";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { UserRepository } from "@calcom/lib/server/repository/user";
import { createModule } from "../di";
export const userRepositoryModule = createModule();
userRepositoryModule.bind(DI_TOKENS.USER_REPOSITORY).toClass(UserRepository, [DI_TOKENS.PRISMA_CLIENT]);
packages/lib/di/tokens.ts
+4 -6
View File
@@ -1,3 +1,5 @@
import { BOOKING_DI_TOKENS } from "./bookings/tokens";
export const DI_TOKENS = {
PRISMA_CLIENT: Symbol("PrismaClient"),
READ_ONLY_PRISMA_CLIENT: Symbol("ReadOnlyPrismaClient"),
@@ -51,10 +53,6 @@ export const DI_TOKENS = {
HOST_REPOSITORY_MODULE: Symbol("HostRepositoryModule"),
ATTRIBUTE_REPOSITORY: Symbol("AttributeRepository"),
ATTRIBUTE_REPOSITORY_MODULE: Symbol("AttributeRepositoryModule"),
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"),
// Booking service tokens
...BOOKING_DI_TOKENS,
};
packages/prisma/prisma.module.ts
+13 -5
View File
@@ -1,11 +1,19 @@
import { createModule } from "@evyweb/ioctopus";
import { type Container, createModule } from "@calcom/lib/di/di";
import { DI_TOKENS } from "@calcom/lib/di/tokens";
import { prisma, readonlyPrisma } from "./index";
export const prismaModule = createModule();
const token = DI_TOKENS.PRISMA_CLIENT;
const readOnlyToken = DI_TOKENS.READ_ONLY_PRISMA_CLIENT;
const moduleToken = DI_TOKENS.PRISMA_MODULE;
prismaModule.bind(token).toFactory(() => prisma, "singleton");
prismaModule.bind(readOnlyToken).toFactory(() => readonlyPrisma, "singleton");
prismaModule.bind(DI_TOKENS.PRISMA_CLIENT).toFactory(() => prisma, "singleton");
prismaModule.bind(DI_TOKENS.READ_ONLY_PRISMA_CLIENT).toFactory(() => readonlyPrisma, "singleton");
export const moduleLoader = {
token,
readOnlyToken,
loadModule: (container: Container) => {
container.load(moduleToken, prismaModule);
},
};