@kerebron/extension-codejar 0.6.1 → 0.6.3
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/esm/TreeSitterHighlighter.d.ts +2 -1
- package/esm/TreeSitterHighlighter.d.ts.map +1 -1
- package/esm/TreeSitterHighlighter.js +5 -5
- package/esm/TreeSitterHighlighter.js.map +1 -1
- package/esm/codeJarBlockNodeView.js +1 -1
- package/esm/codeJarBlockNodeView.js.map +1 -1
- package/package.json +9 -10
- package/src/TreeSitterHighlighter.ts +5 -4
- package/src/codeJarBlockNodeView.ts +1 -1
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { type Parser } from '@kerebron/tree-sitter';
|
|
2
2
|
import { Decorator } from './Decorator.js';
|
|
3
|
+
import { AssetLoad } from '@kerebron/editor';
|
|
3
4
|
export declare class TreeSitterHighlighter {
|
|
4
5
|
parser: Parser | undefined;
|
|
5
6
|
hightligtScm: string | undefined;
|
|
6
|
-
|
|
7
|
+
assetLoad?: AssetLoad;
|
|
7
8
|
lang?: string;
|
|
8
9
|
init(lang: string): Promise<boolean>;
|
|
9
10
|
highlight(code: string, decorator: Decorator): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TreeSitterHighlighter.d.ts","sourceRoot":"","sources":["../src/TreeSitterHighlighter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAQlE,OAAO,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TreeSitterHighlighter.d.ts","sourceRoot":"","sources":["../src/TreeSitterHighlighter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAQlE,OAAO,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,qBAAa,qBAAqB;IAChC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IAER,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC1C,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS;CAoC7C"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import { createParser } from '@kerebron/tree-sitter';
|
|
2
|
-
import { fetchTextResource,
|
|
2
|
+
import { fetchTextResource, getLangTreeSitter, } from '@kerebron/wasm';
|
|
3
3
|
export class TreeSitterHighlighter {
|
|
4
4
|
parser;
|
|
5
5
|
hightligtScm;
|
|
6
|
-
|
|
6
|
+
assetLoad;
|
|
7
7
|
lang;
|
|
8
8
|
async init(lang) {
|
|
9
9
|
this.lang = lang;
|
|
10
|
-
if (!lang) {
|
|
10
|
+
if (!lang || !this.assetLoad) {
|
|
11
11
|
this.parser = undefined;
|
|
12
12
|
this.hightligtScm = undefined;
|
|
13
13
|
return true;
|
|
14
14
|
}
|
|
15
|
-
const treeSitterConfig = getLangTreeSitter(lang
|
|
15
|
+
const treeSitterConfig = getLangTreeSitter(lang);
|
|
16
16
|
const wasmUrl = treeSitterConfig.files[0]; // TODO add support for split parsers like markdown
|
|
17
17
|
const highlightUrl = treeSitterConfig.queries['highlights.scm'];
|
|
18
18
|
try {
|
|
19
|
-
const wasm = await
|
|
19
|
+
const wasm = await this.assetLoad(wasmUrl);
|
|
20
20
|
this.parser = await createParser(wasm);
|
|
21
21
|
this.hightligtScm = await fetchTextResource(highlightUrl);
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TreeSitterHighlighter.js","sourceRoot":"","sources":["../src/TreeSitterHighlighter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,MAAM,uBAAuB,CAAC;AAElE,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"TreeSitterHighlighter.js","sourceRoot":"","sources":["../src/TreeSitterHighlighter.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ class CodeJarBlockNodeView {
|
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
63
|
this.highlighter = new TreeSitterHighlighter();
|
|
64
|
-
this.highlighter.
|
|
64
|
+
this.highlighter.assetLoad = this.editor.config.assetLoad;
|
|
65
65
|
this.decorator = new Decorator();
|
|
66
66
|
dom.append(this.element);
|
|
67
67
|
this.lineNumbers = initLineNumbers(this.element, lineNumberOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeJarBlockNodeView.js","sourceRoot":"","sources":["../src/codeJarBlockNodeView.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"codeJarBlockNodeView.js","sourceRoot":"","sources":["../src/codeJarBlockNodeView.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kerebron/extension-codejar",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"module": "./esm/mod.js",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
8
8
|
"import": "./esm/mod.js"
|
|
9
9
|
},
|
|
10
|
-
"./assets
|
|
11
|
-
|
|
12
|
-
}
|
|
10
|
+
"./assets/codejar-linenumbers.css": "./assets/codejar-linenumbers.css",
|
|
11
|
+
"./assets/codejar.css": "./assets/codejar.css"
|
|
13
12
|
},
|
|
14
13
|
"scripts": {},
|
|
15
14
|
"files": [
|
|
@@ -18,12 +17,12 @@
|
|
|
18
17
|
"assets"
|
|
19
18
|
],
|
|
20
19
|
"dependencies": {
|
|
21
|
-
"@kerebron/editor": "0.6.
|
|
22
|
-
"@kerebron/extension-basic-editor": "0.6.
|
|
23
|
-
"@kerebron/extension-lsp": "0.6.
|
|
24
|
-
"@kerebron/extension-markdown": "0.6.
|
|
25
|
-
"@kerebron/tree-sitter": "0.6.
|
|
26
|
-
"@kerebron/wasm": "0.6.
|
|
20
|
+
"@kerebron/editor": "0.6.3",
|
|
21
|
+
"@kerebron/extension-basic-editor": "0.6.3",
|
|
22
|
+
"@kerebron/extension-lsp": "0.6.3",
|
|
23
|
+
"@kerebron/extension-markdown": "0.6.3",
|
|
24
|
+
"@kerebron/tree-sitter": "0.6.3",
|
|
25
|
+
"@kerebron/wasm": "0.6.3",
|
|
27
26
|
"prosemirror-model": "1.25.3",
|
|
28
27
|
"prosemirror-state": "1.4.3",
|
|
29
28
|
"prosemirror-view": "1.40.0",
|
|
@@ -7,26 +7,27 @@ import {
|
|
|
7
7
|
} from '@kerebron/wasm';
|
|
8
8
|
|
|
9
9
|
import { DecorationInline, Decorator } from './Decorator.js';
|
|
10
|
+
import { AssetLoad } from '@kerebron/editor';
|
|
10
11
|
|
|
11
12
|
export class TreeSitterHighlighter {
|
|
12
13
|
parser: Parser | undefined;
|
|
13
14
|
hightligtScm: string | undefined;
|
|
14
|
-
|
|
15
|
+
assetLoad?: AssetLoad;
|
|
15
16
|
lang?: string;
|
|
16
17
|
|
|
17
18
|
async init(lang: string): Promise<boolean> {
|
|
18
19
|
this.lang = lang;
|
|
19
|
-
if (!lang) {
|
|
20
|
+
if (!lang || !this.assetLoad) {
|
|
20
21
|
this.parser = undefined;
|
|
21
22
|
this.hightligtScm = undefined;
|
|
22
23
|
return true;
|
|
23
24
|
}
|
|
24
|
-
const treeSitterConfig = getLangTreeSitter(lang
|
|
25
|
+
const treeSitterConfig = getLangTreeSitter(lang);
|
|
25
26
|
const wasmUrl = treeSitterConfig.files[0]; // TODO add support for split parsers like markdown
|
|
26
27
|
const highlightUrl = treeSitterConfig.queries['highlights.scm'];
|
|
27
28
|
|
|
28
29
|
try {
|
|
29
|
-
const wasm = await
|
|
30
|
+
const wasm = await this.assetLoad(wasmUrl);
|
|
30
31
|
this.parser = await createParser(wasm);
|
|
31
32
|
|
|
32
33
|
this.hightligtScm = await fetchTextResource(highlightUrl);
|
|
@@ -91,7 +91,7 @@ class CodeJarBlockNodeView implements NodeView {
|
|
|
91
91
|
});
|
|
92
92
|
|
|
93
93
|
this.highlighter = new TreeSitterHighlighter();
|
|
94
|
-
this.highlighter.
|
|
94
|
+
this.highlighter.assetLoad = this.editor.config.assetLoad;
|
|
95
95
|
this.decorator = new Decorator();
|
|
96
96
|
|
|
97
97
|
dom.append(this.element);
|