refactor: Enable TS option verbatimModuleSyntax (#183)

backend/src/api/auth/local-login.ts

@@ -1,5 +1,5 @@
-import { FastifyPluginAsync } from 'fastify'
-import { authenticateLocal, LocalStrategyRequestBody } from '../../auth/local-strategy.js'
+import type { FastifyPluginAsync } from 'fastify'
+import { authenticateLocal, type LocalStrategyRequestBody } from '../../auth/local-strategy.js'
 
 export interface LocalLoginRoute {
   Body: LocalStrategyRequestBody

backend/src/api/auth/logout.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 import { authenticateSession } from '../../auth/common.js'
 
 export interface LogoutRoute {

backend/src/api/auth/me.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 import { forbidden } from '../errors.js'
 import { authenticateSession } from '../../auth/common.js'
 

backend/src/api/auth/oidc.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 import { authenticateOidc } from '../../auth/oidc-strategy.js'
 import { AuthStrategy } from '../../auth/common.js'
 

backend/src/api/auth/strategies.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 import { AuthStrategy } from '../../auth/common.js'
 
 export interface StrategiesRoute {

backend/src/api/cronjob.ts

@@ -1,5 +1,5 @@
-import { FastifyPluginAsync } from 'fastify'
-import { Controllers } from '../controllers.js'
+import type { FastifyPluginAsync } from 'fastify'
+import type { Controllers } from '../controllers.js'
 import cronParser from 'cron-parser'
 import { forbidden, notFound } from './errors.js'
 import { authenticateSession } from '../auth/common.js'

backend/src/api/errors.ts

@@ -1,4 +1,4 @@
-import { FastifyReply } from 'fastify'
+import type { FastifyReply } from 'fastify'
 
 export async function badRequest (reply: FastifyReply): Promise<FastifyReply> {
   return await reply.code(400).send({ error: 'Bad Request' })

backend/src/api/job-pods.ts

@@ -1,8 +1,8 @@
-import { FastifyPluginAsync } from 'fastify'
-import { Controllers } from '../controllers.js'
+import type { FastifyPluginAsync } from 'fastify'
+import type { Controllers } from '../controllers.js'
 import { forbidden, notFound } from './errors.js'
 import { authenticateSession } from '../auth/common.js'
-import { V1Pod } from '@kubernetes/client-node'
+import type { V1Pod } from '@kubernetes/client-node'
 import assert from 'node:assert'
 import { DEFAULT_NAMESPACE } from '../kubernetes/api.js'
 

backend/src/api/jobs.ts

@@ -1,8 +1,8 @@
-import { FastifyPluginAsync } from 'fastify'
-import { Controllers } from '../controllers.js'
+import type { FastifyPluginAsync } from 'fastify'
+import type { Controllers } from '../controllers.js'
 import { forbidden, notFound } from './errors.js'
 import { authenticateSession } from '../auth/common.js'
-import { V1Job } from '@kubernetes/client-node'
+import type { V1Job } from '@kubernetes/client-node'
 import assert from 'node:assert'
 import { DEFAULT_NAMESPACE } from '../kubernetes/api.js'
 import { ForemanAnnotations } from '../metadata.js'

backend/src/api/pod-logs.ts

@@ -1,5 +1,5 @@
-import { FastifyPluginAsync } from 'fastify'
-import { Controllers } from '../controllers.js'
+import type { FastifyPluginAsync } from 'fastify'
+import type { Controllers } from '../controllers.js'
 import { badRequest, forbidden, notFound } from './errors.js'
 import { authenticateSession } from '../auth/common.js'
 import { prettifyLogs } from '../renovate/prettify-logs.js'

backend/src/api/pod-progress.ts

@@ -1,9 +1,9 @@
-import { FastifyPluginAsync } from 'fastify'
-import { Controllers } from '../controllers.js'
+import type { FastifyPluginAsync } from 'fastify'
+import type { Controllers } from '../controllers.js'
 import { forbidden, notFound } from './errors.js'
 import { authenticateSession } from '../auth/common.js'
-import { extractProgress, ProgressItem } from '../renovate/progress.js'
-import { BackendConfig } from '../backend-config.js'
+import { extractProgress, type ProgressItem } from '../renovate/progress.js'
+import type { BackendConfig } from '../backend-config.js'
 
 export interface PodProgressRoute {
   Reply: ProgressItem[]

backend/src/api/trigger.ts

@@ -1,6 +1,6 @@
-import { FastifyPluginAsync } from 'fastify'
-import { Controllers } from '../controllers.js'
-import { boolean, Infer, object, optional, pattern, string } from 'superstruct'
+import type { FastifyPluginAsync } from 'fastify'
+import type { Controllers } from '../controllers.js'
+import { boolean, type Infer, object, optional, pattern, string } from 'superstruct'
 import { badRequest, forbidden } from './errors.js'
 import { authenticateSession } from '../auth/common.js'
 import assert from 'node:assert'

backend/src/auth/common.ts

@@ -1,5 +1,5 @@
-import { RouteHandlerMethod } from 'fastify'
-import fastifyPassport from '@fastify/passport'
+import type { RouteHandlerMethod } from 'fastify'
+import { fastifyPassport } from '../fastifyPassport.js'
 
 export enum AuthStrategy {
   LOCAL = 'local',

backend/src/auth/local-strategy.ts

@@ -1,9 +1,9 @@
 import { Strategy as LocalStrategy } from 'passport-local'
-import crypto, { BinaryLike, timingSafeEqual } from 'node:crypto'
+import crypto, { type BinaryLike, timingSafeEqual } from 'node:crypto'
 import { Mutex } from '../util/mutex.js'
-import { AuthStrategy, User } from './common.js'
-import { RouteHandlerMethod } from 'fastify'
-import fastifyPassport from '@fastify/passport'
+import { AuthStrategy, type User } from './common.js'
+import type { RouteHandlerMethod } from 'fastify'
+import { fastifyPassport } from '../fastifyPassport.js'
 import { promisify } from 'node:util'
 
 export const authenticateLocal = (): RouteHandlerMethod => fastifyPassport.authenticate(AuthStrategy.LOCAL)

backend/src/auth/oidc-strategy.ts

@@ -1,8 +1,8 @@
-import { custom, Issuer, Strategy as OpenIdStrategy, TokenSet, UserinfoResponse } from 'openid-client'
-import { AuthStrategy, User } from './common.js'
-import { AuthenticateOptions } from '@fastify/passport/dist/AuthenticationRoute.js'
-import { RouteHandlerMethod } from 'fastify'
-import fastifyPassport from '@fastify/passport'
+import { custom, Issuer, Strategy as OpenIdStrategy, TokenSet, type UserinfoResponse } from 'openid-client'
+import { AuthStrategy, type User } from './common.js'
+import type { AuthenticateOptions } from '@fastify/passport/dist/AuthenticationRoute.js'
+import type { RouteHandlerMethod } from 'fastify'
+import { fastifyPassport } from '../fastifyPassport.js'
 
 export const authenticateOidc = (options?: AuthenticateOptions): RouteHandlerMethod => fastifyPassport.authenticate(AuthStrategy.OIDC, options)
 

backend/src/controllers.ts

@@ -4,7 +4,7 @@ import { PodController } from './controllers/pod.js'
 import { KubernetesApi } from './kubernetes/api.js'
 import { LogsController } from './controllers/logs.js'
 import { TriggerController } from './controllers/trigger.js'
-import { BackendConfig } from './index.js'
+import type { BackendConfig } from './index.js'
 
 export interface Controllers {
   cronJobController: CronJobController

backend/src/controllers/cronjob.ts

@@ -1,6 +1,6 @@
 import { KubernetesApi } from '../kubernetes/api.js'
 import { StrongCache } from '../util/cache.js'
-import { BackendConfig } from '../index.js'
+import type { BackendConfig } from '../index.js'
 import { V1CronJob } from '@kubernetes/client-node'
 
 export class CronJobController {

backend/src/controllers/job.ts

@@ -1,8 +1,8 @@
-import { CronJobController } from './cronjob.js'
-import { KubernetesApi } from '../kubernetes/api.js'
+import type { CronJobController } from './cronjob.js'
+import type { KubernetesApi } from '../kubernetes/api.js'
 import assert from 'node:assert'
 import { StrongCache } from '../util/cache.js'
-import { V1CronJob, V1Job } from '@kubernetes/client-node'
+import type { V1CronJob, V1Job } from '@kubernetes/client-node'
 import { ForemanLabels } from '../metadata.js'
 
 export class JobController {

backend/src/controllers/logs.ts

@@ -1,5 +1,5 @@
-import { KubernetesApi } from '../kubernetes/api.js'
-import { PodController } from './pod.js'
+import type { KubernetesApi } from '../kubernetes/api.js'
+import type { PodController } from './pod.js'
 import { WeakCache } from '../util/cache.js'
 import { Mutex } from '../util/mutex.js'
 

backend/src/controllers/pod.ts

@@ -1,8 +1,8 @@
-import { KubernetesApi } from '../kubernetes/api.js'
-import { JobController } from './job.js'
+import type { KubernetesApi } from '../kubernetes/api.js'
+import type { JobController } from './job.js'
 import { StrongCache } from '../util/cache.js'
 import assert from 'node:assert'
-import { V1Pod } from '@kubernetes/client-node'
+import type { V1Pod } from '@kubernetes/client-node'
 
 export class PodController {
   private readonly cache = new StrongCache<V1Pod[]>(5000)

backend/src/controllers/trigger.ts

@@ -1,10 +1,10 @@
-import { KubernetesApi } from '../kubernetes/api.js'
-import { CronJobController } from './cronjob.js'
+import type { KubernetesApi } from '../kubernetes/api.js'
+import type { CronJobController } from './cronjob.js'
 import assert from 'node:assert'
 import { randomBytes } from 'node:crypto'
-import { V1Job } from '@kubernetes/client-node'
+import type { V1Job } from '@kubernetes/client-node'
 import { ForemanAnnotations, ForemanLabels } from '../metadata.js'
-import { JobController } from './job.js'
+import type { JobController } from './job.js'
 
 export class TriggerController {
   constructor (

backend/src/fastifyPassport.ts

@@ -0,0 +1,4 @@
+import passport from '@fastify/passport'
+
+// Something is wrong with esModuleInterop... this is a workaround
+export const fastifyPassport = passport.default

backend/src/index.ts

@@ -6,9 +6,9 @@ import { jobsRoute } from './api/jobs.js'
 import { jobPodsRoute } from './api/job-pods.js'
 import { createControllers } from './controllers.js'
 import { triggerRoute } from './api/trigger.js'
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 import { fastifySecureSession } from '@fastify/secure-session'
-import fastifyPassport from '@fastify/passport'
+import { fastifyPassport } from './fastifyPassport.js'
 import { randomBytes } from 'node:crypto'
 import { meAuthRoute } from './api/auth/me.js'
 import { localLoginAuthRoute } from './api/auth/local-login.js'
@@ -18,9 +18,9 @@ import { getAvailableMemory } from './util/system.js'
 import { oidcAuthRoute } from './api/auth/oidc.js'
 import { makeLocalStrategy } from './auth/local-strategy.js'
 import { makeOidcStrategy } from './auth/oidc-strategy.js'
-import { AuthStrategy, User } from './auth/common.js'
+import { AuthStrategy, type User } from './auth/common.js'
 import { strategiesAuthRoute } from './api/auth/strategies.js'
-import { BackendConfig } from './backend-config.js'
+import type { BackendConfig } from './backend-config.js'
 
 export type { BackendConfig } from './backend-config.js'
 export * from './api/errors.js'

backend/src/kubernetes/api.ts

@@ -1,6 +1,6 @@
-import k8s, { HttpError, V1CronJob, V1EnvVar, V1Job, V1Pod } from '@kubernetes/client-node'
+import k8s, { HttpError, type V1CronJob, type V1EnvVar, type V1Job, type V1Pod } from '@kubernetes/client-node'
 import assert from 'node:assert'
-import { BaseLogger } from 'pino'
+import type { BaseLogger } from 'pino'
 
 export const DEFAULT_NAMESPACE = 'default'
 

backend/test/auth/oidc-strategy.test.ts

@@ -1,4 +1,4 @@
-import { fastify, FastifyInstance } from 'fastify'
+import { fastify, type FastifyInstance } from 'fastify'
 import { makeOidcStrategy } from '../../src/auth/oidc-strategy.js'
 import assert from 'node:assert'
 import { Strategy } from 'openid-client'

backend/test/kubernetes/api.test.ts

@@ -1,8 +1,8 @@
-import pino from 'pino'
+import { pino } from 'pino'
 import { KubernetesApi } from '../../src/kubernetes/api.js'
 import { HttpError, KubeConfig, V1CronJob } from '@kubernetes/client-node'
 import assert from 'node:assert'
-import { fastify, FastifyInstance } from 'fastify'
+import { fastify, type FastifyInstance } from 'fastify'
 
 function assertEqualResources (actual: any, expected: any): void {
   // Check for deep strict equality but ignore undefined values

backend/tsconfig.json

@@ -1,11 +1,12 @@
 {
   "compilerOptions": {
     "lib": ["ES2022"],
-    "module": "ES2022",
+    "module": "NodeNext",
     "target": "ES2022",
-    "moduleResolution": "Node",
+    "moduleResolution": "nodenext",
     "strict": true,
     "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "declaration": true,

integration/fixtures.ts

@@ -1,8 +1,8 @@
-import pino from 'pino'
+import { pino } from 'pino'
 import { KubeConfig } from '@kubernetes/client-node'
 import { startServer } from '../src/server.js'
-import { Config, createConfig } from '../src/config.js'
-import { FastifyBaseLogger } from 'fastify'
+import { type Config, createConfig } from '../src/config.js'
+import type { FastifyBaseLogger } from 'fastify'
 
 const testServerPort = 3333
 const testClusterPort = 56443

src/config.ts

@@ -2,7 +2,7 @@ import {
   coerce,
   defaulted,
   enums,
-  Infer,
+  type Infer,
   instance,
   integer,
   literal,

src/handle-error.ts

@@ -1,4 +1,4 @@
-import { FastifyError, FastifyReply } from 'fastify'
+import type { FastifyError, FastifyReply } from 'fastify'
 import { badRequest, internalServerError, payloadTooLarge, unsupportedMediaType } from 'backend'
 
 /**

src/kube-config.ts

@@ -1,6 +1,6 @@
 import k8s from '@kubernetes/client-node'
-import { Config } from './config.js'
-import { BaseLogger } from 'pino'
+import type { Config } from './config.js'
+import type { BaseLogger } from 'pino'
 
 export function loadKubeConfig (log: BaseLogger, config: Config): k8s.KubeConfig {
   const from = config.kubeConfig.source

src/main.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
-import { Config, readConfigDirectory } from './config.js'
+import { type Config, readConfigDirectory } from './config.js'
 import { StructError } from 'superstruct'
-import pino from 'pino'
+import { pino } from 'pino'
 import { startServer } from './server.js'
 import { getPort } from './environment.js'
 import { KubeConfig } from '@kubernetes/client-node'

src/server.ts

@@ -3,9 +3,9 @@ import { backend, notFound } from 'backend'
 
 import { fastifyStatic } from '@fastify/static'
 import path from 'node:path'
-import { fastify, FastifyBaseLogger } from 'fastify'
-import { Config } from './config.js'
-import { KubeConfig } from '@kubernetes/client-node'
+import { fastify, type FastifyBaseLogger } from 'fastify'
+import type { Config } from './config.js'
+import type { KubeConfig } from '@kubernetes/client-node'
 import { handleError } from './handle-error.js'
 
 type CloseFunction = () => Promise<void>

tsconfig.json

@@ -1,11 +1,12 @@
 {
   "compilerOptions": {
     "lib": ["ES2020"],
-    "module": "ES2022",
+    "module": "NodeNext",
     "target": "ES2022",
-    "moduleResolution": "Node",
+    "moduleResolution": "nodenext",
     "strict": true,
     "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "declaration": false,