jupyterlab-ipyflow 0.0.159 → 0.0.160

package/lib/index.js

@@ -9,8 +9,9 @@ const readyMakingClass = 'ready-making-cell';
 const readyMakingInputClass = 'ready-making-input-cell';
 const linkedWaitingClass = 'linked-waiting';
 const linkedReadyMakerClass = 'linked-ready-maker';
+const cleanup = new Event('cleanup');
 // ipyflow frontend state
-const dirtyCells = new Set();
+let dirtyCells = new Set();
 let waitingCells = new Set();
 let readyCells = new Set();
 let waiterLinks = {};
@@ -28,7 +29,26 @@ let lastExecutionHighlights = null;
 let executedReactiveReadyCells = new Set();
 let newReadyCells = new Set();
 let forcedReactiveCells = new Set();
-const cleanup = new Event('cleanup');
+function resetState() {
+    dirtyCells = new Set();
+    waitingCells = new Set();
+    readyCells = new Set();
+    waiterLinks = {};
+    readyMakerLinks = {};
+    activeCell = null;
+    activeCellId = null;
+    cellsById = {};
+    cellModelsById = {};
+    orderIdxById = {};
+    cellPendingExecution = null;
+    lastExecutionMode = null;
+    isReactivelyExecuting = false;
+    isAltModeExecuting = false;
+    lastExecutionHighlights = null;
+    executedReactiveReadyCells = new Set();
+    newReadyCells = new Set();
+    forcedReactiveCells = new Set();
+}
 /**
  * Initialization data for the jupyterlab-ipyflow extension.
  */
@@ -43,20 +63,27 @@ const extension = {
             isVisible: () => true,
             isToggled: () => false,
             execute: () => {
-                if (!isAltModeExecuting && notebooks.activeCell.model.type === 'code') {
+                const session = notebooks.currentWidget.sessionContext;
+                if (!session.isReady) {
+                    return;
+                }
+                if (session.session.kernel.name !== IPYFLOW_KERNEL_NAME) {
+                    app.commands.execute('notebook:enter-command-mode');
+                    CodeCell.execute(notebooks.activeCell, session);
+                }
+                else if (!isAltModeExecuting &&
+                    notebooks.activeCell.model.type === 'code') {
                     isAltModeExecuting = true;
-                    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.execute('notebook:enter-command-mode');
+                    session.session.kernel
+                        .requestExecute({
+                        code: '%flow toggle-reactivity-until-next-reset',
+                        silent: true,
+                        store_history: false,
+                    })
+                        .done.then(() => {
+                        CodeCell.execute(notebooks.activeCell, session);
+                    });
                 }
             },
         });
@@ -75,45 +102,45 @@ const extension = {
             category: 'execution',
             args: {},
         });
+        app.commands.addCommand('alt-execute', {
+            label: 'Alt Execute',
+            isEnabled: () => true,
+            isVisible: () => true,
+            isToggled: () => false,
+            execute: () => {
+                const session = notebooks.currentWidget.sessionContext;
+                if (session.isReady) {
+                    app.commands.execute('notebook:enter-command-mode');
+                    CodeCell.execute(notebooks.activeCell, session);
+                }
+            },
+        });
+        app.commands.addKeyBinding({
+            command: 'alt-execute',
+            keys: ['Accel Enter'],
+            selector: '.jp-Notebook',
+        });
         notebooks.widgetAdded.connect((sender, nbPanel) => {
             const session = nbPanel.sessionContext;
             session.ready.then(() => {
                 clearCellState(nbPanel.content);
-                activeCell = nbPanel.content.activeCell;
-                activeCellId = nbPanel.content.activeCell.model.id;
-                let commDisconnectHandler = function () {
-                    // do nothing if not connected.
-                };
+                let commDisconnectHandler = resetState;
                 if (session.session.kernel.name === IPYFLOW_KERNEL_NAME) {
-                    commDisconnectHandler = connectToComm(session, nbPanel.content);
+                    session.ready.then(() => {
+                        commDisconnectHandler = connectToComm(session, nbPanel.content);
+                    });
                 }
                 session.kernelChanged.connect((_, args) => {
+                    if (args.newValue == null) {
+                        return;
+                    }
+                    resetState();
                     clearCellState(nbPanel.content);
                     commDisconnectHandler();
-                    commDisconnectHandler = function () {
-                        // do nothing if not connected.
-                    };
-                    if (args.newValue !== null &&
-                        args.newValue.name === IPYFLOW_KERNEL_NAME) {
-                        commDisconnectHandler = connectToComm(session, nbPanel.content);
-                    }
-                });
-                let shouldReconnect = false;
-                session.statusChanged.connect((session, status) => {
-                    if (status === 'restarting' || status === 'autorestarting') {
-                        shouldReconnect = true;
-                    }
-                    if ((status === 'idle' || status === 'busy') && shouldReconnect) {
-                        shouldReconnect = false;
+                    commDisconnectHandler = resetState;
+                    if (args.newValue.name === IPYFLOW_KERNEL_NAME) {
                         session.ready.then(() => {
-                            clearCellState(nbPanel.content);
-                            commDisconnectHandler();
-                            commDisconnectHandler = function () {
-                                // do nothing if not connected.
-                            };
-                            if (session.session.kernel.name === IPYFLOW_KERNEL_NAME) {
-                                commDisconnectHandler = connectToComm(session, nbPanel.content);
-                            }
+                            commDisconnectHandler = connectToComm(session, nbPanel.content);
                         });
                     }
                 });
@@ -175,7 +202,7 @@ const refreshNodeMapping = (notebook) => {
     });
 };
 const clearCellState = (notebook) => {
-    notebook.widgets.forEach((cell, idx) => {
+    notebook.widgets.forEach((cell) => {
         cell.node.classList.remove(waitingClass);
         cell.node.classList.remove(readyMakingClass);
         cell.node.classList.remove(readyClass);
@@ -216,6 +243,9 @@ const addUnsafeCellInteraction = (elem, linkedElems, cellsById, collapserFun, ev
     attachCleanupListener(elem, evt, listener);
 };
 const connectToComm = (session, notebook) => {
+    resetState();
+    activeCell = notebook.activeCell;
+    activeCellId = activeCell.model.id;
     const comm = session.session.kernel.createComm('ipyflow');
     let disconnected = false;
     const gatherCellMetadataAndContent = () => {
@@ -255,7 +285,7 @@ const connectToComm = (session, notebook) => {
         if (args.name !== 'executionCount' || args.newValue === null) {
             return;
         }
-        notebook.widgets.forEach((itercell, idx) => {
+        notebook.widgets.forEach((itercell) => {
             if (itercell.model.id === cell.id) {
                 itercell.node.classList.remove(readyClass);
                 itercell.node.classList.remove(readyMakingInputClass);
@@ -475,6 +505,7 @@ const connectToComm = (session, notebook) => {
     // return a disconnection handle
     return () => {
         disconnected = true;
+        resetState();
     };
 };
 export default extension;

package/package.json

@@ -67,5 +67,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.159"
-}
+  "version": "0.0.160"
+}