npm - skir-cc-gen - Versions diffs - 1.0.1 → 1.0.2 - Mend

skir-cc-gen 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/client/CMakeLists.txt CHANGED Viewed

@@ -13,11 +13,23 @@ if(NOT TARGET absl::base)
   find_package(absl REQUIRED)
 endif()
-# 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()
+      set(SKIR_ENABLE_TESTING OFF)
+    endif()
+  endif()
 endif()
+message(STATUS "Skir testing library: ${SKIR_ENABLE_TESTING}")
 # ============================================================================
 # Main skir library
 # ============================================================================
@@ -48,24 +60,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 CHANGED Viewed

@@ -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, {{"&", "&amp;"},
+                                              {"<", "&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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"enum_variant.js","sourceRoot":"","sources":["../src/enum_variant.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,WAAW,EAAE,MAAM,eAAe,CAAC;AA+BtE,MAAM,UAAU,eAAe,CAC7B,QAA0B,EAC1B,WAAwB;IAExB,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE,CAAC;QACjC,IAAI,UAA8B,CAAC;QACnC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;YACnB,UAAU,GAAG,kBAAkB,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QACvE,CAAC;QACD,UAAU,CAAC,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO;QACL,WAAW,EAAE,~~GAAG~~;~~QAChB~~,SAAS,EAAE,EAAE;QACb,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,CAAC;QAChB,gBAAgB,EAAE,IAAI;QACtB,UAAU,EAAE,WAAW;QACvB,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,UAAU;QACtB,cAAc,EAAE,UAAU;QAC1B,UAAU,EAAE,KAAK;QACjB,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;KAC9B,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,WAAmB,EACnB,GAAQ;IAER,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1D,OAAO;QACL,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,EAAE;QACb,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,CAAC;QAChB,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,KAAK,eAAe,EAAE;QAClC,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,IAAI,UAAU,EAAE;QAC5B,cAAc,EAAE,IAAI,UAAU,OAAO;QACrC,UAAU,EAAE,KAAK;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAc,EACd,GAAQ,EACR,WAAwB;IAExB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IACtC,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAK,CAAC;IAC3B,OAAO;QACL,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC;QACtC,sBAAsB,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,EAAE;YAClD,cAAc,EAAE,IAAI;SACrB,CAAC;QACF,aAAa,EAAE,CAAC;QAChB,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,QAAQ,WAAW,EAAE;QACjC,SAAS,EAAE,QAAQ,WAAW,OAAO;QACrC,UAAU,EAAE,QAAQ,WAAW,EAAE;QACjC,cAAc,EAAE,IAAI,UAAU,SAAS;QACvC,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,IAAK,CAAC;QACrC,GAAG,EAAE,GAAG;KACT,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAAkB;IACpC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC3C,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,WAAW;YACd,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"enum_variant.js","sourceRoot":"","sources":["../src/enum_variant.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "skir-cc-gen",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "keywords": [],
   "repository": {
@@ -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.11",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
     "typescript": "^5.2.2",

package/src/enum_variant.ts CHANGED Viewed

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