[Rust] Fixed import path rewrite (#3954)

Author: ncave

src/Fable.Cli/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* [Rust] Fixed import path rewrite (by @ncave)
 * [Rust] Updated derived interfaces (by @ncave)
 * [Rust] Updated string comparisons (by @ncave)
 * [Rust] Fixed derived traits mapping (by @ncave)

src/Fable.Cli/Pipeline.fs

@@ -442,7 +442,21 @@ module Rust =
         let stream = new IO.StreamWriter(targetPath)
 
         interface Printer.Writer with
-            member _.Write(str) =
+            member self.Write(str) =
+
+                let str =
+                    // rewrite import paths in last file
+                    if com.CurrentFile = (Array.last com.SourceFiles) then
+                        System.Text.RegularExpressions.Regex.Replace(
+                            str,
+                            @"(#\[path\s*=\s*\"")([^""]*)(\""])",
+                            fun m ->
+                                let path = (self :> Printer.Writer).MakeImportPath(m.Groups[2].Value)
+                                m.Groups[1].Value + path + m.Groups[3].Value
+                        )
+                    else
+                        str
+
                 stream.WriteAsync(str) |> Async.AwaitTask
 
             member _.MakeImportPath(path) =

src/Fable.Compiler/Util.fs

@@ -617,7 +617,10 @@ module Imports =
                     importPath
 
             if isAbsolutePath importPath then
-                if importPath.EndsWith(".fs", StringComparison.Ordinal) then
+                if
+                    importPath.EndsWith(".fs", StringComparison.Ordinal)
+                    || importPath.EndsWith(".rs", StringComparison.Ordinal)
+                then
                     getTargetRelativePath pathResolver importPath targetDir projDir outDir
                 else
                     getRelativePath targetDir importPath

src/Fable.Transforms/Rust/AST/Rust.AST.Helpers.fs

@@ -20,7 +20,7 @@ module Naming =
     let rustPrelude = HashSet(kw.RustPrelude)
 
     let rawIdent (ident: string) =
-        if ident.StartsWith("r#") then
+        if ident = "" || ident = "_" || ident.StartsWith("r#") then
             ident
         else
             "r#" + ident

src/Fable.Transforms/Rust/Fable2Rust.fs

@@ -2228,9 +2228,8 @@ module Util =
 
     let maybeAddParens fableExpr (expr: Rust.Expr) : Rust.Expr =
         match fableExpr with
-        | Fable.IfThenElse _ -> mkParenExpr expr
-        // TODO: add more expressions that need parens
-        | _ -> expr
+        | Fable.Value _ -> expr
+        | _ -> mkParenExpr expr
 
     let transformOperation com ctx range typ opKind : Rust.Expr =
         match opKind with
@@ -5103,6 +5102,7 @@ module Util =
     let isFableLibraryPath (com: IRustCompiler) (path: string) =
         not (isFableLibrary com)
         && (path.StartsWith(com.LibraryDir, StringComparison.Ordinal)
+            || path.Contains("fable-library-rust")
             || path = "fable_library_rust")
 
     let getImportModulePath (com: IRustCompiler) (path: string) =
@@ -5235,7 +5235,8 @@ module Compiler =
                         // add import module to a global list (across files)
                         if
                             path.Length > 0
-                            && path <> "fable_library_rust"
+                            && not (path = "fable_library_rust")
+                            && not (path.Contains("fable-library-rust"))
                             && not (isFableLibraryPath self path)
                         then
                             importModules.TryAdd(modulePath, true) |> ignore

src/fable-standalone/.gitignore

@@ -5,3 +5,5 @@ perf*.data
 perf*.svg
 build/
 dist/
+target/
+Cargo.lock

src/fable-standalone/test/bench-compiler/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "bench-compiler"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "bench-compiler"
+path = "./out-rust/app.rs"
+
+[features]
+threaded = ["fable_library_rust/threaded"]
+default = ["threaded"]
+
+[dependencies]
+fable_library_rust = { path = "./out-rust/fable_modules/fable-library-rust" }

…lone/test/bench-compiler/src/Platform.fs …andalone/test/bench-compiler/Platform.fssrc/fable-standalone/test/bench-compiler/src/Platform.fs renamed to src/fable-standalone/test/bench-compiler/Platform.fs src/fable-standalone/test/bench-compiler/src/Platform.fs renamed to src/fable-standalone/test/bench-compiler/Platform.fs

@@ -84,7 +84,26 @@ let getGlobFiles (path: string) =
 let serializeToJson (value: obj) =
     System.Text.Json.JsonSerializer.Serialize(value)
 
-#else
+#endif
+
+#if FABLE_COMPILER_RUST
+
+let readAllBytes (filePath: string) : byte[] = [||]
+let readAllText (filePath: string) : string = ""
+let writeAllText (filePath: string) (text: string) : unit = ()
+let measureTime (f: 'a -> 'b) x = f x, 0
+let ensureDirExists (path: string) : unit = ()
+let normalizePath (path: string) = path.Replace('\\', '/')
+let normalizeFullPath (path: string) = path
+let getRelativePath (path: string) (pathTo: string) = path
+let getHomePath () = ""
+let getDirFiles (path: string) (extension: string) : string[] = [||]
+let getGlobFiles (path: string) : string[] = [||]
+let serializeToJson (value: obj) = ""
+
+#endif
+
+#if FABLE_COMPILER_JAVASCRIPT || FABLE_COMPILER_TYPESCRIPT
 
 open Fable.Core.JsInterop
 

…test/bench-compiler/src/ProjectParser.fs …one/test/bench-compiler/ProjectParser.fssrc/fable-standalone/test/bench-compiler/src/ProjectParser.fs renamed to src/fable-standalone/test/bench-compiler/ProjectParser.fs src/fable-standalone/test/bench-compiler/src/ProjectParser.fs renamed to src/fable-standalone/test/bench-compiler/ProjectParser.fs

@@ -4,10 +4,10 @@ open Fable.Compiler.Platform
 open Fable.Compiler.ProjectParser
 
 let getMetadataDir () : string =
-    __SOURCE_DIRECTORY__ + "/../../../../fable-metadata/lib/"
+    __SOURCE_DIRECTORY__ + "/../../../fable-metadata/lib/"
 
 let getFableLibDir () : string =
-    __SOURCE_DIRECTORY__ + "/../../../../../temp/fable-library-js"
+    __SOURCE_DIRECTORY__ + "/../../../../temp/fable-library-js"
 
 let getVersion () : string = ".next"