Prevent useNavigator being compiled as tag

Lanayx · Jan 3, 2025 · dcf7e9f · dcf7e9f
1 parent aff174f
commit dcf7e9f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/src/Oxpecker.Solid.FablePlugin/Library.fs b/src/Oxpecker.Solid.FablePlugin/Library.fs
@@ -110,7 +110,7 @@ module internal rec AST =
 
     let (|LibraryTagImport|_|) (expr: Expr) =
         match expr with
-        | Call(Import({ Kind = UserImport false }, Any, _) as imp, _, DeclaredType(typ, []), range) when
+        | Call(Import({ Kind = UserImport false }, Any, _) as imp, { Tags = [ "new" ] }, DeclaredType(typ, []), range) when
             typ.FullName.StartsWith("Oxpecker.Solid")
             ->
             Some(imp, range)

diff --git a/src/Oxpecker.Solid.FablePlugin/Oxpecker.Solid.FablePlugin.fsproj b/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.4.1</Version>
-        <PackageVersion>0.4.1</PackageVersion>
-        <PackageReleaseNotes>More graceful fallback on compilation error</PackageReleaseNotes>
+        <Version>0.4.2</Version>
+        <PackageVersion>0.4.2</PackageVersion>
+        <PackageReleaseNotes>Prevent useNavigator being compiled as tag</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Oxpecker.Solid/Oxpecker.Solid.fsproj b/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.4.1</Version>
-        <PackageVersion>0.4.1</PackageVersion>
-        <PackageReleaseNotes>More graceful fallback on compilation error</PackageReleaseNotes>
+        <Version>0.4.2</Version>
+        <PackageVersion>0.4.2</PackageVersion>
+        <PackageReleaseNotes>Prevent useNavigator being compiled as tag</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/tests/Oxpecker.Solid.Tests/Common.fs b/tests/Oxpecker.Solid.Tests/Common.fs
@@ -9,13 +9,13 @@ let private runCase folderName caseName =
     cli {
         Shell CMD
         WorkingDirectory dir
-        Command "dotnet fable --noCache --exclude Oxpecker.Solid.FablePlugin"
+        Command "dotnet fable --noCache --exclude Oxpecker.Solid.FablePlugin --extension .jsx"
     }
     |> Command.execute
     |> Output.toExitCode
     |> shouldEqual 0
 
-    let result = File.ReadAllText($"{dir}/{caseName}.fs.js")
+    let result = File.ReadAllText($"{dir}/{caseName}.jsx")
     let expected = File.ReadAllText($"{dir}/{caseName}.expected")
     result |> shouldEqual expected
 

diff --git a/tests/Oxpecker.Solid.Tests/SolidCases/Router/Router.expected b/tests/Oxpecker.Solid.Tests/SolidCases/Router/Router.expected
@@ -1,7 +1,7 @@
-import { Route, Router, A } from "@solidjs/router";
-import { App1 } from "./App1.fs.js";
-import { App2 } from "./App2.fs.js";
-import { lazy } from "solid-js";
+import { Route, Router, useNavigate, A } from "@solidjs/router";
+import { lazy, createEffect } from "solid-js";
+import { App1 } from "./App1.jsx";
+import { App2 } from "./App2.jsx";
 
 export function Root(props) {
     return <>
@@ -15,6 +15,16 @@ export function Root(props) {
     </>;
 }
 
+export function App3() {
+    const navigator = useNavigate();
+    createEffect(() => {
+        navigator("/def/inner");
+    });
+    return <h1>
+        Hello world 3
+    </h1>;
+}
+
 export function Test1() {
     return <Router root={Root}>
         <Route></Route>

diff --git a/tests/Oxpecker.Solid.Tests/SolidCases/Router/Router.fs b/tests/Oxpecker.Solid.Tests/SolidCases/Router/Router.fs
@@ -13,6 +13,13 @@ let Root (props: RootProps) : HtmlElement =
         A(href="/about") { "About" }
     }
 
+[<SolidComponent>]
+let App3 () : HtmlElement =
+    let navigator = useNavigate()
+    createEffect(fun _ -> navigator.Invoke("/def/inner"))
+
+    h1() { "Hello world 3" }
+
 [<SolidComponent>]
 let Test1 () =
     Router(root=Root) {