Several fixes

Author: alfonsogarciacaro

RELEASE_NOTES_COMPILER.md

@@ -1,11 +1,16 @@
+### 0.7.15
+
+* Issue warning when calling `typeof` on a generic parameter
+* Use absolute paths for assembly references in `node_modules`
+
 ### 0.7.14
 
 * Use "umd" distribution of fable-core and other libs when compiling for umd modules
 * Fix #569: Types with circular dependencies
 
 ### 0.7.12
 
-* Fix #568: Types with `StructAttribute`
+* Fix #568: Types with `StructAttribute` (compiled as records)
 * Better checking when calling functions with `PassGenericsAttribute`
 
 ### 0.7.11

src/fable/Fable.Client.Node/AssemblyInfo.fs

@@ -2,10 +2,10 @@
 namespace System
 open System.Reflection
 
-[<assembly: AssemblyVersionAttribute("0.7.10")>]
-[<assembly: AssemblyMetadataAttribute("fableCoreVersion","0.7.9")>]
+[<assembly: AssemblyVersionAttribute("0.7.15")>]
+[<assembly: AssemblyMetadataAttribute("fableCoreVersion","0.7.11")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] AssemblyVersion = "0.7.10"
-    let [<Literal>] AssemblyMetadata_fableCoreVersion = "0.7.9"
+    let [<Literal>] AssemblyVersion = "0.7.15"
+    let [<Literal>] AssemblyMetadata_fableCoreVersion = "0.7.11"

src/fable/Fable.Compiler/AssemblyInfo.fs

@@ -2,8 +2,8 @@
 namespace System
 open System.Reflection
 
-[<assembly: AssemblyVersionAttribute("0.7.10")>]
+[<assembly: AssemblyVersionAttribute("0.7.15")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] AssemblyVersion = "0.7.10"
+    let [<Literal>] AssemblyVersion = "0.7.15"

src/fable/Fable.Compiler/FSharp2Fable.fs

@@ -776,11 +776,13 @@ let private processMemberDecls (com: IFableCompiler) ctx (fableEnt: Fable.Entity
                 ("FSharpUnion"::fableEnt.Interfaces) (Some cases) None
         if needsEqImpl then yield makeUnionEqualMethod fableType
         if needsCompImpl then yield makeUnionCompareMethod fableType ]
-    // TODO: Use specific interface for FSharpException?
     | Fable.Record fields
     | Fable.Exception fields ->
       let isEx = match fableEnt.Kind with Fable.Exception _ -> true | _ -> false
-      [ yield makeRecordCons isEx fields
+      // Structs are considered equivalent to records but
+      // some already include a constructor (see #569)
+      [ if fableEnt.Members |> Seq.exists (fun m -> m.Kind = Fable.Constructor) |> not
+        then yield makeRecordCons isEx fields
         yield makeReflectionMeth fableEnt false fableEnt.FullName
                 ("FSharpRecord"::fableEnt.Interfaces) None (Some fields)
         if needsEqImpl then yield makeRecordEqualMethod fableType
@@ -1149,25 +1151,29 @@ let private getProjectMaps (com: ICompiler) (parsedProj: FSharpCheckProjectResul
         try
             let asmName = Path.GetFileNameWithoutExtension(asmPath)
             let resolve =
+                // TODO: Use a case insensitive search?
                 match Map.tryFind asmName com.Options.refs with
                 | Some baseDir when baseDir.StartsWith(".") ->
-                    let baseDir = Path.GetFullPath(baseDir)
-                    fun path -> Path.GetFullPath(combine baseDir path)
+                    Path.GetFullPath(baseDir)
                 | Some baseDir ->
                     // The triple slash is just a mark to indicate
                     // the import must NOT be resolved with a relative path
-                    fun path -> "///" + combine baseDir path
+                    "///" + baseDir
                 | None ->
                     let baseDir =
-                        let asmDir = Path.GetDirectoryName(asmPath)
+                        let asmDir = Path.GetDirectoryName(Path.GetFullPath(asmPath))
                         // If we're compiling to a non-ES2015 module check if the referenced
                         // library includes a UMD distribution
                         if Naming.umdModules.Contains com.Options.moduleSystem
                         then
-                            let umdDir = Path.GetFullPath(Path.Combine(asmDir, "umd"))
+                            let umdDir = Path.Combine(asmDir, "umd")
                             if Directory.Exists(umdDir) then umdDir else asmDir
                         else asmDir
-                    fun path -> Path.GetFullPath(combine baseDir path)
+                    // If the assembly is an npm package, use an absolute reference
+                    let i = baseDir.IndexOf("node_modules/")
+                    if i > -1 then "///" + baseDir.Substring(i + 13) else baseDir
+                |> fun baseDir ->
+                    fun path -> combine baseDir path
             let fableMap =
                 let json = File.ReadAllText(mapPath)
                 Newtonsoft.Json.JsonConvert.DeserializeObject<Fable.FableMap>(json).files

src/fable/Fable.Compiler/Replacements.fs

@@ -569,12 +569,18 @@ module private AstPass =
             Fable.Throw (newError None Fable.Any args, typ, r) |> Some
         // Type ref
         | "typeOf" | "typeDefOf" ->
-            let genInfo = {
-                makeGeneric = info.methodName = "typeOf"
-                genericAvailability = info.genericAvailability
-            }
-            info.methodTypeArgs.Head
-            |> makeTypeRef genInfo |> Some
+            let genInfo =
+                { makeGeneric = info.methodName = "typeOf"
+                ; genericAvailability = info.genericAvailability }
+            match info.methodTypeArgs with
+            | [Fable.GenericParam _ as t] when not info.genericAvailability ->
+                "`typeof` is being called on a generic parameter, "
+                + "consider inlining the method (for `internal` members) "
+                + "or using `PassGenericsAttribute`."
+                |> addWarning com info
+                makeTypeRef genInfo t |> Some
+            | [t] -> makeTypeRef genInfo t |> Some
+            | _ -> None
         // Concatenates two lists
         | "op_Append" ->
           CoreLibCall("List", Some "append", false, args)
@@ -1430,7 +1436,7 @@ module private AstPass =
     let types com (info: Fable.ApplyInfo) =
         let str x = Fable.Value(Fable.StringConst x)
         match info.callee with
-        | Some(Fable.Value(Fable.TypeRef(ent,[]))) ->
+        | Some(Fable.Value(Fable.TypeRef(ent,_))) ->
             match info.methodName with
             | "namespace" -> str ent.Namespace |> Some
             | "fullName" -> str ent.FullName |> Some

src/fable/Fable.Core/AST/AST.Fable.Util.fs

@@ -129,7 +129,6 @@ type GenericInfo = {
 }
 
 let rec makeTypeRef (genInfo: GenericInfo) typ =
-    let (|TryDecorator|_|) dec (ent: Fable.Entity) = ent.TryGetDecorator dec
     let str s = Wrapped(Value(StringConst s), MetaType)
     match typ with
     | Boolean -> str "boolean"

src/fable/Fable.Core/AssemblyInfo.fs

@@ -2,8 +2,8 @@
 namespace System
 open System.Reflection
 
-[<assembly: AssemblyVersionAttribute("0.7.10")>]
+[<assembly: AssemblyVersionAttribute("0.7.11")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] AssemblyVersion = "0.7.10"
+    let [<Literal>] AssemblyVersion = "0.7.11"

src/tests/Main/TypeTests.fs

@@ -474,7 +474,7 @@ type ValueType<'T> =
     member x.Value = foo
 
 [<Struct>]
-type ValueType2<'T>(i: int, j: int) =
+type ValueType2(i: int, j: int) =
     member x.Value = i + j
 
 type Point2D =