@datalayer/jupyter-react 0.16.0 → 0.18.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.
Files changed (159) hide show
  1. package/lib/components/cell/Cell.js +15 -20
  2. package/lib/components/cell/Cell.js.map +1 -1
  3. package/lib/components/cell/CellAdapter.d.ts +3 -0
  4. package/lib/components/cell/CellAdapter.js +97 -4
  5. package/lib/components/cell/CellAdapter.js.map +1 -1
  6. package/lib/components/cell/CellCommands.d.ts +2 -2
  7. package/lib/components/cell/CellCommands.js +2 -2
  8. package/lib/components/cell/CellCommands.js.map +1 -1
  9. package/lib/components/cell/CellState.d.ts +15 -8
  10. package/lib/components/cell/CellState.js +33 -8
  11. package/lib/components/cell/CellState.js.map +1 -1
  12. package/lib/components/codemirror/CodeMirrorEditor.js +11 -17
  13. package/lib/components/codemirror/CodeMirrorEditor.js.map +1 -1
  14. package/lib/components/kernel/Kernelndicator.d.ts +7 -5
  15. package/lib/components/kernel/Kernelndicator.js +8 -8
  16. package/lib/components/kernel/Kernelndicator.js.map +1 -1
  17. package/lib/components/kernel/inspector/widget.js +3 -3
  18. package/lib/components/kernel/inspector/widget.js.map +1 -1
  19. package/lib/components/notebook/Notebook.d.ts +1 -1
  20. package/lib/components/notebook/Notebook.js +19 -19
  21. package/lib/components/notebook/Notebook.js.map +1 -1
  22. package/lib/components/notebook/NotebookAdapter.d.ts +2 -2
  23. package/lib/components/notebook/NotebookAdapter.js +9 -9
  24. package/lib/components/notebook/NotebookAdapter.js.map +1 -1
  25. package/lib/components/notebook/NotebookCommands.js +30 -4
  26. package/lib/components/notebook/NotebookCommands.js.map +1 -1
  27. package/lib/components/notebook/NotebookState.d.ts +34 -34
  28. package/lib/components/notebook/NotebookState.js +54 -54
  29. package/lib/components/notebook/NotebookState.js.map +1 -1
  30. package/lib/components/notebook/cell/metadata/CellMetadataEditor.js +23 -8
  31. package/lib/components/notebook/cell/metadata/CellMetadataEditor.js.map +1 -1
  32. package/lib/components/notebook/cell/metadata/NbGraderCells.js +4 -4
  33. package/lib/components/notebook/cell/metadata/NbGraderCells.js.map +1 -1
  34. package/lib/components/notebook/cell/sidebar/CellSidebar.js +6 -6
  35. package/lib/components/notebook/cell/sidebar/CellSidebar.js.map +1 -1
  36. package/lib/components/notebook/cell/sidebar/CellSidebarButton.js +6 -6
  37. package/lib/components/notebook/cell/sidebar/CellSidebarButton.js.map +1 -1
  38. package/lib/components/notebook/cell/sidebar/CellSidebarWidget.js +1 -1
  39. package/lib/components/notebook/cell/sidebar/CellSidebarWidget.js.map +1 -1
  40. package/lib/components/output/Output.d.ts +4 -4
  41. package/lib/components/output/Output.js +51 -38
  42. package/lib/components/output/Output.js.map +1 -1
  43. package/lib/components/output/OutputAdapter.d.ts +3 -2
  44. package/lib/components/output/OutputAdapter.js +9 -6
  45. package/lib/components/output/OutputAdapter.js.map +1 -1
  46. package/lib/components/output/OutputExecutor.d.ts +8 -0
  47. package/lib/components/output/OutputExecutor.js +28 -0
  48. package/lib/components/output/OutputExecutor.js.map +1 -0
  49. package/lib/components/output/OutputState.d.ts +23 -42
  50. package/lib/components/output/OutputState.js +50 -40
  51. package/lib/components/output/OutputState.js.map +1 -1
  52. package/lib/examples/All.js +14 -15
  53. package/lib/examples/All.js.map +1 -1
  54. package/lib/examples/Bokeh.js +1 -1
  55. package/lib/examples/Bokeh.js.map +1 -1
  56. package/lib/examples/Bqplot.js +1 -1
  57. package/lib/examples/Bqplot.js.map +1 -1
  58. package/lib/examples/Cell.js +16 -11
  59. package/lib/examples/Cell.js.map +1 -1
  60. package/lib/examples/CellExecuteControl.d.ts +1 -0
  61. package/lib/examples/CellExecuteControl.js +38 -0
  62. package/lib/examples/CellExecuteControl.js.map +1 -0
  63. package/lib/examples/Cells.js +1 -1
  64. package/lib/examples/Cells.js.map +1 -1
  65. package/lib/examples/Dashboard.js +1 -1
  66. package/lib/examples/Dashboard.js.map +1 -1
  67. package/lib/examples/GeoJson.js +1 -1
  68. package/lib/examples/GeoJson.js.map +1 -1
  69. package/lib/examples/IPyLeaflet.js +1 -1
  70. package/lib/examples/IPyLeaflet.js.map +1 -1
  71. package/lib/examples/IPyReact.js +1 -1
  72. package/lib/examples/IPyReact.js.map +1 -1
  73. package/lib/examples/IPyWidgets.js +1 -1
  74. package/lib/examples/IPyWidgets.js.map +1 -1
  75. package/lib/examples/IPyWidgetsWithState.js +1 -1
  76. package/lib/examples/IPyWidgetsWithState.js.map +1 -1
  77. package/lib/examples/KernelExecute.d.ts +1 -0
  78. package/lib/examples/{KernelExecResult.js → KernelExecute.js} +5 -5
  79. package/lib/examples/KernelExecute.js.map +1 -0
  80. package/lib/examples/KernelExecutor.js +3 -3
  81. package/lib/examples/KernelExecutor.js.map +1 -1
  82. package/lib/examples/Matplotlib.js +1 -1
  83. package/lib/examples/Matplotlib.js.map +1 -1
  84. package/lib/examples/Notebook.js +2 -2
  85. package/lib/examples/Notebook.js.map +1 -1
  86. package/lib/examples/NotebookCellSidebar.js +1 -1
  87. package/lib/examples/NotebookCellSidebar.js.map +1 -1
  88. package/lib/examples/NotebookColorMode.js +1 -1
  89. package/lib/examples/NotebookColorMode.js.map +1 -1
  90. package/lib/examples/NotebookExternalContent.js +3 -3
  91. package/lib/examples/NotebookExternalContent.js.map +1 -1
  92. package/lib/examples/NotebookInit.js +2 -3
  93. package/lib/examples/NotebookInit.js.map +1 -1
  94. package/lib/examples/NotebookKernelChange.js +3 -4
  95. package/lib/examples/NotebookKernelChange.js.map +1 -1
  96. package/lib/examples/NotebookLite.js +1 -1
  97. package/lib/examples/NotebookLite.js.map +1 -1
  98. package/lib/examples/NotebookNbFormat.js +1 -1
  99. package/lib/examples/NotebookNbFormat.js.map +1 -1
  100. package/lib/examples/NotebookNbFormatChange.js +3 -3
  101. package/lib/examples/NotebookNbFormatChange.js.map +1 -1
  102. package/lib/examples/NotebookNoContext.js +2 -2
  103. package/lib/examples/NotebookNoContext.js.map +1 -1
  104. package/lib/examples/NotebookNoContextNoPrimer.js +2 -2
  105. package/lib/examples/NotebookNoContextNoPrimer.js.map +1 -1
  106. package/lib/examples/NotebookPath.js +2 -2
  107. package/lib/examples/NotebookPath.js.map +1 -1
  108. package/lib/examples/NotebookPathChange.js +1 -1
  109. package/lib/examples/NotebookPathChange.js.map +1 -1
  110. package/lib/examples/NotebookSkeleton.js +2 -2
  111. package/lib/examples/NotebookSkeleton.js.map +1 -1
  112. package/lib/examples/NotebookTheme.js +1 -1
  113. package/lib/examples/NotebookTheme.js.map +1 -1
  114. package/lib/examples/NotebookThemeColorMode.js +1 -1
  115. package/lib/examples/NotebookThemeColorMode.js.map +1 -1
  116. package/lib/examples/NotebookUnmount.js +1 -2
  117. package/lib/examples/NotebookUnmount.js.map +1 -1
  118. package/lib/examples/NotebookUrl.js +2 -2
  119. package/lib/examples/NotebookUrl.js.map +1 -1
  120. package/lib/examples/Output.js +52 -14
  121. package/lib/examples/Output.js.map +1 -1
  122. package/lib/examples/Panel.js +1 -1
  123. package/lib/examples/Panel.js.map +1 -1
  124. package/lib/examples/Plotly.js +1 -1
  125. package/lib/examples/Plotly.js.map +1 -1
  126. package/lib/examples/Vega.js +1 -1
  127. package/lib/examples/Vega.js.map +1 -1
  128. package/lib/examples/notebooks/Matplotlib.ipynb.json +1 -1
  129. package/lib/examples/sidebars/CellSidebarSource.js +6 -6
  130. package/lib/examples/sidebars/CellSidebarSource.js.map +1 -1
  131. package/lib/examples/toolbars/NotebookToolbar.js +4 -4
  132. package/lib/examples/toolbars/NotebookToolbar.js.map +1 -1
  133. package/lib/examples/toolbars/NotebookToolbarAutoSave.js +2 -2
  134. package/lib/examples/toolbars/NotebookToolbarAutoSave.js.map +1 -1
  135. package/lib/index.d.ts +2 -0
  136. package/lib/index.js +3 -8
  137. package/lib/index.js.map +1 -1
  138. package/lib/jupyter/kernel/Kernel.d.ts +8 -3
  139. package/lib/jupyter/kernel/Kernel.js +10 -9
  140. package/lib/jupyter/kernel/Kernel.js.map +1 -1
  141. package/lib/jupyter/kernel/KernelExecutor.d.ts +17 -10
  142. package/lib/jupyter/kernel/KernelExecutor.js +82 -63
  143. package/lib/jupyter/kernel/KernelExecutor.js.map +1 -1
  144. package/lib/jupyter/kernel/KernelState.d.ts +25 -0
  145. package/lib/jupyter/kernel/KernelState.js +56 -0
  146. package/lib/jupyter/kernel/KernelState.js.map +1 -0
  147. package/lib/state/State.d.ts +10 -10
  148. package/lib/state/State.js +10 -12
  149. package/lib/state/State.js.map +1 -1
  150. package/lib/utils/Utils.d.ts +1 -1
  151. package/lib/utils/Utils.js +3 -5
  152. package/lib/utils/Utils.js.map +1 -1
  153. package/package.json +8 -7
  154. package/lib/examples/KernelExecResult.d.ts +0 -1
  155. package/lib/examples/KernelExecResult.js.map +0 -1
  156. package/lib/examples/notebooks/DashboardExample.exclude.json +0 -1351
  157. package/lib/examples/notebooks/IPyWidgetsOutputMatplotlib.exclude.d.ts +0 -51
  158. package/lib/examples/notebooks/IPyWidgetsOutputMatplotlib.exclude.js +0 -64
  159. package/lib/examples/notebooks/IPyWidgetsOutputMatplotlib.exclude.js.map +0 -1
@@ -5,44 +5,38 @@ import { jsx as _jsx } from "react/jsx-runtime";
5
5
  * MIT License
6
6
  */
7
7
  import { useState, useEffect } from 'react';
8
- import { CodeCell, MarkdownCell } from '@jupyterlab/cells';
8
+ import { CodeCell } from '@jupyterlab/cells';
9
9
  import { Box } from '@primer/react';
10
- import CellAdapter from './CellAdapter';
11
10
  import Lumino from '../lumino/Lumino';
12
11
  import { useJupyter } from './../../jupyter/JupyterContext';
13
- import useCellStore from './CellState';
12
+ import CellAdapter from './CellAdapter';
13
+ import useCellsStore from './CellState';
14
14
  import { newUuid } from '../../utils';
15
15
  export const Cell = (props) => {
16
- const { type = 'code', source = '', autoStart, showToolbar = true } = props;
17
- const { serverSettings, defaultKernel } = useJupyter();
16
+ const { autoStart, showToolbar = true, source = '', type = 'code', } = props;
17
+ const { defaultKernel, serverSettings } = useJupyter();
18
18
  const [id] = useState(props.id || newUuid());
19
19
  const [adapter, setAdapter] = useState();
20
- const cellStore = useCellStore();
20
+ const cellsStore = useCellsStore();
21
21
  const handleCellInitEvents = (adapter) => {
22
22
  adapter.cell.model.contentChanged.connect((cellModel, changedArgs) => {
23
- cellStore.setSource(id, cellModel.sharedModel.getSource());
23
+ cellsStore.setSource(id, cellModel.sharedModel.getSource());
24
24
  });
25
25
  if (adapter.cell instanceof CodeCell) {
26
26
  adapter.cell.outputArea.outputLengthChanged?.connect((outputArea, outputsCount) => {
27
- cellStore.setOutputsCount(id, outputsCount);
27
+ cellsStore.setOutputsCount(id, outputsCount);
28
28
  });
29
29
  }
30
30
  adapter.sessionContext.initialize().then(() => {
31
- if (!autoStart || !adapter.cell.model) {
32
- return;
33
- }
34
- // Perform auto-start for code or markdown cells
35
- if (adapter.cell instanceof CodeCell) {
36
- CodeCell.execute(adapter.cell, adapter.sessionContext);
37
- }
38
- if (adapter.cell instanceof MarkdownCell) {
39
- adapter.cell.rendered = true;
31
+ if (autoStart && adapter.cell.model) {
32
+ // Perform auto-start for code or markdown cells.
33
+ adapter.execute();
40
34
  }
41
35
  });
42
36
  adapter.sessionContext.kernelChanged.connect(() => {
43
37
  void adapter.sessionContext.session?.kernel?.info.then(info => {
44
38
  // Set that session/kernel is ready for this cell when the kernel is guaranteed to be connected
45
- cellStore.setIsKernelSessionAvailable(id, true);
39
+ cellsStore.setKernelSessionAvailable(id, true);
46
40
  });
47
41
  });
48
42
  };
@@ -50,14 +44,15 @@ export const Cell = (props) => {
50
44
  if (id && defaultKernel && serverSettings) {
51
45
  defaultKernel.ready.then(() => {
52
46
  const adapter = new CellAdapter({
47
+ id,
53
48
  type,
54
49
  source,
55
50
  serverSettings,
56
51
  kernel: defaultKernel,
57
52
  boxOptions: { showToolbar }
58
53
  });
59
- cellStore.setAdapter(id, adapter);
60
- cellStore.setSource(id, source);
54
+ cellsStore.setAdapter(id, adapter);
55
+ cellsStore.setSource(id, source);
61
56
  handleCellInitEvents(adapter);
62
57
  setAdapter(adapter);
63
58
  const handleDblClick = (event) => {
@@ -1 +1 @@
1
- {"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Cell.js","sourceRoot":"","sources":["../../../src/components/cell/Cell.tsx"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ interface BoxOptions {
7
7
  showToolbar?: boolean;
8
8
  }
9
9
  export declare class CellAdapter {
10
+ private _id;
10
11
  private _cell;
11
12
  private _kernel;
12
13
  private _panel;
@@ -19,9 +20,11 @@ export declare class CellAdapter {
19
20
  get sessionContext(): SessionContext;
20
21
  get kernel(): Kernel;
21
22
  execute: () => void;
23
+ private _execute;
22
24
  }
23
25
  export declare namespace CellAdapter {
24
26
  type ICellAdapterOptions = {
27
+ id: string;
25
28
  type: 'code' | 'markdown' | 'raw';
26
29
  source: string;
27
30
  serverSettings: ServerConnection.ISettings;
@@ -12,6 +12,7 @@ import { ybinding, CodeMirrorMimeTypeService, EditorLanguageRegistry, CodeMirror
12
12
  import { MathJaxTypesetter } from '@jupyterlab/mathjax-extension';
13
13
  import { Completer, CompleterModel, CompletionHandler, ProviderReconciliator, KernelCompleterProvider, } from '@jupyterlab/completer';
14
14
  import { RenderMimeRegistry, standardRendererFactories as initialFactories, } from '@jupyterlab/rendermime';
15
+ import { execute as executeOutput } from './../output/OutputExecutor';
15
16
  import { SessionManager, KernelManager, KernelSpecManager, } from '@jupyterlab/services';
16
17
  import { runIcon } from '@jupyterlab/ui-components';
17
18
  import { createStandaloneCell } from '@jupyter/ydoc';
@@ -20,14 +21,17 @@ import { requireLoader as loader } from '../../jupyter/ipywidgets/libembed-amd';
20
21
  import ClassicWidgetManager from '../../jupyter/ipywidgets/classic/manager';
21
22
  import getMarked from '../notebook/marked/marked';
22
23
  import CellCommands from './CellCommands';
24
+ import { cellsStore } from './CellState';
23
25
  export class CellAdapter {
26
+ _id;
24
27
  _cell;
25
28
  _kernel;
26
29
  _panel;
27
30
  _sessionContext;
28
31
  _type;
29
32
  constructor(options) {
30
- const { type, source, serverSettings, kernel, boxOptions } = options;
33
+ const { id, type, source, serverSettings, kernel, boxOptions } = options;
34
+ this._id = id;
31
35
  this._kernel = kernel;
32
36
  this._type = type;
33
37
  this.setupCell(type, source, serverSettings, kernel, boxOptions);
@@ -232,7 +236,7 @@ export class CellAdapter {
232
236
  });
233
237
  });
234
238
  handler.editor = editor;
235
- CellCommands(commands, this._cell, this._sessionContext, handler);
239
+ CellCommands(commands, this._cell, handler, this);
236
240
  completer.hide();
237
241
  completer.addClass('jp-Completer-Cell');
238
242
  Widget.attach(completer, document.body);
@@ -242,7 +246,7 @@ export class CellAdapter {
242
246
  icon: runIcon,
243
247
  onClick: () => {
244
248
  if (this._type === 'code') {
245
- CodeCell.execute(this._cell, this._sessionContext);
249
+ this.execute();
246
250
  }
247
251
  else if (this._type === 'markdown') {
248
252
  this._cell.rendered = true;
@@ -289,12 +293,101 @@ export class CellAdapter {
289
293
  }
290
294
  execute = () => {
291
295
  if (this._type === 'code') {
292
- CodeCell.execute(this._cell, this._sessionContext);
296
+ this._execute(this._cell);
293
297
  }
294
298
  else if (this._type === 'markdown') {
295
299
  this._cell.rendered = true;
296
300
  }
297
301
  };
302
+ async _execute(cell, metadata) {
303
+ cellsStore.getState().setIsExecuting(this._id, true);
304
+ const model = cell.model;
305
+ const code = model.sharedModel.getSource();
306
+ if (!code.trim() || !this.kernel) {
307
+ model.sharedModel.transact(() => {
308
+ model.clearExecution();
309
+ }, false);
310
+ cellsStore.getState().setIsExecuting(this._id, false);
311
+ return new Promise(() => { });
312
+ }
313
+ const cellId = { cellId: model.sharedModel.getId() };
314
+ metadata = {
315
+ ...model.metadata,
316
+ ...metadata,
317
+ ...cellId
318
+ };
319
+ const { recordTiming } = metadata;
320
+ model.sharedModel.transact(() => {
321
+ model.clearExecution();
322
+ cell.outputHidden = false;
323
+ }, false);
324
+ cell.setPrompt('*');
325
+ model.trusted = true;
326
+ let future;
327
+ try {
328
+ const kernelMessagePromise = executeOutput(this._id, code, cell.outputArea, this._kernel, metadata);
329
+ // cell.outputArea.future assigned synchronously in `execute`.
330
+ if (recordTiming) {
331
+ const recordTimingHook = (msg) => {
332
+ let label;
333
+ switch (msg.header.msg_type) {
334
+ case 'status':
335
+ label = `status.${msg.content.execution_state}`;
336
+ break;
337
+ case 'execute_input':
338
+ label = 'execute_input';
339
+ break;
340
+ default:
341
+ return true;
342
+ }
343
+ // If the data is missing, estimate it to now
344
+ // Date was added in 5.1: https://jupyter-client.readthedocs.io/en/stable/messaging.html#message-header
345
+ const value = msg.header.date || new Date().toISOString();
346
+ const timingInfo = Object.assign({}, model.getMetadata('execution'));
347
+ timingInfo[`iopub.${label}`] = value;
348
+ model.setMetadata('execution', timingInfo);
349
+ return true;
350
+ };
351
+ cell.outputArea.future.registerMessageHook(recordTimingHook);
352
+ }
353
+ else {
354
+ model.deleteMetadata('execution');
355
+ }
356
+ // Save this execution's future so we can compare in the catch below.
357
+ future = cell.outputArea.future;
358
+ const executeReplyMessage = (await kernelMessagePromise);
359
+ model.executionCount = executeReplyMessage.content.execution_count;
360
+ if (recordTiming) {
361
+ const timingInfo = Object.assign({}, model.getMetadata('execution'));
362
+ const started = executeReplyMessage.metadata.started;
363
+ // Started is not in the API, but metadata IPyKernel sends
364
+ if (started) {
365
+ timingInfo['shell.execute_reply.started'] = started;
366
+ }
367
+ // Per above, the 5.0 spec does not assume date, so we estimate is required
368
+ const finished = executeReplyMessage.header.date;
369
+ timingInfo['shell.execute_reply'] =
370
+ finished || new Date().toISOString();
371
+ model.setMetadata('execution', timingInfo);
372
+ }
373
+ cellsStore.getState().setIsExecuting(this._id, false);
374
+ return executeReplyMessage;
375
+ }
376
+ catch (e) {
377
+ cellsStore.getState().setIsExecuting(this._id, false);
378
+ // If we started executing, and the cell is still indicating this execution, clear the prompt.
379
+ if (future && !cell.isDisposed && cell.outputArea.future === future) {
380
+ cell.setPrompt('');
381
+ if (recordTiming && future.isDisposed) {
382
+ // Record the time when the cell execution was aborted
383
+ const timingInfo = Object.assign({}, model.getMetadata('execution'));
384
+ timingInfo['execution_failed'] = new Date().toISOString();
385
+ model.setMetadata('execution', timingInfo);
386
+ }
387
+ }
388
+ throw e;
389
+ }
390
+ }
298
391
  }
299
392
  export default CellAdapter;
300
393
  //# sourceMappingURL=CellAdapter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,cAAc,EAEd,OAAO,EACP,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAW,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC5G,OAAO,EACL,QAAQ,EACR,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACL,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,yBAAyB,IAAI,gBAAgB,GAC9C,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,cAAc,EACd,aAAa,EACb,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAoC,MAAM,eAAe,CAAC;AACvF,OAAO,EACL,eAAe,EACf,cAAc,GACf,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,oBAAoB,MAAM,0CAA0C,CAAC;AAE5E,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAClD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAK1C,MAAM,OAAO,WAAW;IACd,KAAK,CAAoC;IACzC,OAAO,CAAS;IAChB,MAAM,CAAW;IACjB,eAAe,CAAiB;IAChC,KAAK,CAA6B;IAE1C,YAAY,OAAwC;QAClD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACrE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACnE,CAAC;IAEO,SAAS,CACf,IAAI,GAAG,MAAM,EACb,MAAc,EACd,cAA0C,EAC1C,MAAc,EACd,UAAuB;QAEvB,MAAM,aAAa,GACjB,MAAM,CAAC,aAAa;YACpB,IAAI,aAAa,CAAC;gBAChB,cAAc;aACf,CAAC,CAAC;QACL,MAAM,cAAc,GAClB,MAAM,CAAC,cAAc;YACrB,IAAI,cAAc,CAAC;gBACjB,cAAc;gBACd,aAAa;aACd,CAAC,CAAC;QACL,MAAM,YAAY,GAChB,MAAM,CAAC,iBAAiB;YACxB,IAAI,iBAAiB,CAAC;gBACpB,cAAc;aACf,CAAC,CAAC;QACL,MAAM,gBAAgB,GAAsC,MAAM;YAChE,CAAC,CAAC;gBACE,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,WAAW,EAAE,KAAK;gBAClB,gBAAgB,EAAE,KAAK;gBACvB,iBAAiB,EAAE,KAAK;aACzB;YACH,CAAC,CAAC;gBACE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,IAAI;gBACjB,gBAAgB,EAAE,IAAI;gBACtB,iBAAiB,EAAE,IAAI;aACxB,CAAC;QAEN,IAAI,CAAC,eAAe,GAAG,IAAI,cAAc,CAAC;YACxC,IAAI,EAAE,MAAM,EAAE,IAAI;YAClB,IAAI,EAAE,MAAM,EAAE,IAAI;YAClB,cAAc;YACd,YAAY;YACZ,IAAI,EAAE,QAAQ;YACd,gBAAgB;SACjB,CAAC,CAAC;QAEH,6DAA6D;QAC5D,IAAI,CAAC,eAAuB,CAAC,WAAW,GAAG,KAAK,IAAsB,EAAE;YACvE,MAAM,OAAO,GAAI,IAAI,CAAC,eAAuB;iBAC1C,cAAgC,CAAC;YACpC,MAAM,OAAO,CAAC,KAAK,CAAC;YACpB,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE;gBAC3C,8EAA8E;gBAC9E,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,EAAE;gBACT,IAAI;oBACF,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;wBAChC,KAAK;wBACL,uBAAuB,EAAE;4BACvB,WAAW,EAAE,IAAI;yBAClB;qBACF,CAAC,CAAC;oBACF,IAAI,CAAC,eAAuB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;iBAC1D;gBAAC,OAAO,GAAG,EAAE;oBACZ,KAAM,IAAI,CAAC,eAAuB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;oBAC5D,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;iBAC5B;aACF;YACD,OAAO,MAAO,IAAI,CAAC,eAAuB,CAAC,iBAAiB,EAAE,CAAC;QACjE,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,mBAAmB,CAAC,gBAAgB,EAAE,EAAE;YAC1D,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACxB;QACD,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC5B,MAAM,QAAQ,GAAG,IAAI,uBAAuB,EAAE,CAAC;YAC/C,KAAK,MAAM,gBAAgB,IAAI,uBAAuB,CAAC,oBAAoB,CACzE,EAAE,MAAM,EAAE,CACX,EAAE;gBACD,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;aACzC;YACD,QAAQ,CAAC,YAAY,CAAC;gBACpB,IAAI,EAAE,sBAAsB;gBAC5B,OAAO,EAAE,OAAO,CAAC,EAAE;oBACjB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,WAAqB,CAAC;oBACxD,OAAO,uBAAuB,CAAC,wBAAwB,CACrD,QAAQ,CAAC;wBACP,KAAK,EAAE,WAAW,CAAC,OAAO;wBAC1B,WAAW,EAAE,WAAW,CAAC,WAAW,IAAI,SAAS;qBAClD,CAAC,CACH,CAAC;gBACJ,CAAC;aACF,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC/C,KAAK,MAAM,QAAQ,IAAI,sBAAsB,CAAC,mBAAmB,EAAE,EAAE;YACnE,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SACjC;QACD,SAAS,CAAC,WAAW,CAAC;YACpB,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,+BAA+B;gBAC/B,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;gBACpD,OAAO,CAAC,CAAC,QAAQ,CAAC;oBAChB,aAAa,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAQ;iBACjE,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,yBAAyB,CAAC,SAAS,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC;QACxB,QAAQ,CAAC,gBAAgB,CACvB,SAAS,EACT,KAAK,CAAC,EAAE;YACN,yDAAyD;YACzD,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;YAC7C,IAAI,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnF,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;aACrC;QACH,CAAC,EACD,UAAU,CACX,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC;YACxC,gBAAgB;YAChB,eAAe,EAAE,IAAI,iBAAiB,EAAE;YACxC,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,wBAAwB,GAAG,IAAI,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACtE,UAAU,CAAC,UAAU,CACnB;YACE,IAAI,EAAE,KAAK;YACX,SAAS,EAAE,CAAC,eAAe,CAAC;YAC5B,cAAc,EAAE,OAAO,CAAC,EAAE,CACxB,IAAI,cAAc,CAAC,OAAO,EAAE,wBAAwB,CAAC;SACxD,EACD,CAAC,CACF,CAAC;QACF,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,cAAc,GAAG,IAAI,uBAAuB,CAAC;YACjD,UAAU,EAAE,gBAAgB,EAAE;YAC9B,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC;YACrC,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC;YAC7C,aAAa,EAAE,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC;SACnE,CAAC,CAAC;QACH,IAAI,IAAI,KAAK,MAAM,EAAE;YACnB,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC;gBACxB,UAAU;gBACV,KAAK,EAAE,IAAI,aAAa,CAAC,EAAC,WAAW,EAAE,SAAsB,EAAC,CAAC;gBAC/D,cAAc,EAAE,cAAc;aAC/B,CAAC,CAAC;SACJ;aAAO,IAAI,IAAI,KAAK,UAAU,EAAE;YAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAC;gBAC5B,UAAU;gBACV,KAAK,EAAE,IAAI,iBAAiB,CAAC,EAAC,WAAW,EAAE,SAA0B,EAAC,CAAC;gBACvE,cAAc,EAAE,cAAc;aAC/B,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;YAC5B,IAAI,CAAC,KAAsB,CAAC,QAAQ,GAAG,KAAK,CAAC;SAC/C;QAED,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CACxC,CAAC,CAAC,EAAE,GAAkD,EAAE,EAAE;YACxD,MAAM,gBAAgB,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,CAAC;YAC3D,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;gBACrD,OAAO,CAAC,IAAI,CACV,yCAAyC,EACzC,gBAAgB,CAAC,EAAE,CACpB,CAAC;gBACD,gBAAwB,CAAC,WAAW,GAAG,IAAI,CAAC;gBAC7C,OAAO,CAAC,GAAG,CACT,uDAAuD,EACvD,gBAAgB,CAAC,WAAW,CAC7B,CAAC;aACH;YACD,wBAAwB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAChE,CAAC,CACF,CAAC;QACF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE;YAC9C,KAAK,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC1D,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE;oBACzB,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC;oBAChC,MAAM,QAAQ,GAAG,WAAW,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;oBACzD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;wBACpB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;qBACtC;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,cAAc,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,MAAM,QAAQ,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,qBAAqB,CAAC;YAC9C,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI,CAAC,KAAK;gBAClB,MAAM;gBACN,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;aACtC;YACD,SAAS,EAAE,CAAC,QAAQ,CAAC;YACrB,OAAO;SACR,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;QACpE,KAAK,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACxC,MAAM,QAAQ,GAAG,IAAI,uBAAuB,EAAE,CAAC;YAC/C,OAAO,CAAC,aAAa,GAAG,IAAI,qBAAqB,CAAC;gBAChD,OAAO,EAAE;oBACP,MAAM,EAAE,IAAI,CAAC,KAAK;oBAClB,MAAM;oBACN,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;iBACtC;gBACD,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,OAAO;aACR,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QAExB,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAM,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QACnE,SAAS,CAAC,IAAI,EAAE,CAAC;QACjB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC;YAClC,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE;oBACzB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;iBAChE;qBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;oBACnC,IAAI,CAAC,KAAsB,CAAC,QAAQ,GAAG,IAAI,CAAC;iBAC9C;YACH,CAAC;YACD,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAClC,OAAO,CAAC,OAAO,CACb,WAAW,EACX,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,eAAe,CAAC,CACpD,CAAC;QACF,OAAO,CAAC,OAAO,CACb,SAAS,EACT,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAClD,CAAC;QACF,+EAA+E;QAC/E,OAAO,CAAC,OAAO,CACb,QAAQ,EACR,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,eAAe,CAAC,CACrD,CAAC;QAEF,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE;YACxB,IAAI,CAAC,KAAkB,CAAC,eAAe,GAAG,KAAK,CAAC;SAClD;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEtB,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;QAExB,IAAI,UAAU,EAAE,WAAW,KAAK,KAAK,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAElC,IAAI,UAAU,EAAE,WAAW,KAAK,KAAK,EAAE;YACrC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;SACjC;QACD,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,OAAO,GAAG,GAAG,EAAE;QACb,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE;YACzB,QAAQ,CAAC,OAAO,CAAE,IAAI,CAAC,KAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;SAClE;aAAM,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE;YACnC,IAAI,CAAC,KAAsB,CAAC,QAAQ,GAAG,IAAI,CAAC;SAC9C;IACH,CAAC,CAAC;CACH;AAYD,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"CellAdapter.js","sourceRoot":"","sources":["../../../src/components/cell/CellAdapter.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { CommandRegistry } from '@lumino/commands';
2
2
  import { CompletionHandler } from '@jupyterlab/completer';
3
3
  import { CodeCell, MarkdownCell, RawCell } from '@jupyterlab/cells';
4
- import { SessionContext } from '@jupyterlab/apputils';
5
- export declare const CellCommands: (commandRegistry: CommandRegistry, cell: CodeCell | MarkdownCell | RawCell, sessionContext: SessionContext, completerHandler: CompletionHandler) => void;
4
+ import CellAdapter from './CellAdapter';
5
+ export declare const CellCommands: (commandRegistry: CommandRegistry, cell: CodeCell | MarkdownCell | RawCell, completerHandler: CompletionHandler, cellAdapter: CellAdapter) => void;
6
6
  export default CellCommands;
@@ -8,7 +8,7 @@ const cmdIds = {
8
8
  invoke: 'completer:invoke',
9
9
  select: 'completer:select',
10
10
  };
11
- export const CellCommands = (commandRegistry, cell, sessionContext, completerHandler) => {
11
+ export const CellCommands = (commandRegistry, cell, completerHandler, cellAdapter) => {
12
12
  commandRegistry.addCommand(cmdIds.invoke, {
13
13
  label: 'Completer: Invoke',
14
14
  execute: () => completerHandler.invoke(),
@@ -20,7 +20,7 @@ export const CellCommands = (commandRegistry, cell, sessionContext, completerHan
20
20
  commandRegistry.addCommand('run:cell', {
21
21
  execute: () => {
22
22
  if (cell instanceof CodeCell) {
23
- CodeCell.execute(cell, sessionContext);
23
+ cellAdapter.execute();
24
24
  }
25
25
  else if (cell instanceof MarkdownCell) {
26
26
  cell.rendered = true;
@@ -1 +1 @@
1
- {"version":3,"file":"CellCommands.js","sourceRoot":"","sources":["../../../src/components/cell/CellCommands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAW,MAAM,mBAAmB,CAAC;AAGpE,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;CAC3B,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,eAAgC,EAChC,IAAuC,EACvC,cAA8B,EAC9B,gBAAmC,EAC7B,EAAE;IACR,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE;KACzC,CAAC,CAAC;IACH,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,EAAE;KACzD,CAAC,CAAC;IACH,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE;QACrC,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,IAAI,YAAY,QAAQ,EAAE;gBAC5B,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;aACvC;iBAAM,IAAI,IAAI,YAAY,YAAY,EAAE;gBACtC,IAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC;aACxC;QACH,CAAC;KACF,CAAC,CAAC;IACH,eAAe,CAAC,aAAa,CAAC;QAC5B,QAAQ,EAAE,+CAA+C;QACzD,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,OAAO,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,eAAe,CAAC,aAAa,CAAC;QAC5B,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,CAAC,aAAa,CAAC;QACrB,OAAO,EAAE,UAAU;KACpB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG;QACf;YACE,QAAQ,EAAE,8CAA8C;YACxD,IAAI,EAAE,CAAC,OAAO,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,MAAM;SACvB;KACF,CAAC;IACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"CellCommands.js","sourceRoot":"","sources":["../../../src/components/cell/CellCommands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAW,MAAM,mBAAmB,CAAC;AAGpE,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;CAC3B,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,eAAgC,EAChC,IAAuC,EACvC,gBAAmC,EACnC,WAAwB,EAClB,EAAE;IACR,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE;KACzC,CAAC,CAAC;IACH,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,YAAY,EAAE;KACzD,CAAC,CAAC;IACH,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE;QACrC,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,IAAI,YAAY,QAAQ,EAAE;gBAC5B,WAAW,CAAC,OAAO,EAAE,CAAC;aACvB;iBAAM,IAAI,IAAI,YAAY,YAAY,EAAE;gBACtC,IAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC;aACxC;QACH,CAAC;KACF,CAAC,CAAC;IACH,eAAe,CAAC,aAAa,CAAC;QAC5B,QAAQ,EAAE,+CAA+C;QACzD,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,OAAO,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,eAAe,CAAC,aAAa,CAAC;QAC5B,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,CAAC,aAAa,CAAC;QACrB,OAAO,EAAE,UAAU;KACpB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG;QACf;YACE,QAAQ,EAAE,8CAA8C;YACxD,IAAI,EAAE,CAAC,OAAO,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,MAAM;SACvB;KACF,CAAC;IACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -1,27 +1,34 @@
1
- import CellAdapter from './CellAdapter';
1
+ import { CellAdapter } from './CellAdapter';
2
2
  export interface ICellState {
3
3
  source?: string;
4
4
  outputsCount?: number;
5
5
  adapter?: CellAdapter;
6
6
  isKernelSessionAvailable?: boolean;
7
+ isExecuting?: boolean;
7
8
  }
8
9
  export interface ICellsState {
9
10
  cells: Map<string, ICellState>;
10
11
  areAllKernelSessionsReady: boolean;
12
+ isAnyCellExecuting: boolean;
11
13
  }
12
- export type CellState = ICellsState & {
14
+ export type CellsState = ICellsState & {
13
15
  setCells: (cells: Map<string, ICellState>) => void;
14
16
  setSource: (id: string, source: string) => void;
15
17
  setOutputsCount: (id: string, outputsCount: number) => void;
16
- setIsKernelSessionAvailable: (id: string, kernelAvailable: boolean) => void;
18
+ setKernelSessionAvailable: (id: string, kernelAvailable: boolean) => void;
17
19
  setAdapter: (id: string, adapter?: CellAdapter) => void;
18
20
  getAdapter: (id: string) => CellAdapter | undefined;
19
21
  getSource: (id: string) => string | undefined;
20
22
  getOutputsCount: (id: string) => number | undefined;
21
- getIsKernelSessionAvailable: (id: string) => boolean | undefined;
23
+ isKernelSessionAvailable: (id: string) => boolean | undefined;
22
24
  execute: (id?: string) => void;
25
+ setIsExecuting: (id: string, isExecuting: boolean) => void;
23
26
  };
24
- export declare const cellStore: import("zustand").StoreApi<CellState>;
25
- export declare function useCellStore(): CellState;
26
- export declare function useCellStore<T>(selector: (state: CellState) => T): T;
27
- export default useCellStore;
27
+ /**
28
+ * Check if any cell is currently executing
29
+ */
30
+ export declare const isAnyCellRunning: (cells: Map<string, ICellState>) => boolean;
31
+ export declare const cellsStore: import("zustand").StoreApi<CellsState>;
32
+ export declare function useCellsStore(): CellsState;
33
+ export declare function useCellsStore<T>(selector: (state: CellsState) => T): T;
34
+ export default useCellsStore;
@@ -16,13 +16,24 @@ const areAllKernelSessionsAvailable = (cells) => {
16
16
  }
17
17
  return true;
18
18
  };
19
- export const cellStore = createStore((set, get) => ({
19
+ /**
20
+ * Check if any cell is currently executing
21
+ */
22
+ export const isAnyCellRunning = (cells) => {
23
+ for (const cell of cells.values()) {
24
+ if (cell.isExecuting) {
25
+ return true;
26
+ }
27
+ }
28
+ return false;
29
+ };
30
+ export const cellsStore = createStore((set, get) => ({
20
31
  cells: new Map(),
21
32
  source: '',
22
33
  outputsCount: 0,
23
- isKernelSessionAvailable: false,
24
- areAllKernelSessionsReady: false,
25
34
  adapter: undefined,
35
+ areAllKernelSessionsReady: false,
36
+ isAnyCellExecuting: false,
26
37
  setCells: (cells) => set((cell) => ({ cells })),
27
38
  setSource: (id, source) => {
28
39
  const cells = get().cells;
@@ -46,7 +57,7 @@ export const cellStore = createStore((set, get) => ({
46
57
  }
47
58
  set((state) => ({ cells }));
48
59
  },
49
- setIsKernelSessionAvailable: (id, isKernelSessionAvailable) => {
60
+ setKernelSessionAvailable: (id, isKernelSessionAvailable) => {
50
61
  const cells = get().cells;
51
62
  const cell = cells.get(id);
52
63
  if (cell) {
@@ -78,7 +89,7 @@ export const cellStore = createStore((set, get) => ({
78
89
  getOutputsCount: (id) => {
79
90
  return get().cells.get(id)?.outputsCount;
80
91
  },
81
- getIsKernelSessionAvailable: (id) => {
92
+ isKernelSessionAvailable: (id) => {
82
93
  return get().cells.get(id)?.isKernelSessionAvailable;
83
94
  },
84
95
  execute: (id) => {
@@ -91,9 +102,23 @@ export const cellStore = createStore((set, get) => ({
91
102
  get().cells.forEach((cell) => cell.adapter?.execute());
92
103
  }
93
104
  },
105
+ setIsExecuting: (id, isExecuting) => {
106
+ const cells = get().cells;
107
+ const cell = cells.get(id);
108
+ if (cell) {
109
+ cell.isExecuting = isExecuting;
110
+ }
111
+ else {
112
+ get().cells.forEach((cell) => cell.adapter?.execute());
113
+ cells.set(id, { isExecuting });
114
+ }
115
+ // Also update isAnyCellRunning state (for all cells)
116
+ const isAnyCellExecuting = isAnyCellRunning(cells);
117
+ set((state) => ({ cells, isAnyCellExecuting }));
118
+ },
94
119
  }));
95
- export function useCellStore(selector) {
96
- return useStore(cellStore, selector);
120
+ export function useCellsStore(selector) {
121
+ return useStore(cellsStore, selector);
97
122
  }
98
- export default useCellStore;
123
+ export default useCellsStore;
99
124
  //# sourceMappingURL=CellState.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CellState.js","sourceRoot":"","sources":["../../../src/components/cell/CellState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CellState.js","sourceRoot":"","sources":["../../../src/components/cell/CellState.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiCnC;;GAEG;AACH,MAAM,6BAA6B,GAAG,CAAC,KAA8B,EAAW,EAAE;IAChF,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;QACjC,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;YAClC,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAA8B,EAAW,EAAE;IAC1E,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;QACjC,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,CAAa,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC/D,KAAK,EAAE,IAAI,GAAG,EAAsB;IACpC,MAAM,EAAE,EAAE;IACV,YAAY,EAAE,CAAC;IACf,OAAO,EAAE,SAAS;IAClB,yBAAyB,EAAE,KAAK;IAChC,kBAAkB,EAAE,KAAK;IACzB,QAAQ,EAAE,CAAC,KAA8B,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACpF,SAAS,EAAE,CAAC,EAAU,EAAE,MAAc,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3B;QACD,GAAG,CAAC,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACxC,CAAC;IACD,eAAe,EAAE,CAAC,EAAU,EAAE,YAAoB,EAAE,EAAE;QACpD,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;SAClC;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;SACjC;QACD,GAAG,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,yBAAyB,EAAE,CAAC,EAAU,EAAE,wBAAiC,EAAE,EAAE;QAC3E,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;SAC1D;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAC,wBAAwB,EAAC,CAAC,CAAC;SAC3C;QACD,MAAM,yBAAyB,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;QACvE,GAAG,CAAC,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,UAAU,EAAE,CAAC,EAAU,EAAE,OAAqB,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;SACxB;aAAM;YACL,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;SAC5B;QACD,GAAG,CAAC,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACxC,CAAC;IACD,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE;QACzB,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC;IACtC,CAAC;IACD,SAAS,EAAE,CAAC,EAAU,EAAsB,EAAE;QAC5C,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrC,CAAC;IACD,eAAe,EAAE,CAAC,EAAU,EAAsB,EAAE;QAClD,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC;IAC3C,CAAC;IACD,wBAAwB,EAAE,CAAC,EAAU,EAAuB,EAAE;QAC5D,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,wBAAwB,CAAC;IACvD,CAAC;IACD,OAAO,EAAE,CAAC,EAAU,EAAE,EAAE;QACtB,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;SACzB;aAAM;YACL,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;IACD,cAAc,EAAE,CAAC,EAAU,EAAE,WAAoB,EAAE,EAAE;QACnD,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;SAChC;aAAM;YACL,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;YACtD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;SAChC;QAED,qDAAqD;QACrD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnD,GAAG,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF,CAAC,CAAC,CAAC;AAIJ,MAAM,UAAU,aAAa,CAAI,QAAmC;IAClE,OAAO,QAAQ,CAAC,UAAU,EAAE,QAAS,CAAC,CAAC;AACzC,CAAC;AAED,eAAe,aAAa,CAAC"}
@@ -6,18 +6,18 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
6
6
  */
7
7
  import { useState, useRef, useEffect } from 'react';
8
8
  import { basicSetup } from 'codemirror';
9
- import { EditorState, Compartment } from '@codemirror/state';
9
+ import { EditorState } from '@codemirror/state';
10
+ // import { Compartment } from '@codemirror/state';
10
11
  import { keymap, EditorView } from '@codemirror/view';
11
- import { python } from '@codemirror/lang-python';
12
12
  import codeMirrorTheme from './CodeMirrorTheme';
13
13
  import CodeMirrorOutputToolbar from './CodeMirrorOutputToolbar';
14
- import useOutputStore from '../output/OutputState';
14
+ import useOutputsStore from '../output/OutputState';
15
15
  export const CodeMirrorEditor = (props) => {
16
16
  const { code, codePre, outputAdapter, autoRun, disableRun, sourceId, toolbarPosition, insertText, kernel, } = props;
17
- const outputStore = useOutputStore();
17
+ const outputStore = useOutputsStore();
18
18
  const [view, setView] = useState();
19
19
  const dataset = outputStore.getDataset(sourceId);
20
- const source = outputStore.getSource(sourceId);
20
+ const source = outputStore.getInput(sourceId);
21
21
  const editorDiv = useRef();
22
22
  const setEditorSource = (source) => {
23
23
  if (view && source) {
@@ -54,11 +54,8 @@ export const CodeMirrorEditor = (props) => {
54
54
  return true;
55
55
  };
56
56
  useEffect(() => {
57
- outputStore.setSource({
58
- sourceId,
59
- source: code,
60
- });
61
- const language = new Compartment();
57
+ outputStore.setInput(sourceId, code);
58
+ // const language = new Compartment();
62
59
  const keyBinding = [
63
60
  {
64
61
  key: 'Shift-Enter',
@@ -70,17 +67,14 @@ export const CodeMirrorEditor = (props) => {
70
67
  doc: code,
71
68
  extensions: [
72
69
  basicSetup,
73
- language.of(python()),
70
+ // language.of(python()), // TODO CodeMirrorEditor imported by Output breaks the JupyterLab extension loading. https://github.com/datalayer/jupyter-ui/issues/170
74
71
  EditorView.lineWrapping,
75
72
  keymap.of([...keyBinding]),
76
73
  codeMirrorTheme,
77
74
  EditorView.updateListener.of((viewUpdate) => {
78
75
  if (viewUpdate.docChanged) {
79
76
  const source = viewUpdate.state.doc.toString();
80
- outputStore.setSource({
81
- sourceId,
82
- source,
83
- });
77
+ outputStore.setInput(sourceId, source);
84
78
  }
85
79
  }),
86
80
  ],
@@ -98,10 +92,10 @@ export const CodeMirrorEditor = (props) => {
98
92
  };
99
93
  }, [code]);
100
94
  useEffect(() => {
101
- doInsertText(dataset?.dataset);
95
+ doInsertText(dataset);
102
96
  }, [dataset]);
103
97
  useEffect(() => {
104
- setEditorSource(source?.source);
98
+ setEditorSource(source);
105
99
  }, [source]);
106
100
  return (_jsxs(_Fragment, { children: [kernel && toolbarPosition === 'up' && (_jsx(CodeMirrorOutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode })), _jsx("div", { ref: editorDiv }), kernel && toolbarPosition === 'middle' && (_jsx(CodeMirrorOutputToolbar, { editorView: view, codePre: codePre, kernel: kernel, outputAdapter: outputAdapter, executeCode: executeCode }))] }));
107
101
  };
@@ -1 +1 @@
1
- {"version":3,"file":"CodeMirrorEditor.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorEditor.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CodeMirrorEditor.js","sourceRoot":"","sources":["../../../src/components/codemirror/CodeMirrorEditor.tsx"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  import { ReactElement } from 'react';
2
- import { IKernelConnection } from '@jupyterlab/services/lib/kernel/kernel';
2
+ import { KernelMessage } from '@jupyterlab/services';
3
+ import { ConnectionStatus, IKernelConnection } from '@jupyterlab/services/lib/kernel/kernel';
3
4
  import { Environment } from '../environment/Environment';
4
- type KernelState = 'connecting' | 'connected-unknown' | 'connected-starting' | 'connected-idle' | 'connected-busy' | 'connected-terminating' | 'connected-restarting' | 'connected-autorestarting' | 'connected-dead' | 'disconnecting' | 'undefined';
5
+ export type ExecutionState = 'connecting' | 'connected-unknown' | 'connected-starting' | 'connected-idle' | 'connected-busy' | 'connected-terminating' | 'connected-restarting' | 'connected-autorestarting' | 'connected-dead' | 'disconnecting' | 'undefined';
5
6
  /**
6
7
  * The valid kernel connection states.
7
8
  *
@@ -20,10 +21,11 @@ type KernelState = 'connecting' | 'connected-unknown' | 'connected-starting' | '
20
21
  *
21
22
  * Status = 'unknown' | 'starting' | 'idle' | 'busy' | 'terminating' | 'restarting' | 'autorestarting' | 'dead';
22
23
  */
23
- export declare const KERNEL_STATES: Map<KernelState, ReactElement>;
24
- type Props = {
24
+ export declare const KERNEL_STATES: Map<ExecutionState, ReactElement>;
25
+ export declare const toKernelState: (connectionStatus: ConnectionStatus, status: KernelMessage.Status) => ExecutionState;
26
+ type KernelIndicatorProps = {
25
27
  kernel?: IKernelConnection | null;
26
28
  env?: Environment;
27
29
  };
28
- export declare const KernelIndicator: (props: Props) => import("react/jsx-runtime").JSX.Element;
30
+ export declare const KernelIndicator: (props: KernelIndicatorProps) => import("react/jsx-runtime").JSX.Element;
29
31
  export default KernelIndicator;