Fixed type visibility when parent is namespace

fable-compiler · Apr 5, 2024 · 742efe3 · nojaf · Apr 23, 2024 · ncave
1 parent 836ee7a
commit 742efe3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -271,7 +271,7 @@
         "request": "launch",
         "preLaunchTask": "build",
         "program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
-        "args": ["--outDir", "${workspaceRoot}/../fable-test", "--fableLib", "../../Fable/build/fable-library-rust", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache"],
+        "args": ["--outDir", "${workspaceRoot}/../fable-test", "--fableLib", "../../Fable/build/fable-library-rust", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache", "--noParallelTypeCheck"],
         "cwd": "${workspaceRoot}/../fable-test",
         "stopAtEntry": false,
         "console": "internalConsole"

diff --git a/src/Fable.Transforms/FSharp2Fable.Util.fs b/src/Fable.Transforms/FSharp2Fable.Util.fs
@@ -826,24 +826,26 @@ module Helpers =
         | FSharpInlineAnnotation.AlwaysInline
         | FSharpInlineAnnotation.AggressiveInline -> true
 
+    let hasOwnSignatureFile (ent: FSharpEntity) =
+        not ent.IsNamespace
+        && (
+            match ent.SignatureLocation with
+            | None -> false
+            | Some m -> m.FileName.EndsWith(".fsi", StringComparison.Ordinal)
+        )
+
     let parentHasSignatureFile (declaringEntity: FSharpEntity option) =
         declaringEntity
-        |> Option.bind (fun p -> p.SignatureLocation)
-        |> Option.map (fun m -> m.FileName.EndsWith(".fsi", StringComparison.Ordinal))
+        |> Option.map (fun ent -> hasOwnSignatureFile ent)
         |> Option.defaultValue false
 
     let topLevelBindingHiddenBySignatureFile (v: FSharpMemberOrFunctionOrValue) =
         v.IsModuleValueOrMember
         && not v.HasSignatureFile
         && parentHasSignatureFile v.DeclaringEntity
 
-    let typeIsHiddenBySignatureFile (ent: FSharpEntity) : bool =
-        let hasOwnSignatureFile =
-            match ent.SignatureLocation with
-            | None -> false
-            | Some m -> m.FileName.EndsWith(".fsi", StringComparison.Ordinal)
-
-        not hasOwnSignatureFile && parentHasSignatureFile ent.DeclaringEntity
+    let typeIsHiddenBySignatureFile (ent: FSharpEntity) =
+        not (hasOwnSignatureFile ent) && parentHasSignatureFile ent.DeclaringEntity
 
     let isNotPrivate (memb: FSharpMemberOrFunctionOrValue) =
         if memb.IsCompilerGenerated then