Skip to content

Commit 7669e8e

Browse files
committed
Fix issue #37
1 parent 12936c0 commit 7669e8e

File tree

4 files changed

+94
-88
lines changed

4 files changed

+94
-88
lines changed

SchemaGenerator.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,13 +1947,13 @@ std::future<response::Value> )cpp" << objectType.type
19471947

19481948
sourceFile << R"cpp(
19491949
std::future<response::Value> )cpp" << objectType.type
1950-
<< R"cpp(::resolve__typename(service::ResolverParams&&)
1950+
<< R"cpp(::resolve__typename(service::ResolverParams&& params)
19511951
{
1952-
std::promise<response::Value> promise;
1952+
std::promise<response::StringType> promise;
19531953
1954-
promise.set_value(response::Value(std::string(")cpp" << objectType.type << R"cpp(")));
1954+
promise.set_value(")cpp" << objectType.type << R"cpp(");
19551955
1956-
return promise.get_future();
1956+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
19571957
}
19581958
)cpp";
19591959

samples/IntrospectionSchema.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,13 @@ std::future<response::Value> __Schema::resolveDirectives(service::ResolverParams
195195
return service::ModifiedResult<__Directive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
196196
}
197197

198-
std::future<response::Value> __Schema::resolve__typename(service::ResolverParams&&)
198+
std::future<response::Value> __Schema::resolve__typename(service::ResolverParams&& params)
199199
{
200-
std::promise<response::Value> promise;
200+
std::promise<response::StringType> promise;
201201

202-
promise.set_value(response::Value(std::string("__Schema")));
202+
promise.set_value("__Schema");
203203

204-
return promise.get_future();
204+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
205205
}
206206

207207
__Type::__Type()
@@ -315,13 +315,13 @@ std::future<response::Value> __Type::resolveOfType(service::ResolverParams&& par
315315
return service::ModifiedResult<__Type>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
316316
}
317317

318-
std::future<response::Value> __Type::resolve__typename(service::ResolverParams&&)
318+
std::future<response::Value> __Type::resolve__typename(service::ResolverParams&& params)
319319
{
320-
std::promise<response::Value> promise;
320+
std::promise<response::StringType> promise;
321321

322-
promise.set_value(response::Value(std::string("__Type")));
322+
promise.set_value("__Type");
323323

324-
return promise.get_future();
324+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
325325
}
326326

327327
__Field::__Field()
@@ -381,13 +381,13 @@ std::future<response::Value> __Field::resolveDeprecationReason(service::Resolver
381381
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
382382
}
383383

384-
std::future<response::Value> __Field::resolve__typename(service::ResolverParams&&)
384+
std::future<response::Value> __Field::resolve__typename(service::ResolverParams&& params)
385385
{
386-
std::promise<response::Value> promise;
386+
std::promise<response::StringType> promise;
387387

388-
promise.set_value(response::Value(std::string("__Field")));
388+
promise.set_value("__Field");
389389

390-
return promise.get_future();
390+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
391391
}
392392

393393
__InputValue::__InputValue()
@@ -431,13 +431,13 @@ std::future<response::Value> __InputValue::resolveDefaultValue(service::Resolver
431431
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
432432
}
433433

434-
std::future<response::Value> __InputValue::resolve__typename(service::ResolverParams&&)
434+
std::future<response::Value> __InputValue::resolve__typename(service::ResolverParams&& params)
435435
{
436-
std::promise<response::Value> promise;
436+
std::promise<response::StringType> promise;
437437

438-
promise.set_value(response::Value(std::string("__InputValue")));
438+
promise.set_value("__InputValue");
439439

440-
return promise.get_future();
440+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
441441
}
442442

443443
__EnumValue::__EnumValue()
@@ -481,13 +481,13 @@ std::future<response::Value> __EnumValue::resolveDeprecationReason(service::Reso
481481
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
482482
}
483483

484-
std::future<response::Value> __EnumValue::resolve__typename(service::ResolverParams&&)
484+
std::future<response::Value> __EnumValue::resolve__typename(service::ResolverParams&& params)
485485
{
486-
std::promise<response::Value> promise;
486+
std::promise<response::StringType> promise;
487487

488-
promise.set_value(response::Value(std::string("__EnumValue")));
488+
promise.set_value("__EnumValue");
489489

490-
return promise.get_future();
490+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
491491
}
492492

493493
__Directive::__Directive()
@@ -531,13 +531,13 @@ std::future<response::Value> __Directive::resolveArgs(service::ResolverParams&&
531531
return service::ModifiedResult<__InputValue>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
532532
}
533533

534-
std::future<response::Value> __Directive::resolve__typename(service::ResolverParams&&)
534+
std::future<response::Value> __Directive::resolve__typename(service::ResolverParams&& params)
535535
{
536-
std::promise<response::Value> promise;
536+
std::promise<response::StringType> promise;
537537

538-
promise.set_value(response::Value(std::string("__Directive")));
538+
promise.set_value("__Directive");
539539

540-
return promise.get_future();
540+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
541541
}
542542

543543
} /* namespace object */

samples/TodaySchema.cpp

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,13 @@ std::future<response::Value> Query::resolveNested(service::ResolverParams&& para
210210
return service::ModifiedResult<NestedType>::convert(std::move(result), std::move(params));
211211
}
212212

213-
std::future<response::Value> Query::resolve__typename(service::ResolverParams&&)
213+
std::future<response::Value> Query::resolve__typename(service::ResolverParams&& params)
214214
{
215-
std::promise<response::Value> promise;
215+
std::promise<response::StringType> promise;
216216

217-
promise.set_value(response::Value(std::string("Query")));
217+
promise.set_value("Query");
218218

219-
return promise.get_future();
219+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
220220
}
221221

222222
std::future<response::Value> Query::resolve__schema(service::ResolverParams&& params)
@@ -263,13 +263,13 @@ std::future<response::Value> PageInfo::resolveHasPreviousPage(service::ResolverP
263263
return service::ModifiedResult<response::BooleanType>::convert(std::move(result), std::move(params));
264264
}
265265

266-
std::future<response::Value> PageInfo::resolve__typename(service::ResolverParams&&)
266+
std::future<response::Value> PageInfo::resolve__typename(service::ResolverParams&& params)
267267
{
268-
std::promise<response::Value> promise;
268+
std::promise<response::StringType> promise;
269269

270-
promise.set_value(response::Value(std::string("PageInfo")));
270+
promise.set_value("PageInfo");
271271

272-
return promise.get_future();
272+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
273273
}
274274

275275
AppointmentEdge::AppointmentEdge()
@@ -297,13 +297,13 @@ std::future<response::Value> AppointmentEdge::resolveCursor(service::ResolverPar
297297
return service::ModifiedResult<response::Value>::convert(std::move(result), std::move(params));
298298
}
299299

300-
std::future<response::Value> AppointmentEdge::resolve__typename(service::ResolverParams&&)
300+
std::future<response::Value> AppointmentEdge::resolve__typename(service::ResolverParams&& params)
301301
{
302-
std::promise<response::Value> promise;
302+
std::promise<response::StringType> promise;
303303

304-
promise.set_value(response::Value(std::string("AppointmentEdge")));
304+
promise.set_value("AppointmentEdge");
305305

306-
return promise.get_future();
306+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
307307
}
308308

309309
AppointmentConnection::AppointmentConnection()
@@ -331,13 +331,13 @@ std::future<response::Value> AppointmentConnection::resolveEdges(service::Resolv
331331
return service::ModifiedResult<AppointmentEdge>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
332332
}
333333

334-
std::future<response::Value> AppointmentConnection::resolve__typename(service::ResolverParams&&)
334+
std::future<response::Value> AppointmentConnection::resolve__typename(service::ResolverParams&& params)
335335
{
336-
std::promise<response::Value> promise;
336+
std::promise<response::StringType> promise;
337337

338-
promise.set_value(response::Value(std::string("AppointmentConnection")));
338+
promise.set_value("AppointmentConnection");
339339

340-
return promise.get_future();
340+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
341341
}
342342

343343
TaskEdge::TaskEdge()
@@ -365,13 +365,13 @@ std::future<response::Value> TaskEdge::resolveCursor(service::ResolverParams&& p
365365
return service::ModifiedResult<response::Value>::convert(std::move(result), std::move(params));
366366
}
367367

368-
std::future<response::Value> TaskEdge::resolve__typename(service::ResolverParams&&)
368+
std::future<response::Value> TaskEdge::resolve__typename(service::ResolverParams&& params)
369369
{
370-
std::promise<response::Value> promise;
370+
std::promise<response::StringType> promise;
371371

372-
promise.set_value(response::Value(std::string("TaskEdge")));
372+
promise.set_value("TaskEdge");
373373

374-
return promise.get_future();
374+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
375375
}
376376

377377
TaskConnection::TaskConnection()
@@ -399,13 +399,13 @@ std::future<response::Value> TaskConnection::resolveEdges(service::ResolverParam
399399
return service::ModifiedResult<TaskEdge>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
400400
}
401401

402-
std::future<response::Value> TaskConnection::resolve__typename(service::ResolverParams&&)
402+
std::future<response::Value> TaskConnection::resolve__typename(service::ResolverParams&& params)
403403
{
404-
std::promise<response::Value> promise;
404+
std::promise<response::StringType> promise;
405405

406-
promise.set_value(response::Value(std::string("TaskConnection")));
406+
promise.set_value("TaskConnection");
407407

408-
return promise.get_future();
408+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
409409
}
410410

411411
FolderEdge::FolderEdge()
@@ -433,13 +433,13 @@ std::future<response::Value> FolderEdge::resolveCursor(service::ResolverParams&&
433433
return service::ModifiedResult<response::Value>::convert(std::move(result), std::move(params));
434434
}
435435

436-
std::future<response::Value> FolderEdge::resolve__typename(service::ResolverParams&&)
436+
std::future<response::Value> FolderEdge::resolve__typename(service::ResolverParams&& params)
437437
{
438-
std::promise<response::Value> promise;
438+
std::promise<response::StringType> promise;
439439

440-
promise.set_value(response::Value(std::string("FolderEdge")));
440+
promise.set_value("FolderEdge");
441441

442-
return promise.get_future();
442+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
443443
}
444444

445445
FolderConnection::FolderConnection()
@@ -467,13 +467,13 @@ std::future<response::Value> FolderConnection::resolveEdges(service::ResolverPar
467467
return service::ModifiedResult<FolderEdge>::convert<service::TypeModifier::Nullable, service::TypeModifier::List, service::TypeModifier::Nullable>(std::move(result), std::move(params));
468468
}
469469

470-
std::future<response::Value> FolderConnection::resolve__typename(service::ResolverParams&&)
470+
std::future<response::Value> FolderConnection::resolve__typename(service::ResolverParams&& params)
471471
{
472-
std::promise<response::Value> promise;
472+
std::promise<response::StringType> promise;
473473

474-
promise.set_value(response::Value(std::string("FolderConnection")));
474+
promise.set_value("FolderConnection");
475475

476-
return promise.get_future();
476+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
477477
}
478478

479479
CompleteTaskPayload::CompleteTaskPayload()
@@ -501,13 +501,13 @@ std::future<response::Value> CompleteTaskPayload::resolveClientMutationId(servic
501501
return service::ModifiedResult<response::StringType>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
502502
}
503503

504-
std::future<response::Value> CompleteTaskPayload::resolve__typename(service::ResolverParams&&)
504+
std::future<response::Value> CompleteTaskPayload::resolve__typename(service::ResolverParams&& params)
505505
{
506-
std::promise<response::Value> promise;
506+
std::promise<response::StringType> promise;
507507

508-
promise.set_value(response::Value(std::string("CompleteTaskPayload")));
508+
promise.set_value("CompleteTaskPayload");
509509

510-
return promise.get_future();
510+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
511511
}
512512

513513
Mutation::Mutation()
@@ -528,13 +528,13 @@ std::future<response::Value> Mutation::resolveCompleteTask(service::ResolverPara
528528
return service::ModifiedResult<CompleteTaskPayload>::convert(std::move(result), std::move(params));
529529
}
530530

531-
std::future<response::Value> Mutation::resolve__typename(service::ResolverParams&&)
531+
std::future<response::Value> Mutation::resolve__typename(service::ResolverParams&& params)
532532
{
533-
std::promise<response::Value> promise;
533+
std::promise<response::StringType> promise;
534534

535-
promise.set_value(response::Value(std::string("Mutation")));
535+
promise.set_value("Mutation");
536536

537-
return promise.get_future();
537+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
538538
}
539539

540540
Subscription::Subscription()
@@ -563,13 +563,13 @@ std::future<response::Value> Subscription::resolveNodeChange(service::ResolverPa
563563
return service::ModifiedResult<service::Object>::convert(std::move(result), std::move(params));
564564
}
565565

566-
std::future<response::Value> Subscription::resolve__typename(service::ResolverParams&&)
566+
std::future<response::Value> Subscription::resolve__typename(service::ResolverParams&& params)
567567
{
568-
std::promise<response::Value> promise;
568+
std::promise<response::StringType> promise;
569569

570-
promise.set_value(response::Value(std::string("Subscription")));
570+
promise.set_value("Subscription");
571571

572-
return promise.get_future();
572+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
573573
}
574574

575575
Appointment::Appointment()
@@ -614,13 +614,13 @@ std::future<response::Value> Appointment::resolveIsNow(service::ResolverParams&&
614614
return service::ModifiedResult<response::BooleanType>::convert(std::move(result), std::move(params));
615615
}
616616

617-
std::future<response::Value> Appointment::resolve__typename(service::ResolverParams&&)
617+
std::future<response::Value> Appointment::resolve__typename(service::ResolverParams&& params)
618618
{
619-
std::promise<response::Value> promise;
619+
std::promise<response::StringType> promise;
620620

621-
promise.set_value(response::Value(std::string("Appointment")));
621+
promise.set_value("Appointment");
622622

623-
return promise.get_future();
623+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
624624
}
625625

626626
Task::Task()
@@ -657,13 +657,13 @@ std::future<response::Value> Task::resolveIsComplete(service::ResolverParams&& p
657657
return service::ModifiedResult<response::BooleanType>::convert(std::move(result), std::move(params));
658658
}
659659

660-
std::future<response::Value> Task::resolve__typename(service::ResolverParams&&)
660+
std::future<response::Value> Task::resolve__typename(service::ResolverParams&& params)
661661
{
662-
std::promise<response::Value> promise;
662+
std::promise<response::StringType> promise;
663663

664-
promise.set_value(response::Value(std::string("Task")));
664+
promise.set_value("Task");
665665

666-
return promise.get_future();
666+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
667667
}
668668

669669
Folder::Folder()
@@ -700,13 +700,13 @@ std::future<response::Value> Folder::resolveUnreadCount(service::ResolverParams&
700700
return service::ModifiedResult<response::IntType>::convert(std::move(result), std::move(params));
701701
}
702702

703-
std::future<response::Value> Folder::resolve__typename(service::ResolverParams&&)
703+
std::future<response::Value> Folder::resolve__typename(service::ResolverParams&& params)
704704
{
705-
std::promise<response::Value> promise;
705+
std::promise<response::StringType> promise;
706706

707-
promise.set_value(response::Value(std::string("Folder")));
707+
promise.set_value("Folder");
708708

709-
return promise.get_future();
709+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
710710
}
711711

712712
NestedType::NestedType()
@@ -734,13 +734,13 @@ std::future<response::Value> NestedType::resolveNested(service::ResolverParams&&
734734
return service::ModifiedResult<NestedType>::convert(std::move(result), std::move(params));
735735
}
736736

737-
std::future<response::Value> NestedType::resolve__typename(service::ResolverParams&&)
737+
std::future<response::Value> NestedType::resolve__typename(service::ResolverParams&& params)
738738
{
739-
std::promise<response::Value> promise;
739+
std::promise<response::StringType> promise;
740740

741-
promise.set_value(response::Value(std::string("NestedType")));
741+
promise.set_value("NestedType");
742742

743-
return promise.get_future();
743+
return service::ModifiedResult<response::StringType>::convert(promise.get_future(), std::move(params));
744744
}
745745

746746
} /* namespace object */

0 commit comments

Comments
 (0)