From 9074ef792fd3b0c3c3750a5f10c4b6838d344be5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 25 Jun 2025 19:35:40 +0200
Subject: [PATCH 1/2] Reduce component_iterator memory usage

---
 esphome/core/component_iterator.cpp | 2 +-
 esphome/core/component_iterator.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/core/component_iterator.cpp b/esphome/core/component_iterator.cpp
index da593340c1..03c8fb44f9 100644
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@@ -375,7 +375,7 @@ void ComponentIterator::advance() {
   }
 
   if (advance_platform) {
-    this->state_ = static_cast<IteratorState>(static_cast<uint32_t>(this->state_) + 1);
+    this->state_ = static_cast<IteratorState>(static_cast<uint16_t>(this->state_) + 1);
     this->at_ = 0;
   } else if (success) {
     this->at_++;
diff --git a/esphome/core/component_iterator.h b/esphome/core/component_iterator.h
index 9e187f6c57..c7cebfd178 100644
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -93,7 +93,7 @@ class ComponentIterator {
   virtual bool on_end();
 
  protected:
-  enum class IteratorState {
+  enum class IteratorState : uint8_t {
     NONE = 0,
     BEGIN,
 #ifdef USE_BINARY_SENSOR
@@ -167,7 +167,7 @@ class ComponentIterator {
 #endif
     MAX,
   } state_{IteratorState::NONE};
-  size_t at_{0};
+  uint16_t at_{0};
   bool include_internal_{false};
 };
 

From a7e0bf9013d4f19f53a74948b4e02c0aec8e6838 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 25 Jun 2025 23:53:22 +0200
Subject: [PATCH 2/2] tweak

---
 esphome/core/component_iterator.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/core/component_iterator.h b/esphome/core/component_iterator.h
index c7cebfd178..4b41872db7 100644
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -93,6 +93,8 @@ class ComponentIterator {
   virtual bool on_end();
 
  protected:
+  // Iterates over all ESPHome entities (sensors, switches, lights, etc.)
+  // Supports up to 256 entity types and up to 65,535 entities of each type
   enum class IteratorState : uint8_t {
     NONE = 0,
     BEGIN,
@@ -167,7 +169,7 @@ class ComponentIterator {
 #endif
     MAX,
   } state_{IteratorState::NONE};
-  uint16_t at_{0};
+  uint16_t at_{0};  // Supports up to 65,535 entities per type
   bool include_internal_{false};
 };