fastlifeweb 0.7.3__tar.gz → 0.8.0__tar.gz

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlifeweb
-Version: 0.7.3
+Version: 0.8.0
 Summary: High-level web framework
 Home-page: https://github.com/mardiros/fastlife
 License: BSD-derived
@@ -21,7 +21,7 @@ Requires-Dist: beautifulsoup4[testing] (>=4.12.2,<5.0.0)
 Requires-Dist: behave (>=1.2.6,<2.0.0)
 Requires-Dist: fastapi (>=0.112.0,<0.113.0)
 Requires-Dist: itsdangerous (>=2.1.2,<3.0.0)
-Requires-Dist: jinjax (>=0.37,<0.38)
+Requires-Dist: jinjax (>=0.43,<0.44)
 Requires-Dist: markupsafe (>=2.1.3,<3.0.0)
 Requires-Dist: multidict (>=6.0.5,<7.0.0)
 Requires-Dist: pydantic (>=2.5.3,<3.0.0)

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
   "Topic :: Internet :: WWW/HTTP",
 ]
-version = "0.7.3"
+version = "0.8.0"
 
 [tool.poetry.dependencies]
 python = "^3.11"
@@ -23,7 +23,7 @@ beautifulsoup4 = {version = "^4.12.2", extras = ["testing"]}
 behave = "^1.2.6"
 fastapi = "^0.112.0"
 itsdangerous = "^2.1.2"
-jinjax = "^0.37"
+jinjax = "^0.43"
 markupsafe = "^2.1.3"
 multidict = "^6.0.5"
 pydantic = "^2.5.3"

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/__init__.py

@@ -1,9 +1,12 @@
 from .configurator import Configurator, configure
 from .configurator.registry import Registry
 
+from .monkeypatch import monkeypatch
 # from .request.form_data import model
 from .templating import Template, template
 
+monkeypatch()
+
 __all__ = [
     # Config
     "configure",

fastlifeweb-0.8.0/src/fastlife/monkeypatch.py

@@ -0,0 +1,8 @@
+import re
+from jinjax import component
+
+
+def monkeypatch() -> None:
+    # the current regex is currently breaking the A component
+    # and we don't use comments inside {# def #}
+    component.RX_INTER_COMMENTS = re.compile("^$")

fastlifeweb-0.8.0/src/fastlife/templates/CsrfToken.jinja

@@ -0,0 +1 @@
+<Hidden :name="csrf_token.name" :value="csrf_token.value" />

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/templates/Radio.jinja

@@ -26,5 +26,5 @@ div_class="flex items-center mb-4"
   <input type="radio" name="{{name}}" id="{{id}}" value="{{value}}" {% if checked %}checked{% endif %}
     class="{{attrs.class or class_}}" {% if onclick %}onclick="{{onclick}}" {% endif %} {%if
     disabled%}disabled{%endif%}>
-  <Label for={id} class={label_class}>{{label}}</Label>
+  <Label :for="id" :class="label_class">{{label}}</Label>
 </div>

fastlifeweb-0.8.0/src/fastlife/templates/pydantic_form/Boolean.jinja

@@ -0,0 +1,12 @@
+{# def widget #}
+<pydantic_form.Widget :widget="widget" :removable="widget.removable">
+  <div class="pt-4">
+    <div class="flex items-center">
+     <Checkbox :name="widget.name" type="checkbox" :id="widget.id" :checked="widget.value" value="1" />
+     <Label :for="widget.id" class="ms-2 text-base text-neutral-900 dark:text-white">
+        {{widget.title|safe}}
+      </Label>
+    </div>
+   <pydantic_form.Error :text="widget.error" />
+  </div>
+</pydantic_form.Widget>

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/templates/pydantic_form/Checklist.jinja

@@ -2,19 +2,19 @@
 widget,
 #}
 
-<pydantic_form.Widget widget={widget} removable={widget.removable}>
+<pydantic_form.Widget :widget="widget" :removable="widget.removable">
   <div class="pt-4">
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
-        <pydantic_form.Error text={widget.error} />
+        <pydantic_form.Error :text="widget.error" />
       </summary>
       <div>
         {% for value in widget.value %}
         <div class="flex items-center mb-4">
-          <Checkbox name={value.field_name} type="checkbox" id={value.id} value={value.value} checked={value.checked} />
-          <Label for={value.id} class="ms-2 text-base text-neutral-900 dark:text-white">{{value.label}}</Label>
-          <pydantic_form.Error text={value.error} />
+         <Checkbox :name="value.field_name" type="checkbox" :id="value.id" :value="value.value" :checked="value.checked" />
+         <Label :for="value.id" class="ms-2 text-base text-neutral-900 dark:text-white">{{value.label}}</Label>
+         <pydantic_form.Error :text="value.error" />
         </div>
         {% endfor %}
       </div>

fastlifeweb-0.8.0/src/fastlife/templates/pydantic_form/Dropdown.jinja

@@ -0,0 +1,16 @@
+{# def widget #}
+
+<pydantic_form.Widget :widget="widget" :removable="widget.removable">
+  <div class="pt-4">
+   <Label :for="widget.id">{{widget.title}}</Label>
+   <Select :name="widget.name" :id="widget.id">
+      {%- for opt in widget.options -%}
+     <Option :value="opt.value" id={{widget.id + "-" + opt.value}} :selected="widget.value==opt.value">
+        {{ opt.text }}
+      </Option>
+      {%- endfor -%}
+    </Select>
+   <pydantic_form.Error :text="widget.error" />
+   <pydantic_form.Hint :text="widget.hint" />
+  </div>
+</pydantic_form.Widget>

fastlifeweb-0.8.0/src/fastlife/templates/pydantic_form/Hidden.jinja

@@ -0,0 +1,2 @@
+{# def widget #}
+<Hidden :name="widget.name" :value="widget.value" :id="widget.id" />

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/templates/pydantic_form/Model.jinja

@@ -1,11 +1,11 @@
 {# def widget, children_widget #}
 
-<pydantic_form.Widget widget={widget} removable={widget.removable}>
+<pydantic_form.Widget :widget="widget" :removable="widget.removable">
   <div id="{{widget.id}}" class="m-4">
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
-        <pydantic_form.Error text={widget.error} />
+        <pydantic_form.Error :text="widget.error" />
       </summary>
       <div>
         {% for child in children_widget %}

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/templates/pydantic_form/Sequence.jinja

@@ -1,10 +1,10 @@
 {# def widget, children_widgets, type #}
 
-<pydantic_form.Widget widget={widget} removable={widget.removable}>
+<pydantic_form.Widget :widget="widget" :removable="widget.removable">
   <details id="{{widget.id}}" open>
     <summary class="justify-between items-center font-medium cursor-pointer">
       <H3>{{widget.title}}</H3>
-      <pydantic_form.Error text={widget.error} />
+      <pydantic_form.Error :text="widget.error" />
     </summary>
     <div>
       {% set fnGetName = "get" + widget.id.replace("-", "_") %}
@@ -29,7 +29,7 @@
         {% set container_id = "#" + widget.id + "-container" %}
         {% set add_id = widget.id + "-add" %}
         {% set vals = 'js:{"name": '+ fnGetName + '(), "token": "' + type.token + '", "removable": true}' %}
-        <Button type="button" hx-target={container_id} hx-swap="beforeend" id={add_id} hx-vals={vals} hx-get={type.url}>
+        <Button type="button" :hx-target="container_id" hx-swap="beforeend" :id="add_id" :hx-vals="vals" :hx-get="type.url">
           Add
         </Button>
       </div>

fastlifeweb-0.8.0/src/fastlife/templates/pydantic_form/Text.jinja

@@ -0,0 +1,11 @@
+{# def widget #}
+
+<pydantic_form.Widget :widget="widget" :removable="widget.removable">
+  <div class="pt-4">
+    <Label :for="widget.id">{{widget.title}}</Label>
+    <pydantic_form.Error :text="widget.error" />
+    <Input :name="widget.name" :value="widget.value" :type="widget.input_type" :id="widget.id"
+      :aria-label="widget.aria_label" :placeholder="widget.placeholder" />
+    <pydantic_form.Hint :text="widget.hint" />
+  </div>
+</pydantic_form.Widget>

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/templates/pydantic_form/Union.jinja

@@ -1,24 +1,24 @@
 {# def widget, child, types, parent_type #}
 
-<pydantic_form.Widget widget={widget}>
+<pydantic_form.Widget :widget="widget">
   <div id="{{widget.id}}">
     <details open>
       <summary class="justify-between items-center font-medium cursor-pointer">
         <H3>{{widget.title}}</H3>
-        <pydantic_form.Error text={widget.error} />
+        <pydantic_form.Error :text="widget.error" />
       </summary>
       <div hx-sync="this" id="{{widget.id}}-child">
         {% if child %}
         {{ child }}
         {% else %}
         {% for typ in types %}
-        <Button type="button" hx-target="closest div" hx-get={typ.url} hx-vals={typ.params|tojson} id={typ.id}
-          onclick={"document.getElementById('" + widget.id +"-remove-btn').hidden=false"}>{{typ.title}}</Button>
+        <Button type="button" hx-target="closest div" :hx-get="typ.url" :hx-vals="typ.params|tojson" :id="typ.id"
+onclick={{ "document.getElementById('" + widget.id + "-remove-btn').hidden=false" }}>{{typ.title}}</Button>
         {% endfor %}
         {% endif %}
       </div>
-      <Button type="button" id={widget.id + "-remove-btn" } hx-target={"#" + widget.id}
-        hx-vals={parent_type.params|tojson} hx-get={parent_type.url} hidden={not child}>
+      <Button type="button" :id="widget.id + '-remove-btn'" :hx-target="'#' + widget.id"
+hx-vals="parent_type.params|tojson" :hx-get="parent_type.url" :hidden="not child">
         Remove
       </Button>
     </details>

{fastlifeweb-0.7.3 → fastlifeweb-0.8.0}/src/fastlife/templates/pydantic_form/Widget.jinja

@@ -3,7 +3,7 @@
 <div id="{{container_id}}">
   {{ content }}
   {% if removable %}
-  <Button type="button" onclick={"document.getElementById('" + container_id + "').remove()"}>
+  <Button type="button" :onclick="'document.getElementById(' + container_id + ').remove()'">
     Remove
   </Button>
   {% endif %}

fastlifeweb-0.7.3/src/fastlife/templates/CsrfToken.jinja

@@ -1 +0,0 @@
-<Hidden name={csrf_token.name} value={csrf_token.value} />

fastlifeweb-0.7.3/src/fastlife/templates/pydantic_form/Boolean.jinja

@@ -1,12 +0,0 @@
-{# def widget #}
-<pydantic_form.Widget widget={widget} removable={widget.removable}>
-  <div class="pt-4">
-    <div class="flex items-center">
-      <Checkbox name={widget.name} type="checkbox" id={widget.id} checked={widget.value} value="1" />
-      <Label for={widget.id} class="ms-2 text-base text-neutral-900 dark:text-white">
-        {{widget.title|safe}}
-      </Label>
-    </div>
-    <pydantic_form.Error text={widget.error} />
-  </div>
-</pydantic_form.Widget>

fastlifeweb-0.7.3/src/fastlife/templates/pydantic_form/Dropdown.jinja

@@ -1,16 +0,0 @@
-{# def widget #}
-
-<pydantic_form.Widget widget={widget} removable={widget.removable}>
-  <div class="pt-4">
-    <Label for={widget.id}>{{widget.title}}</Label>
-    <Select name={widget.name} id={widget.id}>
-      {%- for opt in widget.options -%}
-      <Option value={opt.value} id={widget.id + "-" + opt.value} selected={widget.value==opt.value}>
-        {{ opt.text }}
-      </Option>
-      {%- endfor -%}
-    </Select>
-    <pydantic_form.Error text={widget.error} />
-    <pydantic_form.Hint text={widget.hint} />
-  </div>
-</pydantic_form.Widget>

fastlifeweb-0.7.3/src/fastlife/templates/pydantic_form/Hidden.jinja

@@ -1,2 +0,0 @@
-{# def widget #}
-<Hidden name={widget.name} value={widget.value} id={widget.id} />

fastlifeweb-0.7.3/src/fastlife/templates/pydantic_form/Text.jinja

@@ -1,11 +0,0 @@
-{# def widget #}
-
-<pydantic_form.Widget widget={widget} removable={widget.removable}>
-  <div class="pt-4">
-    <Label for={widget.id}>{{widget.title}}</Label>
-    <pydantic_form.Error text={widget.error} />
-    <Input name={widget.name} value={widget.value} type={widget.input_type} id={widget.id}
-      aria-label={widget.aria_label} placeholder={widget.placeholder} />
-    <pydantic_form.Hint text={widget.hint} />
-  </div>
-</pydantic_form.Widget>