Fix the incorrect rendering of the Patch attribute (#375)

ConsumePlugin/Generated2SwaggerGitea.fs

@@ -41945,7 +41945,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -42394,7 +42394,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -43117,7 +43117,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -43439,7 +43439,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -43726,7 +43726,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -44013,7 +44013,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -45382,7 +45382,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -45790,7 +45790,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -47997,7 +47997,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -48164,7 +48164,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -48836,7 +48836,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -49125,7 +49125,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -49384,7 +49384,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -51242,7 +51242,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -51669,7 +51669,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -52174,7 +52174,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -54060,7 +54060,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -54319,7 +54319,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -56075,7 +56075,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -56713,7 +56713,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -57524,7 +57524,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 
@@ -58531,7 +58531,7 @@ module Gitea =
 
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
+                            Method = System.Net.Http.HttpMethod.Patch,
                             RequestUri = uri
                         )
 

ConsumePlugin/GeneratedSwaggerGitea.fs

@@ -3423,7 +3423,7 @@ type IGitea =
         [<RestEase.Path "id">] id : int * ?ct : System.Threading.CancellationToken -> Hook System.Threading.Tasks.Task
 
     /// Update a hook
-    [<RestEase.Post "admin/hooks/{id}">]
+    [<RestEase.Patch "admin/hooks/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract AdminEditHook :
         [<RestEase.Path "id">] id : int *
@@ -3494,7 +3494,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an existing user
-    [<RestEase.Post "admin/users/{username}">]
+    [<RestEase.Patch "admin/users/{username}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract AdminEditUser :
         [<RestEase.Path "username">] username : string *
@@ -3601,7 +3601,7 @@ type IGitea =
             NotificationThread System.Threading.Tasks.Task
 
     /// Mark notification thread as read by ID
-    [<RestEase.Post "notifications/threads/{id}">]
+    [<RestEase.Patch "notifications/threads/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract NotifyReadThread :
         [<RestEase.Path "id">] id : string *
@@ -3649,7 +3649,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an organization
-    [<RestEase.Post "orgs/{org}">]
+    [<RestEase.Patch "orgs/{org}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEdit :
         [<RestEase.Path "org">] org : string *
@@ -3695,7 +3695,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a hook
-    [<RestEase.Post "orgs/{org}/hooks/{id}">]
+    [<RestEase.Patch "orgs/{org}/hooks/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEditHook :
         [<RestEase.Path "org">] org : string *
@@ -3742,7 +3742,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a label
-    [<RestEase.Post "orgs/{org}/labels/{id}">]
+    [<RestEase.Patch "orgs/{org}/labels/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEditLabel :
         [<RestEase.Path "org">] org : string *
@@ -3984,7 +3984,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a repository's properties. Only fields that are set will be changed.
-    [<RestEase.Post "repos/{owner}/{repo}">]
+    [<RestEase.Patch "repos/{owner}/{repo}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEdit :
         [<RestEase.Path "owner">] owner : string *
@@ -4052,7 +4052,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a branch protections for a repository. Only fields that are set will be changed
-    [<RestEase.Post "repos/{owner}/{repo}/branch_protections/{name}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/branch_protections/{name}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditBranchProtection :
         [<RestEase.Path "owner">] owner : string *
@@ -4425,7 +4425,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a Git hook in a repository
-    [<RestEase.Post "repos/{owner}/{repo}/hooks/git/{id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/hooks/git/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditGitHook :
         [<RestEase.Path "owner">] owner : string *
@@ -4456,7 +4456,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a hook in a repository
-    [<RestEase.Post "repos/{owner}/{repo}/hooks/{id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/hooks/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditHook :
         [<RestEase.Path "owner">] owner : string *
@@ -4573,7 +4573,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a comment attachment
-    [<RestEase.Post "repos/{owner}/{repo}/issues/comments/{id}/assets/{attachment_id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/issues/comments/{id}/assets/{attachment_id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditIssueCommentAttachment :
         [<RestEase.Path "owner">] owner : string *
@@ -4626,7 +4626,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an issue. If using deadline only the date will be taken into account, and time of day ignored.
-    [<RestEase.Post "repos/{owner}/{repo}/issues/{index}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/issues/{index}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditIssue :
         [<RestEase.Path "owner">] owner : string *
@@ -4669,7 +4669,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an issue attachment
-    [<RestEase.Post "repos/{owner}/{repo}/issues/{index}/assets/{attachment_id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/issues/{index}/assets/{attachment_id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditIssueAttachment :
         [<RestEase.Path "owner">] owner : string *
@@ -4999,7 +4999,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a label
-    [<RestEase.Post "repos/{owner}/{repo}/labels/{id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/labels/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditLabel :
         [<RestEase.Path "owner">] owner : string *
@@ -5073,7 +5073,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a milestone
-    [<RestEase.Post "repos/{owner}/{repo}/milestones/{id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/milestones/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditMilestone :
         [<RestEase.Path "owner">] owner : string *
@@ -5157,7 +5157,7 @@ type IGitea =
             PullRequest System.Threading.Tasks.Task
 
     /// Update a pull request. If using deadline only the date will be taken into account, and time of day ignored.
-    [<RestEase.Post "repos/{owner}/{repo}/pulls/{index}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/pulls/{index}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditPullRequest :
         [<RestEase.Path "owner">] owner : string *
@@ -5495,7 +5495,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a release
-    [<RestEase.Post "repos/{owner}/{repo}/releases/{id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/releases/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditRelease :
         [<RestEase.Path "owner">] owner : string *
@@ -5538,7 +5538,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a release attachment
-    [<RestEase.Post "repos/{owner}/{repo}/releases/{id}/assets/{attachment_id}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/releases/{id}/assets/{attachment_id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditReleaseAttachment :
         [<RestEase.Path "owner">] owner : string *
@@ -5845,7 +5845,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a wiki page
-    [<RestEase.Post "repos/{owner}/{repo}/wiki/page/{pageName}">]
+    [<RestEase.Patch "repos/{owner}/{repo}/wiki/page/{pageName}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditWikiPage :
         [<RestEase.Path "owner">] owner : string *
@@ -5936,7 +5936,7 @@ type IGitea =
         [<RestEase.Path "id">] id : int * ?ct : System.Threading.CancellationToken -> unit System.Threading.Tasks.Task
 
     /// Edit a team
-    [<RestEase.Post "teams/{id}">]
+    [<RestEase.Patch "teams/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEditTeam :
         [<RestEase.Path "id">] id : int *
@@ -6066,7 +6066,7 @@ type IGitea =
         [<RestEase.Path "id">] id : int * ?ct : System.Threading.CancellationToken -> unit System.Threading.Tasks.Task
 
     /// update an OAuth2 Application, this includes regenerating the client secret
-    [<RestEase.Post "user/applications/oauth2/{id}">]
+    [<RestEase.Patch "user/applications/oauth2/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract UserUpdateOAuth2Application :
         [<RestEase.Path "id">] id : int *
@@ -6204,7 +6204,7 @@ type IGitea =
     abstract GetUserSettings : ?ct : System.Threading.CancellationToken -> UserSettings list System.Threading.Tasks.Task
 
     /// Update user settings
-    [<RestEase.Post "user/settings">]
+    [<RestEase.Patch "user/settings">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract UpdateUserSettings :
         [<RestEase.Body>] body : UserSettingsOptions * ?ct : System.Threading.CancellationToken ->

README.md

@@ -136,7 +136,7 @@ module InnerTypeWithBoth =
                         ret.Add (key.ToString (), System.Text.Json.Nodes.JsonValue.Create<Uri> value)
 
                     ret
-                ) input.Map
+                ) input.ReadOnlyDict
             )
 
         node

WoofWare.Myriad.Plugins/HttpClientGenerator.fs

@@ -70,7 +70,7 @@ module internal HttpClientGenerator =
         if m = HttpMethod.Get then "Get"
         elif m = HttpMethod.Post then "Post"
         elif m = HttpMethod.Delete then "Delete"
-        elif m = HttpMethod.Patch then "Post"
+        elif m = HttpMethod.Patch then "Patch"
         elif m = HttpMethod.Options then "Options"
         elif m = HttpMethod.Head then "Head"
         elif m = HttpMethod.Put then "Put"

WoofWare.Myriad.Plugins/Swagger.fs

@@ -202,15 +202,10 @@ and ObjectTypeDefinition =
             match node.["example"] with
             | null -> None
             | :? JsonObject as o -> Some o
-            | :? JsonValue as s ->
+            | _ ->
-                // Gitea returns a stringified JSON object here, which from my limited reading is
+                // Gitea returns a stringified and malformed JSON object here.
-                // against the spec.
+                // Don't throw; just omit.
-                match JsonNode.Parse (s.GetValue<string> ()) with
+                None
-                | null ->
-                    // JSON null value; :shrug:
-                    None
-                | n -> n.AsObject () |> Some
-            | _ -> failwith "expected `example` key to be a JSON object"
 
         let required = asArrOpt'<string> node "required"
 
@@ -477,7 +472,7 @@ type HttpMethod =
         | HttpMethod.Get -> "Get"
         | HttpMethod.Post -> "Post"
         | HttpMethod.Delete -> "Delete"
-        | HttpMethod.Patch -> "Post"
+        | HttpMethod.Patch -> "Patch"
         | HttpMethod.Options -> "Options"
         | HttpMethod.Head -> "Head"
         | HttpMethod.Put -> "Put"

WoofWare.Myriad.Plugins/SwaggerClientGenerator.fs

@@ -1,7 +1,6 @@
 namespace WoofWare.Myriad.Plugins
 
 open System.Collections.Generic
-open System.IO
 open System.Threading
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Xml
@@ -19,6 +18,7 @@ type internal SwaggerClientConfig =
 type internal Produces =
     // TODO: this will cope with decoding JSON, plain text, etc
     | Produces of string
+    | OctetStream
 
 type internal Endpoint =
     {
@@ -47,16 +47,8 @@ type internal Types =
 
 [<RequireQualifiedAccess>]
 module internal SwaggerClientGenerator =
-    let outputFile = FileInfo "/tmp/output.txt"
 
-    // do
+    let internal log (_ : string) = ()
-    //     use _ = File.Create outputFile.FullName
-    //     ()
-
-    let log (line : string) =
-        // use w = outputFile.AppendText ()
-        // w.WriteLine line
-        ()
 
     let renderType (types : Types) (defn : Definition) : SynType option =
         match types.ByDefinition.TryGetValue defn with
@@ -477,6 +469,15 @@ module internal SwaggerClientGenerator =
                             (SynLongIdent.createS' [ "RestEase" ; "Header" ])
                             // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
                             (SynExpr.tuple [ SynExpr.CreateConst "Content-Type" ; SynExpr.CreateConst contentType ])
+                    | Produces.OctetStream ->
+                        SynAttribute.create
+                            (SynLongIdent.createS' [ "RestEase" ; "Header" ])
+                            // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
+                            (SynExpr.tuple
+                                [
+                                    SynExpr.CreateConst "Content-Type"
+                                    SynExpr.CreateConst "application/octet-stream"
+                                ])
                 ]
 
             returnType
@@ -512,6 +513,7 @@ module internal SwaggerClientGenerator =
         |> List.singleton
 
 open Myriad.Core
+open System.IO
 
 /// Myriad generator that stamps out an interface and class to access a Swagger-specified API.
 [<MyriadGenerator("swagger-client")>]
@@ -622,10 +624,11 @@ type SwaggerClientGenerator () =
 
                         let produces =
                             match endpoint.Produces with
-                            | None -> Produces "json"
+                            | None -> Produces.Produces "json"
                             | Some [] -> failwith $"API specified empty Produces: %s{path} (%O{method})"
-                            | Some [ MimeType "application/json" ] -> Produces "json"
+                            | Some [ MimeType "application/octet-stream" ] -> Produces.OctetStream
-                            | Some [ MimeType (StartsWith "text/" t) ] -> Produces t
+                            | Some [ MimeType "application/json" ] -> Produces.Produces "json"
+                            | Some [ MimeType (StartsWith "text/" t) ] -> Produces.Produces t
                             | Some [ MimeType s ] ->
                                 failwithf
                                     $"we don't support non-JSON Produces right now, got: %s{s} (%s{path} %O{method})"

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

@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="Myriad.Core" Version="0.8.3" />
     <PackageReference Include="TypeEquality" Version="0.3.0" />
-    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.6.2" />
+    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.6.3" />
     <!-- the lowest version allowed by Myriad.Core -->
     <PackageReference Update="FSharp.Core" Version="6.0.1" PrivateAssets="all"/>
   </ItemGroup>

nix/deps.json

@@ -381,7 +381,7 @@
   },
   {
     "pname": "WoofWare.Whippet.Fantomas",
-    "version": "0.6.2",
+    "version": "0.6.3",
-    "hash": "sha256-nDT/W5eBwM/E+Z2oQ80maAGYrEyRJQXL1unxR9q6ztU="
+    "hash": "sha256-FkW/HtVp8/HE2k6d7yFpnJcnP3FNNe9kGlkoIWmNgDw="
   }
 ]