♻️ Simplify transactions

package.json

@@ -33,10 +33,10 @@
 		"prettier-plugin-svelte": "^2.9.0",
 		"svelte": "^3.55.1",
 		"svelte-check": "^3.0.2",
-		"svelte-preprocess": "^5.0.1",
+		"svelte-preprocess": "^5.0.3",
 		"tinygesture": "^2.0.0",
 		"tslib": "^2.3.1",
-		"typescript": "^4.9.4",
+		"typescript": "^5.0.3",
 		"unocss": "^0.48.4",
 		"vite": "^4.0.4"
 	},

pnpm-lock.yaml

@@ -32,10 +32,10 @@ specifiers:
   sharp: ^0.31.2
   svelte: ^3.55.1
   svelte-check: ^3.0.2
-  svelte-preprocess: ^5.0.1
+  svelte-preprocess: ^5.0.3
   tinygesture: ^2.0.0
   tslib: ^2.3.1
-  typescript: ^4.9.4
+  typescript: ^5.0.3
   unocss: ^0.48.4
   vite: ^4.0.4
 
@@ -61,8 +61,8 @@ devDependencies:
   '@types/lodash': 4.14.188
   '@types/marked': 4.0.7
   '@types/sharp': 0.31.0
-  '@typescript-eslint/eslint-plugin': 5.42.0_aztydxbwb5dw26jymrshygayce
-  '@typescript-eslint/parser': 5.42.0_v5bglvupnukcksncywgdzapdrq
+  '@typescript-eslint/eslint-plugin': 5.42.0_maf6oeqzrvvbbdpgg7uzhystc4
+  '@typescript-eslint/parser': 5.42.0_wjftjwwutwf6hy45blo2onh3s4
   '@unocss/preset-icons': 0.46.3
   '@unocss/preset-uno': 0.46.3
   '@unocss/reset': 0.46.3
@@ -73,10 +73,10 @@ devDependencies:
   prettier-plugin-svelte: 2.9.0_kdmmghgdi3ngrsq6otxkjilbry
   svelte: 3.55.1
   svelte-check: 3.0.2_svelte@3.55.1
-  svelte-preprocess: 5.0.1_atrrhq7vg4ekua4nnyrpuardle
+  svelte-preprocess: 5.0.3_77gy2s7m5yt4ef3uq3cbqgx4fm
   tinygesture: 2.0.0
   tslib: 2.4.1
-  typescript: 4.9.4
+  typescript: 5.0.3
   unocss: 0.48.4_vite@4.0.4
   vite: 4.0.4
 
@@ -1380,12 +1380,6 @@ packages:
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
     dev: true
 
-  /@types/sass/1.43.1:
-    resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==}
-    dependencies:
-      '@types/node': 18.11.9
-    dev: true
-
   /@types/semver/7.3.13:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
@@ -1407,7 +1401,7 @@ packages:
       '@types/webidl-conversions': 7.0.0
     dev: false
 
-  /@typescript-eslint/eslint-plugin/5.42.0_aztydxbwb5dw26jymrshygayce:
+  /@typescript-eslint/eslint-plugin/5.42.0_maf6oeqzrvvbbdpgg7uzhystc4:
     resolution: {integrity: sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1418,23 +1412,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.42.0_v5bglvupnukcksncywgdzapdrq
+      '@typescript-eslint/parser': 5.42.0_wjftjwwutwf6hy45blo2onh3s4
       '@typescript-eslint/scope-manager': 5.42.0
-      '@typescript-eslint/type-utils': 5.42.0_v5bglvupnukcksncywgdzapdrq
-      '@typescript-eslint/utils': 5.42.0_v5bglvupnukcksncywgdzapdrq
+      '@typescript-eslint/type-utils': 5.42.0_wjftjwwutwf6hy45blo2onh3s4
+      '@typescript-eslint/utils': 5.42.0_wjftjwwutwf6hy45blo2onh3s4
       debug: 4.3.4
       eslint: 8.26.0
       ignore: 5.2.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
+      tsutils: 3.21.0_typescript@5.0.3
+      typescript: 5.0.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.42.0_v5bglvupnukcksncywgdzapdrq:
+  /@typescript-eslint/parser/5.42.0_wjftjwwutwf6hy45blo2onh3s4:
     resolution: {integrity: sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1446,10 +1440,10 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 5.42.0
       '@typescript-eslint/types': 5.42.0
-      '@typescript-eslint/typescript-estree': 5.42.0_typescript@4.9.4
+      '@typescript-eslint/typescript-estree': 5.42.0_typescript@5.0.3
       debug: 4.3.4
       eslint: 8.26.0
-      typescript: 4.9.4
+      typescript: 5.0.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1462,7 +1456,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.42.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.42.0_v5bglvupnukcksncywgdzapdrq:
+  /@typescript-eslint/type-utils/5.42.0_wjftjwwutwf6hy45blo2onh3s4:
     resolution: {integrity: sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1472,12 +1466,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.42.0_typescript@4.9.4
-      '@typescript-eslint/utils': 5.42.0_v5bglvupnukcksncywgdzapdrq
+      '@typescript-eslint/typescript-estree': 5.42.0_typescript@5.0.3
+      '@typescript-eslint/utils': 5.42.0_wjftjwwutwf6hy45blo2onh3s4
       debug: 4.3.4
       eslint: 8.26.0
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
+      tsutils: 3.21.0_typescript@5.0.3
+      typescript: 5.0.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1487,7 +1481,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.42.0_typescript@4.9.4:
+  /@typescript-eslint/typescript-estree/5.42.0_typescript@5.0.3:
     resolution: {integrity: sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1502,13 +1496,13 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
+      tsutils: 3.21.0_typescript@5.0.3
+      typescript: 5.0.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.42.0_v5bglvupnukcksncywgdzapdrq:
+  /@typescript-eslint/utils/5.42.0_wjftjwwutwf6hy45blo2onh3s4:
     resolution: {integrity: sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1518,7 +1512,7 @@ packages:
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.42.0
       '@typescript-eslint/types': 5.42.0
-      '@typescript-eslint/typescript-estree': 5.42.0_typescript@4.9.4
+      '@typescript-eslint/typescript-estree': 5.42.0_typescript@5.0.3
       eslint: 8.26.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0_eslint@8.26.0
@@ -3318,7 +3312,7 @@ packages:
       picocolors: 1.0.0
       sade: 1.8.1
       svelte: 3.55.1
-      svelte-preprocess: 5.0.1_atrrhq7vg4ekua4nnyrpuardle
+      svelte-preprocess: 5.0.3_atrrhq7vg4ekua4nnyrpuardle
       typescript: 4.9.4
     transitivePeerDependencies:
       - '@babel/core'
@@ -3341,8 +3335,8 @@ packages:
       svelte: 3.55.1
     dev: true
 
-  /svelte-preprocess/5.0.1_atrrhq7vg4ekua4nnyrpuardle:
-    resolution: {integrity: sha512-0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ==}
+  /svelte-preprocess/5.0.3_77gy2s7m5yt4ef3uq3cbqgx4fm:
+    resolution: {integrity: sha512-GrHF1rusdJVbOZOwgPWtpqmaexkydznKzy5qIC2FabgpFyKN57bjMUUUqPRfbBXK5igiEWn1uO/DXsa2vJ5VHA==}
     engines: {node: '>= 14.10.0'}
     requiresBuild: true
     peerDependencies:
@@ -3356,7 +3350,54 @@ packages:
       stylus: ^0.55.0
       sugarss: ^2.0.0 || ^3.0.0 || ^4.0.0
       svelte: ^3.23.0
-      typescript: ^3.9.5 || ^4.0.0
+      typescript: '>=3.9.5 || ^4.0.0 || ^5.0.0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      coffeescript:
+        optional: true
+      less:
+        optional: true
+      postcss:
+        optional: true
+      postcss-load-config:
+        optional: true
+      pug:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      typescript:
+        optional: true
+    dependencies:
+      '@types/pug': 2.0.6
+      detect-indent: 6.1.0
+      magic-string: 0.27.0
+      sorcery: 0.11.0
+      strip-indent: 3.0.0
+      svelte: 3.55.1
+      typescript: 5.0.3
+    dev: true
+
+  /svelte-preprocess/5.0.3_atrrhq7vg4ekua4nnyrpuardle:
+    resolution: {integrity: sha512-GrHF1rusdJVbOZOwgPWtpqmaexkydznKzy5qIC2FabgpFyKN57bjMUUUqPRfbBXK5igiEWn1uO/DXsa2vJ5VHA==}
+    engines: {node: '>= 14.10.0'}
+    requiresBuild: true
+    peerDependencies:
+      '@babel/core': ^7.10.2
+      coffeescript: ^2.5.1
+      less: ^3.11.3 || ^4.0.0
+      postcss: ^7 || ^8
+      postcss-load-config: ^2.1.0 || ^3.0.0 || ^4.0.0
+      pug: ^3.0.0
+      sass: ^1.26.8
+      stylus: ^0.55.0
+      sugarss: ^2.0.0 || ^3.0.0 || ^4.0.0
+      svelte: ^3.23.0
+      typescript: '>=3.9.5 || ^4.0.0 || ^5.0.0'
     peerDependenciesMeta:
       '@babel/core':
         optional: true
@@ -3380,7 +3421,6 @@ packages:
         optional: true
     dependencies:
       '@types/pug': 2.0.6
-      '@types/sass': 1.43.1
       detect-indent: 6.1.0
       magic-string: 0.27.0
       sorcery: 0.11.0
@@ -3454,14 +3494,14 @@ packages:
   /tslib/2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
 
-  /tsutils/3.21.0_typescript@4.9.4:
+  /tsutils/3.21.0_typescript@5.0.3:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
       tslib: 1.14.1
-      typescript: 4.9.4
+      typescript: 5.0.3
     dev: true
 
   /tunnel-agent/0.6.0:
@@ -3488,6 +3528,12 @@ packages:
     hasBin: true
     dev: true
 
+  /typescript/5.0.3:
+    resolution: {integrity: sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==}
+    engines: {node: '>=12.20'}
+    hasBin: true
+    dev: true
+
   /ufo/0.8.6:
     resolution: {integrity: sha512-fk6CmUgwKCfX79EzcDQQpSCMxrHstvbLswFChHS0Vump+kFkw7nJBfTZoC1j0bOGoY9I7R3n2DGek5ajbcYnOw==}
     dev: true

src/lib/server/db/index.ts

@@ -1,5 +1,5 @@
 import { MONGODB_URL } from '$env/static/private';
-import { MongoClient } from 'mongodb';
+import { MongoClient, type WithSessionCallback } from 'mongodb';
 import { createPageCollection } from './page';
 import { createPictureCollections } from './picture';
 import { createProductCollection } from './product';
@@ -20,3 +20,7 @@ const { pictures, picturesFs } = createPictureCollections(db);
 
 export { client, db };
 export const collections = { products, pictures, pages, users, picturesFs };
+
+export async function withTransaction(cb: WithSessionCallback) {
+	await client.withSession((session) => session.withTransaction(cb));
+}

src/lib/server/photo.ts

@@ -1,5 +1,5 @@
 import sharp from 'sharp';
-import { client, collections } from '$lib/server/db';
+import { collections, withTransaction } from '$lib/server/db';
 import { generateId } from '$lib/utils/generateId';
 import type { ClientSession } from 'mongodb';
 import { error } from '@sveltejs/kit';
@@ -44,43 +44,40 @@ export async function generatePicture(
 
 	const _id = generateId(name);
 
-	await client.withSession(
-		async (session) =>
-			await session.withTransaction(async (session) => {
-				await collections.pictures.insertOne(
-					{
-						_id,
-						name,
-						storage: formats.map((format) => ({
-							_id: `${_id}-${format.width}x${format.height}`,
-							width: format.width,
-							height: format.height,
-							size: format.data.length
-						})),
-						...(opts?.productId && { productId: opts.productId }),
-						createdAt: new Date(),
-						updatedAt: new Date()
-					},
-					{ session }
-				);
+	await withTransaction(async (session) => {
+		await collections.pictures.insertOne(
+			{
+				_id,
+				name,
+				storage: formats.map((format) => ({
+					_id: `${_id}-${format.width}x${format.height}`,
+					width: format.width,
+					height: format.height,
+					size: format.data.length
+				})),
+				...(opts?.productId && { productId: opts.productId }),
+				createdAt: new Date(),
+				updatedAt: new Date()
+			},
+			{ session }
+		);
 
-				await collections.picturesFs.insertMany(
-					formats.map(
-						(format) => ({
-							_id: `${_id}-${format.width}x${format.height}`,
-							createdAt: new Date(),
-							updatedAt: new Date(),
-							size: format.data.length,
-							data: format.data,
-							picture: _id
-						}),
-						{ session }
-					)
-				);
+		await collections.picturesFs.insertMany(
+			formats.map(
+				(format) => ({
+					_id: `${_id}-${format.width}x${format.height}`,
+					createdAt: new Date(),
+					updatedAt: new Date(),
+					size: format.data.length,
+					data: format.data,
+					picture: _id
+				}),
+				{ session }
+			)
+		);
 
-				if (opts?.cb) {
-					await opts.cb(session);
-				}
-			})
-	);
+		if (opts?.cb) {
+			await opts.cb(session);
+		}
+	});
 }

src/routes/admin/photos/[id]/+page.server.ts

@@ -1,5 +1,4 @@
-import type { Picture } from '$lib/types/Picture';
-import { client, collections } from '$lib/server/db';
+import { collections, withTransaction } from '$lib/server/db';
 import { error, redirect } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
 
@@ -31,16 +30,17 @@ export const actions: Actions = {
 		return {};
 	},
 	delete: async function ({ params }) {
-		let picture: Picture | null = null;
-
-		await client.withSession(
-			async (session) =>
-				await session.withTransaction(async (session) => {
-					picture = (await collections.pictures.findOneAndDelete({ _id: params.id }, { session }))
-						.value;
-					await collections.picturesFs.deleteMany({ picture: params.id }, { session });
-				})
-		);
+		const picture = await collections.pictures.findOne({ _id: params.id });
+
+		await withTransaction(async (session) => {
+			const res = await collections.pictures.deleteOne({ _id: params.id }, { session });
+
+			if (!res.deletedCount) {
+				throw new Error('Conflict during picture deletion');
+			}
+
+			await collections.picturesFs.deleteMany({ picture: params.id }, { session });
+		});
 
 		if (!picture) {
 			throw error(404);

src/routes/admin/produits/[id]/+page.server.ts

@@ -1,4 +1,4 @@
-import { client, collections } from '$lib/server/db';
+import { client, collections, withTransaction } from '$lib/server/db';
 import type { Product } from '$lib/types/Product';
 import { error, redirect } from '@sveltejs/kit';
 import type { Actions, PageServerLoad } from './$types';
@@ -51,31 +51,28 @@ export const actions: Actions = {
 	},
 
 	delete: async ({ params }) => {
-		await client.withSession(
-			async (session) =>
-				await session.withTransaction(async (session) => {
-					const product = await collections.products.findOneAndDelete({ _id: params.id });
+		await withTransaction(async (session) => {
+			const product = await collections.products.findOneAndDelete({ _id: params.id });
 
-					if (!product.value) {
-						throw error(404);
-					}
+			if (!product.value) {
+				throw error(404);
+			}
 
-					const pictures = await collections.pictures
-						.find({ productId: params.id }, { session })
-						.toArray();
+			const pictures = await collections.pictures
+				.find({ productId: params.id }, { session })
+				.toArray();
 
-					await collections.pictures.deleteMany(
-						{ _id: { $in: pictures.map((p) => p._id) } },
-						{ session }
-					);
-					await collections.picturesFs.deleteMany(
-						{
-							_id: { $in: pictures.flatMap((p) => p.storage.map((s) => s._id)) }
-						},
-						{ session }
-					);
-				})
-		);
+			await collections.pictures.deleteMany(
+				{ _id: { $in: pictures.map((p) => p._id) } },
+				{ session }
+			);
+			await collections.picturesFs.deleteMany(
+				{
+					_id: { $in: pictures.flatMap((p) => p.storage.map((s) => s._id)) }
+				},
+				{ session }
+			);
+		});
 
 		throw redirect(303, '/admin/produits');
 	}