Skip to content

Commit 51f0182

Browse files
committed
[elm] Add suffix to operation parameters
So there are no longer conflicts between parameters or parameters and operation names.
1 parent a1087f4 commit 51f0182

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

modules/openapi-generator/src/main/resources/elm/operation.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ import Uuid exposing (Uuid){{/includeUuid}}
3434
-}
3535
{{/notes}}
3636
{{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}}
37-
{{operationId}}{{#allParams}} {{paramName}}{{/allParams}} =
37+
{{operationId}}{{#allParams}} {{>paramName}}{{/allParams}} =
3838
Api.request
3939
"{{httpMethod}}"
4040
"{{path}}"
41-
[{{#pathParams}} ( "{{paramName}}", {{>paramToString}} {{paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/pathParams}}]
42-
[{{#queryParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/queryParams}}]
43-
[{{#headerParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/headerParams}}]
44-
{{#bodyParam}}({{#required}}Just ({{/required}}{{^required}}Maybe.map {{/required}}{{#isModel}}Api.Data.{{/isModel}}{{>recordFieldValueEncoder}} {{paramName}}{{#required}}){{/required}}){{/bodyParam}}{{^bodyParam}}Nothing{{/bodyParam}}
41+
[{{#pathParams}} ( "{{paramName}}", {{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/pathParams}}]
42+
[{{#queryParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/queryParams}}]
43+
[{{#headerParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/headerParams}}]
44+
{{#bodyParam}}({{#required}}Just ({{/required}}{{^required}}Maybe.map {{/required}}{{#isModel}}Api.Data.{{/isModel}}{{>recordFieldValueEncoder}} {{>paramName}}{{#required}}){{/required}}){{/bodyParam}}{{^bodyParam}}Nothing{{/bodyParam}}
4545
{{^responses}}(Json.Decode.succeed ()){{/responses}}{{#responses}}{{#isDefault}}{{^dataType}}(Json.Decode.succeed ()){{/dataType}}{{#dataType}}{{>recordFieldValueDecoder}}{{/dataType}}{{/isDefault}}{{/responses}}
4646
{{/operation}}{{/operations}}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{paramName}}{{#isPathParam}}_path{{/isPathParam}}{{#isQueryParam}}_query{{/isQueryParam}}{{#isHeaderParam}}_header{{/isHeaderParam}}{{#isBodyParam}}_body{{/isBodyParam}}

samples/openapi3/client/elm/src/Api/Request/Default.elm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ stringFromEnum model =
109109

110110

111111
headerPost : String -> Maybe Int -> Maybe HeaderType -> Api.Request String
112-
headerPost string integer headerType =
112+
headerPost string_header integer_header headerType_header =
113113
Api.request
114114
"POST"
115115
"/header"
116116
[]
117117
[]
118-
[ ( "string", Just <| identity string ), ( "integer", Maybe.map String.fromInt integer ), ( "headerType", Maybe.map stringFromHeaderType headerType ) ]
118+
[ ( "string", Just <| identity string_header ), ( "integer", Maybe.map String.fromInt integer_header ), ( "headerType", Maybe.map stringFromHeaderType headerType_header ) ]
119119
Nothing
120120
Json.Decode.string
121121

@@ -135,11 +135,11 @@ maybeGet =
135135

136136

137137
pathStringIntegerEnumerationGet : String -> Int -> Enumeration -> Api.Request ()
138-
pathStringIntegerEnumerationGet string integer enumeration =
138+
pathStringIntegerEnumerationGet string_path integer_path enumeration_path =
139139
Api.request
140140
"GET"
141141
"/path/{string}/{integer}/{enumeration}"
142-
[ ( "string", identity string ), ( "integer", String.fromInt integer ), ( "enumeration", stringFromEnumeration enumeration ) ]
142+
[ ( "string", identity string_path ), ( "integer", String.fromInt integer_path ), ( "enumeration", stringFromEnumeration enumeration_path ) ]
143143
[]
144144
[]
145145
Nothing
@@ -148,12 +148,12 @@ pathStringIntegerEnumerationGet string integer enumeration =
148148

149149

150150
queryGet : Maybe String -> Maybe Int -> Maybe Enum -> Api.Request ()
151-
queryGet string int enum =
151+
queryGet string_query int_query enum_query =
152152
Api.request
153153
"GET"
154154
"/query"
155155
[]
156-
[ ( "string", Maybe.map identity string ), ( "int", Maybe.map String.fromInt int ), ( "enum", Maybe.map stringFromEnum enum ) ]
156+
[ ( "string", Maybe.map identity string_query ), ( "int", Maybe.map String.fromInt int_query ), ( "enum", Maybe.map stringFromEnum enum_query ) ]
157157
[]
158158
Nothing
159159
(Json.Decode.succeed ())

samples/openapi3/client/elm/src/Api/Request/Primitive.elm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import Json.Encode
2727

2828

2929
update : Api.Data.Primitive -> Api.Request Api.Data.Primitive
30-
update primitive =
30+
update primitive_body =
3131
Api.request
3232
"POST"
3333
"/data"
3434
[]
3535
[]
3636
[]
37-
(Just (Api.Data.encodePrimitive primitive))
37+
(Just (Api.Data.encodePrimitive primitive_body))
3838
Api.Data.primitiveDecoder

0 commit comments

Comments
 (0)