Merged in feat/sw-2862-move-booking-router-to-trpc-package (pull request #2421)

feat(SW-2861): Move booking router to trpc package

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Move booking router to trpc package

* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package


Approved-by: Linus Flood

apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/Room/Breakfast/index.tsx

@@ -7,7 +7,7 @@ import { formatPrice } from "@/utils/numberFormatting"
 
 import styles from "./breakfast.module.css"
 
-import type { PackageSchema } from "@/types/trpc/routers/booking/confirmation"
+import type { PackageSchema } from "@scandic-hotels/trpc/types/bookingConfirmation"
 
 interface BreakfastProps {
   breakfast: PackageSchema | false | undefined

apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/RoomDetailsSidePeek/index.tsx

@@ -5,12 +5,12 @@ import { useIntl } from "react-intl"
 
 import { Button } from "@scandic-hotels/design-system/Button"
 import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
+import { getBookedHotelRoom } from "@scandic-hotels/trpc/routers/booking/helpers"
 
 import { useBookingConfirmationStore } from "@/stores/booking-confirmation"
 
 import { RoomSidePeekContent } from "@/components/SidePeeks/RoomSidePeek/RoomSidePeekContent"
 import SidePeekSelfControlled from "@/components/TempDesignSystem/SidePeekSelfControlled"
-import { getBookedHotelRoom } from "@/utils/booking"
 
 interface RoomDetailsSidePeekProps {
   roomTypeCode: string

apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/index.tsx

@@ -11,8 +11,9 @@ import { useSearchHistory } from "@/hooks/useSearchHistory"
 import { clearPaymentInfoSessionStorage } from "../../EnterDetails/Payment/helpers"
 import { getTracking } from "./tracking"
 
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
+
 import type { Room } from "@/types/stores/booking-confirmation"
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 
 export default function Tracking({
   bookingConfirmation,

apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts

@@ -13,6 +13,7 @@ import { getSpecialRoomType } from "@/utils/specialRoomType"
 import { invertedBedTypeMap } from "../../utils"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
 import type { RateDefinition } from "@scandic-hotels/trpc/types/roomAvailability"
 
 import {
@@ -23,7 +24,6 @@ import {
   type TrackingSDKPaymentInfo,
 } from "@/types/components/tracking"
 import type { Room } from "@/types/stores/booking-confirmation"
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 
 function getRate(cancellationRule: RateDefinition["cancellationRule"] | null) {
   switch (cancellationRule) {

apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts

@@ -1,15 +1,16 @@
+import { type IntlShape } from "react-intl"
+
 import { CurrencyEnum } from "@scandic-hotels/common/constants/currency"
 import { BreakfastPackageEnum } from "@scandic-hotels/trpc/enums/breakfast"
 
 import { formatPrice } from "@/utils/numberFormatting"
 
-import type { IntlShape } from "react-intl"
-
-import type { BookingConfirmationRoom } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
 import type {
   BookingConfirmationSchema,
   PackageSchema,
-} from "@/types/trpc/routers/booking/confirmation"
+} from "@scandic-hotels/trpc/types/bookingConfirmation"
+
+import type { BookingConfirmationRoom } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
 
 export function mapRoomState(
   booking: BookingConfirmationSchema,

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx

@@ -3,7 +3,9 @@
 import { useRouter } from "next/navigation"
 import { useEffect } from "react"
 
-import { BookingStatusEnum, MEMBERSHIP_FAILED_ERROR } from "@/constants/booking"
+import { BookingStatusEnum } from "@scandic-hotels/trpc/enums/bookingStatus"
+
+import { MEMBERSHIP_FAILED_ERROR } from "@/constants/booking"
 
 import LoadingSpinner from "@/components/LoadingSpinner"
 import { useHandleBookingStatus } from "@/hooks/booking/useHandleBookingStatus"

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -14,9 +14,10 @@ import { Button } from "@scandic-hotels/design-system/Button"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 import { bedTypeMap } from "@scandic-hotels/trpc/constants/bedTypeMap"
 import { REDEMPTION } from "@scandic-hotels/trpc/constants/booking"
+import { BookingStatusEnum } from "@scandic-hotels/trpc/enums/bookingStatus"
 import { RoomPackageCodeEnum } from "@scandic-hotels/trpc/enums/roomFilter"
 
-import { BookingStatusEnum, PAYMENT_METHOD_TITLES } from "@/constants/booking"
+import { PAYMENT_METHOD_TITLES } from "@/constants/booking"
 import { bookingConfirmation } from "@/constants/routes/hotelReservation"
 import { env } from "@/env/client"
 import { trpc } from "@/lib/trpc/client"

apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/RemoveButton.tsx

@@ -11,8 +11,9 @@ import { toast } from "@/components/TempDesignSystem/Toasts"
 import useLang from "@/hooks/useLang"
 import { trackRemoveAncillary } from "@/utils/tracking/myStay"
 
+import type { PackageSchema } from "@scandic-hotels/trpc/types/bookingConfirmation"
+
 import type { Room } from "@/types/stores/my-stay"
-import type { PackageSchema } from "@/types/trpc/routers/booking/confirmation"
 
 export default function RemoveButton({
   refId,

apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx

@@ -16,9 +16,10 @@ import RemoveButton from "./RemoveButton"
 
 import styles from "./addedAncillaries.module.css"
 
+import type { PackageSchema } from "@scandic-hotels/trpc/types/bookingConfirmation"
+
 import type { AddedAncillariesProps } from "@/types/components/myPages/myStay/ancillaries"
 import type { Room } from "@/types/stores/my-stay"
-import type { PackageSchema } from "@/types/trpc/routers/booking/confirmation"
 
 export function AddedAncillaries({
   ancillaries,

apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/index.tsx

@@ -24,13 +24,14 @@ import ModifyContact from "../ModifyContact"
 
 import styles from "./guestDetails.module.css"
 
+import type { Guest } from "@scandic-hotels/trpc/routers/booking/output"
+
 import {
   type ModifyContactSchema,
   modifyContactSchema,
 } from "@/types/components/hotelReservation/myStay/modifyContact"
 import { MODAL_STEPS } from "@/types/components/hotelReservation/myStay/myStay"
 import type { SafeUser } from "@/types/user"
-import type { Guest } from "@/server/routers/booking/output"
 
 interface GuestDetailsProps {
   refId: string

apps/scandic-web/components/HotelReservation/MyStay/ModifyContact/index.tsx

@@ -10,7 +10,7 @@ import Body from "@/components/TempDesignSystem/Text/Body"
 
 import styles from "./modifyContact.module.css"
 
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
 
 interface ModifyContactProps {
   guest: BookingConfirmation["booking"]["guest"]

apps/scandic-web/components/HotelReservation/MyStay/PriceType/index.tsx

@@ -5,8 +5,9 @@ import Points from "./Points"
 import Price from "./Price"
 import Vouchers from "./Vouchers"
 
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
+
 import { PriceTypeEnum } from "@/types/components/hotelReservation/myStay/myStay"
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 
 interface PriceTypeProps
   extends Pick<

apps/scandic-web/components/HotelReservation/MyStay/Receipt/index.tsx

@@ -5,6 +5,7 @@ import { CurrencyEnum } from "@scandic-hotels/common/constants/currency"
 import { dt } from "@scandic-hotels/common/dt"
 import ScandicLogoIcon from "@scandic-hotels/design-system/Icons/ScandicLogoIcon"
 import { Typography } from "@scandic-hotels/design-system/Typography"
+import { parseRefId } from "@scandic-hotels/trpc/utils/refId"
 
 import {
   findBooking,
@@ -16,7 +17,6 @@ import {
 import { getIntl } from "@/i18n"
 import { isLoggedInUser } from "@/utils/isLoggedInUser"
 import * as maskValue from "@/utils/maskValue"
-import { parseRefId } from "@/utils/refId"
 
 import AdditionalInfoForm from "../../FindMyBooking/AdditionalInfoForm"
 import accessBooking, {
@@ -31,7 +31,7 @@ import Tracking from "./tracking"
 
 import styles from "./receipt.module.css"
 
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
 
 export async function Receipt({ refId }: { refId: string }) {
   const { confirmationNumber, lastName } = parseRefId(refId)

apps/scandic-web/components/HotelReservation/MyStay/accessBooking.test.ts

@@ -8,8 +8,9 @@ import accessBooking, {
   ERROR_UNAUTHORIZED,
 } from "./accessBooking"
 
+import type { Guest } from "@scandic-hotels/trpc/routers/booking/output"
+
 import type { SafeUser } from "@/types/user"
-import type { Guest } from "@/server/routers/booking/output"
 
 describe("Access booking", () => {
   describe("for logged in booking", () => {

apps/scandic-web/components/HotelReservation/MyStay/accessBooking.ts

@@ -1,5 +1,6 @@
+import type { Guest } from "@scandic-hotels/trpc/routers/booking/output"
+
 import type { SafeUser } from "@/types/user"
-import type { Guest } from "@/server/routers/booking/output"
 
 export {
   ACCESS_GRANTED,

apps/scandic-web/components/HotelReservation/MyStay/index.tsx

@@ -4,6 +4,7 @@ import { notFound } from "next/navigation"
 import { dt } from "@scandic-hotels/common/dt"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 import { BreakfastPackageEnum } from "@scandic-hotels/trpc/enums/breakfast"
+import { parseRefId } from "@scandic-hotels/trpc/utils/refId"
 
 import { env } from "@/env/server"
 import {
@@ -35,14 +36,13 @@ import { getIntl } from "@/i18n"
 import MyStayProvider from "@/providers/MyStay"
 import { isLoggedInUser } from "@/utils/isLoggedInUser"
 import * as maskValue from "@/utils/maskValue"
-import { parseRefId } from "@/utils/refId"
 import { getCurrentWebUrl } from "@/utils/url"
 
 import styles from "./index.module.css"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
 
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 import type { SafeUser } from "@/types/user"
 
 export default async function MyStay(props: {

apps/scandic-web/components/HotelReservation/MyStay/utils/mapRoomDetails.ts

@@ -1,20 +1,21 @@
 import { dt } from "@scandic-hotels/common/dt"
+import { BookingStatusEnum } from "@scandic-hotels/trpc/enums/bookingStatus"
 import { BreakfastPackageEnum } from "@scandic-hotels/trpc/enums/breakfast"
 import { PackageTypeEnum } from "@scandic-hotels/trpc/enums/packages"
 import { RoomPackageCodeEnum } from "@scandic-hotels/trpc/enums/roomFilter"
 
-import { BookingStatusEnum, CancellationRuleEnum } from "@/constants/booking"
+import { CancellationRuleEnum } from "@/constants/booking"
 
 import { convertToChildType } from "../../utils/convertToChildType"
 import { getPriceType } from "../../utils/getPriceType"
 import { formatChildBedPreferences } from "../utils"
 
 import type { RateEnum } from "@scandic-hotels/trpc/enums/rate"
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
 import type { Room } from "@scandic-hotels/trpc/types/hotel"
 
 import type { BreakfastPackage } from "@/types/components/hotelReservation/breakfast"
 import type { Room as MyStayRoom } from "@/types/stores/my-stay"
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 
 interface MapRoomDetailsParams {
   booking: BookingConfirmation["booking"]

apps/scandic-web/components/HotelReservation/SelectHotel/helpers.ts

@@ -1,13 +1,5 @@
 import { AvailabilityEnum } from "@scandic-hotels/trpc/enums/selectHotel"
 import { generateChildrenString } from "@scandic-hotels/trpc/routers/hotels/helpers"
-import {
-  type AdditionalData,
-  type Hotel,
-} from "@scandic-hotels/trpc/types/hotel"
-import {
-  type HotelLocation,
-  type Location,
-} from "@scandic-hotels/trpc/types/locations"
 
 import { getHotel } from "@/lib/trpc/memoizedRequests"
 import { serverClient } from "@/lib/trpc/server"
@@ -16,6 +8,11 @@ import { getLang } from "@/i18n/serverContext"
 
 import type { HotelsAvailabilityItem } from "@scandic-hotels/trpc/types/availability"
 import type { Child } from "@scandic-hotels/trpc/types/child"
+import type { AdditionalData, Hotel } from "@scandic-hotels/trpc/types/hotel"
+import type {
+  HotelLocation,
+  Location,
+} from "@scandic-hotels/trpc/types/locations"
 
 import type {
   AlternativeHotelsAvailabilityInput,

apps/scandic-web/components/HotelReservation/utils/convertToChildType.ts

@@ -1,9 +1,8 @@
 import { ChildBedMapEnum } from "@scandic-hotels/trpc/enums/childBedMapEnum"
 
+import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConfirmation"
 import type { Child } from "@scandic-hotels/trpc/types/child"
 
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
-
 export function convertToChildType(
   childrenAges: number[],
   childBedPreferences: BookingConfirmation["booking"]["childBedPreferences"]