@theia/notebook 1.42.0 → 1.43.0
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/browser/contributions/notebook-cell-actions-contribution.d.ts +8 -0
- package/lib/browser/contributions/notebook-cell-actions-contribution.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.js +9 -1
- package/lib/browser/contributions/notebook-cell-actions-contribution.js.map +1 -1
- package/lib/browser/contributions/notebook-context-keys.d.ts +3 -0
- package/lib/browser/contributions/notebook-context-keys.d.ts.map +1 -1
- package/lib/browser/contributions/notebook-context-keys.js +7 -0
- package/lib/browser/contributions/notebook-context-keys.js.map +1 -1
- package/lib/browser/index.d.ts +1 -1
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +1 -1
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/notebook-cell-resource-resolver.d.ts +1 -4
- package/lib/browser/notebook-cell-resource-resolver.d.ts.map +1 -1
- package/lib/browser/notebook-cell-resource-resolver.js.map +1 -1
- package/lib/browser/notebook-editor-widget-factory.d.ts.map +1 -1
- package/lib/browser/notebook-editor-widget-factory.js +1 -1
- package/lib/browser/notebook-editor-widget-factory.js.map +1 -1
- package/lib/browser/notebook-editor-widget.d.ts +8 -6
- package/lib/browser/notebook-editor-widget.d.ts.map +1 -1
- package/lib/browser/notebook-editor-widget.js +38 -27
- package/lib/browser/notebook-editor-widget.js.map +1 -1
- package/lib/browser/notebook-frontend-module.js +3 -3
- package/lib/browser/notebook-frontend-module.js.map +1 -1
- package/lib/browser/notebook-open-handler.d.ts +1 -2
- package/lib/browser/notebook-open-handler.d.ts.map +1 -1
- package/lib/browser/notebook-open-handler.js +8 -10
- package/lib/browser/notebook-open-handler.js.map +1 -1
- package/lib/browser/notebook-renderer-registry.d.ts +2 -1
- package/lib/browser/notebook-renderer-registry.d.ts.map +1 -1
- package/lib/browser/notebook-renderer-registry.js +6 -3
- package/lib/browser/notebook-renderer-registry.js.map +1 -1
- package/lib/browser/notebook-type-registry.d.ts +2 -1
- package/lib/browser/notebook-type-registry.d.ts.map +1 -1
- package/lib/browser/notebook-type-registry.js +6 -3
- package/lib/browser/notebook-type-registry.js.map +1 -1
- package/lib/browser/renderers/cell-output-webview.d.ts +1 -1
- package/lib/browser/renderers/cell-output-webview.d.ts.map +1 -1
- package/lib/browser/service/notebook-cell-context-manager.d.ts +1 -2
- package/lib/browser/service/notebook-cell-context-manager.d.ts.map +1 -1
- package/lib/browser/service/notebook-cell-context-manager.js +7 -11
- package/lib/browser/service/notebook-cell-context-manager.js.map +1 -1
- package/lib/browser/service/{notebook-editor-service.d.ts → notebook-editor-widget-service.d.ts} +5 -5
- package/lib/browser/service/notebook-editor-widget-service.d.ts.map +1 -0
- package/lib/browser/service/{notebook-editor-service.js → notebook-editor-widget-service.js} +21 -13
- package/lib/browser/service/notebook-editor-widget-service.js.map +1 -0
- package/lib/browser/service/notebook-execution-service.js +1 -1
- package/lib/browser/service/notebook-execution-service.js.map +1 -1
- package/lib/browser/service/notebook-execution-state-service.d.ts +6 -18
- package/lib/browser/service/notebook-execution-state-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-execution-state-service.js +24 -14
- package/lib/browser/service/notebook-execution-state-service.js.map +1 -1
- package/lib/browser/service/notebook-kernel-quick-pick-service.d.ts +1 -0
- package/lib/browser/service/notebook-kernel-quick-pick-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-kernel-quick-pick-service.js +20 -17
- package/lib/browser/service/notebook-kernel-quick-pick-service.js.map +1 -1
- package/lib/browser/service/notebook-kernel-service.d.ts +15 -14
- package/lib/browser/service/notebook-kernel-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-kernel-service.js +24 -18
- package/lib/browser/service/notebook-kernel-service.js.map +1 -1
- package/lib/browser/service/notebook-model-resolver-service.d.ts +3 -2
- package/lib/browser/service/notebook-model-resolver-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-model-resolver-service.js +53 -35
- package/lib/browser/service/notebook-model-resolver-service.js.map +1 -1
- package/lib/browser/service/notebook-renderer-messaging-service.d.ts +7 -5
- package/lib/browser/service/notebook-renderer-messaging-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-renderer-messaging-service.js +11 -10
- package/lib/browser/service/notebook-renderer-messaging-service.js.map +1 -1
- package/lib/browser/service/notebook-service.d.ts +12 -17
- package/lib/browser/service/notebook-service.d.ts.map +1 -1
- package/lib/browser/service/notebook-service.js +13 -18
- package/lib/browser/service/notebook-service.js.map +1 -1
- package/lib/browser/view/notebook-cell-editor.d.ts +2 -2
- package/lib/browser/view/notebook-cell-editor.d.ts.map +1 -1
- package/lib/browser/view/notebook-cell-editor.js +2 -2
- package/lib/browser/view/notebook-cell-editor.js.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.d.ts +7 -5
- package/lib/browser/view-model/notebook-cell-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-cell-model.js +20 -6
- package/lib/browser/view-model/notebook-cell-model.js.map +1 -1
- package/lib/browser/view-model/notebook-cell-output-model.d.ts +1 -0
- package/lib/browser/view-model/notebook-cell-output-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-cell-output-model.js +31 -0
- package/lib/browser/view-model/notebook-cell-output-model.js.map +1 -1
- package/lib/browser/view-model/notebook-model.d.ts +15 -12
- package/lib/browser/view-model/notebook-model.d.ts.map +1 -1
- package/lib/browser/view-model/notebook-model.js +36 -21
- package/lib/browser/view-model/notebook-model.js.map +1 -1
- package/lib/common/notebook-common.d.ts +4 -6
- package/lib/common/notebook-common.d.ts.map +1 -1
- package/lib/common/notebook-common.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/contributions/notebook-cell-actions-contribution.ts +9 -2
- package/src/browser/contributions/notebook-context-keys.ts +7 -0
- package/src/browser/index.ts +1 -1
- package/src/browser/notebook-cell-resource-resolver.ts +1 -5
- package/src/browser/notebook-editor-widget-factory.ts +2 -2
- package/src/browser/notebook-editor-widget.tsx +18 -13
- package/src/browser/notebook-frontend-module.ts +3 -3
- package/src/browser/notebook-open-handler.ts +3 -4
- package/src/browser/notebook-renderer-registry.ts +7 -3
- package/src/browser/notebook-type-registry.ts +7 -3
- package/src/browser/renderers/cell-output-webview.ts +1 -1
- package/src/browser/service/notebook-cell-context-manager.ts +7 -9
- package/src/browser/service/{notebook-editor-service.ts → notebook-editor-widget-service.ts} +19 -12
- package/src/browser/service/notebook-execution-service.ts +1 -1
- package/src/browser/service/notebook-execution-state-service.ts +26 -33
- package/src/browser/service/notebook-kernel-quick-pick-service.ts +10 -7
- package/src/browser/service/notebook-kernel-service.ts +29 -30
- package/src/browser/service/notebook-model-resolver-service.ts +56 -35
- package/src/browser/service/notebook-renderer-messaging-service.ts +21 -19
- package/src/browser/service/notebook-service.ts +21 -27
- package/src/browser/view/notebook-cell-editor.tsx +3 -3
- package/src/browser/view-model/notebook-cell-model.ts +26 -9
- package/src/browser/view-model/notebook-cell-output-model.ts +31 -1
- package/src/browser/view-model/notebook-model.ts +26 -16
- package/src/common/notebook-common.ts +4 -7
- package/lib/browser/service/notebook-editor-service.d.ts.map +0 -1
- package/lib/browser/service/notebook-editor-service.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-renderer-messaging-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-renderer-messaging-service.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAE/E,UAAU,
|
|
1
|
+
{"version":3,"file":"notebook-renderer-messaging-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-renderer-messaging-service.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAE/E,UAAU,eAAe;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACjD;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE5E;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CAC3D;AAED,qBACa,gCAAiC,YAAW,UAAU;IAE/D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAkC;IACrE,QAAQ,CAAC,aAAa,+CAAiC;IAEvD,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAyB;IACrE,QAAQ,CAAC,sBAAsB,sCAA0C;IAEzE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqE;IACjG,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuD;IAEvF,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IASpG,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAgB1B,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB;IAerD,OAAO,CAAC,WAAW;IAcnB,OAAO,IAAI,IAAI;CAGlB"}
|
|
@@ -32,17 +32,19 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
32
32
|
let NotebookRendererMessagingService = class NotebookRendererMessagingService {
|
|
33
33
|
constructor() {
|
|
34
34
|
this.postMessageEmitter = new core_1.Emitter();
|
|
35
|
-
this.
|
|
35
|
+
this.onPostMessage = this.postMessageEmitter.event;
|
|
36
|
+
this.willActivateRendererEmitter = new core_1.Emitter();
|
|
37
|
+
this.onWillActivateRenderer = this.willActivateRendererEmitter.event;
|
|
36
38
|
this.activations = new Map();
|
|
37
39
|
this.scopedMessaging = new Map();
|
|
38
40
|
}
|
|
39
41
|
receiveMessage(editorId, rendererId, message) {
|
|
40
42
|
var _a, _b, _c;
|
|
41
43
|
if (editorId === undefined) {
|
|
42
|
-
const sends = [...this.scopedMessaging.values()].map(e => { var _a; return (_a = e.
|
|
44
|
+
const sends = [...this.scopedMessaging.values()].map(e => { var _a; return (_a = e.receiveMessage) === null || _a === void 0 ? void 0 : _a.call(e, rendererId, message); });
|
|
43
45
|
return Promise.all(sends).then(values => values.some(value => !!value));
|
|
44
46
|
}
|
|
45
|
-
return (_c = (_b = (_a = this.scopedMessaging.get(editorId)) === null || _a === void 0 ? void 0 : _a.
|
|
47
|
+
return (_c = (_b = (_a = this.scopedMessaging.get(editorId)) === null || _a === void 0 ? void 0 : _a.receiveMessage) === null || _b === void 0 ? void 0 : _b.call(_a, rendererId, message)) !== null && _c !== void 0 ? _c : Promise.resolve(false);
|
|
46
48
|
}
|
|
47
49
|
prepare(rendererId) {
|
|
48
50
|
if (this.activations.has(rendererId)) {
|
|
@@ -50,13 +52,12 @@ let NotebookRendererMessagingService = class NotebookRendererMessagingService {
|
|
|
50
52
|
}
|
|
51
53
|
const queue = [];
|
|
52
54
|
this.activations.set(rendererId, queue);
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
// });
|
|
55
|
+
Promise.all(this.willActivateRendererEmitter.fire(rendererId)).then(() => {
|
|
56
|
+
for (const message of queue) {
|
|
57
|
+
this.postMessageEmitter.fire(message);
|
|
58
|
+
}
|
|
59
|
+
this.activations.set(rendererId, undefined);
|
|
60
|
+
});
|
|
60
61
|
}
|
|
61
62
|
getScoped(editorId) {
|
|
62
63
|
const existing = this.scopedMessaging.get(editorId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-renderer-messaging-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-renderer-messaging-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;;;;;;;;;AAEhG,sCAAsC;AACtC,4DAA0D;AAOzD,CAAC;AAgBF,IAAa,gCAAgC,GAA7C,MAAa,gCAAgC;IAA7C;QAEqB,uBAAkB,GAAG,IAAI,cAAO,
|
|
1
|
+
{"version":3,"file":"notebook-renderer-messaging-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-renderer-messaging-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,44 +1,39 @@
|
|
|
1
1
|
import { Disposable, DisposableCollection, Emitter, URI } from '@theia/core';
|
|
2
2
|
import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
3
|
-
import { NotebookData,
|
|
3
|
+
import { NotebookData, TransientOptions } from '../../common';
|
|
4
4
|
import { NotebookModel, NotebookModelProps } from '../view-model/notebook-model';
|
|
5
5
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
6
6
|
import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
|
|
7
7
|
import { NotebookCellModel, NotebookCellModelProps } from '../view-model/notebook-cell-model';
|
|
8
8
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
9
9
|
export declare const NotebookProvider: unique symbol;
|
|
10
|
-
export interface
|
|
10
|
+
export interface NotebookProviderInfo {
|
|
11
11
|
readonly notebookType: string;
|
|
12
12
|
readonly serializer: NotebookSerializer;
|
|
13
|
-
readonly extensionData: NotebookExtensionDescription;
|
|
14
13
|
}
|
|
15
14
|
export interface NotebookSerializer {
|
|
16
15
|
options: TransientOptions;
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
toNotebook(data: BinaryBuffer): Promise<NotebookData>;
|
|
17
|
+
fromNotebook(data: NotebookData): Promise<BinaryBuffer>;
|
|
19
18
|
}
|
|
20
19
|
export declare class NotebookService implements Disposable {
|
|
21
20
|
protected fileService: FileService;
|
|
22
21
|
protected modelService: MonacoTextModelService;
|
|
23
22
|
protected notebookModelFactory: (props: NotebookModelProps) => NotebookModel;
|
|
24
23
|
protected notebookCellModelFactory: (props: NotebookCellModelProps) => NotebookCellModel;
|
|
25
|
-
protected
|
|
26
|
-
readonly
|
|
24
|
+
protected willUseNotebookSerializerEmitter: Emitter<string>;
|
|
25
|
+
readonly onWillUseNotebookSerializer: import("@theia/core").Event<string>;
|
|
27
26
|
protected readonly disposables: DisposableCollection;
|
|
28
|
-
protected readonly notebookProviders: Map<string,
|
|
27
|
+
protected readonly notebookProviders: Map<string, NotebookProviderInfo>;
|
|
29
28
|
protected readonly notebookModels: Map<string, NotebookModel>;
|
|
30
|
-
protected readonly
|
|
31
|
-
readonly
|
|
29
|
+
protected readonly didRegisterNotebookSerializerEmitter: Emitter<string>;
|
|
30
|
+
readonly onDidRegisterNotebookSerializer: import("@theia/core").Event<string>;
|
|
32
31
|
protected readonly didRemoveViewTypeEmitter: Emitter<string>;
|
|
33
32
|
readonly onDidRemoveViewType: import("@theia/core").Event<string>;
|
|
34
33
|
protected readonly willOpenNotebookTypeEmitter: Emitter<string>;
|
|
35
34
|
readonly onWillOpenNotebook: import("@theia/core").Event<string>;
|
|
36
|
-
protected readonly willAddNotebookDocumentEmitter: Emitter<URI>;
|
|
37
|
-
readonly onWillAddNotebookDocument: import("@theia/core").Event<URI>;
|
|
38
35
|
protected readonly didAddNotebookDocumentEmitter: Emitter<NotebookModel>;
|
|
39
36
|
readonly onDidAddNotebookDocument: import("@theia/core").Event<NotebookModel>;
|
|
40
|
-
protected readonly willRemoveNotebookDocumentEmitter: Emitter<NotebookModel>;
|
|
41
|
-
readonly onWillRemoveNotebookDocument: import("@theia/core").Event<NotebookModel>;
|
|
42
37
|
protected readonly didRemoveNotebookDocumentEmitter: Emitter<NotebookModel>;
|
|
43
38
|
readonly onDidRemoveNotebookDocument: import("@theia/core").Event<NotebookModel>;
|
|
44
39
|
dispose(): void;
|
|
@@ -47,15 +42,15 @@ export declare class NotebookService implements Disposable {
|
|
|
47
42
|
* Marks the notebook service as ready. From this point on, the service will start dispatching the `onNotebookSerializer` event.
|
|
48
43
|
*/
|
|
49
44
|
markReady(): void;
|
|
50
|
-
registerNotebookSerializer(
|
|
45
|
+
registerNotebookSerializer(viewType: string, serializer: NotebookSerializer): Disposable;
|
|
51
46
|
createNotebookModel(data: NotebookData, viewType: string, uri: URI): Promise<NotebookModel>;
|
|
52
|
-
getNotebookDataProvider(viewType: string): Promise<
|
|
47
|
+
getNotebookDataProvider(viewType: string): Promise<NotebookProviderInfo>;
|
|
53
48
|
/**
|
|
54
49
|
* When the application starts up, notebook providers from plugins are not registered yet.
|
|
55
50
|
* It takes a few seconds for the plugin host to start so that notebook data providers can be registered.
|
|
56
51
|
* This methods waits until the notebook provider is registered.
|
|
57
52
|
*/
|
|
58
|
-
protected waitForNotebookProvider(type: string): Promise<
|
|
53
|
+
protected waitForNotebookProvider(type: string): Promise<NotebookProviderInfo | undefined>;
|
|
59
54
|
getNotebookEditorModel(uri: URI): NotebookModel | undefined;
|
|
60
55
|
getNotebookModels(): Iterable<NotebookModel>;
|
|
61
56
|
willOpenNotebook(type: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE7E,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"notebook-service.d.ts","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,23 +35,19 @@ const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
|
35
35
|
exports.NotebookProvider = Symbol('notebook provider');
|
|
36
36
|
let NotebookService = class NotebookService {
|
|
37
37
|
constructor() {
|
|
38
|
-
this.
|
|
39
|
-
this.
|
|
38
|
+
this.willUseNotebookSerializerEmitter = new core_1.Emitter();
|
|
39
|
+
this.onWillUseNotebookSerializer = this.willUseNotebookSerializerEmitter.event;
|
|
40
40
|
this.disposables = new core_1.DisposableCollection();
|
|
41
41
|
this.notebookProviders = new Map();
|
|
42
42
|
this.notebookModels = new Map();
|
|
43
|
-
this.
|
|
44
|
-
this.
|
|
43
|
+
this.didRegisterNotebookSerializerEmitter = new core_1.Emitter();
|
|
44
|
+
this.onDidRegisterNotebookSerializer = this.didRegisterNotebookSerializerEmitter.event;
|
|
45
45
|
this.didRemoveViewTypeEmitter = new core_1.Emitter();
|
|
46
46
|
this.onDidRemoveViewType = this.didRemoveViewTypeEmitter.event;
|
|
47
47
|
this.willOpenNotebookTypeEmitter = new core_1.Emitter();
|
|
48
48
|
this.onWillOpenNotebook = this.willOpenNotebookTypeEmitter.event;
|
|
49
|
-
this.willAddNotebookDocumentEmitter = new core_1.Emitter();
|
|
50
|
-
this.onWillAddNotebookDocument = this.willAddNotebookDocumentEmitter.event;
|
|
51
49
|
this.didAddNotebookDocumentEmitter = new core_1.Emitter();
|
|
52
50
|
this.onDidAddNotebookDocument = this.didAddNotebookDocumentEmitter.event;
|
|
53
|
-
this.willRemoveNotebookDocumentEmitter = new core_1.Emitter();
|
|
54
|
-
this.onWillRemoveNotebookDocument = this.willRemoveNotebookDocumentEmitter.event;
|
|
55
51
|
this.didRemoveNotebookDocumentEmitter = new core_1.Emitter();
|
|
56
52
|
this.onDidRemoveNotebookDocument = this.didRemoveNotebookDocumentEmitter.event;
|
|
57
53
|
this.ready = new promise_util_1.Deferred();
|
|
@@ -65,15 +61,15 @@ let NotebookService = class NotebookService {
|
|
|
65
61
|
markReady() {
|
|
66
62
|
this.ready.resolve();
|
|
67
63
|
}
|
|
68
|
-
registerNotebookSerializer(
|
|
69
|
-
if (this.notebookProviders.has(
|
|
70
|
-
throw new Error(`notebook provider for viewtype '${
|
|
64
|
+
registerNotebookSerializer(viewType, serializer) {
|
|
65
|
+
if (this.notebookProviders.has(viewType)) {
|
|
66
|
+
throw new Error(`notebook provider for viewtype '${viewType}' already exists`);
|
|
71
67
|
}
|
|
72
|
-
this.notebookProviders.set(
|
|
73
|
-
this.
|
|
68
|
+
this.notebookProviders.set(viewType, { notebookType: viewType, serializer });
|
|
69
|
+
this.didRegisterNotebookSerializerEmitter.fire(viewType);
|
|
74
70
|
return core_1.Disposable.create(() => {
|
|
75
|
-
this.notebookProviders.delete(
|
|
76
|
-
this.didRemoveViewTypeEmitter.fire(
|
|
71
|
+
this.notebookProviders.delete(viewType);
|
|
72
|
+
this.didRemoveViewTypeEmitter.fire(viewType);
|
|
77
73
|
});
|
|
78
74
|
}
|
|
79
75
|
async createNotebookModel(data, viewType, uri) {
|
|
@@ -82,7 +78,6 @@ let NotebookService = class NotebookService {
|
|
|
82
78
|
if (!serializer) {
|
|
83
79
|
throw new Error('no notebook serializer for ' + viewType);
|
|
84
80
|
}
|
|
85
|
-
this.willAddNotebookDocumentEmitter.fire(uri);
|
|
86
81
|
const model = this.notebookModelFactory({ data, uri, viewType, serializer });
|
|
87
82
|
this.notebookModels.set(uri.toString(), model);
|
|
88
83
|
// Resolve cell text models right after creating the notebook model
|
|
@@ -93,7 +88,6 @@ let NotebookService = class NotebookService {
|
|
|
93
88
|
}
|
|
94
89
|
async getNotebookDataProvider(viewType) {
|
|
95
90
|
await this.ready.promise;
|
|
96
|
-
await this.notebookSerializerEmitter.sequence(async (listener) => listener(`onNotebookSerializer:${viewType}`));
|
|
97
91
|
const result = await this.waitForNotebookProvider(viewType);
|
|
98
92
|
if (!result) {
|
|
99
93
|
throw new Error(`No provider registered for view type: '${viewType}'`);
|
|
@@ -109,10 +103,11 @@ let NotebookService = class NotebookService {
|
|
|
109
103
|
if (this.notebookProviders.has(type)) {
|
|
110
104
|
return this.notebookProviders.get(type);
|
|
111
105
|
}
|
|
106
|
+
await Promise.all(this.willUseNotebookSerializerEmitter.fire(type));
|
|
112
107
|
const deferred = new promise_util_1.Deferred();
|
|
113
108
|
// 20 seconds of timeout
|
|
114
109
|
const timeoutDuration = 20000;
|
|
115
|
-
const disposable = this.
|
|
110
|
+
const disposable = this.onDidRegisterNotebookSerializer(viewType => {
|
|
116
111
|
if (viewType === type) {
|
|
117
112
|
clearTimeout(timeout);
|
|
118
113
|
disposable.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;;;;AAEhF,sCAA6E;AAC7E,4DAAkE;AAGlE,iEAAuG;AACvG,6EAAyE;AACzE,mGAA6F;AAC7F,2EAAwH;AACxH,sEAA+D;AAElD,QAAA,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook-service.js","sourceRoot":"","sources":["../../../src/browser/service/notebook-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import * as React from '@theia/core/shared/react';
|
|
3
3
|
import { NotebookModel } from '../view-model/notebook-model';
|
|
4
4
|
import { NotebookCellModel } from '../view-model/notebook-cell-model';
|
|
5
|
-
import {
|
|
5
|
+
import { SimpleMonacoEditor } from '@theia/monaco/lib/browser/simple-monaco-editor';
|
|
6
6
|
import { MonacoEditorServices } from '@theia/monaco/lib/browser/monaco-editor';
|
|
7
7
|
import { DisposableCollection } from '@theia/core';
|
|
8
8
|
interface CellEditorProps {
|
|
@@ -11,7 +11,7 @@ interface CellEditorProps {
|
|
|
11
11
|
monacoServices: MonacoEditorServices;
|
|
12
12
|
}
|
|
13
13
|
export declare class CellEditor extends React.Component<CellEditorProps, {}> {
|
|
14
|
-
protected editor?:
|
|
14
|
+
protected editor?: SimpleMonacoEditor;
|
|
15
15
|
protected toDispose: DisposableCollection;
|
|
16
16
|
protected container?: HTMLDivElement;
|
|
17
17
|
componentDidMount(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"notebook-cell-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,UAAU,eAAe;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,EAAE,iBAAiB,CAAC;IACxB,cAAc,EAAE,oBAAoB,CAAA;CACvC;AAYD,qBAAa,UAAW,SAAQ,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,CAAC;IAEhE,SAAS,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IACtC,SAAS,CAAC,SAAS,uBAA8B;IACjD,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IAE5B,iBAAiB,IAAI,IAAI;IAKzB,oBAAoB,IAAI,IAAI;IAIrC,SAAS,CAAC,aAAa,IAAI,IAAI;cAKf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB3C,SAAS,CAAC,SAAS,cAAe,cAAc,UAE9C;IAEF,SAAS,CAAC,YAAY,aAEpB;IAEO,MAAM,IAAI,KAAK,CAAC,SAAS;CAIrC"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.CellEditor = void 0;
|
|
19
19
|
const React = require("@theia/core/shared/react");
|
|
20
|
-
const
|
|
20
|
+
const simple_monaco_editor_1 = require("@theia/monaco/lib/browser/simple-monaco-editor");
|
|
21
21
|
const monaco_editor_provider_1 = require("@theia/monaco/lib/browser/monaco-editor-provider");
|
|
22
22
|
const core_1 = require("@theia/core");
|
|
23
23
|
const DEFAULT_EDITOR_OPTIONS = {
|
|
@@ -58,7 +58,7 @@ class CellEditor extends React.Component {
|
|
|
58
58
|
const editorNode = this.container;
|
|
59
59
|
const editorModel = await cell.resolveTextModel();
|
|
60
60
|
const uri = cell.uri;
|
|
61
|
-
this.editor = new
|
|
61
|
+
this.editor = new simple_monaco_editor_1.SimpleMonacoEditor(uri, editorModel, editorNode, monacoServices, DEFAULT_EDITOR_OPTIONS);
|
|
62
62
|
this.toDispose.push(this.editor);
|
|
63
63
|
this.editor.setLanguage(cell.language);
|
|
64
64
|
this.toDispose.push(this.editor.getControl().onDidContentSizeChange(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-editor.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,kDAAkD;AAGlD,
|
|
1
|
+
{"version":3,"file":"notebook-cell-editor.js","sourceRoot":"","sources":["../../../src/browser/view/notebook-cell-editor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,10 @@ import { Disposable, DisposableCollection, Emitter, Event, URI } from '@theia/co
|
|
|
2
2
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
3
3
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
4
4
|
import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
|
|
5
|
-
import { CellInternalMetadataChangedEvent, CellKind, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellOutputsSplice, CellOutput, CellData, NotebookCell } from '../../common';
|
|
5
|
+
import { CellInternalMetadataChangedEvent, CellKind, NotebookCellCollapseState, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellOutputsSplice, CellOutput, CellData, NotebookCell, CellOutputItem } from '../../common';
|
|
6
6
|
import { NotebookCellOutputModel } from './notebook-cell-output-model';
|
|
7
7
|
export declare const NotebookCellModelFactory: unique symbol;
|
|
8
|
+
export declare type NotebookCellModelFactory = (props: NotebookCellModelProps) => NotebookCellModel;
|
|
8
9
|
export declare function createNotebookCellModelContainer(parent: interfaces.Container, props: NotebookCellModelProps, notebookCellContextManager: new (...args: never[]) => unknown): interfaces.Container;
|
|
9
10
|
declare const NotebookCellContextManager: unique symbol;
|
|
10
11
|
interface NotebookCellContextManager {
|
|
@@ -26,8 +27,8 @@ export interface NotebookCellModelProps {
|
|
|
26
27
|
export declare class NotebookCellModel implements NotebookCell, Disposable {
|
|
27
28
|
protected readonly onDidChangeOutputsEmitter: Emitter<NotebookCellOutputsSplice>;
|
|
28
29
|
readonly onDidChangeOutputs: Event<NotebookCellOutputsSplice>;
|
|
29
|
-
protected readonly onDidChangeOutputItemsEmitter: Emitter<
|
|
30
|
-
readonly onDidChangeOutputItems: Event<
|
|
30
|
+
protected readonly onDidChangeOutputItemsEmitter: Emitter<CellOutput>;
|
|
31
|
+
readonly onDidChangeOutputItems: Event<CellOutput>;
|
|
31
32
|
protected readonly onDidChangeContentEmitter: Emitter<"content" | "language" | "mime">;
|
|
32
33
|
readonly onDidChangeContent: Event<'content' | 'language' | 'mime'>;
|
|
33
34
|
protected readonly onDidChangeMetadataEmitter: Emitter<void>;
|
|
@@ -52,7 +53,7 @@ export declare class NotebookCellModel implements NotebookCell, Disposable {
|
|
|
52
53
|
textModel: MonacoEditorModel;
|
|
53
54
|
protected htmlContext: HTMLLIElement;
|
|
54
55
|
get context(): HTMLLIElement;
|
|
55
|
-
get
|
|
56
|
+
get text(): string;
|
|
56
57
|
get source(): string;
|
|
57
58
|
set source(source: string);
|
|
58
59
|
get language(): string;
|
|
@@ -66,7 +67,8 @@ export declare class NotebookCellModel implements NotebookCell, Disposable {
|
|
|
66
67
|
requestEdit(): void;
|
|
67
68
|
requestStopEdit(): void;
|
|
68
69
|
spliceNotebookCellOutputs(splice: NotebookCellOutputsSplice): void;
|
|
69
|
-
|
|
70
|
+
replaceOutputData(outputId: string, newOutputData: CellOutput): boolean;
|
|
71
|
+
changeOutputItems(outputId: string, append: boolean, items: CellOutputItem[]): boolean;
|
|
70
72
|
getData(): CellData;
|
|
71
73
|
resolveTextModel(): Promise<MonacoEditorModel>;
|
|
72
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EACH,gCAAgC,EAAE,QAAQ,EAAE,yBAAyB,EAAE,4BAA4B,EACnG,oBAAoB,EAAE,yBAAyB,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"notebook-cell-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ let NotebookCellModel = class NotebookCellModel {
|
|
|
84
84
|
get context() {
|
|
85
85
|
return this.htmlContext;
|
|
86
86
|
}
|
|
87
|
-
get
|
|
87
|
+
get text() {
|
|
88
88
|
return this.textModel ? this.textModel.getText() : this.source;
|
|
89
89
|
}
|
|
90
90
|
get source() {
|
|
@@ -153,7 +153,7 @@ let NotebookCellModel = class NotebookCellModel {
|
|
|
153
153
|
for (let i = 0; i < commonLen; i++) {
|
|
154
154
|
const currentOutput = this.outputs[splice.start + i];
|
|
155
155
|
const newOutput = splice.newOutputs[i];
|
|
156
|
-
this.
|
|
156
|
+
this.replaceOutputData(currentOutput.outputId, newOutput);
|
|
157
157
|
}
|
|
158
158
|
this.outputs.splice(splice.start + commonLen, splice.deleteCount - commonLen, ...splice.newOutputs.slice(commonLen).map(op => new notebook_cell_output_model_1.NotebookCellOutputModel(op)));
|
|
159
159
|
this.onDidChangeOutputsEmitter.fire({ start: splice.start + commonLen, deleteCount: splice.deleteCount - commonLen, newOutputs: splice.newOutputs.slice(commonLen) });
|
|
@@ -163,13 +163,27 @@ let NotebookCellModel = class NotebookCellModel {
|
|
|
163
163
|
this.onDidChangeOutputsEmitter.fire(splice);
|
|
164
164
|
}
|
|
165
165
|
}
|
|
166
|
-
|
|
166
|
+
replaceOutputData(outputId, newOutputData) {
|
|
167
167
|
const output = this.outputs.find(out => out.outputId === outputId);
|
|
168
168
|
if (!output) {
|
|
169
169
|
return false;
|
|
170
170
|
}
|
|
171
|
-
output.replaceData(
|
|
172
|
-
this.onDidChangeOutputItemsEmitter.fire();
|
|
171
|
+
output.replaceData(newOutputData);
|
|
172
|
+
this.onDidChangeOutputItemsEmitter.fire(output);
|
|
173
|
+
return true;
|
|
174
|
+
}
|
|
175
|
+
changeOutputItems(outputId, append, items) {
|
|
176
|
+
const output = this.outputs.find(out => out.outputId === outputId);
|
|
177
|
+
if (!output) {
|
|
178
|
+
return false;
|
|
179
|
+
}
|
|
180
|
+
if (append) {
|
|
181
|
+
output.appendData(items);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
output.replaceData({ outputId: outputId, outputs: items, metadata: output.metadata });
|
|
185
|
+
}
|
|
186
|
+
this.onDidChangeOutputItemsEmitter.fire(output);
|
|
173
187
|
return true;
|
|
174
188
|
}
|
|
175
189
|
getData() {
|
|
@@ -177,7 +191,7 @@ let NotebookCellModel = class NotebookCellModel {
|
|
|
177
191
|
cellKind: this.cellKind,
|
|
178
192
|
language: this.language,
|
|
179
193
|
outputs: this.outputs.map(output => output.getData()),
|
|
180
|
-
source: this.
|
|
194
|
+
source: this.text,
|
|
181
195
|
collapseState: this.props.collapseState,
|
|
182
196
|
internalMetadata: this.internalMetadata,
|
|
183
197
|
metadata: this.metadata
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF;;;gGAGgG;;;;;;;;;;;;AAEhG,sCAAoF;AACpF,4DAA6F;AAE7F,mGAA6F;AAK7F,6EAAuE;AAE1D,QAAA,wBAAwB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook-cell-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-output-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-output-model.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAW,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"notebook-cell-output-model.d.ts","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-output-model.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAW,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAoB,MAAM,cAAc,CAAC;AAE5E,qBAAa,uBAAwB,YAAW,UAAU;IAoB1C,OAAO,CAAC,SAAS;IAlB7B,OAAO,CAAC,oBAAoB,CAAuB;IACnD,QAAQ,CAAC,eAAe,oCAAmC;IAE3D,OAAO,CAAC,sCAAsC,CAAuB;IACrE,QAAQ,CAAC,iCAAiC,oCAAqD;IAE/F,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,OAAO,IAAI,cAAc,EAAE,CAE9B;IAED,IAAI,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAElD;gBAEmB,SAAS,EAAE,UAAU;IAEzC,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;IAMtC,UAAU,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,IAAI;IAMzC,OAAO,IAAI,IAAI;IAKf,+BAA+B,IAAI,IAAI;IAIvC,OAAO,IAAI,UAAU;IAQrB,OAAO,CAAC,mBAAmB;CA2B9B"}
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.NotebookCellOutputModel = void 0;
|
|
19
19
|
const core_1 = require("@theia/core");
|
|
20
|
+
const buffer_1 = require("@theia/core/lib/common/buffer");
|
|
21
|
+
const common_1 = require("../../common");
|
|
20
22
|
class NotebookCellOutputModel {
|
|
21
23
|
constructor(rawOutput) {
|
|
22
24
|
this.rawOutput = rawOutput;
|
|
@@ -36,10 +38,12 @@ class NotebookCellOutputModel {
|
|
|
36
38
|
}
|
|
37
39
|
replaceData(rawData) {
|
|
38
40
|
this.rawOutput = rawData;
|
|
41
|
+
this.optimizeOutputItems();
|
|
39
42
|
this.didChangeDataEmitter.fire();
|
|
40
43
|
}
|
|
41
44
|
appendData(items) {
|
|
42
45
|
this.rawOutput.outputs.push(...items);
|
|
46
|
+
this.optimizeOutputItems();
|
|
43
47
|
this.didChangeDataEmitter.fire();
|
|
44
48
|
}
|
|
45
49
|
dispose() {
|
|
@@ -56,6 +60,33 @@ class NotebookCellOutputModel {
|
|
|
56
60
|
outputId: this.outputId
|
|
57
61
|
};
|
|
58
62
|
}
|
|
63
|
+
optimizeOutputItems() {
|
|
64
|
+
if (this.outputs.length > 1 && this.outputs.every(item => (0, common_1.isTextStreamMime)(item.mime))) {
|
|
65
|
+
// Look for the mimes in the items, and keep track of their order.
|
|
66
|
+
// Merge the streams into one output item, per mime type.
|
|
67
|
+
const mimeOutputs = new Map();
|
|
68
|
+
const mimeTypes = [];
|
|
69
|
+
this.outputs.forEach(item => {
|
|
70
|
+
let items;
|
|
71
|
+
if (mimeOutputs.has(item.mime)) {
|
|
72
|
+
items = mimeOutputs.get(item.mime);
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
items = [];
|
|
76
|
+
mimeOutputs.set(item.mime, items);
|
|
77
|
+
mimeTypes.push(item.mime);
|
|
78
|
+
}
|
|
79
|
+
items.push(item.data);
|
|
80
|
+
});
|
|
81
|
+
this.outputs.length = 0;
|
|
82
|
+
mimeTypes.forEach(mime => {
|
|
83
|
+
this.outputs.push({
|
|
84
|
+
mime,
|
|
85
|
+
data: buffer_1.BinaryBuffer.concat(mimeOutputs.get(mime))
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
}
|
|
59
90
|
}
|
|
60
91
|
exports.NotebookCellOutputModel = NotebookCellOutputModel;
|
|
61
92
|
//# sourceMappingURL=notebook-cell-output-model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notebook-cell-output-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-output-model.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,sCAAkD;
|
|
1
|
+
{"version":3,"file":"notebook-cell-output-model.js","sourceRoot":"","sources":["../../../src/browser/view-model/notebook-cell-output-model.ts"],"names":[],"mappings":"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"}
|