wrap_sub

src/hooked_containers/__init__.py

@@ -1,12 +0,0 @@
-from .container import HookedContainer, HookFunction
-from .mapping import HookedMapping
-from .sequence import HookedList
-from .state import NameSpaceState
-
-__all__ = [
-    "HookedContainer",
-    "HookFunction",
-    "HookedMapping",
-    "HookedList",
-    "NameSpaceState",
-]

src/hooked_containers/container.py

@@ -1,17 +1,13 @@
 from abc import ABC, abstractmethod
 from collections.abc import Container, Iterable, MutableMapping, MutableSequence, Sized
-from typing import Protocol, TypeVar
+from typing import TypeVar
 
 from . import events as e
+from .events import HookFunction
+from .types import MutableNesting
 
 T = TypeVar("T")
 
-type MutableNesting[T] = T | MutableSequence[T] | MutableMapping[T, MutableNesting[T]]
-
-
-class HookFunction(Protocol):
-    def __call__(self, event: e.ChangeEvent[T]) -> None: ...
-
 
 class HookedContainer(ABC, Sized, Iterable[T], Container[T]):
     _data: MutableNesting[T]

src/hooked_containers/events.py

@@ -1,26 +1,33 @@
+from __future__ import annotations
+
 from collections.abc import MutableSequence
-from dataclasses import dataclass
+from dataclasses import dataclass, field
-from typing import Generic, TypeVar
+from typing import TYPE_CHECKING, Generic, Protocol, TypeVar
+
+if TYPE_CHECKING:
+    from .mapping import HookedMapping
 
 T = TypeVar("T")
 
 
 @dataclass(frozen=True)
 class ChangeEvent(Generic[T]):
+    root: HookedMapping[T] = field(repr=False)
     path: MutableSequence[int]
     item: T
 
 
 @dataclass(frozen=True)
-class AddItemEvent(ChangeEvent[T]):
+class AddItemEvent(ChangeEvent[T]): ...
-    item: T
 
 
 @dataclass(frozen=True)
-class SetItemEvent(ChangeEvent[T]):
+class SetItemEvent(ChangeEvent[T]): ...
-    item: T
 
 
 @dataclass(frozen=True)
-class RemoveItemEvent(ChangeEvent[T]):
+class RemoveItemEvent(ChangeEvent[T]): ...
-    item: T
+
+
+class HookFunction(Protocol):
+    def __call__(self, event: ChangeEvent[T]) -> None: ...

src/hooked_containers/mapping.py

@@ -2,7 +2,8 @@ from collections.abc import MutableMapping, MutableSequence
 from typing import TypeVar
 
 from . import events as e
-from .container import HookedContainer, HookFunction, MutableNesting
+from .container import HookedContainer, MutableNesting
+from .events import HookFunction
 
 T = TypeVar("T")
 
@@ -14,6 +15,7 @@ class HookedMapping(HookedContainer[T], MutableMapping[T, MutableNesting[T]]):
         self,
         existing: MutableMapping[T, MutableNesting[T]],
         hook: HookFunction | None = None,
+        root: MutableMapping[T] | None = None,
         path: MutableSequence[int] | None = None,
     ):
         match existing:
@@ -26,15 +28,19 @@ class HookedMapping(HookedContainer[T], MutableMapping[T, MutableNesting[T]]):
                 # self._data = dict(it)
         self._data = existing
         self.hook = hook
+        self._root = root if root is not None else self
         self._path = list(path) if path is not None else []
 
+    def __wrap_sub__(self, other, **kwargs):
+        return HookedMapping(other, hook=self.hook, root=self._root, **kwargs)
+
     def __getitem__(self, key: T) -> MutableNesting[T]:
         if key not in self._data:
-            return HookedMapping(self.__setitem__(key, {}), hook=self.hook, path=self.new_path(key))
+            return self.__wrap_sub__(self.__setitem__(key, {}), path=self.new_path(key))
         value = self._data[key]
         match value:
             case MutableMapping() as mapping:
-                return HookedMapping(mapping, hook=self.hook, path=self.new_path(key))
+                return self.__wrap_sub__(mapping, path=self.new_path(key))
             case _ as item:
                 return item
 
@@ -46,7 +52,11 @@ class HookedMapping(HookedContainer[T], MutableMapping[T, MutableNesting[T]]):
         suppress_hook: bool = False,
     ) -> MutableNesting[T] | None:
         new_path = self.new_path(key)
-        event = e.SetItemEvent(new_path, value) if key in self._data else e.AddItemEvent(new_path, value)
+        event = (
+            e.SetItemEvent(self._root, new_path, value)
+            if key in self._data
+            else e.AddItemEvent(self._root, new_path, value)
+        )
         match value:
             case HookedMapping(_data=value):
                 self._data[key] = value
@@ -59,4 +69,4 @@ class HookedMapping(HookedContainer[T], MutableMapping[T, MutableNesting[T]]):
     def __delitem__(self, key: T) -> None:
         item = self._data.pop(key)
         if self.hook:
-            self.hook(e.RemoveItemEvent(self.new_path(key), item))
+            self.hook(e.RemoveItemEvent(self._root, self.new_path(key), item))

src/hooked_containers/sequence.py

@@ -3,7 +3,8 @@ from copy import copy
 from typing import TypeVar
 
 from . import events as e
-from .container import HookedContainer, HookFunction
+from .container import HookedContainer
+from .types import HookFunction
 
 T = TypeVar("T")
 

src/hooked_containers/state.py

@@ -1,31 +1,43 @@
+from collections.abc import MutableMapping
 from datetime import datetime
 
 from .mapping import HookedMapping
 
 
 class EntityState(HookedMapping[str]):
-    pass
+    def __setitem__(self, key, value):
+        super().__setitem__(key, value)
+        super().__setitem__("last_changed", datetime.now(), suppress_hook=True)
 
 
 class DomainState(HookedMapping[str]):
-    _data: EntityState
+    _data: MutableMapping[str, EntityState]
 
-    def __setitem__(self, key, value):
+    def __getitem__(self, key):
-        super().__setitem__(key, value)
+        match super().__getitem__(key):
-        super().__setitem__("last_changed", datetime.now())
+            case HookedMapping(_data=val):
+                return EntityState(val, hook=self.hook, path=self.new_path(key))
+            case _ as val:
+                raise TypeError(f"Expected a mapping for domain state, got {type(val)}")
 
 
 class NameSpaceState(HookedMapping[str]):
-    _data: DomainState
+    _data: MutableMapping[str, DomainState]
-
-    def __iter__(self):
-        return super().__iter__()
-
-    def __setitem__(self, key, value):
-        super().__setitem__(key, value)
-        # print("ns SetItem")
 
     def __getitem__(self, key):
-        val = super().__getitem__(key)
+        match super().__getitem__(key):
-        # print("ns GetItem")
+            case HookedMapping(_data=val):
                 return DomainState(val, hook=self.hook, path=self.new_path(key))
+            case _ as val:
+                raise TypeError(f"Expected a mapping for domain state, got {type(val)}")
+
+
+class FullState(HookedMapping[str]):
+    _data: MutableMapping[str, NameSpaceState]
+
+    def __getitem__(self, key):
+        match super().__getitem__(key):
+            case HookedMapping(_data=val):
+                return NameSpaceState(val, hook=self.hook, path=self.new_path(key))
+            case _ as val:
+                raise TypeError(f"Expected a mapping for namespace state, got {type(val)}")

src/hooked_containers/types.py

@@ -0,0 +1,6 @@
+from collections.abc import MutableMapping, MutableSequence
+from typing import TypeVar
+
+T = TypeVar("T")
+
+type MutableNesting[T] = T | MutableSequence[T] | MutableMapping[T, MutableNesting[T]]