pytypehintweb 1.2.3__tar.gz → 1.3.0__tar.gz

{pytypehintweb-1.2.3/src/pytypehintweb.egg-info → pytypehintweb-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytypehintweb
-Version: 1.2.3
+Version: 1.3.0
 Summary: Framework-free browser form layer for pytypehint
 Author: Beltran Offerrall
 License-Expression: MIT
@@ -23,7 +23,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytypehint==1.0.0
+Requires-Dist: pytypehint==1.3.0
 Provides-Extra: demo
 Requires-Dist: fastapi; extra == "demo"
 Requires-Dist: uvicorn; extra == "demo"

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0}/pyproject.toml

@@ -11,7 +11,7 @@ license = "MIT"
 license-files = ["LICENSE"]
 authors = [{name = "Beltran Offerrall"}]
 requires-python = ">=3.11"
-dependencies = ["pytypehint==1.0.0"]
+dependencies = ["pytypehint==1.3.0"]
 keywords = ["forms", "type-hints", "dataclasses", "schema", "web", "html"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0}/src/pytypehintweb/__init__.py

@@ -6,7 +6,7 @@ from pytypehintweb.types import COLOR_PATTERN, EMAIL_PATTERN, Color, Email
 
 STATIC = Path(__file__).parent / "static"
 
-__version__ = "1.2.3"
+__version__ = "1.3.0"
 
 __all__ = [
     "plan_of",

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0}/src/pytypehintweb/plan.py

@@ -480,6 +480,19 @@ def _bound(bound, delta, path: str, what: str):
     return inclusive
 
 
+def _writable_float(value: float, path: str) -> float:
+    # JavaScript writes a number below 1e-6 or from 1e21 up in exponent notation,
+    # text the float control's own grammar rejects, so the default could never
+    # be shown as the value it is.
+    if value != 0 and not 1e-6 <= abs(value) < 1e21:
+        raise _error(
+            path,
+            f"Float default: {value!r} is valid in pytypehint but JavaScript "
+            f"writes it in exponent notation, which a float control cannot hold")
+
+    return value
+
+
 def _file_size(bound, path: str, what: str):
     # A plain int on FileHint, already checked there for being a non-negative
     # int and for min <= max. All that is left is the one thing the core has no
@@ -1059,6 +1072,11 @@ def _plain_value(shape, value, path: str):
         _check_slider_default(shape, safe, path)
         return safe
 
+    # A select names its choices and writes no number, so only a text control
+    # is bound by what JavaScript can write.
+    if type(shape) is Float and shape.choices is None:
+        return _writable_float(value, path)
+
     # The plan is JSON, so a date/time default travels as canonical ISO text and
     # an enum member as its name — the transport their choices already take.
     if type(shape) is Date or type(shape) is Time:
@@ -1140,10 +1158,32 @@ def _field_node(field, config, path: str) -> dict:
     return node
 
 
-def _form_node(name, description, fields, config) -> dict:
+def _reject_recursion(shapes, path: str, open_structs: tuple) -> None:
+    # A plan is fully expanded, so a dataclass that contains itself has no plan.
+    # Name the field instead of descending until the interpreter's stack ends.
+    for shape in shapes:
+        if type(shape) is List:
+            _reject_recursion(shape.item, f"{path}.item", open_structs)
+        elif type(shape) is Struct:
+            if any(shape is opened for opened in open_structs):
+                raise _error(
+                    path,
+                    f"{shape.cls.__name__} contains itself; a plan is fully "
+                    f"expanded and cannot represent a recursive shape")
+
+            for f in shape.fields:
+                _reject_recursion(
+                    f.shape, f"{path}.{f.name}", (*open_structs, shape))
+
+
+def _form_node(name, description, fields, config, root=None) -> dict:
     plan = {"v": _PLAN_VERSION, "kind": "form", "name": name,
             "description": description}
 
+    for f in fields:
+        _reject_recursion(
+            f.shape, f"fields.{f.name}", () if root is None else (root,))
+
     plan["fields"] = [_field_node(f, config, "fields") for f in fields]
 
     return plan
@@ -1157,7 +1197,7 @@ def plan_of(obj, *, config: WebConfig | None = None) -> dict:
             f"config must be WebConfig or None, got {type(config).__name__}")
 
     if type(obj) is Struct:
-        return _form_node(obj.cls.__name__, None, obj.fields, config)
+        return _form_node(obj.cls.__name__, None, obj.fields, config, obj)
 
     if type(obj) is Signature:
         return _form_node(obj.name, obj.doc, obj.params, config)

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0}/src/pytypehintweb/static/contract.js

@@ -623,7 +623,15 @@ function checkFileDefault(options, value, path) {
 }
 
 
+const WRITABLE_FLOAT = /^-?\d+(\.\d+)?$/;
+
+
 function checkFloatDefault(options, value, path) {
+    if (options.choices === null && !WRITABLE_FLOAT.test(String(value))) {
+        fail(path, "expected a number JavaScript writes as a simple decimal, "
+            + "not exponent notation");
+    }
+
     if (options.min !== null) {
         const below = options.minExclusive ? value <= options.min : value < options.min;
 

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0}/src/pytypehintweb/static/inputs.js

@@ -20,6 +20,8 @@ const ISO_MINUTES = /^([01]\d|2[0-3]):[0-5]\d$/;
 
 const FLOAT = /^-?\d+(\.\d+)?$/;
 
+const FREE_EXTENSION = /\.[a-z0-9]{1,16}$/;
+
 function isWritableFloat(value) {
     return typeof value === "number"
         && Number.isFinite(value)
@@ -53,7 +55,7 @@ function setAttributes(el, attributes) {
 
 
 function withValue(template, value) {
-    return template.replace("{value}", String(value));
+    return template.replace("{value}", () => String(value));
 }
 
 
@@ -443,21 +445,7 @@ export class FileWidget extends Widget {
     }
 
     setValue(value) {
-        if (value === null) {
-            this._clear();
-            return;
-        }
-
-        this._current = this._asReferences(value);
-        this._files = [];
-        this._refs = [];
-        this._invalid = false;
-        this._stashedCurrent = null;
-        this.input.value = "";
-
-        this._renderCurrent();
-        this._showMessage();
-        this._emitChange();
+        this._reset(value === null ? null : this._asReferences(value), null);
     }
 
     error() {
@@ -531,13 +519,13 @@ export class FileWidget extends Widget {
         return this.extensions.some((extension) => lower.endsWith(extension));
     }
 
-    _clear() {
+    _reset(current, stashed) {
+        this._current = current;
+        this._stashedCurrent = stashed;
         this._files = [];
         this._refs = [];
         this._invalid = false;
         this._oversized = null;
-        this._current = null;
-        this._stashedCurrent = null;
         this.input.value = "";
 
         this._renderCurrent();
@@ -547,37 +535,13 @@ export class FileWidget extends Widget {
     }
 
     _beginReplace() {
-        this._stashedCurrent = this._current;
-        this._current = null;
-        this._files = [];
-        this._refs = [];
-        this._invalid = false;
-        this._oversized = null;
-        this.input.value = "";
-
-        this._renderCurrent();
-        this._renderList();
-        this._showMessage();
-        this._emitChange();
+        this._reset(null, this._current);
     }
 
     _restore() {
-        if (this._stashedCurrent === null) {
-            return;
+        if (this._stashedCurrent !== null) {
+            this._reset(this._stashedCurrent, null);
         }
-
-        this._current = this._stashedCurrent;
-        this._stashedCurrent = null;
-        this._files = [];
-        this._refs = [];
-        this._invalid = false;
-        this._oversized = null;
-        this.input.value = "";
-
-        this._renderCurrent();
-        this._renderList();
-        this._showMessage();
-        this._emitChange();
     }
 
     _sizeError(file) {
@@ -608,8 +572,7 @@ export class FileWidget extends Widget {
         const lower = name.toLowerCase();
 
         if (this.extensions.length === 0) {
-            const dot = lower.lastIndexOf(".");
-            return dot === -1 ? "" : lower.slice(dot);
+            return FREE_EXTENSION.exec(lower)?.[0] ?? "";
         }
 
         return this.extensions.find((extension) => lower.endsWith(extension))

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0/src/pytypehintweb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytypehintweb
-Version: 1.2.3
+Version: 1.3.0
 Summary: Framework-free browser form layer for pytypehint
 Author: Beltran Offerrall
 License-Expression: MIT
@@ -23,7 +23,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytypehint==1.0.0
+Requires-Dist: pytypehint==1.3.0
 Provides-Extra: demo
 Requires-Dist: fastapi; extra == "demo"
 Requires-Dist: uvicorn; extra == "demo"

{pytypehintweb-1.2.3 → pytypehintweb-1.3.0}/src/pytypehintweb.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pytypehint==1.0.0
+pytypehint==1.3.0
 
 [demo]
 fastapi