From 979b96f7d40e6099a117d796415c32bf0ef2f200 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 2 Jan 2026 21:56:38 -1000
Subject: [PATCH] cleanup

---
 esphome/components/api/api_pb2_dump.cpp | 627 ++++++------------------
 script/api_protobuf/api_protobuf.py     |  13 +-
 2 files changed, 163 insertions(+), 477 deletions(-)

diff --git a/esphome/components/api/api_pb2_dump.cpp b/esphome/components/api/api_pb2_dump.cpp
index 05edc20b7b..ee88a99ca9 100644
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -735,9 +735,7 @@ template<> const char *proto_enum_to_string<enums::ZWaveProxyRequestType>(enums:
 
 void HelloRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "HelloRequest");
-  out.append("  client_info: ");
-  out.append("'").append(this->client_info.c_str(), this->client_info.size()).append("'");
-  out.append("\n");
+  dump_field(out, "client_info", this->client_info);
   dump_field(out, "api_version_major", this->api_version_major);
   dump_field(out, "api_version_minor", this->api_version_minor);
 }
@@ -745,20 +743,11 @@ void HelloResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "HelloResponse");
   dump_field(out, "api_version_major", this->api_version_major);
   dump_field(out, "api_version_minor", this->api_version_minor);
-  out.append("  server_info: ");
-  out.append("'").append(this->server_info.c_str(), this->server_info.size()).append("'");
-  out.append("\n");
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "server_info", this->server_info);
+  dump_field(out, "name", this->name);
 }
 #ifdef USE_API_PASSWORD
-void AuthenticationRequest::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "AuthenticationRequest");
-  out.append("  password: ");
-  out.append("'").append(this->password.c_str(), this->password.size()).append("'");
-  out.append("\n");
-}
+void AuthenticationRequest::dump_to(std::string &out) const { dump_field(out, "password", this->password); }
 void AuthenticationResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "AuthenticationResponse");
   dump_field(out, "invalid_password", this->invalid_password);
@@ -773,18 +762,14 @@ void DeviceInfoRequest::dump_to(std::string &out) const { out.append("DeviceInfo
 void AreaInfo::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "AreaInfo");
   dump_field(out, "area_id", this->area_id);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 }
 #endif
 #ifdef USE_DEVICES
 void DeviceInfo::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "DeviceInfo");
   dump_field(out, "device_id", this->device_id);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "area_id", this->area_id);
 }
 #endif
@@ -793,33 +778,19 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
 #ifdef USE_API_PASSWORD
   dump_field(out, "uses_password", this->uses_password);
 #endif
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
-  out.append("  mac_address: ");
-  out.append("'").append(this->mac_address.c_str(), this->mac_address.size()).append("'");
-  out.append("\n");
-  out.append("  esphome_version: ");
-  out.append("'").append(this->esphome_version.c_str(), this->esphome_version.size()).append("'");
-  out.append("\n");
-  out.append("  compilation_time: ");
-  out.append("'").append(this->compilation_time.c_str(), this->compilation_time.size()).append("'");
-  out.append("\n");
-  out.append("  model: ");
-  out.append("'").append(this->model.c_str(), this->model.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
+  dump_field(out, "mac_address", this->mac_address);
+  dump_field(out, "esphome_version", this->esphome_version);
+  dump_field(out, "compilation_time", this->compilation_time);
+  dump_field(out, "model", this->model);
 #ifdef USE_DEEP_SLEEP
   dump_field(out, "has_deep_sleep", this->has_deep_sleep);
 #endif
 #ifdef ESPHOME_PROJECT_NAME
-  out.append("  project_name: ");
-  out.append("'").append(this->project_name.c_str(), this->project_name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "project_name", this->project_name);
 #endif
 #ifdef ESPHOME_PROJECT_NAME
-  out.append("  project_version: ");
-  out.append("'").append(this->project_version.c_str(), this->project_version.size()).append("'");
-  out.append("\n");
+  dump_field(out, "project_version", this->project_version);
 #endif
 #ifdef USE_WEBSERVER
   dump_field(out, "webserver_port", this->webserver_port);
@@ -827,24 +798,16 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
 #ifdef USE_BLUETOOTH_PROXY
   dump_field(out, "bluetooth_proxy_feature_flags", this->bluetooth_proxy_feature_flags);
 #endif
-  out.append("  manufacturer: ");
-  out.append("'").append(this->manufacturer.c_str(), this->manufacturer.size()).append("'");
-  out.append("\n");
-  out.append("  friendly_name: ");
-  out.append("'").append(this->friendly_name.c_str(), this->friendly_name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "manufacturer", this->manufacturer);
+  dump_field(out, "friendly_name", this->friendly_name);
 #ifdef USE_VOICE_ASSISTANT
   dump_field(out, "voice_assistant_feature_flags", this->voice_assistant_feature_flags);
 #endif
 #ifdef USE_AREAS
-  out.append("  suggested_area: ");
-  out.append("'").append(this->suggested_area.c_str(), this->suggested_area.size()).append("'");
-  out.append("\n");
+  dump_field(out, "suggested_area", this->suggested_area);
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  out.append("  bluetooth_mac_address: ");
-  out.append("'").append(this->bluetooth_mac_address.c_str(), this->bluetooth_mac_address.size()).append("'");
-  out.append("\n");
+  dump_field(out, "bluetooth_mac_address", this->bluetooth_mac_address);
 #endif
 #ifdef USE_API_NOISE
   dump_field(out, "api_encryption_supported", this->api_encryption_supported);
@@ -881,22 +844,14 @@ void SubscribeStatesRequest::dump_to(std::string &out) const { out.append("Subsc
 #ifdef USE_BINARY_SENSOR
 void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesBinarySensorResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
+  dump_field(out, "device_class", this->device_class);
   dump_field(out, "is_status_binary_sensor", this->is_status_binary_sensor);
   dump_field(out, "disabled_by_default", this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
 #ifdef USE_DEVICES
@@ -916,24 +871,16 @@ void BinarySensorStateResponse::dump_to(std::string &out) const {
 #ifdef USE_COVER
 void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesCoverResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "assumed_state", this->assumed_state);
   dump_field(out, "supports_position", this->supports_position);
   dump_field(out, "supports_tilt", this->supports_tilt);
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
   dump_field(out, "disabled_by_default", this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
   dump_field(out, "supports_stop", this->supports_stop);
@@ -967,22 +914,16 @@ void CoverCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_FAN
 void ListEntitiesFanResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesFanResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "supports_oscillation", this->supports_oscillation);
   dump_field(out, "supports_speed", this->supports_speed);
   dump_field(out, "supports_direction", this->supports_direction);
   dump_field(out, "supported_speed_count", this->supported_speed_count);
   dump_field(out, "disabled_by_default", this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
   for (const auto &it : *this->supported_preset_modes) {
@@ -999,9 +940,7 @@ void FanStateResponse::dump_to(std::string &out) const {
   dump_field(out, "oscillating", this->oscillating);
   dump_field(out, "direction", static_cast<enums::FanDirection>(this->direction));
   dump_field(out, "speed_level", this->speed_level);
-  out.append("  preset_mode: ");
-  out.append("'").append(this->preset_mode.c_str(), this->preset_mode.size()).append("'");
-  out.append("\n");
+  dump_field(out, "preset_mode", this->preset_mode);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1018,9 +957,7 @@ void FanCommandRequest::dump_to(std::string &out) const {
   dump_field(out, "has_speed_level", this->has_speed_level);
   dump_field(out, "speed_level", this->speed_level);
   dump_field(out, "has_preset_mode", this->has_preset_mode);
-  out.append("  preset_mode: ");
-  out.append("'").append(this->preset_mode.c_str(), this->preset_mode.size()).append("'");
-  out.append("\n");
+  dump_field(out, "preset_mode", this->preset_mode);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1029,13 +966,9 @@ void FanCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_LIGHT
 void ListEntitiesLightResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesLightResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   for (const auto &it : *this->supported_color_modes) {
     dump_field(out, "supported_color_modes", static_cast<enums::ColorMode>(it), 4);
   }
@@ -1046,9 +979,7 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
   }
   dump_field(out, "disabled_by_default", this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
 #ifdef USE_DEVICES
@@ -1069,9 +1000,7 @@ void LightStateResponse::dump_to(std::string &out) const {
   dump_field(out, "color_temperature", this->color_temperature);
   dump_field(out, "cold_white", this->cold_white);
   dump_field(out, "warm_white", this->warm_white);
-  out.append("  effect: ");
-  out.append("'").append(this->effect.c_str(), this->effect.size()).append("'");
-  out.append("\n");
+  dump_field(out, "effect", this->effect);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1104,9 +1033,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   dump_field(out, "has_flash_length", this->has_flash_length);
   dump_field(out, "flash_length", this->flash_length);
   dump_field(out, "has_effect", this->has_effect);
-  out.append("  effect: ");
-  out.append("'").append(this->effect.c_str(), this->effect.size()).append("'");
-  out.append("\n");
+  dump_field(out, "effect", this->effect);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1115,26 +1042,16 @@ void LightCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_SENSOR
 void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesSensorResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
-  out.append("  unit_of_measurement: ");
-  out.append("'").append(this->unit_of_measurement.c_str(), this->unit_of_measurement.size()).append("'");
-  out.append("\n");
+  dump_field(out, "unit_of_measurement", this->unit_of_measurement);
   dump_field(out, "accuracy_decimals", this->accuracy_decimals);
   dump_field(out, "force_update", this->force_update);
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
   dump_field(out, "state_class", static_cast<enums::SensorStateClass>(this->state_class));
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -1155,24 +1072,16 @@ void SensorStateResponse::dump_to(std::string &out) const {
 #ifdef USE_SWITCH
 void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesSwitchResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "assumed_state", this->assumed_state);
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1197,23 +1106,15 @@ void SwitchCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_TEXT_SENSOR
 void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesTextSensorResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1221,9 +1122,7 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
 void TextSensorStateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "TextSensorStateResponse");
   dump_field(out, "key", this->key);
-  out.append("  state: ");
-  out.append("'").append(this->state.c_str(), this->state.size()).append("'");
-  out.append("\n");
+  dump_field(out, "state", this->state);
   dump_field(out, "missing_state", this->missing_state);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
@@ -1257,16 +1156,12 @@ void SubscribeHomeassistantServicesRequest::dump_to(std::string &out) const {
 }
 void HomeassistantServiceMap::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "HomeassistantServiceMap");
-  out.append("  key: ");
-  out.append("'").append(this->key.c_str(), this->key.size()).append("'");
-  out.append("\n");
+  dump_field(out, "key", this->key);
   dump_field(out, "value", this->value);
 }
 void HomeassistantActionRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "HomeassistantActionRequest");
-  out.append("  service: ");
-  out.append("'").append(this->service.c_str(), this->service.size()).append("'");
-  out.append("\n");
+  dump_field(out, "service", this->service);
   for (const auto &it : this->data) {
     out.append("  data: ");
     it.dump_to(out);
@@ -1299,9 +1194,7 @@ void HomeassistantActionResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "HomeassistantActionResponse");
   dump_field(out, "call_id", this->call_id);
   dump_field(out, "success", this->success);
-  out.append("  error_message: ");
-  out.append("'").append(this->error_message.c_str(), this->error_message.size()).append("'");
-  out.append("\n");
+  dump_field(out, "error_message", this->error_message);
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON
   out.append("  response_data: ");
   out.append(format_hex_pretty(this->response_data, this->response_data_len));
@@ -1315,48 +1208,32 @@ void SubscribeHomeAssistantStatesRequest::dump_to(std::string &out) const {
 }
 void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "SubscribeHomeAssistantStateResponse");
-  out.append("  entity_id: ");
-  out.append("'").append(this->entity_id.c_str(), this->entity_id.size()).append("'");
-  out.append("\n");
-  out.append("  attribute: ");
-  out.append("'").append(this->attribute.c_str(), this->attribute.size()).append("'");
-  out.append("\n");
+  dump_field(out, "entity_id", this->entity_id);
+  dump_field(out, "attribute", this->attribute);
   dump_field(out, "once", this->once);
 }
 void HomeAssistantStateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "HomeAssistantStateResponse");
-  out.append("  entity_id: ");
-  out.append("'").append(this->entity_id.c_str(), this->entity_id.size()).append("'");
-  out.append("\n");
-  out.append("  state: ");
-  out.append("'").append(this->state.c_str(), this->state.size()).append("'");
-  out.append("\n");
-  out.append("  attribute: ");
-  out.append("'").append(this->attribute.c_str(), this->attribute.size()).append("'");
-  out.append("\n");
+  dump_field(out, "entity_id", this->entity_id);
+  dump_field(out, "state", this->state);
+  dump_field(out, "attribute", this->attribute);
 }
 #endif
 void GetTimeRequest::dump_to(std::string &out) const { out.append("GetTimeRequest {}"); }
 void GetTimeResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "GetTimeResponse");
   dump_field(out, "epoch_seconds", this->epoch_seconds);
-  out.append("  timezone: ");
-  out.append("'").append(this->timezone.c_str(), this->timezone.size()).append("'");
-  out.append("\n");
+  dump_field(out, "timezone", this->timezone);
 }
 #ifdef USE_API_USER_DEFINED_ACTIONS
 void ListEntitiesServicesArgument::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesServicesArgument");
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "type", static_cast<enums::ServiceArgType>(this->type));
 }
 void ListEntitiesServicesResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesServicesResponse");
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "key", this->key);
   for (const auto &it : this->args) {
     out.append("  args: ");
@@ -1370,9 +1247,7 @@ void ExecuteServiceArgument::dump_to(std::string &out) const {
   dump_field(out, "bool_", this->bool_);
   dump_field(out, "legacy_int", this->legacy_int);
   dump_field(out, "float_", this->float_);
-  out.append("  string_: ");
-  out.append("'").append(this->string_.c_str(), this->string_.size()).append("'");
-  out.append("\n");
+  dump_field(out, "string_", this->string_);
   dump_field(out, "int_", this->int_);
   for (const auto it : this->bool_array) {
     dump_field(out, "bool_array", static_cast<bool>(it), 4);
@@ -1408,9 +1283,7 @@ void ExecuteServiceResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ExecuteServiceResponse");
   dump_field(out, "call_id", this->call_id);
   dump_field(out, "success", this->success);
-  out.append("  error_message: ");
-  out.append("'").append(this->error_message.c_str(), this->error_message.size()).append("'");
-  out.append("\n");
+  dump_field(out, "error_message", this->error_message);
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES_JSON
   out.append("  response_data: ");
   out.append(format_hex_pretty(this->response_data, this->response_data_len));
@@ -1421,18 +1294,12 @@ void ExecuteServiceResponse::dump_to(std::string &out) const {
 #ifdef USE_CAMERA
 void ListEntitiesCameraResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesCameraResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "disabled_by_default", this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
 #ifdef USE_DEVICES
@@ -1459,13 +1326,9 @@ void CameraImageRequest::dump_to(std::string &out) const {
 #ifdef USE_CLIMATE
 void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesClimateResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
   dump_field(out, "supports_current_temperature", this->supports_current_temperature);
   dump_field(out, "supports_two_point_target_temperature", this->supports_two_point_target_temperature);
   for (const auto &it : *this->supported_modes) {
@@ -1492,9 +1355,7 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   }
   dump_field(out, "disabled_by_default", this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
   dump_field(out, "visual_current_temperature_step", this->visual_current_temperature_step);
@@ -1518,13 +1379,9 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   dump_field(out, "action", static_cast<enums::ClimateAction>(this->action));
   dump_field(out, "fan_mode", static_cast<enums::ClimateFanMode>(this->fan_mode));
   dump_field(out, "swing_mode", static_cast<enums::ClimateSwingMode>(this->swing_mode));
-  out.append("  custom_fan_mode: ");
-  out.append("'").append(this->custom_fan_mode.c_str(), this->custom_fan_mode.size()).append("'");
-  out.append("\n");
+  dump_field(out, "custom_fan_mode", this->custom_fan_mode);
   dump_field(out, "preset", static_cast<enums::ClimatePreset>(this->preset));
-  out.append("  custom_preset: ");
-  out.append("'").append(this->custom_preset.c_str(), this->custom_preset.size()).append("'");
-  out.append("\n");
+  dump_field(out, "custom_preset", this->custom_preset);
   dump_field(out, "current_humidity", this->current_humidity);
   dump_field(out, "target_humidity", this->target_humidity);
 #ifdef USE_DEVICES
@@ -1547,15 +1404,11 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   dump_field(out, "has_swing_mode", this->has_swing_mode);
   dump_field(out, "swing_mode", static_cast<enums::ClimateSwingMode>(this->swing_mode));
   dump_field(out, "has_custom_fan_mode", this->has_custom_fan_mode);
-  out.append("  custom_fan_mode: ");
-  out.append("'").append(this->custom_fan_mode.c_str(), this->custom_fan_mode.size()).append("'");
-  out.append("\n");
+  dump_field(out, "custom_fan_mode", this->custom_fan_mode);
   dump_field(out, "has_preset", this->has_preset);
   dump_field(out, "preset", static_cast<enums::ClimatePreset>(this->preset));
   dump_field(out, "has_custom_preset", this->has_custom_preset);
-  out.append("  custom_preset: ");
-  out.append("'").append(this->custom_preset.c_str(), this->custom_preset.size()).append("'");
-  out.append("\n");
+  dump_field(out, "custom_preset", this->custom_preset);
   dump_field(out, "has_target_humidity", this->has_target_humidity);
   dump_field(out, "target_humidity", this->target_humidity);
 #ifdef USE_DEVICES
@@ -1566,17 +1419,11 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_WATER_HEATER
 void ListEntitiesWaterHeaterResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesWaterHeaterResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -1621,30 +1468,20 @@ void WaterHeaterCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_NUMBER
 void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesNumberResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "min_value", this->min_value);
   dump_field(out, "max_value", this->max_value);
   dump_field(out, "step", this->step);
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  unit_of_measurement: ");
-  out.append("'").append(this->unit_of_measurement.c_str(), this->unit_of_measurement.size()).append("'");
-  out.append("\n");
+  dump_field(out, "unit_of_measurement", this->unit_of_measurement);
   dump_field(out, "mode", static_cast<enums::NumberMode>(this->mode));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1670,17 +1507,11 @@ void NumberCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_SELECT
 void ListEntitiesSelectResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesSelectResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   for (const auto &it : *this->options) {
     dump_field(out, "options", it, 4);
@@ -1694,9 +1525,7 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
 void SelectStateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "SelectStateResponse");
   dump_field(out, "key", this->key);
-  out.append("  state: ");
-  out.append("'").append(this->state.c_str(), this->state.size()).append("'");
-  out.append("\n");
+  dump_field(out, "state", this->state);
   dump_field(out, "missing_state", this->missing_state);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
@@ -1705,9 +1534,7 @@ void SelectStateResponse::dump_to(std::string &out) const {
 void SelectCommandRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "SelectCommandRequest");
   dump_field(out, "key", this->key);
-  out.append("  state: ");
-  out.append("'").append(this->state.c_str(), this->state.size()).append("'");
-  out.append("\n");
+  dump_field(out, "state", this->state);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1716,17 +1543,11 @@ void SelectCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_SIREN
 void ListEntitiesSirenResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesSirenResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   for (const auto &it : *this->tones) {
@@ -1753,9 +1574,7 @@ void SirenCommandRequest::dump_to(std::string &out) const {
   dump_field(out, "has_state", this->has_state);
   dump_field(out, "state", this->state);
   dump_field(out, "has_tone", this->has_tone);
-  out.append("  tone: ");
-  out.append("'").append(this->tone.c_str(), this->tone.size()).append("'");
-  out.append("\n");
+  dump_field(out, "tone", this->tone);
   dump_field(out, "has_duration", this->has_duration);
   dump_field(out, "duration", this->duration);
   dump_field(out, "has_volume", this->has_volume);
@@ -1768,26 +1587,18 @@ void SirenCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_LOCK
 void ListEntitiesLockResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesLockResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
   dump_field(out, "assumed_state", this->assumed_state);
   dump_field(out, "supports_open", this->supports_open);
   dump_field(out, "requires_code", this->requires_code);
-  out.append("  code_format: ");
-  out.append("'").append(this->code_format.c_str(), this->code_format.size()).append("'");
-  out.append("\n");
+  dump_field(out, "code_format", this->code_format);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1805,9 +1616,7 @@ void LockCommandRequest::dump_to(std::string &out) const {
   dump_field(out, "key", this->key);
   dump_field(out, "command", static_cast<enums::LockCommand>(this->command));
   dump_field(out, "has_code", this->has_code);
-  out.append("  code: ");
-  out.append("'").append(this->code.c_str(), this->code.size()).append("'");
-  out.append("\n");
+  dump_field(out, "code", this->code);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1816,23 +1625,15 @@ void LockCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_BUTTON
 void ListEntitiesButtonResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesButtonResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -1848,9 +1649,7 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_MEDIA_PLAYER
 void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "MediaPlayerSupportedFormat");
-  out.append("  format: ");
-  out.append("'").append(this->format.c_str(), this->format.size()).append("'");
-  out.append("\n");
+  dump_field(out, "format", this->format);
   dump_field(out, "sample_rate", this->sample_rate);
   dump_field(out, "num_channels", this->num_channels);
   dump_field(out, "purpose", static_cast<enums::MediaPlayerFormatPurpose>(this->purpose));
@@ -1858,17 +1657,11 @@ void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
 }
 void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesMediaPlayerResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -1901,9 +1694,7 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
   dump_field(out, "has_volume", this->has_volume);
   dump_field(out, "volume", this->volume);
   dump_field(out, "has_media_url", this->has_media_url);
-  out.append("  media_url: ");
-  out.append("'").append(this->media_url.c_str(), this->media_url.size()).append("'");
-  out.append("\n");
+  dump_field(out, "media_url", this->media_url);
   dump_field(out, "has_announcement", this->has_announcement);
   dump_field(out, "announcement", this->announcement);
 #ifdef USE_DEVICES
@@ -2119,16 +1910,12 @@ void VoiceAssistantAudioSettings::dump_to(std::string &out) const {
 void VoiceAssistantRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantRequest");
   dump_field(out, "start", this->start);
-  out.append("  conversation_id: ");
-  out.append("'").append(this->conversation_id.c_str(), this->conversation_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "conversation_id", this->conversation_id);
   dump_field(out, "flags", this->flags);
   out.append("  audio_settings: ");
   this->audio_settings.dump_to(out);
   out.append("\n");
-  out.append("  wake_word_phrase: ");
-  out.append("'").append(this->wake_word_phrase.c_str(), this->wake_word_phrase.size()).append("'");
-  out.append("\n");
+  dump_field(out, "wake_word_phrase", this->wake_word_phrase);
 }
 void VoiceAssistantResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantResponse");
@@ -2137,12 +1924,8 @@ void VoiceAssistantResponse::dump_to(std::string &out) const {
 }
 void VoiceAssistantEventData::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantEventData");
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
-  out.append("  value: ");
-  out.append("'").append(this->value.c_str(), this->value.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
+  dump_field(out, "value", this->value);
 }
 void VoiceAssistantEventResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantEventResponse");
@@ -2163,63 +1946,39 @@ void VoiceAssistantAudio::dump_to(std::string &out) const {
 void VoiceAssistantTimerEventResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantTimerEventResponse");
   dump_field(out, "event_type", static_cast<enums::VoiceAssistantTimerEvent>(this->event_type));
-  out.append("  timer_id: ");
-  out.append("'").append(this->timer_id.c_str(), this->timer_id.size()).append("'");
-  out.append("\n");
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "timer_id", this->timer_id);
+  dump_field(out, "name", this->name);
   dump_field(out, "total_seconds", this->total_seconds);
   dump_field(out, "seconds_left", this->seconds_left);
   dump_field(out, "is_active", this->is_active);
 }
 void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantAnnounceRequest");
-  out.append("  media_id: ");
-  out.append("'").append(this->media_id.c_str(), this->media_id.size()).append("'");
-  out.append("\n");
-  out.append("  text: ");
-  out.append("'").append(this->text.c_str(), this->text.size()).append("'");
-  out.append("\n");
-  out.append("  preannounce_media_id: ");
-  out.append("'").append(this->preannounce_media_id.c_str(), this->preannounce_media_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "media_id", this->media_id);
+  dump_field(out, "text", this->text);
+  dump_field(out, "preannounce_media_id", this->preannounce_media_id);
   dump_field(out, "start_conversation", this->start_conversation);
 }
 void VoiceAssistantAnnounceFinished::dump_to(std::string &out) const { dump_field(out, "success", this->success); }
 void VoiceAssistantWakeWord::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantWakeWord");
-  out.append("  id: ");
-  out.append("'").append(this->id.c_str(), this->id.size()).append("'");
-  out.append("\n");
-  out.append("  wake_word: ");
-  out.append("'").append(this->wake_word.c_str(), this->wake_word.size()).append("'");
-  out.append("\n");
+  dump_field(out, "id", this->id);
+  dump_field(out, "wake_word", this->wake_word);
   for (const auto &it : this->trained_languages) {
     dump_field(out, "trained_languages", it, 4);
   }
 }
 void VoiceAssistantExternalWakeWord::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantExternalWakeWord");
-  out.append("  id: ");
-  out.append("'").append(this->id.c_str(), this->id.size()).append("'");
-  out.append("\n");
-  out.append("  wake_word: ");
-  out.append("'").append(this->wake_word.c_str(), this->wake_word.size()).append("'");
-  out.append("\n");
+  dump_field(out, "id", this->id);
+  dump_field(out, "wake_word", this->wake_word);
   for (const auto &it : this->trained_languages) {
     dump_field(out, "trained_languages", it, 4);
   }
-  out.append("  model_type: ");
-  out.append("'").append(this->model_type.c_str(), this->model_type.size()).append("'");
-  out.append("\n");
+  dump_field(out, "model_type", this->model_type);
   dump_field(out, "model_size", this->model_size);
-  out.append("  model_hash: ");
-  out.append("'").append(this->model_hash.c_str(), this->model_hash.size()).append("'");
-  out.append("\n");
-  out.append("  url: ");
-  out.append("'").append(this->url.c_str(), this->url.size()).append("'");
-  out.append("\n");
+  dump_field(out, "model_hash", this->model_hash);
+  dump_field(out, "url", this->url);
 }
 void VoiceAssistantConfigurationRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "VoiceAssistantConfigurationRequest");
@@ -2251,17 +2010,11 @@ void VoiceAssistantSetConfiguration::dump_to(std::string &out) const {
 #ifdef USE_ALARM_CONTROL_PANEL
 void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesAlarmControlPanelResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -2284,9 +2037,7 @@ void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "AlarmControlPanelCommandRequest");
   dump_field(out, "key", this->key);
   dump_field(out, "command", static_cast<enums::AlarmControlPanelStateCommand>(this->command));
-  out.append("  code: ");
-  out.append("'").append(this->code.c_str(), this->code.size()).append("'");
-  out.append("\n");
+  dump_field(out, "code", this->code);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -2295,25 +2046,17 @@ void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_TEXT
 void ListEntitiesTextResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesTextResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
   dump_field(out, "min_length", this->min_length);
   dump_field(out, "max_length", this->max_length);
-  out.append("  pattern: ");
-  out.append("'").append(this->pattern.c_str(), this->pattern.size()).append("'");
-  out.append("\n");
+  dump_field(out, "pattern", this->pattern);
   dump_field(out, "mode", static_cast<enums::TextMode>(this->mode));
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
@@ -2322,9 +2065,7 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
 void TextStateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "TextStateResponse");
   dump_field(out, "key", this->key);
-  out.append("  state: ");
-  out.append("'").append(this->state.c_str(), this->state.size()).append("'");
-  out.append("\n");
+  dump_field(out, "state", this->state);
   dump_field(out, "missing_state", this->missing_state);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
@@ -2333,9 +2074,7 @@ void TextStateResponse::dump_to(std::string &out) const {
 void TextCommandRequest::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "TextCommandRequest");
   dump_field(out, "key", this->key);
-  out.append("  state: ");
-  out.append("'").append(this->state.c_str(), this->state.size()).append("'");
-  out.append("\n");
+  dump_field(out, "state", this->state);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -2344,17 +2083,11 @@ void TextCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_DATETIME_DATE
 void ListEntitiesDateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesDateResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -2387,17 +2120,11 @@ void DateCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_DATETIME_TIME
 void ListEntitiesTimeResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesTimeResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -2430,23 +2157,15 @@ void TimeCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_EVENT
 void ListEntitiesEventResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesEventResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
   for (const auto &it : *this->event_types) {
     dump_field(out, "event_types", it, 4);
   }
@@ -2457,9 +2176,7 @@ void ListEntitiesEventResponse::dump_to(std::string &out) const {
 void EventResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "EventResponse");
   dump_field(out, "key", this->key);
-  out.append("  event_type: ");
-  out.append("'").append(this->event_type.c_str(), this->event_type.size()).append("'");
-  out.append("\n");
+  dump_field(out, "event_type", this->event_type);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -2468,23 +2185,15 @@ void EventResponse::dump_to(std::string &out) const {
 #ifdef USE_VALVE
 void ListEntitiesValveResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesValveResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
   dump_field(out, "assumed_state", this->assumed_state);
   dump_field(out, "supports_position", this->supports_position);
   dump_field(out, "supports_stop", this->supports_stop);
@@ -2515,17 +2224,11 @@ void ValveCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_DATETIME_DATETIME
 void ListEntitiesDateTimeResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesDateTimeResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
@@ -2554,23 +2257,15 @@ void DateTimeCommandRequest::dump_to(std::string &out) const {
 #ifdef USE_UPDATE
 void ListEntitiesUpdateResponse::dump_to(std::string &out) const {
   MessageDumpHelper helper(out, "ListEntitiesUpdateResponse");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id.c_str(), this->object_id.size()).append("'");
-  out.append("\n");
+  dump_field(out, "object_id", this->object_id);
   dump_field(out, "key", this->key);
-  out.append("  name: ");
-  out.append("'").append(this->name.c_str(), this->name.size()).append("'");
-  out.append("\n");
+  dump_field(out, "name", this->name);
 #ifdef USE_ENTITY_ICON
-  out.append("  icon: ");
-  out.append("'").append(this->icon.c_str(), this->icon.size()).append("'");
-  out.append("\n");
+  dump_field(out, "icon", this->icon);
 #endif
   dump_field(out, "disabled_by_default", this->disabled_by_default);
   dump_field(out, "entity_category", static_cast<enums::EntityCategory>(this->entity_category));
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class.c_str(), this->device_class.size()).append("'");
-  out.append("\n");
+  dump_field(out, "device_class", this->device_class);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
@@ -2582,21 +2277,11 @@ void UpdateStateResponse::dump_to(std::string &out) const {
   dump_field(out, "in_progress", this->in_progress);
   dump_field(out, "has_progress", this->has_progress);
   dump_field(out, "progress", this->progress);
-  out.append("  current_version: ");
-  out.append("'").append(this->current_version.c_str(), this->current_version.size()).append("'");
-  out.append("\n");
-  out.append("  latest_version: ");
-  out.append("'").append(this->latest_version.c_str(), this->latest_version.size()).append("'");
-  out.append("\n");
-  out.append("  title: ");
-  out.append("'").append(this->title.c_str(), this->title.size()).append("'");
-  out.append("\n");
-  out.append("  release_summary: ");
-  out.append("'").append(this->release_summary.c_str(), this->release_summary.size()).append("'");
-  out.append("\n");
-  out.append("  release_url: ");
-  out.append("'").append(this->release_url.c_str(), this->release_url.size()).append("'");
-  out.append("\n");
+  dump_field(out, "current_version", this->current_version);
+  dump_field(out, "latest_version", this->latest_version);
+  dump_field(out, "title", this->title);
+  dump_field(out, "release_summary", this->release_summary);
+  dump_field(out, "release_url", this->release_url);
 #ifdef USE_DEVICES
   dump_field(out, "device_id", this->device_id);
 #endif
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 7557b4d57b..e5a245f94e 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -913,6 +913,10 @@ class PointerToStringBufferType(PointerToBufferTypeBase):
     reference_type = "StringRef &"
     const_reference_type = "const StringRef &"
 
+    @classmethod
+    def can_use_dump_field(cls) -> bool:
+        return True
+
     @property
     def public_content(self) -> list[str]:
         return [f"StringRef {self.field_name}{{}};"]
@@ -929,15 +933,12 @@ class PointerToStringBufferType(PointerToBufferTypeBase):
     }}"""
 
     def dump(self, name: str) -> str:
-        return f'out.append("\'").append(this->{self.field_name}.c_str(), this->{self.field_name}.size()).append("\'");'
+        # Not used since we use dump_field, but required by abstract base class
+        return f'out.append("\'").append({name}.c_str(), {name}.size()).append("\'");'
 
     @property
     def dump_content(self) -> str:
-        return (
-            f'out.append("  {self.name}: ");\n'
-            + f"{self.dump(self.field_name)}\n"
-            + 'out.append("\\n");'
-        )
+        return f'dump_field(out, "{self.name}", this->{self.field_name});'
 
     def get_size_calculation(self, name: str, force: bool = False) -> str:
         return f"size.add_length({self.calculate_field_id_size()}, this->{self.field_name}.size());"