@jupyterlab/mermaid 4.7.0-alpha.1 → 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/lib/manager.js +5 -3
- package/lib/manager.js.map +1 -1
- package/lib/mime.js +12 -3
- package/lib/mime.js.map +1 -1
- package/package.json +4 -4
- package/src/manager.ts +4 -3
- package/src/mime.ts +18 -3
package/lib/manager.js
CHANGED
|
@@ -6,7 +6,8 @@ import { DETAILS_CLASS, MERMAID_CLASS, MERMAID_CODE_CLASS, MERMAID_DARK_THEME, M
|
|
|
6
6
|
*/
|
|
7
7
|
export class MermaidManager {
|
|
8
8
|
constructor(options = {}) {
|
|
9
|
-
|
|
9
|
+
var _a;
|
|
10
|
+
this._diagrams = new LruCache({ maxSize: (_a = options.maxCacheSize) !== null && _a !== void 0 ? _a : null });
|
|
10
11
|
// handle reacting to themes
|
|
11
12
|
if (options.themes) {
|
|
12
13
|
Private.initThemes(options.themes || null);
|
|
@@ -159,8 +160,9 @@ export class MermaidManager {
|
|
|
159
160
|
figure.appendChild(img);
|
|
160
161
|
img.setAttribute('src', `data:image/svg+xml,${encodeURIComponent(info.svg)}`);
|
|
161
162
|
// add dimension information
|
|
162
|
-
|
|
163
|
-
|
|
163
|
+
const { width } = info;
|
|
164
|
+
if (width !== undefined && width !== null && width !== 0) {
|
|
165
|
+
img.width = width;
|
|
164
166
|
}
|
|
165
167
|
// add accessible alt title
|
|
166
168
|
if (info.accessibleTitle) {
|
package/lib/manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjD,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACd,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,MAAM,OAAO,cAAc;IAIzB,YAAY,UAAmC,EAAE
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}
|
package/lib/mime.js
CHANGED
|
@@ -2,13 +2,12 @@
|
|
|
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 mermaid-extension
|
|
9
8
|
*/
|
|
10
9
|
import { MERMAID_CLASS, MERMAID_MIME_TYPE, WARNING_CLASS } from './tokens';
|
|
11
|
-
import { PromiseDelegate } from '@lumino/coreutils';
|
|
10
|
+
import { JSONExt, PromiseDelegate } from '@lumino/coreutils';
|
|
12
11
|
import { Widget } from '@lumino/widgets';
|
|
13
12
|
const SVG_MIME = 'image/svg+xml';
|
|
14
13
|
/**
|
|
@@ -58,8 +57,11 @@ export class RenderedMermaid extends Widget {
|
|
|
58
57
|
}
|
|
59
58
|
// capture the version of mermaid used
|
|
60
59
|
const version = manager.getMermaidVersion();
|
|
60
|
+
const existingMetadata = model.metadata[MERMAID_MIME_TYPE];
|
|
61
61
|
const mermaidMetadata = {
|
|
62
|
-
...(
|
|
62
|
+
...(Private.isReadonlyPartialJSONObject(existingMetadata)
|
|
63
|
+
? existingMetadata
|
|
64
|
+
: {}),
|
|
63
65
|
version
|
|
64
66
|
};
|
|
65
67
|
const metadata = {
|
|
@@ -87,6 +89,13 @@ export class RenderedMermaid extends Widget {
|
|
|
87
89
|
}
|
|
88
90
|
RenderedMermaid._manager = null;
|
|
89
91
|
RenderedMermaid._managerReady = new PromiseDelegate();
|
|
92
|
+
var Private;
|
|
93
|
+
(function (Private) {
|
|
94
|
+
function isReadonlyPartialJSONObject(value) {
|
|
95
|
+
return value !== undefined && JSONExt.isObject(value);
|
|
96
|
+
}
|
|
97
|
+
Private.isReadonlyPartialJSONObject = isReadonlyPartialJSONObject;
|
|
98
|
+
})(Private || (Private = {}));
|
|
90
99
|
/**
|
|
91
100
|
* A mime renderer factory for mermaid text-based diagrams.
|
|
92
101
|
*/
|
package/lib/mime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mime.js","sourceRoot":"","sources":["../src/mime.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAC/E
|
|
1
|
+
{"version":3,"file":"mime.js","sourceRoot":"","sources":["../src/mime.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/mermaid",
|
|
3
|
-
"version": "4.7.0-alpha.
|
|
3
|
+
"version": "4.7.0-alpha.2",
|
|
4
4
|
"description": "JupyterLab - Mermaid Renderer",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"watch": "tsc -b --watch"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@jupyterlab/apputils": "^4.8.0-alpha.
|
|
45
|
-
"@jupyterlab/coreutils": "^6.7.0-alpha.
|
|
46
|
-
"@jupyterlab/rendermime-interfaces": "^3.15.0-alpha.
|
|
44
|
+
"@jupyterlab/apputils": "^4.8.0-alpha.2",
|
|
45
|
+
"@jupyterlab/coreutils": "^6.7.0-alpha.2",
|
|
46
|
+
"@jupyterlab/rendermime-interfaces": "^3.15.0-alpha.2",
|
|
47
47
|
"@lumino/coreutils": "^2.2.3",
|
|
48
48
|
"@lumino/widgets": "^2.9.0",
|
|
49
49
|
"@mermaid-js/layout-elk": "^0.2.1",
|
package/src/manager.ts
CHANGED
|
@@ -29,7 +29,7 @@ export class MermaidManager implements IMermaidManager {
|
|
|
29
29
|
protected _themes: IThemeManager | null;
|
|
30
30
|
|
|
31
31
|
constructor(options: MermaidManager.IOptions = {}) {
|
|
32
|
-
this._diagrams = new LruCache({ maxSize: options.maxCacheSize
|
|
32
|
+
this._diagrams = new LruCache({ maxSize: options.maxCacheSize ?? null });
|
|
33
33
|
|
|
34
34
|
// handle reacting to themes
|
|
35
35
|
if (options.themes) {
|
|
@@ -211,8 +211,9 @@ export class MermaidManager implements IMermaidManager {
|
|
|
211
211
|
);
|
|
212
212
|
|
|
213
213
|
// add dimension information
|
|
214
|
-
|
|
215
|
-
|
|
214
|
+
const { width } = info;
|
|
215
|
+
if (width !== undefined && width !== null && width !== 0) {
|
|
216
|
+
img.width = width;
|
|
216
217
|
}
|
|
217
218
|
|
|
218
219
|
// add accessible alt title
|
package/src/mime.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 mermaid-extension
|
|
@@ -11,7 +10,12 @@
|
|
|
11
10
|
import type { IMermaidManager } from './tokens';
|
|
12
11
|
import { MERMAID_CLASS, MERMAID_MIME_TYPE, WARNING_CLASS } from './tokens';
|
|
13
12
|
import type { IRenderMime } from '@jupyterlab/rendermime-interfaces';
|
|
14
|
-
import {
|
|
13
|
+
import {
|
|
14
|
+
JSONExt,
|
|
15
|
+
PromiseDelegate,
|
|
16
|
+
type ReadonlyPartialJSONObject,
|
|
17
|
+
type ReadonlyPartialJSONValue
|
|
18
|
+
} from '@lumino/coreutils';
|
|
15
19
|
import { Widget } from '@lumino/widgets';
|
|
16
20
|
|
|
17
21
|
const SVG_MIME = 'image/svg+xml';
|
|
@@ -74,8 +78,11 @@ export class RenderedMermaid extends Widget implements IRenderMime.IRenderer {
|
|
|
74
78
|
|
|
75
79
|
// capture the version of mermaid used
|
|
76
80
|
const version = manager.getMermaidVersion();
|
|
81
|
+
const existingMetadata = model.metadata[MERMAID_MIME_TYPE];
|
|
77
82
|
const mermaidMetadata = {
|
|
78
|
-
...((
|
|
83
|
+
...(Private.isReadonlyPartialJSONObject(existingMetadata)
|
|
84
|
+
? existingMetadata
|
|
85
|
+
: {}),
|
|
79
86
|
version
|
|
80
87
|
};
|
|
81
88
|
const metadata = {
|
|
@@ -105,6 +112,14 @@ export class RenderedMermaid extends Widget implements IRenderMime.IRenderer {
|
|
|
105
112
|
private _mimeType: string;
|
|
106
113
|
}
|
|
107
114
|
|
|
115
|
+
namespace Private {
|
|
116
|
+
export function isReadonlyPartialJSONObject(
|
|
117
|
+
value: ReadonlyPartialJSONValue | undefined
|
|
118
|
+
): value is ReadonlyPartialJSONObject {
|
|
119
|
+
return value !== undefined && JSONExt.isObject(value);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
|
|
108
123
|
/**
|
|
109
124
|
* A mime renderer factory for mermaid text-based diagrams.
|
|
110
125
|
*/
|