Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #324 #325

Merged
merged 2 commits into from
Sep 25, 2024
Merged

fix: #324 #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e874c9
fix: #324
wravery Sep 25, 2024
85c139c
fix: explicitly type default initializers for clarity
wravery Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions include/graphqlservice/GraphQLService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,17 @@ class [[nodiscard("unnecessary construction")]] await_async final
using Directives = std::vector<std::pair<std::string_view, response::Value>>;

// Traversing a fragment spread adds a new set of directives.
using FragmentDefinitionDirectiveStack = std::list<std::reference_wrapper<const Directives>>;
using FragmentSpreadDirectiveStack = std::list<Directives>;
struct [[nodiscard("unnecessary construction")]] FragmentDefinitionDirectiveStack
{
const std::reference_wrapper<const Directives> directives;
const std::shared_ptr<FragmentDefinitionDirectiveStack> outer;
};

struct [[nodiscard("unnecessary construction")]] FragmentSpreadDirectiveStack
{
const Directives directives;
const std::shared_ptr<FragmentSpreadDirectiveStack> outer;
};

// Pass a common bundle of parameters to all of the generated Object::getField accessors in a
// SelectionSet
Expand Down
12 changes: 6 additions & 6 deletions samples/today/TodayMock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,15 +907,15 @@ NestedType::NestedType(service::FieldParams&& params, int depth)
: depth(depth)
{
_capturedParams.push({ { params.operationDirectives },
params.fragmentDefinitionDirectives->empty()
!params.fragmentDefinitionDirectives
? service::Directives {}
: service::Directives { params.fragmentDefinitionDirectives->front().get() },
params.fragmentSpreadDirectives->empty()
: service::Directives { params.fragmentDefinitionDirectives->directives.get() },
!params.fragmentSpreadDirectives
? service::Directives {}
: service::Directives { params.fragmentSpreadDirectives->front() },
params.inlineFragmentDirectives->empty()
: service::Directives { params.fragmentSpreadDirectives->directives },
!params.inlineFragmentDirectives
? service::Directives {}
: service::Directives { params.inlineFragmentDirectives->front() },
: service::Directives { params.inlineFragmentDirectives->directives },
std::move(params.fieldDirectives) });
}

Expand Down
72 changes: 40 additions & 32 deletions src/GraphQLService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,17 +244,17 @@ void await_worker_queue::resumePending()
// Default to immediate synchronous execution.
await_async::await_async()
: _pimpl { std::static_pointer_cast<const Concept>(
std::make_shared<Model<std::suspend_never>>(std::make_shared<std::suspend_never>())) }
std::make_shared<Model<std::suspend_never>>(std::make_shared<std::suspend_never>())) }
{
}

// Implicitly convert a std::launch parameter used with std::async to an awaitable.
await_async::await_async(std::launch launch)
: _pimpl { ((launch & std::launch::async) == std::launch::async)
? std::static_pointer_cast<const Concept>(std::make_shared<Model<await_worker_thread>>(
std::make_shared<await_worker_thread>()))
std::make_shared<await_worker_thread>()))
: std::static_pointer_cast<const Concept>(std::make_shared<Model<std::suspend_never>>(
std::make_shared<std::suspend_never>())) }
std::make_shared<std::suspend_never>())) }
{
}

Expand Down Expand Up @@ -896,13 +896,17 @@ class SelectionVisitor
const TypeNames& _typeNames;
const ResolverMap& _resolvers;

static const Directives s_emptyFragmentDefinitionDirectives;

std::shared_ptr<FragmentDefinitionDirectiveStack> _fragmentDefinitionDirectives;
std::shared_ptr<FragmentSpreadDirectiveStack> _fragmentSpreadDirectives;
std::shared_ptr<FragmentSpreadDirectiveStack> _inlineFragmentDirectives;
internal::string_view_set _names;
std::vector<VisitorValue> _values;
};

const Directives SelectionVisitor::s_emptyFragmentDefinitionDirectives {};

SelectionVisitor::SelectionVisitor(const SelectionSetParams& selectionSetParams,
const FragmentMap& fragments, const response::Value& variables, const TypeNames& typeNames,
const ResolverMap& resolvers, std::size_t count)
Expand All @@ -917,19 +921,17 @@ SelectionVisitor::SelectionVisitor(const SelectionSetParams& selectionSetParams,
, _variables(variables)
, _typeNames(typeNames)
, _resolvers(resolvers)
, _fragmentDefinitionDirectives { selectionSetParams.fragmentDefinitionDirectives }
, _fragmentSpreadDirectives { selectionSetParams.fragmentSpreadDirectives }
, _inlineFragmentDirectives { selectionSetParams.inlineFragmentDirectives }
, _fragmentDefinitionDirectives { std::make_shared<FragmentDefinitionDirectiveStack>(
FragmentDefinitionDirectiveStack { std::cref(s_emptyFragmentDefinitionDirectives),
selectionSetParams.fragmentDefinitionDirectives }) }
, _fragmentSpreadDirectives { std::make_shared<FragmentSpreadDirectiveStack>(
FragmentSpreadDirectiveStack { {}, selectionSetParams.fragmentSpreadDirectives }) }
, _inlineFragmentDirectives { std::make_shared<FragmentSpreadDirectiveStack>(
FragmentSpreadDirectiveStack { {}, selectionSetParams.inlineFragmentDirectives }) }
{
static const Directives s_emptyFragmentDefinitionDirectives;

// Traversing a SelectionSet from an Object type field should start tracking new fragment
// directives. The outer fragment directives are still there in the FragmentSpreadDirectiveStack
// if the field accessors want to inspect them.
_fragmentDefinitionDirectives->push_front(std::cref(s_emptyFragmentDefinitionDirectives));
_fragmentSpreadDirectives->push_front({});
_inlineFragmentDirectives->push_front({});

_names.reserve(count);
_values.reserve(count);
}
Expand Down Expand Up @@ -1126,8 +1128,12 @@ void SelectionVisitor::visitFragmentSpread(const peg::ast_node& fragmentSpread)
return;
}

_fragmentDefinitionDirectives->push_front(itr->second.getDirectives());
_fragmentSpreadDirectives->push_front(directiveVisitor.getDirectives());
_fragmentDefinitionDirectives = std::make_shared<FragmentDefinitionDirectiveStack>(
FragmentDefinitionDirectiveStack { itr->second.getDirectives(),
_fragmentDefinitionDirectives });
_fragmentSpreadDirectives = std::make_shared<FragmentSpreadDirectiveStack>(
FragmentSpreadDirectiveStack { directiveVisitor.getDirectives(),
_fragmentSpreadDirectives });

const std::size_t count = itr->second.getSelection().children.size();

Expand All @@ -1142,8 +1148,8 @@ void SelectionVisitor::visitFragmentSpread(const peg::ast_node& fragmentSpread)
visit(*selection);
}

_fragmentSpreadDirectives->pop_front();
_fragmentDefinitionDirectives->pop_front();
_fragmentSpreadDirectives = _fragmentSpreadDirectives->outer;
_fragmentDefinitionDirectives = _fragmentDefinitionDirectives->outer;
}

void SelectionVisitor::visitInlineFragment(const peg::ast_node& inlineFragment)
Expand Down Expand Up @@ -1172,7 +1178,9 @@ void SelectionVisitor::visitInlineFragment(const peg::ast_node& inlineFragment)
{
peg::on_first_child<peg::selection_set>(inlineFragment,
[this, &directiveVisitor](const peg::ast_node& child) {
_inlineFragmentDirectives->push_front(directiveVisitor.getDirectives());
_inlineFragmentDirectives = std::make_shared<FragmentSpreadDirectiveStack>(
FragmentSpreadDirectiveStack { directiveVisitor.getDirectives(),
_inlineFragmentDirectives });

const std::size_t count = child.children.size();

Expand All @@ -1187,7 +1195,7 @@ void SelectionVisitor::visitInlineFragment(const peg::ast_node& inlineFragment)
visit(*selection);
}

_inlineFragmentDirectives->pop_front();
_inlineFragmentDirectives = _inlineFragmentDirectives->outer;
});
}
}
Expand Down Expand Up @@ -1438,9 +1446,9 @@ void OperationDefinitionVisitor::visit(
_resolverContext,
_params->state,
_params->directives,
std::make_shared<FragmentDefinitionDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
std::shared_ptr<FragmentDefinitionDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::nullopt,
_launch,
};
Expand Down Expand Up @@ -1855,10 +1863,10 @@ AwaitableSubscribe Request::subscribe(RequestSubscribeParams params)
ResolverContext::NotifySubscribe,
registration->data->state,
registration->data->directives,
std::make_shared<FragmentDefinitionDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
{},
std::shared_ptr<FragmentDefinitionDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::nullopt,
launch,
};

Expand Down Expand Up @@ -1917,10 +1925,10 @@ AwaitableUnsubscribe Request::unsubscribe(RequestUnsubscribeParams params)
ResolverContext::NotifyUnsubscribe,
registration->data->state,
registration->data->directives,
std::make_shared<FragmentDefinitionDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
{},
std::shared_ptr<FragmentDefinitionDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::nullopt,
params.launch,
};

Expand Down Expand Up @@ -1980,9 +1988,9 @@ AwaitableDeliver Request::deliver(RequestDeliverParams params) const
ResolverContext::Subscription,
registration->data->state,
registration->data->directives,
std::make_shared<FragmentDefinitionDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
std::make_shared<FragmentSpreadDirectiveStack>(),
std::shared_ptr<FragmentDefinitionDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::shared_ptr<FragmentSpreadDirectiveStack> {},
std::nullopt,
params.launch,
};
Expand Down