Remove the unnecessary async handler (in Expr5)

Author: hamishwillee

controllers/authorController.js

@@ -2,19 +2,18 @@ const Author = require("../models/author");
 const Book = require("../models/book");
 
 const { body, validationResult } = require("express-validator");
-const asyncHandler = require("express-async-handler");
 
 // Display list of all Authors.
-exports.author_list = asyncHandler(async (req, res, next) => {
+exports.author_list = async (req, res, next) => {
   const allAuthors = await Author.find().sort({ family_name: 1 }).exec();
   res.render("author_list", {
     title: "Author List",
     author_list: allAuthors,
   });
-});
+};
 
 // Display detail page for a specific Author.
-exports.author_detail = asyncHandler(async (req, res, next) => {
+exports.author_detail = async (req, res, next) => {
   // Get details of author and all their books (in parallel)
   const [author, allBooksByAuthor] = await Promise.all([
     Author.findById(req.params.id).exec(),
@@ -33,7 +32,7 @@ exports.author_detail = asyncHandler(async (req, res, next) => {
     author,
     author_books: allBooksByAuthor,
   });
-});
+};
 
 // Display Author create form on GET.
 exports.author_create_get = (req, res, next) => {
@@ -67,7 +66,7 @@ exports.author_create_post = [
     .toDate(),
 
   // Process request after validation and sanitization.
-  asyncHandler(async (req, res, next) => {
+  async (req, res, next) => {
     // Extract the validation errors from a request.
     const errors = validationResult(req);
 
@@ -93,11 +92,11 @@ exports.author_create_post = [
     await author.save();
     // Redirect to new author record.
     res.redirect(author.url);
-  }),
+  },
 ];
 
 // Display Author delete form on GET.
-exports.author_delete_get = asyncHandler(async (req, res, next) => {
+exports.author_delete_get = async (req, res, next) => {
   // Get details of author and all their books (in parallel)
   const [author, allBooksByAuthor] = await Promise.all([
     Author.findById(req.params.id).exec(),
@@ -114,10 +113,10 @@ exports.author_delete_get = asyncHandler(async (req, res, next) => {
     author,
     author_books: allBooksByAuthor,
   });
-});
+};
 
 // Handle Author delete on POST.
-exports.author_delete_post = asyncHandler(async (req, res, next) => {
+exports.author_delete_post = async (req, res, next) => {
   // Get details of author and all their books (in parallel)
   const [author, allBooksByAuthor] = await Promise.all([
     Author.findById(req.params.id).exec(),
@@ -137,10 +136,10 @@ exports.author_delete_post = asyncHandler(async (req, res, next) => {
   // Author has no books. Delete object and redirect to the list of authors.
   await Author.findByIdAndDelete(req.body.authorid);
   res.redirect("/catalog/authors");
-});
+};
 
 // Display Author update form on GET.
-exports.author_update_get = asyncHandler(async (req, res, next) => {
+exports.author_update_get = async (req, res, next) => {
   const author = await Author.findById(req.params.id).exec();
   if (author === null) {
     // No results.
@@ -150,7 +149,7 @@ exports.author_update_get = asyncHandler(async (req, res, next) => {
   }
 
   res.render("author_form", { title: "Update Author", author });
-});
+};
 
 // Handle Author update on POST.
 exports.author_update_post = [
@@ -179,7 +178,7 @@ exports.author_update_post = [
     .toDate(),
 
   // Process request after validation and sanitization.
-  asyncHandler(async (req, res, next) => {
+  async (req, res, next) => {
     // Extract the validation errors from a request.
     const errors = validationResult(req);
 
@@ -205,5 +204,5 @@ exports.author_update_post = [
     // Data from form is valid. Update the record.
     await Author.findByIdAndUpdate(req.params.id, author);
     res.redirect(author.url);
-  }),
+  },
 ];

controllers/bookController.js

@@ -4,9 +4,8 @@ const Genre = require("../models/genre");
 const BookInstance = require("../models/bookinstance");
 
 const { body, validationResult } = require("express-validator");
-const asyncHandler = require("express-async-handler");
 
-exports.index = asyncHandler(async (req, res, next) => {
+exports.index = async (req, res, next) => {
   // Get details of books, book instances, authors and genre counts (in parallel)
   const [
     numBooks,
@@ -30,20 +29,20 @@ exports.index = asyncHandler(async (req, res, next) => {
     author_count: numAuthors,
     genre_count: numGenres,
   });
-});
+};
 
 // Display list of all books.
-exports.book_list = asyncHandler(async (req, res, next) => {
+exports.book_list = async (req, res, next) => {
   const allBooks = await Book.find({}, "title author")
     .sort({ title: 1 })
     .populate("author")
     .exec();
 
   res.render("book_list", { title: "Book List", book_list: allBooks });
-});
+};
 
 // Display detail page for a specific book.
-exports.book_detail = asyncHandler(async (req, res, next) => {
+exports.book_detail = async (req, res, next) => {
   // Get details of books, book instances for specific book
   const [book, bookInstances] = await Promise.all([
     Book.findById(req.params.id).populate("author").populate("genre").exec(),
@@ -62,10 +61,10 @@ exports.book_detail = asyncHandler(async (req, res, next) => {
     book,
     book_instances: bookInstances,
   });
-});
+};
 
 // Display book create form on GET.
-exports.book_create_get = asyncHandler(async (req, res, next) => {
+exports.book_create_get = async (req, res, next) => {
   // Get all authors and genres, which we can use for adding to our book.
   const [allAuthors, allGenres] = await Promise.all([
     Author.find().sort({ family_name: 1 }).exec(),
@@ -77,7 +76,7 @@ exports.book_create_get = asyncHandler(async (req, res, next) => {
     authors: allAuthors,
     genres: allGenres,
   });
-});
+};
 
 // Handle book create on POST.
 exports.book_create_post = [
@@ -107,7 +106,7 @@ exports.book_create_post = [
   body("genre.*").escape(),
   // Process request after validation and sanitization.
 
-  asyncHandler(async (req, res, next) => {
+  async (req, res, next) => {
     // Extract the validation errors from a request.
     const errors = validationResult(req);
 
@@ -148,11 +147,11 @@ exports.book_create_post = [
     // Data from form is valid. Save book.
     await book.save();
     res.redirect(book.url);
-  }),
+  },
 ];
 
 // Display book delete form on GET.
-exports.book_delete_get = asyncHandler(async (req, res, next) => {
+exports.book_delete_get = async (req, res, next) => {
   const [book, bookInstances] = await Promise.all([
     Book.findById(req.params.id).populate("author").populate("genre").exec(),
     BookInstance.find({ book: req.params.id }).exec(),
@@ -168,10 +167,10 @@ exports.book_delete_get = asyncHandler(async (req, res, next) => {
     book,
     book_instances: bookInstances,
   });
-});
+};
 
 // Handle book delete on POST.
-exports.book_delete_post = asyncHandler(async (req, res, next) => {
+exports.book_delete_post = async (req, res, next) => {
   // Assume the post has valid id (ie no validation/sanitization).
 
   const [book, bookInstances] = await Promise.all([
@@ -197,10 +196,10 @@ exports.book_delete_post = asyncHandler(async (req, res, next) => {
   // Book has no BookInstance objects. Delete object and redirect to the list of books.
   await Book.findByIdAndDelete(req.body.id);
   res.redirect("/catalog/books");
-});
+};
 
 // Display book update form on GET.
-exports.book_update_get = asyncHandler(async (req, res, next) => {
+exports.book_update_get = async (req, res, next) => {
   // Get book, authors and genres for form.
   const [book, allAuthors, allGenres] = await Promise.all([
     Book.findById(req.params.id).populate("author").exec(),
@@ -226,7 +225,7 @@ exports.book_update_get = asyncHandler(async (req, res, next) => {
     genres: allGenres,
     book,
   });
-});
+};
 
 // Handle book update on POST.
 exports.book_update_post = [
@@ -256,7 +255,7 @@ exports.book_update_post = [
   body("genre.*").escape(),
 
   // Process request after validation and sanitization.
-  asyncHandler(async (req, res, next) => {
+  async (req, res, next) => {
     // Extract the validation errors from a request.
     const errors = validationResult(req);
 
@@ -299,5 +298,5 @@ exports.book_update_post = [
     const thebook = await Book.findByIdAndUpdate(req.params.id, book, {});
     // Redirect to book detail page.
     res.redirect(thebook.url);
-  }),
+  },
 ];

controllers/bookinstanceController.js

@@ -2,20 +2,19 @@ const BookInstance = require("../models/bookinstance");
 const Book = require("../models/book");
 
 const { body, validationResult } = require("express-validator");
-const asyncHandler = require("express-async-handler");
 
 // Display list of all BookInstances.
-exports.bookinstance_list = asyncHandler(async (req, res, next) => {
+exports.bookinstance_list = async (req, res, next) => {
   const allBookInstances = await BookInstance.find().populate("book").exec();
 
   res.render("bookinstance_list", {
     title: "Book Instance List",
     bookinstance_list: allBookInstances,
   });
-});
+};
 
 // Display detail page for a specific BookInstance.
-exports.bookinstance_detail = asyncHandler(async (req, res, next) => {
+exports.bookinstance_detail = async (req, res, next) => {
   const bookInstance = await BookInstance.findById(req.params.id)
     .populate("book")
     .exec();
@@ -31,17 +30,17 @@ exports.bookinstance_detail = asyncHandler(async (req, res, next) => {
     title: "Book:",
     bookinstance: bookInstance,
   });
-});
+};
 
 // Display BookInstance create form on GET.
-exports.bookinstance_create_get = asyncHandler(async (req, res, next) => {
+exports.bookinstance_create_get = async (req, res, next) => {
   const allBooks = await Book.find({}, "title").sort({ title: 1 }).exec();
 
   res.render("bookinstance_form", {
     title: "Create BookInstance",
     book_list: allBooks,
   });
-});
+};
 
 // Handle BookInstance create on POST.
 exports.bookinstance_create_post = [
@@ -58,7 +57,7 @@ exports.bookinstance_create_post = [
     .toDate(),
 
   // Process request after validation and sanitization.
-  asyncHandler(async (req, res, next) => {
+  async (req, res, next) => {
     // Extract the validation errors from a request.
     const errors = validationResult(req);
 
@@ -88,11 +87,11 @@ exports.bookinstance_create_post = [
     // Data from form is valid
     await bookInstance.save();
     res.redirect(bookInstance.url);
-  }),
+  },
 ];
 
 // Display BookInstance delete form on GET.
-exports.bookinstance_delete_get = asyncHandler(async (req, res, next) => {
+exports.bookinstance_delete_get = async (req, res, next) => {
   const bookInstance = await BookInstance.findById(req.params.id)
     .populate("book")
     .exec();
@@ -106,17 +105,17 @@ exports.bookinstance_delete_get = asyncHandler(async (req, res, next) => {
     title: "Delete BookInstance",
     bookinstance: bookInstance,
   });
-});
+};
 
 // Handle BookInstance delete on POST.
-exports.bookinstance_delete_post = asyncHandler(async (req, res, next) => {
+exports.bookinstance_delete_post = async (req, res, next) => {
   // Assume valid BookInstance id in field.
   await BookInstance.findByIdAndDelete(req.body.id);
   res.redirect("/catalog/bookinstances");
-});
+};
 
 // Display BookInstance update form on GET.
-exports.bookinstance_update_get = asyncHandler(async (req, res, next) => {
+exports.bookinstance_update_get = async (req, res, next) => {
   // Get book, all books for form (in parallel)
   const [bookInstance, allBooks] = await Promise.all([
     BookInstance.findById(req.params.id).populate("book").exec(),
@@ -136,7 +135,7 @@ exports.bookinstance_update_get = asyncHandler(async (req, res, next) => {
     selected_book: bookInstance.book._id,
     bookinstance: bookInstance,
   });
-});
+};
 
 // Handle BookInstance update on POST.
 exports.bookinstance_update_post = [
@@ -153,7 +152,7 @@ exports.bookinstance_update_post = [
     .toDate(),
 
   // Process request after validation and sanitization.
-  asyncHandler(async (req, res, next) => {
+  async (req, res, next) => {
     // Extract the validation errors from a request.
     const errors = validationResult(req);
 
@@ -186,5 +185,5 @@ exports.bookinstance_update_post = [
     await BookInstance.findByIdAndUpdate(req.params.id, bookInstance, {});
     // Redirect to detail page.
     res.redirect(bookInstance.url);
-  }),
+  },
 ];

package.json

@@ -16,7 +16,6 @@
     "cookie-parser": "^1.4.7",
     "debug": "^4.4.1",
     "express": "^5.1.0",
-    "express-async-handler": "^1.2.0",
     "express-rate-limit": "^7.5.1",
     "express-validator": "^7.2.1",
     "helmet": "^8.1.0",