@jupyterlab/vega5-extension 4.0.0-alpha.2 → 4.0.0-alpha.20
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 +2 -4
- package/lib/index.d.ts +7 -0
- package/lib/index.js +38 -9
- package/lib/index.js.map +1 -1
- package/package.json +19 -10
- package/src/index.ts +254 -0
- package/src/json.d.ts +8 -0
- package/style/base.css +2 -2
package/README.md
CHANGED
|
@@ -4,9 +4,7 @@ A JupyterLab extension for rendering [Vega](https://vega.github.io/vega) 5 and [
|
|
|
4
4
|
|
|
5
5
|

|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
- JupyterLab ^0.27.0
|
|
7
|
+
This extension is in the official JupyterLab distribution.
|
|
10
8
|
|
|
11
9
|
## Usage
|
|
12
10
|
|
|
@@ -74,7 +72,7 @@ display({
|
|
|
74
72
|
}
|
|
75
73
|
}
|
|
76
74
|
}, metadata={
|
|
77
|
-
"application/vnd.vegalite.
|
|
75
|
+
"application/vnd.vegalite.v3+json": {
|
|
78
76
|
"embed_options": {
|
|
79
77
|
"actions": False
|
|
80
78
|
}
|
package/lib/index.d.ts
CHANGED
|
@@ -25,6 +25,13 @@ export declare const VEGALITE3_MIME_TYPE = "application/vnd.vegalite.v3+json";
|
|
|
25
25
|
* The version of this follows the major version of Vega-Lite.
|
|
26
26
|
*/
|
|
27
27
|
export declare const VEGALITE4_MIME_TYPE = "application/vnd.vegalite.v4+json";
|
|
28
|
+
/**
|
|
29
|
+
* The MIME type for Vega-Lite.
|
|
30
|
+
*
|
|
31
|
+
* #### Notes
|
|
32
|
+
* The version of this follows the major version of Vega-Lite.
|
|
33
|
+
*/
|
|
34
|
+
export declare const VEGALITE5_MIME_TYPE = "application/vnd.vegalite.v5+json";
|
|
28
35
|
/**
|
|
29
36
|
* A widget for rendering Vega or Vega-Lite data, for usage with rendermime.
|
|
30
37
|
*/
|
package/lib/index.js
CHANGED
|
@@ -40,6 +40,13 @@ export const VEGALITE3_MIME_TYPE = 'application/vnd.vegalite.v3+json';
|
|
|
40
40
|
* The version of this follows the major version of Vega-Lite.
|
|
41
41
|
*/
|
|
42
42
|
export const VEGALITE4_MIME_TYPE = 'application/vnd.vegalite.v4+json';
|
|
43
|
+
/**
|
|
44
|
+
* The MIME type for Vega-Lite.
|
|
45
|
+
*
|
|
46
|
+
* #### Notes
|
|
47
|
+
* The version of this follows the major version of Vega-Lite.
|
|
48
|
+
*/
|
|
49
|
+
export const VEGALITE5_MIME_TYPE = 'application/vnd.vegalite.v5+json';
|
|
43
50
|
/**
|
|
44
51
|
* A widget for rendering Vega or Vega-Lite data, for usage with rendermime.
|
|
45
52
|
*/
|
|
@@ -64,6 +71,11 @@ export class RenderedVega extends Widget {
|
|
|
64
71
|
}
|
|
65
72
|
const metadata = model.metadata[this._mimeType];
|
|
66
73
|
const embedOptions = metadata && metadata.embed_options ? metadata.embed_options : {};
|
|
74
|
+
// If the JupyterLab theme is dark, render this using a dark Vega theme.
|
|
75
|
+
let bodyThemeDark = document.body.dataset.jpThemeLight === 'false';
|
|
76
|
+
if (bodyThemeDark) {
|
|
77
|
+
embedOptions.theme = 'dark';
|
|
78
|
+
}
|
|
67
79
|
const mode = this._mimeType === VEGA_MIME_TYPE ? 'vega' : 'vega-lite';
|
|
68
80
|
const vega = Private.vega != null ? Private.vega : await Private.ensureVega();
|
|
69
81
|
const el = document.createElement('div');
|
|
@@ -85,14 +97,20 @@ export class RenderedVega extends Widget {
|
|
|
85
97
|
}
|
|
86
98
|
return loader.sanitize(uri, options);
|
|
87
99
|
};
|
|
88
|
-
this._result = await vega.default(el, spec,
|
|
100
|
+
this._result = await vega.default(el, spec, {
|
|
101
|
+
actions: true,
|
|
102
|
+
defaultStyle: true,
|
|
103
|
+
...embedOptions,
|
|
104
|
+
mode,
|
|
105
|
+
loader: { ...loader, sanitize }
|
|
106
|
+
});
|
|
89
107
|
if (model.data['image/png']) {
|
|
90
108
|
return;
|
|
91
109
|
}
|
|
92
110
|
// Add png representation of vega chart to output
|
|
93
|
-
const imageURL = await this._result.view.toImageURL('png');
|
|
111
|
+
const imageURL = await this._result.view.toImageURL('png', embedOptions.scaleFactor);
|
|
94
112
|
model.setData({
|
|
95
|
-
data:
|
|
113
|
+
data: { ...model.data, 'image/png': imageURL.split(',')[1] }
|
|
96
114
|
});
|
|
97
115
|
}
|
|
98
116
|
dispose() {
|
|
@@ -107,7 +125,12 @@ export class RenderedVega extends Widget {
|
|
|
107
125
|
*/
|
|
108
126
|
export const rendererFactory = {
|
|
109
127
|
safe: true,
|
|
110
|
-
mimeTypes: [
|
|
128
|
+
mimeTypes: [
|
|
129
|
+
VEGA_MIME_TYPE,
|
|
130
|
+
VEGALITE3_MIME_TYPE,
|
|
131
|
+
VEGALITE4_MIME_TYPE,
|
|
132
|
+
VEGALITE5_MIME_TYPE
|
|
133
|
+
],
|
|
111
134
|
createRenderer: options => new RenderedVega(options)
|
|
112
135
|
};
|
|
113
136
|
const extension = {
|
|
@@ -123,10 +146,10 @@ const extension = {
|
|
|
123
146
|
defaultFor: ['vega5']
|
|
124
147
|
},
|
|
125
148
|
{
|
|
126
|
-
name: 'Vega-
|
|
127
|
-
primaryFileType: 'vega-
|
|
128
|
-
fileTypes: ['vega-lite3', 'vega-lite4', 'json'],
|
|
129
|
-
defaultFor: ['vega-lite3', 'vega-lite4']
|
|
149
|
+
name: 'Vega-Lite5',
|
|
150
|
+
primaryFileType: 'vega-lite5',
|
|
151
|
+
fileTypes: ['vega-lite3', 'vega-lite4', 'vega-lite5', 'json'],
|
|
152
|
+
defaultFor: ['vega-lite3', 'vega-lite4', 'vega-lite5']
|
|
130
153
|
}
|
|
131
154
|
],
|
|
132
155
|
fileTypes: [
|
|
@@ -136,10 +159,16 @@ const extension = {
|
|
|
136
159
|
extensions: ['.vg', '.vg.json', '.vega'],
|
|
137
160
|
icon: 'ui-components:vega'
|
|
138
161
|
},
|
|
162
|
+
{
|
|
163
|
+
mimeTypes: [VEGALITE5_MIME_TYPE],
|
|
164
|
+
name: 'vega-lite5',
|
|
165
|
+
extensions: ['.vl', '.vl.json', '.vegalite'],
|
|
166
|
+
icon: 'ui-components:vega'
|
|
167
|
+
},
|
|
139
168
|
{
|
|
140
169
|
mimeTypes: [VEGALITE4_MIME_TYPE],
|
|
141
170
|
name: 'vega-lite4',
|
|
142
|
-
extensions: [
|
|
171
|
+
extensions: [],
|
|
143
172
|
icon: 'ui-components:vega'
|
|
144
173
|
},
|
|
145
174
|
{
|
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;;;GAGG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC;;GAEG;AACH,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAEnD;;GAEG;AACH,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAEtC;;GAEG;AACH,MAAM,cAAc,GAAG,qBAAqB,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,8BAA8B,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;AAEtE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;AAEtE;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,MAAM;IAGtC;;OAEG;IACH,YAAY,OAAqC;QAC/C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,CACX,IAAI,CAAC,SAAS,KAAK,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAChE,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,KAA6B;QAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAA2B,CAAC;QAClE,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO;SACR;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAIjC,CAAC;QACd,MAAM,YAAY,GAChB,QAAQ,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,GACR,IAAI,CAAC,SAAS,KAAK,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;QAE3D,MAAM,IAAI,GACR,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAEnE,MAAM,EAAE,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEzC,4CAA4C;QAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAE1B,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;SACzB;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE;SACrC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAW,EAAE,OAAY,EAAE,EAAE;YACnD,mDAAmD;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;YAChC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,KAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC9C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC/C,GAAG,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;aAC9C;YACD,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/vega5-extension",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
4
|
-
"description": "JupyterLab - Vega 5 and Vega-Lite
|
|
3
|
+
"version": "4.0.0-alpha.20",
|
|
4
|
+
"description": "JupyterLab - Vega 5 and Vega-Lite 5 Mime Renderer Extension",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/jupyterlab/jupyterlab/issues"
|
|
@@ -23,27 +23,36 @@
|
|
|
23
23
|
},
|
|
24
24
|
"files": [
|
|
25
25
|
"lib/*.{d.ts,js,js.map}",
|
|
26
|
-
"style/*.*"
|
|
26
|
+
"style/*.*",
|
|
27
|
+
"src/**/*.{ts,tsx}"
|
|
27
28
|
],
|
|
28
29
|
"scripts": {
|
|
29
30
|
"build": "tsc -b",
|
|
30
|
-
"
|
|
31
|
+
"build:test": "tsc --build tsconfig.test.json",
|
|
32
|
+
"clean": "rimraf lib tsconfig.tsbuildinfo",
|
|
31
33
|
"docs": "typedoc src",
|
|
34
|
+
"test": "jest",
|
|
35
|
+
"test:cov": "jest --collect-coverage",
|
|
36
|
+
"test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
|
|
37
|
+
"test:debug:watch": "node --inspect-brk node_modules/.bin/jest --runInBand --watch",
|
|
32
38
|
"watch": "tsc -b --watch"
|
|
33
39
|
},
|
|
34
40
|
"dependencies": {
|
|
35
|
-
"@jupyterlab/rendermime-interfaces": "^
|
|
36
|
-
"@lumino/coreutils": "^
|
|
37
|
-
"@lumino/widgets": "^
|
|
41
|
+
"@jupyterlab/rendermime-interfaces": "^3.8.0-alpha.20",
|
|
42
|
+
"@lumino/coreutils": "^2.0.0-rc.0",
|
|
43
|
+
"@lumino/widgets": "^2.0.0-rc.0",
|
|
38
44
|
"vega": "^5.20.0",
|
|
39
45
|
"vega-embed": "^6.2.1",
|
|
40
|
-
"vega-lite": "^5.1.
|
|
46
|
+
"vega-lite": "^5.6.1-next.1"
|
|
41
47
|
},
|
|
42
48
|
"devDependencies": {
|
|
49
|
+
"@jupyterlab/testutils": "^4.0.0-alpha.20",
|
|
50
|
+
"@types/jest": "^29.2.0",
|
|
43
51
|
"@types/webpack-env": "^1.14.1",
|
|
52
|
+
"jest": "^29.2.0",
|
|
44
53
|
"rimraf": "~3.0.0",
|
|
45
|
-
"typedoc": "~0.
|
|
46
|
-
"typescript": "~
|
|
54
|
+
"typedoc": "~0.23.25",
|
|
55
|
+
"typescript": "~5.0.0-beta"
|
|
47
56
|
},
|
|
48
57
|
"publishConfig": {
|
|
49
58
|
"access": "public"
|
package/src/index.ts
ADDED
|
@@ -0,0 +1,254 @@
|
|
|
1
|
+
/* -----------------------------------------------------------------------------
|
|
2
|
+
| Copyright (c) Jupyter Development Team.
|
|
3
|
+
| Distributed under the terms of the Modified BSD License.
|
|
4
|
+
|----------------------------------------------------------------------------*/
|
|
5
|
+
/**
|
|
6
|
+
* @packageDocumentation
|
|
7
|
+
* @module vega5-extension
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
|
|
11
|
+
import { JSONObject } from '@lumino/coreutils';
|
|
12
|
+
import { Widget } from '@lumino/widgets';
|
|
13
|
+
import * as VegaModuleType from 'vega-embed';
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* The CSS class to add to the Vega and Vega-Lite widget.
|
|
17
|
+
*/
|
|
18
|
+
const VEGA_COMMON_CLASS = 'jp-RenderedVegaCommon5';
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* The CSS class to add to the Vega.
|
|
22
|
+
*/
|
|
23
|
+
const VEGA_CLASS = 'jp-RenderedVega5';
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* The CSS class to add to the Vega-Lite.
|
|
27
|
+
*/
|
|
28
|
+
const VEGALITE_CLASS = 'jp-RenderedVegaLite';
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* The MIME type for Vega.
|
|
32
|
+
*
|
|
33
|
+
* #### Notes
|
|
34
|
+
* The version of this follows the major version of Vega.
|
|
35
|
+
*/
|
|
36
|
+
export const VEGA_MIME_TYPE = 'application/vnd.vega.v5+json';
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* The MIME type for Vega-Lite.
|
|
40
|
+
*
|
|
41
|
+
* #### Notes
|
|
42
|
+
* The version of this follows the major version of Vega-Lite.
|
|
43
|
+
*/
|
|
44
|
+
export const VEGALITE3_MIME_TYPE = 'application/vnd.vegalite.v3+json';
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* The MIME type for Vega-Lite.
|
|
48
|
+
*
|
|
49
|
+
* #### Notes
|
|
50
|
+
* The version of this follows the major version of Vega-Lite.
|
|
51
|
+
*/
|
|
52
|
+
export const VEGALITE4_MIME_TYPE = 'application/vnd.vegalite.v4+json';
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* The MIME type for Vega-Lite.
|
|
56
|
+
*
|
|
57
|
+
* #### Notes
|
|
58
|
+
* The version of this follows the major version of Vega-Lite.
|
|
59
|
+
*/
|
|
60
|
+
export const VEGALITE5_MIME_TYPE = 'application/vnd.vegalite.v5+json';
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* A widget for rendering Vega or Vega-Lite data, for usage with rendermime.
|
|
64
|
+
*/
|
|
65
|
+
export class RenderedVega extends Widget implements IRenderMime.IRenderer {
|
|
66
|
+
private _result: VegaModuleType.Result;
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Create a new widget for rendering Vega/Vega-Lite.
|
|
70
|
+
*/
|
|
71
|
+
constructor(options: IRenderMime.IRendererOptions) {
|
|
72
|
+
super();
|
|
73
|
+
this._mimeType = options.mimeType;
|
|
74
|
+
this._resolver = options.resolver;
|
|
75
|
+
this.addClass(VEGA_COMMON_CLASS);
|
|
76
|
+
this.addClass(
|
|
77
|
+
this._mimeType === VEGA_MIME_TYPE ? VEGA_CLASS : VEGALITE_CLASS
|
|
78
|
+
);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Render Vega/Vega-Lite into this widget's node.
|
|
83
|
+
*/
|
|
84
|
+
async renderModel(model: IRenderMime.IMimeModel): Promise<void> {
|
|
85
|
+
const spec = model.data[this._mimeType] as JSONObject | undefined;
|
|
86
|
+
if (spec === undefined) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const metadata = model.metadata[this._mimeType] as
|
|
90
|
+
| {
|
|
91
|
+
embed_options?: VegaModuleType.EmbedOptions;
|
|
92
|
+
}
|
|
93
|
+
| undefined;
|
|
94
|
+
const embedOptions =
|
|
95
|
+
metadata && metadata.embed_options ? metadata.embed_options : {};
|
|
96
|
+
|
|
97
|
+
// If the JupyterLab theme is dark, render this using a dark Vega theme.
|
|
98
|
+
let bodyThemeDark = document.body.dataset.jpThemeLight === 'false';
|
|
99
|
+
if (bodyThemeDark) {
|
|
100
|
+
embedOptions.theme = 'dark';
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
const mode: VegaModuleType.Mode =
|
|
104
|
+
this._mimeType === VEGA_MIME_TYPE ? 'vega' : 'vega-lite';
|
|
105
|
+
|
|
106
|
+
const vega =
|
|
107
|
+
Private.vega != null ? Private.vega : await Private.ensureVega();
|
|
108
|
+
|
|
109
|
+
const el = document.createElement('div');
|
|
110
|
+
|
|
111
|
+
// clear the output before attaching a chart
|
|
112
|
+
this.node.textContent = '';
|
|
113
|
+
this.node.appendChild(el);
|
|
114
|
+
|
|
115
|
+
if (this._result) {
|
|
116
|
+
this._result.finalize();
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
const loader = vega.vega.loader({
|
|
120
|
+
http: { credentials: 'same-origin' }
|
|
121
|
+
});
|
|
122
|
+
const sanitize = async (uri: string, options: any) => {
|
|
123
|
+
// Use the resolver for any URIs it wants to handle
|
|
124
|
+
const resolver = this._resolver;
|
|
125
|
+
if (resolver?.isLocal && resolver.isLocal(uri)) {
|
|
126
|
+
const absPath = await resolver.resolveUrl(uri);
|
|
127
|
+
uri = await resolver.getDownloadUrl(absPath);
|
|
128
|
+
}
|
|
129
|
+
return loader.sanitize(uri, options);
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
this._result = await vega.default(el, spec, {
|
|
133
|
+
actions: true,
|
|
134
|
+
defaultStyle: true,
|
|
135
|
+
...embedOptions,
|
|
136
|
+
mode,
|
|
137
|
+
loader: { ...loader, sanitize }
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
if (model.data['image/png']) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// Add png representation of vega chart to output
|
|
145
|
+
const imageURL = await this._result.view.toImageURL(
|
|
146
|
+
'png',
|
|
147
|
+
embedOptions.scaleFactor
|
|
148
|
+
);
|
|
149
|
+
model.setData({
|
|
150
|
+
data: { ...model.data, 'image/png': imageURL.split(',')[1] }
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
dispose(): void {
|
|
155
|
+
if (this._result) {
|
|
156
|
+
this._result.finalize();
|
|
157
|
+
}
|
|
158
|
+
super.dispose();
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
private _mimeType: string;
|
|
162
|
+
private _resolver: IRenderMime.IResolver | null;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/**
|
|
166
|
+
* A mime renderer factory for vega data.
|
|
167
|
+
*/
|
|
168
|
+
export const rendererFactory: IRenderMime.IRendererFactory = {
|
|
169
|
+
safe: true,
|
|
170
|
+
mimeTypes: [
|
|
171
|
+
VEGA_MIME_TYPE,
|
|
172
|
+
VEGALITE3_MIME_TYPE,
|
|
173
|
+
VEGALITE4_MIME_TYPE,
|
|
174
|
+
VEGALITE5_MIME_TYPE
|
|
175
|
+
],
|
|
176
|
+
createRenderer: options => new RenderedVega(options)
|
|
177
|
+
};
|
|
178
|
+
|
|
179
|
+
const extension: IRenderMime.IExtension = {
|
|
180
|
+
id: '@jupyterlab/vega5-extension:factory',
|
|
181
|
+
rendererFactory,
|
|
182
|
+
rank: 57,
|
|
183
|
+
dataType: 'json',
|
|
184
|
+
documentWidgetFactoryOptions: [
|
|
185
|
+
{
|
|
186
|
+
name: 'Vega5',
|
|
187
|
+
primaryFileType: 'vega5',
|
|
188
|
+
fileTypes: ['vega5', 'json'],
|
|
189
|
+
defaultFor: ['vega5']
|
|
190
|
+
},
|
|
191
|
+
{
|
|
192
|
+
name: 'Vega-Lite5',
|
|
193
|
+
primaryFileType: 'vega-lite5',
|
|
194
|
+
fileTypes: ['vega-lite3', 'vega-lite4', 'vega-lite5', 'json'],
|
|
195
|
+
defaultFor: ['vega-lite3', 'vega-lite4', 'vega-lite5']
|
|
196
|
+
}
|
|
197
|
+
],
|
|
198
|
+
fileTypes: [
|
|
199
|
+
{
|
|
200
|
+
mimeTypes: [VEGA_MIME_TYPE],
|
|
201
|
+
name: 'vega5',
|
|
202
|
+
extensions: ['.vg', '.vg.json', '.vega'],
|
|
203
|
+
icon: 'ui-components:vega'
|
|
204
|
+
},
|
|
205
|
+
{
|
|
206
|
+
mimeTypes: [VEGALITE5_MIME_TYPE],
|
|
207
|
+
name: 'vega-lite5',
|
|
208
|
+
extensions: ['.vl', '.vl.json', '.vegalite'],
|
|
209
|
+
icon: 'ui-components:vega'
|
|
210
|
+
},
|
|
211
|
+
{
|
|
212
|
+
mimeTypes: [VEGALITE4_MIME_TYPE],
|
|
213
|
+
name: 'vega-lite4',
|
|
214
|
+
extensions: [],
|
|
215
|
+
icon: 'ui-components:vega'
|
|
216
|
+
},
|
|
217
|
+
{
|
|
218
|
+
mimeTypes: [VEGALITE3_MIME_TYPE],
|
|
219
|
+
name: 'vega-lite3',
|
|
220
|
+
extensions: [],
|
|
221
|
+
icon: 'ui-components:vega'
|
|
222
|
+
}
|
|
223
|
+
]
|
|
224
|
+
};
|
|
225
|
+
|
|
226
|
+
export default extension;
|
|
227
|
+
|
|
228
|
+
/**
|
|
229
|
+
* A namespace for private module data.
|
|
230
|
+
*/
|
|
231
|
+
namespace Private {
|
|
232
|
+
/**
|
|
233
|
+
* A cached reference to the vega library.
|
|
234
|
+
*/
|
|
235
|
+
export let vega: typeof VegaModuleType;
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* A Promise for the initial load of vega.
|
|
239
|
+
*/
|
|
240
|
+
export let vegaReady: Promise<typeof VegaModuleType>;
|
|
241
|
+
|
|
242
|
+
/**
|
|
243
|
+
* Lazy-load and cache the vega-embed library
|
|
244
|
+
*/
|
|
245
|
+
export function ensureVega(): Promise<typeof VegaModuleType> {
|
|
246
|
+
if (vegaReady) {
|
|
247
|
+
return vegaReady;
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
vegaReady = import('vega-embed');
|
|
251
|
+
|
|
252
|
+
return vegaReady;
|
|
253
|
+
}
|
|
254
|
+
}
|
package/src/json.d.ts
ADDED
package/style/base.css
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
| Distributed under the terms of the Modified BSD License.
|
|
4
4
|
|----------------------------------------------------------------------------*/
|
|
5
5
|
|
|
6
|
-
.jp-
|
|
6
|
+
.jp-RenderedVegaCommon5 {
|
|
7
7
|
margin-left: 8px;
|
|
8
8
|
margin-top: 8px;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
.jp-MimeDocument .jp-
|
|
11
|
+
.jp-MimeDocument .jp-RenderedVegaCommon5 {
|
|
12
12
|
padding: 16px;
|
|
13
13
|
}
|
|
14
14
|
|