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

feat: update Vega and other deps #9182

Merged
merged 2 commits into from
Nov 27, 2023
Merged
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
8 changes: 6 additions & 2 deletions build/vega-lite-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"valid",
"values",
"variance",
"variancep"
"variancep",
"exponential",
"exponentialb"
],
"type": "string"
},
Expand Down Expand Up @@ -17882,7 +17884,9 @@
"valid",
"values",
"variance",
"variancep"
"variancep",
"exponential",
"exponentialb"
],
"type": "string"
},
Expand Down
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/interactive_index_chart.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/interactive_multi_line_label.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/interactive_paintbrush.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/interactive_stocks_nearest_index.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/compiled/line_narrow_2year_span.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/line_narrow_2year_span.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/selection_multi_condition.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified examples/compiled/trail_color.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/trail_color.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/trellis_selections.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/vega_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
vega: 5.25.0
vega: 5.26.1
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,54 +79,54 @@
"url": "https://github.com/vega/vega-lite/issues"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@babel/core": "^7.23.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/preset-env": "^7.22.10",
"@babel/preset-typescript": "^7.22.5",
"@release-it/conventional-changelog": "^7.0.0",
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-terser": "^0.4.3",
"@types/chai": "^4.3.5",
"@types/d3": "^7.4.0",
"@types/jest": "^29.5.4",
"@types/pako": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@babel/preset-env": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@release-it/conventional-changelog": "^8.0.1",
"@rollup/plugin-alias": "^5.1.0",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-json": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-terser": "^0.4.4",
"@types/chai": "^4.3.11",
"@types/d3": "^7.4.3",
"@types/jest": "^29.5.10",
"@types/pako": "^2.0.3",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
"chai": "^4.3.7",
"chai": "^4.3.10",
"cheerio": "^1.0.0-rc.12",
"conventional-changelog-cli": "^4.0.0",
"conventional-changelog-cli": "^4.1.0",
"d3": "^7.8.5",
"del-cli": "^5.0.0",
"eslint": "^8.47.0",
"del-cli": "^5.1.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-jest": "^27.2.3",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-prettier": "^5.0.1",
"fast-json-stable-stringify": "~2.1.0",
"highlight.js": "^11.8.0",
"jest": "^29.6.3",
"jest-dev-server": "^9.0.0",
"highlight.js": "^11.9.0",
"jest": "^29.7.0",
"jest-dev-server": "^9.0.1",
"mkdirp": "^3.0.1",
"pako": "^2.1.0",
"prettier": "^3.0.2",
"prettier": "^3.1.0",
"puppeteer": "^15.0.0",
"release-it": "^16.1.5",
"rollup": "^3.28.1",
"release-it": "^17.0.0",
"rollup": "^4.6.0",
"rollup-plugin-bundle-size": "^1.0.3",
"rollup-plugin-sourcemaps": "^0.6.3",
"serve": "^14.2.1",
"terser": "^5.19.2",
"terser": "^5.24.0",
"ts-jest": "^29.1.1",
"ts-json-schema-generator": "^1.3.0",
"typescript": "~5.2.2",
"vega-cli": "^5.25.0",
"ts-json-schema-generator": "^1.4.1",
"typescript": "~5.3.2",
"vega-cli": "^5.26.1",
"vega-datasets": "^2.7.0",
"vega-embed": "^6.22.2",
"vega-embed": "^6.23.0",
"vega-tooltip": "^0.33.0",
"yaml-front-matter": "^4.1.1"
},
Expand Down
2 changes: 2 additions & 0 deletions src/aggregate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const AGGREGATE_OP_INDEX: Flag<AggregateOp> = {
average: 1,
count: 1,
distinct: 1,
exponential: 1,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes #9181

exponentialb: 1,
product: 1,
max: 1,
mean: 1,
Expand Down
40 changes: 20 additions & 20 deletions src/channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,16 @@ export function isSecondaryRangeChannel(c: ExtendedChannel): c is SecondaryRange
export type MainChannelOf<C extends ExtendedChannel> = C extends 'x2'
? 'x'
: C extends 'y2'
? 'y'
: C extends 'latitude2'
? 'latitude'
: C extends 'longitude2'
? 'longitude'
: C extends 'theta2'
? 'theta'
: C extends 'radius2'
? 'radius'
: C;
? 'y'
: C extends 'latitude2'
? 'latitude'
: C extends 'longitude2'
? 'longitude'
: C extends 'theta2'
? 'theta'
: C extends 'radius2'
? 'radius'
: C;

/**
* Get the main channel for a range channel. E.g. `x` for `x2`.
Expand All @@ -254,16 +254,16 @@ export function getMainRangeChannel<C extends ExtendedChannel>(channel: C): Main
export type SecondaryChannelOf<C extends Channel> = C extends 'x'
? 'x2'
: C extends 'y'
? 'y2'
: C extends 'latitude'
? 'latitude2'
: C extends 'longitude'
? 'longitude2'
: C extends 'theta'
? 'theta2'
: C extends 'radius'
? 'radius2'
: undefined;
? 'y2'
: C extends 'latitude'
? 'latitude2'
: C extends 'longitude'
? 'longitude2'
: C extends 'theta'
? 'theta2'
: C extends 'radius'
? 'radius2'
: undefined;

export function getVgPositionChannel(channel: PolarPositionChannel | PositionChannel) {
if (isPolarPositionChannel(channel)) {
Expand Down
8 changes: 4 additions & 4 deletions src/channeldef.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1097,10 +1097,10 @@ export function initFieldOrDatumDef(
const guideType = isPositionFieldOrDatumDef(fd)
? 'axis'
: isMarkPropFieldOrDatumDef(fd)
? 'legend'
: isFacetFieldDef(fd)
? 'header'
: null;
? 'legend'
: isFacetFieldDef(fd)
? 'header'
: null;
if (guideType && fd[guideType]) {
const {format, formatType, ...newGuide} = fd[guideType];
if (isCustomFormatType(formatType) && !config.customFormatTypes) {
Expand Down
12 changes: 6 additions & 6 deletions src/compile/axis/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ export function getAxisConfigs(
scaleType === 'band'
? ['axisDiscrete', 'axisBand']
: scaleType === 'point'
? ['axisDiscrete', 'axisPoint']
: isQuantitative(scaleType)
? ['axisQuantitative']
: scaleType === 'time' || scaleType === 'utc'
? ['axisTemporal']
: [];
? ['axisDiscrete', 'axisPoint']
: isQuantitative(scaleType)
? ['axisQuantitative']
: scaleType === 'time' || scaleType === 'utc'
? ['axisTemporal']
: [];

const axisChannel = channel === 'x' ? 'axisX' : 'axisY';
const axisOrient = isSignalRef(orient) ? 'axisOrient' : `axis${titleCase(orient)}`; // axisTop, axisBottom, ...
Expand Down
8 changes: 4 additions & 4 deletions src/compile/data/facet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export class FacetNode extends DataFlowNode {
...(isSortField(sort)
? {sortField: sort}
: isArray(sort)
? {sortIndexField: sortArrayIndexField(fieldDef, channel)}
: {})
? {sortIndexField: sortArrayIndexField(fieldDef, channel)}
: {})
};
}
}
Expand Down Expand Up @@ -231,8 +231,8 @@ export class FacetNode extends DataFlowNode {
? {signal: `ceil(${cardinality} / ${columns})`}
: 1
: columns
? {signal: `min(${cardinality}, ${columns})`}
: {signal: cardinality};
? {signal: `min(${cardinality}, ${columns})`}
: {signal: cardinality};

data.push({
name: `${this.facet.name}_${headerChannel}`,
Expand Down
8 changes: 4 additions & 4 deletions src/compile/data/geojson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ export class GeoJSONNode extends DataFlowNode {
return isFieldDef(def)
? def.field
: isDatumDef(def)
? {expr: `${def.datum}`}
: isValueDef(def)
? {expr: `${def['value']}`}
: undefined;
? {expr: `${def.datum}`}
: isValueDef(def)
? {expr: `${def['value']}`}
: undefined;
}) as [GeoPositionChannel, GeoPositionChannel];

if (pair[0] || pair[1]) {
Expand Down
Loading