Skip to content

Commit

Permalink
[elm] Add suffix to operation parameters
Browse files Browse the repository at this point in the history
So there are no longer conflicts between parameters or
parameters and operation names.
  • Loading branch information
eriktim committed Jan 20, 2020
1 parent a1087f4 commit 51f0182
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ import Uuid exposing (Uuid){{/includeUuid}}
-}
{{/notes}}
{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#-first}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}Api.Data.{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/-first}}{{/responses}}
{{operationId}}{{#allParams}} {{paramName}}{{/allParams}} =
{{operationId}}{{#allParams}} {{>paramName}}{{/allParams}} =
Api.request
"{{httpMethod}}"
"{{path}}"
[{{#pathParams}} ( "{{paramName}}", {{>paramToString}} {{paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/pathParams}}]
[{{#queryParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/queryParams}}]
[{{#headerParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/headerParams}}]
{{#bodyParam}}({{#required}}Just ({{/required}}{{^required}}Maybe.map {{/required}}{{#isModel}}Api.Data.{{/isModel}}{{>recordFieldValueEncoder}} {{paramName}}{{#required}}){{/required}}){{/bodyParam}}{{^bodyParam}}Nothing{{/bodyParam}}
[{{#pathParams}} ( "{{paramName}}", {{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/pathParams}}]
[{{#queryParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/queryParams}}]
[{{#headerParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/headerParams}}]
{{#bodyParam}}({{#required}}Just ({{/required}}{{^required}}Maybe.map {{/required}}{{#isModel}}Api.Data.{{/isModel}}{{>recordFieldValueEncoder}} {{>paramName}}{{#required}}){{/required}}){{/bodyParam}}{{^bodyParam}}Nothing{{/bodyParam}}
{{^responses}}(Json.Decode.succeed ()){{/responses}}{{#responses}}{{#isDefault}}{{^dataType}}(Json.Decode.succeed ()){{/dataType}}{{#dataType}}{{>recordFieldValueDecoder}}{{/dataType}}{{/isDefault}}{{/responses}}
{{/operation}}{{/operations}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{paramName}}{{#isPathParam}}_path{{/isPathParam}}{{#isQueryParam}}_query{{/isQueryParam}}{{#isHeaderParam}}_header{{/isHeaderParam}}{{#isBodyParam}}_body{{/isBodyParam}}
12 changes: 6 additions & 6 deletions samples/openapi3/client/elm/src/Api/Request/Default.elm
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ stringFromEnum model =


headerPost : String -> Maybe Int -> Maybe HeaderType -> Api.Request String
headerPost string integer headerType =
headerPost string_header integer_header headerType_header =
Api.request
"POST"
"/header"
[]
[]
[ ( "string", Just <| identity string ), ( "integer", Maybe.map String.fromInt integer ), ( "headerType", Maybe.map stringFromHeaderType headerType ) ]
[ ( "string", Just <| identity string_header ), ( "integer", Maybe.map String.fromInt integer_header ), ( "headerType", Maybe.map stringFromHeaderType headerType_header ) ]
Nothing
Json.Decode.string

Expand All @@ -135,11 +135,11 @@ maybeGet =


pathStringIntegerEnumerationGet : String -> Int -> Enumeration -> Api.Request ()
pathStringIntegerEnumerationGet string integer enumeration =
pathStringIntegerEnumerationGet string_path integer_path enumeration_path =
Api.request
"GET"
"/path/{string}/{integer}/{enumeration}"
[ ( "string", identity string ), ( "integer", String.fromInt integer ), ( "enumeration", stringFromEnumeration enumeration ) ]
[ ( "string", identity string_path ), ( "integer", String.fromInt integer_path ), ( "enumeration", stringFromEnumeration enumeration_path ) ]
[]
[]
Nothing
Expand All @@ -148,12 +148,12 @@ pathStringIntegerEnumerationGet string integer enumeration =


queryGet : Maybe String -> Maybe Int -> Maybe Enum -> Api.Request ()
queryGet string int enum =
queryGet string_query int_query enum_query =
Api.request
"GET"
"/query"
[]
[ ( "string", Maybe.map identity string ), ( "int", Maybe.map String.fromInt int ), ( "enum", Maybe.map stringFromEnum enum ) ]
[ ( "string", Maybe.map identity string_query ), ( "int", Maybe.map String.fromInt int_query ), ( "enum", Maybe.map stringFromEnum enum_query ) ]
[]
Nothing
(Json.Decode.succeed ())
4 changes: 2 additions & 2 deletions samples/openapi3/client/elm/src/Api/Request/Primitive.elm
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import Json.Encode


update : Api.Data.Primitive -> Api.Request Api.Data.Primitive
update primitive =
update primitive_body =
Api.request
"POST"
"/data"
[]
[]
[]
(Just (Api.Data.encodePrimitive primitive))
(Just (Api.Data.encodePrimitive primitive_body))
Api.Data.primitiveDecoder

0 comments on commit 51f0182

Please sign in to comment.