@omegagrid/code 0.4.31 → 0.4.33
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/dist/components/code.d.ts +6 -7
- package/dist/components/code.d.ts.map +1 -1
- package/dist/components/code.js +60 -72
- package/dist/components/code.js.map +1 -1
- package/dist/components/codeBlock.d.ts +0 -2
- package/dist/components/codeBlock.d.ts.map +1 -1
- package/dist/components/codeDiff.d.ts +9 -10
- package/dist/components/codeDiff.d.ts.map +1 -1
- package/dist/components/codeDiff.js +85 -44
- package/dist/components/codeDiff.js.map +1 -1
- package/package.json +5 -5
|
@@ -5,22 +5,21 @@ export declare class Code extends LitElement implements Layout {
|
|
|
5
5
|
#private;
|
|
6
6
|
static monaco: typeof monaco;
|
|
7
7
|
static styles: import("lit").CSSResult;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
options: monaco.editor.IStandaloneEditorConstructionOptions;
|
|
8
|
+
get options(): monaco.editor.IStandaloneEditorConstructionOptions;
|
|
9
|
+
set options(val: monaco.editor.IStandaloneEditorConstructionOptions);
|
|
11
10
|
get content(): string;
|
|
12
11
|
set content(val: string);
|
|
12
|
+
get language(): string;
|
|
13
|
+
set language(val: string);
|
|
13
14
|
get selectedContent(): string;
|
|
14
15
|
codeRoot: HTMLDivElement;
|
|
15
|
-
editor: monaco.editor.IStandaloneCodeEditor;
|
|
16
|
-
preventChangeEvent: boolean;
|
|
16
|
+
get editor(): monaco.editor.IStandaloneCodeEditor;
|
|
17
17
|
get theme(): "vs" | "vs-dark";
|
|
18
18
|
onStyleChange: () => void;
|
|
19
19
|
initMonaco(): Promise<void>;
|
|
20
20
|
getOptions: () => monaco.editor.IStandaloneEditorConstructionOptions;
|
|
21
|
-
applyState(): void;
|
|
22
21
|
initEditor(): Promise<void>;
|
|
23
|
-
updated(
|
|
22
|
+
updated(): void;
|
|
24
23
|
connectedCallback(): void;
|
|
25
24
|
disconnectedCallback(): void;
|
|
26
25
|
dispose(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAK7C,qBACa,IAAK,SAAQ,UAAW,YAAW,MAAM;;IAErD,MAAM,CAAC,MAAM,EAAE,OAAO,MAAM,CAAC;IAC7B,MAAM,CAAC,MAAM,0BAQX;IAGF,
|
|
1
|
+
{"version":3,"file":"code.d.ts","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAK7C,qBACa,IAAK,SAAQ,UAAW,YAAW,MAAM;;IAErD,MAAM,CAAC,MAAM,EAAE,OAAO,MAAM,CAAC;IAC7B,MAAM,CAAC,MAAM,0BAQX;IAGF,IACI,OAAO,IACM,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAD7B;IACtC,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,EAGlE;IAED,IACI,OAAO,IACM,MAAM,CADwD;IAC/E,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAOtB;IAGD,IACI,QAAQ,IACM,MAAM,CADgB;IACxC,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAGvB;IAED,IAAI,eAAe,WAKlB;IAGD,QAAQ,EAAE,cAAc,CAAC;IAGzB,IAAI,MAAM,wCAA0B;IAOpC,IAAI,KAAK,qBAA+E;IAExF,aAAa,aAEZ;IAEK,UAAU;IAOhB,UAAU,QAAO,OAAO,MAAM,CAAC,oCAAoC,CAShE;IAEG,UAAU;IAqBhB,OAAO;IAIP,iBAAiB;IAMjB,oBAAoB;IAIpB,OAAO;IAKP,MAAM,6CAEJ;IAEF,MAAM;IAIN,KAAK;CAIL"}
|
package/dist/components/code.js
CHANGED
|
@@ -16,7 +16,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
16
16
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
17
17
|
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
18
18
|
};
|
|
19
|
-
var
|
|
19
|
+
var _Code_options, _Code_language, _Code_editor, _Code_preventChangeEvent, _Code_initialized, _Code_initializing, _Code_content;
|
|
20
20
|
var Code_1;
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
22
|
exports.Code = void 0;
|
|
@@ -29,17 +29,15 @@ const shared_1 = require("./shared");
|
|
|
29
29
|
let Code = Code_1 = class Code extends lit_1.LitElement {
|
|
30
30
|
constructor() {
|
|
31
31
|
super(...arguments);
|
|
32
|
-
this
|
|
33
|
-
this
|
|
34
|
-
|
|
32
|
+
_Code_options.set(this, void 0);
|
|
33
|
+
_Code_language.set(this, 'typescript');
|
|
34
|
+
_Code_editor.set(this, void 0);
|
|
35
|
+
_Code_preventChangeEvent.set(this, false);
|
|
35
36
|
_Code_initialized.set(this, false);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
selection: null
|
|
39
|
-
});
|
|
40
|
-
this.preventChangeEvent = false;
|
|
37
|
+
_Code_initializing.set(this, false);
|
|
38
|
+
_Code_content.set(this, void 0);
|
|
41
39
|
this.onStyleChange = () => {
|
|
42
|
-
this.
|
|
40
|
+
__classPrivateFieldGet(this, _Code_editor, "f").updateOptions({ theme: this.theme });
|
|
43
41
|
};
|
|
44
42
|
this.getOptions = () => ({
|
|
45
43
|
...this.options,
|
|
@@ -55,20 +53,37 @@ let Code = Code_1 = class Code extends lit_1.LitElement {
|
|
|
55
53
|
<div id="codeRoot"></div>
|
|
56
54
|
`;
|
|
57
55
|
}
|
|
58
|
-
get
|
|
56
|
+
get options() { return __classPrivateFieldGet(this, _Code_options, "f"); }
|
|
57
|
+
set options(val) {
|
|
58
|
+
var _a;
|
|
59
|
+
__classPrivateFieldSet(this, _Code_options, val, "f");
|
|
60
|
+
(_a = __classPrivateFieldGet(this, _Code_editor, "f")) === null || _a === void 0 ? void 0 : _a.updateOptions(val);
|
|
61
|
+
}
|
|
62
|
+
get content() { return __classPrivateFieldGet(this, _Code_editor, "f") ? __classPrivateFieldGet(this, _Code_editor, "f").getValue() : __classPrivateFieldGet(this, _Code_content, "f"); }
|
|
59
63
|
set content(val) {
|
|
60
64
|
var _a;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
65
|
+
if (__classPrivateFieldGet(this, _Code_editor, "f")) {
|
|
66
|
+
__classPrivateFieldSet(this, _Code_preventChangeEvent, true, "f");
|
|
67
|
+
(_a = __classPrivateFieldGet(this, _Code_editor, "f")) === null || _a === void 0 ? void 0 : _a.setValue(val);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
__classPrivateFieldSet(this, _Code_content, val, "f");
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
get language() { return __classPrivateFieldGet(this, _Code_language, "f"); }
|
|
74
|
+
set language(val) {
|
|
75
|
+
__classPrivateFieldSet(this, _Code_language, val, "f");
|
|
76
|
+
if (__classPrivateFieldGet(this, _Code_editor, "f"))
|
|
77
|
+
Code_1.monaco.editor.setModelLanguage(__classPrivateFieldGet(this, _Code_editor, "f").getModel(), val);
|
|
64
78
|
}
|
|
65
79
|
get selectedContent() {
|
|
66
|
-
if (!this
|
|
80
|
+
if (!__classPrivateFieldGet(this, _Code_editor, "f"))
|
|
67
81
|
return __classPrivateFieldGet(this, _Code_content, "f");
|
|
68
|
-
const selectedCodeChunks = this.
|
|
82
|
+
const selectedCodeChunks = __classPrivateFieldGet(this, _Code_editor, "f").getSelections().map(selection => __classPrivateFieldGet(this, _Code_editor, "f").getModel().getValueInRange(selection));
|
|
69
83
|
const selectedCode = selectedCodeChunks.join("\n").trim();
|
|
70
|
-
return selectedCode == null || selectedCode == '' ? this.
|
|
84
|
+
return selectedCode == null || selectedCode == '' ? __classPrivateFieldGet(this, _Code_editor, "f").getValue() : selectedCode;
|
|
71
85
|
}
|
|
86
|
+
get editor() { return __classPrivateFieldGet(this, _Code_editor, "f"); }
|
|
72
87
|
get theme() { var _a; return ((_a = (0, core_1.getThemeManager)().activeTheme) === null || _a === void 0 ? void 0 : _a.type) == 'light' ? 'vs' : 'vs-dark'; }
|
|
73
88
|
async initMonaco() {
|
|
74
89
|
var _a;
|
|
@@ -78,84 +93,60 @@ let Code = Code_1 = class Code extends lit_1.LitElement {
|
|
|
78
93
|
core_1.dom.appendStyle(this.shadowRoot, loader_1.MonacoLoader.monacoStyle);
|
|
79
94
|
__classPrivateFieldSet(this, _Code_initialized, true, "f");
|
|
80
95
|
}
|
|
81
|
-
applyState() {
|
|
82
|
-
if (!this.editor)
|
|
83
|
-
return;
|
|
84
|
-
if (__classPrivateFieldGet(this, _Code_state, "f").scrollTop > 0)
|
|
85
|
-
this.editor.setScrollTop(__classPrivateFieldGet(this, _Code_state, "f").scrollTop);
|
|
86
|
-
if (__classPrivateFieldGet(this, _Code_state, "f").selection)
|
|
87
|
-
this.editor.setSelection(__classPrivateFieldGet(this, _Code_state, "f").selection);
|
|
88
|
-
}
|
|
89
96
|
async initEditor() {
|
|
90
|
-
|
|
97
|
+
__classPrivateFieldSet(this, _Code_initializing, true, "f");
|
|
91
98
|
await this.initMonaco();
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
return;
|
|
97
|
-
}
|
|
98
|
-
this.editor = Code_1.monaco.editor.create(this.codeRoot, this.getOptions());
|
|
99
|
-
this.applyState();
|
|
100
|
-
this.dispatchEvent(new shared_1.CodeEvent('ready', { editor: this.editor }));
|
|
101
|
-
this.editor.onDidChangeModelContent(e => {
|
|
102
|
-
if (!this.preventChangeEvent) {
|
|
99
|
+
__classPrivateFieldSet(this, _Code_editor, Code_1.monaco.editor.create(this.codeRoot, this.getOptions()), "f");
|
|
100
|
+
this.dispatchEvent(new shared_1.CodeEvent('ready', { editor: __classPrivateFieldGet(this, _Code_editor, "f") }));
|
|
101
|
+
__classPrivateFieldGet(this, _Code_editor, "f").onDidChangeModelContent(e => {
|
|
102
|
+
if (!__classPrivateFieldGet(this, _Code_preventChangeEvent, "f")) {
|
|
103
103
|
this.dispatchEvent(new shared_1.CodeEvent('change', {
|
|
104
|
-
editor: this
|
|
104
|
+
editor: __classPrivateFieldGet(this, _Code_editor, "f"),
|
|
105
105
|
changes: e.changes
|
|
106
106
|
}));
|
|
107
|
-
this.dispatchEvent(new core_1.events.ChangeEvent({ value: this.
|
|
107
|
+
this.dispatchEvent(new core_1.events.ChangeEvent({ value: __classPrivateFieldGet(this, _Code_editor, "f").getModel() }));
|
|
108
108
|
}
|
|
109
109
|
else
|
|
110
|
-
this
|
|
110
|
+
__classPrivateFieldSet(this, _Code_preventChangeEvent, false, "f");
|
|
111
111
|
});
|
|
112
|
-
this
|
|
113
|
-
this
|
|
112
|
+
__classPrivateFieldSet(this, _Code_preventChangeEvent, false, "f");
|
|
113
|
+
__classPrivateFieldSet(this, _Code_initializing, false, "f");
|
|
114
114
|
}
|
|
115
|
-
updated(
|
|
116
|
-
|
|
117
|
-
init = init || !this.editor;
|
|
118
|
-
if (init)
|
|
115
|
+
updated() {
|
|
116
|
+
if (!__classPrivateFieldGet(this, _Code_editor, "f") && !__classPrivateFieldGet(this, _Code_initializing, "f"))
|
|
119
117
|
this.initEditor();
|
|
120
118
|
}
|
|
121
119
|
connectedCallback() {
|
|
122
120
|
var _a;
|
|
123
121
|
super.connectedCallback();
|
|
124
122
|
(0, core_1.getThemeManager)().addEventListener('change', this.onStyleChange);
|
|
125
|
-
|
|
126
|
-
this.requestUpdate();
|
|
127
|
-
}
|
|
128
|
-
else {
|
|
129
|
-
(_a = this.editor) === null || _a === void 0 ? void 0 : _a.focus();
|
|
130
|
-
}
|
|
123
|
+
(_a = __classPrivateFieldGet(this, _Code_editor, "f")) === null || _a === void 0 ? void 0 : _a.focus();
|
|
131
124
|
}
|
|
132
125
|
disconnectedCallback() {
|
|
133
126
|
(0, core_1.getThemeManager)().removeEventListener('change', this.onStyleChange);
|
|
134
|
-
if (!this.editor || !this.disposeOnDisconnect)
|
|
135
|
-
return;
|
|
136
|
-
__classPrivateFieldGet(this, _Code_state, "f").scrollTop = this.editor.getScrollTop();
|
|
137
|
-
__classPrivateFieldGet(this, _Code_state, "f").selection = this.editor.getSelection();
|
|
138
|
-
__classPrivateFieldSet(this, _Code_content, this.editor.getValue(), "f");
|
|
139
|
-
this.dispose();
|
|
140
127
|
}
|
|
141
128
|
dispose() {
|
|
142
129
|
var _a;
|
|
143
|
-
(_a = this
|
|
144
|
-
this
|
|
130
|
+
(_a = __classPrivateFieldGet(this, _Code_editor, "f")) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
131
|
+
__classPrivateFieldSet(this, _Code_editor, null, "f");
|
|
145
132
|
}
|
|
146
133
|
layout() {
|
|
147
134
|
var _a;
|
|
148
|
-
(_a = this
|
|
135
|
+
(_a = __classPrivateFieldGet(this, _Code_editor, "f")) === null || _a === void 0 ? void 0 : _a.layout();
|
|
149
136
|
}
|
|
150
137
|
focus() {
|
|
151
138
|
var _a;
|
|
152
|
-
(_a = this
|
|
139
|
+
(_a = __classPrivateFieldGet(this, _Code_editor, "f")) === null || _a === void 0 ? void 0 : _a.focus();
|
|
153
140
|
}
|
|
154
141
|
};
|
|
155
142
|
exports.Code = Code;
|
|
156
|
-
|
|
143
|
+
_Code_options = new WeakMap();
|
|
144
|
+
_Code_language = new WeakMap();
|
|
145
|
+
_Code_editor = new WeakMap();
|
|
146
|
+
_Code_preventChangeEvent = new WeakMap();
|
|
157
147
|
_Code_initialized = new WeakMap();
|
|
158
|
-
|
|
148
|
+
_Code_initializing = new WeakMap();
|
|
149
|
+
_Code_content = new WeakMap();
|
|
159
150
|
Code.styles = (0, lit_1.css) `
|
|
160
151
|
:host, #codeRoot {
|
|
161
152
|
user-select: text;
|
|
@@ -166,17 +157,14 @@ Code.styles = (0, lit_1.css) `
|
|
|
166
157
|
}
|
|
167
158
|
`;
|
|
168
159
|
__decorate([
|
|
169
|
-
(0, decorators_js_1.property)({ type:
|
|
170
|
-
], Code.prototype, "
|
|
171
|
-
__decorate([
|
|
172
|
-
(0, decorators_js_1.property)({ type: String })
|
|
173
|
-
], Code.prototype, "language", void 0);
|
|
174
|
-
__decorate([
|
|
175
|
-
(0, decorators_js_1.property)({ type: Object })
|
|
176
|
-
], Code.prototype, "options", void 0);
|
|
160
|
+
(0, decorators_js_1.property)({ type: Object, noAccessor: true })
|
|
161
|
+
], Code.prototype, "options", null);
|
|
177
162
|
__decorate([
|
|
178
163
|
(0, decorators_js_1.property)({ type: String, noAccessor: true })
|
|
179
164
|
], Code.prototype, "content", null);
|
|
165
|
+
__decorate([
|
|
166
|
+
(0, decorators_js_1.property)({ type: String, noAccessor: true })
|
|
167
|
+
], Code.prototype, "language", null);
|
|
180
168
|
__decorate([
|
|
181
169
|
(0, decorators_js_1.query)('#codeRoot')
|
|
182
170
|
], Code.prototype, "codeRoot", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAuE;AACvE,6BAA4C;AAC5C,qDAAmE;AACnE,sCAAyC;AAEzC,0CAAoD;AACpD,qCAAqC;AAI9B,IAAM,IAAI,YAAV,MAAM,IAAK,SAAQ,gBAAU;IAA7B;;
|
|
1
|
+
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/components/code.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,6 @@ export declare class CodeBlock extends LitElement implements Layout {
|
|
|
46
46
|
screenReaderAnnounceInlineSuggestion?: boolean;
|
|
47
47
|
tabIndex?: number;
|
|
48
48
|
rulers?: (number | monaco.editor.IRulerOption)[];
|
|
49
|
-
wordSegmenterLocales?: string | string[];
|
|
50
49
|
wordSeparators?: string;
|
|
51
50
|
selectionClipboard?: boolean;
|
|
52
51
|
lineNumbers?: monaco.editor.LineNumbersType;
|
|
@@ -175,7 +174,6 @@ export declare class CodeBlock extends LitElement implements Layout {
|
|
|
175
174
|
letterSpacing?: number;
|
|
176
175
|
showUnused?: boolean;
|
|
177
176
|
peekWidgetDefaultFocus?: "editor" | "tree";
|
|
178
|
-
placeholder?: string;
|
|
179
177
|
definitionLinkOpensInPeek?: boolean;
|
|
180
178
|
showDeprecated?: boolean;
|
|
181
179
|
matchOnWordStartOnly?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeBlock.d.ts","sourceRoot":"","sources":["../../src/components/codeBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,cAAM,eAAgB,SAAQ,WAAW;IAClC,OAAO;;;;IASb,UAAU,IAAK,WAAW;CAO1B;AAED,qBACa,SAAU,SAAQ,UAAW,YAAW,MAAM;;IAE1D,MAAM,CAAC,MAAM,0BAqCX;IAGF,QAAQ,SAAgB;IAGxB,aAAa,UAAS;IAGtB,SAAS,SAAO;IAGhB,SAAS,SAAM;IAGf,cAAc,UAAS;IAGvB,MAAM,EAAE,IAAI,CAAC;IAGb,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;IAGlE,IAAI,eAAe,oBAGlB;IAGD,IAAI,OAAO,IACQ,MAAM,CADqC;IAC9D,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAGxB;IAED,IAAI,YAAY,wCAAiC;IACjD,IAAI,KAAK,6BAA2C;IAEpD,YAAY;IASZ,SAAS,OAAQ,SAAS,UAExB;IAEI,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IAMxD,iBAAiB,MAAO,SAAS,UAMhC;IAED,gBAAgB
|
|
1
|
+
{"version":3,"file":"codeBlock.d.ts","sourceRoot":"","sources":["../../src/components/codeBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEtE,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,cAAM,eAAgB,SAAQ,WAAW;IAClC,OAAO;;;;IASb,UAAU,IAAK,WAAW;CAO1B;AAED,qBACa,SAAU,SAAQ,UAAW,YAAW,MAAM;;IAE1D,MAAM,CAAC,MAAM,0BAqCX;IAGF,QAAQ,SAAgB;IAGxB,aAAa,UAAS;IAGtB,SAAS,SAAO;IAGhB,SAAS,SAAM;IAGf,cAAc,UAAS;IAGvB,MAAM,EAAE,IAAI,CAAC;IAGb,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;IAGlE,IAAI,eAAe,oBAGlB;IAGD,IAAI,OAAO,IACQ,MAAM,CADqC;IAC9D,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAGxB;IAED,IAAI,YAAY,wCAAiC;IACjD,IAAI,KAAK,6BAA2C;IAEpD,YAAY;IASZ,SAAS,OAAQ,SAAS,UAExB;IAEI,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IAMxD,iBAAiB,MAAO,SAAS,UAMhC;IAED,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAGb;IAEH,MAAM,6CAkBJ;IAEF,MAAM;IAIN,KAAK;CAIL"}
|
|
@@ -2,27 +2,26 @@ import { Layout } from '@omegagrid/core';
|
|
|
2
2
|
import { LitElement } from 'lit';
|
|
3
3
|
import type * as monaco from 'monaco-editor';
|
|
4
4
|
export declare class CodeDiffEditor extends LitElement implements Layout {
|
|
5
|
+
#private;
|
|
5
6
|
static monaco: typeof monaco;
|
|
6
7
|
static styles: import("lit").CSSResult;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
get options(): monaco.editor.IStandaloneEditorConstructionOptions;
|
|
9
|
+
set options(val: monaco.editor.IStandaloneEditorConstructionOptions);
|
|
10
|
+
get language(): string;
|
|
11
|
+
set language(val: string);
|
|
12
|
+
get selectedContent(): string;
|
|
13
|
+
codeRoot: HTMLDivElement;
|
|
14
|
+
get editor(): monaco.editor.IStandaloneDiffEditor;
|
|
11
15
|
get modifiedContent(): string;
|
|
12
16
|
set modifiedContent(val: string);
|
|
13
|
-
private _originalContent;
|
|
14
17
|
get originalContent(): string;
|
|
15
18
|
set originalContent(val: string);
|
|
16
|
-
get selectedContent(): string;
|
|
17
|
-
codeRoot: HTMLDivElement;
|
|
18
|
-
editor: monaco.editor.IStandaloneDiffEditor;
|
|
19
|
-
preventChangeEvent: boolean;
|
|
20
19
|
get theme(): "vs" | "vs-dark";
|
|
21
20
|
onStyleChange: () => void;
|
|
22
21
|
initMonaco(): Promise<void>;
|
|
23
22
|
getOptions: () => monaco.editor.IStandaloneDiffEditorConstructionOptions;
|
|
24
23
|
initEditor(): Promise<void>;
|
|
25
|
-
updated(
|
|
24
|
+
updated(): void;
|
|
26
25
|
connectedCallback(): void;
|
|
27
26
|
disconnectedCallback(): void;
|
|
28
27
|
render: () => import("lit-html").TemplateResult<1>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeDiff.d.ts","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAK7C,qBACa,cAAe,SAAQ,UAAW,YAAW,MAAM
|
|
1
|
+
{"version":3,"file":"codeDiff.d.ts","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,MAAM,EAA2B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAK7C,qBACa,cAAe,SAAQ,UAAW,YAAW,MAAM;;IAE/D,MAAM,CAAC,MAAM,EAAE,OAAO,MAAM,CAAC;IAC7B,MAAM,CAAC,MAAM,0BAQX;IAGF,IACI,OAAO,IACM,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAD7B;IACtC,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,EAGlE;IAGD,IACI,QAAQ,IACM,MAAM,CADgB;IACxC,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAMvB;IAED,IAAI,eAAe,WAOlB;IAGD,QAAQ,EAAE,cAAc,CAAC;IAGzB,IAAI,MAAM,wCAA0B;IAQpC,IACI,eAAe,IACM,MAAM,CADmF;IAClH,IAAI,eAAe,CAAC,GAAG,EAAE,MAAM,EAI9B;IAID,IACI,eAAe,IACM,MAAM,CADmF;IAClH,IAAI,eAAe,CAAC,GAAG,EAAE,MAAM,EAI9B;IAGD,IAAI,KAAK,qBAA+E;IAExF,aAAa,aAEZ;IAEK,UAAU;IAOhB,UAAU,QAAO,OAAO,MAAM,CAAC,wCAAwC,CAOpE;IAEG,UAAU;IA6ChB,OAAO;IAIP,iBAAiB;IAMjB,oBAAoB;IAIpB,MAAM,6CAEJ;IAEF,MAAM;IAIN,KAAK;CAIL"}
|
|
@@ -5,6 +5,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
9
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
10
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
|
+
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
|
+
};
|
|
13
|
+
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
14
|
+
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
15
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
16
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
17
|
+
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
18
|
+
};
|
|
19
|
+
var _CodeDiffEditor_options, _CodeDiffEditor_language, _CodeDiffEditor_editor, _CodeDiffEditor_preventChangeEvent, _CodeDiffEditor_initialized, _CodeDiffEditor_initializing, _CodeDiffEditor_activeModel, _CodeDiffEditor_modifiedContent, _CodeDiffEditor_originalContent;
|
|
8
20
|
var CodeDiffEditor_1;
|
|
9
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
22
|
exports.CodeDiffEditor = void 0;
|
|
@@ -17,11 +29,15 @@ const shared_1 = require("./shared");
|
|
|
17
29
|
let CodeDiffEditor = CodeDiffEditor_1 = class CodeDiffEditor extends lit_1.LitElement {
|
|
18
30
|
constructor() {
|
|
19
31
|
super(...arguments);
|
|
20
|
-
this
|
|
21
|
-
this
|
|
22
|
-
this
|
|
23
|
-
this
|
|
24
|
-
this
|
|
32
|
+
_CodeDiffEditor_options.set(this, void 0);
|
|
33
|
+
_CodeDiffEditor_language.set(this, 'typescript');
|
|
34
|
+
_CodeDiffEditor_editor.set(this, void 0);
|
|
35
|
+
_CodeDiffEditor_preventChangeEvent.set(this, false);
|
|
36
|
+
_CodeDiffEditor_initialized.set(this, false);
|
|
37
|
+
_CodeDiffEditor_initializing.set(this, false);
|
|
38
|
+
_CodeDiffEditor_activeModel.set(this, void 0);
|
|
39
|
+
_CodeDiffEditor_modifiedContent.set(this, '');
|
|
40
|
+
_CodeDiffEditor_originalContent.set(this, '');
|
|
25
41
|
this.onStyleChange = () => {
|
|
26
42
|
this.editor.updateOptions({ theme: this.theme });
|
|
27
43
|
};
|
|
@@ -37,55 +53,66 @@ let CodeDiffEditor = CodeDiffEditor_1 = class CodeDiffEditor extends lit_1.LitEl
|
|
|
37
53
|
<div id="codeRoot"></div>
|
|
38
54
|
`;
|
|
39
55
|
}
|
|
40
|
-
get
|
|
56
|
+
get options() { return __classPrivateFieldGet(this, _CodeDiffEditor_options, "f"); }
|
|
57
|
+
set options(val) {
|
|
58
|
+
var _a;
|
|
59
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_options, val, "f");
|
|
60
|
+
(_a = __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")) === null || _a === void 0 ? void 0 : _a.updateOptions(val);
|
|
61
|
+
}
|
|
62
|
+
get language() { return __classPrivateFieldGet(this, _CodeDiffEditor_language, "f"); }
|
|
63
|
+
set language(val) {
|
|
64
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_language, val, "f");
|
|
65
|
+
if (__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f")) {
|
|
66
|
+
CodeDiffEditor_1.monaco.editor.setModelLanguage(__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModel().modified, val);
|
|
67
|
+
CodeDiffEditor_1.monaco.editor.setModelLanguage(__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModel().original, val);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
get selectedContent() {
|
|
71
|
+
if (!__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f"))
|
|
72
|
+
return __classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f");
|
|
73
|
+
if (!__classPrivateFieldGet(this, _CodeDiffEditor_activeModel, "f"))
|
|
74
|
+
return __classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f");
|
|
75
|
+
const selectedCodeChunks = __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getSelections().map(selection => __classPrivateFieldGet(this, _CodeDiffEditor_activeModel, "f").getValueInRange(selection));
|
|
76
|
+
const selectedCode = selectedCodeChunks.join("\n").trim();
|
|
77
|
+
return selectedCode == null || selectedCode == '' ? __classPrivateFieldGet(this, _CodeDiffEditor_activeModel, "f").getValue() : selectedCode;
|
|
78
|
+
}
|
|
79
|
+
get editor() { return __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f"); }
|
|
80
|
+
get modifiedContent() { var _a; return this.editor ? (_a = this.editor.getModel()) === null || _a === void 0 ? void 0 : _a.modified.getValue() : __classPrivateFieldGet(this, _CodeDiffEditor_modifiedContent, "f"); }
|
|
41
81
|
set modifiedContent(val) {
|
|
42
82
|
var _a;
|
|
43
|
-
this
|
|
44
|
-
this
|
|
83
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_modifiedContent, val, "f");
|
|
84
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, true, "f");
|
|
45
85
|
(_a = this.editor) === null || _a === void 0 ? void 0 : _a.getModel().modified.setValue(val);
|
|
46
86
|
}
|
|
47
|
-
get originalContent() { var _a; return this.editor ? (_a = this.editor.getModel()) === null || _a === void 0 ? void 0 : _a.original.getValue() : this
|
|
87
|
+
get originalContent() { var _a; return this.editor ? (_a = this.editor.getModel()) === null || _a === void 0 ? void 0 : _a.original.getValue() : __classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f"); }
|
|
48
88
|
set originalContent(val) {
|
|
49
89
|
var _a;
|
|
50
|
-
this
|
|
51
|
-
this
|
|
90
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_originalContent, val, "f");
|
|
91
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, true, "f");
|
|
52
92
|
(_a = this.editor) === null || _a === void 0 ? void 0 : _a.getModel().original.setValue(val);
|
|
53
93
|
}
|
|
54
|
-
get selectedContent() {
|
|
55
|
-
if (!this.editor)
|
|
56
|
-
return this._originalContent;
|
|
57
|
-
// const selectedCodeChunks = this.editor.getSelections().map(selection => this.editor.getModel().getValueInRange(selection));
|
|
58
|
-
// const selectedCode = selectedCodeChunks.join("\n").trim();
|
|
59
|
-
// return selectedCode == null || selectedCode == '' ? this.editor.getValue() : selectedCode;
|
|
60
|
-
}
|
|
61
94
|
get theme() { var _a; return ((_a = (0, core_1.getThemeManager)().activeTheme) === null || _a === void 0 ? void 0 : _a.type) == 'light' ? 'vs' : 'vs-dark'; }
|
|
62
95
|
async initMonaco() {
|
|
63
96
|
var _a;
|
|
64
|
-
if (this
|
|
97
|
+
if (__classPrivateFieldGet(this, _CodeDiffEditor_initialized, "f"))
|
|
65
98
|
return;
|
|
66
99
|
CodeDiffEditor_1.monaco = (_a = CodeDiffEditor_1.monaco) !== null && _a !== void 0 ? _a : await loader_1.MonacoLoader.get();
|
|
67
100
|
core_1.dom.appendStyle(this.shadowRoot, loader_1.MonacoLoader.monacoStyle);
|
|
68
|
-
this
|
|
101
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_initialized, true, "f");
|
|
69
102
|
}
|
|
70
103
|
async initEditor() {
|
|
71
|
-
|
|
104
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_initializing, true, "f");
|
|
72
105
|
await this.initMonaco();
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
catch (e) {
|
|
77
|
-
return;
|
|
78
|
-
}
|
|
79
|
-
this.editor = CodeDiffEditor_1.monaco.editor.createDiffEditor(this.codeRoot, this.getOptions());
|
|
80
|
-
const originalModel = CodeDiffEditor_1.monaco.editor.createModel(this._modifiedContent, this.language);
|
|
81
|
-
const modifiedModel = CodeDiffEditor_1.monaco.editor.createModel(this._originalContent, this.language);
|
|
106
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_editor, CodeDiffEditor_1.monaco.editor.createDiffEditor(this.codeRoot, this.getOptions()), "f");
|
|
107
|
+
const originalModel = CodeDiffEditor_1.monaco.editor.createModel(__classPrivateFieldGet(this, _CodeDiffEditor_modifiedContent, "f"), this.language);
|
|
108
|
+
const modifiedModel = CodeDiffEditor_1.monaco.editor.createModel(__classPrivateFieldGet(this, _CodeDiffEditor_originalContent, "f"), this.language);
|
|
82
109
|
this.editor.setModel({
|
|
83
110
|
original: originalModel,
|
|
84
111
|
modified: modifiedModel,
|
|
85
112
|
});
|
|
86
113
|
this.dispatchEvent(new shared_1.CodeEvent('ready', { editor: this.editor }));
|
|
87
114
|
modifiedModel.onDidChangeContent(e => {
|
|
88
|
-
if (!this
|
|
115
|
+
if (!__classPrivateFieldGet(this, _CodeDiffEditor_preventChangeEvent, "f")) {
|
|
89
116
|
this.dispatchEvent(new shared_1.CodeEvent('change', {
|
|
90
117
|
editor: this.editor,
|
|
91
118
|
changes: e.changes
|
|
@@ -93,14 +120,19 @@ let CodeDiffEditor = CodeDiffEditor_1 = class CodeDiffEditor extends lit_1.LitEl
|
|
|
93
120
|
this.dispatchEvent(new core_1.events.ChangeEvent({ value: this.editor.getModel().modified.getValue() }));
|
|
94
121
|
}
|
|
95
122
|
else
|
|
96
|
-
this
|
|
123
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, false, "f");
|
|
124
|
+
});
|
|
125
|
+
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor().onDidFocusEditorText(() => {
|
|
126
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_activeModel, __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getModifiedEditor().getModel(), "f");
|
|
97
127
|
});
|
|
98
|
-
this.
|
|
128
|
+
__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getOriginalEditor().onDidFocusEditorText(() => {
|
|
129
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_activeModel, __classPrivateFieldGet(this, _CodeDiffEditor_editor, "f").getOriginalEditor().getModel(), "f");
|
|
130
|
+
});
|
|
131
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_preventChangeEvent, false, "f");
|
|
132
|
+
__classPrivateFieldSet(this, _CodeDiffEditor_initializing, false, "f");
|
|
99
133
|
}
|
|
100
|
-
updated(
|
|
101
|
-
|
|
102
|
-
init = init || !this.editor;
|
|
103
|
-
if (init)
|
|
134
|
+
updated() {
|
|
135
|
+
if (!__classPrivateFieldGet(this, _CodeDiffEditor_editor, "f") && !__classPrivateFieldGet(this, _CodeDiffEditor_initializing, "f"))
|
|
104
136
|
this.initEditor();
|
|
105
137
|
}
|
|
106
138
|
connectedCallback() {
|
|
@@ -122,6 +154,15 @@ let CodeDiffEditor = CodeDiffEditor_1 = class CodeDiffEditor extends lit_1.LitEl
|
|
|
122
154
|
}
|
|
123
155
|
};
|
|
124
156
|
exports.CodeDiffEditor = CodeDiffEditor;
|
|
157
|
+
_CodeDiffEditor_options = new WeakMap();
|
|
158
|
+
_CodeDiffEditor_language = new WeakMap();
|
|
159
|
+
_CodeDiffEditor_editor = new WeakMap();
|
|
160
|
+
_CodeDiffEditor_preventChangeEvent = new WeakMap();
|
|
161
|
+
_CodeDiffEditor_initialized = new WeakMap();
|
|
162
|
+
_CodeDiffEditor_initializing = new WeakMap();
|
|
163
|
+
_CodeDiffEditor_activeModel = new WeakMap();
|
|
164
|
+
_CodeDiffEditor_modifiedContent = new WeakMap();
|
|
165
|
+
_CodeDiffEditor_originalContent = new WeakMap();
|
|
125
166
|
CodeDiffEditor.styles = (0, lit_1.css) `
|
|
126
167
|
:host, #codeRoot {
|
|
127
168
|
user-select: text;
|
|
@@ -132,20 +173,20 @@ CodeDiffEditor.styles = (0, lit_1.css) `
|
|
|
132
173
|
}
|
|
133
174
|
`;
|
|
134
175
|
__decorate([
|
|
135
|
-
(0, decorators_js_1.property)({ type:
|
|
136
|
-
], CodeDiffEditor.prototype, "
|
|
176
|
+
(0, decorators_js_1.property)({ type: Object, noAccessor: true })
|
|
177
|
+
], CodeDiffEditor.prototype, "options", null);
|
|
137
178
|
__decorate([
|
|
138
|
-
(0, decorators_js_1.property)({ type:
|
|
139
|
-
], CodeDiffEditor.prototype, "
|
|
179
|
+
(0, decorators_js_1.property)({ type: String, noAccessor: true })
|
|
180
|
+
], CodeDiffEditor.prototype, "language", null);
|
|
181
|
+
__decorate([
|
|
182
|
+
(0, decorators_js_1.query)('#codeRoot')
|
|
183
|
+
], CodeDiffEditor.prototype, "codeRoot", void 0);
|
|
140
184
|
__decorate([
|
|
141
185
|
(0, decorators_js_1.property)({ type: String, noAccessor: true })
|
|
142
186
|
], CodeDiffEditor.prototype, "modifiedContent", null);
|
|
143
187
|
__decorate([
|
|
144
188
|
(0, decorators_js_1.property)({ type: String, noAccessor: true })
|
|
145
189
|
], CodeDiffEditor.prototype, "originalContent", null);
|
|
146
|
-
__decorate([
|
|
147
|
-
(0, decorators_js_1.query)('#codeRoot')
|
|
148
|
-
], CodeDiffEditor.prototype, "codeRoot", void 0);
|
|
149
190
|
exports.CodeDiffEditor = CodeDiffEditor = CodeDiffEditor_1 = __decorate([
|
|
150
191
|
(0, decorators_js_1.customElement)('og-code-diff')
|
|
151
192
|
], CodeDiffEditor);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeDiff.js","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codeDiff.js","sourceRoot":"","sources":["../../src/components/codeDiff.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@omegagrid/code",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.33",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"description": "Monaco editor webcomponent",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -28,12 +28,12 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@fortawesome/fontawesome-svg-core": "6.4.2",
|
|
31
|
-
"@omegagrid/core": "^0.4.
|
|
32
|
-
"@omegagrid/localize": "^0.4.
|
|
33
|
-
"@omegagrid/tree": "^0.4.
|
|
31
|
+
"@omegagrid/core": "^0.4.33",
|
|
32
|
+
"@omegagrid/localize": "^0.4.33",
|
|
33
|
+
"@omegagrid/tree": "^0.4.33",
|
|
34
34
|
"@riovir/wc-fontawesome": "^0.1.9",
|
|
35
35
|
"lit": "^3.1.1",
|
|
36
|
-
"monaco-editor": "
|
|
36
|
+
"monaco-editor": "0.47.0",
|
|
37
37
|
"ts-debounce": "^4.0.0",
|
|
38
38
|
"vscode-loader": "^1.0.2"
|
|
39
39
|
},
|