Skip to content

Commit

Permalink
Merge branch 'main' into jq/interactive-cursor-2
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed May 27, 2024
2 parents d5dc78d + b32c73c commit cda8955
Show file tree
Hide file tree
Showing 476 changed files with 24,122 additions and 2,383 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-docs-and-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down Expand Up @@ -62,10 +62,10 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand All @@ -68,16 +68,18 @@ jobs:
run: yarn jest test/ --collectCoverage=true

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.1.0
uses: codecov/codecov-action@v4.3.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

test-cli:
name: CLI
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
Expand All @@ -86,7 +88,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'yarn'
node-version: latest
node-version: 21

- name: Install Node dependencies
run: yarn --frozen-lockfile
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@


## [5.18.1](https://github.com/vega/vega-lite/compare/v5.18.0...v5.18.1) (2024-05-07)


### Bug Fixes

* Allow non-linear scale for stacked bars ([#9315](https://github.com/vega/vega-lite/issues/9315)) ([716fe73](https://github.com/vega/vega-lite/commit/716fe734df2b4bd00fe78d7789ac43f5b035e4ed))
* correctly place unfiltered null values for line ([#9326](https://github.com/vega/vega-lite/issues/9326)) ([#9334](https://github.com/vega/vega-lite/issues/9334)) ([b617c84](https://github.com/vega/vega-lite/commit/b617c84d6fca636ff1469b7db5a40e7393354e5c))
* extent name collision in transforms ([#9312](https://github.com/vega/vega-lite/issues/9312)) ([8b3b30b](https://github.com/vega/vega-lite/commit/8b3b30b352ce0e50fe5422cd4d24323a5a5ec9b4))

# [5.18.0](https://github.com/vega/vega-lite/compare/v5.17.0...v5.18.0) (2024-04-09)


### Bug Fixes

* **#8338,#8126:** make boxplot work with single value per group ([#8339](https://github.com/vega/vega-lite/issues/8339)) ([4e55836](https://github.com/vega/vega-lite/commit/4e558369eecc5d84fbccd0fd2bc84be19f5f5e35)), closes [#8338](https://github.com/vega/vega-lite/issues/8338) [#8126](https://github.com/vega/vega-lite/issues/8126) [#8338](https://github.com/vega/vega-lite/issues/8338) [#8126](https://github.com/vega/vega-lite/issues/8126)
* describe how to set a custom scheme by setting the range, reverts [#9262](https://github.com/vega/vega-lite/issues/9262) ([#9266](https://github.com/vega/vega-lite/issues/9266)) ([e6af641](https://github.com/vega/vega-lite/commit/e6af6414431ade1f52359ad682ffc1f4f4a667c3)), closes [#9022](https://github.com/vega/vega-lite/issues/9022)
* generate unescaped boxplot calculated field aliases ([#9284](https://github.com/vega/vega-lite/issues/9284)) ([44fbceb](https://github.com/vega/vega-lite/commit/44fbceb0120ee54a8989cb1537537757adac8c58))


### Features

* add explicit option to control how densities are resolved, change how densities are resolved by default ([#9172](https://github.com/vega/vega-lite/issues/9172)) ([bf0b8d3](https://github.com/vega/vega-lite/commit/bf0b8d3e2c80dc1d28cd3c6c4e764ea2ed714d6c))

# [5.17.0](https://github.com/vega/vega-lite/compare/v5.16.3...v5.17.0) (2024-03-12)


Expand Down
666 changes: 581 additions & 85 deletions build/vega-lite-schema.json

Large diffs are not rendered by default.

Binary file modified examples/compiled/airport_connections.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/airport_connections.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/airport_connections.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"name": "size",
"type": "linear",
"domain": {"data": "data_1", "field": "routes"},
"range": [0, 1000],
"range": [4, 1000],
"zero": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/area.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"yearmonth_date\"]"},
"sort": {"field": "x"},
"from": {"data": "source_0"},
"encode": {
"update": {
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/area_cumulative_freq.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"IMDB Rating\"]"},
"sort": {"field": "x"},
"from": {"data": "source_0"},
"encode": {
"update": {
Expand Down
Binary file modified examples/compiled/area_density.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/compiled/area_density.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions examples/compiled/area_density.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"type": "kde",
"field": "IMDB Rating",
"bandwidth": 0.3,
"as": ["value", "density"]
"as": ["value", "density"],
"resolve": "shared"
},
{
"type": "impute",
Expand All @@ -41,7 +42,7 @@
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"value\"]"},
"sort": {"field": "x"},
"from": {"data": "source_0"},
"encode": {
"update": {
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/area_density_facet.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"name": "child_marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"value\"]"},
"sort": {"field": "x"},
"from": {"data": "facet"},
"encode": {
"update": {
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/area_density_stacked.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"value\"]"},
"sort": {"field": "x"},
"from": {"data": "faceted_path_main"},
"encode": {
"update": {
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/area_density_stacked_fold.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"value\"]"},
"sort": {"field": "x"},
"from": {"data": "faceted_path_main"},
"encode": {
"update": {
Expand Down
4 changes: 2 additions & 2 deletions examples/compiled/area_gradient.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"name": "layer_0_marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"date\"]"},
"sort": {"field": "x"},
"from": {"data": "source_0"},
"encode": {
"update": {
Expand Down Expand Up @@ -72,7 +72,7 @@
"name": "layer_1_marks",
"type": "line",
"style": ["line"],
"sort": {"field": "datum[\"date\"]"},
"sort": {"field": "x"},
"from": {"data": "source_0"},
"encode": {
"update": {
Expand Down
4 changes: 2 additions & 2 deletions examples/compiled/area_horizon.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"type": "area",
"clip": true,
"style": ["area"],
"sort": {"field": "datum[\"x\"]"},
"sort": {"field": "x"},
"from": {"data": "data_1"},
"encode": {
"update": {
Expand All @@ -115,7 +115,7 @@
"type": "area",
"clip": true,
"style": ["area"],
"sort": {"field": "datum[\"x\"]"},
"sort": {"field": "x"},
"from": {"data": "data_2"},
"encode": {
"update": {
Expand Down
Binary file added examples/compiled/area_invalid_null.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions examples/compiled/area_invalid_null.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
141 changes: 141 additions & 0 deletions examples/compiled/area_invalid_null.vg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
{
"$schema": "https://vega.github.io/schema/vega/v5.json",
"background": "white",
"padding": 5,
"width": 200,
"height": 200,
"style": "cell",
"data": [
{
"name": "source_0",
"values": [
{"x": -1, "y": null},
{"x": 1, "y": 10},
{"x": 2, "y": 30},
{"x": 3, "y": null},
{"x": 4, "y": 15},
{"x": 5, "y": 30},
{"x": 6, "y": 40},
{"x": 7, "y": 20},
{"x": 10, "y": null}
]
},
{
"name": "data_0",
"source": "source_0",
"transform": [
{"type": "formula", "expr": "toNumber(datum[\"x\"])", "as": "x"},
{
"type": "impute",
"field": "y",
"groupby": [],
"key": "x",
"method": "value",
"value": 0
},
{
"type": "stack",
"groupby": ["x"],
"field": "y",
"sort": {"field": [], "order": []},
"as": ["y_start", "y_end"],
"offset": "zero"
}
]
}
],
"marks": [
{
"name": "marks",
"type": "area",
"style": ["area"],
"sort": {"field": "x"},
"from": {"data": "data_0"},
"encode": {
"update": {
"orient": {"value": "vertical"},
"fill": {"value": "#4c78a8"},
"description": {
"signal": "\"x: \" + (format(datum[\"x\"], \"\")) + \"; y: \" + (format(datum[\"y\"], \"\"))"
},
"x": [
{
"test": "!isValid(datum[\"x\"]) || !isFinite(+datum[\"x\"])",
"signal": "scale('x', inrange(0, domain('x')) ? 0 : domain('x')[0])"
},
{"scale": "x", "field": "x"}
],
"y": {"scale": "y", "field": "y_end"},
"y2": {"scale": "y", "field": "y_start"}
}
}
}
],
"scales": [
{
"name": "x",
"type": "linear",
"domain": {"data": "data_0", "field": "x"},
"range": [0, {"signal": "width"}],
"nice": true,
"zero": false
},
{
"name": "y",
"type": "linear",
"domain": {"data": "data_0", "fields": ["y_start", "y_end"]},
"range": [{"signal": "height"}, 0],
"nice": true,
"zero": true
}
],
"axes": [
{
"scale": "x",
"orient": "bottom",
"gridScale": "y",
"grid": true,
"tickCount": {"signal": "ceil(width/40)"},
"domain": false,
"labels": false,
"aria": false,
"maxExtent": 0,
"minExtent": 0,
"ticks": false,
"zindex": 0
},
{
"scale": "y",
"orient": "left",
"gridScale": "x",
"grid": true,
"tickCount": {"signal": "ceil(height/40)"},
"domain": false,
"labels": false,
"aria": false,
"maxExtent": 0,
"minExtent": 0,
"ticks": false,
"zindex": 0
},
{
"scale": "x",
"orient": "bottom",
"grid": false,
"title": "x",
"labelFlush": true,
"labelOverlap": true,
"tickCount": {"signal": "ceil(width/40)"},
"zindex": 0
},
{
"scale": "y",
"orient": "left",
"grid": false,
"title": "y",
"labelOverlap": true,
"tickCount": {"signal": "ceil(height/40)"},
"zindex": 0
}
]
}
4 changes: 2 additions & 2 deletions examples/compiled/area_overlay.vg.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"name": "layer_0_marks",
"type": "area",
"style": ["area"],
"sort": {"field": "datum[\"date\"]"},
"sort": {"field": "x"},
"from": {"data": "data_0"},
"encode": {
"update": {
Expand All @@ -82,7 +82,7 @@
"name": "layer_1_marks",
"type": "line",
"style": ["line"],
"sort": {"field": "datum[\"date\"]"},
"sort": {"field": "x"},
"from": {"data": "data_0"},
"encode": {
"update": {
Expand Down
Loading

0 comments on commit cda8955

Please sign in to comment.