Merge pull request #2297 from fable-compiler/entity-by-core-name

RC 9

Author: alfonsogarciacaro

src/Fable.AST/Fable.AST.fsproj

@@ -6,7 +6,7 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Version>3.0.0</Version>
-    <PackageVersion>3.0.0-nagareyama-beta-002</PackageVersion>
+    <PackageVersion>3.0.0-nagareyama-rc-001</PackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Common.fs" />

src/Fable.AST/Fable.fs

@@ -2,15 +2,19 @@ namespace rec Fable.AST.Fable
 
 open Fable.AST
 
+type EntityPath =
+    | SourcePath of string
+    | AssemblyPath of string
+    /// Only used to reference entities in core assemblies without a path
+    | CoreAssemblyName of string
+
 type EntityRef =
-    { QualifiedName: string
-      SourcePath: string option }
-    member this.FullName =
-        let fullName =
-            match this.QualifiedName.IndexOf(",") with
-            | i when i > 0 -> this.QualifiedName.[..i-1]
-            | _ -> this.QualifiedName
-        fullName.Replace("+", ".")
+    { FullName: string
+      Path: EntityPath }
+    member this.SourcePath =
+        match this.Path with
+        | SourcePath p -> Some p
+        | AssemblyPath _ | CoreAssemblyName _ -> None
 
 type DeclaredType =
     abstract Entity: EntityRef
@@ -305,7 +309,8 @@ type Expr =
     | DecisionTreeSuccess of targetIndex: int * boundValues: Expr list * Type
 
     // Getters, setters and bindings
-    | Let of bindings: (Ident * Expr) list * body: Expr
+    | Let of Ident * Expr * body: Expr
+    | LetRec of bindings: (Ident * Expr) list * body: Expr
     | Get of Expr * GetKind * typ: Type * range: SourceLocation option
     | Set of Expr * key: KeyKind option * value: Expr * range: SourceLocation option
 
@@ -335,7 +340,8 @@ type Expr =
         | WhileLoop _
         | ForLoop _-> Unit
         | Sequential exprs -> List.tryLast exprs |> Option.map (fun e -> e.Type) |> Option.defaultValue Unit
-        | Let (_, expr)
+        | Let (_, _, expr)
+        | LetRec (_, expr)
         | TryCatch (expr, _, _, _)
         | IfThenElse (_, expr, _, _)
         | DecisionTree (expr, _) -> expr.Type
@@ -347,6 +353,7 @@ type Expr =
         | ObjectExpr _
         | Sequential _
         | Let _
+        | LetRec _
         | DecisionTree _
         | DecisionTreeSuccess _ -> None
         | Lambda (_, e, _)

src/Fable.AST/Plugins.fs

@@ -28,6 +28,10 @@ type PluginHelper =
     abstract GetRootModule: fileName: string -> string
     abstract GetEntity: EntityRef -> Entity
 
+[<System.AttributeUsage(System.AttributeTargets.Assembly)>]
+type ScanForPluginsAttribute() =
+    inherit System.Attribute()
+
 [<AbstractClass>]
 type PluginAttribute() =
     inherit System.Attribute()
@@ -36,5 +40,5 @@ type PluginAttribute() =
 [<AbstractClass>]
 type MemberDeclarationPluginAttribute() =
     inherit PluginAttribute()
-    abstract Transform: PluginHelper * MemberDecl -> MemberDecl
+    abstract Transform: PluginHelper * File * MemberDecl -> MemberDecl
     abstract TransformCall: PluginHelper * member_: MemberFunctionOrValue * expr: Expr -> Expr

src/Fable.AST/RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+### 3.0.0-nagareyama-rc-001
+
+* Add `Expr.LetRec`
+* Add `ScanForPluginsAttribute`
+* Add `AST.Fable.File` argument to `MemberDeclarationPlugin.Transform`
+
 ### 3.0.0-nagareyama-beta-002
 
 * Add `MemberDecl.ExportDefault`

src/Fable.Cli/Entry.fs

@@ -82,15 +82,17 @@ let defaultFileExt isTypescript args =
 
 type Runner =
   static member Run(args: string list, rootDir: string, runProc: RunProcess option, ?fsprojPath: string, ?watch, ?testInfo) =
-    let makeAbsolute (path: string) =
-        if IO.Path.IsPathRooted(path) then path
-        else IO.Path.Combine(rootDir, path)
+    let normalizeAbsolutePath (path: string) =
+        (if IO.Path.IsPathRooted(path) then path
+         else IO.Path.Combine(rootDir, path))
+        // Use GetFullPath to remove things like: myrepo/./build/
+        |> Path.normalizeFullPath
 
     let watch = defaultArg watch false
 
     let fsprojPath =
         fsprojPath
-        |> Option.map makeAbsolute
+        |> Option.map normalizeAbsolutePath
         |> Option.defaultValue rootDir
 
     if IO.Directory.Exists(fsprojPath) then
@@ -147,7 +149,7 @@ type Runner =
             { ProjectFile = Path.normalizeFullPath projFile
               FableLibraryPath = argValue "--fableLib" args
               RootDir = rootDir
-              OutDir = argValueMulti ["-o"; "--outDir"] args |> Option.map makeAbsolute
+              OutDir = argValueMulti ["-o"; "--outDir"] args |> Option.map normalizeAbsolutePath
               ForcePkgs = flagEnabled "--forcePkgs" args
               NoRestore = flagEnabled "--noRestore" args
               Exclude = argValue "--exclude" args

src/Fable.Cli/Fable.Cli.fsproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>3.0.0</Version>
-    <PackageVersion>3.0.0-nagareyama-rc-008</PackageVersion>
+    <PackageVersion>3.0.0-nagareyama-rc-009</PackageVersion>
     <!-- Allow users with newer dotnet SDK to run Fable, see #1910 -->
     <RollForward>Major</RollForward>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -18,9 +18,6 @@
     <Content Include="..\..\build\fable-library\**\*.js" PackagePath="fable-library\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\fable-standalone\src\Metadata.fs">
-      <Link>Metadata.fs</Link>
-    </Compile>
     <Compile Include="Util.fs" />
     <Compile Include="Contributors.fs" />
     <Compile Include="Globbing.fs" />

src/Fable.Cli/ProjectCracker.fs

@@ -175,11 +175,11 @@ let getProjectOptionsFromScript (opts: CrackerOptions): CrackedFsproj list * Cra
                 dllRefs, path::srcFiles
             | _ -> dllRefs, srcFiles)
 
-    let coreDllDir = IO.Path.GetDirectoryName(typeof<System.Array>.Assembly.Location) |> Path.normalizePath
+    let coreDllDir = IO.Path.GetDirectoryName(typeof<Array>.Assembly.Location) |> Path.normalizePath
     let fsharpCoreDll = typeof<obj list>.Assembly.Location |> Path.normalizePath
 
     let coreDlls =
-        Standalone.Metadata.references_core
+        Metadata.coreAssemblies
         |> Array.filter (function
             | "FSharp.Core" | "Fable.Core" -> false
             | _ -> true)
@@ -278,7 +278,7 @@ let private isUsefulOption (opt : string) =
         [ "--define"
           "--nowarn"
           "--warnon"
-          "--warnaserror"
+        //   "--warnaserror" // Disable for now to prevent unexpected errors, see #2288
         //   "--langversion" // See getBasicCompilerArgs
         ]
         |> List.exists opt.StartsWith
@@ -433,7 +433,7 @@ let createFableDir (opts: CrackerOptions) =
     let compilerInfo = IO.Path.Combine(fableDir, "compiler_info.txt")
     let newInfo =
         Map [
-            "version", Fable.Literals.VERSION
+            "version", Literals.VERSION
             "define", opts.FableOptions.Define |> List.sort |> String.concat ","
             "typedArrays", opts.FableOptions.TypedArrays.ToString()
             "clampByteArrays", opts.FableOptions.ClampByteArrays.ToString()
@@ -543,7 +543,7 @@ let getFullProjectOpts (opts: CrackerOptions) =
             |> List.toArray
 
         let otherOptions =
-            let coreRefs = HashSet Standalone.Metadata.references_core
+            let coreRefs = HashSet Metadata.coreAssemblies
             coreRefs.Add("System.Private.CoreLib") |> ignore
             let ignoredRefs = HashSet [
                "WindowsBase"

src/Fable.Cli/RELEASE_NOTES.md

@@ -1,3 +1,12 @@
+### 3.0.0-nagareyama-rc-009
+
+* Improve lambda beta reduction
+* Fix #1962: Find entities by core assembly name
+* Fix #2283: FABLE_COMPILER_3 constant
+* Fix #2284: Inline import can absorb arguments
+* Fix #2288: Ignore --warnaserror from project references
+* Fix #2291: Default hashing for classes
+
 ### 3.0.0-nagareyama-rc-008
 
 * Fix FSharpType.IsTuple for array of tuples @kerams

src/Fable.Transforms/FSharp2Fable.Util.fs

@@ -130,14 +130,6 @@ type FsEnt(ent: FSharpEntity) =
     static member IsPublic (ent: FSharpEntity) =
         not ent.Accessibility.IsPrivate
 
-    static member QualifiedName (ent: FSharpEntity): string =
-        let ent = Helpers.nonAbbreviatedDefinition ent
-        match tryArrayFullName ent with
-        | Some fullName -> fullName
-        | None ->
-            try ent.QualifiedName
-            with _ -> ent.LogicalName
-
     static member FullName (ent: FSharpEntity): string =
         let ent = Helpers.nonAbbreviatedDefinition ent
         match tryArrayFullName ent with
@@ -152,16 +144,16 @@ type FsEnt(ent: FSharpEntity) =
             | None -> ent.LogicalName
 
     static member Ref (ent: FSharpEntity): Fable.EntityRef =
-        let sourcePath =
-            if Option.isSome ent.Assembly.FileName
-            then None
-            else Some(FsEnt.SourcePath ent)
-        { QualifiedName = FsEnt.QualifiedName ent
-          SourcePath = sourcePath }
-
-    static member Ref (assemblyEntityQualifiedName: string): Fable.EntityRef =
-        { QualifiedName = assemblyEntityQualifiedName
-          SourcePath = None }
+        let path =
+            match ent.Assembly.FileName with
+            // When compiling with netcoreapp target, netstandard only contains redirects
+            // Find the actual assembly name from the entity qualified name
+            | Some asmPath when asmPath.EndsWith("netstandard.dll") ->
+                ent.QualifiedName.Split(',').[1].Trim() |> Fable.CoreAssemblyName
+            | Some asmPath -> Path.normalizePath asmPath |> Fable.AssemblyPath
+            | None -> FsEnt.SourcePath ent |> Fable.SourcePath
+        { FullName = FsEnt.FullName ent
+          Path = path }
 
     interface Fable.Entity with
         member _.Ref = FsEnt.Ref ent
@@ -775,11 +767,11 @@ module TypeHelpers =
         dict ["bool`1", Choice1Of2 Fable.Boolean
               "byte`1", Choice1Of2 (Fable.Number UInt8)
               "string`1", Choice1Of2 Fable.String
-              "uint64`1", Choice2Of2 Types.uint64
-              "Guid`1", Choice2Of2 Types.guid
-              "TimeSpan`1", Choice2Of2 Types.timespan
-              "DateTime`1", Choice2Of2 Types.datetime
-              "DateTimeOffset`1", Choice2Of2 Types.datetimeOffset]
+              "uint64`1", Choice2Of2("System.Runtime", Types.uint64)
+              "Guid`1", Choice2Of2("System.Runtime", Types.guid)
+              "TimeSpan`1", Choice2Of2("System.Runtime", Types.timespan)
+              "DateTime`1", Choice2Of2("System.Runtime", Types.datetime)
+              "DateTimeOffset`1", Choice2Of2("System.Runtime", Types.datetimeOffset)]
 
     let makeTypeFromDef ctxTypeArgs (genArgs: IList<FSharpType>) (tdef: FSharpEntity) =
         if tdef.IsArrayType then
@@ -808,7 +800,11 @@ module TypeHelpers =
             | Naming.StartsWith "FSharp.UMX." (DicContains fsharpUMX choice) ->
                 match choice with
                 | Choice1Of2 t -> t
-                | Choice2Of2 qualifiedName -> Fable.DeclaredType(FsEnt.Ref qualifiedName, [])
+                | Choice2Of2(dllName, fullName) ->
+                    let r: Fable.EntityRef =
+                        { FullName = fullName
+                          Path = Fable.CoreAssemblyName dllName }
+                    Fable.DeclaredType(r, [])
             | _ ->
                 // Special attributes
                 tdef.Attributes |> tryPickAttribute [
@@ -857,7 +853,7 @@ module TypeHelpers =
         | _ -> ()
     }
 
-    let getArgTypes com (memb: FSharpMemberOrFunctionOrValue) =
+    let getArgTypes _com (memb: FSharpMemberOrFunctionOrValue) =
         // FSharpParameters don't contain the `this` arg
         Seq.concat memb.CurriedParameterGroups
         // The F# compiler "untuples" the args in methods
@@ -878,7 +874,7 @@ module TypeHelpers =
             if t.HasTypeDefinition then Some t.TypeDefinition else None
         else None
 
-    let tryFindMember com (entity: Fable.Entity) genArgs compiledName isInstance (argTypes: Fable.Type list) =
+    let tryFindMember _com (entity: Fable.Entity) genArgs compiledName isInstance (argTypes: Fable.Type list) =
         let argsEqual (args1: Fable.Type list) args1Length (args2: IList<IList<FSharpParameter>>) =
                 let args2Length = args2 |> Seq.sumBy (fun g -> g.Count)
                 if args1Length = args2Length then
@@ -898,7 +894,7 @@ module TypeHelpers =
                 else false)
         | _ -> None
 
-    let fitsAnonRecordInInterface com (argExprs: Fable.Expr list) fieldNames (interface_: Fable.Entity) =
+    let fitsAnonRecordInInterface _com (argExprs: Fable.Expr list) fieldNames (interface_: Fable.Entity) =
         match interface_ with
         | :? FsEnt as fsEnt ->
             let interface_ = fsEnt.FSharpEntity
@@ -931,7 +927,7 @@ module TypeHelpers =
 
 
 
-    let inline (|FableType|) com (ctx: Context) t = makeType ctx.GenericArgs t
+    let inline (|FableType|) _com (ctx: Context) t = makeType ctx.GenericArgs t
 
 module Identifiers =
     open Helpers
@@ -940,7 +936,7 @@ module Identifiers =
     let putIdentInScope (ctx: Context) (fsRef: FSharpMemberOrFunctionOrValue) (ident: Fable.Ident) value =
         { ctx with Scope = (fsRef, ident, value)::ctx.Scope}
 
-    let makeIdentFrom (com: IFableCompiler) (ctx: Context) (fsRef: FSharpMemberOrFunctionOrValue): Fable.Ident =
+    let makeIdentFrom (_com: IFableCompiler) (ctx: Context) (fsRef: FSharpMemberOrFunctionOrValue): Fable.Ident =
         let sanitizedName = (fsRef.CompiledName, Naming.NoMemberPart)
                             ||> Naming.sanitizeIdent (isUsedName ctx)
         ctx.UseNamesInDeclarationScope.Add(sanitizedName) |> ignore
@@ -1153,7 +1149,9 @@ module Util =
             | _ -> false)
 
     let isFromDllRef (ent: Fable.Entity) =
-        Option.isNone ent.Ref.SourcePath
+        match ent.Ref.Path with
+        | Fable.AssemblyPath _ | Fable.CoreAssemblyName _ -> true
+        | Fable.SourcePath _ -> false
 
     let private isReplacementCandidatePrivate isFromDllRef (entFullName: string) =
         if entFullName.StartsWith("System.") || entFullName.StartsWith("Microsoft.FSharp.") then isFromDllRef
@@ -1162,8 +1160,7 @@ module Util =
         else entFullName.StartsWith("Fable.Core.")
 
     let isReplacementCandidate (ent: Fable.Entity) =
-        let isFromDllRef = Option.isNone ent.Ref.SourcePath
-        isReplacementCandidatePrivate isFromDllRef ent.FullName
+        isReplacementCandidatePrivate (isFromDllRef ent) ent.FullName
 
     let isReplacementCandidateFrom (ent: FSharpEntity) =
         let isFromDllRef = Option.isSome ent.Assembly.FileName
@@ -1272,7 +1269,7 @@ module Util =
         let entityName = defaultArg ent.TryFullName ""
         entityName + "." + memberName + overloadHash
 
-    let callInstanceMember com r typ (callInfo: Fable.CallInfo)
+    let callInstanceMember _com r typ (callInfo: Fable.CallInfo)
                     (entity: FSharpEntity) (memb: FSharpMemberOrFunctionOrValue) =
         let callInfo, callee =
             match callInfo.ThisArg with
@@ -1455,7 +1452,7 @@ module Util =
                 if List.isEmpty args then importExpr
                 else makeCall r t info importExpr
             | body ->
-                List.fold (fun body binding -> Fable.Let([binding], body)) body bindings
+                List.fold (fun body (ident, value) -> Fable.Let(ident, value, body)) body bindings
 
     let (|Inlined|_|) (com: IFableCompiler) ctx r t genArgs callee info (memb: FSharpMemberOrFunctionOrValue) =
         if isInline memb