Be more consistent about turning uncaught exceptions into error objects

Author: wravery

GraphQLService.cpp

@@ -1058,7 +1058,10 @@ std::future<response::Value> Object::resolve(const SelectionSetParams & selectio
 								message << "Field error name: " << name
 									<< " error: duplicate field";
 
-								errors.emplace_back(response::Value(message.str()));
+								response::Value error(response::Type::Map);
+
+								error.emplace_back(strMessage, response::Value(message.str()));
+								errors.emplace_back(std::move(error));
 							}
 							else
 							{
@@ -1074,7 +1077,10 @@ std::future<response::Value> Object::resolve(const SelectionSetParams & selectio
 					message << "Field error name: " << name
 						<< " unknown error: " << ex.what();
 
-					errors.emplace_back(response::Value(message.str()));
+					response::Value error(response::Type::Map);
+
+					error.emplace_back(strMessage, response::Value(message.str()));
+					errors.emplace_back(std::move(error));
 				}
 
 				children.pop();

include/graphqlservice/GraphQLService.h

@@ -532,7 +532,10 @@ struct ModifiedResult
 							<< "[" << index << "] "
 							<< " unknown error: " << ex.what();
 
-						errors.emplace_back(response::Value(message.str()));
+						response::Value error(response::Type::Map);
+
+						error.emplace_back(strMessage, response::Value(message.str()));
+						errors.emplace_back(std::move(error));
 					}
 
 					children.pop();
@@ -575,8 +578,10 @@ struct ModifiedResult
 						<< " unknown error: " << ex.what();
 
 					response::Value errors(response::Type::List);
+					response::Value error(response::Type::Map);
 
-					errors.emplace_back(response::Value(message.str()));
+					error.emplace_back(strMessage, response::Value(message.str()));
+					errors.emplace_back(std::move(error));
 					document.emplace_back(strErrors, std::move(errors));
 				}
 

tests.cpp

@@ -852,7 +852,9 @@ TEST_F(TodayServiceCase, UnimplementedFieldError)
 		const auto& errors = result["errors"];
 		ASSERT_TRUE(errors.type() == response::Type::List);
 		ASSERT_EQ(size_t(1), errors.size());
-		const auto& message = errors[0];
+		const auto& error = errors[0];
+		ASSERT_TRUE(error.type() == response::Type::Map);
+		const auto& message = error[service::strMessage];
 		ASSERT_TRUE(message.type() == response::Type::String);
 		ASSERT_EQ(R"e(Field name: unimplemented unknown error: Query::getUnimplemented is not implemented)e", message.get<const response::StringType&>());
 	}