feat(packages): support removing components (#5821)

esphome/config_helpers.py

@@ -22,6 +22,22 @@ class Extend:
         return isinstance(b, Extend) and self.value == b.value
 
 
+class Remove:
+    def __init__(self, value=None):
+        self.value = value
+
+    def __str__(self):
+        return f"!remove {self.value}"
+
+    def __eq__(self, b):
+        """
+        Check if two Remove objects contain the same ID.
+
+        Only used in unit tests.
+        """
+        return isinstance(b, Remove) and self.value == b.value
+
+
 def read_config_file(path: str) -> str:
     if CORE.vscode and (
         not CORE.ace or os.path.abspath(path) == os.path.abspath(CORE.config_path)
@@ -48,7 +64,10 @@ def merge_config(full_old, full_new):
                 return new
             res = old.copy()
             for k, v in new.items():
-                res[k] = merge(old[k], v) if k in old else v
+                if isinstance(v, Remove) and k in old:
+                    del res[k]
+                else:
+                    res[k] = merge(old[k], v) if k in old else v
             return res
         if isinstance(new, list):
             if not isinstance(old, list):
@@ -59,6 +78,7 @@ def merge_config(full_old, full_new):
                 for i, v in enumerate(res)
                 if CONF_ID in v and isinstance(v[CONF_ID], str)
             }
+            ids_to_delete = []
             for v in new:
                 if CONF_ID in v:
                     new_id = v[CONF_ID]
@@ -68,9 +88,15 @@ def merge_config(full_old, full_new):
                             v[CONF_ID] = new_id
                             res[ids[new_id]] = merge(res[ids[new_id]], v)
                             continue
+                    elif isinstance(new_id, Remove):
+                        new_id = new_id.value
+                        if new_id in ids:
+                            ids_to_delete.append(ids[new_id])
+                            continue
                     else:
                         ids[new_id] = len(res)
                 res.append(v)
+            res = [v for i, v in enumerate(res) if i not in ids_to_delete]
             return res
         if new is None:
             return old