Skip to content

Remove workaround for elm-codegen improperly qualifying names #243

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

Merged
miniBill merged 2 commits into from
Jan 16, 2026
Merged

Remove workaround for elm-codegen improperly qualifying names #243

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
7671a68
Remove workaround to avoid qualifying value names
miniBill Jan 16, 2026
2116978
Remove unused parameter
miniBill Jan 16, 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
16 changes: 8 additions & 8 deletions src/JsonSchema/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ schemaToDeclarations name schema =
}
)
(CliMonad.moduleToNamespace Common.Types)
(schemaToDecoder False schema)
(schemaToDecoder schema)
, CliMonad.map2
(\typesNamespace encoder ->
{ moduleName = Common.Json
Expand All @@ -231,21 +231,21 @@ schemaToDeclarations name schema =
}
)
(CliMonad.moduleToNamespace Common.Types)
(schemaToEncoder False schema)
(schemaToEncoder schema)
]
|> CliMonad.combine
)
)
|> CliMonad.withPath name


schemaToDecoder : Bool -> Json.Schema.Definitions.Schema -> CliMonad Elm.Expression
schemaToDecoder qualify schema =
schemaToDecoder : Json.Schema.Definitions.Schema -> CliMonad Elm.Expression
schemaToDecoder schema =
SchemaUtils.schemaToType True schema
|> CliMonad.andThen (\{ type_ } -> SchemaUtils.typeToDecoder qualify type_)
|> CliMonad.andThen (\{ type_ } -> SchemaUtils.typeToDecoder type_)


schemaToEncoder : Bool -> Json.Schema.Definitions.Schema -> CliMonad (Elm.Expression -> Elm.Expression)
schemaToEncoder qualify schema =
schemaToEncoder : Json.Schema.Definitions.Schema -> CliMonad (Elm.Expression -> Elm.Expression)
schemaToEncoder schema =
SchemaUtils.schemaToType True schema
|> CliMonad.andThen (\{ type_ } -> SchemaUtils.typeToEncoder qualify type_)
|> CliMonad.andThen (\{ type_ } -> SchemaUtils.typeToEncoder type_)
10 changes: 5 additions & 5 deletions src/OpenApi/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ unitDeclarations name =
}
)
(CliMonad.moduleToNamespace Common.Types)
(SchemaUtils.typeToDecoder False Common.Unit)
(SchemaUtils.typeToDecoder Common.Unit)
, CliMonad.map2
(\typesNamespace encoder ->
{ moduleName = Common.Json
Expand All @@ -397,7 +397,7 @@ unitDeclarations name =
}
)
(CliMonad.moduleToNamespace Common.Types)
(SchemaUtils.typeToEncoder False Common.Unit)
(SchemaUtils.typeToEncoder Common.Unit)
]


Expand Down Expand Up @@ -493,7 +493,7 @@ toRequestFunctions server effectTypes method pathUrl operation =
)

JsonContent type_ ->
SchemaUtils.typeToEncoder True type_
SchemaUtils.typeToEncoder type_
|> CliMonad.map
(\encoder config ->
let
Expand Down Expand Up @@ -2482,7 +2482,7 @@ operationToTypesExpectAndResolver functionName operation =
}
}
)
(SchemaUtils.typeToDecoder True type_)
(SchemaUtils.typeToDecoder type_)

StringContent _ ->
{ successType =
Expand Down Expand Up @@ -2625,7 +2625,7 @@ errorResponsesToErrorDecoders functionName errorResponses =
(\contentSchema ->
case contentSchema of
JsonContent type_ ->
SchemaUtils.typeToDecoder True type_
SchemaUtils.typeToDecoder type_

StringContent _ ->
CliMonad.succeed Gen.Json.Decode.string
Expand Down
64 changes: 22 additions & 42 deletions src/SchemaUtils.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,8 +1355,8 @@ fieldToAnnotation qualify { useMaybe } { type_, required } =
CliMonad.map Gen.Maybe.annotation_.maybe annotation


typeToEncoder : Bool -> Common.Type -> CliMonad (Elm.Expression -> Elm.Expression)
typeToEncoder qualify type_ =
typeToEncoder : Common.Type -> CliMonad (Elm.Expression -> Elm.Expression)
typeToEncoder type_ =
case type_ of
Common.Basic basicType basic ->
basicTypeToEncoder basicType basic
Expand All @@ -1377,12 +1377,7 @@ typeToEncoder qualify type_ =
(\jsonNamespace rec ->
Elm.apply
(Elm.value
{ importFrom =
if qualify then
jsonNamespace

else
[]
{ importFrom = jsonNamespace
, name = "encode" ++ Common.toTypeName name
, annotation = Nothing
}
Expand All @@ -1401,7 +1396,7 @@ typeToEncoder qualify type_ =
properties
|> CliMonad.combineMap
(\( key, field ) ->
typeToEncoder qualify field.type_
typeToEncoder field.type_
|> CliMonad.map
(\encoder rec ->
let
Expand Down Expand Up @@ -1438,7 +1433,7 @@ typeToEncoder qualify type_ =
)

Common.List t ->
typeToEncoder qualify t
typeToEncoder t
|> CliMonad.map
(\encoder ->
Gen.Json.Encode.call_.list (Elm.functionReduced "rec" encoder)
Expand All @@ -1447,7 +1442,7 @@ typeToEncoder qualify type_ =
-- An object with additionalProperties (the type of those properties is
-- `additionalProperties`) and no normal `properties` fields: A simple Dict.
Common.Dict additionalProperties [] ->
typeToEncoder qualify additionalProperties.type_
typeToEncoder additionalProperties.type_
|> CliMonad.map
(\encoder ->
Gen.Json.Encode.call_.dict Gen.Basics.values_.identity (Elm.functionReduced "rec" encoder)
Expand All @@ -1463,7 +1458,7 @@ typeToEncoder qualify type_ =
properties
|> CliMonad.combineMap
(\( key, field ) ->
typeToEncoder qualify field.type_
typeToEncoder field.type_
|> CliMonad.map
(\encoder rec ->
let
Expand Down Expand Up @@ -1508,7 +1503,7 @@ typeToEncoder qualify type_ =
)
)
)
(typeToEncoder qualify additionalProperties.type_)
(typeToEncoder additionalProperties.type_)

Common.Nullable t ->
CliMonad.map
Expand All @@ -1524,7 +1519,7 @@ typeToEncoder qualify type_ =
encoder
]
)
(typeToEncoder qualify t)
(typeToEncoder t)

Common.Value ->
CliMonad.succeed <| Gen.Basics.identity
Expand All @@ -1534,12 +1529,7 @@ typeToEncoder qualify type_ =
(\jsonNamespace name rec ->
Elm.apply
(Elm.value
{ importFrom =
if qualify then
jsonNamespace

else
[]
{ importFrom = jsonNamespace
, name = "encode" ++ Common.toTypeName name
, annotation = Nothing
}
Expand All @@ -1562,7 +1552,7 @@ typeToEncoder qualify type_ =
variantEncoder
)
(typeToAnnotationWithNullable True variant.type_)
(typeToEncoder qualify variant.type_)
(typeToEncoder variant.type_)
)
|> CliMonad.map2
(\typesNamespace branches rec ->
Expand Down Expand Up @@ -1629,8 +1619,8 @@ refToTypeName ref =
CliMonad.fail <| "Couldn't get the type ref (" ++ String.join "/" ref ++ ") for the response"


typeToDecoder : Bool -> Common.Type -> CliMonad Elm.Expression
typeToDecoder qualify type_ =
typeToDecoder : Common.Type -> CliMonad Elm.Expression
typeToDecoder type_ =
case type_ of
Common.Object properties ->
List.foldl
Expand All @@ -1650,7 +1640,7 @@ typeToDecoder qualify type_ =
)
prevExpr
)
(typeToDecoder qualify field.type_)
(typeToDecoder field.type_)
prevExprRes
)
(CliMonad.succeed
Expand Down Expand Up @@ -1681,11 +1671,11 @@ typeToDecoder qualify type_ =

Common.List t ->
CliMonad.map Gen.Json.Decode.list
(typeToDecoder qualify t)
(typeToDecoder t)

Common.Dict additionalProperties [] ->
CliMonad.map Gen.Json.Decode.dict
(typeToDecoder qualify additionalProperties.type_)
(typeToDecoder additionalProperties.type_)

Common.Dict additionalProperties properties ->
properties
Expand All @@ -1706,7 +1696,7 @@ typeToDecoder qualify type_ =
)
)
)
(typeToDecoder qualify field.type_)
(typeToDecoder field.type_)
prevExprRes
)
(CliMonad.succeed
Expand Down Expand Up @@ -1837,7 +1827,7 @@ typeToDecoder qualify type_ =
)
)
)
(typeToDecoder qualify additionalProperties.type_)
(typeToDecoder additionalProperties.type_)

Common.Enum variants ->
CliMonad.enumName variants
Expand Down Expand Up @@ -1874,12 +1864,7 @@ typeToDecoder qualify type_ =
CliMonad.map
(\jsonNamespace ->
Elm.value
{ importFrom =
if qualify then
jsonNamespace

else
[]
{ importFrom = jsonNamespace
, name = "decode" ++ Common.toTypeName name
, annotation = Nothing
}
Expand All @@ -1901,18 +1886,13 @@ typeToDecoder qualify type_ =
OpenApi.Common.Internal.make_.null
]
)
(typeToDecoder qualify t)
(typeToDecoder t)

Common.Ref ref ->
CliMonad.map2
(\jsonNamespace name ->
Elm.value
{ importFrom =
if qualify then
jsonNamespace

else
[]
{ importFrom = jsonNamespace
, name = "decode" ++ Common.toTypeName name
, annotation = Nothing
}
Expand All @@ -1924,7 +1904,7 @@ typeToDecoder qualify type_ =
variants
|> CliMonad.combineMap
(\variant ->
typeToDecoder qualify variant.type_
typeToDecoder variant.type_
|> CliMonad.map2
(\typesNamespace ->
Gen.Json.Decode.call_.map
Expand Down