Fix compilation issues in scaffolded code. (#118)

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+- Fix compilation errors in scaffolded Many-to-Many joins - https://github.com/efcore/EFCore.FSharp/pull/119
+
 ## [6.0.1] - 2021-11-10
 
 ### Fixed

docsTool/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53237/",
+      "sslPort": 44367
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "docsTool": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}

src/EFCore.FSharp/Internal/FSharpHelper.fs

@@ -779,18 +779,12 @@ type FSharpHelper(relationalTypeMappingSource: IRelationalTypeMappingSource) =
                 else
                     lambdaIdentifier
 
-            StringBuilder()
-                .Append(sprintf "(fun %s -> " lambdaIdentifier')
-                .Append("(")
-                .Append(
-                    String.Join(
-                        ", ",
-                        (properties
-                         |> Seq.map (fun p -> lambdaIdentifier' + "." + p))
-                    )
-                )
-                .Append(") :> obj)")
-            |> string
+            let props =
+                properties
+                |> Seq.map (fun p -> lambdaIdentifier' + "." + p)
+                |> join ", "
+
+            sprintf "(fun %s -> (%s) :> obj)" lambdaIdentifier' props
 
         member this.Literal(values: obj [,]) : string = this.literalArray2D values
 

src/EFCore.FSharp/Scaffolding/FSharpDbContextGenerator.fs

@@ -486,7 +486,7 @@ type FSharpDbContextGenerator
                 (if isNull fk.PrincipalToDependent then
                      ""
                  else
-                     code.Literal fk.PrincipalToDependent.Name)
+                     (sprintf "fun p -> p.%s" fk.PrincipalToDependent.Name))
         )
 
         if not (fk.PrincipalKey.IsPrimaryKey()) then
@@ -512,8 +512,14 @@ type FSharpDbContextGenerator
             else
                 ""
 
-        let methodParams = code.Lambda(fk.Properties, "d")
-        lines.Add(sprintf ".HasForeignKey%s(%s)" typeParam methodParams)
+        let methodParams =
+            fk.Properties
+            |> Seq.map (fun p -> "d." + p.Name)
+            |> join ", "
+
+        lines.Add(
+            sprintf ".HasForeignKey%s(fun (d:%s) -> (%s) :> obj)" typeParam fk.DeclaringEntityType.Name methodParams
+        )
 
         let defaultOnDeleteAction =
             if fk.IsRequired then
@@ -545,14 +551,21 @@ type FSharpDbContextGenerator
                 sb |> append line |> ignore
 
             sb |> appendLine terminator |> ignore
+
             lines.Clear()
 
         let generateForeignKeyConfigurationLines (foreignKey: IForeignKey) targetType identifier =
             let annotations =
                 annotationCodeGenerator.FilterIgnoredAnnotations(foreignKey.GetAnnotations())
                 |> annotationsToDictionary
 
-            lines.Add(sprintf "(fun %s -> %s.HasOne<%s>().WithMany()" identifier identifier targetType)
+            lines.Add(
+                sprintf
+                    "(fun (%s: Builders.EntityTypeBuilder<_>) -> %s.HasOne<%s>().WithMany()"
+                    identifier
+                    identifier
+                    targetType
+            )
 
             if not (foreignKey.PrincipalKey.IsPrimaryKey()) then
                 let principalKeyProps =
@@ -578,13 +591,9 @@ type FSharpDbContextGenerator
             if foreignKey.DeleteBehavior <> defaultOnDeleteAction then
                 lines.Add $".OnDelete({code.Literal(foreignKey.DeleteBehavior)})"
 
-            if lines.Count = 1 then
-                lines.[0] <- lines.[0] + ")"
-            else
-                lines.Add(")")
-
             generateAnnotations foreignKey annotations lines
-            writeLines ","
+            writeLines "),"
+
 
         if not _entityTypeBuilderInitialized then
             initializeEntityTypeBuilder skipNavigation.DeclaringEntityType sb
@@ -635,7 +644,7 @@ type FSharpDbContextGenerator
         lines.Add $"j.HasKey({props})"
 
         if explicitName then
-            lines.Add ".HasName({code.Literal(key.GetName())})"
+            lines.Add $".HasName({code.Literal(key.GetName())})"
 
         generateAnnotations key keyAnnotations lines
         writeLines " |> ignore"