PyPI - instaui - Versions diffs - 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl - Mend

instaui 0.1.0py3-none-any.whl → 0.1.2py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

instaui/components/component.py +1 -1
instaui/components/element.py +37 -17
instaui/components/html/checkbox.py +0 -7
instaui/components/slot.py +2 -3
instaui/components/vfor.py +1 -1
instaui/dependencies/component_dependency.py +16 -0
instaui/dependencies/plugin_dependency.py +28 -0
instaui/fastapi_server/debug_mode_router.py +0 -1
instaui/fastapi_server/dependency_router.py +21 -0
instaui/fastapi_server/resource.py +35 -0
instaui/fastapi_server/server.py +124 -100
instaui/html_tools.py +12 -106
instaui/page_info.py +1 -11
instaui/runtime/_app.py +9 -20
instaui/runtime/resource.py +11 -46
instaui/spa_router/_file_base_utils.py +47 -42
instaui/spa_router/_route_model.py +3 -25
instaui/spa_router/templates/page_routes +1 -0
instaui/static/insta-ui.esm-browser.prod.js +3663 -3663
instaui/static/insta-ui.iife.js +29 -29
instaui/static/templates/web.html +32 -76
instaui/static/templates/zero.html +48 -32
instaui/systems/file_system.py +0 -9
instaui/template/web_template.py +40 -46
instaui/template/zero_template.py +100 -15
instaui/ui/__init__.py +2 -5
instaui/ui_functions/ui_page.py +3 -18
instaui/vars/path_var.py +2 -1
instaui/zero/func.py +111 -0
instaui/zero/scope.py +12 -1
{instaui-0.1.0.dist-info → instaui-0.1.2.dist-info}/METADATA +1 -1
{instaui-0.1.0.dist-info → instaui-0.1.2.dist-info}/RECORD +34 -33
instaui/dependencies/__init__.py +0 -15
instaui/dependencies/component_registrar.py +0 -82
instaui/dependencies/installer.py +0 -5
instaui/fastapi_server/config_router.py +0 -60
{instaui-0.1.0.dist-info → instaui-0.1.2.dist-info}/LICENSE +0 -0
{instaui-0.1.0.dist-info → instaui-0.1.2.dist-info}/WHEEL +0 -0

instaui/static/templates/zero.html CHANGED Viewed

@@ -1,55 +1,71 @@
+{% from 'debug/sse.html' import sse_style, sse_script,sse_html -%}
 <!doctype html>
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link href="{{ favicon_url }}" rel="shortcut icon" />
-  <title>{{ title }}</title>
+  <link href="{{ model.favicon_url }}" rel="shortcut icon" />
+  <title>{{ model.title }}</title>
-  {% for link in css_links %}
-  <link rel="stylesheet" href="{{ prefix | safe }}{{link}}" />
+  {%- for link in model.css_links %}
+  <link rel="stylesheet" href="{{ model.prefix | safe }}{{link}}" />
   {% endfor -%}
-  {% for content in style_tags %}
+  {%- for content in model.style_tags %}
   <style>{{content}}</style>
   {% endfor -%}
 </head>
 <body>
   <div id="app">
-    <insta-ui :config="appConfig"></insta-ui>
+    <insta-ui :config="config"></insta-ui>
   </div>
-  {% for info in js_links %}
-  <script src="{{ prefix | safe }}{{info.link}}" {{info.create_attrs_str()}}></script>
-  {% endfor -%}
+  <script type="importmap">
+  {
+  "imports":{{model.import_maps_string | safe}}
+  }
+  </script>
-  {% for content in script_tags %}
+  {%- for info in model.js_links -%}
+  <script src="{{ model.prefix | safe }}{{info.link}}"></script>
+  {%- endfor -%}
+  {%- for content in model.script_tags -%}
   <script>{{content}}</script>
-  {% endfor -%}
+  {%- endfor -%}
+  <script type="module">
+    import { createApp } from 'vue'
+    import installInsta from 'instaui'
+    const True = true;
+    const False = false;
+    const None = undefined;
+    const appConfig = {{model.config_dict | safe}};
+    const app = createApp({
+      setup() {
+        return {
+          config:appConfig
+        }
+      }
+    })
-  <script>
-      const True = true;
-      const False = false;
-      const None = undefined;
-      const { createApp } = Vue
-      const insta = InstaUI
-      const appConfig = {{appConfig}}
-      const app = createApp({
-          setup() {
-              return {
-                  appConfig
-              }
-          }
-      })
-      insta(app,appConfig)
-      {% for info in vue_app_use %}
-      app.use({{info.name}})
-      {% endfor %}
-      app.mount('#app')
+    installInsta(app, appConfig)
+    {% for info in model.vue_app_component -%}
+    app.component('{{info.name | safe}}',(await import('{{info.url | safe }}')).default)
+    {% endfor -%}
+    {% for plugin_url in model.vue_app_use -%}
+    app.use(await import('{{plugin_url | safe }}'))
+    {% endfor -%}
+    app.mount('#app')
   </script>
 </body>
 </html>

instaui/systems/file_system.py CHANGED Viewed

@@ -1,17 +1,8 @@
 import uuid
 from pathlib import Path
-from urllib.parse import quote as urllib_quote
 def generate_hash_name_from_path(file_path: Path):
     path_str = str(file_path)
     unique_id = uuid.uuid5(uuid.NAMESPACE_URL, path_str)
     return str(unique_id)
-def generate_static_url_from_file_path(file_path: Path):
-    file_path = Path(file_path).resolve()
-    return urllib_quote(
-        f"/_instaui/static/{generate_hash_name_from_path(file_path)}/{file_path.name}"
-    )

instaui/template/web_template.py CHANGED Viewed

@@ -1,55 +1,49 @@
 from __future__ import annotations
-from typing import Any, Dict, Optional
+import typing
+from dataclasses import dataclass, field
 from .env import env
 from instaui.common.jsonable import dumps
-from instaui.runtime import get_app_slot
 from instaui.runtime.context import get_context
+from instaui.runtime.dataclass import JsLink, VueAppComponent
 _html_template = env.get_template("web.html")
-def render_web_html(
-    *,
-    config_json: Optional[str] = None,
-    config_fetch_url: Optional[str] = None,
-    config_fetch_key: Optional[str] = None,
-    query_path_params: Optional[str] = None,
-    query_params: Optional[Dict] = None,
-    query_path: Optional[str] = None,
-    page_loadding_json: Optional[str] = None,
-    prefix: Any = "",
-) -> str:
-    if config_json is None and config_fetch_url is None:
-        raise ValueError("Either config_json or config_fetch_url must be provided")
-    is_remote_config = config_fetch_url is not None
-    has_preload = page_loadding_json is not None
-    system_slot = get_app_slot()
-    resources = system_slot._html_resource
-    context = get_context()
-    return _html_template.render(
-        {
-            "is_debug": context.debug_mode,
-            "css_links": list(resources._css_links.keys()),
-            "style_tags": resources._style_tags,
-            "js_links": resources._js_links,
-            "script_tags": resources._script_tags,
-            "vue_app_use": list(resources._vue_app_use),
-            "vue_app_component": list(resources._vue_app_components),
-            "import_maps": dumps(resources._import_maps),
-            "config_fetch_url": config_fetch_url,
-            "config_fetch_key": config_fetch_key,
-            "query_path": query_path,
-            "query_path_params": query_path_params,
-            "query_params": query_params,
-            "config_json": config_json,
-            "is_remote_config": is_remote_config,
-            "has_preload": has_preload,
-            "preload_json": page_loadding_json,
-            "title": resources.title,
-            "prefix": prefix,
+@dataclass
+class WebTemplateModel:
+    vue_js_link: str
+    instaui_js_link: str
+    config_dict: typing.Dict[str, typing.Any] = field(default_factory=dict)
+    extra_import_maps: typing.Dict[str, str] = field(default_factory=dict)
+    css_links: typing.List[str] = field(default_factory=list)
+    style_tags: typing.List[str] = field(default_factory=list)
+    js_links: typing.List[JsLink] = field(default_factory=list)
+    script_tags: typing.List[str] = field(default_factory=list)
+    vue_app_use: typing.List[str] = field(default_factory=list)
+    vue_app_component: typing.List[VueAppComponent] = field(default_factory=list)
+    prefix: str = ""
+    title: str = ""
+    favicon_url: str = ""
+    def add_extra_import_map(self, name: str, url: str):
+        self.extra_import_maps[name] = url
+    @property
+    def import_maps_string(self):
+        data = {
+            **self.extra_import_maps,
+            "vue": self.vue_js_link,
+            "instaui": self.instaui_js_link,
         }
-    )
+        return dumps(data)
+    @property
+    def is_debug(self):
+        context = get_context()
+        return context.debug_mode
+def render_web_html(model: WebTemplateModel):
+    return _html_template.render(model=model)

instaui/template/zero_template.py CHANGED Viewed

@@ -1,24 +1,109 @@
 from __future__ import annotations
-from typing import Any
+import typing
+from pathlib import Path
+from urllib.parse import quote
+import base64
+from dataclasses import dataclass, field
 from .env import env
-from instaui.runtime import get_app_slot
+from instaui.common.jsonable import dumps
+from instaui.runtime.dataclass import JsLink
+_TCodeOrPath = typing.Union[str, Path]
+_JS_PREFIX = "data:text/javascript;charset=utf-8"
+_CSS_PREFIX = "data:text/css;charset=utf-8"
+_ICON_PREFIX = "data:image/x-icon;base64"
 _html_template = env.get_template("zero.html")
-def render_zero_html(config_json: str = "{}", prefix: Any = "") -> str:
-    resources = get_app_slot()._html_resource
+@dataclass(frozen=True)
+class ZeroVueAppComponent:
+    name: str
+    url: _TCodeOrPath
-    return _html_template.render(
-        {
-            "css_links": list(resources._css_links.keys()),
-            "style_tags": resources._style_tags,
-            "js_links": resources._js_links,
-            "script_tags": resources._script_tags,
-            "vue_app_use": list(resources._vue_app_use),
-            "appConfig": config_json,
-            "title": resources.title,
-            "prefix": prefix,
+@dataclass
+class ZeroTemplateModel:
+    vue_js_code: _TCodeOrPath
+    instaui_js_code: _TCodeOrPath
+    config_dict: typing.Dict[str, typing.Any] = field(default_factory=dict)
+    extra_import_maps: typing.Dict[str, _TCodeOrPath] = field(default_factory=dict)
+    css_links: typing.List[_TCodeOrPath] = field(default_factory=list)
+    style_tags: typing.List[str] = field(default_factory=list)
+    js_links: typing.List[JsLink] = field(default_factory=list)
+    script_tags: typing.List[str] = field(default_factory=list)
+    vue_app_use: typing.List[str] = field(default_factory=list)
+    vue_app_component: typing.List[ZeroVueAppComponent] = field(default_factory=list)
+    prefix: str = ""
+    title: str = ""
+    favicon_url: typing.Optional[_TCodeOrPath] = None
+    def add_extra_import_map(self, name: str, url: _TCodeOrPath):
+        self.extra_import_maps[name] = url
+    @property
+    def import_maps_string(self):
+        data = {
+            **self.extra_import_maps,
+            "vue": self.vue_js_code,
+            "instaui": self.instaui_js_code,
+        }
+        return dumps(data)
+    def normalize_path_with_self(self):
+        self.vue_js_code = self._normalize_path_to_dataurl(self.vue_js_code, _JS_PREFIX)
+        self.instaui_js_code = self._normalize_path_to_dataurl(
+            self.instaui_js_code, _JS_PREFIX
+        )
+        self.css_links = [
+            self._normalize_path_to_dataurl(link, _CSS_PREFIX)
+            for link in self.css_links
+        ]
+        self.js_links = [
+            JsLink(
+                link=self._normalize_path_to_dataurl(link.link, _JS_PREFIX),
+                attrs=link.attrs,
+            )
+            for link in self.js_links
+        ]
+        self.extra_import_maps = {
+            k: self._normalize_path_to_dataurl(v, _JS_PREFIX)
+            for k, v in self.extra_import_maps.items()
         }
-    )
+        self.vue_app_component = [
+            ZeroVueAppComponent(
+                name=component.name,
+                url=self._normalize_path_to_dataurl(component.url, _JS_PREFIX),
+            )
+            for component in self.vue_app_component
+        ]
+        self.favicon_url = (
+            self._normalize_path_to_base64_url(self.favicon_url, _ICON_PREFIX)
+            if self.favicon_url is not None
+            else None
+        )
+    @staticmethod
+    def _normalize_path_to_dataurl(path: typing.Union[str, Path], prefix: str):
+        if isinstance(path, Path):
+            path = path.read_text(encoding="utf-8")
+        return f"{prefix},{quote(path)}"
+    @staticmethod
+    def _normalize_path_to_base64_url(path: typing.Union[str, Path], prefix: str):
+        if isinstance(path, Path):
+            path = path.read_text(encoding="utf-8")
+        return f"{prefix},{base64.b64encode(path.encode('utf-8')).decode('utf-8')}"
+def render_zero_html(model: ZeroTemplateModel) -> str:
+    model.normalize_path_with_self()
+    return _html_template.render(model=model)

instaui/ui/__init__.py CHANGED Viewed

@@ -12,16 +12,15 @@ from instaui.vars.vfor_item import TVForItem, TVForIndex
 from instaui.vars.element_ref import ElementRef as element_ref, run_element_method
 from instaui.html_tools import (
     to_json,
-    to_html,
     add_css_link,
     add_js_link,
     add_style,
     add_js_code,
     add_vue_app_use,
     to_config_data,
+    use_tailwind,
 )
 from instaui.components.element import Element as element
 from instaui.components.row import Row as row
 from instaui.components.column import Column as column
@@ -31,7 +30,6 @@ from instaui.components.vfor import VFor as vfor
 from instaui.components.vif import VIf as vif
 from instaui.components.match import Match as match
 from instaui.components.content import Content as content
-from instaui.dependencies import install_component
 from instaui.event.web_event import ui_event as event, WebEvent as TEventFn
 from instaui.event.js_event import js_event
@@ -83,7 +81,6 @@ __all__ = [
     "element_ref",
     "run_element_method",
     "to_json",
-    "to_html",
     "to_config_data",
     "element",
     "vfor",
@@ -93,7 +90,7 @@ __all__ = [
     "add_js_code",
     "add_js_link",
     "add_vue_app_use",
-    "install_component",
+    "use_tailwind",
     "directive",
     "vif",
     "page",

instaui/ui_functions/ui_page.py CHANGED Viewed

@@ -1,31 +1,16 @@
-import inspect
-from typing import Callable, Optional
+from typing import Callable
 from instaui.launch_collector import get_launch_collector, PageInfo
-def page(
-    url: str,
-    *,
-    page_loading: Optional[Callable] = None,
-    use_tailwind: Optional[bool] = None,
-):
+def page(url: str):
     """Register a page route.
     Args:
         url (str): The route URL.
-        page_loading (Optional[Callable], optional): Function to display a preload interface for the page. Defaults to None.
-        use_tailwind (Optional[bool], optional): Whether to use tailwind or not. Defaults to None(not use tailwind).
-    Raises:
-        ValueError:  if page_loading_fn is a coroutine function
     """
-    if page_loading is not None and inspect.iscoroutinefunction(page_loading):
-        raise ValueError("page_loading_fn must be a synchronous function")
     def wrapper(func: Callable):
-        get_launch_collector().register_page(
-            PageInfo(url, func, page_loading, use_tailwind=use_tailwind)
-        )
+        get_launch_collector().register_page(PageInfo(url, func))
         return func
     return wrapper

instaui/vars/path_var.py CHANGED Viewed

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from abc import abstractmethod
-from typing import List, Optional, Union, Self
+from typing import List, Optional, Union
+from typing_extensions import Self
 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

instaui/zero/func.py ADDED Viewed

@@ -0,0 +1,111 @@
+from __future__ import annotations
+import itertools
+from pathlib import Path
+from typing import Union
+import instaui.consts as consts
+from instaui.runtime._app import get_app_slot, get_default_app_slot
+from instaui.template import render_zero_html
+from instaui.template import zero_template
+from instaui.html_tools import to_config_data
+from instaui.runtime.dataclass import JsLink
+def to_html(file: Union[str, Path]):
+    if isinstance(file, str):
+        import inspect
+        frame = inspect.currentframe().f_back  # type: ignore
+        assert frame is not None
+        script_file = inspect.getfile(frame)
+        file = Path(script_file).parent.joinpath(file)
+    file = Path(file)
+    raw = to_html_str()
+    file.write_text(raw, "utf8")
+    return file.resolve().absolute()
+def to_html_str():
+    system_slot = get_app_slot()
+    default_app_slot = get_default_app_slot()
+    html_resource = system_slot._html_resource
+    default_html_resource = default_app_slot._html_resource
+    config_data = to_config_data()
+    model = zero_template.ZeroTemplateModel(
+        vue_js_code=consts.VUE_ES_JS_PATH,
+        instaui_js_code=consts.APP_ES_JS_PATH,
+        css_links=[
+            consts.APP_CSS_PATH,
+        ],
+        config_dict=config_data,
+    )
+    if html_resource.use_tailwind is None:
+        if default_html_resource.use_tailwind:
+            model.js_links.append(JsLink(consts.TAILWIND_JS_PATH))
+    else:
+        if html_resource.use_tailwind:
+            model.js_links.append(JsLink(consts.TAILWIND_JS_PATH))
+    # register custom components
+    for component in system_slot._component_dependencies:
+        if not component.esm:
+            continue
+        model.vue_app_component.append(
+            zero_template.ZeroVueAppComponent(
+                name=component.tag_name,
+                url=component.esm,
+            )
+        )
+        if component.css:
+            for css_link in component.css:
+                model.css_links.append(css_link)
+    # register custom plugins
+    for plugin in set(
+        itertools.chain(
+            system_slot._plugin_dependencies, default_app_slot._plugin_dependencies
+        )
+    ):
+        if not plugin.esm:
+            continue
+        model.vue_app_use.append(plugin.name)
+        model.add_extra_import_map(plugin.name, plugin.esm)
+        if plugin.css:
+            for css_link in plugin.css:
+                model.css_links.append(css_link)
+    # css file link to web static link
+    for link, attrs in itertools.chain(
+        html_resource._css_links.items(), default_html_resource._css_links.items()
+    ):
+        if isinstance(link, Path):
+            model.css_links.append(link)
+    # js file link to web static link
+    for info in itertools.chain(
+        html_resource._js_links, default_html_resource._js_links
+    ):
+        if isinstance(info.link, Path):
+            model.js_links.append(JsLink(info.link))
+    for js_code in itertools.chain(
+        html_resource._script_tags, default_html_resource._script_tags
+    ):
+        model.script_tags.append(js_code)
+    for sylte_code in itertools.chain(
+        html_resource._style_tags, default_html_resource._style_tags
+    ):
+        model.style_tags.append(sylte_code)
+    return render_zero_html(model)

instaui/zero/scope.py CHANGED Viewed

@@ -1,9 +1,20 @@
+from pathlib import Path
+from typing import Union
 from instaui.runtime import new_app_slot, reset_app_slot
 from contextlib import contextmanager
+from .func import to_html, to_html_str
 @contextmanager
 def scope():
     token = new_app_slot("zero")
-    yield
+    yield Wrapper()
     reset_app_slot(token)
+class Wrapper:
+    def to_html(self, file: Union[str, Path]):
+        return to_html(file)
+    def to_html_str(self):
+        return to_html_str()

{instaui-0.1.0.dist-info → instaui-0.1.2.dist-info}/METADATA RENAMED Viewed

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

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

instaui 0.1.0py3-none-any.whl → 0.1.2py3-none-any.whl