Merge pull request #107 from wravery/master

Fix issues #105 and #106

Author: wravery

CMakeLists.txt

@@ -9,6 +9,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(GRAPHQL_INSTALL_INCLUDE_DIR include CACHE PATH "Header file install directory")
 set(GRAPHQL_INSTALL_TOOLS_DIR bin CACHE PATH "schemagen install directory")
 set(GRAPHQL_INSTALL_CMAKE_DIR lib/cmake CACHE PATH "CMake config files install directory")
+set(GRAPHQL_INSTALL_CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES} CACHE STRING "Configurations which perform a full install")
 
 option(BUILD_SHARED_LIBS "Build shared libraries instead of static libs" OFF)
 

src/CMakeLists.txt

@@ -59,8 +59,8 @@ if(GRAPHQL_BUILD_SCHEMAGEN)
 
   install(TARGETS schemagen
     EXPORT cppgraphqlgen-targets
-    RUNTIME DESTINATION ${GRAPHQL_INSTALL_TOOLS_DIR}/${PROJECT_NAME}
-    CONFIGURATIONS Release)
+    CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
+    RUNTIME DESTINATION ${GRAPHQL_INSTALL_TOOLS_DIR}/${PROJECT_NAME})
 endif()
 
 # introspection
@@ -111,8 +111,8 @@ target_link_libraries(graphqlservice PUBLIC
     graphqlpeg
     Threads::Threads)
 target_link_libraries(graphqlservice PUBLIC graphqlresponse)
-target_include_directories(graphqlservice SYSTEM PRIVATE
-  ${CMAKE_CURRENT_BINARY_DIR}/../include)
+target_include_directories(graphqlservice PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>)
 
 if(WIN32 AND BUILD_SHARED_LIBS)
   target_compile_definitions(graphqlservice
@@ -155,8 +155,8 @@ if(BUILD_GRAPHQLJSON)
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/JSONResponse.h
-    DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice
-    CONFIGURATIONS Release)
+    CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
+    DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
 else()
   set(GRAPHQL_BUILD_TESTS OFF CACHE BOOL "GRAPHQL_BUILD_TESTS depends on BUILD_GRAPHQLJSON" FORCE)
 endif()
@@ -178,8 +178,8 @@ install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLTree.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/Introspection.h
     ${CMAKE_CURRENT_BINARY_DIR}/../include/graphqlservice/IntrospectionSchema.h
-  DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice
-  CONFIGURATIONS Release)
+  CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
+  DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
 
 install(EXPORT cppgraphqlgen-targets
   NAMESPACE cppgraphqlgen::

src/SchemaGenerator.cpp

@@ -764,7 +764,10 @@ void Generator::visitObjectTypeDefinition(const peg::ast_node& objectTypeDefinit
 	peg::on_first_child<peg::description>(objectTypeDefinition,
 		[&description](const peg::ast_node& child)
 	{
-		description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			description = child.children.front()->unescaped;
+		}
 	});
 
 	_schemaTypes[name] = SchemaType::Object;
@@ -828,7 +831,10 @@ void Generator::visitInterfaceTypeDefinition(const peg::ast_node& interfaceTypeD
 	peg::on_first_child<peg::description>(interfaceTypeDefinition,
 		[&description](const peg::ast_node& child)
 	{
-		description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			description = child.children.front()->unescaped;
+		}
 	});
 
 	_schemaTypes[name] = SchemaType::Interface;
@@ -886,7 +892,10 @@ void Generator::visitInputObjectTypeDefinition(const peg::ast_node& inputObjectT
 	peg::on_first_child<peg::description>(inputObjectTypeDefinition,
 		[&description](const peg::ast_node& child)
 	{
-		description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			description = child.children.front()->unescaped;
+		}
 	});
 
 	_schemaTypes[name] = SchemaType::Input;
@@ -944,7 +953,10 @@ void Generator::visitEnumTypeDefinition(const peg::ast_node& enumTypeDefinition)
 	peg::on_first_child<peg::description>(enumTypeDefinition,
 		[&description](const peg::ast_node& child)
 	{
-		description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			description = child.children.front()->unescaped;
+		}
 	});
 
 	_schemaTypes[name] = SchemaType::Enum;
@@ -987,9 +999,12 @@ void Generator::visitEnumTypeExtension(const peg::ast_node& enumTypeExtension)
 			});
 
 			peg::on_first_child<peg::description>(child,
-				[&value](const peg::ast_node& enumValue)
+				[&value](const peg::ast_node& description)
 			{
-				value.description = enumValue.children.front()->unescaped;
+				if (!description.children.empty())
+				{
+					value.description = description.children.front()->unescaped;
+				}
 			});
 
 			peg::on_first_child<peg::directives>(child,
@@ -1058,7 +1073,10 @@ void Generator::visitScalarTypeDefinition(const peg::ast_node& scalarTypeDefinit
 	peg::on_first_child<peg::description>(scalarTypeDefinition,
 		[&description](const peg::ast_node& child)
 	{
-		description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			description = child.children.front()->unescaped;
+		}
 	});
 
 	_schemaTypes[name] = SchemaType::Scalar;
@@ -1081,7 +1099,10 @@ void Generator::visitUnionTypeDefinition(const peg::ast_node& unionTypeDefinitio
 	peg::on_first_child<peg::description>(unionTypeDefinition,
 		[&description](const peg::ast_node& child)
 	{
-		description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			description = child.children.front()->unescaped;
+		}
 	});
 
 	_schemaTypes[name] = SchemaType::Union;
@@ -1132,7 +1153,10 @@ void Generator::visitDirectiveDefinition(const peg::ast_node& directiveDefinitio
 	peg::on_first_child<peg::description>(directiveDefinition,
 		[&directive](const peg::ast_node& child)
 	{
-		directive.description = child.children.front()->unescaped;
+		if (!child.children.empty())
+		{
+			directive.description = child.children.front()->unescaped;
+		}
 	});
 
 	peg::for_each_child<peg::directive_location>(directiveDefinition,
@@ -1206,7 +1230,8 @@ OutputFieldList Generator::getOutputFields(const std::vector<std::unique_ptr<peg
 			{
 				fieldType.visit(*child);
 			}
-			else if (child->is_type<peg::description>())
+			else if (child->is_type<peg::description>()
+				&& !child->children.empty())
 			{
 				field.description = child->children.front()->unescaped;
 			}
@@ -1300,7 +1325,8 @@ InputFieldList Generator::getInputFields(const std::vector<std::unique_ptr<peg::
 
 				defaultValueLocation = { position.line, position.column };
 			}
-			else if (child->is_type<peg::description>())
+			else if (child->is_type<peg::description>()
+				&& !child->children.empty())
 			{
 				field.description = child->children.front()->unescaped;
 			}