From c7e0ad79b8c0b04261c512ca21001ed957b8ba75 Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Mon, 11 Dec 2023 10:57:19 +0000
Subject: [PATCH] tests passing!

---
 src/npm-fastui/src/components/FormField.tsx   |  12 +-
 src/npm-fastui/src/components/Iframe.tsx      |   7 +
 src/npm-fastui/src/components/display.tsx     |   1 +
 src/npm-fastui/src/components/form.tsx        |   1 +
 src/npm-fastui/src/components/heading.tsx     |   4 +
 src/npm-fastui/src/components/image.tsx       |   2 +
 src/npm-fastui/src/components/pagination.tsx  |   4 +
 .../fastui/components/__init__.py             |  69 +++++-----
 .../fastui/components/display.py              |   8 +-
 src/python-fastui/fastui/components/forms.py  |  13 +-
 src/python-fastui/fastui/components/tables.py |   2 +-
 src/python-fastui/fastui/events.py            |   6 +-
 src/python-fastui/fastui/forms.py             |   5 +-
 .../tests/react-fastui-json-schema.json       | 123 ++++++++++--------
 .../tests/test_json_schema_match.py           | 114 +++++++++++-----
 15 files changed, 232 insertions(+), 139 deletions(-)

diff --git a/src/npm-fastui/src/components/FormField.tsx b/src/npm-fastui/src/components/FormField.tsx
index aa8a4edd..0fd0e44e 100644
--- a/src/npm-fastui/src/components/FormField.tsx
+++ b/src/npm-fastui/src/components/FormField.tsx
@@ -5,16 +5,18 @@ import Select, { StylesConfig } from 'react-select'
 import { ClassName, useClassName } from '../hooks/className'
 import { debounce, useRequest } from '../tools'
 
+type PrivateOnChange = () => void
+
 interface BaseFormFieldProps {
   name: string
-  title: string[]
+  title: string | string[]
   required: boolean
   locked: boolean
   error?: string
   description?: string
   displayMode?: 'default' | 'inline'
   className?: ClassName
-  onChange?: () => void
+  onChange?: PrivateOnChange
 }
 
 export type FormFieldProps =
@@ -239,6 +241,7 @@ function findDefault(options: SelectOptions, value?: string): SelectOption | und
 interface FormFieldSelectSearchProps extends BaseFormFieldProps {
   type: 'FormFieldSelectSearch'
   searchUrl: string
+  /** @TJS-type integer */
   debounce?: number
   initial?: SelectOption
   multiple?: boolean
@@ -302,7 +305,10 @@ export const FormFieldSelectSearchComp: FC<FormFieldSelectSearchProps> = (props)
 }
 
 const Label: FC<FormFieldProps> = (props) => {
-  const { title } = props
+  let { title } = props
+  if (!Array.isArray(title)) {
+    title = [title]
+  }
   return (
     <label htmlFor={inputId(props)} className={useClassName(props, { el: 'label' })}>
       {title.map((t, i) => (
diff --git a/src/npm-fastui/src/components/Iframe.tsx b/src/npm-fastui/src/components/Iframe.tsx
index 1df4bc40..c7895765 100644
--- a/src/npm-fastui/src/components/Iframe.tsx
+++ b/src/npm-fastui/src/components/Iframe.tsx
@@ -4,8 +4,15 @@ import { ClassName } from '../hooks/className'
 
 export interface IframeProps {
   type: 'Iframe'
+  /**
+   * @format uri
+   * @maxLength 2083
+   * @minLength 1
+   */
   src: string
+  /** @TJS-type ["string", "integer"] */
   width?: string | number
+  /** @TJS-type ["string", "integer"] */
   height?: string | number
   title?: string
   className?: ClassName
diff --git a/src/npm-fastui/src/components/display.tsx b/src/npm-fastui/src/components/display.tsx
index e292fa0c..9f9063e2 100644
--- a/src/npm-fastui/src/components/display.tsx
+++ b/src/npm-fastui/src/components/display.tsx
@@ -21,6 +21,7 @@ export enum DisplayMode {
 
 export interface DisplayProps {
   type: 'Display'
+  /** @TJS-type JSON */
   value?: JsonData
   mode?: DisplayMode
   title?: string
diff --git a/src/npm-fastui/src/components/form.tsx b/src/npm-fastui/src/components/form.tsx
index d037efd0..38dd21c4 100644
--- a/src/npm-fastui/src/components/form.tsx
+++ b/src/npm-fastui/src/components/form.tsx
@@ -12,6 +12,7 @@ import { FormFieldProps } from './FormField'
 
 interface BaseFormProps {
   formFields: FormFieldProps[]
+  /** @TJS-type object */
   initial?: Record<string, any>
   submitUrl: string
   footer?: boolean | FastProps[]
diff --git a/src/npm-fastui/src/components/heading.tsx b/src/npm-fastui/src/components/heading.tsx
index 387a23b9..738fdda4 100644
--- a/src/npm-fastui/src/components/heading.tsx
+++ b/src/npm-fastui/src/components/heading.tsx
@@ -5,6 +5,10 @@ import { slugify } from '../tools'
 
 export interface HeadingProps {
   type: 'Heading'
+  /**
+   * @TJS-enum [1, 2, 3, 4, 5, 6]
+   * @TJS-type integer
+   */
   level: 1 | 2 | 3 | 4 | 5 | 6
   htmlId?: string
   className?: ClassName
diff --git a/src/npm-fastui/src/components/image.tsx b/src/npm-fastui/src/components/image.tsx
index 8e04b118..e26a53b5 100644
--- a/src/npm-fastui/src/components/image.tsx
+++ b/src/npm-fastui/src/components/image.tsx
@@ -7,7 +7,9 @@ export interface ImageProps {
   type: 'Image'
   src: string
   alt?: string
+  /** @TJS-type ["string", "integer"] */
   width?: number | string
+  /** @TJS-type ["string", "integer"] */
   height?: number | string
   referrerPolicy?:
     | 'no-referrer'
diff --git a/src/npm-fastui/src/components/pagination.tsx b/src/npm-fastui/src/components/pagination.tsx
index f2852c93..2884adc3 100644
--- a/src/npm-fastui/src/components/pagination.tsx
+++ b/src/npm-fastui/src/components/pagination.tsx
@@ -7,9 +7,13 @@ import { LinkListComp } from './LinkList'
 
 export interface PaginationProps {
   type: 'Pagination'
+  /** @TJS-type integer */
   page: number
+  /** @TJS-type integer */
   pageSize: number
+  /** @TJS-type integer */
   total: number
+  /** @TJS-type integer */
   pageCount: number
   className?: ClassName
 }
diff --git a/src/python-fastui/fastui/components/__init__.py b/src/python-fastui/fastui/components/__init__.py
index c9f2254e..215e19c0 100644
--- a/src/python-fastui/fastui/components/__init__.py
+++ b/src/python-fastui/fastui/components/__init__.py
@@ -128,7 +128,7 @@ class Link(pydantic.BaseModel, extra='forbid'):
     components: '_t.List[AnyComponent]'
     on_click: _t.Union[events.AnyEvent, None] = pydantic.Field(default=None, serialization_alias='onClick')
     mode: _t.Union[_t.Literal['navbar', 'tabs', 'vertical', 'pagination'], None] = None
-    active: _t.Union[bool, str, None] = None
+    active: _t.Union[str, bool, None] = None
     locked: _t.Union[bool, None] = None
     class_name: _class_name.ClassName = None
     type: _t.Literal['Link'] = 'Link'
@@ -154,7 +154,7 @@ class Modal(pydantic.BaseModel, extra='forbid'):
     body: '_t.List[AnyComponent]'
     footer: '_t.Union[_t.List[AnyComponent], None]' = None
     open_trigger: _t.Union[events.PageEvent, None] = pydantic.Field(default=None, serialization_alias='openTrigger')
-    open_context: _t.Union[events.EventContext, None] = pydantic.Field(default=None, serialization_alias='openContext')
+    open_context: _t.Union[events.ContextType, None] = pydantic.Field(default=None, serialization_alias='openContext')
     class_name: _class_name.ClassName = None
     type: _t.Literal['Modal'] = 'Modal'
 
@@ -174,9 +174,9 @@ class ServerLoad(pydantic.BaseModel, extra='forbid'):
 class Image(pydantic.BaseModel, extra='forbid'):
     src: str
     alt: _t.Union[str, None] = None
-    width: _t.Union[int, float, str, None] = None
-    height: _t.Union[int, float, str, None] = None
-    referrerpolicy: _t.Union[
+    width: _t.Union[str, int, None] = None
+    height: _t.Union[str, int, None] = None
+    referrer_policy: _t.Union[
         _t.Literal[
             'no-referrer',
             'no-referrer-when-downgrade',
@@ -188,7 +188,7 @@ class Image(pydantic.BaseModel, extra='forbid'):
             'unsafe-url',
         ],
         None,
-    ] = None
+    ] = pydantic.Field(None, serialization_alias='referrerPolicy')
     loading: _t.Union[_t.Literal['eager', 'lazy'], None] = None
     on_click: _t.Union[events.AnyEvent, None] = pydantic.Field(default=None, serialization_alias='onClick')
     class_name: _class_name.ClassName = None
@@ -200,37 +200,32 @@ class Iframe(pydantic.BaseModel, extra='forbid'):
     title: _t.Union[str, None] = None
     width: _t.Union[str, int, None] = None
     height: _t.Union[str, int, None] = None
+    class_name: _class_name.ClassName = None
     type: _t.Literal['Iframe'] = 'Iframe'
 
 
-AnyComponent = _te.TypeAliasType(
-    'AnyComponent',
-    _te.Annotated[
-        _t.Union[
-            Text,
-            Paragraph,
-            PageTitle,
-            Div,
-            Page,
-            Heading,
-            Markdown,
-            Code,
-            Button,
-            Link,
-            LinkList,
-            Navbar,
-            Modal,
-            ServerLoad,
-            Table,
-            Pagination,
-            Display,
-            Details,
-            Form,
-            ModelForm,
-            Image,
-            Iframe,
-            FormField,
-        ],
-        pydantic.Field(discriminator='type'),
-    ],
-)
+AnyComponent = _t.Union[
+    Text,
+    Paragraph,
+    PageTitle,
+    Div,
+    Page,
+    Heading,
+    Markdown,
+    Code,
+    Button,
+    Link,
+    LinkList,
+    Navbar,
+    Modal,
+    ServerLoad,
+    Table,
+    Pagination,
+    Display,
+    Details,
+    Form,
+    ModelForm,
+    Image,
+    Iframe,
+    FormField,
+]
diff --git a/src/python-fastui/fastui/components/display.py b/src/python-fastui/fastui/components/display.py
index e27e556d..6f33d69c 100644
--- a/src/python-fastui/fastui/components/display.py
+++ b/src/python-fastui/fastui/components/display.py
@@ -13,10 +13,6 @@
 
 
 class DisplayMode(str, enum.Enum):
-    """
-    How to a value.
-    """
-
     auto = 'auto'  # default, same as None below
     plain = 'plain'
     datetime = 'datetime'
@@ -30,6 +26,7 @@ class DisplayMode(str, enum.Enum):
 
 class DisplayBase(pydantic.BaseModel, ABC, defer_build=True):
     mode: _t.Union[DisplayMode, None] = None
+    title: _t.Union[str, None] = None
     on_click: _t.Union[events.AnyEvent, None] = pydantic.Field(default=None, serialization_alias='onClick')
 
 
@@ -39,7 +36,6 @@ class DisplayLookup(DisplayBase, extra='forbid'):
     """
 
     field: str
-    title: _t.Union[str, None] = None
     # percentage width - 0 to 100, specific to tables
     table_width_percent: _t.Union[_te.Annotated[int, _at.Interval(ge=0, le=100)], None] = pydantic.Field(
         default=None, serialization_alias='tableWidthPercent'
@@ -51,7 +47,7 @@ class Display(DisplayBase, extra='forbid'):
     Description of how to display a value, either in a table or detail view.
     """
 
-    value: _t.Any
+    value: _t.Any = pydantic.Field(json_schema_extra={'type': 'JSON'})
     type: _t.Literal['Display'] = 'Display'
 
 
diff --git a/src/python-fastui/fastui/components/forms.py b/src/python-fastui/fastui/components/forms.py
index 0a571aba..1b6d237f 100644
--- a/src/python-fastui/fastui/components/forms.py
+++ b/src/python-fastui/fastui/components/forms.py
@@ -10,22 +10,27 @@
 if _t.TYPE_CHECKING:
     from . import AnyComponent
 
+# # alphabetical order matches typescript-json-schema
+# InputHtmlType = _t.Literal['date', 'datetime-local', 'email', 'number', 'password', 'text', 'time', 'url']
 InputHtmlType = _t.Literal['text', 'date', 'datetime-local', 'time', 'email', 'url', 'number', 'password']
 
 
 class BaseFormField(pydantic.BaseModel, ABC, defer_build=True):
     name: str
-    title: _t.Union[str, _t.List[str]]
+    title: _t.Union[_t.List[str], str]
     required: bool = False
     error: _t.Union[str, None] = None
     locked: bool = False
     description: _t.Union[str, None] = None
+    display_mode: _t.Union[_t.Literal['default', 'inline'], None] = pydantic.Field(
+        default=None, serialization_alias='displayMode'
+    )
     class_name: _class_name.ClassName = None
 
 
 class FormFieldInput(BaseFormField):
     html_type: InputHtmlType = pydantic.Field(default='text', serialization_alias='htmlType')
-    initial: _t.Union[str, int, float, None] = None
+    initial: _t.Union[str, float, None] = None
     placeholder: _t.Union[str, None] = None
     type: _t.Literal['FormFieldInput'] = 'FormFieldInput'
 
@@ -43,7 +48,7 @@ class FormFieldFile(BaseFormField):
 
 
 class FormFieldSelect(BaseFormField):
-    options: _t.Union[_t.List[forms.SelectOption], _t.List[forms.SelectGroup]]
+    options: forms.SelectOptions
     multiple: _t.Union[bool, None] = None
     initial: _t.Union[str, None] = None
     vanilla: _t.Union[bool, None] = None
@@ -72,7 +77,7 @@ class BaseForm(pydantic.BaseModel, ABC, defer_build=True, extra='forbid'):
         default=None, serialization_alias='displayMode'
     )
     submit_on_change: _t.Union[bool, None] = pydantic.Field(default=None, serialization_alias='submitOnChange')
-    footer: '_t.Union[bool, _t.List[AnyComponent], None]' = None
+    footer: '_t.Union[_t.List[AnyComponent], bool, None]' = None
     class_name: _class_name.ClassName = None
 
     @pydantic.model_validator(mode='after')
diff --git a/src/python-fastui/fastui/components/tables.py b/src/python-fastui/fastui/components/tables.py
index 4ba0eed1..327ae95b 100644
--- a/src/python-fastui/fastui/components/tables.py
+++ b/src/python-fastui/fastui/components/tables.py
@@ -41,7 +41,7 @@ def fill_columns(self) -> _te.Self:
 
 class Pagination(pydantic.BaseModel):
     page: int
-    page_size: int
+    page_size: int = pydantic.Field(serialization_alias='pageSize')
     total: int
     class_name: _class_name.ClassName = None
     type: _t.Literal['Pagination'] = 'Pagination'
diff --git a/src/python-fastui/fastui/events.py b/src/python-fastui/fastui/events.py
index 373c727d..01733616 100644
--- a/src/python-fastui/fastui/events.py
+++ b/src/python-fastui/fastui/events.py
@@ -1,15 +1,15 @@
 from typing import Dict, Literal, Union
 
 from pydantic import BaseModel, Field
-from typing_extensions import Annotated, TypeAlias
+from typing_extensions import Annotated, TypeAliasType
 
-EventContext: TypeAlias = Dict[str, Union[str, int]]
+ContextType = TypeAliasType('ContextType', Dict[str, Union[str, int]])
 
 
 class PageEvent(BaseModel):
     name: str
     push_path: Union[str, None] = Field(default=None, serialization_alias='pushPath')
-    context: Union[EventContext, None] = None
+    context: Union[ContextType, None] = None
     clear: Union[bool, None] = None
     type: Literal['page'] = 'page'
 
diff --git a/src/python-fastui/fastui/forms.py b/src/python-fastui/fastui/forms.py
index 59c37abe..2a2d8215 100644
--- a/src/python-fastui/fastui/forms.py
+++ b/src/python-fastui/fastui/forms.py
@@ -170,8 +170,11 @@ class SelectGroup(_te.TypedDict):
     options: _t.List[SelectOption]
 
 
+SelectOptions = _te.TypeAliasType('SelectOptions', _t.Union[_t.List[SelectOption], _t.List[SelectGroup]])
+
+
 class SelectSearchResponse(pydantic.BaseModel):
-    options: _t.Union[_t.List[SelectOption], _t.List[SelectGroup]]
+    options: SelectOptions
 
 
 NestedDict: _te.TypeAlias = 'dict[str | int, NestedDict | str | list[str] | ds.UploadFile | list[ds.UploadFile]]'
diff --git a/src/python-fastui/tests/react-fastui-json-schema.json b/src/python-fastui/tests/react-fastui-json-schema.json
index 05b70161..bf6ad768 100644
--- a/src/python-fastui/tests/react-fastui-json-schema.json
+++ b/src/python-fastui/tests/react-fastui-json-schema.json
@@ -219,23 +219,7 @@
           "type": "string"
         },
         "value": {
-          "anyOf": [
-            {
-              "items": {
-                "$ref": "#/definitions/JsonData"
-              },
-              "type": "array"
-            },
-            {
-              "additionalProperties": {
-                "$ref": "#/definitions/JsonData"
-              },
-              "type": "object"
-            },
-            {
-              "type": ["null", "string", "number", "boolean"]
-            }
-          ]
+          "type": "JSON"
         }
       },
       "type": "object"
@@ -390,10 +374,17 @@
           "type": "boolean"
         },
         "title": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "type": {
           "const": "FormFieldBoolean",
@@ -436,10 +427,17 @@
           "type": "boolean"
         },
         "title": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "type": {
           "const": "FormFieldFile",
@@ -486,10 +484,17 @@
           "type": "boolean"
         },
         "title": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "type": {
           "const": "FormFieldInput",
@@ -557,10 +562,17 @@
           "type": "boolean"
         },
         "title": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "type": {
           "const": "FormFieldSelect",
@@ -578,7 +590,7 @@
           "$ref": "#/definitions/ClassName"
         },
         "debounce": {
-          "type": "number"
+          "type": "integer"
         },
         "description": {
           "type": "string"
@@ -615,10 +627,17 @@
           "type": "string"
         },
         "title": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
+          "anyOf": [
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "type": {
           "const": "FormFieldSelectSearch",
@@ -656,7 +675,7 @@
           "type": "array"
         },
         "initial": {
-          "$ref": "#/definitions/Record<string,any>"
+          "type": "object"
         },
         "method": {
           "enum": ["GET", "GOTO", "POST"],
@@ -700,7 +719,7 @@
         },
         "level": {
           "enum": [1, 2, 3, 4, 5, 6],
-          "type": "number"
+          "type": "integer"
         },
         "text": {
           "type": "string"
@@ -718,9 +737,12 @@
           "$ref": "#/definitions/ClassName"
         },
         "height": {
-          "type": ["string", "number"]
+          "type": ["string", "integer"]
         },
         "src": {
+          "format": "uri",
+          "maxLength": 2083,
+          "minLength": 1,
           "type": "string"
         },
         "title": {
@@ -731,7 +753,7 @@
           "type": "string"
         },
         "width": {
-          "type": ["string", "number"]
+          "type": ["string", "integer"]
         }
       },
       "type": "object"
@@ -745,7 +767,7 @@
           "$ref": "#/definitions/ClassName"
         },
         "height": {
-          "type": ["string", "number"]
+          "type": ["string", "integer"]
         },
         "loading": {
           "enum": ["eager", "lazy"],
@@ -785,7 +807,7 @@
           "type": "string"
         },
         "width": {
-          "type": ["string", "number"]
+          "type": ["string", "integer"]
         }
       },
       "type": "object"
@@ -973,7 +995,7 @@
           "type": "array"
         },
         "initial": {
-          "$ref": "#/definitions/Record<string,any>"
+          "type": "object"
         },
         "method": {
           "enum": ["GET", "GOTO", "POST"],
@@ -1083,16 +1105,16 @@
           "$ref": "#/definitions/ClassName"
         },
         "page": {
-          "type": "number"
+          "type": "integer"
         },
         "pageCount": {
-          "type": "number"
+          "type": "integer"
         },
         "pageSize": {
-          "type": "number"
+          "type": "integer"
         },
         "total": {
-          "type": "number"
+          "type": "integer"
         },
         "type": {
           "const": "Pagination",
@@ -1116,9 +1138,6 @@
       },
       "type": "object"
     },
-    "Record<string,any>": {
-      "type": "object"
-    },
     "Record<string,boolean|null>": {
       "type": "object"
     },
diff --git a/src/python-fastui/tests/test_json_schema_match.py b/src/python-fastui/tests/test_json_schema_match.py
index 3fdf4681..ceef80c8 100644
--- a/src/python-fastui/tests/test_json_schema_match.py
+++ b/src/python-fastui/tests/test_json_schema_match.py
@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import pytest
+from dirty_equals import IsList
 from fastui import AnyComponent
 from pydantic import TypeAdapter
 
@@ -12,7 +13,7 @@
 
 ta = TypeAdapter(AnyComponent)
 json_schema = ta.json_schema(by_alias=True, mode='serialization', ref_template='#/definitions/{model}')
-components_union = json_schema['oneOf']
+components_union = json_schema['anyOf']
 components_union_set = set(d['$ref'] for d in components_union)
 
 
@@ -23,36 +24,84 @@ def python_model_iter():
         yield pytest.param(python_defs[key], id=key)
 
 
+NULL_TYPE = {'type': 'null'}
+
+
+def any_of_simple(any_of: list[typing.Any]) -> list[typing.Any] | None:
+    new_types = []
+    simple = True
+    for s in any_of:
+        if s == NULL_TYPE:
+            continue
+        elif len(s) == 1 and (value := s.get('type')):
+            new_types.append(value)
+        else:
+            simple = False
+
+    if simple:
+        return new_types
+
+
 def fix_pydantic_schema(s: typing.Any):
     """
-    * convert pydantic's `anyOf` all components to typescripts `'$ref': '#/definitions/FastProps'`
-    * switch "type": "integer" to "type": "number"
-    * switch `{"anyOf": [{"type": "XXX"}, {"type": "null"}]}` to `{"type": "XXX"}`
-    * switch `{"oneOf": ..., "discriminator": ...}` to `{"anyOf": ...}`
+    Convert pydantic JSON schema to match `typescript-json-schema`.
     """
     if isinstance(s, dict):
-        for k, v in s.items():
-            if k == 'type' and v == 'integer':
-                s[k] = 'number'
-            if isinstance(v, dict):
-                if any_of := v.get('anyOf'):
-                    refs = [d.get('$ref') for d in any_of]
-                    if set(refs) == components_union_set:
-                        v.pop('anyOf')
-                        v['$ref'] = '#/definitions/FastProps'
-                        continue
-
-                    null_type = {'type': 'null'}
-                    if null_type in any_of and len(any_of) == 2:
-                        other = next(d for d in any_of if d != null_type)
+        s.pop('readOnly', None)
+
+        if len(s) == 2 and 'discriminator' in s and (one_of := s.get('oneOf')):
+            s.clear()
+            s['anyOf'] = one_of
+        else:
+            for k, v in list(s.items()):
+                if k == '$ref':
+                    if v in {'#/definitions/DisplayLookup', '#/definitions/Link'}:
+                        s['$ref'] = f'{v}Props'
+                    elif v == '#/definitions/BaseModel':
+                        s['$ref'] = '#/definitions/ModelData'
+                    elif v == '#/definitions/DisplayMode':
+                        display_mode = json_schema['$defs']['DisplayMode']
+                        s.clear()
+                        s.update(
+                            enum=IsList(*display_mode['enum'], check_order=False),
+                            type='string',
+                        )
+
+                    continue
+
+                if isinstance(v, dict):
+                    if any_of := v.get('anyOf'):
+                        refs = [d.get('$ref') for d in any_of]
+                        if set(refs) == components_union_set:
+                            v.pop('anyOf')
+                            v['$ref'] = '#/definitions/FastProps'
+                            continue
+
+                        if NULL_TYPE in any_of and len(any_of) == 2:
+                            other = next(d for d in any_of if d != NULL_TYPE)
+                            fix_pydantic_schema(other)
+                            v.clear()
+                            v.update(other)
+                            continue
+
+                        if (new_types := any_of_simple(any_of)) is not None:
+                            v.clear()
+                            v['type'] = new_types
+                            continue
+
+                        if NULL_TYPE in any_of:
+                            any_of.remove(NULL_TYPE)
+
+                    if k == 'formFields':
+                        # hack until we fix `customise_form_fields`
                         v.clear()
-                        v.update(other)
+                        v.update({'items': {'$ref': '#/definitions/FormFieldProps'}, 'type': 'array'})
+                        continue
 
-                if 'discriminator' in v and (one_of := v.get('oneOf')):
-                    v.clear()
-                    v['anyOf'] = one_of
+                if k == 'enum':
+                    s[k] = IsList(*v, check_order=False)
 
-            fix_pydantic_schema(v)
+                fix_pydantic_schema(v)
     elif isinstance(s, list):
         for item in s:
             fix_pydantic_schema(item)
@@ -68,13 +117,6 @@ def test_components_match(model_schema: typing.Dict[str, typing.Any]):
         title = ref.split('/')[-1]
         model_schema = model_schema['$defs'][title]
 
-    react_title = f'{title}Props'
-
-    try:
-        react_schema = REACT_SCHEMA_DEFS[react_title]
-    except KeyError as e:
-        pytest.fail(f'No react model found with name {e}')
-
     model_properties = model_schema['properties']
     for value in model_properties.values():
         value.pop('title', None)
@@ -82,16 +124,24 @@ def test_components_match(model_schema: typing.Dict[str, typing.Any]):
 
     fix_pydantic_schema(model_properties)
 
+    try:
+        react_schema = REACT_SCHEMA_DEFS[f'{title}Props']
+    except KeyError as e:
+        pytest.fail(f'No react model found with name {e}')
+
     react_properties = react_schema['properties']
     # typescript-json-schema adds type to `const` properties while pydantic does not,
     # pydantic matches the example from JSON Schema's docs
     # https://json-schema.org/understanding-json-schema/reference/const
     react_properties['type'].pop('type')
 
+    # `onChange` is a frontend only attribute
+    react_properties.pop('onChange', None)
+
     if 'className' in model_properties and 'className' in react_properties:
         # class name doesn't match due to recursive type
         model_properties.pop('className')
         react_properties.pop('className')
 
-    # debug(model_properties, react_properties)
+    debug(model_properties, react_properties)
     assert model_properties == react_properties