Skip to content
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.

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

Include only required fields in data #195

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/rendering/render.jl
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,15 @@ end

function Base.display(d::REPL.REPLDisplay, plt::VLSpec{:plot})
# checkplot(plt)
tmppath = writehtml_full(JSON.json(getparams(plt)))
tmppath = writehtml_full(render_json(plt))
launch_browser(tmppath) # Open the browser
end

function Base.display(d::REPL.REPLDisplay, plt::VGSpec)
tmppath = write_vg_html_full(JSON.json(getparams(plt)))
launch_browser(tmppath) # Open the browser
end

render_json(x) = sprint(render_json, x)
render_json(io::IO, plt::VLSpec) =
JSON.print(io, getparams(with_stripped_data(plt)))
6 changes: 3 additions & 3 deletions src/rendering/show.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ end

function convert_vl_to_vg(v::VLSpec{:plot})
vl2vg_script_path = joinpath(@__DIR__, "vl2vg.js")
data = JSON.json(getparams(v))
data = render_json(v)
p = open(`$(nodejs_cmd()) $vl2vg_script_path`, "r+")
writer = @async begin
write(p, data)
Expand All @@ -39,7 +39,7 @@ end
function convert_vl_to_x(v::VLSpec{:plot}, second_script)
vl2vg_script_path = joinpath(@__DIR__, "vl2vg.js")
full_second_script_path = joinpath(@__DIR__, "..", "..", "deps", "node_modules", "vega-cli", "bin", second_script)
data = JSON.json(getparams(v))
data = render_json(v)
p = open(pipeline(`$(nodejs_cmd()) $vl2vg_script_path`, `$(nodejs_cmd()) $full_second_script_path`), "r+")
writer = @async begin
write(p, data)
Expand Down Expand Up @@ -75,7 +75,7 @@ Base.Multimedia.istextmime(::MIME{Symbol("application/vnd.vegalite.v3+json")}) =
Base.Multimedia.istextmime(::MIME{Symbol("application/vnd.vega.v5+json")}) = true

function Base.show(io::IO, m::MIME"application/vnd.vegalite.v3+json", v::VLSpec{:plot})
print(io, JSON.json(getparams(v)))
render_json(io, v)
end

function Base.show(io::IO, m::MIME"application/vnd.vega.v5+json", v::VGSpec)
Expand Down
29 changes: 29 additions & 0 deletions src/vlspec.jl
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,32 @@ end
Create a copy of `spec` without data. See also [`deletedata!`](@ref).
"""
deletedata(spec::VLSpec) = deletedata!(copy(spec))

push_field!(fields, _) = fields
push_field!(fields, xs::AbstractVector) = foldl(push_field!, xs; init=fields)
function push_field!(fields, dict::AbstractDict)
f = get(dict, "field", nothing)
f !== nothing && push!(fields, string(f))
for v in values(dict)
push_field!(fields, v)
end
return fields
end

encoding_fields(spec::VLSpec) = encoding_fields(getparams(spec))
function encoding_fields(specdict)
fields = Set{String}()
for (k, v) in specdict
k == "data" && continue
push_field!(fields, v)
end
return sort!(collect(fields))
end

function with_stripped_data(spec::VLSpec)
fields = encoding_fields(spec)
vals = get(get(getparams(spec), "data", Dict()), "values", nothing)
vals isa AbstractVector || return spec
vals = map(row -> Dict(f => get(row, f, nothing) for f in fields), vals)
return @set spec.data.values = vals
end