Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/web/modules/bookings/views/bookings-single-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import {
SystemField,
TITLE_FIELD,
} from "@calcom/features/bookings/lib/SystemField";
import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Path migration looks right; verify no stale imports remain

Ensure all imports now point to @calcom/features/bookings/lib/getCalendarLinks and that enum values didn’t change.


🏁 Script executed:

#!/bin/bash
# Find stale paths after migration
rg -n --no-heading -S "@calcom/lib/bookings/getCalendarLinks|@calcom/lib/event\b"

# Quick sanity: ensure the new paths are used
rg -n --no-heading -S "@calcom/features/bookings/lib/getCalendarLinks|@calcom/features/eventtypes/lib/eventNaming"

Length of output: 5983


Replace all remaining @calcom/lib/event-types imports with the new feature paths
rg output shows numerous residual imports referencing @calcom/lib/event-types/*; update them to their counterparts under @calcom/features/eventtypes/lib before merging.

🤖 Prompt for AI Agents
In apps/web/modules/bookings/views/bookings-single-view.tsx around line 29,
replace the import that references the old path (@calcom/lib/event-types/...)
with the new feature path under @calcom/features/eventtypes/lib (e.g., update
any imports to @calcom/features/eventtypes/lib/<module> and preserve the exact
named exports), and run a repo-wide search (rg "@calcom/lib/event-types") to
update all remaining occurrences to the corresponding
@calcom/features/eventtypes/lib paths before merging.

import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
import { getCalendarLinks, CalendarLinkType } from "@calcom/lib/bookings/getCalendarLinks";
import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Type-only import breaks z.infer<typeof nameObjectSchema>

import type erases the value symbol, so typeof nameObjectSchema is invalid. Import it as a value (or import a dedicated exported type if available) to fix TS errors.

Apply this diff:

-import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
+import { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";

If the module exports a dedicated type (e.g., NameObject), prefer:

-import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
+import type { NameObject } from "@calcom/features/eventtypes/lib/eventNaming";

and update usage:

- attendeeName: bookingInfo.responses.name as z.infer<typeof nameObjectSchema> | string,
+ attendeeName: bookingInfo.responses.name as NameObject | string,
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
// apps/web/modules/bookings/views/bookings-single-view.tsx
import { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
🤖 Prompt for AI Agents
In apps/web/modules/bookings/views/bookings-single-view.tsx around line 31, the
import uses "import type { nameObjectSchema }" which erases the value so
"z.infer<typeof nameObjectSchema>" is invalid; change the import to bring in the
runtime value (remove "type") or, if the module exports a dedicated TypeScript
type (e.g., NameObject), import that type instead and update usages to use
NameObject rather than z.infer<typeof nameObjectSchema>; ensure the schema
symbol is available at runtime for typeof or swap to the exported type
everywhere.

import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import { APP_NAME } from "@calcom/lib/constants";
import { formatToLocalizedDate, formatToLocalizedTime, formatToLocalizedTimezone } from "@calcom/lib/dayjs";
import type { nameObjectSchema } from "@calcom/lib/event";
import { getEventName } from "@calcom/lib/event";
import useGetBrandingColours from "@calcom/lib/getBrandColours";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
Expand Down
2 changes: 1 addition & 1 deletion apps/web/modules/test-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ vi.mock("@calcom/app-store/utils", () => ({
getEventTypeAppData: vi.fn(),
}));

vi.mock("@calcom/lib/event", () => ({
vi.mock("@calcom/features/eventtypes/lib/eventNaming", () => ({
getEventName: vi.fn(),
}));

Expand Down
2 changes: 1 addition & 1 deletion packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { z } from "zod";

import { getDailyAppKeys } from "@calcom/app-store/dailyvideo/lib/getDailyAppKeys";
import { fetcher } from "@calcom/lib/dailyApiFetcher";
import { prisma } from "@calcom/prisma";
import type { GetRecordingsResponseSchema, GetAccessLinkResponseSchema } from "@calcom/prisma/zod-utils";
import {
Expand All @@ -16,6 +15,7 @@ import type { VideoApiAdapter, VideoCallData } from "@calcom/types/VideoApiAdapt

import { ZSubmitBatchProcessorJobRes, ZGetTranscriptAccessLink } from "../zod";
import type { TSubmitBatchProcessorJobRes, TGetTranscriptAccessLink, batchProcessorBody } from "../zod";
import { fetcher } from "./dailyApiFetcher";
import {
dailyReturnTypeSchema,
getTranscripts,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { getDailyAppKeys } from "@calcom/app-store/dailyvideo/lib/getDailyAppKeys";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Violation: lib was importing app-store

import { handleErrorsJson } from "@calcom/lib/errors";

import { getDailyAppKeys } from "./getDailyAppKeys";

export const fetcher = async (endpoint: string, init?: RequestInit | undefined) => {
const { api_key } = await getDailyAppKeys();
return fetch(`https://api.daily.co/v1${endpoint}`, {
Expand Down
2 changes: 1 addition & 1 deletion packages/app-store/routing-forms/api/responses/[formId].ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { getSession } from "next-auth/react";

import { sanitizeValue } from "@calcom/lib/csvUtils";
import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
import { getHumanReadableFieldResponseValue } from "@calcom/lib/server/service/routingForm/responseData/getHumanReadableFieldResponseValue";
import prisma from "@calcom/prisma";

import { getSerializableForm } from "../../lib/getSerializableForm";
import { getHumanReadableFieldResponseValue } from "../../lib/responseData/getHumanReadableFieldResponseValue";
import type { FormResponse, SerializableForm } from "../../types/types";

type Fields = NonNullable<SerializableForm<App_RoutingForms_Form>["fields"]>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";

import logger from "@calcom/lib/logger";
import { PrismaQueuedFormResponseRepository } from "@calcom/lib/server/repository/routingForm/queuedFormResponse/PrismaQueuedFormResponseRepository";
import { QueuedFormResponseService } from "@calcom/lib/server/service/routingForm/queuedFormResponse/QueuedFormResponseService";
import prisma from "@calcom/prisma";

import { PrismaQueuedFormResponseRepository } from "../lib/queuedFormResponse/PrismaQueuedFormResponseRepository";
import { QueuedFormResponseService } from "../lib/queuedFormResponse/QueuedFormResponseService";

function validateRequest(request: NextRequest) {
const apiKey = request.headers.get("authorization") || request.nextUrl.searchParams.get("apiKey");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, it, expect, beforeEach, vi } from "vitest";

import type { RoutingFormResponseRepositoryInterface } from "../../repository/RoutingFormResponseRepository.interface";
import type { RoutingFormResponseRepositoryInterface } from "@calcom/lib/server/repository/RoutingFormResponseRepository.interface";

import { RoutingFormResponseDataFactory } from "./RoutingFormResponseDataFactory";
import { parseRoutingFormResponse } from "./responseData/parseRoutingFormResponse";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type logger from "@calcom/lib/logger";
import type { RoutingFormResponseRepositoryInterface } from "@calcom/lib/server/repository/RoutingFormResponseRepository.interface";

import type { RoutingFormResponseRepositoryInterface } from "../../repository/RoutingFormResponseRepository.interface";
import { parseRoutingFormResponse } from "./responseData/parseRoutingFormResponse";

interface Dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from "vitest";

import { findFieldValueByIdentifier } from "./findFieldValueByIdentifier";
import type { RoutingFormResponseData } from "./types";
import type { RoutingFormResponseData } from "./responseData/types";

describe("findFieldValueByIdentifier", () => {
const responseData: RoutingFormResponseData = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import getFieldIdentifier from "@calcom/app-store/routing-forms/lib/getFieldIdentifier";

import type { RoutingFormResponseData } from "./types";
import getFieldIdentifier from "./getFieldIdentifier";
import type { RoutingFormResponseData } from "./responseData/types";

type FindFieldValueByIdentifierResult =
| { success: true; data: string | string[] | number | null }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { Prisma } from "@prisma/client";
import { describe, expect, beforeAll, afterAll, beforeEach, it } from "vitest";

import prisma from "@calcom/prisma";
Expand Down Expand Up @@ -32,7 +33,7 @@ const createTestForm = async (userId: number, overrides?: { name?: string }) =>
const createFormResponse = async (
formId: string,
overrides?: {
response?: Record<string, unknown>;
response?: Prisma.InputJsonValue;
chosenRouteId?: string;
}
) => {
Expand All @@ -48,7 +49,7 @@ const createFormResponse = async (
const createQueuedResponse = async (
formId: string,
overrides?: {
response?: Record<string, unknown>;
response?: Prisma.InputJsonValue;
chosenRouteId?: string;
actualResponseId?: number | null;
createdAt?: Date;
Expand Down Expand Up @@ -384,9 +385,15 @@ describe("PrismaQueuedFormResponseRepository Integration Tests", () => {
describe("deleteByIds", () => {
it("should delete queued responses by their ids", async () => {
// Create test queued responses
const response1 = await createQueuedResponse(testForm.id, { response: { field1: "value1" } });
const response2 = await createQueuedResponse(testForm.id, { response: { field1: "value2" } });
const response3 = await createQueuedResponse(testForm.id, { response: { field1: "value3" } });
const response1 = await createQueuedResponse(testForm.id, {
response: { field1: "value1" },
});
const response2 = await createQueuedResponse(testForm.id, {
response: { field1: "value2" },
});
const response3 = await createQueuedResponse(testForm.id, {
response: { field1: "value3" },
});

// Delete response1 and response2
const result = await repository.deleteByIds([response1.id, response2.id]);
Expand All @@ -411,7 +418,9 @@ describe("PrismaQueuedFormResponseRepository Integration Tests", () => {
});

it("should handle single id deletion", async () => {
const response = await createQueuedResponse(testForm.id, { response: { field1: "single-delete" } });
const response = await createQueuedResponse(testForm.id, {
response: { field1: "single-delete" },
});

const result = await repository.deleteByIds([response.id]);

Expand All @@ -422,7 +431,9 @@ describe("PrismaQueuedFormResponseRepository Integration Tests", () => {
});

it("should handle mix of existing and non-existing ids", async () => {
const response = await createQueuedResponse(testForm.id, { response: { field1: "mixed-delete" } });
const response = await createQueuedResponse(testForm.id, {
response: { field1: "mixed-delete" },
});

const result = await repository.deleteByIds([response.id, "non-existent-id"]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";

import type logger from "@calcom/lib/logger";

import type { QueuedFormResponseRepositoryInterface } from "../../repository/routingForm/queuedFormResponse/QueuedFormResponseRepository.interface";
import type { QueuedFormResponseRepositoryInterface } from "./QueuedFormResponseRepository.interface";
import { QueuedFormResponseService } from "./QueuedFormResponseService";

describe("QueuedFormResponseService", () => {
Expand Down Expand Up @@ -130,7 +130,7 @@ describe("QueuedFormResponseService", () => {

it("should stop when batch is not full", async () => {
// Return partial batch
mockRepo.findMany.mockResolvedValueOnce([{ id: "1" }, { id: "2" }, { id: "3" }]);
mockRepo.findMany.mockResolvedValueOnce([{ id: "1" }, { id: "2" }, { id: "3" }] as any);
mockRepo.deleteByIds.mockResolvedValueOnce({ count: 3 });

const result = await service.cleanupExpiredResponses({ batchSize: 5 });
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type logger from "@calcom/lib/logger";

import type { QueuedFormResponseRepositoryInterface } from "../../../repository/routingForm/queuedFormResponse/QueuedFormResponseRepository.interface";
import type { QueuedFormResponseRepositoryInterface } from "./QueuedFormResponseRepository.interface";

interface Dependencies {
logger: typeof logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { describe, it, expect } from "vitest";

import type { Field, FormResponse } from "@calcom/app-store/routing-forms/types/types";

import type { Field, FormResponse } from "../../types/types";
import { getHumanReadableFieldResponseValue } from "./getHumanReadableFieldResponseValue";

describe("getHumanReadableFieldResponseValue", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { getHumanReadableFieldResponseValue } from "@calcom/lib/server/service/routingForm/responseData/getHumanReadableFieldResponseValue";
import slugify from "@calcom/lib/slugify";

import type { FormResponse, NonRouterRoute, Field } from "../types/types";
import getFieldIdentifier from "./getFieldIdentifier";
import { getHumanReadableFieldResponseValue } from "./responseData/getHumanReadableFieldResponseValue";

/**
* Substitues variables in the target URL identified by routeValue with values from response
Expand Down
4 changes: 2 additions & 2 deletions packages/app-store/salesforce/lib/CrmService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import jsforce from "@jsforce/jsforce-node";
import { RRule } from "rrule";
import { z } from "zod";

import { RoutingFormResponseDataFactory } from "@calcom/app-store/routing-forms/lib/RoutingFormResponseDataFactory";
import { getLocation } from "@calcom/lib/CalEventParser";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { RetryableError } from "@calcom/lib/crmManager/errors";
Expand All @@ -11,15 +12,14 @@ import logger from "@calcom/lib/logger";
import { safeStringify } from "@calcom/lib/safeStringify";
import { PrismaAssignmentReasonRepository } from "@calcom/lib/server/repository/PrismaAssignmentReasonRepository";
import { PrismaRoutingFormResponseRepository as RoutingFormResponseRepository } from "@calcom/lib/server/repository/PrismaRoutingFormResponseRepository";
import { RoutingFormResponseDataFactory } from "@calcom/lib/server/service/routingForm/RoutingFormResponseDataFactory";
import { findFieldValueByIdentifier } from "@calcom/lib/server/service/routingForm/responseData/findFieldValueByIdentifier";
import { prisma } from "@calcom/prisma";
import type { CalendarEvent, CalEventResponses } from "@calcom/types/Calendar";
import type { CredentialPayload } from "@calcom/types/Credential";
import type { CRM, Contact, CrmEvent } from "@calcom/types/CrmService";

import type { ParseRefreshTokenResponse } from "../../_utils/oauth/parseRefreshTokenResponse";
import parseRefreshTokenResponse from "../../_utils/oauth/parseRefreshTokenResponse";
import { findFieldValueByIdentifier } from "../../routing-forms/lib/findFieldValueByIdentifier";
import { default as appMeta } from "../config.json";
import type { writeToRecordDataSchema, appDataSchema, writeToBookingEntry } from "../zod";
import {
Expand Down
4 changes: 2 additions & 2 deletions packages/emails/email-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import type { z } from "zod";

import dayjs from "@calcom/dayjs";
import type BaseEmail from "@calcom/emails/templates/_base-email";
import type { EventNameObjectType } from "@calcom/lib/event";
import { getEventName } from "@calcom/lib/event";
import type { EventNameObjectType } from "@calcom/features/eventtypes/lib/eventNaming";
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import { formatCalEvent } from "@calcom/lib/formatCalendarEvent";
import logger from "@calcom/lib/logger";
import { safeStringify } from "@calcom/lib/safeStringify";
Expand Down
2 changes: 1 addition & 1 deletion packages/features/bookings/lib/BookingEmailSmsHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
sendAttendeeRequestEmailAndSMS,
} from "@calcom/emails";
import type { BookingType } from "@calcom/features/bookings/lib/handleNewBooking/originalRescheduledBookingUtils";
import type { EventNameObjectType } from "@calcom/lib/event";
import type { EventNameObjectType } from "@calcom/features/eventtypes/lib/eventNaming";
import { getPiiFreeCalendarEvent } from "@calcom/lib/piiFreeData";
import { safeStringify } from "@calcom/lib/safeStringify";
import { getTranslation } from "@calcom/lib/server/i18n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ import type { z } from "zod";

import type { Dayjs } from "@calcom/dayjs";
import dayjs from "@calcom/dayjs";
import type { nameObjectSchema } from "@calcom/lib/event";
import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RecurringEvent } from "@calcom/types/Calendar";

import { getEventName } from "../event";

type RecurringEventOrPrismaJsonObject = RecurringEvent | Prisma.JsonObject | null | undefined;
export const enum CalendarLinkType {
GOOGLE_CALENDAR = "googleCalendar",
Expand Down
2 changes: 1 addition & 1 deletion packages/features/bookings/lib/handleNewBooking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { handleWebhookTrigger } from "@calcom/features/bookings/lib/handleWebhoo
import { isEventTypeLoggingEnabled } from "@calcom/features/bookings/lib/isEventTypeLoggingEnabled";
import type { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";
import AssignmentReasonRecorder from "@calcom/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder";
import { getEventName, updateHostInEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import type { FeaturesRepository } from "@calcom/features/flags/features.repository";
import { getFullName } from "@calcom/features/form-builder/utils";
import { UsersRepository } from "@calcom/features/users/users.repository";
Expand All @@ -49,7 +50,6 @@ import { getCacheService } from "@calcom/lib/di/containers/Cache";
import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser";
import { ErrorCode } from "@calcom/lib/errorCodes";
import { getErrorFromUnknown } from "@calcom/lib/errors";
import { getEventName, updateHostInEventName } from "@calcom/lib/event";
import { extractBaseEmail } from "@calcom/lib/extract-base-email";
import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ import { getEventTypesFromDB } from "@calcom/features/bookings/lib/handleNewBook
import AssignmentReasonRecorder, {
RRReassignmentType,
} from "@calcom/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder";
import { BookingLocationService } from "@calcom/features/ee/round-robin/lib/bookingLocationService";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BookingLocationService was only consumed in Features package, so there's no reason for this to live in @calcom/lib + BookingLocationService was importing app store (which is a violation)

import {
scheduleEmailReminder,
deleteScheduledEmailReminder,
} from "@calcom/features/ee/workflows/lib/reminders/emailReminderManager";
import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser";
import { SENDER_NAME } from "@calcom/lib/constants";
import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server";
import { getEventName } from "@calcom/lib/event";
import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server";
import { IdempotencyKeyService } from "@calcom/lib/idempotencyKey/idempotencyKeyService";
import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
import logger from "@calcom/lib/logger";
import { getTranslation } from "@calcom/lib/server/i18n";
import { BookingLocationService } from "@calcom/lib/server/service/bookingLocationService";
import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
import { prisma } from "@calcom/prisma";
import { WorkflowActions, WorkflowMethods, WorkflowTriggerEvents } from "@calcom/prisma/enums";
Expand Down
2 changes: 1 addition & 1 deletion packages/features/ee/round-robin/roundRobinReassignment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import type { IsFixedAwareUser } from "@calcom/features/bookings/lib/handleNewBo
import AssignmentReasonRecorder, {
RRReassignmentType,
} from "@calcom/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder";
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import {
enrichHostsWithDelegationCredentials,
enrichUserWithDelegationCredentialsIncludeServiceAccountKey,
} from "@calcom/lib/delegationCredential/server";
import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser";
import { ErrorCode } from "@calcom/lib/errorCodes";
import { getEventName } from "@calcom/lib/event";
import { IdempotencyKeyService } from "@calcom/lib/idempotencyKey/idempotencyKeyService";
import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
import logger from "@calcom/lib/logger";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { FormProvider } from "react-hook-form";
import { useForm, useFormContext } from "react-hook-form";

import { Dialog } from "@calcom/features/components/controlled-dialog";
import type { EventNameObjectType } from "@calcom/features/eventtypes/lib/eventNaming";
import { getEventName, validateCustomEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import type { InputClassNames } from "@calcom/features/eventtypes/lib/types";
import type { EventNameObjectType } from "@calcom/lib/event";
import { getEventName, validateCustomEventName } from "@calcom/lib/event";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import classNames from "@calcom/ui/classNames";
import { Button } from "@calcom/ui/components/button";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import {
allowDisablingHostConfirmationEmails,
} from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";
import { MultiplePrivateLinksController } from "@calcom/features/eventtypes/components";
import type { EventNameObjectType } from "@calcom/features/eventtypes/lib/eventNaming";
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
import type {
FormValues,
EventTypeSetupProps,
Expand All @@ -38,8 +40,6 @@ import {
APP_NAME,
MAX_SEATS_PER_TIME_SLOT,
} from "@calcom/lib/constants";
import type { EventNameObjectType } from "@calcom/lib/event";
import { getEventName } from "@calcom/lib/event";
import { generateHashedLink } from "@calcom/lib/generateHashedLink";
import { checkWCAGContrastColor } from "@calcom/lib/getBrandColours";
import { extractHostTimezone } from "@calcom/lib/hashedLinksUtils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { TFunction } from "i18next";
import { describe, expect, it, vi } from "vitest";

import * as event from "./event";
import { updateHostInEventName } from "./event";
import * as event from "./eventNaming";
import { updateHostInEventName } from "./eventNaming";

describe("event tests", () => {
describe("fn: getEventName", () => {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { fetcher } from "@calcom/lib/dailyApiFetcher";
import { fetcher } from "@calcom/app-store/dailyvideo/lib/dailyApiFetcher";

import { triggerNoShowPayloadSchema } from "./schema";

Expand Down
Loading
Loading