kicad-sch-api 0.3.5__py3-none-any.whl → 0.4.1__py3-none-any.whl

kicad_sch_api/core/no_connects.py

@@ -10,7 +10,8 @@ import uuid
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
 from ..utils.validation import SchematicValidator, ValidationError, ValidationIssue
-from .types import Point, NoConnect
+from .collections import BaseCollection
+from .types import NoConnect, Point
 
 logger = logging.getLogger(__name__)
 
@@ -72,10 +73,13 @@ class NoConnectElement:
         return f"<NoConnect @ {self.position}>"
 
 
-class NoConnectCollection:
+class NoConnectCollection(BaseCollection[NoConnectElement]):
     """
     Collection class for efficient no-connect element management.
 
+    Inherits from BaseCollection for standard operations and adds no-connect-specific
+    functionality including position-based indexing.
+
     Provides fast lookup, filtering, and bulk operations for schematic no-connect elements.
     """
 
@@ -86,18 +90,17 @@ class NoConnectCollection:
         Args:
             no_connects: Initial list of no-connect data
         """
-        self._no_connects: List[NoConnectElement] = []
-        self._uuid_index: Dict[str, NoConnectElement] = {}
+        # Initialize base collection
+        super().__init__([], collection_name="no_connects")
+
+        # Additional no-connect-specific index
         self._position_index: Dict[Tuple[float, float], List[NoConnectElement]] = {}
-        self._modified = False
 
         # Add initial no-connects
         if no_connects:
             for no_connect_data in no_connects:
                 self._add_to_indexes(NoConnectElement(no_connect_data, self))
 
-        logger.debug(f"NoConnectCollection initialized with {len(self._no_connects)} no-connects")
-
     def add(
         self,
         position: Union[Point, Tuple[float, float]],
@@ -144,9 +147,7 @@ class NoConnectCollection:
         logger.debug(f"Added no-connect: {no_connect_element}")
         return no_connect_element
 
-    def get(self, no_connect_uuid: str) -> Optional[NoConnectElement]:
-        """Get no-connect by UUID."""
-        return self._uuid_index.get(no_connect_uuid)
+    # get() method inherited from BaseCollection
 
     def remove(self, no_connect_uuid: str) -> bool:
         """
@@ -158,18 +159,26 @@ class NoConnectCollection:
         Returns:
             True if no-connect was removed, False if not found
         """
-        no_connect_element = self._uuid_index.get(no_connect_uuid)
+        no_connect_element = self.get(no_connect_uuid)
         if not no_connect_element:
             return False
 
-        # Remove from indexes
-        self._remove_from_indexes(no_connect_element)
-        self._mark_modified()
+        # Remove from position index
+        pos_key = (no_connect_element.position.x, no_connect_element.position.y)
+        if pos_key in self._position_index:
+            self._position_index[pos_key].remove(no_connect_element)
+            if not self._position_index[pos_key]:
+                del self._position_index[pos_key]
+
+        # Remove using base class method
+        super().remove(no_connect_uuid)
 
         logger.debug(f"Removed no-connect: {no_connect_element}")
         return True
 
-    def find_at_position(self, position: Union[Point, Tuple[float, float]], tolerance: float = 0.1) -> List[NoConnectElement]:
+    def find_at_position(
+        self, position: Union[Point, Tuple[float, float]], tolerance: float = 0.1
+    ) -> List[NoConnectElement]:
         """
         Find no-connects at or near a position.
 
@@ -184,7 +193,7 @@ class NoConnectCollection:
             position = Point(position[0], position[1])
 
         matches = []
-        for no_connect_element in self._no_connects:
+        for no_connect_element in self._items:
             distance = no_connect_element.position.distance_to(position)
             if distance <= tolerance:
                 matches.append(no_connect_element)
@@ -192,7 +201,7 @@ class NoConnectCollection:
 
     def filter(self, predicate: Callable[[NoConnectElement], bool]) -> List[NoConnectElement]:
         """
-        Filter no-connects by predicate function.
+        Filter no-connects by predicate function (delegates to base class find).
 
         Args:
             predicate: Function that returns True for no-connects to include
@@ -200,7 +209,7 @@ class NoConnectCollection:
         Returns:
             List of no-connects matching predicate
         """
-        return [no_connect for no_connect in self._no_connects if predicate(no_connect)]
+        return self.find(predicate)
 
     def bulk_update(self, criteria: Callable[[NoConnectElement], bool], updates: Dict[str, Any]):
         """
@@ -211,7 +220,7 @@ class NoConnectCollection:
             updates: Dictionary of property updates
         """
         updated_count = 0
-        for no_connect_element in self._no_connects:
+        for no_connect_element in self._items:
             if criteria(no_connect_element):
                 for prop, value in updates.items():
                     if hasattr(no_connect_element, prop):
@@ -224,15 +233,12 @@ class NoConnectCollection:
 
     def clear(self):
         """Remove all no-connects from collection."""
-        self._no_connects.clear()
-        self._uuid_index.clear()
         self._position_index.clear()
-        self._mark_modified()
+        super().clear()
 
     def _add_to_indexes(self, no_connect_element: NoConnectElement):
-        """Add no-connect to internal indexes."""
-        self._no_connects.append(no_connect_element)
-        self._uuid_index[no_connect_element.uuid] = no_connect_element
+        """Add no-connect to internal indexes (base + position index)."""
+        self._add_item(no_connect_element)
 
         # Add to position index
         pos_key = (no_connect_element.position.x, no_connect_element.position.y)
@@ -240,35 +246,7 @@ class NoConnectCollection:
             self._position_index[pos_key] = []
         self._position_index[pos_key].append(no_connect_element)
 
-    def _remove_from_indexes(self, no_connect_element: NoConnectElement):
-        """Remove no-connect from internal indexes."""
-        self._no_connects.remove(no_connect_element)
-        del self._uuid_index[no_connect_element.uuid]
-
-        # Remove from position index
-        pos_key = (no_connect_element.position.x, no_connect_element.position.y)
-        if pos_key in self._position_index:
-            self._position_index[pos_key].remove(no_connect_element)
-            if not self._position_index[pos_key]:
-                del self._position_index[pos_key]
-
-    def _mark_modified(self):
-        """Mark collection as modified."""
-        self._modified = True
-
-    # Collection interface methods
-    def __len__(self) -> int:
-        """Return number of no-connects."""
-        return len(self._no_connects)
-
-    def __iter__(self) -> Iterator[NoConnectElement]:
-        """Iterate over no-connects."""
-        return iter(self._no_connects)
-
-    def __getitem__(self, index: int) -> NoConnectElement:
-        """Get no-connect by index."""
-        return self._no_connects[index]
-
+    # Collection interface methods - __len__, __iter__, __getitem__ inherited from BaseCollection
     def __bool__(self) -> bool:
         """Return True if collection has no-connects."""
-        return len(self._no_connects) > 0
+        return len(self._items) > 0