Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Feb 13, 2023
2 parents 1ff500a + 0cbfb2b commit 13d175a
Show file tree
Hide file tree
Showing 21 changed files with 783 additions and 698 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths:
- 'site/**'
- 'scripts/**'
- '.github/workflows/**'

jobs:
toc:
Expand All @@ -28,16 +29,15 @@ jobs:
run: yarn --frozen-lockfile

- name: Setup Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.x'
ruby-version: '2.7'

- name: Setup data
run: yarn data

- name: Build Jekyll
run: |
gem install bundler
pushd site
bundle install
bundle exec jekyll build -q
Expand Down
246 changes: 123 additions & 123 deletions build/vega-lite-schema.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"module": "build/src/index",
"types": "build/src/index.d.ts",
"bin": {
"vl2pdf": "./bin/vl2pdf",
"vl2png": "./bin/vl2png",
"vl2svg": "./bin/vl2svg",
"vl2pdf": "./bin/vl2pdf",
"vl2vg": "./bin/vl2vg"
},
"files": [
Expand Down Expand Up @@ -90,12 +90,12 @@
"@babel/preset-typescript": "^7.18.6",
"@rollup/plugin-alias": "^4.0.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^23.0.0",
"@rollup/plugin-json": "^4.1.0",
"@types/jest": "^27.4.1",
"@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@types/chai": "^4.3.3",
"@types/d3": "^7.4.0",
"@types/jest": "^27.4.1",
"@types/mkdirp": "^1.0.2",
"@types/pako": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^5.38.0",
Expand All @@ -112,11 +112,11 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^27.0.4",
"eslint-plugin-prettier": "^4.2.1",
"gh-pages": "^4.0.0",
"jest": "^27.5.1",
"gh-pages": "^5.0.0",
"highlight.js": "^11.6.0",
"jest": "^27.5.1",
"jest-dev-server": "^6.1.1",
"mkdirp": "^1.0.4",
"mkdirp": "^2.1.3",
"pako": "^2.0.4",
"prettier": "^2.7.1",
"puppeteer": "^15.0.0",
Expand All @@ -128,11 +128,11 @@
"terser": "^5.15.0",
"ts-jest": "^29.0.1",
"ts-json-schema-generator": "^1.1.1",
"vega-cli": "^5.22.1",
"typescript": "~4.8.3",
"vega-cli": "^5.22.1",
"vega-datasets": "~2.5.1",
"vega-embed": "^6.21.0",
"vega-tooltip": "^0.28.0",
"vega-tooltip": "^0.30.0",
"yaml-front-matter": "^4.1.1"
},
"dependencies": {
Expand All @@ -141,7 +141,7 @@
"fast-deep-equal": "~3.1.3",
"fast-json-stable-stringify": "~2.1.0",
"json-stringify-pretty-compact": "~3.0.0",
"tslib": "~2.4.0",
"tslib": "~2.5.0",
"vega-event-selector": "~3.0.0",
"vega-expression": "~5.0.0",
"vega-util": "~1.17.0",
Expand Down
72 changes: 35 additions & 37 deletions site/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.5.1)
activesupport (7.0.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.23.6)
concurrent-ruby (1.1.10)
commonmarker (0.23.8)
concurrent-ruby (1.2.0)
dnsruby (1.61.9)
simpleidn (~> 0.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.8.1)
faraday (2.3.0)
faraday-net_http (~> 2.0)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (2.0.3)
faraday-net_http (3.0.2)
ffi (1.15.5)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (227)
github-pages (228)
github-pages-health-check (= 1.17.9)
jekyll (= 3.9.2)
jekyll (= 3.9.3)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.2.0)
jekyll-commonmark-ghpages (= 0.4.0)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.15.1)
jekyll-gist (= 1.5.0)
Expand Down Expand Up @@ -71,7 +70,7 @@ GEM
jemoji (= 0.12.0)
kramdown (= 2.3.2)
kramdown-parser-gfm (= 1.1.0)
liquid (= 4.0.3)
liquid (= 4.0.4)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.13.6, < 2.0)
Expand All @@ -83,17 +82,17 @@ GEM
octokit (~> 4.0)
public_suffix (>= 3.0, < 5.0)
typhoeus (~> 1.3)
html-pipeline (2.14.2)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (0.9.5)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jekyll (3.9.2)
jekyll (3.9.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
Expand All @@ -109,11 +108,11 @@ GEM
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.4.0)
commonmarker (~> 0.22)
jekyll-commonmark-ghpages (0.2.0)
commonmarker (~> 0.23.4)
jekyll-commonmark-ghpages (0.4.0)
commonmarker (~> 0.23.7)
jekyll (~> 3.9.0)
jekyll-commonmark (~> 1.4.0)
rouge (>= 2.0, < 4.0)
rouge (>= 2.0, < 5.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.15.1)
Expand Down Expand Up @@ -201,30 +200,30 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.16.2)
nokogiri (1.13.7-arm64-darwin)
minitest (5.17.0)
nokogiri (1.14.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.7-x86_64-darwin)
nokogiri (1.14.1-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.7-x86_64-linux)
nokogiri (1.14.1-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
racc (1.6.0)
rb-fsevent (0.11.1)
racc (1.6.2)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
Expand All @@ -244,21 +243,20 @@ GEM
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.10)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
webrick (1.7.0)
zeitwerk (2.6.0)
webrick (1.8.1)

PLATFORMS
arm64-darwin-20
arm64-darwin-21
arm64-darwin-22
x86_64-darwin-19
x86_64-darwin-20
x86_64-linux
Expand Down
4 changes: 2 additions & 2 deletions site/_data/examples.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
{
"name": "bar_grouped",
"title": "Grouped Bar Chart",
"description": "Read [here](https://vega.github.io/editor/#/examples/vega-lite/size.html#offset-step) for more details about how to set step size for grouped bar. "
"description": "Read [here](https://vega.github.io/vega-lite/docs/size.html#offset-step) for more details about how to set step size for grouped bar. "
},
{
"name": "bar_grouped_repeated",
"title": "Grouped Bar Chart (Multiple Measure with Repeat)",
"description": "Read [here](https://vega.github.io/editor/#/examples/vega-lite/size.html#offset-step) for more details about how to set step size for grouped bar. "
"description": "Read [here](https://vega.github.io/vega-lite/docs/size.html#offset-step) for more details about how to set step size for grouped bar. "
},
{
"name": "stacked_bar_weather",
Expand Down
5 changes: 2 additions & 3 deletions site/_includes/docs_toc.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
- [Window Transform Definition]({{site.baseurl}}/docs/window.html#window-transform-definition)
- [Window Only Operation Reference]({{site.baseurl}}/docs/window.html#ops)
- [Examples]({{site.baseurl}}/docs/window.html#examples)
- [Additional Examples]({{site.baseurl}}/docs/window.html#additional-examples)
- [Mark]({{site.baseurl}}/docs/mark.html)
- [Documentation Overview]({{site.baseurl}}/docs/mark.html#documentation-overview)
- [Mark Types]({{site.baseurl}}/docs/mark.html#types)
Expand Down Expand Up @@ -329,8 +328,8 @@
- [Defining a Parameter]({{site.baseurl}}/docs/parameter.html#defining-a-parameter)
- [Using Parameters]({{site.baseurl}}/docs/parameter.html#using-parameters)
- [Selection Configuration]({{site.baseurl}}/docs/parameter.html#config)
- [Value]({{site.baseurl}}/docs/value.html)
- [Examples]({{site.baseurl}}/docs/value.html#examples)
- [Value]({{site.baseurl}}/docs/param-value.html)
- [Examples]({{site.baseurl}}/docs/param-value.html#examples)
- [Expr]({{site.baseurl}}/docs/parameter.html)
- [Documentation Overview]({{site.baseurl}}/docs/parameter.html#documentation-overview)
- [Defining a Parameter]({{site.baseurl}}/docs/parameter.html#defining-a-parameter)
Expand Down
2 changes: 1 addition & 1 deletion site/_layouts/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
url: parameter
sub-sidebar:
- text: Value
url: value
url: param-value
- text: Expr
url: parameter
anchor: '#expr'
Expand Down
4 changes: 2 additions & 2 deletions site/docs/mark/tick.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ A tick mark definition can contain any [standard mark properties](mark.html#mark

### Dot Plot

For example, the following dot plot uses tick marks to show the distribution of each car's Horsepower.
For example, the following dot plot uses tick marks to show the distribution of rainfall over time.

<span class="vl-example" data-name="tick_dot"></span>

### Strip Plot

<!-- TODO: better explain this -->

The following strip-plot use `tick` mark to represent its data.
The following strip-plot use `tick` mark to show the distribution of horsepower.

<span class="vl-example" data-name="tick_strip"></span>

Expand Down
2 changes: 1 addition & 1 deletion site/docs/parameter/value.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: docs
menu: docs
title: Initializing a Parameter
permalink: /docs/value.html
permalink: /docs/param-value.html
---

Parameters can be initialized using the `value` property.
Expand Down
10 changes: 1 addition & 9 deletions site/docs/transform/window.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,6 @@ Here we use window transform to visualize how the average MPG for vehicles have

<div class="vl-example" data-name="window_cumulative_running_average"></div>

## Additional Examples

These are examples of window transforms that can be simplifies with the join aggregate transform. Please refer to the [join aggregate examples](joinaggregate.html#examples).

### Percent of Total

You can use the window transform to compute an aggregate and attach it to all records. In this case, you can use the [join aggregate](joinaggregate.html) instead of the window transform. Please refer to the [join aggregate examples](joinaggregate.html#examples).

Here we use the window transform to derive the global sum so that we can calculate percentage.

<div class="vl-example" data-name="window_percent_of_total"></div>
The window transform _can_ be used to compute an aggregate and attach it to all records in order to derive a percent of total, however, a simpler approach is to use the [join aggregate](joinaggregate.html) transform instead.
13 changes: 8 additions & 5 deletions site/ecosystem.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ We mark featured plugins and tools with a <span class="octicon octicon-star"></s

- <span class="octicon octicon-star"></span> [Vega-Editor](https://vega.github.io/editor/), the online editor for Vega and Vega-Lite. You can also get an output Vega spec from a given Vega-Lite spec as well.
- <span class="octicon octicon-star"></span> [Vega Viewer](https://github.com/RandomFractals/vscode-vega-viewer), a VSCode extension for interactive preview of Vega and Vega-Lite maps and graphs.
- <span class="octicon octicon-star"></span> [vega-desktop](https://github.com/kristw/vega-desktop), a desktop app that lets you open `.vg.json` and `.vl.json` to see visualizations just like you open image files with an image viewer. This is useful for [creating visualizations with Vega/Vega-Lite locally](https://medium.com/@kristw/create-visualizations-with-vega-on-your-machine-using-your-preferred-editor-529e1be875c0).
- [vega-desktop](https://github.com/kristw/vega-desktop), a desktop app that lets you open `.vg.json` and `.vl.json` to see visualizations just like you open image files with an image viewer. This is useful for [creating visualizations with Vega/Vega-Lite locally](https://medium.com/@kristw/create-visualizations-with-vega-on-your-machine-using-your-preferred-editor-529e1be875c0).
- <span class="octicon octicon-star"></span> [Voyager (2)](https://github.com/vega/voyager), visualization tool for exploratory data analysis that blends a Tableau-style specification interface (formerly [Polestar](https://github.com/vega/polestar)) with chart recommendations (formerly the Voyager visualization browser) and generates Vega-Lite visualizations.
- <span class="octicon octicon-star"></span>[Bayes](https://bayes.com) - A creative data exploration and storytelling tool. Easily create and publish Vega-Lite visualizations.
- [Bayes](https://bayes.com) - A creative data exploration and storytelling tool. Easily create and publish Vega-Lite visualizations.
- [data.world Chart Builder](https://data.world/integrations/chart-builder), a chart builder that imports data from queries in data.world. The generated specs can be saved locally or uploaded back to data.world. Project is [open source](https://github.com/datadotworld/chart-builder).
- [ColorBrewer-Lite](https://github.com/vis-au/colorbrewer), a fork of the ColorBrewer project that allows importing Vega-Lite specifications into the ColorBrewer interface to pick effective color schemes "in situ" for any color encoding.
- [Emacs Vega View](https://github.com/applied-science/emacs-vega-view), a tool that allows one to view Vega visualizations directly within emacs, currently supporting specs written in JSON, elisp or clojure.
Expand All @@ -39,13 +39,13 @@ We mark featured plugins and tools with a <span class="octicon octicon-star"></s
## Plug-ins for Vega-Lite

- <span class="octicon octicon-star"></span> [Tooltips for Vega and Vega-Lite](https://github.com/vega/vega-lite-tooltip)
- <span class="octicon octicon-star"></span> [Leaflet Tile Map integration for Vega and Vega-Lite](https://github.com/nyurik/leaflet-vega)
- [Leaflet Tile Map integration for Vega and Vega-Lite](https://github.com/nyurik/leaflet-vega)

## Bindings for Programming Languages

- <span class="octicon octicon-star"></span> [Altair](https://altair-viz.github.io) exposes a Python API for building statistical visualizations that follows Vega-Lite syntax.
- <span class="octicon octicon-star"></span> [Vega-Lite API](https://github.com/vega/vega-lite-api) is a JavaScript API for creating Vega-Lite JSON specifications.
- <span class="octicon octicon-star"></span> [Elm-Vega](https://package.elm-lang.org/packages/gicentre/elm-vega/latest) generates Vega-Lite specifications in the pure functional language [Elm](https://elm-lang.org).
- <span class="octicon octicon-star"></span> [elm-vegaLite](https://package.elm-lang.org/packages/gicentre/elm-vegalite/latest) generates Vega-Lite specifications in the pure functional language [Elm](https://elm-lang.org).
- [Altair wrapper in R](https://vegawidget.github.io/altair/)
- [ipyvega](https://github.com/vega/ipyvega) supports Vega and Vega-Lite charts in Jupyter Notebooks.
- [VegaLite (Elixir bindings)](https://github.com/elixir-nx/vega_lite).
Expand Down Expand Up @@ -102,11 +102,13 @@ We mark featured plugins and tools with a <span class="octicon octicon-star"></s
- [Datablocks](https://datablocks.pro), a node-based editor for exploring, analyzing and transforming data without code.
- [Rath](https://github.com/Kanaries/Rath) An augmented analysis tool including auto-EDA, pattern discovery, multi-dimensional visualization recommendation, and interactive dashboards generation.
- [MarkText](https://github.com/marktext/marktext): An open-source markdown editor that supports Vega-Lite.
- [Scalene](https://github.com/plasma-umass/scalene): A CPU+GPU+memory profiler for Python.
- [CSrankings](https://csrankings.org): a metrics-based ranking of top computer science institutions around the world.

## Tools for Embedding Vega-Lite Visualizations

- <span class="octicon octicon-star"></span> [Vega-Embed](https://github.com/vega/vega-embed), a convenience wrapper for Vega and Vega-Lite.
- <span class="octicon octicon-star"></span>[Flourish](https://flourish.studio/2018/05/29/vega-lite-in-flourish/) - Visualization and Storytelling Platform
- <span class="octicon octicon-star"></span> [Flourish](https://flourish.studio/2018/05/29/vega-lite-in-flourish/) - Visualization and Storytelling Platform
- [Visdown](http://visdown.com), a web app to create Vega-Lite visualizations in Markdown. Specs are written in [YAML](http://www.yaml.org/) (not JSON) within `code` blocks.
- [vega-element](https://www.webcomponents.org/element/PolymerVis/vega-element) is a Polymer web component to embed Vega or Vega-Lite visualization using custom HTML tags.
- [marked-vega](https://www.webcomponents.org/element/PolymerVis/marked-vega) is a Polymer web component to parse image/code markdowns into Vega and Vega-Lite charts.
Expand All @@ -115,3 +117,4 @@ We mark featured plugins and tools with a <span class="octicon octicon-star"></s
- [generator-veeg](https://github.com/millette/generator-veeg) is a Vega and Vega-Lite boilerplate generator for [Yeoman](https://yeoman.io/).
- [Kroki](https://kroki.io/) is a service to render Vega and Vega-Lite as PNG, SVG, or PDF.
- [vega_embed_flutter](https://pub.dev/packages/vega_embed_flutter), a flutter-web widget to embed Vega-Lite specs into flutter-web apps.
- [graphic-walker](https://github.com/Kanaries/graphic-walker), an open-source alternative to Tableau, is a versatile visualization tool for data exploration and no-code Vega-Lite editing, that can be easily embedded as a component in web apps.
Loading

0 comments on commit 13d175a

Please sign in to comment.