hyperflask 0.6.0__tar.gz → 0.7.1__tar.gz

{hyperflask-0.6.0 → hyperflask-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperflask
-Version: 0.6.0
+Version: 0.7.1
 Summary: Full stack web framework
 Author: Maxime Bouroumeau-Fuseau
 Author-email: Maxime Bouroumeau-Fuseau <maxime.bouroumeau@gmail.com>
@@ -28,7 +28,7 @@ Requires-Dist: html-sanitizer~=2.6
 Requires-Dist: htmx-flask~=0.1
 Requires-Dist: jinja-layout~=0.5
 Requires-Dist: jinja-wtforms~=0.2
-Requires-Dist: periodiq~=0.13
+Requires-Dist: periodiq~=0.14
 Requires-Dist: python-slugify~=8.0.4
 Requires-Dist: watchdog>=6.0.0
 Requires-Dist: pillow>=11.3.0
@@ -114,6 +114,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 1. Create your project directory: `mkdir example-project && cd example-project`
 2. Create and activate a virtualenv: `python -m venv .venv && source .venv/bin/activate`
 3. `pip install hyperflask`
-5. Run `npm install esbuild tailwindcss @tailwindcss/cli htmx.org htmx-ext-sse bootstrap-icons daisyui`
+5. Run `npm install esbuild tailwindcss @tailwindcss/cli htmx.org@4 bootstrap-icons daisyui`
 4. Run `mkdir pages && echo "Hello world" > pages/index.jpy`
 6. Start a development server using `hyperflask dev`

{hyperflask-0.6.0 → hyperflask-0.7.1}/README.md

@@ -76,6 +76,6 @@ A good part of these extensions is developed as part of the Hyperflask project.
 1. Create your project directory: `mkdir example-project && cd example-project`
 2. Create and activate a virtualenv: `python -m venv .venv && source .venv/bin/activate`
 3. `pip install hyperflask`
-5. Run `npm install esbuild tailwindcss @tailwindcss/cli htmx.org htmx-ext-sse bootstrap-icons daisyui`
+5. Run `npm install esbuild tailwindcss @tailwindcss/cli htmx.org@4 bootstrap-icons daisyui`
 4. Run `mkdir pages && echo "Hello world" > pages/index.jpy`
 6. Start a development server using `hyperflask dev`

{hyperflask-0.6.0 → hyperflask-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperflask"
-version = "0.6.0"
+version = "0.7.1"
 description = "Full stack web framework"
 authors = [
     {"name" = "Maxime Bouroumeau-Fuseau", email = "maxime.bouroumeau@gmail.com"}
@@ -33,15 +33,12 @@ dependencies = [
     "htmx-flask ~=0.1",
     "jinja-layout ~=0.5",
     "jinja-wtforms ~=0.2",
-    "periodiq ~=0.13",
+    "periodiq ~=0.14",
     "python-slugify ~=8.0.4",
     "watchdog>=6.0.0",
     "pillow>=11.3.0",
 ]
 
-[tool.uv.sources]
-periodiq = { git = "https://gitlab.com/bersace/periodiq" }
-
 [project.urls]
 Repository = "https://github.com/hyperflask/hyperflask"
 

{hyperflask-0.6.0 → hyperflask-0.7.1}/src/hyperflask/app.py

@@ -16,7 +16,7 @@ from flask_files import Files
 from flask_sqlorm import FlaskSQLORM
 from flask_mercure_sse import MercureSSE
 from flask_mailman_templates import MailTemplates
-from flask_suspense import Suspense, render_template, suspense_before_render_template, suspense_before_render_macros
+from flask_suspense import Suspense, render_template, suspense_before_render_template, suspense_after_render_macros
 #from flask_observability import Observability
 # 3rd party extensions
 from flask_wtf.csrf import CSRFProtect
@@ -82,7 +82,7 @@ class Hyperflask(Flask):
             "ALPINE": False,
             "STATIC_MODE": static_mode,
             "ASSETS_INCLUDE_ALPINE": False,
-            "HTMX_EXT": [],
+            "HTMX_CONFIG": {},
             "HTMX_BOOST_SITE": False,
             "MARKDOWN_OPTIONS": {"extensions": ["fenced_code", "nl2br", "attr_list", "admonition", "codehilite"]},
             "MARKDOWN_SANITIZER_CONFIG": {},
@@ -111,6 +111,8 @@ class Hyperflask(Flask):
         self.config["PAGES_MARKDOWN_OPTIONS"] = self.config["MARKDOWN_OPTIONS"]
         self.config["COLLECTIONS_MARKDOWN_OPTIONS"] = self.config["MARKDOWN_OPTIONS"]
         self.config["MAIL_TEMPLATES_MARKDOWN_OPTIONS"] = self.config["MARKDOWN_OPTIONS"]
+        # error responses are not swapped (only out of band swaps are processed)
+        self.config["HTMX_CONFIG"] = {"noSwap": [204, 304, "4xx", "5xx"], **self.config["HTMX_CONFIG"]}
 
         if self.config['SERVER_SECURED']:
             self.config.update({
@@ -244,10 +246,11 @@ class Hyperflask(Flask):
         def on_suspense_before_render_template(sender, **kwargs):
             csp_nonce() # we will need a nonce but the first call will be after the template started rendering
 
-        @suspense_before_render_macros.connect_via(self, weak=False)
-        def on_suspense_before_render_macros(sender, **kwargs):
-            return ""
-            return f'<script nonce="{csp_nonce()}">htmx.bootstrap()</script>' # waiting on PR 3441
+        @suspense_after_render_macros.connect_via(self, weak=False)
+        def on_suspense_after_render_macros(sender, **kwargs):
+            # process the content inserted by suspense macros during htmx requests
+            # (during full page loads, htmx is not loaded yet and processes the whole page once loaded)
+            return f'<script nonce="{csp_nonce()}">window.htmx?.process(document.body)</script>'
 
         @self.errorhandler(404)
         def not_found(error):

{hyperflask-0.6.0 → hyperflask-0.7.1}/src/hyperflask/components/core.py

@@ -100,13 +100,31 @@ class ComponentAdapter(BaseComponentAdapter):
 
 
 class PropsWrapper:
+    # Not a Mapping subclass on purpose: methods like items() or values() would shadow props
+    # with the same name since jinja tries getattr() first. keys() and __getitem__() are enough for **props.
     def __init__(self, props):
         self._props = props
 
     def __getattr__(self, name):
-        if name in self._props:
+        if not name.startswith("_") and name in self._props:
             return self._props[name]
-        raise Exception(f"No such prop: {name}")
+        # AttributeError lets jinja fall back to __getitem__ which makes missing props undefined
+        raise AttributeError(f"No such prop: {name}")
+
+    def __getitem__(self, name):
+        return self._props[name]
+
+    def __contains__(self, name):
+        return name in self._props
+
+    def __iter__(self):
+        return iter(self._props)
+
+    def __len__(self):
+        return len(self._props)
+
+    def keys(self):
+        return self._props.keys()
 
     def get(self, name, default=None):
         return self._props.get(name, default)

{hyperflask-0.6.0 → hyperflask-0.7.1}/src/hyperflask/layouts/web.html

@@ -5,14 +5,14 @@
         {% block head_metas %}
           {{ metadata_tags(page.get('metadata', {})) }}
         {% endblock %}
+        <meta name="htmx-config" content='{{ config["HTMX_CONFIG"]|tojson }}'>
         {% asset_tags(nonce=csp_nonce) %}
         {% block head_assets %}{% endblock %}
         {%- endblock %}
     </head>
     {% block body_tag -%}
     <body
-        {% if config["HTMX_EXT"] %}hx-ext="{{ ','.join(config['HTMX_EXT']) }}"{% endif %}
-        {% if config["HTMX_BOOST_SITE"] %}hx-boost="true"{% endif %}
+        {% if config["HTMX_BOOST_SITE"] %}hx-boost:inherited="true"{% endif %}
         {% block body_tag_attrs %}{% endblock %}
     >
     {%- endblock %}

hyperflask-0.7.1/src/hyperflask/static/app.js

@@ -0,0 +1,11 @@
+import htmx from "htmx.org";
+import "htmx.org/dist/ext/hx-sse.js";
+import "./htmx-exts";
+import "./app.css";
+
+window.htmx = htmx;
+export { htmx };
+
+if (window.Alpine) {
+    window.Alpine.start()
+}

hyperflask-0.7.1/src/hyperflask/static/htmx-exts.js

@@ -0,0 +1,186 @@
+import htmx from "htmx.org";
+
+function queryAll(root, selector) {
+  const elts = [...root.querySelectorAll(selector)];
+  if (root.matches(selector)) {
+    elts.unshift(root);
+  }
+  return elts;
+}
+
+htmx.registerExtension("hf-modal", {
+  htmx_before_process(root) {
+    for (const elt of queryAll(root, "[hf-modal]")) {
+      elt.setAttribute("hx-get", elt.getAttribute("hf-modal"));
+      elt.setAttribute("hx-target", "body");
+      elt.setAttribute("hx-swap", "beforeend");
+      if (!elt.hasAttribute("hx-disable")) {
+        elt.setAttribute("hx-disable", "this");
+      }
+    }
+  },
+  htmx_after_settle(target, detail) {
+    const triggerElement = detail.task.sourceElement;
+    if (detail.task.type !== "main" || !triggerElement?.hasAttribute("hf-modal")) return;
+    for (const dialog of detail.newContent) {
+      if (dialog.tagName !== "DIALOG") continue;
+      dialog.showModal();
+      const form = dialog.querySelector("form[hf-modal-form]");
+      if (form) {
+        form.setAttribute("hx-target", "closest dialog");
+        form.setAttribute("hx-swap", "delete");
+        form.setAttribute("hx-disable", "this");
+        if (!form.hasAttribute("action")) {
+          form.setAttribute("action", triggerElement.getAttribute("hf-modal"));
+        }
+        setTimeout(() => {
+          form.querySelector("input:not([type=hidden])")?.focus();
+        }, 100);
+      }
+    }
+  }
+});
+
+htmx.registerExtension("hx-bottom-scroll-on-trigger", {
+  htmx_after_process(root) {
+    for (const elt of queryAll(root, "[hx-bottom-scroll-on-trigger]")) {
+      if (elt._hfBottomScroll) continue;
+      elt._hfBottomScroll = true;
+      elt.scrollTop = elt.scrollHeight - elt.clientHeight;
+      elt.classList.add("at-bottom");
+      elt.addEventListener("scroll", () => {
+        if (elt.scrollTop < elt.scrollHeight - elt.clientHeight - 20) {
+          elt.classList.remove("at-bottom");
+        } else {
+          elt.classList.add("at-bottom");
+        }
+      });
+      elt.addEventListener(elt.getAttribute("hx-bottom-scroll-on-trigger"), () => {
+        if (elt.classList.contains("at-bottom")) {
+          elt.scrollTop = elt.scrollHeight - elt.clientHeight;
+        }
+      });
+    }
+  }
+});
+
+// Port of the htmx 1 remove-me extension: removes elements after a delay (eg. remove-me="5s")
+htmx.registerExtension("remove-me", {
+  htmx_after_process(root) {
+    for (const elt of queryAll(root, "[remove-me],[data-remove-me]")) {
+      if (elt._hfRemoveMe) continue;
+      elt._hfRemoveMe = true;
+      const timing = elt.getAttribute("remove-me") || elt.getAttribute("data-remove-me");
+      if (timing) {
+        setTimeout(() => elt.remove(), htmx.parseInterval(timing));
+      }
+    }
+  }
+});
+
+(function () {
+  function ensureLinksAreActive() {
+    const nodes = document.querySelectorAll('a[hx-active-url], [hx-active-url] a');
+    nodes.forEach((a) => {
+      let url;
+      for (const attr of ['hx-push-url', 'hx-replace-url', 'href', 'hx-get']) {
+        if (a.hasAttribute(attr)) {
+          if (attr !== "href" && a.getAttribute(attr) === "true") {
+            url = new URL(a.getAttribute('hx-get'), window.location.origin);
+          } else {
+            url = new URL(a.getAttribute(attr), window.location.origin);
+          }
+          break;
+        }
+      }
+      if (!url) return;
+      const activeClass = a.closest("[hx-active-url]")?.getAttribute("hx-active-url");
+      if (!activeClass) return;
+      if (url.pathname === window.location.pathname && url.search === window.location.search) {
+        a.classList.add(activeClass);
+      } else {
+        a.classList.remove(activeClass);
+      }
+    });
+  }
+
+  htmx.registerExtension("hx-active-url", {
+    init() {
+      document.addEventListener('DOMContentLoaded', ensureLinksAreActive);
+    },
+    htmx_before_process(root) {
+      for (const elt of queryAll(root, "[hx-href]")) {
+        elt.setAttribute('href', elt.getAttribute('hx-href'));
+        elt.setAttribute('hx-push-url', elt.getAttribute('hx-href'));
+      }
+    },
+    htmx_after_history_push: ensureLinksAreActive,
+    htmx_after_history_replace: ensureLinksAreActive
+  });
+})();
+
+(function () {
+  // Swaps named SSE events into elements, like the htmx 2 sse-swap attribute.
+  // The htmx 4 sse extension only swaps unnamed messages into the connection element
+  // and dispatches named events as DOM events.
+  const SSE_CONNECT_SELECTOR = "[hx-sse\\:connect],[data-hx-sse\\:connect]";
+  const SSE_SWAP_ATTR = "hx-sse:swap";
+  let api;
+
+  htmx.registerExtension("hx-sse-swap", {
+    init(internalAPI) {
+      api = internalAPI;
+    },
+    htmx_sse_before_message(elt, detail) {
+      const swapElts = queryAll(elt, "[hx-sse\\:swap]").filter((e) => e.closest(SSE_CONNECT_SELECTOR) === elt);
+      if (!swapElts.length) return;
+      // unnamed messages are treated as "message" events so that the sse extension does not swap them
+      const event = detail.message.event ||= "message";
+      for (const swapElt of swapElts) {
+        if (!swapElt.getAttribute(SSE_SWAP_ATTR).split(/\s*,\s*/).includes(event)) continue;
+        const ctx = api.createRequestContext(swapElt, new CustomEvent(event));
+        ctx.text = detail.message.data;
+        ctx.swap += " swapEmpty:false";
+        detail.waitUntil(htmx.swap(ctx).catch((error) => api.triggerHtmxEvent(swapElt, "htmx:error", { error })));
+      }
+    }
+  });
+})();
+
+(function () {
+  async function streamInto(ctx, stream) {
+    const reader = stream.getReader();
+    const decoder = new TextDecoder();
+    let text = "";
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done || ctx.hfStreamDone) break;
+      text += decoder.decode(value, { stream: true });
+      ctx.target.innerHTML = text;
+    }
+    reader.cancel();
+  }
+
+  // Progressively renders suspense responses (streamed with the x-suspense header)
+  // while htmx waits for the full response to perform the actual swap
+  htmx.registerExtension("hx-stream", {
+    htmx_before_request(elt, detail) {
+      const ctx = detail.ctx;
+      const fetch = ctx.fetch;
+      ctx.fetch = async (url, init) => {
+        const response = await fetch(url, init);
+        if (response.headers.get("x-suspense") !== "1" || !response.body || !(ctx.target instanceof Element)) {
+          return response;
+        }
+        const [body, stream] = response.body.tee();
+        streamInto(ctx, stream);
+        const teed = new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
+        Object.defineProperty(teed, "url", { value: response.url });
+        return teed;
+      };
+    },
+    htmx_before_swap(elt, detail) {
+      detail.ctx.hfStreamDone = true;
+    }
+  });
+})();

{hyperflask-0.6.0 → hyperflask-0.7.1}/src/hyperflask/ui/forms.html

@@ -11,8 +11,9 @@
 
 {% macro HxForm(form=None, action=None) -%}
     {% set inner = caller() %}
-    <{Form form hx_boost="false" hx_post=(action or request.url)
-           hx_on__after_request=("event.detail.successful && event.target.reset();" + kwargs.pop("hx_on__after_request", "")) **kwargs}>
+    {% set on_after_request = "ctx.response.status < 400 && event.target.reset();" + kwargs.pop("hx_on__after_request", "") + kwargs.pop("hx-on::after:request", "") %}
+    {% set _ = kwargs.update({"hx-on::after:request": on_after_request}) %}
+    <{Form form hx_boost="false" hx_post=(action or request.url) **kwargs}>
         {{inner}}
     </{Form}>
 {%- endmacro %}

hyperflask-0.7.1/src/hyperflask/ui/sse.html

@@ -0,0 +1,24 @@
+
+{% macro MercureStream(topic=None, private=True, hx_swap="beforeend", type=None, auto_scroll=False, with_subscriptions=False) -%}
+  {% set sse_url = mercure_authentified_hub_url(topic, with_subscriptions=with_subscriptions) if private else mercure_hub_url(topic, with_subscriptions=with_subscriptions) %}
+  <div {% if topic %}hx-sse:connect="{{sse_url}}"{% endif %}
+    hx-sse:swap="{{mercure_topic(topic if topic and not type and app.extensions['mercure_sse'].type_is_topic else (type or 'message'))}}"
+    {% if auto_scroll %}hx-bottom-scroll-on-trigger="htmx:after:swap"{% endif %} {{html_attrs(hx_swap=hx_swap, class_="mercure-stream", **kwargs)}}>
+      {{ caller() }}
+  </div>
+{%- endmacro %}
+
+{% macro MercureStreamContext(topics, private=True, with_subscriptions=False) -%}
+  {% set sse_url = mercure_authentified_hub_url(topics, with_subscriptions=with_subscriptions) if private else mercure_hub_url(topics, with_subscriptions=with_subscriptions) %}
+  <div hx-sse:connect="{{sse_url}}" {{html_attrs(class_="mercure-stream-context", **kwargs)}}>
+      {{ caller() }}
+  </div>
+{%- endmacro %}
+
+{% macro MercurePresence(hx_get, topic=None) -%}
+  {#- the sse extension uses hx-trigger to open the connection so it needs its own element -#}
+  {% if topic %}<div hx-sse:connect="{{mercure_authentified_hub_url(mercure_subscription_topic(topic))}}" class="mercure-stream-context">{% endif %}
+  <div hx-trigger="Subscription from:'closest .mercure-stream-context'" {{html_attrs(hx_get=hx_get, class_="mercure-presence", **kwargs)}}>
+  </div>
+  {% if topic %}</div>{% endif %}
+{%- endmacro %}

{hyperflask-0.6.0 → hyperflask-0.7.1}/src/hyperflask/utils/htmx.py

@@ -14,15 +14,12 @@ def htmx_oob(html, swap="outerHTML", target=None, wrap=True):
         html = html()
     swap_oob = f"{swap}:{target}" if target else swap
     html = str(html).strip()
-    m = re.match(r'<([a-z\-0-9]+)', html, re.I)
     if swap != "outerHTML" and wrap:
-        wrap_tag = wrap if wrap is not True else {"tr": "table", "li": "ul"}.get(m.group(1).lower() if m else None, "div")
+        # htmx inserts the content of the wrapper (template content can hold any element, eg. table rows)
+        wrap_tag = wrap if wrap is not True else "template"
         html = f"<{wrap_tag} hx-swap-oob=\"{swap_oob}\">{html}</{wrap_tag}>"
-    elif m:
-        tag, html = html.split(" " if " " in html else ">", 1)
-        html = f"{tag} hx-swap-oob=\"{swap_oob}\" {html}"
-        if wrap and tag[1:].lower() in ("tr", "td", "th", "thead", "tbody", "tfoot", "colgroup", "caption", "col"):
-            html = f"<template>{html}</template>"
+    else:
+        html = re.sub(r'^<([a-z\-0-9]+)', lambda m: f'<{m.group(1)} hx-swap-oob="{swap_oob}"', html, count=1, flags=re.I)
     return Markup(html)
 
 
@@ -43,20 +40,23 @@ def add_hx_trigger(response, event, data=None):
     else:
         trigger = {trigger: None}
     trigger[event] = data
-    response.headers["HX-Trigger"] = trigger
+    response.headers["HX-Trigger"] = json.dumps(trigger)
     return response
 
 
 def respond_with_flash_messages(response, only_if_htmx=True, target="#flash-messages-toast"):
     if only_if_htmx and not request.htmx:
         return response
+    if response.is_streamed:
+        # do not buffer streams (eg. sse connections made by htmx)
+        return response
 
     messages = []
     for category, message in get_flashed_messages(with_categories=True):
         props = {"category": category, "caller": lambda: message}
         if current_app.config["FLASH_TOAST_REMOVE_AFTER"]:
             props["remove-me"] = current_app.config["FLASH_TOAST_REMOVE_AFTER"]
-        messages.append(htmx_oob(current_app.macros.FlashMessage(**props), swap="beforestart", target=target))
+        messages.append(htmx_oob(current_app.macros.FlashMessage(**props), swap="afterbegin", target=target))
 
     response.set_data("\n".join(messages) + response.get_data(as_text=True))
     return response

hyperflask-0.6.0/src/hyperflask/static/app.js

@@ -1,14 +0,0 @@
-import htmx from "htmx.org";
-import "htmx-ext-sse";
-import "./htmx-exts";
-import "./app.css";
-
-const DEFAULT_HTMX_EXTS = ['hf-modal', 'hx-bottom-scroll-on-trigger', 'hx-active-url', 'hx-stream'];
-document.body.setAttribute('hx-ext', [document.body.getAttribute('hx-ext'), ...DEFAULT_HTMX_EXTS].filter(Boolean).join(","))
-
-window.htmx = htmx;
-export { htmx };
-
-if (window.Alpine) {
-    window.Alpine.start()
-}

hyperflask-0.6.0/src/hyperflask/static/htmx-exts.js

@@ -1,128 +0,0 @@
-import htmx from "htmx.org";
-
-(function () {
-  let triggerElement = false, enableTriggerElement;
-  htmx.defineExtension("hf-modal", {
-    getSelectors() {
-      return ['[hf-modal]'];
-    },
-    onEvent(name, evt) {
-      if (name === "htmx:beforeProcessNode" && evt.target.hasAttribute("hf-modal")) {
-        evt.target.setAttribute("hx-get", evt.target.getAttribute("hf-modal"));
-        evt.target.setAttribute("hx-target", "body");
-        evt.target.setAttribute("hx-swap", "beforeend");
-      } else if (name === "htmx:beforeRequest" && evt.target.hasAttribute("hf-modal")) {
-        triggerElement = evt.target;
-        enableTriggerElement = !evt.target.disabled;
-        evt.target.disabled = true;
-      } else if (name === "htmx:load" && triggerElement) {
-        if (evt.target.tagName === "DIALOG") {
-          evt.target.showModal();
-          const form = evt.target.querySelector("form[hf-modal-form]");
-          if (form) {
-            form.setAttribute("hx-target", "closest dialog");
-            form.setAttribute("hx-swap", "delete");
-            form.setAttribute("hx-disabled-elt", "this");
-            if (!form.hasAttribute("action")) {
-              form.setAttribute("action", triggerElement.getAttribute("hf-modal"));
-            }
-            setTimeout(() => {
-              form.querySelector("input:not([type=hidden])")?.focus();
-            }, 100);
-          }
-        }
-        if (enableTriggerElement) {
-          triggerElement.disabled = false;
-        }
-        triggerElement = null;
-      }
-    }
-  });
-})();
-
-htmx.defineExtension("hx-bottom-scroll-on-trigger", {
-  getSelectors() {
-    return ['[hx-bottom-scroll-on-trigger]'];
-  },
-  onEvent(name, evt) {
-    if (name === "htmx:afterProcessNode" && evt.target.hasAttribute("hx-bottom-scroll-on-trigger")) {
-      const elt = evt.target;
-      elt.scrollTop = elt.scrollHeight - elt.clientHeight;
-      elt.classList.add("at-bottom");
-      elt.addEventListener("scroll", (e) => {
-        if (e.target.scrollTop < e.target.scrollHeight - e.target.clientHeight - 20) {
-          e.target.classList.remove("at-bottom");
-        } else {
-          e.target.classList.add("at-bottom");
-        }
-      });
-      return;
-    }
-
-    const eventName = evt.target.getAttribute("hx-bottom-scroll-on-trigger");
-    if (name === eventName && evt.target.classList.contains("at-bottom")) {
-      evt.target.scrollTop = evt.target.scrollHeight - evt.target.clientHeight;
-    }
-  }
-});
-
-htmx.defineExtension("hx-active-url", {
-  init() {
-    function ensureLinksAreActive() {
-      const nodes = document.querySelectorAll('a[hx-active-url], [hx-active-url] a');
-      nodes.forEach((a) => {
-        let url;
-        for (const attr of ['hx-push-url', 'hx-replace-url', 'href', 'hx-get']) {
-          if (a.hasAttribute(attr)) {
-            if (attr !== "href" && a.getAttribute(attr) === "true") {
-              url = new URL(a.getAttribute('hx-get'), window.location.origin);
-            } else {
-              url = new URL(a.getAttribute(attr), window.location.origin);
-            }
-            break;
-          }
-        }
-        if (!url) return;
-        const activeClass = a.closest("[hx-active-url]")?.getAttribute("hx-active-url");
-        if (!activeClass) return;
-        if (url.pathname === window.location.pathname && url.search === window.location.search) {
-          a.classList.add(activeClass);
-        } else {
-          a.classList.remove(activeClass);
-        }
-      });
-    }
-    document.addEventListener('DOMContentLoaded', ensureLinksAreActive);
-    document.addEventListener("htmx:pushedIntoHistory", ensureLinksAreActive);
-  },
-  getSelectors() {
-    return ['[hx-href]'];
-  },
-  onEvent(name, evt) {
-    if (name === "htmx:beforeProcessNode" && evt.target.hasAttribute("hx-href")) {
-      evt.target.setAttribute('href', evt.target.getAttribute('hx-href'));
-      evt.target.setAttribute('hx-push-url', evt.target.getAttribute('hx-href'));
-    }
-  }
-});
-
-htmx.defineExtension("hx-stream", {
-  onEvent: function (name, evt) {
-    if (name === "htmx:beforeRequest") {
-      const target = evt.detail.target;
-      const xhr = evt.detail.xhr;
-      let stream = false;
-      xhr.addEventListener('readystatechange', function () {
-        if (xhr.readyState == xhr.HEADERS_RECEIVED && xhr.getResponseHeader('x-suspense') === '1') {
-          stream = true;
-          target.innerHTML = xhr.responseText;
-        } else if (xhr.readyState === xhr.LOADING && stream) {
-          target.innerHTML = xhr.responseText;
-        } else if (xhr.readyState === xhr.DONE) {
-          stream = false;
-        }
-      });
-    }
-    return true;
-  }
-});

hyperflask-0.6.0/src/hyperflask/ui/sse.html

@@ -1,22 +0,0 @@
-
-{% macro MercureStream(topic=None, private=True, hx_swap="beforeend", type=None, auto_scroll=False, with_subscriptions=False) -%}
-  {% set sse_url = mercure_authentified_hub_url(topic, with_subscriptions=with_subscriptions) if private else mercure_hub_url(topic, with_subscriptions=with_subscriptions) %}
-  <div {% if topic %}hx-ext="sse" sse-connect="{{sse_url}}"{% endif %}
-    sse-swap="{{mercure_topic(topic if topic and not type and app.extensions['mercure_sse'].type_is_topic else (type or 'message'))}}"
-    {% if auto_scroll %}hx-bottom-scroll-on-trigger="htmx:sseMessage"{% endif %} {{html_attrs(hx_swap=hx_swap, class_="mercure-stream", **kwargs)}}>
-      {{ caller() }}
-  </div>
-{%- endmacro %}
-
-{% macro MercureStreamContext(topics, private=True, with_subscriptions=False) -%}
-  {% set sse_url = mercure_authentified_hub_url(topics, with_subscriptions=with_subscriptions) if private else mercure_hub_url(topics, with_subscriptions=with_subscriptions) %}
-  <div hx-ext="sse" sse-connect="{{sse_url}}" {{html_attrs(class_="mercure-stream-context", **kwargs)}}>
-      {{ caller() }}
-  </div>
-{%- endmacro %}
-
-{% macro MercurePresence(hx_get, topic=None) -%}
-  <div {% if topic %}hx-ext="sse" sse-connect="{{mercure_authentified_hub_url(mercure_subscription_topic(topic))}}"{% endif %}
-    hx-trigger="sse:Subscription" {{html_attrs(hx_get=hx_get, class_="mercure-presence", **kwargs)}}>
-  </div>
-{%- endmacro %}