Implement block quote whitespace normalization

Author: wravery

include/graphqlservice/internal/Grammar.h

@@ -151,12 +151,29 @@ struct block_escape_sequence : seq<backslash_token, block_quote_token>
 };
 
 struct block_quote_character
-	: plus<not_at<block_quote_token>, not_at<block_escape_sequence>, source_character>
+	: plus<not_at<ascii::eol>, not_at<block_quote_token>, not_at<block_escape_sequence>, source_character>
+{
+};
+
+struct block_quote_empty_line : star<not_at<eol>, space>
+{
+};
+
+struct block_quote_line_content
+	: plus<sor<block_escape_sequence, block_quote_character>>
+{
+};
+
+struct block_quote_line : seq<block_quote_empty_line, block_quote_line_content>
+{
+};
+
+struct block_quote_content_lines: opt<list<sor<block_quote_line, block_quote_empty_line>, eol>>
 {
 };
 
 struct block_quote_content
-	: seq<star<sor<block_escape_sequence, block_quote_character>>, must<block_quote_token>>
+	: seq<block_quote_content_lines, must<block_quote_token>>
 {
 };
 

samples/today/schema.today.graphql

@@ -95,6 +95,14 @@ type Mutation {
     setFloat(value: Float!): Float!
 }
 
+    """
+
+        Subscription type:
+        
+        2nd line...
+            3rd line goes here!
+                
+    """
 type Subscription {
     nextAppointmentChange : Appointment @deprecated(
         reason:"""Need to deprecate a [field](http://spec.graphql.org/June2018/#sec-Deprecation)"""

samples/today/separate/TodaySchema.cpp

@@ -194,7 +194,10 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 	schema->AddType(R"gql(CompleteTaskPayload)gql"sv, typeCompleteTaskPayload);
 	auto typeMutation = schema::ObjectType::Make(R"gql(Mutation)gql"sv, R"md()md");
 	schema->AddType(R"gql(Mutation)gql"sv, typeMutation);
-	auto typeSubscription = schema::ObjectType::Make(R"gql(Subscription)gql"sv, R"md()md");
+	auto typeSubscription = schema::ObjectType::Make(R"gql(Subscription)gql"sv, R"md(Subscription type:
+
+2nd line...
+    3rd line goes here!)md");
 	schema->AddType(R"gql(Subscription)gql"sv, typeSubscription);
 	auto typeAppointment = schema::ObjectType::Make(R"gql(Appointment)gql"sv, R"md()md");
 	schema->AddType(R"gql(Appointment)gql"sv, typeAppointment);

samples/today/unified/TodaySchema.cpp

@@ -1220,7 +1220,10 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 	schema->AddType(R"gql(CompleteTaskPayload)gql"sv, typeCompleteTaskPayload);
 	auto typeMutation = schema::ObjectType::Make(R"gql(Mutation)gql"sv, R"md()md");
 	schema->AddType(R"gql(Mutation)gql"sv, typeMutation);
-	auto typeSubscription = schema::ObjectType::Make(R"gql(Subscription)gql"sv, R"md()md");
+	auto typeSubscription = schema::ObjectType::Make(R"gql(Subscription)gql"sv, R"md(Subscription type:
+
+2nd line...
+    3rd line goes here!)md");
 	schema->AddType(R"gql(Subscription)gql"sv, typeSubscription);
 	auto typeAppointment = schema::ObjectType::Make(R"gql(Appointment)gql"sv, R"md()md");
 	schema->AddType(R"gql(Appointment)gql"sv, typeAppointment);

src/SyntaxTree.cpp

@@ -9,9 +9,12 @@
 #include <tao/pegtl/contrib/unescape.hpp>
 
 #include <functional>
+#include <iterator>
 #include <memory>
 #include <numeric>
+#include <optional>
 #include <tuple>
+#include <utility>
 
 using namespace std::literals;
 
@@ -47,7 +50,90 @@ std::string_view ast_node::unescaped_view() const
 {
 	if (!_unescaped)
 	{
-		if (children.size() > 1)
+		if (is_type<block_quote_content_lines>())
+		{
+			// Trim leading and trailing empty lines
+			const auto isNonEmptyLine = [](const std::unique_ptr<ast_node>& child) noexcept {
+				return child->is_type<block_quote_line>();
+			};
+			const auto itrEndRev = std::make_reverse_iterator(
+				std::find_if(children.cbegin(), children.cend(), isNonEmptyLine));
+			const auto itrRev = std::find_if(children.crbegin(), itrEndRev, isNonEmptyLine);
+			std::vector<std::optional<std::pair<std::string_view, std::string_view>>> lines(
+				std::distance(itrRev, itrEndRev));
+
+			std::transform(itrRev,
+				itrEndRev,
+				lines.rbegin(),
+				[](const std::unique_ptr<ast_node>& child) noexcept {
+					return (child->is_type<block_quote_line>() && !child->children.empty()
+							   && child->children.front()->is_type<block_quote_empty_line>()
+							   && child->children.back()->is_type<block_quote_line_content>())
+						? std::make_optional(std::make_pair(child->children.front()->string_view(),
+							child->children.back()->unescaped_view()))
+						: std::nullopt;
+				});
+
+			// Calculate the common indent
+			const auto commonIndent = std::accumulate(lines.cbegin(),
+				lines.cend(),
+				std::optional<size_t> {},
+				[](auto value, const auto& line) noexcept {
+					if (line)
+					{
+						const auto indent = line->first.size();
+
+						if (!value || indent < *value)
+						{
+							value = indent;
+						}
+					}
+
+					return value;
+				});
+
+			const auto trimIndent = commonIndent ? *commonIndent : 0;
+			std::string joined;
+
+			if (!lines.empty())
+			{
+				joined.reserve(std::accumulate(lines.cbegin(),
+								   lines.cend(),
+								   size_t {},
+								   [trimIndent](auto value, const auto& line) noexcept {
+									   if (line)
+									   {
+										   value += line->first.size() - trimIndent;
+										   value += line->second.size();
+									   }
+
+									   return value;
+								   })
+					+ lines.size() - 1);
+
+				bool firstLine = true;
+
+				for (const auto& line : lines)
+				{
+					if (!firstLine)
+					{
+						joined.append(1, '\n');
+					}
+
+					if (line)
+					{
+						joined.append(line->first.substr(trimIndent));
+						joined.append(line->second);
+					}
+
+					firstLine = false;
+				}
+			}
+
+			const_cast<ast_node*>(this)->_unescaped =
+				std::make_unique<unescaped_t>(std::move(joined));
+		}
+		else if (children.size() > 1)
 		{
 			std::string joined;
 
@@ -224,6 +310,26 @@ struct ast_selector<block_escape_sequence> : std::true_type
 	}
 };
 
+template <>
+struct ast_selector<block_quote_content_lines> : std::true_type
+{
+};
+
+template <>
+struct ast_selector<block_quote_empty_line> : std::true_type
+{
+};
+
+template <>
+struct ast_selector<block_quote_line> : std::true_type
+{
+};
+
+template <>
+struct ast_selector<block_quote_line_content> : std::true_type
+{
+};
+
 template <>
 struct ast_selector<block_quote_character> : std::true_type
 {