sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-11 14:23:47 +01:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-09 15:47:35 -10:00
parent c313be0098
commit 0909f43dbb
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
script/merge_component_configs.py
View File

@@ -60,31 +60,26 @@ def extract_packages_from_yaml(data: dict) -> dict[str, str]:
if "packages" not in data: if "packages" not in data:
return {} return {}
packages_value = data["packages"]
if not isinstance(packages_value, dict):
# List format doesn't include common bus packages (those use dict format)
return {}
# Get common bus package names (cached) # Get common bus package names (cached)
common_bus_packages = get_common_bus_packages() common_bus_packages = get_common_bus_packages()
packages = {} packages = {}
# Handle both dict and list formats for packages
packages_value = data["packages"]
if isinstance(packages_value, dict):
# Dictionary format: packages: {name: value} # Dictionary format: packages: {name: value}
for name, value in packages_value.items(): for name, value in packages_value.items():
# Only include common bus packages, ignore component-specific ones # Only include common bus packages, ignore component-specific ones
if name in common_bus_packages: if name in common_bus_packages:
packages[name] = str(value) packages[name] = str(value)
# Also track package dependencies (e.g., modbus includes uart) # Also track package dependencies (e.g., modbus includes uart)
# This ensures components using modbus are grouped with uart
if name in PACKAGE_DEPENDENCIES: if name in PACKAGE_DEPENDENCIES:
for dep in PACKAGE_DEPENDENCIES[name]: for dep in PACKAGE_DEPENDENCIES[name]:
if dep in common_bus_packages: if dep in common_bus_packages:
# Mark as included via dependency # Mark as included via dependency
packages[f"_dep_{dep}"] = f"(included via {name})" packages[f"_dep_{dep}"] = f"(included via {name})"
elif isinstance(packages_value, list):
# List format: packages: [!include file]
# This format doesn't include common bus packages (those use dict format)
# so we just return empty dict
pass
return packages return packages
@@ -240,23 +235,23 @@ def merge_component_configs(
# Now handle packages: remove common bus packages, expand component-specific ones # Now handle packages: remove common bus packages, expand component-specific ones
if "packages" in comp_data: if "packages" in comp_data:
common_bus_packages = get_common_bus_packages()
packages_value = comp_data["packages"] packages_value = comp_data["packages"]
if isinstance(packages_value, dict): if isinstance(packages_value, dict):
# Dict format - check each package # Dict format - check each package
common_bus_packages = get_common_bus_packages()
for pkg_name, pkg_value in list(packages_value.items()): for pkg_name, pkg_value in list(packages_value.items()):
if pkg_name not in common_bus_packages and isinstance( if pkg_name in common_bus_packages:
pkg_value, dict continue
): if not isinstance(pkg_value, dict):
continue
# Component-specific package - expand its content into top level # Component-specific package - expand its content into top level
# Merge package content using ESPHome's merge_config
comp_data = merge_config(comp_data, pkg_value) comp_data = merge_config(comp_data, pkg_value)
elif isinstance(packages_value, list): elif isinstance(packages_value, list):
# List format - expand all package includes # List format - expand all package includes
for pkg_value in packages_value: for pkg_value in packages_value:
if isinstance(pkg_value, dict): if not isinstance(pkg_value, dict):
# Package content - merge it into top level continue
comp_data = merge_config(comp_data, pkg_value) comp_data = merge_config(comp_data, pkg_value)
# Remove all packages (common will be re-added at the end) # Remove all packages (common will be re-added at the end)