jupyterlab-ipyflow 0.0.210 → 0.0.212

package/lib/index.js

@@ -114,9 +114,9 @@ class IpyflowSessionState {
     }
     toggleReactivity() {
         if (this.settings.exec_mode === 'reactive') {
-            this.settings.exec_mode = 'normal';
+            this.settings.exec_mode = 'lazy';
         }
-        else if (this.settings.exec_mode === 'normal') {
+        else if (this.settings.exec_mode === 'lazy') {
             this.settings.exec_mode = 'reactive';
         }
         return this.session.session.kernel.requestExecute({
@@ -133,7 +133,7 @@ class IpyflowSessionState {
             store_history: false,
         });
     }
-    computeTransitiveClosureHelper(closure, cellId, edges, pullReactiveUpdates = false, skipFirstCheck = false) {
+    computeRawTransitiveClosureHelper(closure, cellId, edges, pullReactiveUpdates = false, skipFirstCheck = false) {
         var _a, _b, _c;
         if (!skipFirstCheck && closure.has(cellId)) {
             return;
@@ -147,7 +147,7 @@ class IpyflowSessionState {
         }
         const prevClosureSize = closure.size;
         relatives.forEach((related) => {
-            this.computeTransitiveClosureHelper(closure, related, edges, pullReactiveUpdates);
+            this.computeRawTransitiveClosureHelper(closure, related, edges, pullReactiveUpdates);
         });
         if (pullReactiveUpdates &&
             (closure.size > prevClosureSize ||
@@ -157,40 +157,41 @@ class IpyflowSessionState {
                 this.dirtyCells.has(cellId))) {
             closure.add(cellId);
         }
-        if (pullReactiveUpdates && closure.has(cellId)) {
-            relatives.forEach((related) => {
-                var _a, _b, _c, _d;
-                if (closure.has(related)) {
-                    return;
-                }
-                let shouldIncludeRelated = (_b = (_a = this.staleParents) === null || _a === void 0 ? void 0 : _a[cellId]) === null || _b === void 0 ? void 0 : _b.includes(related);
-                if (!shouldIncludeRelated) {
-                    for (const [executed, staleParents] of Object.entries((_d = (_c = this.staleParentsByExecutedCellByChild) === null || _c === void 0 ? void 0 : _c[cellId]) !== null && _d !== void 0 ? _d : {})) {
-                        if (!closure.has(executed)) {
-                            continue;
-                        }
-                        shouldIncludeRelated = staleParents.includes(related);
-                        if (shouldIncludeRelated) {
-                            break;
-                        }
+        if (!pullReactiveUpdates || !closure.has(cellId)) {
+            return;
+        }
+        relatives.forEach((related) => {
+            var _a, _b, _c, _d;
+            if (closure.has(related)) {
+                return;
+            }
+            let shouldIncludeRelated = (_b = (_a = this.staleParents) === null || _a === void 0 ? void 0 : _a[cellId]) === null || _b === void 0 ? void 0 : _b.includes(related);
+            if (!shouldIncludeRelated) {
+                for (const [executed, staleParents] of Object.entries((_d = (_c = this.staleParentsByExecutedCellByChild) === null || _c === void 0 ? void 0 : _c[cellId]) !== null && _d !== void 0 ? _d : {})) {
+                    if (!closure.has(executed)) {
+                        continue;
+                    }
+                    shouldIncludeRelated = staleParents.includes(related);
+                    if (shouldIncludeRelated) {
+                        break;
                     }
                 }
-                if (shouldIncludeRelated) {
-                    closure.add(related);
-                    this.computeTransitiveClosureHelper(closure, related, edges, pullReactiveUpdates, true);
-                }
-            });
-            for (const [child, staleParents] of Object.entries((_b = (_a = this.staleParentsByChildByExecutedCell) === null || _a === void 0 ? void 0 : _a[cellId]) !== null && _b !== void 0 ? _b : {})) {
-                if (!closure.has(child)) {
+            }
+            if (shouldIncludeRelated) {
+                closure.add(related);
+                this.computeRawTransitiveClosureHelper(closure, related, edges, pullReactiveUpdates, true);
+            }
+        });
+        for (const [child, staleParents] of Object.entries((_b = (_a = this.staleParentsByChildByExecutedCell) === null || _a === void 0 ? void 0 : _a[cellId]) !== null && _b !== void 0 ? _b : {})) {
+            if (!closure.has(child)) {
+                continue;
+            }
+            for (const parent of staleParents) {
+                if (closure.has(parent) || !((_c = edges === null || edges === void 0 ? void 0 : edges[child]) === null || _c === void 0 ? void 0 : _c.includes(parent))) {
                     continue;
                 }
-                for (const parent of staleParents) {
-                    if (closure.has(parent) || !((_c = edges === null || edges === void 0 ? void 0 : edges[child]) === null || _c === void 0 ? void 0 : _c.includes(parent))) {
-                        continue;
-                    }
-                    closure.add(parent);
-                    this.computeTransitiveClosureHelper(closure, parent, edges, pullReactiveUpdates, true);
-                }
+                closure.add(parent);
+                this.computeRawTransitiveClosureHelper(closure, parent, edges, pullReactiveUpdates, true);
             }
         }
     }
@@ -204,27 +205,41 @@ class IpyflowSessionState {
             .sort((a, b) => orderIdxById[a] - orderIdxById[b])
             .map((id) => this.cellsById[id]);
     }
-    computeTransitiveClosure(cellIds, inclusive = true, parents = false) {
-        const closure = new Set();
-        for (const cellId of cellIds) {
-            if (parents) {
-                this.computeTransitiveClosureHelper(closure, cellId, this.cellParents);
+    computeRawTransitiveClosure(startCellIds, inclusive = true, parents = false) {
+        var _a, _b;
+        let cellIds = startCellIds;
+        const closure = new Set(cellIds);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            for (const cellId of cellIds) {
+                if (parents) {
+                    this.computeRawTransitiveClosureHelper(closure, cellId, this.cellParents, false, true);
+                }
+                else {
+                    this.computeRawTransitiveClosureHelper(closure, cellId, this.cellChildren, false, true);
+                }
             }
-            else {
-                this.computeTransitiveClosureHelper(closure, cellId, this.cellChildren);
+            if (parents || !((_a = this.settings.pull_reactive_updates) !== null && _a !== void 0 ? _a : false)) {
+                break;
             }
-        }
-        if (!parents) {
             for (const cellId of closure) {
-                this.computeTransitiveClosureHelper(closure, cellId, this.cellParents, true, true);
+                this.computeRawTransitiveClosureHelper(closure, cellId, this.cellParents, true, true);
+            }
+            if (cellIds.length === closure.size ||
+                !((_b = this.settings.push_reactive_updates_to_cousins) !== null && _b !== void 0 ? _b : false)) {
+                break;
             }
+            cellIds = Array.from(closure);
         }
         if (!inclusive) {
-            for (const cellId of cellIds) {
+            for (const cellId of startCellIds) {
                 closure.delete(cellId);
             }
         }
-        return this.cellIdsToCells(Array.from(closure));
+        return closure;
+    }
+    computeTransitiveClosure(startCellIds, inclusive = true, parents = false) {
+        return this.cellIdsToCells(Array.from(this.computeRawTransitiveClosure(startCellIds, inclusive, parents)));
     }
 }
 _IpyflowSessionState_instances = new WeakSet(), _IpyflowSessionState_computeTopoOrderIdxHelper = function _IpyflowSessionState_computeTopoOrderIdxHelper(cellId, orderedCellIds, seen) {
@@ -345,7 +360,7 @@ const extension = {
                 }
                 else if (state.settings.reactivity_mode === 'batch') {
                     let closure = altModeExecuteCells !== null && altModeExecuteCells !== void 0 ? altModeExecuteCells : [notebooks.activeCell];
-                    if (state.settings.exec_mode === 'normal' &&
+                    if (state.settings.exec_mode === 'lazy' &&
                         altModeExecuteCells === null) {
                         closure = state.computeTransitiveClosure([
                             notebooks.activeCell.model.id,
@@ -398,7 +413,7 @@ const extension = {
             app.commands.execute('notebook:enter-command-mode');
             const closure = state.computeTransitiveClosure([state.activeCell.model.id], true, isBackward);
             state.numPendingForcedReactiveCounterBumps++;
-            if (state.settings.exec_mode === 'normal') {
+            if (state.settings.exec_mode === 'lazy') {
                 state.executeCells(closure);
             }
             else {
@@ -724,9 +739,6 @@ const connectToComm = (session, notebooks, notebook) => {
                 itercell.node.classList.remove(readyMakingInputClass);
             }
         });
-        if (state.settings.reactivity_mode === 'incremental') {
-            state.requestComputeExecSchedule();
-        }
     };
     for (const cell of notebook.widgets) {
         cell.model.stateChanged.connect(onExecution);
@@ -812,7 +824,7 @@ const connectToComm = (session, notebooks, notebook) => {
         if (model.type !== 'code') {
             return;
         }
-        if (((_a = state.settings.color_scheme) !== null && _a !== void 0 ? _a : 'normal') === 'classic') {
+        if (((_a = state.settings.color_scheme) !== null && _a !== void 0 ? _a : 'lazy') === 'classic') {
             node.classList.add(classicColorsClass);
         }
         if (inExecuteSlice) {
@@ -862,26 +874,18 @@ const connectToComm = (session, notebooks, notebook) => {
         }
     };
     const updateUI = (notebook) => {
-        var _a;
         clearCellState(notebook);
         refreshNodeMapping(notebook);
-        const slice = new Set();
         let closureCellIds = state.selectedCells;
         if (closureCellIds.length === 0) {
             closureCellIds = [state.activeCell.model.id];
         }
-        for (const cellId of closureCellIds) {
-            state.computeTransitiveClosureHelper(slice, cellId, state.cellChildren);
-        }
-        const executeSlice = new Set(slice);
-        if ((_a = state.settings.pull_reactive_updates) !== null && _a !== void 0 ? _a : false) {
-            for (const cellId of slice) {
-                state.computeTransitiveClosureHelper(executeSlice, cellId, state.cellParents, true, true);
-            }
-        }
+        const executeSlice = state.computeRawTransitiveClosure(closureCellIds, true, false);
+        closureCellIds = Array.from(executeSlice);
+        const slice = new Set(executeSlice);
         for (const cellId of closureCellIds) {
             slice.delete(cellId);
-            state.computeTransitiveClosureHelper(slice, cellId, state.cellParents);
+            state.computeRawTransitiveClosureHelper(slice, cellId, state.cellParents);
         }
         for (const cell of notebook.widgets) {
             const id = cell.model.id;
@@ -1089,7 +1093,7 @@ const connectToComm = (session, notebooks, notebook) => {
                 else {
                     state.isReactivelyExecuting = true;
                     state.executedCells.add(state.cellPendingExecution.model.id);
-                    CodeCell.execute(state.cellPendingExecution, session);
+                    state.executeCells([state.cellPendingExecution]);
                 }
             }
             if (doneReactivelyExecuting) {

package/package.json

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