Skip to content

Commit 1178d10

Browse files
Merge pull request #20 from BenPH/make-operationName-default-nothing
Make operationName default to nothing in client
2 parents cd82aba + b5ae769 commit 1178d10

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

docs/src/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Depth = 5
109109
Tokensgraphql(x::String)
110110
Parse(str::String)
111111
Queryclient(queryurl::String)
112-
Queryclient(url::String,data::String; vars::Dict=Dict(),auth::String="Bearer 0000", headers::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::String="")
112+
Queryclient(url::String,data::String; vars::Dict=Dict(),auth::String="Bearer 0000", headers::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::Union{String, Nothing}=nothing)
113113
GraphQLClient(url::String; auth::String="Bearer 0000", headers::Dict=Dict())
114114
Schema(_schema::String, resolvers::Dict; context=nothing)
115115
Schema(_schema::Dict, resolvers::Dict; context=nothing)

src/Parser.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ function Base.show(io::IO, x::Node)
10961096
catch
10971097
v=true
10981098
end
1099-
if ((elemento!=nothing) & v)
1099+
if ((elemento!==nothing) & v)
11001100
if(f == :kind)
11011101
print(io,"Node :: ",elemento)
11021102
elseif(f == :value) | (f == :operation)

src/Schema.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ symbol_table = _schema
4646

4747
count_operations = length(document.definitions)
4848

49-
if (count_operations > 1) && (operationName==nothing)
49+
if (count_operations > 1) && (operationName === nothing)
5050
throw(GraphQLError("{\"data\": null,\"errors\": [{\"message\": \"No operation named.\"}]}"))
5151
end
5252

@@ -55,7 +55,7 @@ symbol_table = _schema
5555
operation= nothing
5656
type_operation = " "
5757

58-
if operationName==nothing
58+
if operationName === nothing
5959
operation= document
6060
type_operation= document.definitions[1].operation
6161
else

src/client.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ end
1515

1616

1717
"""
18-
Queryclient(url::String,data::String; vars::Dict=Dict(),auth::String="Bearer 0000", headers::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::String="")
18+
Queryclient(url::String,data::String; vars::Dict=Dict(),auth::String="Bearer 0000", headers::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::Union{String, Nothing}=nothing)
1919
2020
Execute a query with all available parameters
2121
"""
22-
function Queryclient(url::String,data::String; vars::Dict=Dict(),auth::String="Bearer 0000", headers::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::String="")
22+
function Queryclient(url::String,data::String;
23+
vars::Dict=Dict(),auth::String="Bearer 0000",
24+
headers::Dict=Dict(),getlink::Bool=false,
25+
check::Bool=false,operationName::Union{String, Nothing}=nothing)
2326

2427
if (check)
2528
Validatequery(Parse(data))
@@ -29,7 +32,7 @@ function Queryclient(url::String,data::String; vars::Dict=Dict(),auth::String="B
2932
#------------
3033
link =url*"?query="*HTTP.escapeuri(data)
3134

32-
if length(operationName)>0
35+
if operationName !== nothing && length(operationName) > 0
3336
link=link*"&operationName="*operationName
3437
end
3538

@@ -84,7 +87,7 @@ function GraphQLClient(url::String; auth::String="Bearer 0000", headers::Dict=Di
8487
my_auth= auth
8588
end
8689

87-
function Query(data::String; vars::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::String="")
90+
function Query(data::String; vars::Dict=Dict(),getlink::Bool=false,check::Bool=false,operationName::Union{String, Nothing}=nothing)
8891

8992
return Queryclient(my_url,data,vars=vars,auth=my_auth,headers=my_headersextras,getlink=getlink,operationName=operationName,check=check)
9093

src/rules/schema.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct extract_operation <:Rule
4444
found = Dict()
4545
function enter(node::Node)
4646
if (active==true) && (node.kind == "OperationDefinition")
47-
if node.name != nothing
47+
if node.name !== nothing
4848
if (node.name.value == operationName)
4949
push!(found, "operation_type" => node.operation, "extracted_operation" => node)
5050
active=false

0 commit comments

Comments
 (0)