jupyterlab-ipyflow 0.0.190 → 0.0.192

package/lib/index.js

@@ -8,9 +8,9 @@ const readyMakingClass = 'ready-making-cell';
 const readyMakingInputClass = 'ready-making-input-cell';
 const linkedWaitingClass = 'linked-waiting';
 const linkedReadyMakerClass = 'linked-ready-maker';
-const selfSliceClass = 'ipyflow-slice-self';
-const directSliceClass = 'ipyflow-slice-direct';
 const sliceClass = 'ipyflow-slice';
+const executeSliceClass = 'ipyflow-slice-execute';
+const classicColorsClass = 'ipyflow-classic-colors';
 const cleanup = new Event('cleanup');
 // ipyflow frontend state
 class IpyflowSessionState {
@@ -82,7 +82,8 @@ class IpyflowSessionState {
                     this.executedCells.add(cell.model.id);
                 }
                 if (++numFinished === cells.length) {
-                    this.requestComputeExecSchedule();
+                    // wait a tick first to allow the disk changes to propagate up
+                    setTimeout(() => this.requestComputeExecSchedule(), 0);
                 }
             });
         }
@@ -108,24 +109,26 @@ class IpyflowSessionState {
             store_history: false,
         });
     }
-    computeTransitiveClosureHelper(closure, cellId, edges, onlyIncludeCellsNeedingRefresh = false, skipFirstCheck = false) {
-        if (!skipFirstCheck) {
-            if (closure.has(cellId)) {
-                return;
-            }
-            if (onlyIncludeCellsNeedingRefresh &&
-                this.executedCells.has(cellId) &&
-                !this.waitingCells.has(cellId) &&
-                !this.readyCells.has(cellId)) {
-                return;
-            }
+    computeTransitiveClosureHelper(closure, cellId, edges, addCellsNeedingRefresh = false, skipFirstCheck = false) {
+        if (!skipFirstCheck && closure.has(cellId)) {
+            return;
+        }
+        if (!addCellsNeedingRefresh) {
+            closure.add(cellId);
         }
-        closure.add(cellId);
-        const children = edges[cellId];
+        const children = edges === null || edges === void 0 ? void 0 : edges[cellId];
         if (children === undefined) {
             return;
         }
-        children.forEach((child) => this.computeTransitiveClosureHelper(closure, child, edges, onlyIncludeCellsNeedingRefresh));
+        const prevClosureSize = closure.size;
+        children.forEach((child) => this.computeTransitiveClosureHelper(closure, child, edges, addCellsNeedingRefresh));
+        if (addCellsNeedingRefresh &&
+            (closure.size > prevClosureSize ||
+                !this.executedCells.has(cellId) ||
+                this.readyCells.has(cellId) ||
+                this.waitingCells.has(cellId))) {
+            closure.add(cellId);
+        }
     }
     computeTransitiveClosure(cellIds, inclusive = true, parents = false) {
         const closure = new Set();
@@ -141,18 +144,19 @@ class IpyflowSessionState {
             for (const cellId of closure) {
                 this.computeTransitiveClosureHelper(closure, cellId, this.cellParents, true, true);
             }
-            if (this.settings.flow_order === 'in_order') {
-                const minSeedPosition = Math.min(...cellIds.map((id) => this.orderIdxById[id]));
-                for (const cellId of Array.from(closure)) {
-                    const pos = this.orderIdxById[cellId];
-                    if (pos === undefined) {
-                        closure.delete(cellId);
-                    }
-                    else if (pos < minSeedPosition) {
-                        closure.delete(cellId);
-                    }
-                }
-            }
+            // if (this.settings.flow_order === 'in_order') {
+            //   const minSeedPosition = Math.min(
+            //     ...cellIds.map((id) => this.orderIdxById[id])
+            //   );
+            //   for (const cellId of Array.from(closure)) {
+            //     const pos = this.orderIdxById[cellId];
+            //     if (pos === undefined) {
+            //       closure.delete(cellId);
+            //     } else if (pos < minSeedPosition) {
+            //       closure.delete(cellId);
+            //     }
+            //   }
+            // }
         }
         if (!inclusive) {
             for (const cellId of cellIds) {
@@ -323,20 +327,52 @@ const extension = {
             keys: ['Accel ArrowUp'],
             selector: '.jp-Notebook',
         });
-        const executeRemaining = () => {
-            var _a, _b;
+        let runCellCommand;
+        try {
+            runCellCommand = app.commands._commands.get('notebook:run-cell');
+        }
+        catch (e) {
+            runCellCommand = app.commands._commands['notebook:run-cell'];
+        }
+        const runCellCommandExecute = runCellCommand.execute;
+        const getIpyflowState = () => {
+            var _a;
             const session = notebooks.currentWidget.sessionContext;
             if (!session.isReady) {
-                return;
+                return {};
             }
-            const state = ((_a = ipyflowState[session.session.id]) !== null && _a !== void 0 ? _a : {});
-            if ((_b = state.isIpyflowCommConnected) !== null && _b !== void 0 ? _b : false) {
+            return ((_a = ipyflowState[session.session.id]) !== null && _a !== void 0 ? _a : {});
+        };
+        const isBatchReactive = () => {
+            var _a;
+            const state = getIpyflowState();
+            const settings = state.settings;
+            return (((_a = state.isIpyflowCommConnected) !== null && _a !== void 0 ? _a : false) &&
+                (settings === null || settings === void 0 ? void 0 : settings.exec_mode) === 'reactive' &&
+                (settings === null || settings === void 0 ? void 0 : settings.reactivity_mode) === 'batch');
+        };
+        runCellCommand.execute = (...args) => {
+            if (isBatchReactive() &&
+                getIpyflowState().activeCell.model.type === 'code') {
+                app.commands.execute('notebook:enter-command-mode');
+            }
+            else {
+                runCellCommandExecute.call(runCellCommand, args);
+            }
+        };
+        const executeBatchReactive = (skipFirst = false) => {
+            var _a;
+            const state = getIpyflowState();
+            if ((_a = state.isIpyflowCommConnected) !== null && _a !== void 0 ? _a : false) {
                 let closureCellIds = state.executionScheduledCells;
                 state.executionScheduledCells = [];
                 if (closureCellIds.length === 0) {
                     closureCellIds = [state.activeCell.model.id];
                 }
-                const closure = state.computeTransitiveClosure(closureCellIds, false);
+                let closure = state.computeTransitiveClosure(closureCellIds, true);
+                if (skipFirst) {
+                    closure = closure.splice(1);
+                }
                 if (closure.length > 0) {
                     state.executeCells(closure);
                 }
@@ -346,63 +382,38 @@ const extension = {
             }
         };
         NotebookActions.executionScheduled.connect((_, args) => {
-            var _a, _b, _c;
             const notebook = notebooks === null || notebooks === void 0 ? void 0 : notebooks.currentWidget;
             if ((notebook === null || notebook === void 0 ? void 0 : notebook.content) !== args.notebook) {
                 return;
             }
-            const session = notebook === null || notebook === void 0 ? void 0 : notebook.sessionContext;
-            if (!((_a = session === null || session === void 0 ? void 0 : session.isReady) !== null && _a !== void 0 ? _a : false)) {
-                return;
-            }
-            const state = ((_b = ipyflowState[session.session.id]) !== null && _b !== void 0 ? _b : {});
-            if (!((_c = state.isIpyflowCommConnected) !== null && _c !== void 0 ? _c : false)) {
-                return;
-            }
-            const settings = state.settings;
-            const isBatch = (settings === null || settings === void 0 ? void 0 : settings.reactivity_mode) === 'batch';
-            const isReactive = (settings === null || settings === void 0 ? void 0 : settings.exec_mode) === 'reactive';
-            if (!isBatch || !isReactive) {
+            if (!isBatchReactive()) {
                 return;
             }
             if (args.cell.model.type === 'code') {
+                const state = getIpyflowState();
                 state.executionScheduledCells.push(args.cell.model.id);
             }
         });
         app.commands.commandExecuted.connect((_, args) => {
-            var _a, _b, _c;
-            const notebook = notebooks === null || notebooks === void 0 ? void 0 : notebooks.currentWidget;
-            const session = notebook === null || notebook === void 0 ? void 0 : notebook.sessionContext;
-            if (!((_a = session === null || session === void 0 ? void 0 : session.isReady) !== null && _a !== void 0 ? _a : false)) {
-                return;
-            }
-            const state = ((_b = ipyflowState[session.session.id]) !== null && _b !== void 0 ? _b : {});
-            if (!((_c = state.isIpyflowCommConnected) !== null && _c !== void 0 ? _c : false)) {
-                return;
-            }
-            const settings = state.settings;
-            const isBatch = (settings === null || settings === void 0 ? void 0 : settings.reactivity_mode) === 'batch';
-            const isReactive = (settings === null || settings === void 0 ? void 0 : settings.exec_mode) === 'reactive';
-            if (!isBatch) {
-                return;
-            }
+            var _a;
             if (args.id === 'notebook:run-cell') {
-                if (isReactive) {
-                    executeRemaining();
+                if (isBatchReactive()) {
+                    executeBatchReactive();
                 }
                 else {
-                    state.requestComputeExecSchedule();
+                    (_a = getIpyflowState()) === null || _a === void 0 ? void 0 : _a.requestComputeExecSchedule();
                 }
             }
-            else if (args.id === 'notebook:run-cell-and-select-next') {
+            else if (['notebook:run-cell-and-select-next', 'runmenu:run'].includes(args.id)) {
+                const state = getIpyflowState();
                 const origActiveCell = state.activeCell;
                 try {
                     state.activeCell = state.prevActiveCell;
-                    if (isReactive) {
-                        executeRemaining();
+                    if (isBatchReactive()) {
+                        executeBatchReactive(true);
                     }
                     else {
-                        state.requestComputeExecSchedule();
+                        state === null || state === void 0 ? void 0 : state.requestComputeExecSchedule();
                     }
                 }
                 finally {
@@ -500,12 +511,11 @@ const addWaitingOutputInteractions = (elem, linkedInputClass) => {
 };
 const clearCellState = (notebook) => {
     notebook.widgets.forEach((cell) => {
+        cell.node.classList.remove(classicColorsClass);
         cell.node.classList.remove(waitingClass);
         cell.node.classList.remove(readyMakingClass);
         cell.node.classList.remove(readyClass);
         cell.node.classList.remove(readyMakingInputClass);
-        cell.node.classList.remove(selfSliceClass);
-        cell.node.classList.remove(directSliceClass);
         cell.node.classList.remove(sliceClass);
         // clear any old event listeners
         const inputCollapser = getJpInputCollapser(cell.node);
@@ -543,7 +553,7 @@ const addUnsafeCellInteraction = (elem, linkedElems, cellsById, collapserFun, ev
     attachCleanupListener(elem, evt, listener);
 };
 const connectToComm = (session, notebooks, notebook) => {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     initSessionState(session.session.id);
     const state = ipyflowState[session.session.id];
     state.activeCell = notebook.activeCell;
@@ -674,65 +684,59 @@ const connectToComm = (session, notebooks, notebook) => {
             update: 'remove',
         },
     ];
-    const updateOneCellUI = (id, isSelf, inDirectSlice, inSlice, showCollapserHighlights) => {
-        const model = state.cellsById[id].model;
+    const updateOneCellUI = (cell, inSlice, inExecuteSlice, showCollapserHighlights) => {
+        var _a;
+        const { model, node } = cell;
+        const id = model.id;
         if (model.type !== 'code') {
             return;
         }
-        const codeModel = model;
-        if (codeModel.executionCount == null) {
-            return;
+        if (((_a = state.settings.color_scheme) !== null && _a !== void 0 ? _a : 'normal') === 'classic') {
+            node.classList.add(classicColorsClass);
         }
-        const elem = state.cellsById[id].node;
-        if (isSelf) {
-            elem.classList.add(selfSliceClass);
+        if (inExecuteSlice) {
+            node.classList.add(executeSliceClass);
         }
         else {
-            elem.classList.remove(selfSliceClass);
+            node.classList.remove(executeSliceClass);
         }
-        if (inDirectSlice && !isSelf) {
-            elem.classList.add(directSliceClass);
+        if (inSlice && !inExecuteSlice) {
+            node.classList.add(sliceClass);
         }
         else {
-            elem.classList.remove(directSliceClass);
-        }
-        if (inSlice && !inDirectSlice && !isSelf) {
-            elem.classList.add(sliceClass);
-        }
-        else {
-            elem.classList.remove(sliceClass);
+            node.classList.remove(sliceClass);
         }
         if (!showCollapserHighlights) {
             return;
         }
         if (state.waitingCells.has(id)) {
-            elem.classList.add(waitingClass);
-            elem.classList.add(readyClass);
-            elem.classList.remove(readyMakingInputClass);
-            addWaitingOutputInteractions(elem, linkedWaitingClass);
+            node.classList.add(waitingClass);
+            node.classList.add(readyClass);
+            node.classList.remove(readyMakingInputClass);
+            addWaitingOutputInteractions(node, linkedWaitingClass);
         }
         else if (state.readyCells.has(id)) {
-            elem.classList.add(readyMakingInputClass);
-            elem.classList.add(readyClass);
-            addWaitingOutputInteractions(elem, linkedReadyMakerClass);
+            node.classList.add(readyMakingInputClass);
+            node.classList.add(readyClass);
+            addWaitingOutputInteractions(node, linkedReadyMakerClass);
         }
         if (state.settings.exec_mode === 'reactive') {
             return;
         }
         if (state.waiterLinks[id] !== undefined) {
             actionUpdatePairs.forEach(({ action, update }) => {
-                addUnsafeCellInteraction(getJpInputCollapser(elem), state.waiterLinks[id], state.cellsById, getJpInputCollapser, action, update, state.waitingCells);
-                addUnsafeCellInteraction(getJpOutputCollapser(elem), state.waiterLinks[id], state.cellsById, getJpInputCollapser, action, update, state.waitingCells);
+                addUnsafeCellInteraction(getJpInputCollapser(node), state.waiterLinks[id], state.cellsById, getJpInputCollapser, action, update, state.waitingCells);
+                addUnsafeCellInteraction(getJpOutputCollapser(node), state.waiterLinks[id], state.cellsById, getJpInputCollapser, action, update, state.waitingCells);
             });
         }
         if (state.readyMakerLinks[id] !== undefined) {
             if (!state.waitingCells.has(id)) {
-                elem.classList.add(readyMakingClass);
-                elem.classList.add(readyClass);
+                node.classList.add(readyMakingClass);
+                node.classList.add(readyClass);
             }
             actionUpdatePairs.forEach(({ action, update }) => {
-                addUnsafeCellInteraction(getJpInputCollapser(elem), state.readyMakerLinks[id], state.cellsById, getJpInputCollapser, action, update, state.waitingCells);
-                addUnsafeCellInteraction(getJpInputCollapser(elem), state.readyMakerLinks[id], state.cellsById, getJpOutputCollapser, action, update, state.waitingCells);
+                addUnsafeCellInteraction(getJpInputCollapser(node), state.readyMakerLinks[id], state.cellsById, getJpInputCollapser, action, update, state.waitingCells);
+                addUnsafeCellInteraction(getJpInputCollapser(node), state.readyMakerLinks[id], state.cellsById, getJpOutputCollapser, action, update, state.waitingCells);
             });
         }
     };
@@ -740,30 +744,24 @@ const connectToComm = (session, notebooks, notebook) => {
         clearCellState(notebook);
         refreshNodeMapping(notebook);
         const slice = new Set();
-        let directSlice = new Set();
         let closureCellIds = state.selectedCells;
         if (closureCellIds.length === 0) {
             closureCellIds = [state.activeCell.model.id];
         }
         for (const cellId of closureCellIds) {
-            if (state.cellChildren[cellId] !== undefined ||
-                state.cellParents[cellId] !== undefined) {
-                directSlice = new Set([
-                    cellId,
-                    ...directSlice,
-                    ...state.cellChildren[cellId],
-                    ...state.cellParents[cellId],
-                ]);
-                state.computeTransitiveClosureHelper(slice, cellId, state.cellChildren);
-                slice.delete(cellId);
-                state.computeTransitiveClosureHelper(slice, cellId, state.cellParents);
-            }
+            state.computeTransitiveClosureHelper(slice, cellId, state.cellChildren);
         }
+        const executeSlice = new Set(slice);
         for (const cellId of slice) {
-            state.computeTransitiveClosureHelper(slice, cellId, state.cellParents, true, true);
+            state.computeTransitiveClosureHelper(executeSlice, cellId, state.cellParents, true, true);
+        }
+        for (const cellId of closureCellIds) {
+            slice.delete(cellId);
+            state.computeTransitiveClosureHelper(slice, cellId, state.cellParents);
         }
-        for (const [id] of Object.entries(state.cellsById)) {
-            updateOneCellUI(id, id === state.activeCell.model.id && directSlice.has(id), directSlice.has(id), slice.has(id), state.lastExecutionHighlights !== 'none');
+        for (const cell of notebook.widgets) {
+            const id = cell.model.id;
+            updateOneCellUI(cell, slice.has(id), executeSlice.has(id), state.lastExecutionHighlights !== 'none');
         }
     };
     const onSelectionChanged = () => {
@@ -787,8 +785,11 @@ const connectToComm = (session, notebooks, notebook) => {
         updateUI(notebook);
     };
     notebooks.selectionChanged.connect(onSelectionChanged);
+    const debouncedSave = _.debounce(() => {
+        void notebooks.currentWidget.context.save();
+    }, 200);
     comm.onMsg = (msg) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const payload = msg.content.data;
         if (disconnected || !((_a = payload.success) !== null && _a !== void 0 ? _a : true)) {
             return;
@@ -807,17 +808,17 @@ const connectToComm = (session, notebooks, notebook) => {
         }
         else if (payload.type === 'compute_exec_schedule') {
             state.settings = payload.settings;
-            const ipyflow_metadata = notebook.model.getMetadata('ipyflow');
-            const parentsFromMetadata = (_b = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_parents) !== null && _b !== void 0 ? _b : {};
-            const childrenFromMetadata = (_c = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_children) !== null && _c !== void 0 ? _c : {};
+            const ipyflow_metadata = (_d = (_c = (_b = notebook.model).getMetadata) === null || _c === void 0 ? void 0 : _c.call(_b, 'ipyflow')) !== null && _d !== void 0 ? _d : {};
+            const parentsFromMetadata = (_e = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_parents) !== null && _e !== void 0 ? _e : {};
+            const childrenFromMetadata = (_f = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_children) !== null && _f !== void 0 ? _f : {};
             state.cellParents = mergeMaps(payload.cell_parents, parentsFromMetadata);
             state.cellChildren = mergeMaps(payload.cell_children, childrenFromMetadata);
             state.executedCells = new Set(payload.executed_cells);
-            notebook.model.setMetadata('ipyflow', {
+            (_h = (_g = notebook.model).setMetadata) === null || _h === void 0 ? void 0 : _h.call(_g, 'ipyflow', {
                 cell_parents: state.cellParents,
                 cell_children: state.cellChildren,
             });
-            void notebooks.currentWidget.context.save();
+            debouncedSave();
             state.waitingCells = new Set(payload.waiting_cells);
             state.readyCells = new Set(payload.ready_cells);
             if (state.numPendingForcedReactiveCounterBumps === 0) {
@@ -840,7 +841,7 @@ const connectToComm = (session, notebooks, notebook) => {
             const exec_mode = payload.exec_mode;
             state.isReactivelyExecuting =
                 state.isReactivelyExecuting ||
-                    ((_d = payload === null || payload === void 0 ? void 0 : payload.is_reactively_executing) !== null && _d !== void 0 ? _d : false) ||
+                    ((_j = payload === null || payload === void 0 ? void 0 : payload.is_reactively_executing) !== null && _j !== void 0 ? _j : false) ||
                     exec_mode === 'reactive';
             if (exec_mode === 'reactive') {
                 state.newReadyCells = new Set([
@@ -967,12 +968,12 @@ const connectToComm = (session, notebooks, notebook) => {
             }
         }
     };
-    const ipyflow_metadata = notebook.model.getMetadata('ipyflow');
+    const ipyflow_metadata = (_c = (_b = (_a = notebook.model).getMetadata) === null || _b === void 0 ? void 0 : _b.call(_a, 'ipyflow')) !== null && _c !== void 0 ? _c : {};
     comm.open({
         interface: 'jupyterlab',
         cell_metadata_by_id: state.gatherCellMetadataAndContent(),
-        cell_parents: (_a = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_parents) !== null && _a !== void 0 ? _a : {},
-        cell_children: (_b = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_children) !== null && _b !== void 0 ? _b : {},
+        cell_parents: (_d = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_parents) !== null && _d !== void 0 ? _d : {},
+        cell_children: (_e = ipyflow_metadata === null || ipyflow_metadata === void 0 ? void 0 : ipyflow_metadata.cell_children) !== null && _e !== void 0 ? _e : {},
     });
     // return a disconnection handle
     return () => {

package/package.json

@@ -48,7 +48,7 @@
     "lodash": "^4.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0-rc.1",
+    "@jupyterlab/builder": "^3.6.6",
     "@types/lodash": "^4.14.191",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
@@ -67,5 +67,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.190"
+  "version": "0.0.192"
 }

package/style/index.css

@@ -1,4 +1,9 @@
 :root {
+  --waiting-color: #a539f6;
+  --ready-making-color: #ff8100;
+}
+
+.ipyflow-classic-colors {
   --waiting-color: rgb(254,0,82);
   --ready-making-color: rgb(0,197,158);
 }
@@ -69,19 +74,12 @@
   content: '';
 }
 
-.jp-Notebook .jp-Cell.ipyflow-slice-self .jp-InputPrompt::before {
-  color: var(--jp-brand-color1);
-  content: '•';
-}
-
-.jp-Notebook .jp-Cell.ipyflow-slice-direct .jp-InputPrompt::before {
-  color: var(--ready-making-color);
+.jp-Notebook .jp-Cell.ipyflow-slice .jp-InputPrompt::before {
+  color: var(--waiting-color);
   content: '•';
 }
 
-.jp-Notebook .jp-Cell.ipyflow-slice .jp-InputPrompt::before {
-  /* color: var(--waiting-color); */
-  /* just use the same color as direct for now */
+.jp-Notebook .jp-Cell.ipyflow-slice-execute .jp-InputPrompt::before {
   color: var(--ready-making-color);
   content: '•';
 }