Solid: Improved Select and ErrorBoundary attributes

Author: Lanayx

src/Oxpecker.Solid.FablePlugin/Library.fs

@@ -177,6 +177,8 @@ module internal rec AST =
                                                     FullName = "Oxpecker.Solid.Builder.HtmlElement"
                                                 },
                                                 _)) -> (propName, transform expr) :: restResults
+                        | Delegate(args, expr, name, tags) ->
+                            (propName, Delegate(args, transform expr, name, tags)) :: restResults
                         | _ -> (propName, propValue) :: restResults
                     else
                         restResults

src/Oxpecker.Solid.FablePlugin/Oxpecker.Solid.FablePlugin.fsproj

@@ -18,9 +18,9 @@
         <Authors>Vladimir Shchur and contributors</Authors>
         <Copyright>Copyright (c) Vladimir Shchur 2024</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <Version>0.3.0</Version>
-        <PackageVersion>0.3.0</PackageVersion>
-        <PackageReleaseNotes>Support for match and if expressions</PackageReleaseNotes>
+        <Version>0.4.0</Version>
+        <PackageVersion>0.4.0</PackageVersion>
+        <PackageReleaseNotes>Support for delegates in attributes</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/Oxpecker.Solid/Oxpecker.Solid.fsproj

@@ -19,9 +19,9 @@
         <Authors>Vladimir Shchur and contributors</Authors>
         <Copyright>Copyright (c) Vladimir Shchur 2024</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <Version>0.3.0</Version>
-        <PackageVersion>0.3.0</PackageVersion>
-        <PackageReleaseNotes>Support for match and if expressions</PackageReleaseNotes>
+        <Version>0.4.0</Version>
+        <PackageVersion>0.4.0</PackageVersion>
+        <PackageReleaseNotes>Improved Select and ErrorBoundary attributes</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/Oxpecker.Solid/SolidBindings.fs

@@ -221,6 +221,9 @@ module Bindings =
         [<Erase>]
         member this.onChange
             with set (_: Event -> unit) = ()
+        [<Erase>]
+        member this.onInput
+            with set (_: InputEvent -> unit) = ()
 
     type textarea with
         [<Erase>]
@@ -512,12 +515,14 @@ module Bindings =
         member this.useShadow
             with set (value: bool) = ()
 
+    module ErrorBoundary =
+        type Fallback = delegate of err: obj * reset: (unit -> unit) -> HtmlElement
     [<Erase>]
     type ErrorBoundary() =
         interface HtmlContainer
         [<Erase>]
         member this.fallback
-            with set (value: HtmlElement) = ()
+            with set (value: ErrorBoundary.Fallback) = ()
 
     [<Erase>]
     type Extensions =
@@ -621,7 +626,7 @@ type Bindings =
     static member render(code: unit -> #HtmlElement, element: #Element) : unit = jsNative
 
     [<ImportMember("solid-js/web")>]
-    static member renderToString(fn: (unit -> #HtmlElement)) : string = jsNative
+    static member renderToString(fn: unit -> #HtmlElement) : string = jsNative
 
     [<ImportMember("solid-js")>]
     static member createSignal(value: 'T) : Signal<'T> = jsNative
@@ -662,22 +667,22 @@ type Bindings =
     static member reconcile<'T, 'U>(value: 'T) : ('U -> 'T) = jsNative
 
     [<ImportMember("solid-js/store")>]
-    static member produce<'T>(fn: ('T -> unit)) : ('T -> 'T) = jsNative
+    static member produce<'T>(fn: 'T -> unit) : ('T -> 'T) = jsNative
 
     [<ImportMember("solid-js/store")>]
     static member unwrap<'T>(item: 'T) : 'T = jsNative
 
     [<ImportMember("solid-js")>]
-    static member batch<'T>(fn: (unit -> 'T)) : 'T = jsNative
+    static member batch<'T>(fn: unit -> 'T) : 'T = jsNative
 
     [<ImportMember("solid-js")>]
-    static member catchError<'T>(tryFn: (unit -> 'T), onError: (obj -> unit)) : 'T = jsNative
+    static member catchError<'T>(tryFn: unit -> 'T, onError: obj -> unit) : 'T = jsNative
 
     [<ImportMember("solid-js")>]
-    static member onCleanup(fn: (unit -> unit)) : unit = jsNative
+    static member onCleanup(fn: unit -> unit) : unit = jsNative
 
     [<ImportMember("solid-js")>]
-    static member onMount(fn: (unit -> unit)) : unit = jsNative
+    static member onMount(fn: unit -> unit) : unit = jsNative
 
     [<ImportMember("solid-js")>]
     static member useTransition() : (unit -> bool) * ((unit -> unit) -> JS.Promise<unit>) = jsNative

tests/Oxpecker.Solid.Tests/SolidCases/Conditional/Conditional.expected

@@ -2,7 +2,9 @@ import { createSignal } from "solid-js";
 
 export function Test(show) {
     const x = createSignal(7)[0];
-    return <div>
+    return <ErrorBoundary fallback={(err, _arg) => <div>
+            {`An error occurred ${err}`}
+        </div>}>
         <Show when={show}
             fallback={<div>
                 World
@@ -28,6 +30,6 @@ export function Test(show) {
                 </p>
             </Match>
         </Switch>
-    </div>;
+    </ErrorBoundary>;
 }
 

tests/Oxpecker.Solid.Tests/SolidCases/Conditional/Conditional.fs

@@ -5,7 +5,7 @@ open Oxpecker.Solid
 [<SolidComponent>]
 let Test (show: bool) =
     let x, _ = createSignal 7
-    div() {
+    ErrorBoundary(fallback= fun err _ -> div() { $"An error occurred {err}" }) {
         Show(when'=show, fallback = div() { "World" }) {
             div() {
                 "Hello"