rename proto modules to types

Author: rmorshea

src/idom/__init__.py

@@ -1,8 +1,8 @@
-from . import config, html, log, web
+from . import config, html, log, types, web
 from .core import hooks
-from .core.component import Component, component
+from .core.component import component
 from .core.dispatcher import Stop
-from .core.events import EventHandler, event
+from .core.events import event
 from .core.hooks import (
     create_context,
     use_callback,
@@ -14,7 +14,6 @@
     use_state,
 )
 from .core.layout import Layout
-from .core.proto import ComponentType, VdomDict
 from .core.vdom import vdom
 from .sample import run_sample_app
 from .server.prefab import run
@@ -27,12 +26,9 @@
 
 __all__ = [
     "component",
-    "Component",
-    "ComponentType",
     "config",
     "create_context",
     "event",
-    "EventHandler",
     "hooks",
     "hotswap",
     "html_to_vdom",
@@ -44,6 +40,7 @@
     "run_sample_app",
     "run",
     "Stop",
+    "types",
     "use_callback",
     "use_context",
     "use_effect",
@@ -52,6 +49,5 @@
     "use_ref",
     "use_state",
     "vdom",
-    "VdomDict",
     "web",
 ]

src/idom/core/component.py

@@ -4,7 +4,7 @@
 from functools import wraps
 from typing import Any, Callable, Dict, Optional, Tuple, Union
 
-from .proto import ComponentType, VdomDict
+from .types import ComponentType, VdomDict
 
 
 def component(

src/idom/core/dispatcher.py

@@ -24,7 +24,7 @@
 
 from ._fixed_jsonpatch import apply_patch, make_patch  # type: ignore
 from .layout import LayoutEvent, LayoutUpdate
-from .proto import LayoutType, VdomJson
+from .types import LayoutType, VdomJson
 
 
 logger = getLogger(__name__)

src/idom/core/events.py

@@ -6,7 +6,7 @@
 from anyio import create_task_group
 from typing_extensions import Literal
 
-from idom.core.proto import EventHandlerFunc, EventHandlerType
+from idom.core.types import EventHandlerFunc, EventHandlerType
 
 
 @overload

src/idom/core/hooks.py

@@ -27,7 +27,7 @@
 from idom.utils import Ref
 
 from ._thread_local import ThreadLocal
-from .proto import Key, VdomDict
+from .types import Key, VdomDict
 from .vdom import vdom
 
 

src/idom/core/layout.py

@@ -32,7 +32,7 @@
 
 from ._event_proxy import _wrap_in_warning_event_proxies
 from .hooks import LifeCycleHook
-from .proto import ComponentType, EventHandlerDict, VdomDict, VdomJson
+from .types import ComponentType, EventHandlerDict, VdomDict, VdomJson
 from .vdom import validate_vdom_json
 
 

src/idom/core/proto.py renamed to src/idom/core/types.py

@@ -180,3 +180,15 @@ class EventHandlerType(Protocol):
 
         When ``None``, it is left to a :class:`LayoutType` to auto generate a unique ID.
     """
+
+
+class VdomDictConstructor(Protocol):
+    """Standard function for constructing a :class:`VdomDict`"""
+
+    def __call__(
+        self,
+        *attributes_and_children: VdomAttributesAndChildren,
+        key: str = ...,
+        event_handlers: Optional[EventHandlerMapping] = ...,
+    ) -> VdomDict:
+        ...

src/idom/core/vdom.py

@@ -13,7 +13,7 @@
     merge_event_handlers,
     to_event_handler_function,
 )
-from idom.core.proto import (
+from idom.core.types import (
     EventHandlerDict,
     EventHandlerMapping,
     EventHandlerType,
@@ -320,7 +320,7 @@ def _is_single_child(value: Any) -> bool:
         if _debug_is_single_child(value):
             return True
 
-        from .proto import ComponentType
+        from .types import ComponentType
 
         if hasattr(value, "__iter__") and not hasattr(value, "__len__"):
             logger.error(

src/idom/html.py

@@ -160,7 +160,7 @@
 
 from typing import Any, Mapping
 
-from .core.proto import Key, VdomDict
+from .core.types import Key, VdomDict
 from .core.vdom import coalesce_attributes_and_children, make_vdom_constructor
 
 

src/idom/sample.py

@@ -3,11 +3,11 @@
 import webbrowser
 from typing import Any
 
-from idom.server.proto import ServerType
+from idom.server.types import ServerType
 
 from . import html
 from .core.component import component
-from .core.proto import VdomDict
+from .core.types import VdomDict
 from .server.utils import find_available_port, find_builtin_server_type
 
 

src/idom/server/fastapi.py

@@ -2,7 +2,7 @@
 
 from fastapi import FastAPI
 
-from idom.core.proto import ComponentConstructor
+from idom.core.types import ComponentConstructor
 
 from .starlette import (
     Config,

src/idom/server/flask.py

@@ -22,7 +22,7 @@
 from idom.config import IDOM_DEBUG_MODE, IDOM_WEB_MODULES_DIR
 from idom.core.dispatcher import dispatch_single_view
 from idom.core.layout import LayoutEvent, LayoutUpdate
-from idom.core.proto import ComponentConstructor, ComponentType
+from idom.core.types import ComponentConstructor, ComponentType
 
 from .utils import CLIENT_BUILD_DIR, threaded, wait_on_event
 

src/idom/server/prefab.py

@@ -1,10 +1,10 @@
 import logging
 from typing import Any, Dict, Optional, Tuple, TypeVar
 
-from idom.core.proto import ComponentConstructor
+from idom.core.types import ComponentConstructor
 from idom.widgets import MountFunc, MultiViewMount, hotswap, multiview
 
-from .proto import ServerFactory, ServerType
+from .types import ServerFactory, ServerType
 from .utils import find_available_port, find_builtin_server_type
 
 

src/idom/server/sanic.py

@@ -23,7 +23,7 @@
     ensure_shared_view_dispatcher_future,
 )
 from idom.core.layout import Layout, LayoutEvent
-from idom.core.proto import ComponentConstructor
+from idom.core.types import ComponentConstructor
 
 from .utils import CLIENT_BUILD_DIR, threaded, wait_on_event
 

src/idom/server/starlette.py

@@ -30,7 +30,7 @@
     ensure_shared_view_dispatcher_future,
 )
 from idom.core.layout import Layout, LayoutEvent
-from idom.core.proto import ComponentConstructor
+from idom.core.types import ComponentConstructor
 
 from .utils import CLIENT_BUILD_DIR, poll, threaded
 

src/idom/server/tornado.py

@@ -16,7 +16,7 @@
 from idom.config import IDOM_WEB_MODULES_DIR
 from idom.core.dispatcher import VdomJsonPatch, dispatch_single_view
 from idom.core.layout import Layout, LayoutEvent
-from idom.core.proto import ComponentConstructor
+from idom.core.types import ComponentConstructor
 
 from .utils import CLIENT_BUILD_DIR, threaded, wait_on_event
 

src/idom/server/proto.py renamed to src/idom/server/types.py

@@ -5,7 +5,7 @@
 
 from typing_extensions import Protocol
 
-from idom.core.proto import ComponentConstructor
+from idom.core.types import ComponentConstructor
 
 
 _App = TypeVar("_App")

src/idom/server/utils.py

@@ -12,7 +12,7 @@
 
 import idom
 
-from .proto import ServerFactory
+from .types import ServerFactory
 
 
 CLIENT_BUILD_DIR = Path(idom.__file__).parent / "client"

src/idom/testing.py

@@ -34,7 +34,7 @@
 from idom.core.events import EventHandler, to_event_handler_function
 from idom.core.hooks import LifeCycleHook, current_hook
 from idom.server.prefab import hotswap_server
-from idom.server.proto import ServerFactory, ServerType
+from idom.server.types import ServerFactory, ServerType
 from idom.server.utils import find_available_port
 
 from .log import ROOT_LOGGER

src/idom/types.py

@@ -0,0 +1,39 @@
+from .core.types import (
+    ComponentConstructor,
+    ComponentType,
+    EventHandlerDict,
+    EventHandlerFunc,
+    EventHandlerMapping,
+    EventHandlerType,
+    ImportSourceDict,
+    Key,
+    LayoutType,
+    VdomAttributes,
+    VdomAttributesAndChildren,
+    VdomChild,
+    VdomChildren,
+    VdomDict,
+    VdomJson,
+)
+from .server.types import ServerFactory, ServerType
+
+
+__all__ = [
+    "ComponentConstructor",
+    "ComponentType",
+    "EventHandlerDict",
+    "EventHandlerFunc",
+    "EventHandlerMapping",
+    "EventHandlerType",
+    "ImportSourceDict",
+    "Key",
+    "LayoutType",
+    "VdomAttributes",
+    "VdomAttributesAndChildren",
+    "VdomChild",
+    "VdomChildren",
+    "VdomDict",
+    "VdomJson",
+    "ServerFactory",
+    "ServerType",
+]

src/idom/web/module.py

@@ -10,15 +10,8 @@
 from typing import Any, List, NewType, Optional, Set, Tuple, Union, overload
 from urllib.parse import urlparse
 
-from typing_extensions import Protocol
-
 from idom.config import IDOM_DEBUG_MODE, IDOM_WEB_MODULES_DIR
-from idom.core.proto import (
-    EventHandlerMapping,
-    ImportSourceDict,
-    VdomAttributesAndChildren,
-    VdomDict,
-)
+from idom.core.types import ImportSourceDict, VdomDictConstructor
 from idom.core.vdom import make_vdom_constructor
 
 from .utils import (
@@ -292,16 +285,6 @@ def module_from_string(
     )
 
 
-class _VdomDictConstructor(Protocol):
-    def __call__(
-        self,
-        *attributes_and_children: VdomAttributesAndChildren,
-        key: str = ...,
-        event_handlers: Optional[EventHandlerMapping] = ...,
-    ) -> VdomDict:
-        ...
-
-
 @dataclass(frozen=True)
 class WebModule:
     source: str
@@ -318,7 +301,7 @@ def export(
     export_names: str,
     fallback: Optional[Any] = ...,
     allow_children: bool = ...,
-) -> _VdomDictConstructor:
+) -> VdomDictConstructor:
     ...
 
 
@@ -328,7 +311,7 @@ def export(
     export_names: Union[List[str], Tuple[str, ...]],
     fallback: Optional[Any] = ...,
     allow_children: bool = ...,
-) -> List[_VdomDictConstructor]:
+) -> List[VdomDictConstructor]:
     ...
 
 
@@ -337,7 +320,7 @@ def export(
     export_names: Union[str, List[str], Tuple[str, ...]],
     fallback: Optional[Any] = None,
     allow_children: bool = True,
-) -> Union[_VdomDictConstructor, List[_VdomDictConstructor]]:
+) -> Union[VdomDictConstructor, List[VdomDictConstructor]]:
     """Return one or more VDOM constructors from a :class:`WebModule`
 
     Parameters:
@@ -375,7 +358,7 @@ def _make_export(
     name: str,
     fallback: Optional[Any],
     allow_children: bool,
-) -> _VdomDictConstructor:
+) -> VdomDictConstructor:
     return partial(
         make_vdom_constructor(
             name,

src/idom/widgets.py

@@ -21,7 +21,7 @@
 from . import html
 from .core import hooks
 from .core.component import component
-from .core.proto import ComponentConstructor, VdomDict
+from .core.types import ComponentConstructor, VdomDict
 from .utils import Ref
 
 

tests/test_core/test_vdom.py

@@ -4,7 +4,7 @@
 import idom
 from idom.config import IDOM_DEBUG_MODE
 from idom.core.events import EventHandler
-from idom.core.proto import VdomDict
+from idom.core.types import VdomDict
 from idom.core.vdom import is_vdom, make_vdom_constructor, validate_vdom_json