refactor: refactor transport mode to a module

src/components/line-chip/index.tsx

@@ -1,13 +1,11 @@
+import { Typo } from '@atb/components/typography';
+import style from './line-chip.module.css';
 import {
   TransportIcon,
-  useTransportationThemeColor,
-} from '@atb/components/transport-mode/transport-icon';
-import {
   TransportModeType,
   TransportSubmodeType,
-} from '@atb/components/transport-mode/types';
-import { Typo } from '@atb/components/typography';
-import style from './line-chip.module.css';
+  useTransportationThemeColor,
+} from '@atb/modules/transport-mode';
 
 export type LineChipProps = {
   transportMode: TransportModeType;

src/components/map/map-header.tsx

@@ -1,12 +1,13 @@
 import style from './map.module.css';
-
 import { ButtonLink } from '@atb/components/button';
 import { ComponentText, useTranslation } from '@atb/translations';
 import { and } from '@atb/utils/css';
 import { MonoIcon } from '@atb/components/icon';
-import { transportModeToTranslatedString } from '@atb/components/transport-mode';
-import { getTransportModeIcon } from '@atb/components/transport-mode/transport-icon';
-import { TransportModeType } from '@atb/components/transport-mode/types';
+import {
+  type TransportModeType,
+  transportModeToTranslatedString,
+  getTransportModeIcon,
+} from '@atb/modules/transport-mode';
 
 export type MapHeaderProps = {
   id: string;

src/components/search/index.ts

@@ -0,0 +1,3 @@
+export { default } from './search';
+export { default as GeolocationButton } from './geolocation-button';
+export { default as SwapButton } from './swap-button';

src/modules/search-time/index.ts

@@ -1,3 +1,5 @@
 export { default as SearchTimeSelector } from './selector';
 
 export * from './types';
+
+export { parseSearchTimeQuery, searchTimeToQueryString } from './utils';

src/modules/search-time/utils.ts

@@ -15,3 +15,9 @@ export function parseSearchTimeQuery(
 
   return { mode: 'now' };
 }
+
+export function searchTimeToQueryString(searchTime: SearchTime) {
+  return searchTime.mode !== 'now'
+    ? { searchMode: searchTime.mode, searchTime: searchTime.dateTime }
+    : { searchMode: searchTime.mode };
+}

src/components/transport-mode-filter/__tests__/transport-mode-filter.test.tsx → src/modules/transport-mode/filter/__tests__/filter.test.tsx

@@ -1,9 +1,9 @@
 import { cleanup, render, screen } from '@testing-library/react';
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import TransportModeFilter from '@atb/components/transport-mode-filter';
-import { getInitialTransportModeFilter } from '@atb/components/transport-mode-filter/utils';
 import userEvent from '@testing-library/user-event';
-import { TransportModeFilterState } from '@atb/components/transport-mode-filter/types';
+import TransportModeFilter from '../filter';
+import { getInitialTransportModeFilter } from '../utils';
+import { TransportModeFilterState } from '../types';
 
 afterEach(() => cleanup());
 

src/components/transport-mode-filter/index.tsx → src/modules/transport-mode/filter/filter.tsx

@@ -1,17 +1,11 @@
 import { getTextForLanguage } from '@atb/translations/utils';
 import { useTranslation, ComponentText } from '@atb/translations';
-import style from './transport-mode-filter.module.css';
+import style from './filter.module.css';
 import { MonoIcon } from '@atb/components/icon';
-import {
-  TransportModeFilterOption,
-  TransportModeFilterState,
-} from '@atb/components/transport-mode-filter/types';
+import { TransportModeFilterOption, TransportModeFilterState } from './types';
 import { Typo } from '@atb/components/typography';
-import { getTransportModeIcon } from '@atb/components/transport-mode/transport-icon';
-import {
-  filterOptionsWithTransportModes,
-  setAllValues,
-} from '@atb/components/transport-mode-filter/utils';
+import { getTransportModeIcon } from '../icon';
+import { filterOptionsWithTransportModes, setAllValues } from './utils';
 
 type TransportModeFilterProps = {
   filterState: TransportModeFilterState;

src/modules/transport-mode/filter/index.ts

@@ -0,0 +1,13 @@
+export { default as TransportModeFilter } from './filter';
+
+export {
+  type TransportModeFilterOption,
+  type TransportModeFilterState,
+} from './types';
+
+export {
+  getAllTransportModesFromFilterOptions,
+  getInitialTransportModeFilter,
+  parseFilterQuery,
+  filterToQueryString,
+} from './utils';

src/modules/transport-mode/filter/types.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+
+export const transportModeFilterSchema = z.union([
+  z.literal('bus'),
+  z.literal('rail'),
+  z.literal('expressboat'),
+  z.literal('ferry'),
+  z.literal('airportbus'),
+  z.literal('air'),
+  z.literal('other'),
+]);
+
+export type TransportModeFilterOption = z.infer<
+  typeof transportModeFilterSchema
+>;
+
+export type TransportModeFilterState = Record<
+  TransportModeFilterOption,
+  boolean
+>;
+
+export { TransportModeFilterOptionType } from '@atb-as/config-specs';

src/components/transport-mode-filter/utils.ts → src/modules/transport-mode/filter/utils.ts

@@ -1,13 +1,20 @@
+import { uniq } from 'lodash';
 import {
   TransportModeFilterOption,
-  transportModeFilterOptions,
-  TransportModeFilterState,
-} from '@atb/components/transport-mode-filter/types';
-import {
   TransportModeFilterOptionType,
-  TransportModeType,
-} from '@atb-as/config-specs';
-import { uniq } from 'lodash';
+  TransportModeFilterState,
+} from './types';
+import { TransportModeType } from '../types';
+
+const transportModeFilterOptions: TransportModeFilterOption[] = [
+  'bus',
+  'rail',
+  'expressboat',
+  'ferry',
+  'airportbus',
+  'air',
+  'other',
+];
 
 export function getInitialTransportModeFilter(
   initialSelected?: TransportModeFilterOption[] | null,
@@ -50,8 +57,10 @@ export function parseFilterQuery(
 }
 
 export function getAllTransportModesFromFilterOptions(
-  filterOptions: TransportModeFilterOption[],
+  filterOptions: TransportModeFilterOption[] | null,
 ): TransportModeType[] {
+  if (!filterOptions) return [];
+
   const transportModes: TransportModeType[] = [];
 
   filterOptions.forEach((filterOption) => {

src/components/transport-mode/transport-icon/transport-icon.module.css → src/modules/transport-mode/icon/icon.module.css

@@ -1,17 +1,11 @@
 .transportIcons {
   display: flex;
-
-  /* Specialized sizing. */
-  /* @TODO investigate generic way to handle this */
   gap: 0.125rem;
 }
 
 .transportIcon,
 .transportIconWithLabel {
   display: inline-block;
-
-  /* Specialized sizing. */
-  /* @TODO investigate generic way to handle this */
   border-radius: var(--border-radius-small);
   padding: var(--spacings-xSmall);
 }

src/components/transport-mode/transport-icon/index.tsx → src/modules/transport-mode/icon/index.tsx

@@ -6,7 +6,7 @@ import { useTheme } from '@atb/modules/theme';
 
 import { useTranslation } from '@atb/translations';
 import { transportModeToTranslatedString } from '../utils';
-import style from './transport-icon.module.css';
+import style from './icon.module.css';
 import { colorToOverrideMode } from '@atb/utils/color';
 
 export type TransportIconsProps = {

src/modules/transport-mode/index.ts

@@ -0,0 +1,18 @@
+export {
+  type TransportModeType,
+  type TransportSubmodeType,
+  type TransportModeGroup,
+  transportModeSchema,
+  transportSubmodeSchema,
+} from './types';
+
+export {
+  transportModeToTranslatedString,
+  severalTransportModesToTranslatedStrings,
+  isTransportModeType,
+  isTransportSubmodeType,
+  filterGraphQlTransportModes,
+} from './utils';
+
+export * from './icon';
+export * from './filter';