Skip to content

Commit 79b6278

Browse files
refactor: replace Prisma.validator<Select>() with satisfies syntax (calcom#22270)
* refactor: replace Prisma.validator<Select>() with satisfies syntax - Convert all Prisma.validator<Prisma.SomeSelect>()({...}) patterns to {...} satisfies Prisma.SomeSelect - Update import { Prisma } to import type { Prisma } where only used for types - Maintain existing functionality while modernizing TypeScript syntax - Covers 89+ files across packages/prisma/selects, repository classes, tRPC handlers, and API modules Co-Authored-By: alex@cal.com <me@alexvanandel.com> * refactor: complete remaining Prisma.validator conversions - Update test fixture files with satisfies syntax - Apply lint-staged formatting fixes - Complete refactoring of all remaining files Co-Authored-By: alex@cal.com <me@alexvanandel.com> * revert: remove unintended platform library update - Revert yarn.lock changes that updated @calcom/platform-libraries from 0.0.236 to 0.0.239 - This was an unintended side effect of the refactoring process - Keep only the intended Prisma.validator → satisfies syntax changes Co-Authored-By: alex@cal.com <me@alexvanandel.com> * fix: update ESLint plugin references to correct package name - Change @calcom/eslint to @calcom/eslint-plugin-eslint in eslint-preset.js - Resolves 'Failed to load plugin @calcom/eslint' error causing CI failures Co-Authored-By: alex@cal.com <me@alexvanandel.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: alex@cal.com <me@alexvanandel.com>
1 parent 673823c commit 79b6278

56 files changed

Lines changed: 157 additions & 158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/api/v2/src/ee/calendars/calendars.repository.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
22
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
33
import { Injectable } from "@nestjs/common";
4-
import { Prisma } from "@prisma/client";
4+
import type { Prisma } from "@prisma/client";
55

6-
const credentialForCalendarRepositorySelect = Prisma.validator<Prisma.CredentialSelect>()({
6+
const credentialForCalendarRepositorySelect = {
77
id: true,
88
appId: true,
99
type: true,
@@ -16,7 +16,7 @@ const credentialForCalendarRepositorySelect = Prisma.validator<Prisma.Credential
1616
teamId: true,
1717
key: true,
1818
invalid: true,
19-
});
19+
} satisfies Prisma.CredentialSelect;
2020

2121
@Injectable()
2222
export class CalendarsRepository {

apps/api/v2/src/ee/calendars/services/calendars.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
NotFoundException,
1515
} from "@nestjs/common";
1616
import { User } from "@prisma/client";
17-
import { Prisma } from "@prisma/client";
17+
import type { Prisma } from "@prisma/client";
1818
import { DateTime } from "luxon";
1919
import { z } from "zod";
2020

apps/api/v2/src/ee/schedules/schedules_2024_04_15/schedules.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04
33
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
44
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
55
import { Injectable } from "@nestjs/common";
6-
import { Prisma } from "@prisma/client";
6+
import type { Prisma } from "@prisma/client";
77

88
@Injectable()
99
export class SchedulesRepository_2024_04_15 {

apps/api/v2/src/modules/booking-seat/booking-seat.repository.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
22
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
33
import { Injectable } from "@nestjs/common";
4-
import { Prisma } from "@prisma/client";
54

65
@Injectable()
76
export class BookingSeatRepository {

apps/api/v2/src/modules/cal-unified-calendars/services/google-calendar.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { calendar_v3 } from "@googleapis/calendar";
55
import { Injectable, UnauthorizedException } from "@nestjs/common";
66
import { NotFoundException } from "@nestjs/common";
77
import { Logger } from "@nestjs/common";
8-
import { Prisma } from "@prisma/client";
8+
import type { Prisma } from "@prisma/client";
99
import { JWT } from "googleapis-common";
1010

1111
import { DelegationCredentialRepository, OAuth2UniversalSchema } from "@calcom/platform-libraries/app-store";

apps/api/v2/src/modules/conferencing/repositories/conferencing.repository.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
22
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
33
import { Injectable } from "@nestjs/common";
4-
import { Prisma } from "@prisma/client";
4+
import type { Prisma } from "@prisma/client";
55

66
import { GOOGLE_MEET_TYPE } from "@calcom/platform-constants";
77

88
@Injectable()
99
export class ConferencingRepository {
1010
constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
1111

12-
private readonly credentialSelect = Prisma.validator<Prisma.CredentialSelect>()({
12+
private readonly credentialSelect = {
1313
id: true,
1414
type: true,
1515
userId: true,
@@ -20,7 +20,7 @@ export class ConferencingRepository {
2020
billingCycleStart: true,
2121
invalid: true,
2222
delegationCredentialId: true,
23-
});
23+
} satisfies Prisma.CredentialSelect;
2424

2525
async findConferencingApps(userId: number) {
2626
return this.dbRead.prisma.credential.findMany({

apps/api/v2/src/modules/credentials/credentials.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
22
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
33
import { Injectable } from "@nestjs/common";
4-
import { Prisma } from "@prisma/client";
4+
import type { Prisma } from "@prisma/client";
55

66
import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants";
77
import { credentialForCalendarServiceSelect } from "@calcom/platform-libraries";

apps/api/v2/src/modules/ooo/repositories/ooo.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
22
import { Injectable } from "@nestjs/common";
33
import { v4 as uuidv4 } from "uuid";
44

5-
import { Prisma } from "@calcom/prisma/client";
5+
import type { Prisma } from "@calcom/prisma/client";
66

77
import { PrismaWriteService } from "../../prisma/prisma-write.service";
88

apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
22
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
33
import { Injectable } from "@nestjs/common";
44

5-
import { Prisma } from "@calcom/prisma/client";
5+
import type { Prisma } from "@calcom/prisma/client";
66

77
@Injectable()
88
export class OrganizationsDelegationCredentialRepository {

apps/api/v2/src/modules/organizations/memberships/organizations-membership.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
44
import { MembershipUserSelect } from "@/modules/teams/memberships/teams-memberships.repository";
55
import { Injectable } from "@nestjs/common";
66

7-
import { Prisma } from "@calcom/prisma/client";
7+
import type { Prisma } from "@calcom/prisma/client";
88

99
import { UpdateOrgMembershipDto } from "./inputs/update-organization-membership.input";
1010

0 commit comments

Comments
 (0)