Skip to content

Unify Object and Dict #317

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
wolfadex merged 2 commits into from
Jun 9, 2026
Merged

Unify Object and Dict #317

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
818f7f2
Unify Object and Dict
miniBill Jun 9, 2026
02dee2f
In practice public schemas are terrible so we should default to
miniBill Jun 9, 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
21 changes: 12 additions & 9 deletions src/Common.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module Common exposing
( BasicType(..)
( AdditionalProperties(..)
, BasicType(..)
, Component(..)
, ConstValue(..)
, Field
, Module(..)
, Object
, OneOfData
, Package(..)
, RefTo
Expand Down Expand Up @@ -447,7 +447,11 @@ initialUppercaseWordToLowercase input =

type Type
= Nullable Type
| Object { isRecursive : Maybe UnsafeName } Object
| Object
{ isRecursive : Maybe UnsafeName
, additionalProperties : AdditionalProperties
, fields : List ( UnsafeName, Field )
}
| Basic
-- This is separate for easier pattern matching
BasicType
Expand All @@ -459,8 +463,6 @@ type Type
| List Type
| Tuple Type Type
| Triple Type Type Type
-- The type declared in additionalProperties, and a list of normal properties
| Dict { type_ : Type, documentation : Maybe String } Object
| OneOf TypeName ( OneOfData, List OneOfData )
| Enum ( UnsafeName, List UnsafeName )
| Value
Expand All @@ -469,6 +471,11 @@ type Type
| Unit


type AdditionalProperties
= AdditionalPropertiesAllowed { type_ : Type, documentation : Maybe String }
| AdditionalPropertiesDisallowed


type RefTo r
= RefTo Component UnsafeName

Expand Down Expand Up @@ -511,10 +518,6 @@ basicTypeToString basicType =
"number"


type alias Object =
List ( UnsafeName, Field )


type alias OneOfData =
{ name : UnsafeName
, type_ : Type
Expand Down
2 changes: 1 addition & 1 deletion src/JsonSchema/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ nonEnumToDeclarations component name schema documentation type_ =
isRecursive : Bool
isRecursive =
case type_ of
Common.Object r _ ->
Common.Object r ->
r.isRecursive == Just name

_ ->
Expand Down
6 changes: 3 additions & 3 deletions src/OpenApi/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ multipartContent mediaType =
|> CliMonad.andThen
(\{ type_ } ->
case type_ of
Common.Object _ fields ->
Common.Object { fields } ->
fields
|> List.map
(\( fieldName, field ) ->
Expand Down Expand Up @@ -2207,7 +2207,7 @@ queryParameterToUrlBuilderArgument param =
Gen.Maybe.map build value
in
case type_ of
Common.Nullable (Common.Object _ fields) ->
Common.Nullable (Common.Object { fields }) ->
fields
|> CliMonad.combineMap
(\( fieldName, field ) ->
Expand All @@ -2219,7 +2219,7 @@ queryParameterToUrlBuilderArgument param =
|> CliMonad.withPath (Common.UnsafeName "query params (object)")
)

Common.Object _ fields ->
Common.Object { fields } ->
fields
|> CliMonad.combineMap
(\( fieldName, field ) ->
Expand Down
Loading
Loading