Skip to content

Fixes #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ronanyeah wants to merge 2 commits into
base: main
Choose a base branch
from
+33 −43
Open

Fixes #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9163b4d
Fix arguments parsing
ronanyeah Mar 30, 2026
c8da31d
Fix elm-codegen inference loop
ronanyeah Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scripts": {
"dev": "cd cli && elm-pages run src/Cli.elm",
"docs": "elm make --docs=docs.json",
"build": "cd cli && elm-pages bundle-script src/Cli.elm --output ../dist/elm-open-api.js --debug",
"build": "cd cli && elm-pages bundle-script src/Cli.elm --output ../dist/elm-open-api.js --optimize=1",
"review": "elm-review",
"review:watch": "elm-review --watch --fix",
"format": "elm-format src tests --validate",
Expand Down
68 changes: 26 additions & 42 deletions src/OpenApi/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,50 +778,31 @@ toRequestFunctions server effectTypes method pathUrl operation =
, ( "timeout", Gen.Maybe.make_.nothing )
, ( "tracker", Gen.Maybe.make_.nothing )
]
, cmdAnnotation =
Elm.Annotation.function
[ (paramType { requireToMsg = True }).core ]
(Elm.Annotation.cmd (Elm.Annotation.var "msg"))
, recordAnnotation =
Elm.Annotation.function
[ (paramType { requireToMsg = True }).core ]
(Elm.Annotation.record
[ ( "method", Elm.Annotation.string )
, ( "headers", Elm.Annotation.list Gen.Http.annotation_.header )
, ( "url", Elm.Annotation.string )
, ( "body", Gen.Http.annotation_.body )
, ( "expect", Gen.Http.annotation_.expect (Elm.Annotation.var "msg") )
, ( "timeout", Elm.Annotation.maybe Elm.Annotation.float )
, ( "tracker", Elm.Annotation.maybe Elm.Annotation.string )
]
)
, cmdParam = (paramType { requireToMsg = True }).core
}
)
[ ( OpenApi.Config.ElmHttpCmd
, \{ cmdArg, cmdAnnotation } ->
, \{ cmdArg, cmdParam } ->
( functionName
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" cmdParam)
(\config -> Gen.Http.call_.request (cmdArg config))
|> Elm.withType cmdAnnotation
)
)
, ( OpenApi.Config.ElmHttpCmdRisky
, \{ cmdArg, cmdAnnotation } ->
, \{ cmdArg, cmdParam } ->
( functionName ++ "Risky"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" cmdParam)
(\config -> Gen.Http.call_.riskyRequest (cmdArg config))
|> Elm.withType cmdAnnotation
)
)
, ( OpenApi.Config.ElmHttpCmdRecord
, \{ cmdArg, recordAnnotation } ->
, \{ cmdArg, cmdParam } ->
( functionName ++ "Record"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" cmdParam)
cmdArg
|> Elm.withType recordAnnotation
)
)
]
Expand Down Expand Up @@ -850,6 +831,7 @@ toRequestFunctions server effectTypes method pathUrl operation =
, ( "body", (toBody config).core )
, ( "timeout", Gen.Maybe.make_.nothing )
]
, taskParam = (paramType { requireToMsg = False }).core
, taskAnnotation =
Elm.Annotation.function
[ (paramType { requireToMsg = False }).core ]
Expand All @@ -876,28 +858,28 @@ toRequestFunctions server effectTypes method pathUrl operation =
}
)
[ ( OpenApi.Config.ElmHttpTask
, \{ taskArg, taskAnnotation } ->
, \{ taskArg, taskParam, taskAnnotation } ->
( functionName ++ "Task"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
(\config -> Gen.Http.call_.task (taskArg config))
|> Elm.withType taskAnnotation
)
)
, ( OpenApi.Config.ElmHttpTaskRisky
, \{ taskArg, taskAnnotation } ->
, \{ taskArg, taskParam, taskAnnotation } ->
( functionName ++ "TaskRisky"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
(\config -> Gen.Http.call_.riskyTask (taskArg config))
|> Elm.withType taskAnnotation
)
)
, ( OpenApi.Config.ElmHttpTaskRecord
, \{ taskArg, recordAnnotation } ->
, \{ taskArg, taskParam, recordAnnotation } ->
( functionName ++ "TaskRecord"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
taskArg
|> Elm.withType recordAnnotation
)
Expand Down Expand Up @@ -928,6 +910,7 @@ toRequestFunctions server effectTypes method pathUrl operation =
, ( "retries", Gen.Maybe.make_.nothing )
, ( "timeoutInMs", Gen.Maybe.make_.nothing )
]
, taskParam = (paramType { requireToMsg = False }).elmPages
, taskAnnotation =
Elm.Annotation.function
[ (paramType { requireToMsg = False }).elmPages ]
Expand Down Expand Up @@ -958,19 +941,19 @@ toRequestFunctions server effectTypes method pathUrl operation =
}
)
[ ( OpenApi.Config.DillonkearnsElmPagesTask
, \{ taskArg, taskAnnotation, specificExpect } ->
, \{ taskArg, taskParam, taskAnnotation, specificExpect } ->
( functionName
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
(\config -> Gen.BackendTask.Http.call_.request (taskArg config) (specificExpect <| toMsg config))
|> Elm.withType taskAnnotation
)
)
, ( OpenApi.Config.DillonkearnsElmPagesTaskRecord
, \{ taskArg, recordAnnotation, specificExpect } ->
, \{ taskArg, taskParam, recordAnnotation, specificExpect } ->
( functionName
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
(\config -> Elm.tuple (taskArg config) (specificExpect <| toMsg config))
|> Elm.withType recordAnnotation
)
Expand Down Expand Up @@ -1055,6 +1038,7 @@ toRequestFunctions server effectTypes method pathUrl operation =
, ( "body", (toBody config).lamderaProgramTest )
, ( "timeout", Gen.Maybe.make_.nothing )
]
, taskParam = (paramType { requireToMsg = False }).lamderaProgramTest
, taskAnnotation =
Elm.Annotation.function
[ (paramType { requireToMsg = False }).lamderaProgramTest ]
Expand Down Expand Up @@ -1083,28 +1067,28 @@ toRequestFunctions server effectTypes method pathUrl operation =
}
)
[ ( OpenApi.Config.LamderaProgramTestTask
, \{ taskArg, taskAnnotation } ->
, \{ taskArg, taskParam, taskAnnotation } ->
( functionName ++ "Task"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
(\config -> Gen.Effect.Http.call_.task (taskArg config))
|> Elm.withType taskAnnotation
)
)
, ( OpenApi.Config.LamderaProgramTestTaskRisky
, \{ taskArg, taskAnnotation } ->
, \{ taskArg, taskParam, taskAnnotation } ->
( functionName ++ "TaskRisky"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
(\config -> Gen.Effect.Http.call_.riskyTask (taskArg config))
|> Elm.withType taskAnnotation
)
)
, ( OpenApi.Config.LamderaProgramTestTaskRecord
, \{ taskArg, recordAnnotation } ->
, \{ taskArg, taskParam, recordAnnotation } ->
( functionName ++ "TaskRecord"
, Elm.fn
(Elm.Arg.var "config")
(Elm.Arg.varWith "config" taskParam)
taskArg
|> Elm.withType recordAnnotation
)
Expand Down
6 changes: 6 additions & 0 deletions tests/Test/OpenApi/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,12 @@ pr267 =
{- ## Operations -}


api :
{ toMsg :
Result (OpenApi.Common.Error e String) Output.Types.Responses.Forbidden
-> msg
}
-> Cmd msg
api config =
Http.request
{ url = Url.Builder.absolute [ "api" ] []
Expand Down
Loading