chore: adjust code to typescript 6

Author: dottorblaster

lib/server.ts

@@ -6,16 +6,16 @@ import { requestFormatter, dilate, parsePort } from './utils';
 import config from './config';
 import { StocazzoRequest, StocazzoResponse } from './types';
 
-const sticazzi = config.routes;
+const sticazzi: Record<string, { value: string; big: string }> = config.routes;
 
 const server = fastify();
 
 server.register(cors);
 
-server.get('/:format', (request: StocazzoRequest, reply: FastifyReply) => {
-  const {
-    params: { format },
-  } = request;
+server.get<StocazzoRequest>(
+  '/:format',
+  (request, reply: FastifyReply) => {
+  const { format } = request.params;
   const fallback = !(format && sticazzi[format]);
   const obj = fallback ? sticazzi.root : sticazzi[format];
   const response = { response: obj.value };

lib/types.ts

@@ -1,26 +1,22 @@
-import { FastifyRequest } from 'fastify';
-
-type StocazzoRequestContent = {
+export interface StocazzoRequestContent {
   params?: {
     format: string;
   };
-  query?: {
+  query: {
     big?: number;
     q: string;
   };
-};
+}
 
-export type StocazzoRequest =
-  | StocazzoRequestContent
-  | FastifyRequest<{
-      Params: {
-        format: string;
-      };
-      Querystring: {
-        big: number;
-        q: string;
-      };
-    }>;
+export interface StocazzoRequest {
+  Params: {
+    format: string;
+  };
+  Querystring: {
+    big: number;
+    q: string;
+  };
+}
 
 export interface StocazzoResponse {
   response: string;

lib/utils.ts

@@ -1,10 +1,10 @@
 import { substr } from 'runes';
-import { StocazzoRequest, StocazzoResponse } from './types';
+import { StocazzoRequestContent, StocazzoResponse } from './types';
 
 type Port = string | number;
 
 export const requestFormatter =
-  (req: StocazzoRequest) =>
+  (req: StocazzoRequestContent) =>
   (res: StocazzoResponse): StocazzoResponse => {
     if (req.query.q) {
       res.query = req.query.q;
@@ -16,7 +16,7 @@ export const requestFormatter =
   };
 
 export const dilate =
-  (req: StocazzoRequest) =>
+  (req: StocazzoRequestContent) =>
   (s: string) =>
   (res: StocazzoResponse): StocazzoResponse => {
     const { response } = res;

test/stocazzo.test.ts

@@ -1,15 +1,16 @@
+import { FastifyInstance } from 'fastify';
 import { init } from '../lib/server';
 
 describe("Testing stocazzo's", () => {
-  let server;
+  let server: FastifyInstance;
 
   beforeEach(async () => {
     server = await init();
   });
 
   it('GET /', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/',
     };
 
@@ -20,7 +21,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET / with request body', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/?q=chi%20e',
     };
 
@@ -32,7 +33,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /caps', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/caps',
     };
 
@@ -43,7 +44,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /caps with request body', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/caps?q=chi%20e',
     };
 
@@ -55,7 +56,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /camel', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/camel',
     };
 
@@ -66,7 +67,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /ascii', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/ascii',
     };
 
@@ -77,7 +78,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /snake', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/snake',
     };
 
@@ -88,7 +89,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /snake with big=true', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/snake?big=1',
     };
 
@@ -99,7 +100,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /sto-conte', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/sto-conte',
     };
 
@@ -110,7 +111,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /sto-conte with big=true', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/sto-conte?big=1',
     };
 
@@ -121,7 +122,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /varg', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/varg',
     };
 
@@ -132,7 +133,7 @@ describe("Testing stocazzo's", () => {
 
   it('GET /varg with big enabled', async () => {
     const options = {
-      method: 'GET',
+      method: 'GET' as const,
       url: '/varg?big=1',
     };