Merged in feat/sw-2861-move-autocomplete-router-to-trpc-package (pull request #2417)

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

* Apply lint rules

* 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

* Merge branch 'master' into feat/sw-2861-move-autocomplete-router-to-trpc-package


Approved-by: Linus Flood

apps/scandic-web/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/index.tsx

@@ -3,8 +3,9 @@ import Body from "@/components/TempDesignSystem/Text/Body"
 
 import { listItemVariants } from "./variants"
 
+import type { AutoCompleteLocation } from "@scandic-hotels/trpc/routers/autocomplete/schema"
+
 import type { SearchListProps } from "@/types/components/search"
-import type { AutoCompleteLocation } from "@/server/routers/autocomplete/schema"
 
 export interface ListItemProps
   extends Pick<SearchListProps, "getItemProps" | "highlightedIndex"> {

apps/scandic-web/components/Forms/BookingWidget/FormContent/Search/SearchList/List/index.tsx

@@ -5,8 +5,9 @@ import ListItem, { ListItemSkeleton } from "./ListItem"
 
 import styles from "./list.module.css"
 
+import type { AutoCompleteLocation } from "@scandic-hotels/trpc/routers/autocomplete/schema"
+
 import type { SearchListProps } from "@/types/components/search"
-import type { AutoCompleteLocation } from "@/server/routers/autocomplete/schema"
 
 interface ListProps
   extends Pick<SearchListProps, "getItemProps" | "highlightedIndex"> {

apps/scandic-web/components/Forms/BookingWidget/FormContent/Search/index.tsx

@@ -10,8 +10,6 @@ import { Button } from "@scandic-hotels/design-system/Button"
 import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 
-import { type AutoCompleteLocation } from "@/server/routers/autocomplete/schema"
-
 import SkeletonShimmer from "@/components/SkeletonShimmer"
 import { useSearchHistory } from "@/hooks/useSearchHistory"
 
@@ -20,6 +18,8 @@ import SearchList from "./SearchList"
 
 import styles from "./search.module.css"
 
+import type { AutoCompleteLocation } from "@scandic-hotels/trpc/routers/autocomplete/schema"
+
 interface SearchProps {
   autoFocus?: boolean
   alwaysShowResults?: boolean

apps/scandic-web/components/SidePeeks/AmenitiesSidepeekContent/Accordions/Breakfast.tsx

@@ -2,11 +2,10 @@
 
 import { useIntl } from "react-intl"
 
+import { isDefined } from "@scandic-hotels/common/utils/isDefined"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 import { HotelTypeEnum } from "@scandic-hotels/trpc/enums/hotelType"
 
-import { isDefined } from "@/server/utils"
-
 import { IconName } from "@/components/Icons/iconName"
 import OpeningHours from "@/components/OpeningHours"
 import AccordionItem from "@/components/TempDesignSystem/Accordion/AccordionItem"

apps/scandic-web/hooks/useSearchHistory.ts

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from "react"
 import {
   type AutoCompleteLocation,
   autoCompleteLocationSchema,
-} from "@/server/routers/autocomplete/schema"
+} from "@scandic-hotels/trpc/routers/autocomplete/schema"
 
 import useLang from "@/hooks/useLang"
 

apps/scandic-web/lib/trpc/memoizedRequests/index.ts

@@ -1,7 +1,8 @@
 import { redirect } from "next/navigation"
 
-import { isDefined } from "@/server/utils"
+import { isDefined } from "@scandic-hotels/common/utils/isDefined"
 
+// import { isDefined } from "@/server/utils"
 import { getLang } from "@/i18n/serverContext"
 import { cache } from "@/utils/cache"
 

apps/scandic-web/server/index.ts

@@ -1,10 +1,10 @@
 /** Routers */
 import { router } from "@scandic-hotels/trpc"
+import { autocompleteRouter } from "@scandic-hotels/trpc/routers/autocomplete"
 import { contentstackRouter } from "@scandic-hotels/trpc/routers/contentstack"
 import { hotelsRouter } from "@scandic-hotels/trpc/routers/hotels"
 import { partnerRouter } from "@scandic-hotels/trpc/routers/partners"
 
-import { autocompleteRouter } from "./routers/autocomplete"
 import { bookingRouter } from "./routers/booking"
 import { navigationRouter } from "./routers/navigation"
 import { userRouter } from "./routers/user"

apps/scandic-web/server/utils.ts

@@ -2,10 +2,6 @@ import { NextRequest } from "next/server"
 
 import { env } from "@/env/server"
 
-export function isDefined<T>(argument: T | undefined | null): argument is T {
-  return argument !== undefined && argument !== null
-}
-
 /**
  * Use this function when you want to create URLs that are public facing, for
  * example for redirects or redirectTo query parameters.

apps/scandic-web/services/warmup/wamupAutoCompleteLocations.ts

@@ -1,6 +1,5 @@
 import { getServiceToken } from "@scandic-hotels/common/tokenManager"
-
-import { getAutoCompleteDestinationsData } from "@/server/routers/autocomplete/destinations"
+import { getAutoCompleteDestinationsData } from "@scandic-hotels/trpc/routers/autocomplete/destinations"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"
 

apps/scandic-web/types/components/search.ts

@@ -1,8 +1,9 @@
+import type { AutoCompleteLocation } from "@scandic-hotels/trpc/routers/autocomplete/schema"
 import type { VariantProps } from "class-variance-authority"
 import type { PropGetters } from "downshift"
 
 import type { dialogVariants } from "@/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/variants"
-import type { AutoCompleteLocation } from "@/server/routers/autocomplete/schema"
+// import type { AutoCompleteLocation } from "@/server/routers/autocomplete/schema"
 
 export interface SearchProps {
   handlePressEnter: () => void

packages/common/package.json

@@ -21,6 +21,7 @@
     "./utils/url": "./utils/url.ts",
     "./utils/languages": "./utils/languages.ts",
     "./utils/chunk": "./utils/chunk.ts",
+    "./utils/isDefined": "./utils/isDefined.ts",
     "./utils/zod/stringValidator": "./utils/zod/stringValidator.ts",
     "./utils/zod/numberValidator": "./utils/zod/numberValidator.ts",
     "./utils/zod/arrayValidator": "./utils/zod/arrayValidator.ts",

packages/common/utils/isDefined.ts

@@ -0,0 +1,3 @@
+export function isDefined<T>(argument: T | undefined | null): argument is T {
+  return argument !== undefined && argument !== null
+}

packages/trpc/lib/routers/autocomplete/destinations.ts

@@ -2,20 +2,19 @@ import { z } from "zod"
 
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { getCacheClient } from "@scandic-hotels/common/dataCache"
+import { isDefined } from "@scandic-hotels/common/utils/isDefined"
 import { safeTry } from "@scandic-hotels/common/utils/safeTry"
-import { safeProtectedServiceProcedure } from "@scandic-hotels/trpc/procedures"
-import { getCityPageUrls } from "@scandic-hotels/trpc/routers/contentstack/destinationCityPage/utils"
-import { getCountryPageUrls } from "@scandic-hotels/trpc/routers/contentstack/destinationCountryPage/utils"
-import { getHotelPageUrls } from "@scandic-hotels/trpc/routers/contentstack/hotelPage/utils"
+
+import { safeProtectedServiceProcedure } from "../../procedures"
+import { getCityPageUrls } from "../../routers/contentstack/destinationCityPage/utils"
+import { getCountryPageUrls } from "../../routers/contentstack/destinationCountryPage/utils"
+import { getHotelPageUrls } from "../../routers/contentstack/hotelPage/utils"
 import {
   getCitiesByCountry,
   getCountries,
   getLocations,
-} from "@scandic-hotels/trpc/routers/hotels/utils"
-import { ApiCountry, type Country } from "@scandic-hotels/trpc/types/country"
-
-import { isDefined } from "@/server/utils"
-
+} from "../../routers/hotels/utils"
+import { ApiCountry, type Country } from "../../types/country"
 import { filterAndCategorizeAutoComplete } from "./util/filterAndCategorizeAutoComplete"
 import { mapLocationToAutoCompleteLocation } from "./util/mapLocationToAutoCompleteLocation"
 

packages/trpc/lib/routers/autocomplete/index.ts

@@ -1,5 +1,4 @@
-import { router } from "@scandic-hotels/trpc"
-
+import { router } from "../.."
 import { getDestinationsAutoCompleteRoute } from "./destinations"
 
 export const autocompleteRouter = router({

packages/trpc/lib/routers/autocomplete/util/filterAutoCompleteLocations.test.ts

@@ -1,8 +1,8 @@
-import { describe, expect, it } from "@jest/globals"
+import { describe, expect, it } from "vitest"
 
 import { filterAutoCompleteLocations } from "./filterAutoCompleteLocations"
 
-import type { DeepPartial } from "@/types/DeepPartial"
+import type { DeepPartial } from "../../../types/deepPartial"
 import type { AutoCompleteLocation } from "../schema"
 
 describe("rankAutoCompleteLocations", () => {

packages/trpc/lib/routers/autocomplete/util/getSearchTokens.test.ts

@@ -1,10 +1,10 @@
-import { describe, expect, it } from "@jest/globals"
+import { describe, expect, it } from "vitest"
 
 import { getSearchTokens } from "./getSearchTokens"
 
 import type { Location } from "@scandic-hotels/trpc/types/locations"
 
-import type { DeepPartial } from "@/types/DeepPartial"
+import type { DeepPartial } from "../../../types/deepPartial"
 
 describe("getSearchTokens", () => {
   it("should return lowercased tokens for a hotel location", () => {
@@ -28,16 +28,18 @@ describe("getSearchTokens", () => {
     }
 
     const result = getSearchTokens(location as Location)
-    expect(result).toEqual([
-      "ångström",
-      "café",
-      "münchen",
-      "frånce",
-      "angstrom",
-      "cafe",
-      "munchen",
-      "france",
-    ])
+    expect(result.toSorted()).toEqual(
+      [
+        "ångström",
+        "café",
+        "münchen",
+        "frånce",
+        "angstrom",
+        "cafe",
+        "munchen",
+        "france",
+      ].toSorted()
+    )
   })
 
   it("should filter out empty or falsey tokens", () => {

packages/trpc/lib/routers/autocomplete/util/getSearchTokens.ts

@@ -1,6 +1,6 @@
 import { normalizeAumlauts } from "./normalizeAumlauts"
 
-import type { Location } from "@scandic-hotels/trpc/types/locations"
+import type { Location } from "../../../types/locations"
 
 export function getSearchTokens(location: Location) {
   const tokens = [

packages/trpc/lib/routers/autocomplete/util/mapLocationToAutoCompleteLocation.ts

@@ -1,7 +1,6 @@
 import { getSearchTokens } from "./getSearchTokens"
 
-import type { Location } from "@scandic-hotels/trpc/types/locations"
-
+import type { Location } from "../../../types/locations"
 import type { AutoCompleteLocation } from "../schema"
 
 export function mapLocationToAutoCompleteLocation(

packages/trpc/lib/routers/hotels/query.ts

@@ -2,6 +2,24 @@ import { Lang } from "@scandic-hotels/common/constants/language"
 import { getCacheClient } from "@scandic-hotels/common/dataCache"
 import { dt } from "@scandic-hotels/common/dt"
 import { createCounter } from "@scandic-hotels/common/telemetry"
+
+import { env } from "../../../env/server"
+import { router } from "../.."
+import * as api from "../../api"
+import { REDEMPTION } from "../../constants/booking"
+import { BreakfastPackageEnum } from "../../enums/breakfast"
+import { RateEnum } from "../../enums/rate"
+import { RateTypeEnum } from "../../enums/rateType"
+import { AvailabilityEnum } from "../../enums/selectHotel"
+import { badRequestError, unauthorizedError } from "../../errors"
+import {
+  contentStackBaseWithServiceProcedure,
+  publicProcedure,
+  safeProtectedServiceProcedure,
+  serviceProcedure,
+} from "../../procedures"
+import { getCityPageUrls } from "../../routers/contentstack/destinationCityPage/utils"
+import { getHotelPageUrls } from "../../routers/contentstack/hotelPage/utils"
 import {
   ancillaryPackageInputSchema,
   breakfastPackageInputSchema,
@@ -23,46 +41,30 @@ import {
   roomPackagesInputSchema,
   selectRateRoomAvailabilityInputSchema,
   selectRateRoomsAvailabilityInputSchema,
-} from "@scandic-hotels/trpc/routers/hotels/input"
+} from "../../routers/hotels/input"
 import {
   ancillaryPackagesSchema,
   breakfastPackagesSchema,
   getNearbyHotelIdsSchema,
-} from "@scandic-hotels/trpc/routers/hotels/output"
-import { additionalDataSchema } from "@scandic-hotels/trpc/routers/hotels/schemas/hotel/include/additionalData"
-
-import { env } from "../../../env/server"
-import { router } from "../.."
-import * as api from "../../api"
-import { REDEMPTION } from "../../constants/booking"
-import { BreakfastPackageEnum } from "../../enums/breakfast"
-import { RateEnum } from "../../enums/rate"
-import { RateTypeEnum } from "../../enums/rateType"
-import { AvailabilityEnum } from "../../enums/selectHotel"
-import { badRequestError, unauthorizedError } from "../../errors"
-import {
-  contentStackBaseWithServiceProcedure,
-  publicProcedure,
-  safeProtectedServiceProcedure,
-  serviceProcedure,
-} from "../../procedures"
-import { getCityPageUrls } from "../../routers/contentstack/destinationCityPage/utils"
-import { getHotelPageUrls } from "../../routers/contentstack/hotelPage/utils"
+} from "../../routers/hotels/output"
+import { additionalDataSchema } from "../../routers/hotels/schemas/hotel/include/additionalData"
 import { toApiLang } from "../../utils"
 import { getVerifiedUser } from "../user/utils"
 import { meetingRoomsSchema } from "./schemas/meetingRoom"
 import {
-  getBedTypes,
   getCitiesByCountry,
   getCountries,
   getHotel,
   getHotelIdsByCityId,
   getHotelIdsByCityIdentifier,
   getHotelIdsByCountry,
-  getHotelsAvailabilityByCity,
-  getHotelsAvailabilityByHotelIds,
   getHotelsByHotelIds,
   getLocations,
+} from "./utils"
+import {
+  getBedTypes,
+  getHotelsAvailabilityByCity,
+  getHotelsAvailabilityByHotelIds,
   getPackages,
   getRoomsAvailability,
   getSelectedRoomAvailability,

packages/trpc/package.json

@@ -6,7 +6,9 @@
   "scripts": {
     "check-types": "tsc --noEmit",
     "lint": "eslint . --max-warnings 0 && tsc --noEmit",
-    "lint:fix": "eslint . --fix && tsc --noEmit"
+    "lint:fix": "eslint . --fix && tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "exports": {
     ".": "./lib/index.ts",
@@ -24,6 +26,7 @@
     "./routers/booking/*": "./lib/routers/booking/*.ts",
     "./routers/user/*": "./lib/routers/user/*.ts",
     "./routers/partners/*": "./lib/routers/partners/*.ts",
+    "./routers/autocomplete/*": "./lib/routers/autocomplete/*.ts",
     "./enums/*": "./lib/enums/*.ts",
     "./types/*": "./lib/types/*.ts",
     "./constants/*": "./lib/constants/*.ts",
@@ -46,6 +49,7 @@
     "dayjs": "^1.11.13",
     "deepmerge": "^4.3.1",
     "fetch-retry": "^6.0.0",
+    "fuse.js": "^7.1.0",
     "graphql": "^16.11.0",
     "graphql-request": "^7.1.2",
     "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -68,9 +72,11 @@
     "@types/react": "19.1.0",
     "@typescript-eslint/eslint-plugin": "^8.32.0",
     "@typescript-eslint/parser": "^8.32.0",
+    "dotenv": "^16.5.0",
     "eslint": "^9",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "vitest": "^3.2.3"
   }
 }

packages/trpc/vitest-setup.ts

@@ -0,0 +1,3 @@
+import { config } from "dotenv"
+
+config({ path: "./.env.test" })

packages/trpc/vitest.config.js

@@ -0,0 +1,7 @@
+export default {
+  test: {
+    globals: true,
+    environment: "jsdom",
+    setupFiles: ["./vitest-setup.ts"],
+  },
+}

yarn.lock

@@ -7254,10 +7254,12 @@ __metadata:
     "@typescript-eslint/parser": "npm:^8.32.0"
     dayjs: "npm:^1.11.13"
     deepmerge: "npm:^4.3.1"
+    dotenv: "npm:^16.5.0"
     eslint: "npm:^9"
     eslint-plugin-import: "npm:^2.31.0"
     eslint-plugin-simple-import-sort: "npm:^12.1.1"
     fetch-retry: "npm:^6.0.0"
+    fuse.js: "npm:^7.1.0"
     graphql: "npm:^16.11.0"
     graphql-request: "npm:^7.1.2"
     json-stable-stringify-without-jsonify: "npm:^1.0.1"
@@ -7266,6 +7268,7 @@ __metadata:
     slugify: "npm:^1.6.6"
     superjson: "npm:^2.2.2"
     typescript: "npm:5.8.3"
+    vitest: "npm:^3.2.3"
     zod: "npm:^3.24.4"
   peerDependencies:
     next: ^15