Skip to content

Commit 7e524a5

Browse files
jean-micheletjean-michelet
authored
Upgrade v5 (#30)
* chore: upgrade fastify related packages * chore: update fastify non-related packages * fix: eslint errors
1 parent 441a123 commit 7e524a5

34 files changed

+720
-732
lines changed

‎@types/fastify/fastify.d.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Auth } from "../../src/schemas/auth.ts";
1+
import { Auth } from '../../src/schemas/auth.ts'
22

3-
declare module "fastify" {
4-
export interface FastifyRequest {
5-
user: Auth
6-
}
3+
declare module 'fastify' {
4+
export interface FastifyRequest {
5+
user: Auth
6+
}
77
}

‎@types/node/environment.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ declare global {
1313
}
1414
}
1515

16-
export {};
16+
export {}

‎package.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,32 @@
2424
"author": "Michelet Jean <jean.antoine.michelet@gmail.com>",
2525
"license": "MIT",
2626
"dependencies": {
27-
"@fastify/autoload": "^5.10.0",
28-
"@fastify/cors": "^9.0.1",
29-
"@fastify/env": "^4.3.0",
30-
"@fastify/helmet": "^11.1.1",
31-
"@fastify/jwt": "^8.0.1",
32-
"@fastify/mysql": "^4.3.0",
33-
"@fastify/rate-limit": "^9.1.0",
34-
"@fastify/sensible": "^5.0.0",
35-
"@fastify/swagger": "^8.14.0",
36-
"@fastify/swagger-ui": "^4.0.1",
37-
"@fastify/type-provider-typebox": "^4.0.0",
38-
"@fastify/under-pressure": "^8.3.0",
39-
"@sinclair/typebox": "^0.33.7",
27+
"@fastify/autoload": "^6.0.0",
28+
"@fastify/cors": "^10.0.0",
29+
"@fastify/env": "^5.0.1",
30+
"@fastify/helmet": "^12.0.0",
31+
"@fastify/jwt": "^9.0.0",
32+
"@fastify/mysql": "^5.0.1",
33+
"@fastify/rate-limit": "^10.0.1",
34+
"@fastify/sensible": "^6.0.1",
35+
"@fastify/swagger": "^9.0.0",
36+
"@fastify/swagger-ui": "^5.0.1",
37+
"@fastify/type-provider-typebox": "^5.0.0",
38+
"@fastify/under-pressure": "^9.0.1",
39+
"@sinclair/typebox": "^0.33.12",
4040
"concurrently": "^9.0.1",
41-
"fastify": "^4.26.1",
42-
"fastify-cli": "^6.1.1",
43-
"fastify-plugin": "^4.0.0",
44-
"postgrator": "^7.2.0"
41+
"fastify": "^5.0.0",
42+
"fastify-cli": "^7.0.0",
43+
"fastify-plugin": "^5.0.1",
44+
"postgrator": "^7.3.0"
4545
},
4646
"devDependencies": {
47-
"@types/node": "^22.0.0",
48-
"eslint": "^9.4.0",
47+
"@types/node": "^22.5.5",
48+
"eslint": "^9.11.0",
4949
"fastify-tsconfig": "^2.0.0",
50-
"mysql2": "^3.10.1",
51-
"neostandard": "^0.7.0",
50+
"mysql2": "^3.11.3",
51+
"neostandard": "^0.11.5",
5252
"tap": "^21.0.1",
53-
"typescript": "^5.4.5"
53+
"typescript": "^5.6.2"
5454
}
5555
}

‎src/app.ts‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,47 @@
22
* If you would like to turn your application into a standalone executable, look at server.js file
33
*/
44

5-
import path from "node:path";
6-
import fastifyAutoload from "@fastify/autoload";
7-
import { FastifyInstance, FastifyPluginOptions } from "fastify";
5+
import path from 'node:path'
6+
import fastifyAutoload from '@fastify/autoload'
7+
import { FastifyInstance, FastifyPluginOptions } from 'fastify'
88

99
export const options = {
1010
ajv: {
1111
customOptions: {
12-
coerceTypes: "array",
13-
removeAdditional: "all"
12+
coerceTypes: 'array',
13+
removeAdditional: 'all'
1414
}
1515
}
16-
};
16+
}
1717

18-
export default async function serviceApp(
18+
export default async function serviceApp (
1919
fastify: FastifyInstance,
2020
opts: FastifyPluginOptions
2121
) {
2222
delete opts.skipOverride // This option only serves testing purpose
2323
// This loads all external plugins defined in plugins/external
2424
// those should be registered first as your custom plugins might depend on them
2525
await fastify.register(fastifyAutoload, {
26-
dir: path.join(import.meta.dirname, "plugins/external"),
26+
dir: path.join(import.meta.dirname, 'plugins/external'),
2727
options: { ...opts }
28-
});
28+
})
2929

3030
// This loads all your custom plugins defined in plugins/custom
3131
// those should be support plugins that are reused
3232
// through your application
3333
fastify.register(fastifyAutoload, {
34-
dir: path.join(import.meta.dirname, "plugins/custom"),
34+
dir: path.join(import.meta.dirname, 'plugins/custom'),
3535
options: { ...opts }
36-
});
36+
})
3737

3838
// This loads all plugins defined in routes
3939
// define your routes in one of these
4040
fastify.register(fastifyAutoload, {
41-
dir: path.join(import.meta.dirname, "routes"),
41+
dir: path.join(import.meta.dirname, 'routes'),
4242
autoHooks: true,
4343
cascadeHooks: true,
4444
options: { ...opts }
45-
});
45+
})
4646

4747
fastify.setErrorHandler((err, request, reply) => {
4848
request.log.error(
@@ -55,43 +55,42 @@ export default async function serviceApp(
5555
params: request.params
5656
}
5757
},
58-
"Unhandled error occurred"
59-
);
58+
'Unhandled error occurred'
59+
)
6060

61-
reply.code(err.statusCode ?? 500);
61+
reply.code(err.statusCode ?? 500)
6262

63-
let message = "Internal Server Error";
63+
let message = 'Internal Server Error'
6464
if (err.statusCode === 401) {
65-
message = err.message;
65+
message = err.message
6666
}
6767

68-
return { message };
69-
});
68+
return { message }
69+
})
7070

7171
// An attacker could search for valid URLs if your 404 error handling is not rate limited.
7272
fastify.setNotFoundHandler(
73-
{
74-
preHandler: fastify.rateLimit({
75-
max: 3,
76-
timeWindow: 500
77-
})
78-
},
73+
{
74+
preHandler: fastify.rateLimit({
75+
max: 3,
76+
timeWindow: 500
77+
})
78+
},
7979
(request, reply) => {
80+
request.log.warn(
81+
{
82+
request: {
83+
method: request.method,
84+
url: request.url,
85+
query: request.query,
86+
params: request.params
87+
}
88+
},
89+
'Resource not found'
90+
)
8091

81-
request.log.warn(
82-
{
83-
request: {
84-
method: request.method,
85-
url: request.url,
86-
query: request.query,
87-
params: request.params
88-
}
89-
},
90-
"Resource not found"
91-
);
92-
93-
reply.code(404);
92+
reply.code(404)
9493

95-
return { message: "Not Found" };
96-
});
94+
return { message: 'Not Found' }
95+
})
9796
}

‎src/plugins/custom/repository.ts‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
import { MySQLPromisePool } from "@fastify/mysql";
2-
import { FastifyInstance } from "fastify";
3-
import fp from "fastify-plugin";
4-
import { RowDataPacket, ResultSetHeader } from "mysql2";
1+
import { MySQLPromisePool } from '@fastify/mysql'
2+
import { FastifyInstance } from 'fastify'
3+
import fp from 'fastify-plugin'
4+
import { RowDataPacket, ResultSetHeader } from 'mysql2'
55

6-
declare module "fastify" {
6+
declare module 'fastify' {
77
export interface FastifyInstance {
88
repository: Repository;
99
}
1010
}
1111

12-
export type Repository = MySQLPromisePool & ReturnType<typeof createRepository>;
12+
export type Repository = MySQLPromisePool & ReturnType<typeof createRepository>
1313

14-
type QuerySeparator = 'AND' | ',';
14+
type QuerySeparator = 'AND' | ','
1515

1616
type QueryOptions = {
1717
select?: string;
1818
where?: Record<string, any>;
19-
};
19+
}
2020

2121
type WriteOptions = {
2222
data: Record<string, any>;
2323
where?: Record<string, any>;
24-
};
24+
}
2525

26-
function createRepository(fastify: FastifyInstance) {
26+
function createRepository (fastify: FastifyInstance) {
2727
const processAssignmentRecord = (record: Record<string, any>, separator: QuerySeparator) => {
28-
const keys = Object.keys(record);
29-
const values = Object.values(record);
30-
const clause = keys.map((key) => `${key} = ?`).join(` ${separator} `);
28+
const keys = Object.keys(record)
29+
const values = Object.values(record)
30+
const clause = keys.map((key) => `${key} = ?`).join(` ${separator} `)
3131

32-
return [clause, values] as const;
33-
};
32+
return [clause, values] as const
33+
}
3434

3535
const repository = {
3636
...fastify.mysql,
3737
find: async <T>(table: string, opts: QueryOptions): Promise<T | null> => {
38-
const { select = '*', where = {1:1} } = opts;
39-
const [clause, values] = processAssignmentRecord(where, 'AND');
38+
const { select = '*', where = { 1: 1 } } = opts
39+
const [clause, values] = processAssignmentRecord(where, 'AND')
4040

41-
const query = `SELECT ${select} FROM ${table} WHERE ${clause} LIMIT 1`;
42-
const [rows] = await fastify.mysql.query<RowDataPacket[]>(query, values);
41+
const query = `SELECT ${select} FROM ${table} WHERE ${clause} LIMIT 1`
42+
const [rows] = await fastify.mysql.query<RowDataPacket[]>(query, values)
4343
if (rows.length < 1) {
44-
return null;
44+
return null
4545
}
4646

47-
return rows[0] as T;
47+
return rows[0] as T
4848
},
4949

5050
findMany: async <T>(table: string, opts: QueryOptions = {}): Promise<T[]> => {
51-
const { select = '*', where = {1:1} } = opts;
52-
const [clause, values] = processAssignmentRecord(where, 'AND');
51+
const { select = '*', where = { 1: 1 } } = opts
52+
const [clause, values] = processAssignmentRecord(where, 'AND')
5353

54-
const query = `SELECT ${select} FROM ${table} WHERE ${clause}`;
55-
const [rows] = await fastify.mysql.query<RowDataPacket[]>(query, values);
54+
const query = `SELECT ${select} FROM ${table} WHERE ${clause}`
55+
const [rows] = await fastify.mysql.query<RowDataPacket[]>(query, values)
5656

57-
return rows as T[];
57+
return rows as T[]
5858
},
5959

6060
create: async (table: string, opts: WriteOptions): Promise<number> => {
61-
const { data } = opts;
62-
const columns = Object.keys(data).join(', ');
63-
const placeholders = Object.keys(data).map(() => '?').join(', ');
64-
const values = Object.values(data);
61+
const { data } = opts
62+
const columns = Object.keys(data).join(', ')
63+
const placeholders = Object.keys(data).map(() => '?').join(', ')
64+
const values = Object.values(data)
6565

66-
const query = `INSERT INTO ${table} (${columns}) VALUES (${placeholders})`;
67-
const [result] = await fastify.mysql.query<ResultSetHeader>(query, values);
66+
const query = `INSERT INTO ${table} (${columns}) VALUES (${placeholders})`
67+
const [result] = await fastify.mysql.query<ResultSetHeader>(query, values)
6868

69-
return result.insertId;
69+
return result.insertId
7070
},
7171

7272
update: async (table: string, opts: WriteOptions): Promise<number> => {
73-
const { data, where = {} } = opts;
74-
const [dataClause, dataValues] = processAssignmentRecord(data, ',');
75-
const [whereClause, whereValues] = processAssignmentRecord(where, 'AND');
73+
const { data, where = {} } = opts
74+
const [dataClause, dataValues] = processAssignmentRecord(data, ',')
75+
const [whereClause, whereValues] = processAssignmentRecord(where, 'AND')
7676

77-
const query = `UPDATE ${table} SET ${dataClause} WHERE ${whereClause}`;
78-
const [result] = await fastify.mysql.query<ResultSetHeader>(query, [...dataValues, ...whereValues]);
77+
const query = `UPDATE ${table} SET ${dataClause} WHERE ${whereClause}`
78+
const [result] = await fastify.mysql.query<ResultSetHeader>(query, [...dataValues, ...whereValues])
7979

80-
return result.affectedRows;
80+
return result.affectedRows
8181
},
8282

8383
delete: async (table: string, where: Record<string, any>): Promise<number> => {
84-
const [clause, values] = processAssignmentRecord(where, 'AND');
84+
const [clause, values] = processAssignmentRecord(where, 'AND')
8585

86-
const query = `DELETE FROM ${table} WHERE ${clause}`;
87-
const [result] = await fastify.mysql.query<ResultSetHeader>(query, values);
86+
const query = `DELETE FROM ${table} WHERE ${clause}`
87+
const [result] = await fastify.mysql.query<ResultSetHeader>(query, values)
8888

89-
return result.affectedRows;
89+
return result.affectedRows
9090
}
91-
};
91+
}
9292

93-
return repository;
93+
return repository
9494
}
9595

9696
/**
@@ -101,9 +101,9 @@ function createRepository(fastify: FastifyInstance) {
101101
*/
102102
export default fp(
103103
async function (fastify) {
104-
fastify.decorate("repository", createRepository(fastify));
104+
fastify.decorate('repository', createRepository(fastify))
105105
// You should name your plugins if you want to avoid name collisions
106106
// and/or to perform dependency checks.
107107
},
108-
{ name: "repository", dependencies: ['mysql'] }
109-
);
108+
{ name: 'repository', dependencies: ['mysql'] }
109+
)

0 commit comments

Comments
 (0)