refactor: reorganize platform packages with /src folders and fix cyclic dependencies

apps/api/v2/jest.config.ts

@@ -7,6 +7,10 @@ const config: Config = {
   moduleNameMapper: {
     "@/(.*)": "<rootDir>/src/$1",
     "test/(.*)": "<rootDir>/test/$1",
+    "^@calcom/platform-constants$": "<rootDir>/../../../packages/platform/constants/index.ts",
+    "^@calcom/platform-enums$": "<rootDir>/../../../packages/platform/enums/index.ts",
+    "^@calcom/platform-types$": "<rootDir>/../../../packages/platform/types/index.ts",
+    "^@calcom/platform-utils$": "<rootDir>/../../../packages/platform/utils/index.ts",
   },
   testEnvironment: "node",
   testRegex: ".*\\.spec\\.ts$",
@@ -15,7 +19,7 @@ const config: Config = {
   },
   setupFiles: ["<rootDir>/test/setEnvVars.ts"],
   testPathIgnorePatterns: ["/dist/", "/node_modules/"],
-  transformIgnorePatterns: ["/dist/", "/node_modules/"],
+  transformIgnorePatterns: ["/dist/", "/node_modules/(?!@calcom/platform-)"],
 };
 
 export default config;

apps/api/v2/package.json

@@ -6,8 +6,9 @@
   "license": "UNLICENSED",
   "private": true,
   "scripts": {
-    "build": "nest build",
+    "build": "yarn dev:build && nest build && yarn postbuild",
     "build:docker": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build && yarn workspace @calcom/platform-libraries build && yarn workspace @calcom/trpc build:server",
+    "postbuild": "mkdir -p dist/packages/prisma/client && echo 'module.exports = require(\"@prisma/client\");' > dist/packages/prisma/client/index.js && mkdir -p dist/packages/prisma/enums && sed -e 's| as const;|;|g' -e '/^export type /d' -e 's|^export const |exports.|g' ../../../packages/prisma/enums/index.ts > dist/packages/prisma/enums/index.js && bash -c 'for dir in ../../../packages/*; do name=$(basename $dir); if [ \"$name\" != \"prisma\" ]; then ln -sf ../../../../../packages/$name dist/packages/$name; fi; done'",
     "format": "biome format --write src test",
     "start": "nest start",
     "dev:build:watch": "concurrently --names \"libraries,lru-fix,constants,enums,utils,types\" \"yarn _dev:build:watch:libraries\" \"yarn _dev:build:watch:libraries:lru-fix\" \"yarn _dev:build:watch:constants\" \"yarn _dev:build:watch:enums\" \"yarn _dev:build:watch:utils\" \"yarn _dev:build:watch:types\"",

apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts

@@ -66,8 +66,9 @@ import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-eve
 import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UsersRepository } from "@/modules/users/users.repository";
+import { randomUUID } from "node:crypto";
 
-export const BOOKING_REASSIGN_PERMISSION_ERROR = "You do not have permission to reassign this booking";
+export const BOOKING_REASSIGN_PERMISSION_ERROR= "You do not have permission to reassign this booking";
 
 type CreatedBooking = {
   hosts: { id: number }[];
@@ -1227,12 +1228,20 @@ export class BookingsService_2024_08_13 {
     const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
     const userCalendars = await this.usersRepository.findByIdWithCalendars(requestUser.id);
 
+    const traceContext = {
+      traceId: `trace_${randomUUID()}`,
+      spanId: `span_${randomUUID()}`,
+      operation: "api_v2_confirm_booking",
+      meta: { bookingId: booking.id, bookingUid },
+    };
+
     await confirmBookingHandler({
       ctx: {
         user: {
           ...requestUser,
           destinationCalendar: userCalendars?.destinationCalendar ?? null,
         },
+        traceContext,
       },
       input: {
         bookingId: booking.id,
@@ -1261,12 +1270,20 @@ export class BookingsService_2024_08_13 {
     const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
     const userCalendars = await this.usersRepository.findByIdWithCalendars(requestUser.id);
 
+    const traceContext = {
+      traceId: `trace_${randomUUID()}`,
+      spanId: `span_${randomUUID()}`,
+      operation: "api_v2_decline_booking",
+      meta: { bookingId: booking.id, bookingUid },
+    };
+
     await confirmBookingHandler({
       ctx: {
         user: {
           ...requestUser,
           destinationCalendar: userCalendars?.destinationCalendar ?? null,
         },
+        traceContext,
       },
       input: {
         bookingId: booking.id,

apps/api/v2/tsconfig.json

@@ -15,26 +15,8 @@
     "jsx": "react-jsx",
     "paths": {
       "@/*": ["./src/*"],
-      "@calcom/prisma/client": ["../../../packages/prisma/generated/prisma/client"],
-      "@calcom/prisma/enums": ["../../../packages/prisma/enums"],
-      "@calcom/platform-constants": ["../../../packages/platform/constants/index.ts"],
-      "@calcom/platform-types": ["../../../packages/platform/types/index.ts"],
-      "@calcom/platform-utils": ["../../../packages/platform/utils/index.ts"],
-      "@calcom/platform-enums": ["../../../packages/platform/enums/index.ts"],
-      "@calcom/platform-libraries/event-types": ["../../../packages/platform/libraries/event-types.ts"],
-      "@calcom/platform-libraries/slots": ["../../../packages/platform/libraries/slots.ts"],
-      "@calcom/platform-libraries/emails": ["../../../packages/platform/libraries/emails.ts"],
-      "@calcom/platform-libraries/schedules": ["../../../packages/platform/libraries/schedules.ts"],
-      "@calcom/platform-libraries/app-store": ["../../../packages/platform/libraries/app-store.ts"],
-      "@calcom/platform-libraries/workflows": ["../../../packages/platform/libraries/workflows.ts"],
-      "@calcom/platform-libraries/conferencing": ["../../../packages/platform/libraries/conferencing.ts"],
-      "@calcom/platform-libraries/repositories": ["../../../packages/platform/libraries/repositories.ts"],
-      "@calcom/platform-libraries/bookings": ["../../../packages/platform/libraries/bookings.ts"],
-      "@calcom/platform-libraries/private-links": ["../../../packages/platform/libraries/private-links.ts"],
-      "@calcom/platform-libraries/organizations": ["../../../packages/platform/libraries/organizations.ts"],
-      "@calcom/platform-libraries/errors": ["../../../packages/platform/libraries/errors.ts"],
-      "@calcom/platform-libraries/calendars": ["../../../packages/platform/libraries/calendars.ts"],
-      "@calcom/platform-libraries/tasker": ["../../../packages/platform/libraries/tasker.ts"]
+      "@calcom/prisma/client": ["../../../packages/prisma/client"],
+      "@calcom/prisma/enums": ["../../../packages/prisma/enums"]
     },
     "incremental": true,
     "skipLibCheck": true,

apps/ui-playground/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/web/modules/auth/platform/authorize-view.tsx

@@ -6,12 +6,11 @@ import { APP_NAME } from "@calcom/lib/constants";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
+import { hasPermission } from "@calcom/platform-utils";
 import { Avatar } from "@calcom/ui/components/avatar";
 import { Button } from "@calcom/ui/components/button";
 import { InfoIcon, PlusIcon } from "@coss/ui/icons";
 
-import { hasPermission } from "../../../../../packages/platform/utils/permissions";
-
 export default function Authorize() {
   const { t } = useLocale();
   const router = useRouter();

apps/web/package.json

@@ -40,8 +40,11 @@
     "@calcom/embed-snippet": "workspace:*",
     "@calcom/features": "workspace:*",
     "@calcom/lib": "workspace:*",
+    "@calcom/platform-constants": "workspace:*",
     "@calcom/platform-enums": "workspace:*",
+    "@calcom/platform-libraries": "workspace:*",
     "@calcom/platform-types": "workspace:*",
+    "@calcom/platform-utils": "workspace:*",
     "@calcom/prisma": "workspace:*",
     "@calcom/trpc": "workspace:*",
     "@calcom/tsconfig": "workspace:*",

packages/platform/atoms/booker/BookerPlatformWrapper.tsx

@@ -7,9 +7,9 @@ import {
   useBookerStoreContext,
   useInitializeBookerStoreContext,
 } from "@calcom/features/bookings/Booker/BookerStoreProvider";
-import { useBookerLayout } from "@calcom/features/bookings/Booker/components/hooks/useBookerLayout";
-import { useBookingForm } from "@calcom/features/bookings/Booker/components/hooks/useBookingForm";
-import { useLocalSet } from "@calcom/features/bookings/Booker/components/hooks/useLocalSet";
+import { useBookerLayout } from "@calcom/features/bookings/Booker/hooks/useBookerLayout";
+import { useBookingForm } from "@calcom/features/bookings/Booker/hooks/useBookingForm";
+import { useLocalSet } from "@calcom/features/bookings/Booker/hooks/useLocalSet";
 import { useStableTimezone } from "@calcom/features/bookings/Booker/hooks/useStableTimezone";
 import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store";
 import { useTimePreferences } from "@calcom/features/bookings/lib";

packages/platform/atoms/connect/apple/AppleConnect.tsx

@@ -18,7 +18,7 @@ import { Form } from "@calcom/ui/components/form";
 import { PasswordField } from "@calcom/ui/components/form";
 import { TextField } from "@calcom/ui/components/form";
 
-import { SUCCESS_STATUS } from "../../../constants/api";
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { useCheck } from "../../hooks/connect/useCheck";
 import { useSaveCalendarCredentials } from "../../hooks/connect/useConnect";
 import { AtomsWrapper } from "../../src/components/atoms-wrapper";

packages/platform/constants/index.ts

@@ -1,3 +1,3 @@
-export * from "./api";
-export * from "./apps";
-export * from "./permissions";
+export * from "./src/api";
+export * from "./src/apps";
+export * from "./src/permissions";

packages/platform/constants/package.json

@@ -4,6 +4,41 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "private": true,
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./permissions": {
+      "require": "./dist/src/permissions.js",
+      "import": "./dist/src/permissions.js",
+      "types": "./dist/src/permissions.d.ts"
+    },
+    "./apps": {
+      "require": "./dist/src/apps.js",
+      "import": "./dist/src/apps.js",
+      "types": "./dist/src/apps.d.ts"
+    },
+    "./api": {
+      "require": "./dist/src/api.js",
+      "import": "./dist/src/api.js",
+      "types": "./dist/src/api.d.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "permissions": [
+        "./dist/src/permissions.d.ts"
+      ],
+      "apps": [
+        "./dist/src/apps.d.ts"
+      ],
+      "api": [
+        "./dist/src/api.d.ts"
+      ]
+    }
+  },
   "scripts": {
     "build": "tsc --build --force tsconfig.json",
     "build:watch": "tsc --build --force ./tsconfig.json --watch",

packages/platform/constants/permissions.ts → packages/platform/constants/src/permissions.ts

@@ -22,6 +22,8 @@ export const PERMISSIONS = [
   PROFILE_WRITE,
 ] as const;
 
+export type PLATFORM_PERMISSION = (typeof PERMISSIONS)[number];
+
 export const PERMISSION_MAP = {
   EVENT_TYPE_READ,
   EVENT_TYPE_WRITE,

packages/platform/constants/tsconfig.json

@@ -1,11 +1,12 @@
 {
   "extends": "@calcom/tsconfig/base.json",
   "compilerOptions": {
-    "target": "ES5",
+    "target": "ES2021",
+    "module": "CommonJS",
     "resolveJsonModule": true,
     "baseUrl": "./",
     "outDir": "./dist"
   },
-  "include": ["."],
+  "include": ["src", "index.ts"],
   "exclude": ["dist", "**/node_modules/**"]
 }

packages/platform/enums/index.ts

@@ -1,10 +1,10 @@
-export * from "./event-types/booking-window.enum";
-export * from "./event-types/editable";
-export * from "./event-types/field-type";
-export * from "./event-types/interval-limits.enum";
-export * from "./event-types/period-type";
-export * from "./event-types/scheduling-type";
-export * from "./event-types/frequency";
-export * from "./event-types/booker-layouts.enum";
-export * from "./event-types/confirmation-policy.enum";
-export * from "./slot-format.enum";
+export * from "./src/event-types/booking-window.enum";
+export * from "./src/event-types/editable";
+export * from "./src/event-types/field-type";
+export * from "./src/event-types/interval-limits.enum";
+export * from "./src/event-types/period-type";
+export * from "./src/event-types/scheduling-type";
+export * from "./src/event-types/frequency";
+export * from "./src/event-types/booker-layouts.enum";
+export * from "./src/event-types/confirmation-policy.enum";
+export * from "./src/slot-format.enum";

packages/platform/enums/monorepo.ts

@@ -1,9 +1,2 @@
-export * from "./event-types/booking-window.enum";
-export * from "./event-types/editable";
-export * from "./event-types/field-type";
-export * from "./event-types/interval-limits.enum";
-export * from "./event-types/period-type";
-export * from "./event-types/scheduling-type";
-export * from "./event-types/frequency";
-export * from "./event-types/booker-layouts.enum";
-export * from "./event-types/confirmation-policy.enum";
+// Re-export everything from index to avoid divergence
+export * from "./index";

packages/platform/enums/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@calcom/platform-enums",
   "version": "0.0.0",
-  "main": "./dist/index.ts",
-  "types": "./dist/index.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "private": true,
   "exports": {
     ".": {
       "require": "./dist/index.js",
       "import": "./dist/index.js",
-      "types": "./dist/index.d.ts.map"
+      "types": "./dist/index.d.ts"
     },
     "./monorepo": {
-      "import": "./monorepo.ts",
-      "require": "./monorepo.ts"
+      "import": "./dist/monorepo.js",
+      "require": "./dist/monorepo.js",
+      "types": "./dist/monorepo.d.ts"
     }
   },
   "scripts": {

packages/platform/enums/permissions.ts → packages/platform/enums/src/permissions.ts

@@ -1,17 +1,17 @@
 import {
+  APPS_READ,
+  APPS_WRITE,
   BOOKING_READ,
   BOOKING_WRITE,
   EVENT_TYPE_READ,
   EVENT_TYPE_WRITE,
   PERMISSIONS,
-  SCHEDULE_READ,
-  SCHEDULE_WRITE,
-  APPS_READ,
-  APPS_WRITE,
   PROFILE_READ,
   PROFILE_WRITE,
+  SCHEDULE_READ,
+  SCHEDULE_WRITE,
 } from "@calcom/platform-constants";
-import type { PLATFORM_PERMISSION } from "@calcom/platform-types";
+import type { PLATFORM_PERMISSION } from "@calcom/platform-constants";
 
 export const hasPermission = (userPermissions: number, permission: PLATFORM_PERMISSION): boolean => {
   // use bitwise AND to check if user has the permission

packages/platform/enums/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "extends": "@calcom/tsconfig/base.json",
   "compilerOptions": {
-    "target": "ES5",
+    "target": "ES2021",
+    "module": "CommonJS",
     "resolveJsonModule": true,
     "experimentalDecorators": true,
     "baseUrl": "./",
     "outDir": "./dist"
   },
-  "include": ["."],
+  "include": ["src", "index.ts", "monorepo.ts"],
   "exclude": ["dist", "**/node_modules/**"]
 }

packages/platform/libraries/src/calendars.ts

@@ -0,0 +1,4 @@
+export { CalendarsTaskService } from "@calcom/features/calendars/lib/tasker/CalendarsTaskService";
+export { CalendarsSyncTasker } from "@calcom/features/calendars/lib/tasker/CalendarsSyncTasker";
+export { CalendarsTriggerTasker } from "@calcom/features/calendars/lib/tasker/CalendarsTriggerTasker";
+export { CalendarsTasker } from "@calcom/features/calendars/lib/tasker/CalendarsTasker";

packages/platform/libraries/src/tasker.ts

@@ -0,0 +1,7 @@
+export {
+  CANCEL_USAGE_INCREMENT_JOB_ID,
+  getIncrementUsageIdempotencyKey,
+  getIncrementUsageJobTag,
+  INCREMENT_USAGE_JOB_ID,
+  RESCHEDULE_USAGE_INCREMENT_JOB_ID,
+} from "@calcom/features/ee/organizations/lib/billing/tasker/constants";

packages/platform/libraries/tsconfig.json

@@ -11,10 +11,10 @@
     "experimentalDecorators": true,
     "baseUrl": ".",
     "paths": {
-      "@calcom/lib/server/i18n": ["./i18n.ts"]
+      "@calcom/lib/server/i18n": ["./src/i18n.ts"]
     }
   },
-  "include": [".", "../../types/*.d.ts"],
+  "include": ["src", "../../types/*.d.ts"],
   "exclude": [
     "dist",
     "build",