wip - improve topological sort

Author: kennyfrc

build/cami.cdn.js

@@ -61,6 +61,7 @@ var cami = (() => {
   // src/cami.js
   var cami_exports = {};
   __export(cami_exports, {
+    DependencyTracker: () => DependencyTracker,
     Observable: () => Observable,
     ObservableState: () => ObservableState,
     ObservableStore: () => ObservableStore,
@@ -2012,61 +2013,67 @@ var cami = (() => {
     static detectCycles() {
       const visited = /* @__PURE__ */ new Set();
       const recursionStack = /* @__PURE__ */ new Set();
-      const cyclePath = [];
       function dfs(node) {
         visited.add(node);
         recursionStack.add(node);
-        cyclePath.push(node);
         const neighbors = _DependencyTracker.dependencyGraph.get(node) || /* @__PURE__ */ new Set();
         for (const neighbor of neighbors) {
           if (!visited.has(neighbor)) {
             if (dfs(neighbor))
-              return true;
+              return [node, neighbor];
           } else if (recursionStack.has(neighbor)) {
-            const cycleStart = cyclePath.indexOf(neighbor);
-            const cycle = cyclePath.slice(cycleStart);
-            console.warn(`Cyclic dependency detected: ${cycle.map((n) => n.__name || "unnamed").join(" -> ")}`);
+            return [node, neighbor];
           }
         }
         recursionStack.delete(node);
-        cyclePath.pop();
-        return false;
+        return null;
       }
       for (const node of _DependencyTracker.dependencyGraph.keys()) {
         if (!visited.has(node)) {
-          try {
-            if (dfs(node))
-              return true;
-          } catch (error) {
-            if (error.message.startsWith("Cyclic dependency detected:")) {
-              console.warn(error.message);
-            } else {
-              throw error;
-            }
+          const cycle = dfs(node);
+          if (cycle) {
+            throw new Error(`Dependency cycle detected: ${cycle[0]} <-> ${cycle[1]}`);
           }
         }
       }
-      return false;
     }
     static clearGraph() {
       _DependencyTracker.dependencyGraph.clear();
     }
     static topologicalSort() {
       const visited = /* @__PURE__ */ new Set();
       const stack = [];
-      function dfs(node) {
-        visited.add(node);
-        const neighbors = _DependencyTracker.dependencyGraph.get(node) || /* @__PURE__ */ new Set();
-        for (const neighbor of neighbors) {
-          if (!visited.has(neighbor)) {
-            dfs(neighbor);
-          }
-        }
-        stack.push(node);
-      }
+      const tempMark = /* @__PURE__ */ new Set();
+      const nodeStack = [];
       for (const node of _DependencyTracker.dependencyGraph.keys()) {
-        if (!visited.has(node)) {
-          dfs(node);
+        if (visited.has(node))
+          continue;
+        nodeStack.push(node);
+        while (nodeStack.length > 0) {
+          const current2 = nodeStack[nodeStack.length - 1];
+          if (tempMark.has(current2)) {
+            throw new Error("Graph has a cycle");
+          }
+          if (!visited.has(current2)) {
+            tempMark.add(current2);
+            const neighbors = _DependencyTracker.dependencyGraph.get(current2) || /* @__PURE__ */ new Set();
+            let allVisited = true;
+            for (const neighbor of neighbors) {
+              if (!visited.has(neighbor)) {
+                nodeStack.push(neighbor);
+                allVisited = false;
+                break;
+              }
+            }
+            if (allVisited) {
+              visited.add(current2);
+              tempMark.delete(current2);
+              stack.push(current2);
+              nodeStack.pop();
+            }
+          } else {
+            nodeStack.pop();
+          }
         }
       }
       return stack.reverse();

build/cami.cdn.js.map

@@ -13,7 +13,7 @@ import { produce } from "immer";
 import { ReactiveElement } from './reactive-element.js';
 import { ObservableStore, store } from './observables/observable-store.js';
 import { Observable } from './observables/observable.js';
-import { ObservableState, effect } from './observables/observable-state.js';
+import { ObservableState, effect, DependencyTracker } from './observables/observable-state.js';
 import { __config } from './config.js';
 import { __trace } from './trace.js';
 
@@ -31,4 +31,4 @@ const { debug, events } = __config;
  * @exports debug - The debug property from __config
  * @exports events - The events property from __config
  */
-export { store, html, svg, ReactiveElement, Observable, ObservableState, ObservableStore, debug, events, effect };
+export { store, html, svg, ReactiveElement, Observable, ObservableState, ObservableStore, debug, events, effect, DependencyTracker };