instaui 0.2.1__py2.py3-none-any.whl → 0.3.0__py2.py3-none-any.whl

instaui/ui/__init__.py

@@ -28,6 +28,7 @@ __all__ = [
     "to_config_data",
     "element",
     "vfor",
+    "iter_info",
     "content",
     "label",
     "add_style",
@@ -50,6 +51,8 @@ __all__ = [
     "context",
     "row",
     "grid",
+    "container",
+    "heading",
     "js",
     "watch",
     "vue_watch",
@@ -103,8 +106,10 @@ from instaui.components.element import Element as element
 from instaui.components.row import Row as row
 from instaui.components.column import Column as column
 from instaui.components.grid import Grid as grid
+from instaui.components.container import Container as container
+from instaui.components.heading import Heading as heading
 from instaui.components.directive import Directive as directive
-from instaui.components.vfor import VFor as vfor
+from instaui.components.vfor import VFor as vfor, iter_info
 from instaui.components.vif import VIf as vif
 from instaui.components.match import Match as match
 from instaui.components.content import Content as content
@@ -119,7 +124,7 @@ from instaui.runtime.context import get_context as context
 
 import instaui.js as js
 from instaui.watch.web_watch import watch
-from instaui.watch.vue_watch import VueWatch as vue_watch
+from instaui.watch.vue_watch import vue_watch
 from instaui.watch.js_watch import js_watch
 from instaui.handlers.watch_handler import WatchState as TWatchState
 from instaui.skip import skip_output

instaui/ui/__init__.pyi

@@ -28,6 +28,7 @@ __all__ = [
     "to_config_data",
     "element",
     "vfor",
+    "iter_info",
     "content",
     "label",
     "add_style",
@@ -50,6 +51,8 @@ __all__ = [
     "context",
     "row",
     "grid",
+    "container",
+    "heading",
     "js",
     "watch",
     "vue_watch",
@@ -103,8 +106,10 @@ from instaui.components.element import Element as element
 from instaui.components.row import Row as row
 from instaui.components.column import Column as column
 from instaui.components.grid import Grid as grid
+from instaui.components.container import Container as container
+from instaui.components.heading import Heading as heading
 from instaui.components.directive import Directive as directive
-from instaui.components.vfor import VFor as vfor
+from instaui.components.vfor import VFor as vfor, iter_info
 from instaui.components.vif import VIf as vif
 from instaui.components.match import Match as match
 from instaui.components.content import Content as content
@@ -119,7 +124,7 @@ from instaui.runtime.context import get_context as context
 
 import instaui.js as js
 from instaui.watch.web_watch import watch
-from instaui.watch.vue_watch import VueWatch as vue_watch
+from instaui.watch.vue_watch import vue_watch
 from instaui.watch.js_watch import js_watch
 from instaui.handlers.watch_handler import WatchState as TWatchState
 from instaui.skip import skip_output

instaui/ui_functions/input_slient_data.py

@@ -1,4 +1,5 @@
 import typing
+from instaui.vars._types import InputBindingType
 from instaui.vars.mixin_types.py_binding import CanInputMixin
 
 
@@ -14,3 +15,6 @@ class InputSilentData(CanInputMixin):
             return self.value._to_input_config()
         else:
             return self.value
+
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.Ref

instaui/ui_system_var_type.py

@@ -0,0 +1,6 @@
+from typing import Literal
+
+
+TSize = Literal["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+TWeight = Literal["light", "regular", "medium", "bold"]
+TAlign = Literal["left", "center", "right"]

instaui/vars/_types.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from enum import IntEnum
 from typing import Literal, TypeVar
 
 
@@ -6,3 +7,16 @@ _T_Value = TypeVar("_T_Value")
 _T_Output_Value = TypeVar("_T_Output_Value", covariant=True)
 _T_VAR_TYPE = Literal["ref", "computed", "webComputed"]
 _T_Bindable_Type = Literal["ref", "computed", "js", "webComputed", "vforItem"]
+
+
+class InputBindingType(IntEnum):
+    Ref = 0
+    EventContext = 1
+    Data = 2
+    JsFn = 3
+
+
+class OutputSetType(IntEnum):
+    Ref = 0
+    RouterAction = 1
+    ElementRefAction = 2

instaui/vars/data.py

@@ -6,6 +6,7 @@ from typing import (
 
 from instaui.common.jsonable import Jsonable
 from instaui.runtime._app import get_current_scope
+from instaui.vars._types import InputBindingType, OutputSetType
 from instaui.vars.path_var import PathVar
 
 from .mixin_types.var_type import VarMixin
@@ -25,8 +26,6 @@ class ConstData(
     StrFormatBindingMixin,
     ElementBindingMixin,
 ):
-    BIND_TYPE = "var"
-
     def __init__(self, value: Any = None) -> None:
         self.value = value  # type: ignore
 
@@ -35,7 +34,6 @@ class ConstData(
 
     def __to_binding_config(self):
         return {
-            "type": self.BIND_TYPE,
             "id": self.__register_info.var_id,
             "sid": self.__register_info.scope_id,
         }
@@ -57,10 +55,15 @@ class ConstData(
 
     def _to_json_dict(self):
         data = super()._to_json_dict()
-        data["sid"] = self.__register_info.scope_id
         data["id"] = self.__register_info.var_id
 
         return data
 
+    def _to_event_output_type(self) -> OutputSetType:
+        raise TypeError("ConstData cannot be used as an output")
+
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.Data
+
 
 TConstData = ConstData

instaui/vars/element_ref.py

@@ -1,22 +1,23 @@
 from __future__ import annotations
+from typing import Dict
 from instaui.common.jsonable import Jsonable
 from instaui.runtime._app import get_current_scope
+from instaui.vars._types import OutputSetType
 from instaui.vars.mixin_types.py_binding import CanOutputMixin
+from instaui.vars.mixin_types.element_binding import ElementBindingMixin
 
 
-class ElementRef(Jsonable, CanOutputMixin):
+class ElementRef(Jsonable, CanOutputMixin, ElementBindingMixin):
     def __init__(self) -> None:
         scope = get_current_scope()
-        self._id = scope.generate_element_ref_id()
-        self.__sid = get_current_scope().id
+        self.__register_info = scope.register_element_ref_task(self)
 
     def __to_binding_config(
         self,
     ):
         return {
-            "type": "ele_ref",
-            "id": self._id,
-            "sid": self.__sid,
+            "id": self.__register_info.var_id,
+            "sid": self.__register_info.scope_id,
         }
 
     def _to_output_config(self):
@@ -24,13 +25,15 @@ class ElementRef(Jsonable, CanOutputMixin):
 
     def _to_json_dict(self):
         data = super()._to_json_dict()
-        data["id"] = self._id
-        data["sid"] = self.__sid
+        data["id"] = self.__register_info.var_id
 
         return data
 
-    def _to_element_config(self):
-        return {"id": self._id, "sid": self.__sid}
+    def _to_element_binding_config(self) -> Dict:
+        return self.__to_binding_config()
+
+    def _to_event_output_type(self) -> OutputSetType:
+        return OutputSetType.ElementRefAction
 
 
 def run_element_method(method_name: str, *args, **kwargs):

instaui/vars/event_context.py

@@ -1,11 +1,10 @@
 from typing import Dict
 from instaui.common.jsonable import Jsonable
+from instaui.vars._types import InputBindingType
 from instaui.vars.mixin_types.py_binding import CanInputMixin
 
 
 class EventContext(Jsonable, CanInputMixin):
-    _TYPE = "event"
-
     def __init__(self, path: str):
         self.path = path
 
@@ -14,7 +13,6 @@ class EventContext(Jsonable, CanInputMixin):
 
     def _to_binding_config(self) -> Dict:
         return {
-            "type": self._TYPE,
             "path": self.path,
         }
 
@@ -34,6 +32,9 @@ class EventContext(Jsonable, CanInputMixin):
     def target_value():
         return EventContext(":e => e.target.value")
 
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.EventContext
+
 
 class DatasetEventContext(Jsonable, CanInputMixin):
     def __init__(self, event_context: EventContext) -> None:
@@ -47,3 +48,6 @@ class DatasetEventContext(Jsonable, CanInputMixin):
 
     def _to_json_dict(self):
         return self._event_context._to_json_dict()
+
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.EventContext

instaui/vars/js_computed.py

@@ -4,6 +4,7 @@ import typing
 from instaui.common.jsonable import Jsonable
 
 from instaui.runtime._app import get_current_scope
+from instaui.vars._types import InputBindingType
 from instaui.vars.path_var import PathVar
 from instaui.vars.mixin_types.var_type import VarMixin
 from instaui.vars.mixin_types.element_binding import ElementBindingMixin
@@ -44,8 +45,6 @@ class JsComputed(
         ui.label(plus_one)
     """
 
-    BIND_TYPE = "var"
-
     def __init__(
         self,
         *,
@@ -69,7 +68,6 @@ class JsComputed(
 
     def __to_binding_config(self):
         return {
-            "type": self.BIND_TYPE,
             "id": self.__register_info.var_id,
             "sid": self.__register_info.scope_id,
         }
@@ -92,7 +90,6 @@ class JsComputed(
     def _to_json_dict(self):
         data = super()._to_json_dict()
 
-        data["sid"] = self.__register_info.scope_id
         data["id"] = self.__register_info.var_id
 
         if self._inputs:
@@ -112,5 +109,8 @@ class JsComputed(
 
         return data
 
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.Ref
+
 
 TJsComputed = JsComputed

instaui/vars/mixin_types/py_binding.py

@@ -1,4 +1,6 @@
 from abc import ABC, abstractmethod
+from typing import Sequence
+from instaui.vars._types import InputBindingType, OutputSetType
 
 
 class CanInputMixin(ABC):
@@ -6,8 +8,46 @@ class CanInputMixin(ABC):
     def _to_input_config(self):
         pass
 
+    @abstractmethod
+    def _to_event_input_type(self) -> InputBindingType:
+        pass
+
 
 class CanOutputMixin(ABC):
     @abstractmethod
     def _to_output_config(self):
         pass
+
+    @abstractmethod
+    def _to_event_output_type(self) -> OutputSetType:
+        pass
+
+
+def inputs_to_config(inputs: Sequence[CanInputMixin]):
+    return [
+        {
+            "value": input._to_input_config()
+            if isinstance(input, CanInputMixin)
+            else input,
+            "type": input._to_event_input_type().value
+            if isinstance(input, CanInputMixin)
+            else InputBindingType.Data.value,
+        }
+        for input in inputs
+    ]
+
+
+def outputs_to_config(outputs: Sequence[CanOutputMixin]):
+    return [
+        {
+            "ref": ref._to_output_config(),
+            "type": ref._to_event_output_type().value,
+        }
+        for ref in outputs
+    ]
+
+
+def _assert_outputs_be_can_output_mixin(outputs: Sequence):
+    for output in outputs:
+        if not isinstance(output, CanOutputMixin):
+            raise TypeError("The outputs parameter must be a `ui.state`")

instaui/vars/path_var.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 from abc import abstractmethod
 from typing import List, Optional, Union
 from typing_extensions import Self
+from instaui.vars._types import InputBindingType, OutputSetType
 from instaui.vars.mixin_types.pathable import PathableMixin, CanPathPropMixin
 from instaui.vars.mixin_types.element_binding import ElementBindingMixin
 from instaui.vars.mixin_types.py_binding import CanInputMixin, CanOutputMixin
@@ -88,3 +89,9 @@ class PathTrackerBindable(
             ]
 
         return data
+
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.Ref
+
+    def _to_event_output_type(self) -> OutputSetType:
+        return OutputSetType.Ref

instaui/vars/ref.py

@@ -10,6 +10,7 @@ from typing import (
 
 from instaui.common.jsonable import Jsonable
 from instaui.runtime._app import get_current_scope
+from instaui.vars._types import InputBindingType, OutputSetType
 from instaui.vars.path_var import PathVar
 
 from .mixin_types.var_type import VarMixin
@@ -53,7 +54,6 @@ class Ref(
 
     def __to_binding_config(self):
         return {
-            "type": self.VAR_TYPE,
             "id": self.__register_info.var_id,
             "sid": self.__register_info.scope_id,
         }
@@ -78,7 +78,6 @@ class Ref(
 
     def _to_json_dict(self):
         data = super()._to_json_dict()
-        data["sid"] = self.__register_info.scope_id
         data["id"] = self.__register_info.var_id
 
         if self._debounced is not None:
@@ -89,6 +88,12 @@ class Ref(
 
         return data
 
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.Ref
+
+    def _to_event_output_type(self) -> OutputSetType:
+        return OutputSetType.Ref
+
 
 TRef = Ref
 

instaui/vars/slot_prop.py

@@ -3,9 +3,8 @@ from typing import (
     Dict,
 )
 from instaui.common.jsonable import Jsonable
-
+from instaui.vars._types import InputBindingType
 from instaui.vars.path_var import PathVar
-
 from .mixin_types.py_binding import CanInputMixin
 from .mixin_types.element_binding import ElementBindingMixin
 from .mixin_types.pathable import CanPathPropMixin
@@ -18,29 +17,38 @@ class BindingSlotPropItem(
     CanInputMixin,
     CanPathPropMixin,
 ):
-    def __init__(self, slot_id: str, name: str) -> None:
+    def __init__(self, name: str, sid: str, var_id: str) -> None:
         super().__init__()
-        self.name = name
-        self._id = slot_id
+        self._name = name
+        self._sid = sid
+        self._id = var_id
+
+    def __to_binding_config(self):
+        data: Dict = {
+            "sid": self._sid,
+            "id": self._id,
+        }
+
+        return data
 
     def _to_element_binding_config(self):
-        return self._to_binding_config()
+        return self.__to_binding_config()
 
     def _to_input_config(self):
-        return self._to_binding_config()
+        return self.__to_binding_config()
 
     def _to_path_prop_binding_config(self) -> Dict:
-        return self._to_binding_config()
+        return self.__to_binding_config()
 
     def _to_pathable_binding_config(self) -> Dict:
-        return self._to_binding_config()
+        return self.__to_binding_config()
 
     def _to_json_dict(self):
-        data = super()._to_json_dict()
-        data["type"] = "sp"
-        data["id"] = self._id
+        data: Dict = {
+            "id": self._id,
+        }
 
         return data
 
-    def _to_binding_config(self) -> Dict:
-        return self._to_json_dict()
+    def _to_event_input_type(self) -> InputBindingType:
+        return InputBindingType.Ref

instaui/vars/state.py

@@ -1,6 +1,7 @@
 from typing import Dict, Tuple, TypeVar
 
 from instaui import ui
+from instaui.vars._types import InputBindingType, OutputSetType
 from instaui.vars.mixin_types.py_binding import CanInputMixin, CanOutputMixin
 from instaui.vars.mixin_types.observable import ObservableMixin
 from instaui.vars.mixin_types.element_binding import ElementBindingMixin
@@ -30,44 +31,54 @@ class RefProxy(
         self._ref_ = ui.ref(data, deep_compare=deep_compare)
         self._prop_names_ = set(data.keys()) if isinstance(data, dict) else set()
 
+    @property
+    def __ref_(self):
+        return super().__getattribute__("_ref_")
+
     def __getattribute__(self, name):
         if name not in super().__getattribute__("_prop_names_"):
             return super().__getattribute__(name)
 
-        return super().__getattribute__("_ref_")[name]
+        return self.__ref_[name]
 
     def __getitem__(self, name):
-        return super().__getattribute__("_ref_")[name]
+        return self.__ref_[name]
 
     def inverse(self):
-        return super().__getattribute__("_ref_").inverse()
+        return self.__ref_.inverse()
 
     def __add__(self, other: str):
-        return super().__getattribute__("_ref_") + other
+        return self.__ref_ + other
 
     def __radd__(self, other: str):
-        return other + super().__getattribute__("_ref_")
+        return other + self.__ref_
 
     def _to_element_binding_config(self) -> Dict:
-        return super().__getattribute__("_ref_")._to_element_binding_config()
+        return self.__ref_._to_element_binding_config()
 
     def _to_input_config(self):
-        return super().__getattribute__("_ref_")._to_input_config()
+        return self.__ref_._to_input_config()
 
     def _to_observable_config(self):
-        return super().__getattribute__("_ref_")._to_observable_config()
+        return self.__ref_._to_observable_config()
 
     def _to_path_prop_binding_config(self) -> Dict:
-        return super().__getattribute__("_ref_")._to_path_prop_binding_config()
+        return self.__ref_._to_path_prop_binding_config()
 
     def _to_output_config(self):
-        return super().__getattribute__("_ref_")._to_output_config()
+        return self.__ref_._to_output_config()
 
     def _to_str_format_binding(self, order: int) -> Tuple[str, str]:
-        return super().__getattribute__("_ref_")._to_str_format_binding(order)
+        return self.__ref_._to_str_format_binding(order)
 
     def _to_json_dict(self):
-        return super().__getattribute__("_ref_")._to_json_dict()
+        return self.__ref_._to_json_dict()
+
+    def _to_event_output_type(self) -> OutputSetType:
+        return self.__ref_._to_event_output_type()
+
+    def _to_event_input_type(self) -> InputBindingType:
+        return self.__ref_._to_event_input_type()
 
 
 class StateModel(BaseModel, Jsonable):