jupyterlab-ipyflow 0.0.150 → 0.0.152

package/lib/index.js

@@ -1,14 +1,70 @@
+import { ICommandPalette } from '@jupyterlab/apputils';
 import { CodeCell } from '@jupyterlab/cells';
 import { INotebookTracker } from '@jupyterlab/notebook';
 const IPYFLOW_KERNEL_NAME = 'ipyflow';
+const waitingClass = 'waiting-cell';
+const readyClass = 'ready-cell';
+const readyMakingClass = 'ready-making-cell';
+const readyMakingInputClass = 'ready-making-input-cell';
+const linkedWaitingClass = 'linked-waiting';
+const linkedReadyMakerClass = 'linked-ready-maker';
+// ipyflow frontend state
+let dirtyCells = new Set();
+let waitingCells = new Set();
+let readyCells = new Set();
+let waiterLinks = {};
+let readyMakerLinks = {};
+let activeCell = null;
+let activeCellId = null;
+let cellsById = {};
+let cellModelsById = {};
+let orderIdxById = {};
+let cellPendingExecution = null;
+let lastExecutionMode = null;
+let isReactivelyExecuting = false;
+let lastExecutionHighlights = null;
+let executedReactiveReadyCells = new Set();
+let newReadyCells = new Set();
+let forcedReactiveCells = new Set();
+const cleanup = new Event('cleanup');
 /**
  * Initialization data for the jupyterlab-ipyflow extension.
  */
 const extension = {
     id: 'jupyterlab-ipyflow',
-    requires: [INotebookTracker],
+    requires: [INotebookTracker, ICommandPalette],
     autoStart: true,
-    activate: (app, notebooks) => {
+    activate: (app, notebooks, palette) => {
+        app.commands.addCommand('alt-mode-execute', {
+            label: 'Alt Mode Execute',
+            isEnabled: () => true,
+            isVisible: () => true,
+            isToggled: () => false,
+            execute: () => {
+                if (notebooks.activeCell.model.type === 'code') {
+                    const session = notebooks.currentWidget.sessionContext;
+                    if (session.isReady && notebooks.activeCell.model.type === 'code') {
+                        session.session.kernel.requestExecute({
+                            code: '%flow toggle-reactivity-until-next-reset',
+                            silent: true,
+                            store_history: false,
+                        }).done.then(() => {
+                            CodeCell.execute(notebooks.activeCell, session);
+                        });
+                    }
+                }
+            }
+        });
+        app.commands.addKeyBinding({
+            command: 'alt-mode-execute',
+            keys: ['Accel Shift Enter'],
+            selector: '.jp-Notebook',
+        });
+        palette.addItem({
+            command: 'alt-mode-execute',
+            category: 'execution',
+            args: {},
+        });
         notebooks.widgetAdded.connect((sender, nbPanel) => {
             const session = nbPanel.sessionContext;
             session.ready.then(() => {
@@ -48,35 +104,6 @@ const extension = {
         });
     }
 };
-const waitingClass = 'waiting-cell';
-const readyClass = 'ready-cell';
-const readyMakingClass = 'ready-making-cell';
-const readyMakingInputClass = 'ready-making-input-cell';
-const linkedWaitingClass = 'linked-waiting';
-const linkedReadyMakerClass = 'linked-ready-maker';
-let dirtyCells = new Set();
-let waitingCells = new Set();
-let readyCells = new Set();
-let waiterLinks = {};
-let readyMakerLinks = {};
-let activeCell = null;
-let activeCellId = null;
-let cellsById = {};
-let cellModelsById = {};
-let orderIdxById = {};
-let cellPendingExecution = null;
-let lastExecutionMode = null;
-let isReactivelyExecuting = false;
-let lastExecutionHighlights = null;
-let executedReactiveReadyCells = new Set();
-let newReadyCells = new Set();
-let forcedReactiveCells = new Set();
-const cleanup = new Event('cleanup');
-const resetReactiveState = () => {
-    newReadyCells = new Set();
-    forcedReactiveCells = new Set();
-    executedReactiveReadyCells = new Set();
-};
 const getJpInputCollapser = (elem) => {
     if (elem === null || elem === undefined) {
         return null;
@@ -322,8 +349,14 @@ const connectToComm = (session, notebook) => {
         else if (msg.content.data['type'] === 'compute_exec_schedule') {
             waitingCells = new Set(msg.content.data['waiting_cells']);
             readyCells = new Set(msg.content.data['ready_cells']);
-            newReadyCells = new Set([...newReadyCells, ...msg.content.data['new_ready_cells']]);
-            forcedReactiveCells = new Set([...forcedReactiveCells, ...msg.content.data['forced_reactive_cells']]);
+            newReadyCells = new Set([
+                ...newReadyCells,
+                ...msg.content.data['new_ready_cells'],
+            ]);
+            forcedReactiveCells = new Set([
+                ...forcedReactiveCells,
+                ...msg.content.data['forced_reactive_cells'],
+            ]);
             waiterLinks = msg.content.data['waiter_links'];
             readyMakerLinks = msg.content.data['ready_maker_links'];
             cellPendingExecution = null;
@@ -332,17 +365,19 @@ const connectToComm = (session, notebook) => {
             const exec_schedule = msg.content.data['exec_schedule'];
             lastExecutionMode = exec_mode;
             lastExecutionHighlights = msg.content.data['highlights'];
-            executedReactiveReadyCells.add(msg.content.data['last_executed_cell_id']);
+            const lastExecutedCellId = msg.content.data['last_executed_cell_id'];
+            executedReactiveReadyCells.add(lastExecutedCellId);
             const last_execution_was_error = msg.content.data['last_execution_was_error'];
             if (!last_execution_was_error) {
                 for (const cell of notebook.widgets) {
                     if (cell.model.type !== 'code' || executedReactiveReadyCells.has(cell.model.id)) {
                         continue;
                     }
-                    if (!forcedReactiveCells.has(cell.model.id)) {
-                        if (exec_mode !== 'reactive' || !newReadyCells.has(cell.model.id)) {
-                            continue;
-                        }
+                    if (!newReadyCells.has(cell.model.id)) {
+                        continue;
+                    }
+                    if (!forcedReactiveCells.has(cell.model.id) && exec_mode !== 'reactive') {
+                        continue;
                     }
                     const codeCell = cell;
                     if (cellPendingExecution === null) {
@@ -362,22 +397,18 @@ const connectToComm = (session, notebook) => {
                 }
             }
             if (cellPendingExecution === null) {
-                if (lastExecutionMode === 'reactive') {
+                if (isReactivelyExecuting) {
                     if (lastExecutionHighlights === 'reactive') {
                         readyCells = executedReactiveReadyCells;
                     }
-                    updateUI(notebook);
-                    resetReactiveState();
-                }
-                else {
-                    resetReactiveState();
-                    updateUI(notebook);
-                }
-                if (isReactivelyExecuting) {
                     comm.send({
                         type: 'reactivity_cleanup',
                     });
                 }
+                forcedReactiveCells = new Set();
+                newReadyCells = new Set();
+                executedReactiveReadyCells = new Set();
+                updateUI(notebook);
                 isReactivelyExecuting = false;
             }
             else {

package/package.json

@@ -63,5 +63,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.150"
+  "version": "0.0.152"
 }