feat(ranges): start adopting ranges

Author: wravery

include/graphqlservice/GraphQLClient.h

@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <iterator>
 #include <optional>
+#include <ranges>
 #include <stdexcept>
 #include <vector>
 
@@ -167,7 +168,7 @@ struct ModifiedVariable
 		response::Value result { response::Type::List };
 
 		result.reserve(listValue.size());
-		std::for_each(listValue.begin(), listValue.end(), [&result](auto& value) {
+		std::ranges::for_each(listValue, [&result](auto& value) {
 			result.emplace_back(serialize<Other...>(std::move(value)));
 		});
 		listValue.clear();
@@ -218,7 +219,7 @@ struct ModifiedVariable
 	{
 		typename VariableTraits<Type, Modifier, Other...>::type result(listValue.size());
 
-		std::transform(listValue.cbegin(), listValue.cend(), result.begin(), duplicate<Other...>);
+		std::ranges::transform(listValue, result.begin(), duplicate<Other...>);
 
 		return result;
 	}
@@ -322,8 +323,7 @@ struct ModifiedResponse
 			auto listValue = response.release<response::ListType>();
 
 			result.reserve(listValue.size());
-			std::transform(listValue.begin(),
-				listValue.end(),
+			std::ranges::transform(listValue,
 				std::back_inserter(result),
 				[](response::Value& value) {
 					return parse<Other...>(std::move(value));

include/graphqlservice/GraphQLService.h

@@ -22,6 +22,7 @@
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <ranges>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -758,8 +759,8 @@ struct ModifiedArgument
 		typename ArgumentTraits<Type, Modifier, Other...>::type result(values.size());
 		const auto& elements = values.get<response::ListType>();
 
-		std::transform(elements.cbegin(),
-			elements.cend(),
+		std::transform(elements.begin(),
+			elements.end(),
 			result.begin(),
 			[name](const response::Value& element) {
 				response::Value single(response::Type::Map);
@@ -831,7 +832,7 @@ struct ModifiedArgument
 	{
 		typename ArgumentTraits<Type, Modifier, Other...>::type result(listValue.size());
 
-		std::transform(listValue.cbegin(), listValue.cend(), result.begin(), duplicate<Other...>);
+		std::ranges::transform(listValue, result.begin(), duplicate<Other...>);
 
 		return result;
 	}

samples/client/benchmark.cpp

@@ -7,6 +7,7 @@
 #include <iostream>
 #include <iterator>
 #include <numeric>
+#include <ranges>
 #include <stdexcept>
 #include <string>
 #include <string_view>
@@ -45,7 +46,7 @@ void outputOverview(
 void outputSegment(
 	std::string_view name, std::vector<std::chrono::steady_clock::duration>& durations) noexcept
 {
-	std::sort(durations.begin(), durations.end());
+	std::ranges::sort(durations);
 
 	const auto count = durations.size();
 	const auto total =

samples/learn/DroidData.cpp

@@ -21,18 +21,15 @@ void Droid::addFriends(
 {
 	friends_.resize(friends.size());
 
-	std::transform(friends.begin(),
-		friends.end(),
-		friends_.begin(),
-		[](const auto& spFriend) noexcept {
-			return std::visit(
-				[](const auto& hero) noexcept {
-					return WeakHero {
-						std::weak_ptr<typename std::decay_t<decltype(hero)>::element_type> { hero }
-					};
-				},
-				spFriend);
-		});
+	std::ranges::transform(friends, friends_.begin(), [](const auto& spFriend) noexcept {
+		return std::visit(
+			[](const auto& hero) noexcept {
+				return WeakHero {
+					std::weak_ptr<typename std::decay_t<decltype(hero)>::element_type> { hero }
+				};
+			},
+			spFriend);
+	});
 }
 
 const response::IdType& Droid::getId() const noexcept
@@ -49,12 +46,9 @@ std::optional<std::vector<std::shared_ptr<object::Character>>> Droid::getFriends
 {
 	std::vector<std::shared_ptr<object::Character>> result(friends_.size());
 
-	std::transform(friends_.begin(),
-		friends_.end(),
-		result.begin(),
-		[](const auto& wpFriend) noexcept {
-			return make_hero(wpFriend);
-		});
+	std::ranges::transform(friends_, result.begin(), [](const auto& wpFriend) noexcept {
+		return make_hero(wpFriend);
+	});
 	result.erase(std::remove(result.begin(), result.end(), std::shared_ptr<object::Character> {}),
 		result.end());
 
@@ -65,12 +59,9 @@ std::optional<std::vector<std::optional<Episode>>> Droid::getAppearsIn() const n
 {
 	std::vector<std::optional<Episode>> result(appearsIn_.size());
 
-	std::transform(appearsIn_.begin(),
-		appearsIn_.end(),
-		result.begin(),
-		[](const auto& entry) noexcept {
-			return std::make_optional(entry);
-		});
+	std::ranges::transform(appearsIn_, result.begin(), [](const auto& entry) noexcept {
+		return std::make_optional(entry);
+	});
 
 	return result.empty() ? std::nullopt : std::make_optional(std::move(result));
 }

samples/learn/HumanData.cpp

@@ -20,18 +20,15 @@ void Human::addFriends(std::vector<SharedHero> friends) noexcept
 {
 	friends_.resize(friends.size());
 
-	std::transform(friends.begin(),
-		friends.end(),
-		friends_.begin(),
-		[](const auto& spFriend) noexcept {
-			return std::visit(
-				[](const auto& hero) noexcept {
-					return WeakHero {
-						std::weak_ptr<typename std::decay_t<decltype(hero)>::element_type> { hero }
-					};
-				},
-				spFriend);
-		});
+	std::ranges::transform(friends, friends_.begin(), [](const auto& spFriend) noexcept {
+		return std::visit(
+			[](const auto& hero) noexcept {
+				return WeakHero {
+					std::weak_ptr<typename std::decay_t<decltype(hero)>::element_type> { hero }
+				};
+			},
+			spFriend);
+	});
 }
 
 const response::IdType& Human::getId() const noexcept
@@ -48,12 +45,9 @@ std::optional<std::vector<std::shared_ptr<object::Character>>> Human::getFriends
 {
 	std::vector<std::shared_ptr<object::Character>> result(friends_.size());
 
-	std::transform(friends_.begin(),
-		friends_.end(),
-		result.begin(),
-		[](const auto& wpFriend) noexcept {
-			return make_hero(wpFriend);
-		});
+	std::ranges::transform(friends_, result.begin(), [](const auto& wpFriend) noexcept {
+		return make_hero(wpFriend);
+	});
 	result.erase(std::remove(result.begin(), result.end(), std::shared_ptr<object::Character> {}),
 		result.end());
 
@@ -64,12 +58,9 @@ std::optional<std::vector<std::optional<Episode>>> Human::getAppearsIn() const n
 {
 	std::vector<std::optional<Episode>> result(appearsIn_.size());
 
-	std::transform(appearsIn_.begin(),
-		appearsIn_.end(),
-		result.begin(),
-		[](const auto& entry) noexcept {
-			return std::make_optional(entry);
-		});
+	std::ranges::transform(appearsIn_, result.begin(), [](const auto& entry) noexcept {
+		return std::make_optional(entry);
+	});
 
 	return result.empty() ? std::nullopt : std::make_optional(std::move(result));
 }

samples/today/TodayMock.cpp

@@ -15,6 +15,7 @@
 #include <chrono>
 #include <iostream>
 #include <mutex>
+#include <ranges>
 
 namespace graphql::today {
 
@@ -24,7 +25,7 @@ const response::IdType& getFakeAppointmentId() noexcept
 		std::string_view fakeIdString { "fakeAppointmentId" };
 		response::IdType result(fakeIdString.size());
 
-		std::copy(fakeIdString.cbegin(), fakeIdString.cend(), result.begin());
+		std::ranges::copy(fakeIdString, result.begin());
 
 		return response::IdType { std::move(result) };
 	}();
@@ -38,7 +39,7 @@ const response::IdType& getFakeTaskId() noexcept
 		std::string_view fakeIdString { "fakeTaskId" };
 		response::IdType result(fakeIdString.size());
 
-		std::copy(fakeIdString.cbegin(), fakeIdString.cend(), result.begin());
+		std::ranges::copy(fakeIdString, result.begin());
 
 		return response::IdType { std::move(result) };
 	}();
@@ -52,7 +53,7 @@ const response::IdType& getFakeFolderId() noexcept
 		std::string_view fakeIdString { "fakeFolderId" };
 		response::IdType result(fakeIdString.size());
 
-		std::copy(fakeIdString.cbegin(), fakeIdString.cend(), result.begin());
+		std::ranges::copy(fakeIdString, result.begin());
 
 		return response::IdType { std::move(result) };
 	}();
@@ -198,8 +199,7 @@ std::optional<std::vector<std::shared_ptr<object::AppointmentEdge>>> Appointment
 	auto result = std::make_optional<std::vector<std::shared_ptr<object::AppointmentEdge>>>(
 		_appointments.size());
 
-	std::transform(_appointments.cbegin(),
-		_appointments.cend(),
+	std::ranges::transform(_appointments,
 		result->begin(),
 		[](const std::shared_ptr<Appointment>& node) {
 			return std::make_shared<object::AppointmentEdge>(
@@ -268,12 +268,9 @@ std::optional<std::vector<std::shared_ptr<object::TaskEdge>>> TaskConnection::ge
 {
 	auto result = std::make_optional<std::vector<std::shared_ptr<object::TaskEdge>>>(_tasks.size());
 
-	std::transform(_tasks.cbegin(),
-		_tasks.cend(),
-		result->begin(),
-		[](const std::shared_ptr<Task>& node) {
-			return std::make_shared<object::TaskEdge>(std::make_shared<TaskEdge>(node));
-		});
+	std::ranges::transform(_tasks, result->begin(), [](const std::shared_ptr<Task>& node) {
+		return std::make_shared<object::TaskEdge>(std::make_shared<TaskEdge>(node));
+	});
 
 	return result;
 }
@@ -338,12 +335,9 @@ std::optional<std::vector<std::shared_ptr<object::FolderEdge>>> FolderConnection
 	auto result =
 		std::make_optional<std::vector<std::shared_ptr<object::FolderEdge>>>(_folders.size());
 
-	std::transform(_folders.cbegin(),
-		_folders.cend(),
-		result->begin(),
-		[](const std::shared_ptr<Folder>& node) {
-			return std::make_shared<object::FolderEdge>(std::make_shared<FolderEdge>(node));
-		});
+	std::ranges::transform(_folders, result->begin(), [](const std::shared_ptr<Folder>& node) {
+		return std::make_shared<object::FolderEdge>(std::make_shared<FolderEdge>(node));
+	});
 
 	return result;
 }
@@ -708,12 +702,9 @@ std::vector<std::shared_ptr<object::Appointment>> Query::getAppointmentsById(
 {
 	std::vector<std::shared_ptr<object::Appointment>> result(ids.size());
 
-	std::transform(ids.cbegin(),
-		ids.cend(),
-		result.begin(),
-		[this, &params](const response::IdType& id) {
-			return std::make_shared<object::Appointment>(findAppointment(params, id));
-		});
+	std::ranges::transform(ids, result.begin(), [this, &params](const response::IdType& id) {
+		return std::make_shared<object::Appointment>(findAppointment(params, id));
+	});
 
 	return result;
 }
@@ -723,12 +714,9 @@ std::vector<std::shared_ptr<object::Task>> Query::getTasksById(
 {
 	std::vector<std::shared_ptr<object::Task>> result(ids.size());
 
-	std::transform(ids.cbegin(),
-		ids.cend(),
-		result.begin(),
-		[this, &params](const response::IdType& id) {
-			return std::make_shared<object::Task>(findTask(params, id));
-		});
+	std::ranges::transform(ids, result.begin(), [this, &params](const response::IdType& id) {
+		return std::make_shared<object::Task>(findTask(params, id));
+	});
 
 	return result;
 }
@@ -738,12 +726,9 @@ std::vector<std::shared_ptr<object::Folder>> Query::getUnreadCountsById(
 {
 	std::vector<std::shared_ptr<object::Folder>> result(ids.size());
 
-	std::transform(ids.cbegin(),
-		ids.cend(),
-		result.begin(),
-		[this, &params](const response::IdType& id) {
-			return std::make_shared<object::Folder>(findUnreadCount(params, id));
-		});
+	std::ranges::transform(ids, result.begin(), [this, &params](const response::IdType& id) {
+		return std::make_shared<object::Folder>(findUnreadCount(params, id));
+	});
 
 	return result;
 }
@@ -777,13 +762,10 @@ std::vector<std::shared_ptr<object::UnionType>> Query::getAnyType(
 
 	std::vector<std::shared_ptr<object::UnionType>> result(_appointments.size());
 
-	std::transform(_appointments.cbegin(),
-		_appointments.cend(),
-		result.begin(),
-		[](const auto& appointment) noexcept {
-			return std::make_shared<object::UnionType>(
-				std::make_shared<object::Appointment>(appointment));
-		});
+	std::ranges::transform(_appointments, result.begin(), [](const auto& appointment) noexcept {
+		return std::make_shared<object::UnionType>(
+			std::make_shared<object::Appointment>(appointment));
+	});
 
 	return result;
 }

samples/today/benchmark.cpp

@@ -6,6 +6,7 @@
 #include <iostream>
 #include <iterator>
 #include <numeric>
+#include <ranges>
 #include <stdexcept>
 #include <string>
 #include <string_view>
@@ -43,7 +44,7 @@ void outputOverview(
 void outputSegment(
 	std::string_view name, std::vector<std::chrono::steady_clock::duration>& durations) noexcept
 {
-	std::sort(durations.begin(), durations.end());
+	std::ranges::sort(durations);
 
 	const auto count = durations.size();
 	const auto total =

src/ClientGenerator.cpp

@@ -1120,18 +1120,15 @@ response::Value Variable<)cpp"
 			std::vector<std::pair<std::string_view, std::string_view>> sortedValues(
 				enumValues.size());
 
-			std::transform(enumValues.cbegin(),
-				enumValues.cend(),
+			std::ranges::transform(enumValues,
 				sortedValues.begin(),
 				[](const auto& value) noexcept {
 					return std::make_pair(value->name(),
 						SchemaLoader::getSafeCppName(value->name()));
 				});
-			std::sort(sortedValues.begin(),
-				sortedValues.end(),
-				[](const auto& lhs, const auto& rhs) noexcept {
-					return internal::shorter_or_less {}(lhs.first, rhs.first);
-				});
+			std::ranges::sort(sortedValues, [](const auto& lhs, const auto& rhs) noexcept {
+				return internal::shorter_or_less {}(lhs.first, rhs.first);
+			});
 
 			bool firstValue = true;