silgi 0.8.24 → 0.8.25

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.8.24";
+const version = "0.8.25";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/cli/prepare.mjs

@@ -1049,6 +1049,7 @@ function createDependencyGraph(modules) {
     if (key) {
       graph.set(key, /* @__PURE__ */ new Set());
       inDegree.set(key, 0);
+      logger$1.debug(`Module registered: ${key}`);
     }
   });
   modules.forEach((module) => {
@@ -1056,13 +1057,18 @@ function createDependencyGraph(modules) {
     if (!key)
       return;
     const beforeDeps = module.meta?.beforeDependencies || [];
+    const afterDeps = module.meta?.afterDependencies || [];
+    logger$1.debug(`Module ${key}:`);
+    if (beforeDeps.length)
+      logger$1.debug(`  beforeDeps: ${beforeDeps.join(", ")}`);
+    if (afterDeps.length)
+      logger$1.debug(`  afterDeps: ${afterDeps.join(", ")}`);
     beforeDeps.forEach((dep) => {
       if (graph.has(dep)) {
         graph.get(dep)?.add(key);
         inDegree.set(key, (inDegree.get(key) || 0) + 1);
       }
     });
-    const afterDeps = module.meta?.afterDependencies || [];
     afterDeps.forEach((dep) => {
       if (graph.has(key)) {
         graph.get(key)?.add(dep);
@@ -1073,28 +1079,30 @@ function createDependencyGraph(modules) {
   return { graph, inDegree };
 }
 function findCyclicDependencies(graph) {
-  const visited = /* @__PURE__ */ new Set();
-  const recursionStack = /* @__PURE__ */ new Set();
+  const visited = /* @__PURE__ */ new Map();
   const cycles = [];
-  function dfs(node, path = []) {
-    if (recursionStack.has(node)) {
-      const cycleStart = path.indexOf(node);
-      cycles.push(path.slice(cycleStart));
+  const path = [];
+  function visit(node) {
+    if (visited.has(node)) {
+      if (visited.get(node) === false) {
+        const cycleStart = path.indexOf(node);
+        if (cycleStart !== -1) {
+          cycles.push([...path.slice(cycleStart), node]);
+        }
+      }
       return;
     }
-    if (visited.has(node))
-      return;
-    visited.add(node);
-    recursionStack.add(node);
+    visited.set(node, false);
     path.push(node);
     for (const neighbor of graph.get(node) || []) {
-      dfs(neighbor, [...path]);
+      visit(neighbor);
     }
-    recursionStack.delete(node);
+    path.pop();
+    visited.set(node, true);
   }
   for (const node of graph.keys()) {
     if (!visited.has(node)) {
-      dfs(node);
+      visit(node);
     }
   }
   return cycles;
@@ -1103,25 +1111,39 @@ function topologicalSort(graphData) {
   const { graph, inDegree } = graphData;
   const order = [];
   const queue = [];
+  logger$1.debug("\nDependency Analysis:");
+  logger$1.debug("Initial in-degrees:", Object.fromEntries(inDegree));
   for (const [node, degree] of inDegree.entries()) {
-    if (degree === 0)
+    if (degree === 0) {
       queue.push(node);
+      logger$1.debug(`Starting with zero-dependency module: ${node}`);
+    }
   }
   while (queue.length > 0) {
     const node = queue.shift();
     order.push(node);
+    logger$1.debug(`Processing module: ${node}`);
     for (const neighbor of graph.get(node) || []) {
-      inDegree.set(neighbor, (inDegree.get(neighbor) || 0) - 1);
-      if (inDegree.get(neighbor) === 0)
+      const newDegree = (inDegree.get(neighbor) || 0) - 1;
+      inDegree.set(neighbor, newDegree);
+      logger$1.debug(`  Reduced in-degree of ${neighbor} to ${newDegree}`);
+      if (newDegree === 0) {
         queue.push(neighbor);
+        logger$1.debug(`  Added ${neighbor} to processing queue`);
+      }
     }
   }
   if (order.length !== graph.size) {
     const cycles = findCyclicDependencies(graph);
-    const cycleStr = cycles.map((cycle) => cycle.join(" -> ")).join("\n");
-    throw new Error(`Circular dependencies detected:
+    if (cycles.length > 0) {
+      const cycleStr = cycles.map((cycle) => `  ${cycle.join(" -> ")}`).join("\n");
+      throw new Error(`Circular dependencies detected:
 ${cycleStr}`);
+    } else {
+      throw new Error("Unable to resolve dependencies - possible circular reference");
+    }
   }
+  logger$1.debug("\nFinal module order:", order.join(" -> "));
   return order;
 }
 

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.8.24";
+const version = "0.8.25";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.8.24";
+const version = "0.8.25";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.8.24",
+  "version": "0.8.25",
   "private": false,
   "sideEffects": false,
   "exports": {