feat: reorder include statements to ensure corresponding headers are placed first

format.sh

@@ -3,9 +3,8 @@
 ./check_iwyu.sh
 ./fix_iwyu_auto.sh
 
-# Reorder includes to put corresponding header first
-./reorder_includes.sh
-
 find webserv -name "*.hpp" -o -name "*.cpp" | xargs sed -i -E 's/#include "(.*)"/#include <\1>/g'
 find webserv -name "*.cpp" -o -name "*.hpp" | xargs clang-format -i
 find webserv -name "*.hpp" -exec sh -c 'if ! grep -q "#pragma once" "$1"; then echo "Missing #pragma once in $1"; fi' _ {} \;
+# Reorder includes to put corresponding header first
+./reorder_includes.sh

webserv/client/Client.cpp

@@ -1,4 +1,5 @@
 #include <webserv/client/Client.hpp>
+
 #include <webserv/config/ConfigManager.hpp> // for ConfigManager
 #include <webserv/config/ServerConfig.hpp>  // for ServerConfig
 #include <webserv/handler/ErrorHandler.hpp> // for ErrorHandler

webserv/config/AConfig.cpp

@@ -1,4 +1,5 @@
 #include <webserv/config/AConfig.hpp>                    // for AConfig
+
 #include <webserv/config/directive/ADirective.hpp>       // for ADirective
 #include <webserv/config/directive/DirectiveFactory.hpp> // for DirectiveFactory
 #include <webserv/config/utils.hpp>                      // for trim

webserv/config/ConfigManager.cpp

@@ -1,4 +1,5 @@
 #include <webserv/config/ConfigManager.hpp>
+
 #include <webserv/config/GlobalConfig.hpp> // for GlobalConfig
 #include <webserv/config/utils.hpp>        // for removeComments
 #include <webserv/log/Log.hpp>             // for Log

webserv/config/GlobalConfig.cpp

@@ -1,4 +1,5 @@
 #include <webserv/config/GlobalConfig.hpp>
+
 #include <webserv/config/utils.hpp> // for findCorrespondingClosingBrace
 #include <webserv/log/Log.hpp>      // for Log
 

webserv/config/LocationConfig.cpp

@@ -1,5 +1,6 @@
-#include <webserv/config/AConfig.hpp> // for AConfig
 #include <webserv/config/LocationConfig.hpp>
+
+#include <webserv/config/AConfig.hpp> // for AConfig
 #include <webserv/log/Log.hpp> // for Log, LOCATION
 
 LocationConfig::LocationConfig(const std::string &block, const AConfig *parent) : AConfig(parent)

webserv/config/ServerConfig.cpp

@@ -1,6 +1,7 @@
+#include <webserv/config/ServerConfig.hpp>
+
 #include <webserv/config/AConfig.hpp>        // for AConfig
 #include <webserv/config/LocationConfig.hpp> // for LocationConfig
-#include <webserv/config/ServerConfig.hpp>
 #include <webserv/config/utils.hpp> // for findCorrespondingClosingBrace, trim
 #include <webserv/log/Log.hpp>      // for Log, LOCATION
 

webserv/config/directive/ADirective.cpp

@@ -1,4 +1,5 @@
 #include <webserv/config/directive/ADirective.hpp>
+
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValue, operator<<
 
 DirectiveValue ADirective::getValue() const

webserv/config/directive/BoolDirective.cpp

@@ -1,5 +1,6 @@
-#include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/BoolDirective.hpp>  // for IntDirective
+
+#include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
 #include <webserv/config/utils.hpp>                    // for trim
 

webserv/config/directive/DirectiveFactory.cpp

@@ -1,5 +1,6 @@
-#include <webserv/config/directive/BoolDirective.hpp>      // for BoolDirective
 #include <webserv/config/directive/DirectiveFactory.hpp>   // for DirectiveFactory
+
+#include <webserv/config/directive/BoolDirective.hpp>      // for BoolDirective
 #include <webserv/config/directive/IntDirective.hpp>       // for IntDirective
 #include <webserv/config/directive/IntStringDirective.hpp> // for IntStringDirective
 #include <webserv/config/directive/SizeDirective.hpp>      // for SizeDirective

webserv/config/directive/IntDirective.cpp

@@ -1,6 +1,7 @@
+#include <webserv/config/directive/IntDirective.hpp>   // for IntDirective
+
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-#include <webserv/config/directive/IntDirective.hpp>   // for IntDirective
 
 IntDirective::IntDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)

webserv/config/directive/IntStringDirective.cpp

@@ -1,6 +1,7 @@
+#include <webserv/config/directive/IntStringDirective.hpp> // for IntDirective
+
 #include <webserv/config/directive/ADirective.hpp>         // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp>     // for DirectiveValueType
-#include <webserv/config/directive/IntStringDirective.hpp> // for IntDirective
 #include <webserv/config/utils.hpp>                        // for trim
 
 #include <sstream> // for basic_istringstream, basic_istream::operator>>, istringstream

webserv/config/directive/SizeDirective.cpp

@@ -1,6 +1,7 @@
+#include <webserv/config/directive/SizeDirective.hpp>  // for SizeDirective
+
 #include <webserv/config/directive/ADirective.hpp>     // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp> // for DirectiveValueType
-#include <webserv/config/directive/SizeDirective.hpp>  // for SizeDirective
 #include <webserv/config/utils.hpp>                    // for trim
 
 #include <algorithm> // for __transform_fn, transform

webserv/config/directive/StringDirective.cpp

@@ -1,6 +1,7 @@
+#include <webserv/config/directive/StringDirective.hpp> // for IntDirective
+
 #include <webserv/config/directive/ADirective.hpp>      // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp>  // for DirectiveValueType
-#include <webserv/config/directive/StringDirective.hpp> // for IntDirective
 
 StringDirective::StringDirective(const std::string &name, const std::string &value)
     : ADirective(name) // NOLINT(bugprone-easily-swappable-parameters)

webserv/config/directive/VectorDirective.cpp

@@ -1,6 +1,7 @@
+#include <webserv/config/directive/VectorDirective.hpp> // for IntDirective
+
 #include <webserv/config/directive/ADirective.hpp>      // for ADirective
 #include <webserv/config/directive/DirectiveValue.hpp>  // for DirectiveValueType
-#include <webserv/config/directive/VectorDirective.hpp> // for IntDirective
 
 #include <sstream> // for basic_stringstream, stringstream
 

webserv/http/HttpHeaders.cpp

@@ -1,6 +1,7 @@
+#include <webserv/http/HttpHeaders.hpp>   // for HttpHeaders
+
 #include <webserv/config/utils.hpp>       // for trim
 #include <webserv/http/HttpConstants.hpp> // for CRLF
-#include <webserv/http/HttpHeaders.hpp>   // for HttpHeaders
 #include <webserv/log/Log.hpp>
 
 #include <algorithm> // for __transform_fn, transform

webserv/http/HttpRequest.cpp

@@ -1,7 +1,8 @@
+#include <webserv/http/HttpRequest.hpp>
+
 #include <webserv/client/Client.hpp>      // for Client
 #include <webserv/config/utils.hpp>       // for stoul
 #include <webserv/http/HttpConstants.hpp> // for CRLF, DOUBLE_CRLF, BAD_REQUEST
-#include <webserv/http/HttpRequest.hpp>
 #include <webserv/log/Log.hpp> // for Log, LOCATION
 
 #include <map>      // for map

webserv/log/FileChannel.cpp

@@ -1,4 +1,5 @@
 #include <webserv/log/FileChannel.hpp>
+
 #include <webserv/log/Log.hpp> // for Log
 
 #include <chrono>   // for system_clock

webserv/log/Log.cpp

@@ -1,6 +1,7 @@
+#include <webserv/log/Log.hpp>
+
 #include <webserv/log/Channel.hpp>     // for Channel
 #include <webserv/log/FileChannel.hpp> // for FileChannel
-#include <webserv/log/Log.hpp>
 #include <webserv/log/StdoutChannel.hpp> // for StdoutChannel
 
 #include <chrono>    // for duration_cast, operator-, steady_clock, duration, seconds

webserv/log/StdoutChannel.cpp

@@ -1,6 +1,7 @@
-#include <webserv/log/Log.hpp> // for Log
 #include <webserv/log/StdoutChannel.hpp>
 
+#include <webserv/log/Log.hpp> // for Log
+
 #include <iomanip>  // for operator<<, setfill, setw
 #include <iostream> // for basic_ostream, operator<<, basic_ostream::operator<<, cerr, cout, flush, ostream
 

webserv/server/Server.cpp

@@ -1,8 +1,9 @@
+#include <webserv/server/Server.hpp>
+
 #include <webserv/client/Client.hpp>        // for Client
 #include <webserv/config/ConfigManager.hpp> // for ConfigManager
 #include <webserv/config/ServerConfig.hpp>  // for ServerConfig
 #include <webserv/log/Log.hpp>              // for Log
-#include <webserv/server/Server.hpp>
 #include <webserv/socket/Socket.hpp> // for Socket
 
 #include <cerrno>    // for errno

webserv/socket/Socket.cpp

@@ -1,6 +1,7 @@
-#include <webserv/log/Log.hpp>
 #include <webserv/socket/Socket.hpp>
 
+#include <webserv/log/Log.hpp>
+
 #include <memory>
 #include <stdexcept>