@jupyterlab/vega5-extension 4.7.0-alpha.0 → 4.7.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +72 -51
- package/lib/index.js +2 -6
- package/lib/index.js.map +1 -1
- package/package.json +5 -5
- package/src/index.ts +6 -7
package/README.md
CHANGED
|
@@ -11,24 +11,33 @@ To render Vega-Lite output in IPython:
|
|
|
11
11
|
```python
|
|
12
12
|
from IPython.display import display
|
|
13
13
|
|
|
14
|
-
display(
|
|
15
|
-
|
|
16
|
-
"
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
"
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
14
|
+
display(
|
|
15
|
+
{
|
|
16
|
+
"application/vnd.vegalite.v3+json": {
|
|
17
|
+
"$schema": "https://vega.github.io/schema/vega-lite/v3.json",
|
|
18
|
+
"description": "A simple bar chart with embedded data.",
|
|
19
|
+
"data": {
|
|
20
|
+
"values": [
|
|
21
|
+
{"a": "A", "b": 28},
|
|
22
|
+
{"a": "B", "b": 55},
|
|
23
|
+
{"a": "C", "b": 43},
|
|
24
|
+
{"a": "D", "b": 91},
|
|
25
|
+
{"a": "E", "b": 81},
|
|
26
|
+
{"a": "F", "b": 53},
|
|
27
|
+
{"a": "G", "b": 19},
|
|
28
|
+
{"a": "H", "b": 87},
|
|
29
|
+
{"a": "I", "b": 52},
|
|
30
|
+
]
|
|
31
|
+
},
|
|
32
|
+
"mark": "bar",
|
|
33
|
+
"encoding": {
|
|
34
|
+
"x": {"field": "a", "type": "ordinal"},
|
|
35
|
+
"y": {"field": "b", "type": "quantitative"},
|
|
36
|
+
},
|
|
29
37
|
}
|
|
30
|
-
}
|
|
31
|
-
|
|
38
|
+
},
|
|
39
|
+
raw=True,
|
|
40
|
+
)
|
|
32
41
|
```
|
|
33
42
|
|
|
34
43
|
Using the [Altair library](https://github.com/altair-viz/altair):
|
|
@@ -36,12 +45,16 @@ Using the [Altair library](https://github.com/altair-viz/altair):
|
|
|
36
45
|
```python
|
|
37
46
|
import altair as alt
|
|
38
47
|
|
|
39
|
-
cars = alt.load_dataset(
|
|
48
|
+
cars = alt.load_dataset("cars")
|
|
40
49
|
|
|
41
|
-
chart =
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
50
|
+
chart = (
|
|
51
|
+
alt.Chart(cars)
|
|
52
|
+
.mark_point()
|
|
53
|
+
.encode(
|
|
54
|
+
x="Horsepower",
|
|
55
|
+
y="Miles_per_Gallon",
|
|
56
|
+
color="Origin",
|
|
57
|
+
)
|
|
45
58
|
)
|
|
46
59
|
|
|
47
60
|
chart
|
|
@@ -52,30 +65,34 @@ Provide Vega-Embed options via metadata:
|
|
|
52
65
|
```python
|
|
53
66
|
from IPython.display import display
|
|
54
67
|
|
|
55
|
-
display(
|
|
56
|
-
|
|
57
|
-
"
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
"
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
},
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
68
|
+
display(
|
|
69
|
+
{
|
|
70
|
+
"application/vnd.vegalite.v3+json": {
|
|
71
|
+
"$schema": "https://vega.github.io/schema/vega-lite/v3.json",
|
|
72
|
+
"description": "A simple bar chart with embedded data.",
|
|
73
|
+
"data": {
|
|
74
|
+
"values": [
|
|
75
|
+
{"a": "A", "b": 28},
|
|
76
|
+
{"a": "B", "b": 55},
|
|
77
|
+
{"a": "C", "b": 43},
|
|
78
|
+
{"a": "D", "b": 91},
|
|
79
|
+
{"a": "E", "b": 81},
|
|
80
|
+
{"a": "F", "b": 53},
|
|
81
|
+
{"a": "G", "b": 19},
|
|
82
|
+
{"a": "H", "b": 87},
|
|
83
|
+
{"a": "I", "b": 52},
|
|
84
|
+
]
|
|
85
|
+
},
|
|
86
|
+
"mark": "bar",
|
|
87
|
+
"encoding": {
|
|
88
|
+
"x": {"field": "a", "type": "ordinal"},
|
|
89
|
+
"y": {"field": "b", "type": "quantitative"},
|
|
90
|
+
},
|
|
76
91
|
}
|
|
77
|
-
}
|
|
78
|
-
},
|
|
92
|
+
},
|
|
93
|
+
metadata={"application/vnd.vegalite.v3+json": {"embed_options": {"actions": False}}},
|
|
94
|
+
raw=True,
|
|
95
|
+
)
|
|
79
96
|
```
|
|
80
97
|
|
|
81
98
|
Provide Vega-Embed options via Altair:
|
|
@@ -83,14 +100,18 @@ Provide Vega-Embed options via Altair:
|
|
|
83
100
|
```python
|
|
84
101
|
import altair as alt
|
|
85
102
|
|
|
86
|
-
alt.renderers.enable(
|
|
103
|
+
alt.renderers.enable("default", embed_options={"actions": False})
|
|
87
104
|
|
|
88
|
-
cars = alt.load_dataset(
|
|
105
|
+
cars = alt.load_dataset("cars")
|
|
89
106
|
|
|
90
|
-
chart =
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
107
|
+
chart = (
|
|
108
|
+
alt.Chart(cars)
|
|
109
|
+
.mark_point()
|
|
110
|
+
.encode(
|
|
111
|
+
x="Horsepower",
|
|
112
|
+
y="Miles_per_Gallon",
|
|
113
|
+
color="Origin",
|
|
114
|
+
)
|
|
94
115
|
)
|
|
95
116
|
|
|
96
117
|
chart
|
package/lib/index.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
| Copyright (c) Jupyter Development Team.
|
|
3
3
|
| Distributed under the terms of the Modified BSD License.
|
|
4
4
|
|----------------------------------------------------------------------------*/
|
|
5
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
6
5
|
/**
|
|
7
6
|
* @packageDocumentation
|
|
8
7
|
* @module vega5-extension
|
|
@@ -109,11 +108,8 @@ export class RenderedVega extends Widget {
|
|
|
109
108
|
return;
|
|
110
109
|
}
|
|
111
110
|
// Add png representation of vega chart to output
|
|
112
|
-
const
|
|
113
|
-
|
|
114
|
-
: embedOptions.scaleFactor
|
|
115
|
-
? embedOptions.scaleFactor.png
|
|
116
|
-
: embedOptions.scaleFactor);
|
|
111
|
+
const scaleFactor = embedOptions.scaleFactor;
|
|
112
|
+
const imageURL = await this._result.view.toImageURL('png', typeof scaleFactor === 'number' ? scaleFactor : scaleFactor === null || scaleFactor === void 0 ? void 0 : scaleFactor.png);
|
|
117
113
|
model.setData({
|
|
118
114
|
data: { ...model.data, 'image/png': imageURL.split(',')[1] }
|
|
119
115
|
});
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAC/E
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/vega5-extension",
|
|
3
|
-
"version": "4.7.0-alpha.
|
|
3
|
+
"version": "4.7.0-alpha.2",
|
|
4
4
|
"description": "JupyterLab - Vega 5 and Vega-Lite 5 Mime Renderer Extension",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -37,15 +37,15 @@
|
|
|
37
37
|
"watch": "tsc -b --watch"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@jupyterlab/rendermime-interfaces": "^3.15.0-alpha.
|
|
41
|
-
"@lumino/coreutils": "^2.2.
|
|
42
|
-
"@lumino/widgets": "^2.
|
|
40
|
+
"@jupyterlab/rendermime-interfaces": "^3.15.0-alpha.2",
|
|
41
|
+
"@lumino/coreutils": "^2.2.3",
|
|
42
|
+
"@lumino/widgets": "^2.9.0",
|
|
43
43
|
"vega": "^5.20.0",
|
|
44
44
|
"vega-embed": "^6.2.1",
|
|
45
45
|
"vega-lite": "^5.6.1-next.1"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@jupyterlab/testutils": "^4.7.0-alpha.
|
|
48
|
+
"@jupyterlab/testutils": "^4.7.0-alpha.2",
|
|
49
49
|
"@types/jest": "^29.2.0",
|
|
50
50
|
"@types/webpack-env": "^1.18.0",
|
|
51
51
|
"jest": "^29.2.0",
|
package/src/index.ts
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
| Copyright (c) Jupyter Development Team.
|
|
3
3
|
| Distributed under the terms of the Modified BSD License.
|
|
4
4
|
|----------------------------------------------------------------------------*/
|
|
5
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
6
5
|
/**
|
|
7
6
|
* @packageDocumentation
|
|
8
7
|
* @module vega5-extension
|
|
@@ -120,7 +119,10 @@ export class RenderedVega extends Widget implements IRenderMime.IRenderer {
|
|
|
120
119
|
const loader = vega.vega.loader({
|
|
121
120
|
http: { credentials: 'same-origin' }
|
|
122
121
|
});
|
|
123
|
-
const sanitize = async (
|
|
122
|
+
const sanitize = async (
|
|
123
|
+
uri: string,
|
|
124
|
+
options: Parameters<typeof loader.sanitize>[1]
|
|
125
|
+
) => {
|
|
124
126
|
// Use the resolver for any URIs it wants to handle
|
|
125
127
|
const resolver = this._resolver;
|
|
126
128
|
if (resolver?.isLocal && resolver.isLocal(uri)) {
|
|
@@ -143,13 +145,10 @@ export class RenderedVega extends Widget implements IRenderMime.IRenderer {
|
|
|
143
145
|
}
|
|
144
146
|
|
|
145
147
|
// Add png representation of vega chart to output
|
|
148
|
+
const scaleFactor = embedOptions.scaleFactor;
|
|
146
149
|
const imageURL = await this._result.view.toImageURL(
|
|
147
150
|
'png',
|
|
148
|
-
typeof
|
|
149
|
-
? embedOptions.scaleFactor
|
|
150
|
-
: embedOptions.scaleFactor
|
|
151
|
-
? (embedOptions.scaleFactor as any).png
|
|
152
|
-
: embedOptions.scaleFactor
|
|
151
|
+
typeof scaleFactor === 'number' ? scaleFactor : scaleFactor?.png
|
|
153
152
|
);
|
|
154
153
|
model.setData({
|
|
155
154
|
data: { ...model.data, 'image/png': imageURL.split(',')[1] }
|