Standard binding updates (#1278)

* #1275 - Add warning capability on properties and constructors as well * #1274 #1276 #1277 * Minor cleanup
dotnet-websharper · Oct 27, 2022 · 84d0d5a · 84d0d5a
1 parent 4c03314
commit 84d0d5a
Show file tree

Hide file tree

Showing 6 changed files with 955 additions and 175 deletions.
diff --git a/src/compiler/WebSharper.Compiler/WIGCompile.fs b/src/compiler/WebSharper.Compiler/WIGCompile.fs
@@ -838,7 +838,7 @@ type MemberConverter
         attr.ConstructorArguments.Add(CustomAttributeArgument(tB.String, warning))
         attr 
 
-    let setWarnAttribute (x: CodeModel.MethodBase) (attrs: Mono.Collections.Generic.Collection<CustomAttribute>) =
+    let setWarnAttribute (x: CodeModel.Entity) (attrs: Mono.Collections.Generic.Collection<CustomAttribute>) =
         match x.Warning with
         | Some warning -> attrs.Add (warnAttribute warning)
         | _ -> ()
@@ -985,6 +985,7 @@ type MemberConverter
             pD.SetMethod <- mD
         setObsoleteAttribute p pD.CustomAttributes
         addDependencies p pD.CustomAttributes
+        setWarnAttribute p pD.CustomAttributes
         dT.Properties.Add pD
 
     let withGenerics (generics: Code.TypeParameter list, td: Code.TypeDeclaration, owner) =
@@ -1019,6 +1020,7 @@ type MemberConverter
             if x.Generics.Length > 0 then
                 tD.Name <- tD.Name + "`" + string x.Generics.Length
             k (withGenerics (x.Generics, x, tD)) tD
+            setWarnAttribute x tD.CustomAttributes
         | _ -> ()
 
     member private c.AddMethod(dT: TypeDefinition, td: Code.TypeDeclaration, x: Code.Method) =
@@ -1095,6 +1097,7 @@ type MemberConverter
             if not (propNames.Add name) then failwithf "Duplicate property definition: %s on %s" name x.Name
             addProperty tD x name p
         addDependencies x tD.CustomAttributes
+        setWarnAttribute x tD.CustomAttributes
 
     member d.AddDependencies(ent: Code.IResourceDependable, prov: ICustomAttributeProvider) =
         addDependencies ent prov.CustomAttributes
@@ -1122,6 +1125,7 @@ type MemberConverter
         for ctor in x.Constructors do
             addConstructor tD x ctor
         setObsoleteAttribute x tD.CustomAttributes
+        setWarnAttribute x tD.CustomAttributes
         c.AddTypeMembers(x, tD)
 
     member c.Interface(x: Code.Interface) =

diff --git a/src/compiler/WebSharper.InterfaceGenerator/CodeModel.fs b/src/compiler/WebSharper.InterfaceGenerator/CodeModel.fs
@@ -41,6 +41,7 @@ module CodeModel =
         val mutable DependsOn : list<Dependency>
         val mutable Comment : option<string>
         val mutable ObsoleteStatus : ObsoleteStatus
+        val mutable Warning : option<string>
 
         internal new (name, t) =
             {
@@ -50,6 +51,7 @@ module CodeModel =
                 DependsOn = []
                 Comment = None
                 ObsoleteStatus = NotObsolete
+                Warning = None
             }
 
         /// On type definitions, applies the update.
@@ -289,15 +291,13 @@ module CodeModel =
         val mutable Inline : option<Inline>
         val mutable IsPure : bool
         val mutable Macro : option<T>
-        val mutable Warning : option<string>
 
         internal new (name, t) =
             {
                 inherit Member(name, t)
                 Inline = None
                 IsPure = false
                 Macro = None
-                Warning = None
             }
 
     and Constructor =

diff --git a/src/compiler/WebSharper.InterfaceGenerator/Pervasives.fs b/src/compiler/WebSharper.InterfaceGenerator/Pervasives.fs
@@ -265,8 +265,8 @@ module Pervasives =
     let Pure (x: #Code.MethodBase) =
         x |> Code.Entity.Update (fun x -> x.IsPure <- true)
 
-    /// Marks an method as a pure function call.
-    let WithWarning s (x: #Code.MethodBase) =
+    /// Adds a warning for the given code entity.
+    let WithWarning s (x: #Code.Entity) =
         x |> Code.Entity.Update (fun x -> x.Warning <- Some s)
 
     /// Adds an inline.