skir-cc-gen 1.0.1 → 1.0.3

package/README.md

@@ -21,36 +21,11 @@ In your `skir.yml` file, add the following snippet under `generators`:
 
 The generated C++ code depends on the [skir client library](https://github.com/gepheum/skir-cc-gen/tree/main/client), [absl](https://abseil.io/) and optionally [GoogleTest](https://github.com/google/googletest).
 
-### If you use CMake
-
 Add this to your `CMakeLists.txt`:
 
 ```cmake
 include(FetchContent)
 
-# Should be ON if writeGoogleTestHeaders is true 
-option(BUILD_TESTING "Build tests" OFF)
-
-# Abseil (required, version 20250814.0+)
-FetchContent_Declare(
-  absl
-  GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
-  GIT_TAG        20250814.1  # Use 20250814.0 or later
-)
-set(ABSL_PROPAGATE_CXX_STD ON)
-FetchContent_MakeAvailable(absl)
-
-if(BUILD_TESTING)
-  # GoogleTest (optional - only if you use writeGoogleTestHeaders)
-  FetchContent_Declare(
-    googletest
-    GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG        v1.15.2  # Pick the latest tag
-  )
-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-  FetchContent_MakeAvailable(googletest)
-endif()
-
 # skir-client
 FetchContent_Declare(
   skir-client
@@ -63,10 +38,6 @@ FetchContent_MakeAvailable(skir-client)
 
 See this [example](https://github.com/gepheum/skir-cc-example/blob/main/CMakeLists.txt).
 
-### If you use Bazel
-
-Refer to this example [BUILD.bazel](https://github.com/gepheum/skir-cc-example/blob/main/BUILD.bazel) file.
-
 ## C++ generated code guide
 
 The examples below are for the code generated from [this](https://github.com/gepheum/skir-cc-example/blob/main/skir_src/user.skir) .skir file.

package/client/CMakeLists.txt

@@ -5,19 +5,50 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # ============================================================================
-# Dependencies - Use existing targets if available, otherwise find them
+# Dependencies - Use existing targets if available, otherwise fetch them
 # ============================================================================
 
-# Abseil - check if already provided by parent project
-if(NOT TARGET absl::base)
-  find_package(absl REQUIRED)
-endif()
+# Abseil - always use FetchContent for consistency
+include(FetchContent)
+
+FetchContent_Declare(
+  absl
+  GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
+  GIT_TAG 20250814.1
+)
+set(ABSL_PROPAGATE_CXX_STD ON)
+FetchContent_MakeAvailable(absl)
 
-# GoogleTest - check if already provided by parent project
-if(NOT TARGET GTest::gtest)
-  find_package(GTest REQUIRED)
+# GoogleTest - optional, only needed for testing library
+if(NOT DEFINED SKIR_ENABLE_TESTING)
+  # Default: enable testing if GTest is available
+  if(TARGET GTest::gtest)
+    set(SKIR_ENABLE_TESTING ON)
+  else()
+    find_package(GTest QUIET)
+    if(GTest_FOUND)
+      set(SKIR_ENABLE_TESTING ON)
+    else()
+      # Try to fetch GoogleTest
+      include(FetchContent)
+      FetchContent_Declare(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG v1.15.2
+      )
+      set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+      FetchContent_MakeAvailable(googletest)
+      if(TARGET GTest::gtest)
+        set(SKIR_ENABLE_TESTING ON)
+      else()
+        set(SKIR_ENABLE_TESTING OFF)
+      endif()
+    endif()
+  endif()
 endif()
 
+message(STATUS "Skir testing library: ${SKIR_ENABLE_TESTING}")
+
 # ============================================================================
 # Main skir library
 # ============================================================================
@@ -48,24 +79,31 @@ target_link_libraries(skir PUBLIC
 
 # ============================================================================
 # Testing library (interface library with header-only implementation)
+# Only built if GTest is available
 # ============================================================================
 
-add_library(skir_testing INTERFACE)
+if(SKIR_ENABLE_TESTING)
+  add_library(skir_testing INTERFACE)
 
-target_sources(skir_testing INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/skir.testing.h>
-  $<INSTALL_INTERFACE:include/skir.testing.h>
-)
+  target_sources(skir_testing INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/skir.testing.h>
+    $<INSTALL_INTERFACE:include/skir.testing.h>
+  )
 
-target_include_directories(skir_testing INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<INSTALL_INTERFACE:include>
-)
+  target_include_directories(skir_testing INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+  )
 
-target_link_libraries(skir_testing INTERFACE
-  skir
-  absl::base
-  absl::die_if_null
-  GTest::gtest
-  GTest::gmock
-)
+  target_link_libraries(skir_testing INTERFACE
+    skir
+    absl::base
+    absl::die_if_null
+    GTest::gtest
+    GTest::gmock
+  )
+
+  message(STATUS "Skir testing library target created")
+else()
+  message(STATUS "Skir testing library disabled (GTest not available)")
+endif()

package/client/skir.cc

@@ -996,6 +996,63 @@ void ParseFieldOrVariant(JsonTokenizer& tokenizer, FieldOrVariant& out) {
 }
 }  // namespace
 
+skir::service::RawResponse MakeOkJsonResponse(std::string data) {
+  return {
+      .data = std::move(data),
+      .status_code = 200,
+      .content_type = "application/json",
+  };
+}
+
+skir::service::RawResponse MakeOkHtmlResponse(std::string data) {
+  return {
+      .data = std::move(data),
+      .status_code = 200,
+      .content_type = "text/html; charset=utf-8",
+  };
+}
+
+std::string GetStudioHtml(absl::string_view studio_app_js_url) {
+  const std::string escaped_url =
+      absl::StrReplaceAll(studio_app_js_url, {{"&", "&"},
+                                              {"<", "&lt;"},
+                                              {">", "&gt;"},
+                                              {"\"", "&quot;"},
+                                              {"'", "&#39;"}});
+  return absl::StrCat(R"html(<!DOCTYPE html>
+
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Skir Studio</title>
+    <script src=")html",
+                      escaped_url,
+                      R"html("></script>
+  </head>
+  <body style="margin: 0; padding: 0;">
+    <skir-studio-app></skir-studio-app>
+  </body>
+</html>
+)html");
+}
+
+skir::service::RawResponse MakeBadRequestResponse(std::string data) {
+  return {
+      .data = std::move(data),
+      .status_code = 400,
+      .content_type = "text/plain; charset=utf-8",
+  };
+}
+
+skir::service::RawResponse MakeServerErrorResponse(std::string data,
+                                                   int status_code) {
+  return {
+      .data = std::move(data),
+      .status_code = status_code,
+      .content_type = "text/plain; charset=utf-8",
+  };
+}
+
 JsonTokenType JsonTokenizer::Next() {
   if (!state_.status.ok()) return JsonTokenType::kError;
   return state_.token_type = NextImpl(state_);

package/client/skir.h

@@ -882,64 +882,120 @@ struct enum_wrapper_variant {
 
 namespace service {
 
-enum class ResponseType {
-  // The method invocation succeeded and the response data is in JSON format.
-  kOkJson,
-  // The method invocation succeeded and the response data is in HTML format.
-  kOkHtml,
-  // The method invocation failed because the request was malformed.
-  // The response data is "bad-request:" followed by an error message.
-  kBadRequest,
-  // The method invocation resulted in an error on the server side.
-  // The response data is "server-error:" followed by an error message.
-  kServerError,
-};
-
-// Raw response returned by the server.
-struct RawResponse {
-  // The meaning of this string depends on the response type.
-  std::string data;
-  ResponseType type{};
+// HTTP status codes for errors.
+enum class HttpErrorCode {
+  k400_BadRequest = 400,
+  k401_Unauthorized = 401,
+  k402_PaymentRequired = 402,
+  k403_Forbidden = 403,
+  k404_NotFound = 404,
+  k405_MethodNotAllowed = 405,
+  k406_NotAcceptable = 406,
+  k407_ProxyAuthenticationRequired = 407,
+  k408_RequestTimeout = 408,
+  k409_Conflict = 409,
+  k410_Gone = 410,
+  k411_LengthRequired = 411,
+  k412_PreconditionFailed = 412,
+  k413_ContentTooLarge = 413,
+  k414_UriTooLong = 414,
+  k415_UnsupportedMediaType = 415,
+  k416_RangeNotSatisfiable = 416,
+  k417_ExpectationFailed = 417,
+  k418_ImATeapot = 418,
+  k421_MisdirectedRequest = 421,
+  k422_UnprocessableContent = 422,
+  k423_Locked = 423,
+  k424_FailedDependency = 424,
+  k425_TooEarly = 425,
+  k426_UpgradeRequired = 426,
+  k428_PreconditionRequired = 428,
+  k429_TooManyRequests = 429,
+  k431_RequestHeaderFieldsTooLarge = 431,
+  k451_UnavailableForLegalReasons = 451,
+  k500_InternalServerError = 500,
+  k501_NotImplemented = 501,
+  k502_BadGateway = 502,
+  k503_ServiceUnavailable = 503,
+  k504_GatewayTimeout = 504,
+  k505_HttpVersionNotSupported = 505,
+  k506_VariantAlsoNegotiates = 506,
+  k507_InsufficientStorage = 507,
+  k508_LoopDetected = 508,
+  k510_NotExtended = 510,
+  k511_NetworkAuthenticationRequired = 511,
+};
+
+// Represents an error with a specific HTTP status code.
+// Use this as a return type from service methods when you want to control the
+// HTTP error code sent to clients. For generic errors where the default 500
+// status code is acceptable, use absl::Status instead.
+struct Error {
+  HttpErrorCode code = HttpErrorCode::k500_InternalServerError;
+  std::string message;
+};
+
+// Represents either a successful Response or an Error with a specific HTTP
+// status code. Use this as the return type for service methods when you need
+// fine-grained control over HTTP error codes. For simple error handling where
+// generic HTTP status codes are sufficient, use absl::StatusOr<Response>
+// instead.
+template <typename Response>
+class ErrorOr {
+ public:
+  ErrorOr() = default;
+  ErrorOr(const ErrorOr&) = default;
+  ErrorOr(ErrorOr&&) = default;
 
-  int status_code() const {
-    switch (type) {
-      case ResponseType::kOkJson:
-      case ResponseType::kOkHtml:
-        return 200;
-      case ResponseType::kBadRequest:
-        return 400;
-      case ResponseType::kServerError:
-        return 500;
-    }
+  ErrorOr(Response response) : variant_(std::move(response)) {}
+  ErrorOr(Error error) : variant_(std::move(error)) {}
+  ErrorOr(absl::StatusOr<Response> response_or_error) {
+    (*this) = std::move(response_or_error);
   }
 
-  absl::string_view content_type() const {
-    switch (type) {
-      case ResponseType::kOkJson: {
-        static const char kApplicationJson[] = "application/json";
-        return kApplicationJson;
-      }
-      case ResponseType::kOkHtml: {
-        static const char kTextHtml[] = "text/html";
-        return kTextHtml;
-      }
-      case ResponseType::kBadRequest:
-      case ResponseType::kServerError: {
-        static const char kTextPlain[] = "text/plain; charset=utf-8";
-        return kTextPlain;
-      }
+  ErrorOr& operator=(const ErrorOr&) = default;
+  ErrorOr& operator=(ErrorOr&&) = default;
+
+  ErrorOr& operator=(Response response) {
+    variant_ = std::move(response);
+    return *this;
+  }
+  ErrorOr& operator=(Error error) {
+    variant_ = std::move(error);
+    return *this;
+  }
+  ErrorOr& operator=(absl::StatusOr<Response> response_or_error) {
+    if (response_or_error.ok()) {
+      variant_ = *std::move(response_or_error);
+    } else {
+      variant_ = Error{
+          HttpErrorCode::k500_InternalServerError,
+          absl::StrCat("server error: ", response_or_error.status().message())};
     }
+    return *this;
   }
 
+  bool ok() const { return std::holds_alternative<Response>(variant_); }
+
+  const std::variant<Response, Error>& variant() const { return variant_; }
+  std::variant<Response, Error>& variant() { return variant_; }
+
+ private:
+  using variant_type = std::variant<Response, Error>;
+  variant_type variant_;
+};
+
+// Raw response returned by the server.
+struct RawResponse {
+  std::string data;
+  int status_code{};
+  std::string content_type;
+
   absl::StatusOr<std::string> AsStatus() && {
-    switch (type) {
-      case ResponseType::kOkJson:
-      case ResponseType::kOkHtml:
-        return std::move(data);
-      case ResponseType::kBadRequest:
-      case ResponseType::kServerError:
-        return absl::UnknownError(std::move(data));
+    if (status_code >= 200 && status_code < 300) {
+      return std::move(data);
     }
+    return absl::UnknownError(std::move(data));
   }
 };
 
@@ -975,14 +1031,22 @@ class HttpHeaders {
   absl::flat_hash_map<std::string, std::vector<std::string>> map_;
 };
 
+// Options for handling service requests.
+struct ServiceOptions {
+  UnrecognizedValuesPolicy unrecognized_values =
+      UnrecognizedValuesPolicy::kDrop;
+  std::string studio_app_js_url =
+      "https://cdn.jsdelivr.net/npm/skir-studio/dist/skir-studio-standalone.js";
+};
+
 // Sends RPCs to a skir service.
 class Client {
  public:
   virtual ~Client() = default;
 
   virtual absl::StatusOr<std::string> operator()(
-      absl::string_view request_data, const HttpHeaders& request_headers,
-      HttpHeaders& response_headers) const = 0;
+      absl::string_view request_data,
+      const HttpHeaders& request_headers) const = 0;
 };
 
 }  // namespace service
@@ -990,6 +1054,12 @@ class Client {
 
 namespace skir_internal {
 
+skir::service::RawResponse MakeOkJsonResponse(std::string data);
+skir::service::RawResponse MakeOkHtmlResponse(std::string data);
+skir::service::RawResponse MakeBadRequestResponse(std::string data);
+skir::service::RawResponse MakeServerErrorResponse(std::string data,
+                                                   int status_code);
+
 template <typename T>
 T& get(T& input) {
   return input;
@@ -2593,33 +2663,19 @@ struct MethodListAdapter {
 inline MethodDescriptorAdapter GetAdapter(skir_type<MethodDescriptor>);
 inline MethodListAdapter GetAdapter(skir_type<MethodList>);
 
-constexpr absl::string_view kRestudioHtml = R"html(<!DOCTYPE html>
-
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <title>RESTudio</title>
-    <script src="https://cdn.jsdelivr.net/npm/restudio/dist/restudio-standalone.js"></script>
-  </head>
-  <body style="margin: 0; padding: 0;">
-    <restudio-app></restudio-app>
-  </body>
-</html>
-)html";
-
-template <typename ServiceImpl, typename RequestMeta, typename ResponseMeta>
+std::string GetStudioHtml(absl::string_view studio_app_js_url);
+
+template <typename ServiceImpl, typename RequestMeta>
 class HandleRequestOp {
  public:
   HandleRequestOp(ServiceImpl* absl_nonnull service_impl,
                   absl::string_view request_body,
-                  skir::UnrecognizedValuesPolicy unrecognized_values,
-                  const RequestMeta* absl_nonnull request_meta,
-                  ResponseMeta* absl_nonnull response_meta)
+                  const skir::service::ServiceOptions* absl_nonnull options,
+                  const RequestMeta* absl_nonnull request_meta)
       : service_impl_(*service_impl),
         request_body_(request_body),
-        unrecognized_values_(unrecognized_values),
-        request_meta_(*request_meta),
-        response_meta_(*response_meta) {}
+        options_(*options),
+        request_meta_(*request_meta) {}
 
   skir::service::RawResponse Run() {
     if (request_body_ == "" || request_body_ == "list") {
@@ -2631,20 +2687,16 @@ class HandleRequestOp {
           typename ServiceImpl::methods());
       ReadableJson json;
       MethodListAdapter::Append(method_list, json);
-      return {
-          json.out,
-          skir::service::ResponseType::kOkJson,
-      };
-    } else if (request_body_ == "debug" || request_body_ == "restudio") {
-      return {std::string(kRestudioHtml), skir::service::ResponseType::kOkHtml};
+      return skir_internal::MakeOkJsonResponse(json.out);
+    } else if (request_body_ == "studio") {
+      return skir_internal::MakeOkHtmlResponse(
+          GetStudioHtml(options_.studio_app_js_url));
     }
 
     if (const absl::Status status = request_body_parsed_.Parse(request_body_);
         !status.ok()) {
-      return {
-          absl::StrCat("bad request: ", status.message()),
-          skir::service::ResponseType::kBadRequest,
-      };
+      return skir_internal::MakeBadRequestResponse(
+          absl::StrCat("bad request: ", status.message()));
     }
 
     std::apply(
@@ -2655,19 +2707,16 @@ class HandleRequestOp {
     if (raw_response_.has_value()) {
       return std::move(*raw_response_);
     }
-    return {
-        absl::StrCat(
-            "bad request: method not found: ", request_body_parsed_.method_name,
-            "; number: ", request_body_parsed_.method_number.value_or(-1)),
-        skir::service::ResponseType::kBadRequest};
+    return skir_internal::MakeBadRequestResponse(absl::StrCat(
+        "bad request: method not found: ", request_body_parsed_.method_name,
+        "; number: ", request_body_parsed_.method_number.value_or(-1)));
   }
 
  private:
   ServiceImpl& service_impl_;
   const absl::string_view request_body_;
-  const skir::UnrecognizedValuesPolicy unrecognized_values_;
+  const skir::service::ServiceOptions& options_;
   const RequestMeta& request_meta_;
-  ResponseMeta& response_meta_;
 
   RequestBody request_body_parsed_;
 
@@ -2689,29 +2738,28 @@ class HandleRequestOp {
       // an error in this case.
       return;
     }
-    raw_response_.emplace();
     absl::StatusOr<RequestType> request = skir::Parse<RequestType>(
-        request_body_parsed_.request_data, unrecognized_values_);
+        request_body_parsed_.request_data, options_.unrecognized_values);
     if (!request.ok()) {
-      raw_response_->data =
-          absl::StrCat("bad request: ", request.status().message());
-      raw_response_->type = skir::service::ResponseType::kBadRequest;
+      raw_response_ = skir_internal::MakeBadRequestResponse(
+          absl::StrCat("bad request: ", request.status().message()));
       return;
     }
-    absl::StatusOr<ResponseType> output = service_impl_(
-        method, std::move(*request), request_meta_, response_meta_);
-    if (!output.ok()) {
-      raw_response_->data =
-          absl::StrCat("server error: ", output.status().message());
-      raw_response_->type = skir::service::ResponseType::kServerError;
+    skir::service::ErrorOr<ResponseType> response_or_error =
+        service_impl_(method, std::move(*request), request_meta_);
+    if (!response_or_error.ok()) {
+      auto& error = std::get<skir::service::Error>(response_or_error.variant());
+      raw_response_ = skir_internal::MakeServerErrorResponse(
+          std::move(error.message), int(error.code));
       return;
     }
+    const auto& response = std::get<ResponseType>(response_or_error.variant());
     if (request_body_parsed_.readable) {
-      raw_response_->data = skir::ToReadableJson(*output);
-      raw_response_->type = skir::service::ResponseType::kOkJson;
+      raw_response_ =
+          skir_internal::MakeOkJsonResponse(skir::ToReadableJson(response));
     } else {
-      raw_response_->data = skir::ToDenseJson(*output);
-      raw_response_->type = skir::service::ResponseType::kOkJson;
+      raw_response_ =
+          skir_internal::MakeOkJsonResponse(skir::ToDenseJson(response));
     }
   }
 };
@@ -2724,8 +2772,7 @@ class HttplibClient : public skir::service::Client {
 
   absl::StatusOr<std::string> operator()(
       absl::string_view request_data,
-      const skir::service::HttpHeaders& request_headers,
-      skir::service::HttpHeaders& response_headers) const {
+      const skir::service::HttpHeaders& request_headers) const {
     auto headers =
         decltype(std::declval<HttplibClientPtr>()->Get("")->headers)();
     SkirToHttplibHeaders(request_headers, headers);
@@ -2733,7 +2780,6 @@ class HttplibClient : public skir::service::Client {
         client_->Post(query_path_, headers, request_data.data(),
                       request_data.length(), "text/plain; charset=utf-8");
     if (result) {
-      response_headers = HttplibToSkirHeaders(result->headers);
       const int status_code = result->status;
       if (200 <= status_code && status_code <= 299) {
         // OK status.
@@ -2751,7 +2797,6 @@ class HttplibClient : public skir::service::Client {
       }
     } else {
       // HTTP error.
-      response_headers = {};
       std::stringstream ss;
       ss << "HTTP error: " << result.error();
       return {absl::UnknownError(ss.str())};
@@ -2775,11 +2820,15 @@ namespace service {
 //   1. It must have a public `methods` type alias which resolves to a tuple of
 // //     method types.
 //   2. For each method, it must have a member function with this signature:
+//
 //        absl::StatusOr<typename Method::response_type> operator()(
 //            Method method,
 //            typename Method::request_type request,
-//            const HttpHeaders& request_headers,
-//            HttpHeaders& response_headers);
+//            const HttpHeaders& request_headers);
+//
+//      Or, if you want to specify a specific HTTP status code other than 500
+//      in case of an error, use ErrorOr<typename Method::response_type>
+//      instead of absl::StatusOr<typename Method::response_type>.
 //
 // For example:
 //
@@ -2792,16 +2841,14 @@ namespace service {
 //     absl::StatusOr<skirout_methods::ListUsersResponse> operator()(
 //         skirout_methods::ListUsers,
 //         skirout_methods::ListUsersRequest request,
-//         const HttpHeaders& request_headers,
-//         HttpHeaders& response_headers) const {
+//         const HttpHeaders& request_headers) const {
 //       ...
 //     }
 //
 //     absl::StatusOr<skirout_methods::GetUserResponse> operator()(
 //         skirout_methods::GetUser,
 //         skirout_methods::GetUserRequest request,
-//         const HttpHeaders& request_headers,
-//         HttpHeaders& response_headers) const {
+//         const HttpHeaders& request_headers) const {
 //       ...
 //     }
 //   };
@@ -2815,20 +2862,14 @@ namespace service {
 // If the request is a GET request, pass in the decoded query string as the
 // request's body. The query string is the part of the URL after '?', and it can
 // be decoded with DecodeUrlQueryString.
-//
-// Pass in UnrecognizedValuesPolicy::kKeep if the request is guaranteed to come
-// from a trusted user.
 template <typename ServiceImpl>
 RawResponse HandleRequest(ServiceImpl& service_impl,
                           absl::string_view request_body,
                           const HttpHeaders& request_headers,
-                          HttpHeaders& response_headers,
-                          UnrecognizedValuesPolicy unrecognized_values =
-                              UnrecognizedValuesPolicy::kDrop) {
+                          const ServiceOptions& options = {}) {
   skir_internal::assert_unique_method_numbers<typename ServiceImpl::methods>();
-  return skir_internal::HandleRequestOp(&service_impl, request_body,
-                                        unrecognized_values, &request_headers,
-                                        &response_headers)
+  return skir_internal::HandleRequestOp(&service_impl, request_body, &options,
+                                        &request_headers)
       .Run();
 }
 
@@ -2844,21 +2885,16 @@ absl::StatusOr<std::string> DecodeUrlQueryString(
 //
 // ServiceImpl must satisfy the requirements outlined in the documentation for
 // HandleRequest.
-//
-// Pass in UnrecognizedValuesPolicy::kKeep if the request is guaranteed to come
-// from a trusted user.
 template <typename HttplibServer, typename ServiceImpl>
-void InstallServiceOnHttplibServer(
-    HttplibServer& server, absl::string_view query_path,
-    std::shared_ptr<ServiceImpl> service_impl,
-    UnrecognizedValuesPolicy unrecognized_values =
-        UnrecognizedValuesPolicy::kDrop) {
+void InstallServiceOnHttplibServer(HttplibServer& server,
+                                   absl::string_view query_path,
+                                   std::shared_ptr<ServiceImpl> service_impl,
+                                   const ServiceOptions& options = {}) {
   ABSL_CHECK_NE(service_impl, nullptr);
   const typename HttplibServer::Handler handler =  //
-      [service_impl, unrecognized_values](const auto& req, auto& resp) {
+      [service_impl, options](const auto& req, auto& resp) {
         const HttpHeaders request_headers =
             skir_internal::HttplibToSkirHeaders(req.headers);
-        HttpHeaders response_headers;
         absl::string_view request_body;
         std::string decoded_query_string;
         if (!req.body.empty()) {
@@ -2874,14 +2910,12 @@ void InstallServiceOnHttplibServer(
               DecodeUrlQueryString(query_string).value_or("");
           request_body = decoded_query_string;
         }
-        RawResponse raw_response =
-            HandleRequest(*service_impl, request_body, request_headers,
-                          response_headers, unrecognized_values);
-        skir_internal::SkirToHttplibHeaders(response_headers, resp.headers);
+        RawResponse raw_response = HandleRequest(*service_impl, request_body,
+                                                 request_headers, options);
 
         resp.set_content(std::move(raw_response.data),
-                         std::string(raw_response.content_type()));
-        resp.status = raw_response.status_code();
+                         std::string(raw_response.content_type));
+        resp.status = raw_response.status_code;
       };
   server.Get(std::string(query_path), handler);
   server.Post(std::string(query_path), handler);
@@ -2894,16 +2928,11 @@ template <typename Method>
 absl::StatusOr<typename Method::response_type> InvokeRemote(
     const Client& client, Method method,
     const typename Method::request_type& request,
-    const HttpHeaders& request_headers = {},
-    HttpHeaders* absl_nonnull response_headers = nullptr) {
+    const HttpHeaders& request_headers = {}) {
   const std::string request_data = absl::StrCat(
       Method::kMethodName, ":", Method::kNumber, "::", ToDenseJson(request));
-  HttpHeaders response_headers_tmp;
   absl::StatusOr<std::string> response_data =
-      client(request_data, request_headers, response_headers_tmp);
-  if (response_headers != nullptr) {
-    *response_headers = std::move(response_headers_tmp);
-  }
+      client(request_data, request_headers);
   if (!response_data.ok()) {
     return std::move(response_data).status();
   }

package/client/skir.testing.h

@@ -252,10 +252,9 @@ class ClientForTesting : public ::skir::service::Client {
 
   absl::StatusOr<std::string> operator()(
       absl::string_view request_data,
-      const skir::service::HttpHeaders& request_headers,
-      skir::service::HttpHeaders& response_headers) const override {
+      const skir::service::HttpHeaders& request_headers) const override {
     return ::skir::service::HandleRequest(api_impl_, request_data,
-                                          request_headers, response_headers)
+                                          request_headers)
         .AsStatus();
   }
 

package/dist/enum_variant.js

@@ -17,7 +17,7 @@ export function getEnumVariants(variants, typeSpeller) {
 }
 function makeUnknownVariant() {
     return {
-        variantName: "?",
+        variantName: "UNKNOWN",
         valueType: "",
         valueTypeWithNamespace: "",
         variantNumber: 0,

package/dist/enum_variant.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum_variant.js","sourceRoot":"","sources":["../src/enum_variant.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enum_variant.js","sourceRoot":"","sources":["../src/enum_variant.ts"],"names":[],"mappings":"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"}

package/dist/type_speller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type_speller.d.ts","sourceRoot":"","sources":["../src/type_speller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,cAAc,EACd,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB;;GAEG;AACH,qBAAa,WAAW;IAEpB,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFhB,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC;IAGxC,SAAS,CACP,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;QACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;KACrB,GACL,MAAM;CAoEV;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAE3D"}
+{"version":3,"file":"type_speller.d.ts","sourceRoot":"","sources":["../src/type_speller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,cAAc,EACd,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB;;GAEG;AACH,qBAAa,WAAW;IAEpB,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFhB,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC;IAGxC,SAAS,CACP,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;QACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;KACrB,GACL,MAAM;CAoEV;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQ1D;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAE3D"}

package/dist/type_speller.js

@@ -79,7 +79,11 @@ export class TypeSpeller {
     }
 }
 export function modulePathToNamespace(path) {
-    return "skirout_" + path.replace(/\.skir$/, "").replace("/", "_");
+    return ("skirout_" +
+        path
+            .replace(/^@/, "external/")
+            .replace(/\.skir$/, "")
+            .replace(/[/-]/g, "_"));
 }
 export function getClassName(record) {
     return record.recordAncestors.map((r) => r.name.text).join("_");

package/dist/type_speller.js.map

@@ -1 +1 @@
-{"version":3,"file":"type_speller.js","sourceRoot":"","sources":["../src/type_speller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type_speller.js","sourceRoot":"","sources":["../src/type_speller.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skir-cc-gen",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "keywords": [],
   "repository": {
@@ -27,13 +27,13 @@
     "copy-to-client:check": "diff -s e2e-test/skir.h client/skir.h && diff -s e2e-test/skir.cc client/skir.cc && diff -s e2e-test/skir.testing.h client/skir.testing.h",
     "format-skir": "cd e2e-test && skir format && cd ..",
     "format-skir:check": "cd e2e-test && skir format --ci && cd ..",
-    "format-cc": "find e2e-test -not -path 'e2e-test/skirout/*' \\( -iname '*.cc' -o -iname '*.h' \\) | xargs clang-format --Werror -i",
-    "format-cc:check": "find e2e-test -not -path 'e2e-test/skirout/*' \\( -iname '*.cc' -o -iname '*.h' \\) | xargs clang-format --dry-run --Werror -i",
+    "format-cc": "find e2e-test -maxdepth 1 \\( -name '*.cc' -o -name '*.h' \\) -exec clang-format --Werror -i {} +",
+    "format-cc:check": "find e2e-test -maxdepth 1 \\( -name '*.cc' -o -name '*.h' \\) -exec clang-format --dry-run --Werror -i {} +",
     "format": "prettier --write \"**/*.ts\" && npm run format-skir && npm run format-cc",
     "format:check": "prettier --check \"**/*.ts\" && npm run format-skir:check && npm run format-cc:check",
-    "gen-clang-json": "cd e2e-test && bazel run @hedron_compile_commands//:refresh_all && cd ..",
-    "test-cc": "cd e2e-test && CC=clang BAZEL_COMPILER=llvm bazel test --copt=-DADDRESS_SANITIZER --copt=-fsanitize=address --linkopt=-fsanitize=address --test_output=errors :all && cd ..",
-    "build-client": "cd client && bazel build :skir && bazel build :skir.testing && cd ..",
+    "gen-clang-json": "cd e2e-test && cmake -S . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON && cd ..",
+    "test-cc": "cd e2e-test && cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug && cmake --build build && ctest --test-dir build --output-on-failure && cd ..",
+    "build-client": "cd client && cmake -S . -B build && cmake --build build && cd ..",
     "test": "npm run build && npm run test-cc && npm run build-client",
     "lint": "eslint src/**/*.ts",
     "lint:fix": "eslint src/**/*.ts --fix"
@@ -53,7 +53,7 @@
     "mocha": "^11.7.5",
     "prettier": "^3.2.4",
     "prettier-plugin-organize-imports": "^4.2.0",
-    "skir": "^1.0.4",
+    "skir": "^1.0.20",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
     "typescript": "^5.2.2",

package/src/enum_variant.ts

@@ -50,7 +50,7 @@ export function getEnumVariants(
 
 function makeUnknownVariant(): MutableEnumVariant {
   return {
-    variantName: "?",
+    variantName: "UNKNOWN",
     valueType: "",
     valueTypeWithNamespace: "",
     variantNumber: 0,

package/src/type_speller.ts

@@ -92,7 +92,13 @@ export class TypeSpeller {
 }
 
 export function modulePathToNamespace(path: string): string {
-  return "skirout_" + path.replace(/\.skir$/, "").replace("/", "_");
+  return (
+    "skirout_" +
+    path
+      .replace(/^@/, "external/")
+      .replace(/\.skir$/, "")
+      .replace(/[/-]/g, "_")
+  );
 }
 
 export function getClassName(record: RecordLocation): string {

package/client/BUILD.bazel

@@ -1,33 +0,0 @@
-cc_library(
-    name = "skir",
-    srcs = ["skir.cc"],
-    hdrs = ["skir.h"],
-    deps = [
-        "@abseil-cpp//absl/base",
-        "@abseil-cpp//absl/container:flat_hash_map",
-        "@abseil-cpp//absl/hash",
-        "@abseil-cpp//absl/log:absl_check",
-        "@abseil-cpp//absl/log:die_if_null",
-        "@abseil-cpp//absl/status",
-        "@abseil-cpp//absl/status:statusor",
-        "@abseil-cpp//absl/strings",
-        "@abseil-cpp//absl/time",
-        "@abseil-cpp//absl/types:optional",
-        "@abseil-cpp//absl/types:variant",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "skir.testing",
-    testonly = True,
-    srcs = [],
-    hdrs = ["skir.testing.h"],
-    deps = [
-        ":skir",
-        "@abseil-cpp//absl/base",
-        "@abseil-cpp//absl/log:die_if_null",
-        "@googletest//:gtest",
-    ],
-    visibility = ["//visibility:public"],
-)

package/client/MODULE.bazel

@@ -1,11 +0,0 @@
-"""MODULE.bazel"""
-
-module(name = "skir-client")
-
-# Choose the most recent version available at
-# https://registry.bazel.build/modules/abseil-cpp
-bazel_dep(name = "abseil-cpp", version = "20250814.0")
-
-# Choose the most recent version available at
-# https://registry.bazel.build/modules/googletest
-bazel_dep(name = "googletest", version = "1.17.0")