TS refactoring

frontend/.eslintrc.cjs

@@ -69,6 +69,7 @@ module.exports = {
       rules: {
         '@typescript-eslint/prefer-nullish-coalescing': 'error',
         '@typescript-eslint/prefer-optional-chain': 'error',
+        'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
       },
     },
 

frontend/__tests__/components/anchor-link.test.tsx

@@ -2,7 +2,8 @@ import { fireEvent, render } from '@testing-library/react';
 
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import { AnchorLink, type AnchorLinkProps } from '~/components/anchor-link';
+import { AnchorLink } from '~/components/anchor-link';
+import type { AnchorLinkProps } from '~/components/anchor-link';
 import { scrollAndFocusFromAnchorLink } from '~/utils/link-utils';
 
 vi.mock('~/utils/link-utils', () => ({

frontend/__tests__/services/letters-service.server.test.ts

@@ -3,7 +3,8 @@ import { setupServer } from 'msw/node';
 import { afterAll, afterEach, beforeAll, describe, expect, expectTypeOf, it, vi } from 'vitest';
 
 import { getLetterEntities } from '~/mocks/power-platform-api.server';
-import { type LettersInfo, getLettersService } from '~/services/letters-service.server';
+import { getLettersService } from '~/services/letters-service.server';
+import type { LettersInfo } from '~/services/letters-service.server';
 
 vi.mock('~/utils/logging.server', () => ({
   getLogger: vi.fn().mockReturnValue({

frontend/__tests__/services/wsaddress-service.server.test.ts

@@ -2,7 +2,8 @@ import { HttpResponse, http } from 'msw';
 import { setupServer } from 'msw/node';
 import { afterAll, afterEach, beforeAll, describe, expectTypeOf, it, vi } from 'vitest';
 
-import { type CorrectWSAddressResponseDTO, type ParseWSAddressResponseDTO, type ValidateWSAddressResponseDTO, getWSAddressService } from '~/services/wsaddress-service.server';
+import { getWSAddressService } from '~/services/wsaddress-service.server';
+import type { CorrectWSAddressResponseDTO, ParseWSAddressResponseDTO, ValidateWSAddressResponseDTO } from '~/services/wsaddress-service.server';
 
 vi.mock('~/utils/logging.server', () => ({
   getLogger: vi.fn().mockReturnValue({

frontend/__tests__/utils/route-utils.test.tsx

@@ -5,7 +5,8 @@ import { createRemixStub } from '@remix-run/testing';
 
 import { describe, expect, it } from 'vitest';
 
-import { type Breadcrumbs, type BuildInfo, coalesce, useBreadcrumbs, useBuildInfo, useI18nNamespaces, usePageIdentifier, usePageTitleI18nKey } from '~/utils/route-utils';
+import { coalesce, useBreadcrumbs, useBuildInfo, useI18nNamespaces, usePageIdentifier, usePageTitleI18nKey } from '~/utils/route-utils';
+import type { Breadcrumbs, BuildInfo, RouteHandleData } from '~/utils/route-utils';
 
 describe('coalesce<T> reducer', () => {
   it('expect undefined from two undefined values', () => {

frontend/app/components/buttons.tsx

@@ -1,4 +1,5 @@
-import { type ComponentProps, forwardRef } from 'react';
+import { forwardRef } from 'react';
+import type { ComponentProps } from 'react';
 
 import { Link } from '@remix-run/react';
 

frontend/app/components/client-env.tsx

@@ -1,6 +1,6 @@
-import { type ScriptProps } from '@remix-run/react/dist/components';
+import type { ScriptProps } from '@remix-run/react/dist/components';
 
-import { type PublicEnv } from '~/utils/env.server';
+import type { PublicEnv } from '~/utils/env.server';
 
 export type ClientEnvProps = ScriptProps & { env: PublicEnv };
 

frontend/app/components/input-checkbox.tsx

@@ -1,4 +1,4 @@
-import { type ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import { cn } from '~/utils/tw-utils';
 

frontend/app/components/input-radio.tsx

@@ -1,4 +1,4 @@
-import { type ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
 import { cn } from '~/utils/tw-utils';
 

frontend/app/components/input-select.tsx

@@ -1,4 +1,5 @@
-import { type ComponentProps, type ReactNode, forwardRef } from 'react';
+import { forwardRef } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 
 import { InputError } from './input-error';
 import { InputHelp } from './input-help';

frontend/app/components/language-switcher.tsx

@@ -1,10 +1,11 @@
-import { type MouseEvent } from 'react';
+import type { MouseEvent } from 'react';
 
 import { useSearchParams } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';
 
-import { InlineLink, type InlineLinkProps } from './inline-link';
+import { InlineLink } from './inline-link';
+import type { InlineLinkProps } from './inline-link';
 import { getClientEnv } from '~/utils/env-utils';
 import { getAltLanguage, switchLanguageCookie } from '~/utils/locale-utils';
 

frontend/app/components/nonce-context.tsx

@@ -1,4 +1,5 @@
-import { type ReactNode, createContext } from 'react';
+import { createContext } from 'react';
+import type { ReactNode } from 'react';
 
 import { randomBytes } from 'node:crypto';
 

frontend/app/components/session-timeout.tsx

@@ -3,7 +3,8 @@ import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';
-import { type IIdleTimerProps, useIdleTimer } from 'react-idle-timer';
+import { useIdleTimer } from 'react-idle-timer';
+import type { IIdleTimerProps } from 'react-idle-timer';
 
 import { Button } from './buttons';
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from '~/components/dialog';

frontend/app/components/toaster.tsx

@@ -1,9 +1,11 @@
-import { ComponentProps, forwardRef, useEffect } from 'react';
+import { forwardRef, useEffect } from 'react';
+import type { ComponentProps } from 'react';
 
 import { AlertCircle as AlertCircleIcon, AlertTriangle as AlertTriangleIcon, CheckCircle2 as CheckCircle2Icon, XCircle as XCircleIcon } from 'lucide-react';
 import { MaterialDesignContent, SnackbarProvider, enqueueSnackbar } from 'notistack';
 import { useTranslation } from 'react-i18next';
-import { type ToastMessage, setToastCookieOptions } from 'remix-toast';
+import { setToastCookieOptions } from 'remix-toast';
+import type { ToastMessage } from 'remix-toast';
 
 import { useI18nNamespaces } from '~/utils/route-utils';
 import { cn } from '~/utils/tw-utils';

frontend/app/entry.server.tsx

@@ -1,5 +1,5 @@
-import type { EntryContext } from '@remix-run/node';
 import { createReadableStreamFromReadable } from '@remix-run/node';
+import type { EntryContext } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
 
 import { isbot } from 'isbot';

frontend/app/mocks/power-platform-api.server.ts

@@ -1,4 +1,5 @@
-import jsonpatch, { type Operation } from 'fast-json-patch';
+import jsonpatch from 'fast-json-patch';
+import type { Operation } from 'fast-json-patch';
 import { HttpResponse, http } from 'msw';
 import { z } from 'zod';
 

frontend/app/mocks/raoidc.server.ts

@@ -5,7 +5,7 @@ import { HttpResponse, http } from 'msw';
 import { privateKeyPemToCryptoKey, publicKeyPemToCryptoKey } from '~/utils/crypto-utils.server';
 import { getEnv } from '~/utils/env.server';
 import { getLogger } from '~/utils/logging.server';
-import { type JWKSet, type ServerMetadata, type TokenEndpointResponse, type UserinfoResponse } from '~/utils/raoidc-utils.server';
+import type { JWKSet, ServerMetadata, TokenEndpointResponse, UserinfoResponse } from '~/utils/raoidc-utils.server';
 
 const log = getLogger('raoidc.server');
 

frontend/app/root.tsx

@@ -1,6 +1,7 @@
 import { Suspense, useContext } from 'react';
 
-import { type LinksFunction, type LoaderFunctionArgs, json } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import type { LinksFunction, LoaderFunctionArgs } from '@remix-run/node';
 import { Links, LiveReload, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';

frontend/app/routes/_gcweb-app.$.tsx

@@ -5,6 +5,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import { InlineLink } from '~/components/inline-link';
 import { PageTitle } from '~/components/page-title';
 import { getTypedI18nNamespaces } from '~/utils/locale-utils';
+import type { RouteHandleData } from '~/utils/route-utils';
 
 const i18nNamespaces = getTypedI18nNamespaces('gcweb');
 

frontend/app/routes/_gcweb-app._index.tsx

@@ -1,13 +1,15 @@
 import type { ComponentProps, ReactNode } from 'react';
 
-import { type LoaderFunctionArgs, json } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import type { LoaderFunctionArgs } from '@remix-run/node';
 import { Link, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';
 
 import { getRaoidcService } from '~/services/raoidc-service.server';
 import { getUserService } from '~/services/user-service.server';
 import { getTypedI18nNamespaces } from '~/utils/locale-utils';
+import type { RouteHandleData } from '~/utils/route-utils';
 
 const i18nNamespaces = getTypedI18nNamespaces('index');
 

frontend/app/routes/_gcweb-app.letters.$referenceId.download.tsx

@@ -1,4 +1,4 @@
-import { type LoaderFunctionArgs } from '@remix-run/node';
+import type { LoaderFunctionArgs } from '@remix-run/node';
 
 import { getCCTService } from '~/services/cct-service.server';
 import { getRaoidcService } from '~/services/raoidc-service.server';

frontend/app/routes/_gcweb-app.letters._index.tsx

@@ -1,6 +1,8 @@
-import { type ChangeEvent, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
+import type { ChangeEvent } from 'react';
 
-import { type LoaderFunctionArgs, json } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import type { LoaderFunctionArgs } from '@remix-run/node';
 import { Link, useLoaderData, useSearchParams } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';
@@ -11,6 +13,7 @@ import { getLettersService } from '~/services/letters-service.server';
 import { getRaoidcService } from '~/services/raoidc-service.server';
 import { getUserService } from '~/services/user-service.server';
 import { getTypedI18nNamespaces } from '~/utils/locale-utils';
+import type { RouteHandleData } from '~/utils/route-utils';
 
 const i18nNamespaces = getTypedI18nNamespaces('letters');
 

frontend/app/routes/_gcweb-app.personal-information._index.tsx

@@ -1,6 +1,7 @@
 import type { ReactNode } from 'react';
 
-import { type LoaderFunctionArgs, json } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import type { LoaderFunctionArgs } from '@remix-run/node';
 import { useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';
@@ -12,6 +13,7 @@ import { getLookupService } from '~/services/lookup-service.server';
 import { getRaoidcService } from '~/services/raoidc-service.server';
 import { getUserService } from '~/services/user-service.server';
 import { getNameByLanguage, getTypedI18nNamespaces } from '~/utils/locale-utils';
+import type { RouteHandleData } from '~/utils/route-utils';
 
 const i18nNamespaces = getTypedI18nNamespaces('personal-information');
 

frontend/app/routes/_gcweb-app.personal-information.home-address.address-accuracy.tsx

@@ -1,4 +1,5 @@
-import { type ActionFunctionArgs, type LoaderFunctionArgs, json, redirect } from '@remix-run/node';
+import { json, redirect } from '@remix-run/node';
+import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
 import { Form, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';

frontend/app/routes/_gcweb-app.personal-information.home-address.confirm.tsx

@@ -1,4 +1,5 @@
-import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
 import { Form, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';

frontend/app/routes/_gcweb-app.personal-information.home-address.edit.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 
-import { type ActionFunctionArgs, type LoaderFunctionArgs, json, redirect } from '@remix-run/node';
+import { json, redirect } from '@remix-run/node';
+import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
 import { Form, useActionData, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';
@@ -9,15 +10,16 @@ import { z } from 'zod';
 import { Button, ButtonLink } from '~/components/buttons';
 import { ErrorSummary, createErrorSummaryItems, hasErrors, scrollAndFocusToErrorSummary } from '~/components/error-summary';
 import { InputField } from '~/components/input-field';
-import { type InputOptionProps } from '~/components/input-option';
+import type { InputOptionProps } from '~/components/input-option';
 import { InputSelect } from '~/components/input-select';
 import { getAddressService } from '~/services/address-service.server';
-import { type RegionInfo } from '~/services/lookup-service.server';
 import { getLookupService } from '~/services/lookup-service.server';
+import type { RegionInfo } from '~/services/lookup-service.server';
 import { getRaoidcService } from '~/services/raoidc-service.server';
 import { getSessionService } from '~/services/session-service.server';
 import { getUserService } from '~/services/user-service.server';
 import { getTypedI18nNamespaces } from '~/utils/locale-utils';
+import type { RouteHandleData } from '~/utils/route-utils';
 
 const i18nNamespaces = getTypedI18nNamespaces('personal-information', 'gcweb');
 

frontend/app/routes/_gcweb-app.personal-information.home-address.suggested.tsx

@@ -1,4 +1,5 @@
-import { type ActionFunctionArgs, type LoaderFunctionArgs, json, redirect } from '@remix-run/node';
+import { json, redirect } from '@remix-run/node';
+import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
 import { Form, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';

frontend/app/routes/_gcweb-app.personal-information.mailing-address.address-accuracy.tsx

@@ -1,4 +1,5 @@
-import { type ActionFunctionArgs, type LoaderFunctionArgs, json, redirect } from '@remix-run/node';
+import { json, redirect } from '@remix-run/node';
+import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
 import { Form, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';

frontend/app/routes/_gcweb-app.personal-information.mailing-address.confirm.tsx

@@ -1,4 +1,5 @@
-import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
 import { Form, useLoaderData } from '@remix-run/react';
 
 import { useTranslation } from 'react-i18next';