Migrate service include/type properties and cpp_includes to Whisker

Summary:
Migrate several mstch service and program properties to Whisker:
- `service:include_prefix` → `service:program.include_prefix`
- `service:thrift_includes` → `service:program.thrift_includes`
- `service:cpp_includes` → `service:program.cpp_includes`
- `service:thrift_uri_or_service_name` → inline conditional with `string.empty?`
- `program:cpp_includes` split into `program:cpp_includes` (IDL) + `program:extra_cpp_includes` (compiler options), to allow migrating `service:cpp_includes` (which only takes IDL includes) to use the `program` prototype

Reviewed By: vitaut

Differential Revision: D95884142

fbshipit-source-id: bb01d3892cdc772d15c4ece0dfee751b0075a117

Author: hchokshi

thrift/compiler/generate/t_mstch_cpp2_generator.cc

@@ -563,7 +563,6 @@ class t_mstch_cpp2_generator : public t_mstch_generator {
   void generate_program() override;
   void fill_validator_visitors(ast_validator&) const override;
   static std::string get_cpp2_namespace(const t_program* program);
-  static mstch::array cpp_includes(const t_program* program);
   static std::string include_prefix(
       const t_program* program, const compiler_options_map& options);
 
@@ -796,6 +795,36 @@ class t_mstch_cpp2_generator : public t_mstch_generator {
       return to_array(
           program.get_includes_for_codegen(), proto.of<t_program>());
     });
+    def.property("cpp_includes", [](const t_program& program) {
+      // C++ includes from IDL file
+      whisker::array::raw includes;
+      if (program.language_includes().count("cpp")) {
+        for (std::string include : program.language_includes().at("cpp")) {
+          if (include.at(0) != '<') {
+            include = fmt::format("\"{}\"", include);
+          }
+          includes.emplace_back(std::move(include));
+        }
+      }
+      return whisker::make::array(std::move(includes));
+    });
+    def.property("extra_cpp_includes", [this](const t_program&) {
+      // C++ includes from compiler options
+      std::optional<std::string_view> extra_includes_option =
+          get_compiler_option("includes");
+      if (extra_includes_option.value_or("").empty()) {
+        return whisker::make::array();
+      }
+      std::vector<std::string> extra_includes;
+      boost::split(extra_includes, extra_includes_option.value(), [](char c) {
+        return c == ':';
+      });
+      whisker::array::raw result;
+      for (std::string& s : extra_includes) {
+        result.emplace_back(std::move(s));
+      }
+      return whisker::make::array(std::move(result));
+    });
     return std::move(def).make();
   }
 
@@ -1703,8 +1732,7 @@ class cpp_mstch_program : public mstch_program {
         sm_(sm) {
     register_methods(
         this,
-        {{"program:cpp_includes", &cpp_mstch_program::cpp_includes},
-         {"program:transitive_schema_initializers",
+        {{"program:transitive_schema_initializers",
           &cpp_mstch_program::transitive_schema_initializers},
          {"program:num_transitive_thrift_includes",
           &cpp_mstch_program::num_transitive_thrift_includes},
@@ -1718,19 +1746,6 @@ class cpp_mstch_program : public mstch_program {
   std::string get_program_namespace(const t_program* program) override {
     return t_mstch_cpp2_generator::get_cpp2_namespace(program);
   }
-
-  mstch::node cpp_includes() {
-    mstch::array includes = t_mstch_cpp2_generator::cpp_includes(program_);
-    if (auto it = context_.options->find("includes");
-        it != context_.options->end()) {
-      std::vector<std::string> extra_includes;
-      boost::split(extra_includes, it->second, [](char c) { return c == ':'; });
-      for (auto& include : extra_includes) {
-        includes.emplace_back(std::move(include));
-      }
-    }
-    return includes;
-  }
   /**
    * To reduce build time, the generated constants code only includes the
    * headers for direct thrift includes in the .cpp file and not in the .h
@@ -1908,46 +1923,23 @@ class cpp_mstch_service : public mstch_service {
     register_methods(
         this,
         {
-            {"service:include_prefix", &cpp_mstch_service::include_prefix},
-            {"service:thrift_includes", &cpp_mstch_service::thrift_includes},
-            {"service:cpp_includes", &cpp_mstch_service::cpp_includes},
             {"service:parent_service_cpp_name",
              &cpp_mstch_service::parent_service_cpp_name},
             {"service:parent_service_qualified_name",
              &cpp_mstch_service::parent_service_qualified_name},
-            {"service:thrift_uri_or_service_name",
-             &cpp_mstch_service::thrift_uri_or_service_name},
         });
 
     const auto all_functions = mstch_service::get_functions();
     for (size_t id = split_id; id < all_functions.size(); id += split_count) {
       split_functions_.push_back(all_functions[id]);
     }
   }
-  mstch::node cpp_includes() {
-    return t_mstch_cpp2_generator::cpp_includes(service_->program());
-  }
-  mstch::node include_prefix() {
-    return t_mstch_cpp2_generator::include_prefix(
-        service_->program(), *context_.options);
-  }
-  mstch::node thrift_includes() {
-    mstch::array a;
-    for (const auto* program :
-         service_->program()->get_includes_for_codegen()) {
-      a.emplace_back(make_mstch_program_cached(program, context_));
-    }
-    return a;
-  }
   mstch::node parent_service_cpp_name() {
     return cpp2::get_name(parent_service());
   }
   mstch::node parent_service_qualified_name() {
     return cpp2::get_service_qualified_name(*parent_service());
   }
-  mstch::node thrift_uri_or_service_name() {
-    return service_->uri().empty() ? parent_service_name() : service_->uri();
-  }
 
  private:
   const std::vector<const t_function*>& get_functions() const override {
@@ -2455,19 +2447,6 @@ std::string t_mstch_cpp2_generator::get_cpp2_namespace(
   return cpp2::get_gen_namespace(*program);
 }
 
-mstch::array t_mstch_cpp2_generator::cpp_includes(const t_program* program) {
-  mstch::array a;
-  if (program->language_includes().count("cpp")) {
-    for (auto include : program->language_includes().at("cpp")) {
-      if (include.at(0) != '<') {
-        include = fmt::format("\"{}\"", include);
-      }
-      a.emplace_back(std::move(include));
-    }
-  }
-  return a;
-}
-
 std::string t_mstch_cpp2_generator::include_prefix(
     const t_program* program, const compiler_options_map& options) {
   const std::string& prefix = program->include_prefix();

thrift/compiler/generate/templates/cpp2/ServiceAsyncClient.cpp.mustache

@@ -17,7 +17,7 @@
 }}
 {{> Autogen}}
 
-#include "{{service:include_prefix}}{{service:name}}AsyncClient.h"
+#include "{{service:program.include_prefix}}{{service:name}}AsyncClient.h"
 
 #include <thrift/lib/cpp2/gen/client_cpp.h>
 

thrift/compiler/generate/templates/cpp2/ServiceAsyncClient.h.mustache

@@ -20,31 +20,31 @@
 
 #include <thrift/lib/cpp2/gen/client_h.h>
 
-#include "{{service:include_prefix}}{{service:program.name}}_types.h"
+#include "{{service:program.include_prefix}}{{service:program.name}}_types.h"
 {{#service:extends}}
-#if __has_include("{{service:include_prefix}}{{service:name}}AsyncClient.h")
-#include "{{service:include_prefix}}{{service:name}}AsyncClient.h"
+#if __has_include("{{service:program.include_prefix}}{{service:name}}AsyncClient.h")
+#include "{{service:program.include_prefix}}{{service:name}}AsyncClient.h"
 #else
-#include "{{service:include_prefix}}{{service:program.name}}_clients.h"
+#include "{{service:program.include_prefix}}{{service:program.name}}_clients.h"
 #endif
 {{/service:extends}}
-{{#service:thrift_includes}}
-#include "{{program:include_prefix}}{{program:name}}_types.h"
-{{/service:thrift_includes}}
-{{#each service:cpp_includes as |cpp_include|}}
+  {{#each service:program.thrift_includes as |included|}}
+#include "{{included.include_prefix}}{{included.name}}_types.h"
+  {{/each}}
+  {{#each service:program.cpp_includes as |cpp_include|}}
 #include {{cpp_include}}
-{{/each}}
-{{#if (or service:streams? service:interactions?)}}
+  {{/each}}
+  {{#if (or service:streams? service:interactions?)}}
 #include <thrift/lib/cpp2/async/ClientBufferedStream.h>
 #include <thrift/lib/cpp2/async/ClientStreamInterceptorContext.h>
-{{/if (or service:streams? service:interactions?)}}
-{{#if (or service:sinks? service:interactions?)}}
+  {{/if (or service:streams? service:interactions?)}}
+  {{#if (or service:sinks? service:interactions?)}}
 #include <thrift/lib/cpp2/async/ClientSinkBridge.h>
 #include <thrift/lib/cpp2/async/Sink.h>
-{{/if (or service:sinks? service:interactions?)}}
-{{#if (or service:self.has_bidirectional_streams? service:interactions?)}}
+  {{/if (or service:sinks? service:interactions?)}}
+  {{#if (or service:self.has_bidirectional_streams? service:interactions?)}}
 #include <thrift/lib/cpp2/async/BiDiStream.h>
-{{/if (or service:self.has_bidirectional_streams? service:interactions?)}}
+  {{/if (or service:self.has_bidirectional_streams? service:interactions?)}}
 
 namespace apache { namespace thrift {
   class Cpp2RequestContext;

thrift/compiler/generate/templates/cpp2/module_clients.h.mustache

@@ -26,10 +26,14 @@
 #include "{{program:include_prefix}}{{program:name}}_clients.h"
 {{/program:thrift_includes}}
 
-{{#each program:cpp_includes as |cpp_include|}}
+  {{#each program:cpp_includes as |cpp_include|}}
 // cpp_include's
 #include {{cpp_include}}
-{{/each}}
+  {{/each}}
+  {{#each program:extra_cpp_includes as |cpp_include|}}
+// cpp_include's
+#include {{cpp_include}}
+  {{/each}}
 {{/program}}
 
 {{#if (or any_sinks? any_interactions?)}}

thrift/compiler/generate/templates/cpp2/module_clients_out_of_line.h.mustache

@@ -19,5 +19,5 @@
 #pragma once
 
 {{#services}}
-#include "{{service:include_prefix}}{{service:name}}AsyncClient.h"
+#include "{{service:program.include_prefix}}{{service:name}}AsyncClient.h"
 {{/services}}

thrift/compiler/generate/templates/cpp2/module_handlers.h.mustache

@@ -26,10 +26,14 @@
 #include "{{program:include_prefix}}{{program:name}}_handlers.h"
 {{/program:thrift_includes}}
 
-{{#each program:cpp_includes as |cpp_include|}}
+  {{#each program:cpp_includes as |cpp_include|}}
 // cpp_include's
 #include {{cpp_include}}
-{{/each}}
+  {{/each}}
+  {{#each program:extra_cpp_includes as |cpp_include|}}
+// cpp_include's
+#include {{cpp_include}}
+  {{/each}}
 {{/program}}
 
 {{#if (or any_sinks? any_interactions?)}}

thrift/compiler/generate/templates/cpp2/module_handlers_out_of_line.h.mustache

@@ -19,5 +19,5 @@
 #pragma once
 
 {{#services}}
-#include "{{service:include_prefix}}{{service:name}}.h"
+#include "{{service:program.include_prefix}}{{service:name}}.h"
 {{/services}}

thrift/compiler/generate/templates/cpp2/module_types.h.mustache

@@ -31,9 +31,12 @@
 #include "{{program:include_prefix}}{{program:name}}_constants.h"
   {{/if program:const_referenced_in_field_default?}}
 {{/program:thrift_includes}}
-{{#each program:cpp_includes as |cpp_include|}}
+  {{#each program:cpp_includes as |cpp_include|}}
 #include {{cpp_include}}
-{{/each}}
+  {{/each}}
+  {{#each program:extra_cpp_includes as |cpp_include|}}
+#include {{cpp_include}}
+  {{/each}}
 
 {{#program:structs?}}
 namespace apache::thrift {

thrift/compiler/generate/templates/cpp2/service.cpp.mustache

@@ -18,11 +18,11 @@
 {{#service}}
 {{> Autogen}}
 
-#include "{{service:include_prefix}}{{service:name}}.h"
-#include "{{service:include_prefix}}{{service:name}}.tcc"
-#include "{{service:include_prefix}}{{service:program.name}}_types.h"
+#include "{{service:program.include_prefix}}{{service:name}}.h"
+#include "{{service:program.include_prefix}}{{service:name}}.tcc"
+#include "{{service:program.include_prefix}}{{service:program.name}}_types.h"
 {{#service:has_service_schema}}
-#include "{{service:include_prefix}}{{service:program.name}}_constants.h"
+#include "{{service:program.include_prefix}}{{service:program.name}}_constants.h"
 {{/service:has_service_schema}}
 #include <thrift/lib/cpp2/gen/service_cpp.h>
 

thrift/compiler/generate/templates/cpp2/service.h.mustache

@@ -20,34 +20,34 @@
 
 #include <thrift/lib/cpp2/gen/service_h.h>
 
-#include "{{service:include_prefix}}{{service:name}}AsyncClient.h"
-#include "{{service:include_prefix}}{{service:program.name}}_types.h"
+#include "{{service:program.include_prefix}}{{service:name}}AsyncClient.h"
+#include "{{service:program.include_prefix}}{{service:program.name}}_types.h"
 {{#service:extends}}
-#if __has_include("{{service:include_prefix}}{{service:name}}.h")
-#include "{{service:include_prefix}}{{service:name}}.h"
+#if __has_include("{{service:program.include_prefix}}{{service:name}}.h")
+#include "{{service:program.include_prefix}}{{service:name}}.h"
 #else
-#include "{{service:include_prefix}}{{service:program.name}}_handlers.h"
+#include "{{service:program.include_prefix}}{{service:program.name}}_handlers.h"
 #endif
 {{/service:extends}}
-{{#service:thrift_includes}}
-#include "{{program:include_prefix}}{{program:name}}_types.h"
-{{/service:thrift_includes}}
-{{#each service:cpp_includes as |cpp_include|}}
+  {{#each service:program.thrift_includes as |included|}}
+#include "{{included.include_prefix}}{{included.name}}_types.h"
+  {{/each}}
+  {{#each service:program.cpp_includes as |cpp_include|}}
 #include {{cpp_include}}
-{{/each}}
-{{#if (or service:streams? service:interactions?)}}
+  {{/each}}
+  {{#if (or service:streams? service:interactions?)}}
 #include <thrift/lib/cpp2/async/ServerStream.h>
-{{/if (or service:streams? service:interactions?)}}
-{{#if (or service:sinks? service:interactions?)}}
+  {{/if (or service:streams? service:interactions?)}}
+  {{#if (or service:sinks? service:interactions?)}}
 #include <thrift/lib/cpp2/async/Sink.h>
-{{/if (or service:sinks? service:interactions?)}}
-{{#if (or service:self.has_bidirectional_streams? service:interactions?)}}
+  {{/if (or service:sinks? service:interactions?)}}
+  {{#if (or service:self.has_bidirectional_streams? service:interactions?)}}
 #include <thrift/lib/cpp2/async/BiDiStream.h>
 #include <thrift/lib/cpp2/async/ServerBiDiStreamFactory.h>
-{{/if (or service:self.has_bidirectional_streams? service:interactions?)}}
-{{#service:cpp_requires_method_decorator?}}
+  {{/if (or service:self.has_bidirectional_streams? service:interactions?)}}
+  {{#if service:cpp_requires_method_decorator?}}
 #include <thrift/lib/cpp2/gen/module_method_decorator_h.h>
-{{/service:cpp_requires_method_decorator?}}
+  {{/if service:cpp_requires_method_decorator?}}
 
 namespace folly {
   class IOBuf;