Merge branch 'main' into add-bit-of-myriad

WoofWare.Myriad.Plugins/ArgParserGenerator.fs

@@ -1758,7 +1758,10 @@ type ArgParserGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.getTypes ast
+            let types =
+                Ast.extractTypeDefn ast
+                |> List.groupBy (fst >> List.map _.idText >> String.concat ".")
+                |> List.map (fun (_, v) -> fst (List.head v), List.collect snd v)
 
             let opens = AstHelper.extractOpens ast
 

WoofWare.Myriad.Plugins/HttpClientGenerator.fs

@@ -996,7 +996,7 @@ type HttpClientGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.getTypes ast
+            let types = Ast.extractTypeDefn ast
 
             let opens = AstHelper.extractOpens ast
 

WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs

@@ -291,14 +291,14 @@ type InterfaceMockGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.getTypes ast
+            let types = Ast.extractTypeDefn ast
 
             let namespaceAndInterfaces =
                 types
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
-                        match SynTypeDefn.getAttribute typeof<GenerateMockAttribute>.Name typeDef with
+                        match Ast.getAttribute<GenerateMockAttribute> typeDef with
                         | None ->
                             let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
 

WoofWare.Myriad.Plugins/JsonParseGenerator.fs

@@ -711,13 +711,13 @@ type JsonParseGenerator () =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
             let relevantTypes =
-                Ast.getTypes ast
+                Ast.extractTypeDefn ast
                 |> List.map (fun (name, defns) ->
                     defns
                     |> List.choose (fun defn ->
-                        if SynTypeDefn.isRecord defn then Some defn
-                        elif SynTypeDefn.isDu defn then Some defn
-                        elif SynTypeDefn.isEnum defn then Some defn
+                        if Ast.isRecord defn then Some defn
+                        elif Ast.isDu defn then Some defn
+                        elif AstHelper.isEnum defn then Some defn
                         else None
                     )
                     |> fun defns -> name, defns

WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs

@@ -528,13 +528,13 @@ type JsonSerializeGenerator () =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
             let relevantTypes =
-                Ast.getTypes ast
+                Ast.extractTypeDefn ast
                 |> List.map (fun (name, defns) ->
                     defns
                     |> List.choose (fun defn ->
-                        if SynTypeDefn.isRecord defn then Some defn
-                        elif SynTypeDefn.isDu defn then Some defn
-                        elif SynTypeDefn.isEnum defn then Some defn
+                        if Ast.isRecord defn then Some defn
+                        elif Ast.isDu defn then Some defn
+                        elif AstHelper.isEnum defn then Some defn
                         else None
                     )
                     |> fun defns -> name, defns

WoofWare.Myriad.Plugins/MyriadParamParser.fs

@@ -2,6 +2,28 @@ namespace WoofWare.Myriad.Plugins
 
 open System.Collections.Generic
 
+type internal DesiredGenerator =
+    | InterfaceMock of isInternal : bool option
+    | JsonParse of extensionMethod : bool option
+    | JsonSerialize of extensionMethod : bool option
+    | HttpClient of extensionMethod : bool option
+
+    static member Parse (s : string) =
+        match s with
+        | "GenerateMock" -> DesiredGenerator.InterfaceMock None
+        | "GenerateMock(true)" -> DesiredGenerator.InterfaceMock (Some true)
+        | "GenerateMock(false)" -> DesiredGenerator.InterfaceMock (Some false)
+        | "JsonParse" -> DesiredGenerator.JsonParse None
+        | "JsonParse(true)" -> DesiredGenerator.JsonParse (Some true)
+        | "JsonParse(false)" -> DesiredGenerator.JsonParse (Some false)
+        | "JsonSerialize" -> DesiredGenerator.JsonSerialize None
+        | "JsonSerialize(true)" -> DesiredGenerator.JsonSerialize (Some true)
+        | "JsonSerialize(false)" -> DesiredGenerator.JsonSerialize (Some false)
+        | "HttpClient" -> DesiredGenerator.HttpClient None
+        | "HttpClient(true)" -> DesiredGenerator.HttpClient (Some true)
+        | "HttpClient(false)" -> DesiredGenerator.HttpClient (Some false)
+        | _ -> failwith $"Failed to parse as a generator specification: %s{s}"
+
 [<RequireQualifiedAccess>]
 module internal MyriadParamParser =
     (*

WoofWare.Myriad.Plugins/Parameters.fs

@@ -1,23 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-type internal DesiredGenerator =
-    | InterfaceMock of isInternal : bool option
-    | JsonParse of extensionMethod : bool option
-    | JsonSerialize of extensionMethod : bool option
-    | HttpClient of extensionMethod : bool option
-
-    static member Parse (s : string) =
-        match s with
-        | "GenerateMock" -> DesiredGenerator.InterfaceMock None
-        | "GenerateMock(true)" -> DesiredGenerator.InterfaceMock (Some true)
-        | "GenerateMock(false)" -> DesiredGenerator.InterfaceMock (Some false)
-        | "JsonParse" -> DesiredGenerator.JsonParse None
-        | "JsonParse(true)" -> DesiredGenerator.JsonParse (Some true)
-        | "JsonParse(false)" -> DesiredGenerator.JsonParse (Some false)
-        | "JsonSerialize" -> DesiredGenerator.JsonSerialize None
-        | "JsonSerialize(true)" -> DesiredGenerator.JsonSerialize (Some true)
-        | "JsonSerialize(false)" -> DesiredGenerator.JsonSerialize (Some false)
-        | "HttpClient" -> DesiredGenerator.HttpClient None
-        | "HttpClient(true)" -> DesiredGenerator.HttpClient (Some true)
-        | "HttpClient(false)" -> DesiredGenerator.HttpClient (Some false)
-        | _ -> failwith $"Failed to parse as a generator specification: %s{s}"

WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs

@@ -1,6 +1,5 @@
 namespace WoofWare.Myriad.Plugins
 
-open System
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Xml
 open WoofWare.Whippet.Fantomas
@@ -60,7 +59,7 @@ module internal RemoveOptionsGenerator =
                 Attributes = []
             }
 
-        let typeDecl = RecordType.ToAst record
+        let typeDecl = AstHelper.defineRecordType record
 
         SynModuleDecl.Types ([ typeDecl ], range0)
 
@@ -147,31 +146,44 @@ type RemoveOptionsGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let records = Ast.getRecords ast
+            let records = Ast.extractRecords ast
 
             let namespaceAndRecords =
                 records
-                |> List.collect (fun (ns, ty) ->
-                    ty
-                    |> List.filter (fun record ->
-                        record.Attributes
-                        |> List.exists (fun attr ->
-                            attr.TypeName.LongIdent
-                            |> List.last
-                            |> _.idText
-                            |> fun s ->
-                                if s.EndsWith ("Attribute", StringComparison.Ordinal) then
-                                    s
-                                else
-                                    $"%s{s}Attribute"
-                            |> (=) typeof<RemoveOptionsAttribute>.Name
-                        )
-                    )
-                    |> List.map (fun ty -> ns, ty)
+                |> List.choose (fun (ns, types) ->
+                    match
+                        types
+                        |> List.filter (SynTypeDefn.hasAttribute typeof<RemoveOptionsAttribute>.Name)
+                    with
+                    | [] -> None
+                    | types ->
+                        let types =
+                            types
+                            |> List.map (fun ty ->
+                                match ty with
+                                | SynTypeDefn.SynTypeDefn (sci,
+                                                           SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (access,
+                                                                                                                 fields,
+                                                                                                                 _),
+                                                                                   _),
+                                                           smd,
+                                                           smdo,
+                                                           _,
+                                                           _) -> RecordType.OfRecord sci smd access fields
+                                | _ -> failwith "unexpectedly not a record"
+                            )
+
+                        Some (ns, types)
                 )
 
             let modules =
                 namespaceAndRecords
-                |> List.map (fun (ns, record) -> RemoveOptionsGenerator.createRecordModule ns record)
+                |> List.collect (fun (ns, records) ->
+                    records
+                    |> List.map (fun record ->
+                        let recordModule = RemoveOptionsGenerator.createRecordModule ns record
+                        recordModule
+                    )
+                )
 
             Output.Ast modules

WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj

@@ -31,7 +31,6 @@
     <Compile Include="Text.fs" />
     <Compile Include="Measure.fs" />
     <Compile Include="AstHelper.fs" />
-    <Compile Include="Parameters.fs" />
     <Compile Include="RemoveOptionsGenerator.fs"/>
     <Compile Include="MyriadParamParser.fs" />
     <Compile Include="InterfaceMockGenerator.fs"/>