Skip to content

Allow introspection of default args for built-in scalars #99

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow introspection of default args for built-in scalars #99

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
ab91ced
Allow introspection of default scalar args
ozanmakes Jul 24, 2018
a6e4a90
Make default_doc for scalar args optional
ozanmakes Jul 25, 2018
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
1 change: 1 addition & 0 deletions graphql/src/graphql_intf.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ module type Schema = sig

val scalar : ?doc:string ->
string ->
?default_doc:('a -> Yojson.Basic.json) ->
coerce:(Graphql_parser.const_value -> ('a, string) result) ->
'a option arg_typ

Expand Down
15 changes: 12 additions & 3 deletions graphql/src/graphql_schema.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ module Make(Io : IO) = struct
| Scalar : {
name : string;
doc : string option;
default_doc: 'a -> Yojson.Basic.json;
coerce : Graphql_parser.const_value -> ('a, string) result;
} -> 'a option arg_typ
| Object : {
Expand Down Expand Up @@ -145,8 +146,8 @@ module Make(Io : IO) = struct
let arg' ?doc name ~typ ~default =
DefaultArg { name; doc; typ; default }

let scalar ?doc name ~coerce =
Scalar { name; doc; coerce }
let scalar ?doc name ?(default_doc=(fun _ -> `Null)) ~coerce =
Scalar { name; doc; default_doc; coerce }

let enum ?doc name ~values =
Enum { name; doc; values }
Expand All @@ -158,6 +159,7 @@ module Make(Io : IO) = struct
let int = Scalar {
name = "Int";
doc = None;
default_doc = (fun n -> `Int n);
coerce = function
| `Int n -> Ok n
| _ -> Error "Invalid int"
Expand All @@ -166,6 +168,7 @@ module Make(Io : IO) = struct
let string = Scalar {
name = "String";
doc = None;
default_doc = (fun s -> `String s);
coerce = function
| `String s -> Ok s
| _ -> Error "Invalid string"
Expand All @@ -174,6 +177,7 @@ module Make(Io : IO) = struct
let float = Scalar {
name = "Float";
doc = None;
default_doc = (fun f -> `Float f);
coerce = function
| `Float f -> Ok f
| `Int n -> Ok (float_of_int n)
Expand All @@ -183,6 +187,7 @@ module Make(Io : IO) = struct
let bool = Scalar {
name = "Boolean";
doc = None;
default_doc = (fun b -> `Bool b);
coerce = function
| `Bool b -> Ok b
| _ -> Error "Invalid boolean"
Expand All @@ -191,6 +196,7 @@ module Make(Io : IO) = struct
let guid = Scalar {
name = "ID";
doc = None;
default_doc = (fun s -> `String s);
coerce = function
| `String s -> Ok s
| `Int n -> Ok (string_of_int n)
Expand Down Expand Up @@ -656,7 +662,10 @@ module Introspection = struct
typ = string;
args = Arg.[];
lift = Io.ok;
resolve = fun _ (AnyArg v) -> None
resolve = fun _ (AnyArg arg) -> match arg with
| Arg.DefaultArg { typ = Arg.Scalar { default_doc; _ }; default; _ } ->
Some (Yojson.Basic.to_string (default_doc default))
| _ -> None
}
]
}
Expand Down