Merge pull request #88 from davidanthoff/tweak-func-api

Tweak func api
queryverse · Jun 4, 2018 · 4a2e822 · 4a2e822
2 parents 6f743a6 + c302510
commit 4a2e822
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/VegaLite.jl b/src/VegaLite.jl
@@ -23,6 +23,11 @@ export load, save
 
 export mk, enc
 
+export vlplot, vldata
+
+export config, selection, resolve, projection, facet, spec, rep
+export transform, hconcat, vconcat, layer
+
 ########################  settings functions  ############################
 
 # Switch for plotting in SVGs or canvas

diff --git a/src/dsl_helper_func/dsl_helper_func.jl b/src/dsl_helper_func/dsl_helper_func.jl
@@ -67,9 +67,7 @@ end
 #     vls
 # end
 
-plot(args...; kwargs...)        = mkSpec(:plot, args...; kwargs...)
-
-export plot
+vlplot(args...; kwargs...)        = mkSpec(:plot, args...; kwargs...)
 
 #### 1st level aliases
 
@@ -86,17 +84,14 @@ hconcat(args...)   = mkSpec(:vlhconcat, args...)
 vconcat(args...)   = mkSpec(:vlvconcat, args...)
 layer(args...)     = mkSpec(:vllayer, args...)
 
-export config, selection, resolve, projection, facet, spec, rep
-export transform, hconcat, vconcat, layer
-
 ### data
 # dat is a special case, we want to interpret correctly cases where an
 # iterable table is passed as an argument
 
 getrealvalue(v::DataValues.DataValue) = isnull(v) ? nothing : get(v)
 getrealvalue(v) = v
 
-function data(args...; kwargs...)
+function vldata(args...; kwargs...)
     if (length(args) == 1) && TableTraits.isiterabletable(args[1])
         it = IteratorInterfaceExtensions.getiterator(args[1])
         recs = [Dict(c[1] => getrealvalue(c[2]) for c in zip(keys(r), values(r))) for r in it]
@@ -106,5 +101,3 @@ function data(args...; kwargs...)
         mkSpec(:vldata, args...; kwargs...)
     end
 end
-
-export data