instaui 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

instaui/components/slot.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Dict, List, Optional, Set, Union
+from typing import TYPE_CHECKING, Dict, List, Optional, Set
 from instaui.common.jsonable import Jsonable
 from instaui.runtime import get_slot_stacks, pop_slot
 from instaui.runtime._app import get_app_slot
@@ -8,7 +8,6 @@ from instaui.vars.slot_prop import BindingSlotPropItem
 
 if TYPE_CHECKING:
     from instaui.components.component import Component
-    from instaui.components.vfor import VFor
 
 _DEFAULT_SLOT_NAME = ":"
 
@@ -50,7 +49,7 @@ class Slot(Jsonable):
 
         self._id: Optional[str] = None
         self._name = name
-        self._children: List[Union[Component, VFor]] = []
+        self._children: List[Component] = []
         self._props_use_name: Set[str] = set()
 
     def _has_props_use(self):

instaui/spa_router/_file_base_utils.py

@@ -3,7 +3,6 @@ from collections import deque
 from datetime import datetime
 import importlib.util
 from pathlib import Path
-import sys
 import typing
 from pydantic import BaseModel, Field
 import jinja2
@@ -13,29 +12,42 @@ import inspect
 def build_routes_from_files(
     folder_path: typing.Union[str, Path] = "pages",
     module_name: str = "_routes",
+    route_config_var_name: str = "_route_config",
 ):
-    folder_path = _utils.get_caller_path().parent / Path(folder_path)
-    root = _model_utils.create_root(folder_path, module_name)
+    global_args = _GlobalArgs(
+        base_folder_path=_utils.get_caller_path().parent / Path(folder_path),
+        module_name=module_name,
+        route_config_var_name=route_config_var_name,
+    )
+
+    root = _model_utils.create_root(global_args)
     _code_gen.generate_router_file(root)
 
-    print(f"Build _routes from files in {folder_path}...")
-    # _module_utils.reload_module_from_folder(folder_path, module_name)
+    print(f"Build _routes from files in {global_args.base_folder_path}...")
+
+
+class _GlobalArgs(BaseModel):
+    base_folder_path: Path
+    module_name: str
+    route_config_var_name: str
 
 
 class _model_utils:
     class FileRouteInfo(BaseModel):
         file: Path
         base_folder: Path
+        global_args: _GlobalArgs
         children: typing.List[_model_utils.FileRouteInfo] = []
-
         path: str = Field(init=False, default="")
         name: str = Field(init=False, default="")
         fn_path: typing.Optional[str] = Field(init=False, default=None)
 
         params: str = Field(init=False, default="")
+        meta: typing.Dict = Field(init=False, default={})
 
         def model_post_init(self, __context) -> None:
             self.params = self._extract_params()
+            self.meta = self._extract_meta()
             self.path, self.name = self._extra_path_name()
 
             if self.file.is_file():
@@ -46,14 +58,15 @@ class _model_utils:
         def is_index_file(self):
             return self.file.is_file() and self.file.stem == "index"
 
-        def change_index(self, index_info: _model_utils.FileRouteInfo):
+        def change_sync_index_info(self, index_info: _model_utils.FileRouteInfo):
             self.fn_path = index_info.fn_path
             self.path = self.path + index_info.params
+            self.meta = index_info.meta
 
         def _extract_params(self):
             if self.file.is_file():
                 route_config = _module_utils.get_module_getter(self.file)(
-                    "_route_config"
+                    self.global_args.route_config_var_name
                 )
                 if route_config:
                     if "params" in route_config:
@@ -61,6 +74,18 @@ class _model_utils:
 
             return ""
 
+        def _extract_meta(self):
+            if self.file.is_file():
+                route_config = _module_utils.get_module_getter(self.file)(
+                    self.global_args.route_config_var_name
+                )
+
+                if route_config:
+                    if "meta" in route_config:
+                        return route_config["meta"]
+
+            return {}
+
         def _extra_path_name(self):
             name_parts = list(
                 self.file.relative_to(self.base_folder).with_suffix("").parts
@@ -86,12 +111,12 @@ class _model_utils:
             if not self.fn_path:
                 return ""
 
-            return f"from .{self.fn_path} import main as {self.main_fn_name()}"
+            return f"from .{self.fn_path.replace(' ','_')} import main as {self.main_fn_name()}"
 
         def main_fn_name(self):
             if not self.fn_path:
                 return ""
-            return self.name.replace(".", "_")
+            return self.name.replace(".", "_").replace(" ", "_")
 
     class FileRouteRoot(BaseModel):
         folder: str
@@ -99,15 +124,17 @@ class _model_utils:
         infos: list[_model_utils.FileRouteInfo] = []
 
     @staticmethod
-    def create_root(folder: Path, module_name: str) -> FileRouteRoot:
-        base_folder = Path(folder)
-        infos = _model_utils._create_route_info(base_folder)
+    def create_root(global_args: _GlobalArgs) -> FileRouteRoot:
+        base_folder = Path(global_args.base_folder_path)
+        infos = _model_utils._create_route_info(base_folder, global_args)
         return _model_utils.FileRouteRoot(
-            folder=str(base_folder), module_name=module_name, infos=infos
+            folder=str(base_folder), module_name=global_args.module_name, infos=infos
         )
 
     @staticmethod
-    def _create_route_info(base_folder: Path) -> typing.List[FileRouteInfo]:
+    def _create_route_info(
+        base_folder: Path, global_args: _GlobalArgs
+    ) -> typing.List[FileRouteInfo]:
         result: typing.List[_model_utils.FileRouteInfo] = []
 
         stack: deque[
@@ -124,7 +151,7 @@ class _model_utils:
 
             if is_dir:
                 folder_info = _model_utils.FileRouteInfo(
-                    file=item, base_folder=base_folder
+                    file=item, base_folder=base_folder, global_args=global_args
                 )
                 infos = ((folder_info, path) for path in item.iterdir())
                 stack.extendleft(infos)
@@ -138,13 +165,15 @@ class _model_utils:
             if item.suffix != ".py":
                 continue
 
-            file_info = _model_utils.FileRouteInfo(file=item, base_folder=base_folder)
+            file_info = _model_utils.FileRouteInfo(
+                file=item, base_folder=base_folder, global_args=global_args
+            )
 
             if parent_info is None:
                 result.append(file_info)
             else:
                 if file_info.is_index_file():
-                    parent_info.change_index(file_info)
+                    parent_info.change_sync_index_info(file_info)
 
                 else:
                     parent_info.children.append(file_info)
@@ -200,30 +229,6 @@ class _code_gen:
 
 
 class _module_utils:
-    @staticmethod
-    def reload_module_from_folder(folder: Path, module_name: str):
-        module_file_path = folder / f"{module_name}.py"
-
-        if not module_file_path.exists():
-            raise FileNotFoundError(f"No such file: '{module_file_path}'")
-
-        package_name = module_file_path.parent.name
-        spec = importlib.util.spec_from_file_location(
-            module_name, str(module_file_path)
-        )
-        if spec is None:
-            raise ImportError(f"Failed to load module: '{module_name}'")
-
-        module = importlib.util.module_from_spec(spec)
-        module.__package__ = package_name
-
-        if module_name in sys.modules:
-            sys.modules[module_name] = module
-            importlib.reload(module)
-            return
-
-        spec.loader.exec_module(module)  # type: ignore
-
     @staticmethod
     def get_module_getter(path: Path):
         if not isinstance(path, Path):

instaui/spa_router/_route_model.py

@@ -17,31 +17,7 @@ class RouteItem(BaseModel):
     component_fn: typing.Optional[typing.Callable] = Field(exclude=True)
     scope: typing.Optional[Scope] = None
     vue_route_item: VueRouteItem = Field(serialization_alias="vueItem")
-
-    # def model_post_init(self, __context: typing.Any) -> None:
-    #     if self.component_fn is None and (not self.vue_route_item.path):
-    #         raise ValueError("Either component_fn or vue_route_item.path must be set")
-
-    #     if self.component_fn is None:
-    #         return None
-
-    #     if self.vue_route_item.path is None:
-    #         self.vue_route_item.path = f"/{'' if self.component_fn.__name__=='index' else self.component_fn.__name__}"
-
-    #     app = get_app_slot()
-
-    #     with new_scope(append_to_app=False) as scope:
-    #         with Div() as div:
-    #             self.component_fn()
-
-    #     app.items.pop()
-
-    #     self.scope = scope
-    #     self.vue_route_item.component = div._slot_manager.default._children
-
-    # @field_serializer("scope")
-    # def serialize_scope(self, value: Scope):
-    #     return dumps2dict(value)
+    meta: typing.Optional[typing.Dict] = None
 
     @model_serializer
     def model_ser(self):
@@ -80,6 +56,7 @@ class RouteItem(BaseModel):
         name: typing.Optional[str] = None,
         params: typing.Optional[typing.Dict[str, str]] = None,
         children: typing.Optional[typing.List[RouteItem]] = None,
+        meta: typing.Optional[typing.Dict] = None,
     ):
         """Create a new RouteItem
 
@@ -103,6 +80,7 @@ class RouteItem(BaseModel):
 
         return cls(
             component_fn=component_fn,
+            meta=meta,
             vue_route_item=VueRouteItem(
                 path=path,
                 name=name,

instaui/spa_router/templates/page_routes

@@ -21,6 +21,7 @@
     router.RouteItem.create(
         path="{{route.path}}", 
         name="{{route.name}}", 
+        meta = {{route.meta}},
         {{ render_fn_arg(route.main_fn_name()) |trim}}
         {{ render_children_arg(route.children) |trim}}
     ),

{instaui-0.1.0.dist-info → instaui-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: instaui
-Version: 0.1.0
+Version: 0.1.1
 Summary: insta-ui is a Python-based UI library for rapidly building user interfaces.
 License: MIT
 Author: CrystalWindSnake

{instaui-0.1.0.dist-info → instaui-0.1.1.dist-info}/RECORD

@@ -28,7 +28,7 @@ instaui/components/html/span.py,sha256=kPqXHckL0YRWzV84ze4mAcKZPbmvalqDFtiwez_Lb
 instaui/components/html/ul.py,sha256=YbP2kH0Utlwr194uvVlCNQk1Xfl-5O24nVsDHSM0dqg,545
 instaui/components/match.py,sha256=B3wV1h-SkvYnX8RiMObdM2tfJb8nW2gjFxXQvNeZWWM,2774
 instaui/components/row.py,sha256=dvLbVmXFgigBZo1OKK6fFyJdrYHPms5-EZ11PVPD23I,388
-instaui/components/slot.py,sha256=M_hmeje3EGv2r_GmcjW1y6qdpiEysaGjjTi6K-YtDM4,2353
+instaui/components/slot.py,sha256=RT0eU7wH7ffFDkl5ucfrNXB1nbsKDq688Hp920TZaoo,2287
 instaui/components/transition_group.py,sha256=H9zx9NTlCoQnBArWfmxmh7CMKb5hZn8vKrFe4OFxPrE,201
 instaui/components/value_element.py,sha256=Y10W4Hus-k-Og2ft2noBdVqF_Hq3x54vFdVvi1Tlf_I,1236
 instaui/components/vfor.py,sha256=hPkTk8sBVXRodmIu-9aXugrxK-AlexkiG3mP1KmYbXQ,4015
@@ -76,15 +76,15 @@ instaui/settings/__settings.py,sha256=DWzRvs9bBqjoNA2MvGAyz3GRrSV8H6lMLF1H3iJyoy
 instaui/skip.py,sha256=uqhqusgeChVoivKFMoZd-XePYrlSoLvUzRZDBcUgFmA,149
 instaui/spa_router/__init__.py,sha256=DGSf0YD6wZFj22kmPSyJWUmm_Lx3_YFg32iOa096T7Y,519
 instaui/spa_router/_components.py,sha256=vPo4JuRtbD_5ll0LkGwU1p8l_pxNfCSdFLDzMXsoEpw,896
-instaui/spa_router/_file_base_utils.py,sha256=ddhkLVHuhxWsgLhOa62oxaQ-1swZzoTE630Ux6INsLs,8506
+instaui/spa_router/_file_base_utils.py,sha256=jcT9QoNu_ILhoI3JYhEA2JvINOg3PgWFa0d0IgysAa8,8697
 instaui/spa_router/_functions.py,sha256=j0ga2dq1q5JdPiUtOUS9KaRyvjm0Kmgf_HXYVVLcqvo,3226
 instaui/spa_router/_install.py,sha256=X9p7wtuGxo6B5F47UTY4ndOSRzENXkoK1XdkNo3F_YA,291
-instaui/spa_router/_route_model.py,sha256=4O8jasS-uIZncmvNCF4KDKQjDOWdZAWn_b_JRYn88R0,4834
+instaui/spa_router/_route_model.py,sha256=Vua-xnk2AgHwTz4jBiPSL_3QOLKzX3cFCUDlJHE_mxY,4056
 instaui/spa_router/_router_box.py,sha256=Ez0vWWEYH_FHuFDvcAVhhfrlMRnDpT0_7tjmMZRMWZg,1163
 instaui/spa_router/_router_output.py,sha256=Nc6N8yO_9IrUbaYbPZMkOX_9VlwBKzyXMahaPp5GFGg,528
 instaui/spa_router/_router_param_var.py,sha256=KCy54xBZxGMqLO3Zlbzr6XV8ts-M6jCOKunL2gz5IUc,1455
 instaui/spa_router/_types.py,sha256=KuGuv5C6qivwllfdmV5qrvM0S_GWJ6u8OOTkCNmJImU,81
-instaui/spa_router/templates/page_routes,sha256=vX9OWoonvo6BP1pDWZeOPOsfzx1hIAADI46zomDgtGw,1323
+instaui/spa_router/templates/page_routes,sha256=8VjM_8f6pjFb01QbU9z5HNqpcNRdCiX3X0OqNHLq8fo,1355
 instaui/static/insta-ui.css,sha256=B0xrNK9qVoRwRXhnTT8OascdHFeUk7vtfr7VhoA23_Y,297
 instaui/static/insta-ui.esm-browser.prod.js,sha256=gz3EFnwRRXx3F1t4Fp4fikkr0kjAWZ1xICdBuOnslGw,104366
 instaui/static/insta-ui.iife.js,sha256=JhloLLlMG3D7s6LTpcV9K7f42khfd8ZjzUl1uMR2DEY,71856
@@ -146,7 +146,7 @@ instaui/watch/vue_watch.py,sha256=n6yVt2ruKCjx-ZnIb29ytN9ugDas1JpUBOJeQ_FSYAA,15
 instaui/watch/web_watch.py,sha256=Gl0AZ9ji_A7tAoqsvyHmBOAYaX1CHxowVONlZKy8nd8,3763
 instaui/zero/__init__.py,sha256=N0LuRUAcaurxHSspcEDuwZg62W2S3qL4VtrMKxOivBE,49
 instaui/zero/scope.py,sha256=i4RqD1doMvyrAwQY3NpdPbMaIGbZE2crV3VZyj1k0VA,204
-instaui-0.1.0.dist-info/LICENSE,sha256=_JjnAWrikJ6qkwT7PazeFNRlcIu8q_RH3mYcHTxEF5c,1094
-instaui-0.1.0.dist-info/METADATA,sha256=tV2oibtubxE0YIEyzkpscRXo8VpbFTVI7LrlwEeYOWU,3474
-instaui-0.1.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-instaui-0.1.0.dist-info/RECORD,,
+instaui-0.1.1.dist-info/LICENSE,sha256=_JjnAWrikJ6qkwT7PazeFNRlcIu8q_RH3mYcHTxEF5c,1094
+instaui-0.1.1.dist-info/METADATA,sha256=6M12PNmMvDs2Gv4vzBoluCXls_EejCvohpPfkYbx8Pw,3474
+instaui-0.1.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+instaui-0.1.1.dist-info/RECORD,,