fixes #789

Author: jph00

fasthtml/_modidx.py

@@ -80,6 +80,7 @@
                                'fasthtml.core._add_ids': ('api/core.html#_add_ids', 'fasthtml/core.py'),
                                'fasthtml.core._annotations': ('api/core.html#_annotations', 'fasthtml/core.py'),
                                'fasthtml.core._apply_ft': ('api/core.html#_apply_ft', 'fasthtml/core.py'),
+                               'fasthtml.core._canonical': ('api/core.html#_canonical', 'fasthtml/core.py'),
                                'fasthtml.core._find_p': ('api/core.html#_find_p', 'fasthtml/core.py'),
                                'fasthtml.core._find_targets': ('api/core.html#_find_targets', 'fasthtml/core.py'),
                                'fasthtml.core._find_wsp': ('api/core.html#_find_wsp', 'fasthtml/core.py'),

fasthtml/core.py

@@ -421,15 +421,19 @@ def _part_resp(req, resp):
     return resp,kw
 
 # %% ../nbs/api/00_core.ipynb
+def _canonical(req):
+    if not req.app.canonical: return []
+    url = str(getattr(req, 'canonical', req.url)).replace('http://', 'https://', 1)
+    return [Link(rel="canonical", href=url)]
+
 def _xt_cts(req, resp):
     "Extract content and headers, render as full page or fragment"
     hdr_tags = 'title','meta','link','style','base'
     resp = tuplify(resp)
     heads,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in hdr_tags)
     if not is_full_page(req, resp):
         title = [] if any(getattr(o, 'tag', '')=='title' for o in heads) else [Title(req.app.title)]
-        canonical = [Link(rel="canonical", href=getattr(req, 'canonical', req.url))] if req.app.canonical else []
-        resp = respond(req, [*heads, *title, *canonical], bdy)
+        resp = respond(req, [*heads, *title, *_canonical(req)], bdy)
     return _to_xml(req, resp, indent=fh_cfg.indent)
 
 # %% ../nbs/api/00_core.ipynb
@@ -481,12 +485,13 @@ async def _wrap_call(f, req, params):
     "multi-swap": "https://cdn.jsdelivr.net/npm/[email protected]/multi-swap.js",
     "path-deps": "https://cdn.jsdelivr.net/npm/[email protected]/path-deps.js",
     "remove-me": "https://cdn.jsdelivr.net/npm/[email protected]/remove-me.js",
+    "debug": "https://unpkg.com/[email protected]/dist/ext/debug.js",
     "ws": "https://cdn.jsdelivr.net/npm/[email protected]/ws.js",
     "chunked-transfer": "https://cdn.jsdelivr.net/npm/[email protected]/transfer-encoding-chunked.js"
 }
 
 # %% ../nbs/api/00_core.ipynb
-htmxsrc   = Script(src="https://cdn.jsdelivr.net/npm/[email protected].6/dist/htmx.min.js")
+htmxsrc   = Script(src="https://cdn.jsdelivr.net/npm/[email protected].7/dist/htmx.js")
 fhjsscr   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/[email protected]/fasthtml.js")
 surrsrc   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js")
 scopesrc  = Script(src="https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js")

nbs/api/00_core.ipynb

@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2025, 10, 5, 14, 0)"
+       "datetime.datetime(2025, 10, 27, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -1322,15 +1322,19 @@
    "outputs": [],
    "source": [
     "#| export\n",
+    "def _canonical(req):\n",
+    "    if not req.app.canonical: return []\n",
+    "    url = str(getattr(req, 'canonical', req.url)).replace('http://', 'https://', 1)\n",
+    "    return [Link(rel=\"canonical\", href=url)]\n",
+    "\n",
     "def _xt_cts(req, resp):\n",
     "    \"Extract content and headers, render as full page or fragment\"\n",
     "    hdr_tags = 'title','meta','link','style','base'\n",
     "    resp = tuplify(resp)\n",
     "    heads,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in hdr_tags)\n",
     "    if not is_full_page(req, resp):\n",
     "        title = [] if any(getattr(o, 'tag', '')=='title' for o in heads) else [Title(req.app.title)]\n",
-    "        canonical = [Link(rel=\"canonical\", href=getattr(req, 'canonical', req.url))] if req.app.canonical else []\n",
-    "        resp = respond(req, [*heads, *title, *canonical], bdy)\n",
+    "        resp = respond(req, [*heads, *title, *_canonical(req)], bdy)\n",
     "    return _to_xml(req, resp, indent=fh_cfg.indent)"
    ]
   },
@@ -1422,6 +1426,7 @@
     "    \"multi-swap\": \"https://cdn.jsdelivr.net/npm/[email protected]/multi-swap.js\",\n",
     "    \"path-deps\": \"https://cdn.jsdelivr.net/npm/[email protected]/path-deps.js\",\n",
     "    \"remove-me\": \"https://cdn.jsdelivr.net/npm/[email protected]/remove-me.js\",\n",
+    "    \"debug\": \"https://unpkg.com/[email protected]/dist/ext/debug.js\",\n",
     "    \"ws\": \"https://cdn.jsdelivr.net/npm/[email protected]/ws.js\",\n",
     "    \"chunked-transfer\": \"https://cdn.jsdelivr.net/npm/[email protected]/transfer-encoding-chunked.js\"\n",
     "}"
@@ -1445,7 +1450,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "morph head-support preload class-tools loading-states multi-swap path-deps remove-me ws chunked-transfer\n"
+      "morph head-support preload class-tools loading-states multi-swap path-deps remove-me debug ws chunked-transfer\n"
      ]
     }
    ],
@@ -1461,7 +1466,7 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "htmxsrc   = Script(src=\"https://cdn.jsdelivr.net/npm/[email protected].6/dist/htmx.min.js\")\n",
+    "htmxsrc   = Script(src=\"https://cdn.jsdelivr.net/npm/[email protected].7/dist/htmx.js\")\n",
     "fhjsscr   = Script(src=\"https://cdn.jsdelivr.net/gh/answerdotai/[email protected]/fasthtml.js\")\n",
     "surrsrc   = Script(src=\"https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js\")\n",
     "scopesrc  = Script(src=\"https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js\")\n",
@@ -2879,13 +2884,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2025-09-17 09:13:49.740165\n"
+      "Set to 2025-10-27 07:27:07.025956\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2025-09-17 09:13:49.740165'"
+       "'Session time: 2025-10-27 07:27:07.025956'"
       ]
      },
      "execution_count": null,
@@ -3482,10 +3487,10 @@
       " <html>\n",
       "   <head>\n",
       "     <title>FastHTML page</title>\n",
-      "     <link rel=\"canonical\" href=\"http://testserver/setcookie\">\n",
+      "     <link rel=\"canonical\" href=\"https://testserver/setcookie\">\n",
       "     <meta charset=\"utf-8\">\n",
       "     <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, viewport-fit=cover\">\n",
-      "<script src=\"https://cdn.jsdelivr.net/npm/[email protected].6/dist/htmx.min.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/[email protected]/fasthtml.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js\"></script><script>\n",
+      "<script src=\"https://cdn.jsdelivr.net/npm/[email protected].7/dist/htmx.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/[email protected]/fasthtml.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js\"></script><script src=\"https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js\"></script><script>\n",
       "    function sendmsg() {\n",
       "        window.parent.postMessage({height: document.documentElement.offsetHeight}, '*');\n",
       "    }\n",
@@ -3502,7 +3507,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 08:12:02.333734'"
+       "'Cookie was set at time 07:28:31.264910'"
       ]
      },
      "execution_count": null,