Fix form constraints, take 2

Author: ischaojie

src/npm-fastui/src/components/FormField.tsx

@@ -30,7 +30,9 @@ interface FormFieldInputProps extends BaseFormFieldProps {
   type: 'FormFieldInput'
   htmlType: 'text' | 'date' | 'datetime-local' | 'time' | 'email' | 'url' | 'number' | 'password'
   initial?: string | number
+  /** @TJS-type integer */
   maxLength?: number
+  /** @TJS-type integer */
   minLength?: number
   ge?: number
   le?: number

src/python-fastui/fastui/components/forms.py

@@ -34,9 +34,9 @@ class FormFieldInput(BaseFormField):
     placeholder: _t.Union[str, None] = None
     max_length: _t.Union[int, None] = pydantic.Field(default=None, serialization_alias='maxLength')
     min_length: _t.Union[int, None] = pydantic.Field(default=None, serialization_alias='minLength')
-    ge: _t.Union[int, float, None] = None
-    le: _t.Union[int, float, None] = None
-    multiple_of: _t.Union[int, float, None] = pydantic.Field(default=None, serialization_alias='multipleOf')
+    ge: _t.Union[float, None] = None
+    le: _t.Union[float, None] = None
+    multiple_of: _t.Union[float, None] = pydantic.Field(default=None, serialization_alias='multipleOf')
     type: _t.Literal['FormFieldInput'] = 'FormFieldInput'
 
 

src/python-fastui/fastui/json_schema.py

@@ -46,8 +46,6 @@ class JsonSchemaString(JsonSchemaBase):
     type: _ta.Required[_t.Literal['string']]
     default: str
     format: _t.Literal['date', 'date-time', 'time', 'email', 'uri', 'uuid', 'password']
-    maxLength: int
-    minLength: int
 
 
 class JsonSchemaStringEnum(JsonSchemaBase, total=False):
@@ -63,8 +61,6 @@ class JsonSchemaStringSearch(JsonSchemaBase, total=False):
     search_url: _ta.Required[str]
     placeholder: str
     initial: SelectOption
-    maxLength: int
-    minLength: int
 
 
 class JsonSchemaFile(JsonSchemaBase, total=False):
@@ -87,6 +83,8 @@ class JsonSchemaInt(JsonSchemaBase, total=False):
     maximum: int
     exclusiveMaximum: int
     multipleOf: int
+    maxLength: int
+    minLength: int
 
 
 class JsonSchemaNumber(JsonSchemaBase, total=False):

src/python-fastui/tests/react-fastui-json-schema.json

@@ -473,16 +473,31 @@
         "error": {
           "type": "string"
         },
+        "ge": {
+          "type": "number"
+        },
         "htmlType": {
           "enum": ["date", "datetime-local", "email", "number", "password", "text", "time", "url"],
           "type": "string"
         },
         "initial": {
           "type": ["string", "number"]
         },
+        "le": {
+          "type": "number"
+        },
         "locked": {
           "type": "boolean"
         },
+        "maxLength": {
+          "type": "integer"
+        },
+        "minLength": {
+          "type": "integer"
+        },
+        "multipleOf": {
+          "type": "number"
+        },
         "name": {
           "type": "string"
         },

src/python-fastui/tests/test_forms.py

@@ -31,7 +31,7 @@ async def form(self):
 
 def test_simple_form_fields():
     m = components.ModelForm[SimpleForm](submit_url='/foobar/')
-    print(m.model_dump(by_alias=True, exclude_none=True))
+
     assert m.model_dump(by_alias=True, exclude_none=True) == {
         'submitUrl': '/foobar/',
         'method': 'POST',