@jupyterlab/markedparser-extension 4.3.4 → 4.4.0-alpha.1
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/index.js +5 -5
- package/lib/index.js.map +1 -1
- package/package.json +9 -9
- package/src/index.ts +13 -8
package/lib/index.js
CHANGED
|
@@ -124,24 +124,24 @@ var Private;
|
|
|
124
124
|
function makeRenderer(Renderer_) {
|
|
125
125
|
const renderer = new Renderer_();
|
|
126
126
|
const originalCode = renderer.code;
|
|
127
|
-
renderer.code = (
|
|
127
|
+
renderer.code = ({ text, lang, escaped }) => {
|
|
128
128
|
// handle block renderers
|
|
129
129
|
for (const block of _blocks) {
|
|
130
|
-
if (block.languages.includes(
|
|
131
|
-
const rendered = block.render(
|
|
130
|
+
if (lang && block.languages.includes(lang)) {
|
|
131
|
+
const rendered = block.render(text);
|
|
132
132
|
if (rendered != null) {
|
|
133
133
|
return rendered;
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
137
|
// handle known highlighting
|
|
138
|
-
const key = `${
|
|
138
|
+
const key = `${lang}${FENCE}${text}${FENCE}`;
|
|
139
139
|
const highlight = _highlights.get(key);
|
|
140
140
|
if (highlight != null) {
|
|
141
141
|
return highlight;
|
|
142
142
|
}
|
|
143
143
|
// fall back to calling with the renderer as `this`
|
|
144
|
-
return originalCode.call(renderer,
|
|
144
|
+
return originalCode.call(renderer, { text, lang, escaped });
|
|
145
145
|
};
|
|
146
146
|
return renderer;
|
|
147
147
|
}
|
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;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAC/E;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAWvD,gCAAgC;AAChC,MAAM,KAAK,GAAG,QAAQ,CAAC;AAoBvB;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAkC,EAClC,OAAwB;IAExB,OAAO;QACL,MAAM,EAAE,CAAC,OAAe,EAAmB,EAAE;YAC3C,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,MAAM,GAA2C;IACrD,EAAE,EAAE,2CAA2C;IAC/C,WAAW,EAAE,+BAA+B;IAC5C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,CAAC,uBAAuB,CAAC;IACnC,QAAQ,EAAE,CAAC,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,CACR,GAAoB,EACpB,SAAkC,EAClC,eAAwC,EACxC,EAAE;QACF,OAAO,oBAAoB,CAAC,SAAS,EAAE;YACrC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE;SACjD,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,eAAe,MAAM,CAAC;AAEtB;;GAEG;AACH,IAAU,OAAO,CAgKhB;AAhKD,WAAU,OAAO;IACf,IAAI,aAAa,GAA0C,IAAI,CAAC;IAChE,IAAI,OAAO,GAAyB,IAAI,CAAC;IACzC,IAAI,OAAO,GAA2B,EAAE,CAAC;IACzC,IAAI,UAAU,GAAmC,IAAI,CAAC;IACtD,IAAI,cAAc,GAAkB,EAAE,CAAC;IACvC,IAAI,WAAW,GAAG,IAAI,QAAQ,EAAkB,CAAC;IAE1C,KAAK,UAAU,MAAM,CAC1B,OAAe,EACf,SAAkC,EAClC,OAAwB;QAExB,UAAU,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;SAC3C;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC1C,CAAC;IAVqB,cAAM,SAU3B,CAAA;IAED;;OAEG;IACI,KAAK,UAAU,gBAAgB,CACpC,OAAwB;QAExB,IAAI,OAAO,EAAE;YACX,OAAO,OAAO,CAAC;SAChB;QAED,IAAI,aAAa,EAAE;YACjB,OAAO,MAAM,aAAa,CAAC,OAAO,CAAC;SACpC;QAED,yBAAyB;QACzB,OAAO,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,KAAI,EAAE,CAAC;QAChC,OAAO,GAAG,OAAO,CAAC,IAAI,CACpB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,eAAC,OAAA,CAAC,MAAA,CAAC,CAAC,IAAI,mCAAI,QAAQ,CAAC,GAAG,CAAC,MAAA,CAAC,CAAC,IAAI,mCAAI,QAAQ,CAAC,CAAA,EAAA,CACtD,CAAC;QAEF,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC;QAEtC,uCAAuC;QACvC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxD,MAAM,CAAC,QAAQ,CAAC;YAChB,iBAAiB,EAAE;SACpB,CAAC,CAAC;QAEH,0BAA0B;QAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACpB;QAED,8BAA8B;QAC9B,cAAc,GAAG;YACf,mDAAmD;YACnD,KAAK,EAAE,IAAI;YACX,wDAAwD;YACxD,GAAG,EAAE,IAAI;YACT,+EAA+E;YAC/E,UAAU;YACV,sBAAsB;YACtB,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC;SACjC,CAAC;QAEF,0BAA0B;QAC1B,OAAO,GAAG,MAAM,CAAC;QACjB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,OAAO,OAAO,CAAC;IACjB,CAAC;IA9CqB,wBAAgB,mBA8CrC,CAAA;IAED;;;;;OAKG;IACH,KAAK,UAAU,iBAAiB;QAC9B,4BAA4B;QAC5B,OAAO,OAAO,CAAC,GAAG,CAAC;YACjB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,EAAE;YACtE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;SACzD,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,SAAS,YAAY,CAAC,SAA0B;QAC9C,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;QAEnC,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;YAC1C,yBAAyB;YACzB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;gBAC3B,IAAI,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC1C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACpC,IAAI,QAAQ,IAAI,IAAI,EAAE;wBACpB,OAAO,QAAQ,CAAC;qBACjB;iBACF;aACF;YAED,4BAA4B;YAC5B,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,OAAO,SAAS,CAAC;aAClB;YAED,mDAAmD;YACnD,OAAO,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,KAAK,UAAU,SAAS,CAAC,KAAkB;QACzC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YACxB,+BAA+B;YAC/B,OAAO;SACR;QACD,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC;QAC7C,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACxB,iDAAiD;YACjD,OAAO;SACR;QACD,MAAM,EAAE,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI;YACF,MAAM,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAChE,MAAM,IAAI,GAAG,8BAA8B,IAAI,KAAK,EAAE,CAAC,SAAS,eAAe,CAAC;YAChF,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC5B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,uBAAuB,IAAI,OAAO,EAAE,GAAG,CAAC,CAAC;SACxD;gBAAS;YACR,EAAE,CAAC,MAAM,EAAE,CAAC;SACb;IACH,CAAC;IAED;;OAEG;IACH,KAAK,UAAU,UAAU,CAAC,KAAY;QACpC,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,MAAM;gBACT,IAAI,KAAK,CAAC,IAAI,EAAE;oBACd,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;wBAC3B,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;4BACxC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BAC7B,OAAO;yBACR;qBACF;iBACF;gBACD,MAAM,SAAS,CAAC,KAAoB,CAAC,CAAC;SACzC;IACH,CAAC;AACH,CAAC,EAhKS,OAAO,KAAP,OAAO,QAgKhB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/markedparser-extension",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.0-alpha.1",
|
|
4
4
|
"description": "JupyterLab - Markdown parser provider",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -35,15 +35,15 @@
|
|
|
35
35
|
"watch": "tsc -b --watch"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@jupyterlab/application": "^4.
|
|
39
|
-
"@jupyterlab/codemirror": "^4.
|
|
40
|
-
"@jupyterlab/coreutils": "^6.
|
|
41
|
-
"@jupyterlab/mermaid": "^4.
|
|
42
|
-
"@jupyterlab/rendermime": "^4.
|
|
38
|
+
"@jupyterlab/application": "^4.4.0-alpha.1",
|
|
39
|
+
"@jupyterlab/codemirror": "^4.4.0-alpha.1",
|
|
40
|
+
"@jupyterlab/coreutils": "^6.4.0-alpha.1",
|
|
41
|
+
"@jupyterlab/mermaid": "^4.4.0-alpha.1",
|
|
42
|
+
"@jupyterlab/rendermime": "^4.4.0-alpha.1",
|
|
43
43
|
"@lumino/coreutils": "^2.2.0",
|
|
44
|
-
"marked": "^
|
|
45
|
-
"marked-gfm-heading-id": "^
|
|
46
|
-
"marked-mangle": "^1.1.
|
|
44
|
+
"marked": "^15.0.3",
|
|
45
|
+
"marked-gfm-heading-id": "^4.1.1",
|
|
46
|
+
"marked-mangle": "^1.1.10"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/d3": "^7.4.0",
|
package/src/index.ts
CHANGED
|
@@ -18,9 +18,14 @@ import { IEditorLanguageRegistry } from '@jupyterlab/codemirror';
|
|
|
18
18
|
import { IMarkdownParser } from '@jupyterlab/rendermime';
|
|
19
19
|
import { IMermaidMarkdown } from '@jupyterlab/mermaid';
|
|
20
20
|
|
|
21
|
-
import type {
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
import type {
|
|
22
|
+
marked,
|
|
23
|
+
MarkedExtension,
|
|
24
|
+
MarkedOptions,
|
|
25
|
+
Renderer,
|
|
26
|
+
Token,
|
|
27
|
+
Tokens
|
|
28
|
+
} from 'marked';
|
|
24
29
|
|
|
25
30
|
// highlight cache key separator
|
|
26
31
|
const FENCE = '```~~~';
|
|
@@ -181,11 +186,11 @@ namespace Private {
|
|
|
181
186
|
const renderer = new Renderer_();
|
|
182
187
|
const originalCode = renderer.code;
|
|
183
188
|
|
|
184
|
-
renderer.code = (
|
|
189
|
+
renderer.code = ({ text, lang, escaped }) => {
|
|
185
190
|
// handle block renderers
|
|
186
191
|
for (const block of _blocks) {
|
|
187
|
-
if (block.languages.includes(
|
|
188
|
-
const rendered = block.render(
|
|
192
|
+
if (lang && block.languages.includes(lang)) {
|
|
193
|
+
const rendered = block.render(text);
|
|
189
194
|
if (rendered != null) {
|
|
190
195
|
return rendered;
|
|
191
196
|
}
|
|
@@ -193,14 +198,14 @@ namespace Private {
|
|
|
193
198
|
}
|
|
194
199
|
|
|
195
200
|
// handle known highlighting
|
|
196
|
-
const key = `${
|
|
201
|
+
const key = `${lang}${FENCE}${text}${FENCE}`;
|
|
197
202
|
const highlight = _highlights.get(key);
|
|
198
203
|
if (highlight != null) {
|
|
199
204
|
return highlight;
|
|
200
205
|
}
|
|
201
206
|
|
|
202
207
|
// fall back to calling with the renderer as `this`
|
|
203
|
-
return originalCode.call(renderer,
|
|
208
|
+
return originalCode.call(renderer, { text, lang, escaped });
|
|
204
209
|
};
|
|
205
210
|
|
|
206
211
|
return renderer;
|