Merge branch 'develop'

Author: Lanayx

examples/TodoList/src/App.fs

@@ -2,14 +2,29 @@ module App
 
 open Oxpecker.Solid
 open Components
+open Oxpecker.Solid.Router
 
 [<SolidComponent>]
 let App() : HtmlElement =
-    TodoList()
-    //TodoListStore()
+    div(){
+        TodoList()
+        //TodoListStore()
+        br()
+        br()
+        A(href="/about", class'="block text-right") {
+            "About"
+        }
+    }
 
 [<SolidComponent>]
 let About() : HtmlElement =
-    h1() {
-        "TodoList example made with Oxpecker.Solid!"
+    Fragment() {
+        h1() {
+            "TodoList example made with Oxpecker.Solid!"
+        }
+        br()
+        br()
+        A(href="/", class'="block text-right") {
+            "Back"
+        }
     }

src/Oxpecker.Solid.FablePlugin/Library.fs

@@ -25,17 +25,22 @@ module internal rec AST =
     let (|CallTag|_|) condition =
         function
         | Call(Import(importInfo, LambdaType(_, DeclaredType(typ, _)), _), callInfo, _, range) when condition importInfo ->
-            let tagName = typ.FullName.Split('.') |> Seq.last
-            let finalTagName =
-                if tagName = "Fragment" then
-                    ""
-                elif tagName.EndsWith("'") then
-                    tagName.Substring(0, tagName.Length - 1)
-                elif tagName.EndsWith("`1") then
-                    tagName.Substring(0, tagName.Length - 2)
-                else
-                    tagName
-            Some(AutoImport finalTagName, callInfo, range)
+            let tagImport =
+                match callInfo.Args with
+                | Let(_, LibraryTagImport(imp, _), _) :: _ -> LibraryImport imp
+                | _ ->
+                    let tagName = typ.FullName.Split('.') |> Seq.last
+                    let finalTagName =
+                        if tagName = "Fragment" then
+                            ""
+                        elif tagName.EndsWith("'") then
+                            tagName.Substring(0, tagName.Length - 1)
+                        elif tagName.EndsWith("`1") then
+                            tagName.Substring(0, tagName.Length - 2)
+                        else
+                            tagName
+                    AutoImport finalTagName
+            Some(tagImport, callInfo, range)
         | _ -> None
 
     let (|TagNoChildren|_|) (expr: Expr) =

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

@@ -17,9 +17,9 @@
         <PackageTags>Oxpecker;F#;FSharp;Plugin;fable-javascript;Compiler;Fable;Solid;Solidjs</PackageTags>
         <Authors>Vladimir Shchur</Authors>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <Version>0.2.0</Version>
-        <PackageVersion>0.2.0</PackageVersion>
-        <PackageReleaseNotes>Solid router support</PackageReleaseNotes>
+        <Version>0.2.2</Version>
+        <PackageVersion>0.2.2</PackageVersion>
+        <PackageReleaseNotes>Fixed jsx for Solid A element</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/Oxpecker.Solid/Oxpecker.Solid.fsproj

@@ -18,9 +18,9 @@
         <PackageTags>Oxpecker;F#;FSharp;Fable;fable-javascript;Web;Framework;Solid;Solidjs</PackageTags>
         <Authors>Vladimir Shchur</Authors>
         <PackageReadmeFile>README.md</PackageReadmeFile>
-        <Version>0.2.1</Version>
-        <PackageVersion>0.2.1</PackageVersion>
-        <PackageReleaseNotes>Fable output got minimized</PackageReleaseNotes>
+        <Version>0.2.2</Version>
+        <PackageVersion>0.2.2</PackageVersion>
+        <PackageReleaseNotes>Fixed jsx for Solid A element</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/Oxpecker.Solid/SolidRouterBindings.fs

@@ -75,12 +75,16 @@ module Bindings =
     [<Import("Route", "@solidjs/router")>]
     type Route() =
         interface HtmlElement
+        [<Erase>]
         member this.path
             with set (value: string) = ()
+        [<Erase>]
         member this.component'
             with set (value: unit -> HtmlElement) = ()
+        [<Erase>]
         member this.matchFilters
             with set (value: obj) = ()
+        [<Erase>]
         member this.preload
             with set (value: RoutePreloadFunc) = ()
         member inline _.Combine
@@ -107,16 +111,22 @@ module Bindings =
     [<Import("Router", "@solidjs/router")>]
     type Router() =
         interface HtmlElement
+        [<Erase>]
         member this.root
             with set (value: RootProps -> HtmlElement) = ()
+        [<Erase>]
         member this.base'
             with set (value: string) = ()
+        [<Erase>]
         member this.actionBase
             with set (value: string) = ()
+        [<Erase>]
         member this.preload
             with set (value: bool) = ()
+        [<Erase>]
         member this.explicitLinks
             with set (value: bool) = ()
+        [<Erase>]
         member this.url
             with set (value: string) = ()
         member inline _.Combine
@@ -151,7 +161,7 @@ module Bindings =
             runExpr Unchecked.defaultof<_>
             this
 
-    [<Erase>]
+    [<Import("A", "@solidjs/router")>]
     type A() =
         inherit RegularNode()
         [<Erase>]
@@ -176,7 +186,7 @@ module Bindings =
         member this.end'
             with set (value: bool) = ()
 
-    [<Erase>]
+    [<Import("Navigate", "@solidjs/router")>]
     type Navigate() =
         inherit RegularNode()
         [<Erase>]

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

@@ -1,4 +1,4 @@
-import { Route, Router } from "@solidjs/router";
+import { Route, Router, A } from "@solidjs/router";
 import { App1 } from "./App1.fs.js";
 import { App2 } from "./App2.fs.js";
 import { lazy } from "solid-js";
@@ -9,6 +9,9 @@ export function Root(props) {
             Root header
         </h1>
         {props.children}
+        <A href="/about">
+            About
+        </A>
     </>;
 }
 

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

@@ -10,6 +10,7 @@ let Root (props: RootProps) : HtmlElement =
     Fragment() {
         h1() { "Root header" }
         props.children
+        A(href="/about") { "About" }
     }
 
 [<SolidComponent>]