silgi 0.8.25 → 0.8.26

package/dist/_chunks/index.mjs

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

package/dist/cli/prepare.mjs

@@ -1044,11 +1044,13 @@ async function scanModules$1(silgi) {
 function createDependencyGraph(modules) {
   const graph = /* @__PURE__ */ new Map();
   const inDegree = /* @__PURE__ */ new Map();
+  const dependencyRelations = /* @__PURE__ */ new Map();
   modules.forEach((module) => {
     const key = module.meta?.configKey;
     if (key) {
       graph.set(key, /* @__PURE__ */ new Set());
       inDegree.set(key, 0);
+      dependencyRelations.set(key, { before: [], after: [] });
       logger$1.debug(`Module registered: ${key}`);
     }
   });
@@ -1058,51 +1060,65 @@ function createDependencyGraph(modules) {
       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(", ")}`);
+    logger$1.debug(`
+Analyzing dependencies for module ${key}:`);
     beforeDeps.forEach((dep) => {
-      if (graph.has(dep)) {
-        graph.get(dep)?.add(key);
-        inDegree.set(key, (inDegree.get(key) || 0) + 1);
+      if (!graph.has(dep)) {
+        logger$1.warn(`Warning: Module ${key} depends on non-existent module ${dep}`);
+        return;
       }
+      graph.get(dep)?.add(key);
+      inDegree.set(key, (inDegree.get(key) || 0) + 1);
+      dependencyRelations.get(key)?.before.push(dep);
+      logger$1.debug(`  Must run after: ${dep}`);
     });
     afterDeps.forEach((dep) => {
-      if (graph.has(key)) {
-        graph.get(key)?.add(dep);
-        inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
+      if (!graph.has(key)) {
+        logger$1.warn(`Warning: Module ${dep} depends on non-existent module ${key}`);
+        return;
       }
+      graph.get(key)?.add(dep);
+      inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
+      dependencyRelations.get(key)?.after.push(dep);
+      logger$1.debug(`  Must run before: ${dep}`);
     });
   });
+  logger$1.debug("\nDependency Summary:");
+  for (const [key, relations] of dependencyRelations.entries()) {
+    if (relations.before.length || relations.after.length) {
+      logger$1.debug(`${key}:`);
+      if (relations.before.length)
+        logger$1.debug(`  Must run after: ${relations.before.join(", ")}`);
+      if (relations.after.length)
+        logger$1.debug(`  Must run before: ${relations.after.join(", ")}`);
+    }
+  }
   return { graph, inDegree };
 }
 function findCyclicDependencies(graph) {
-  const visited = /* @__PURE__ */ new Map();
+  const visited = /* @__PURE__ */ new Set();
+  const recursionStack = /* @__PURE__ */ new Set();
   const cycles = [];
-  const path = [];
-  function visit(node) {
-    if (visited.has(node)) {
-      if (visited.get(node) === false) {
-        const cycleStart = path.indexOf(node);
+  function dfs(node, path = []) {
+    visited.add(node);
+    recursionStack.add(node);
+    path.push(node);
+    for (const neighbor of graph.get(node) || []) {
+      if (recursionStack.has(neighbor)) {
+        const cycleStart = path.indexOf(neighbor);
         if (cycleStart !== -1) {
-          cycles.push([...path.slice(cycleStart), node]);
+          cycles.push([...path.slice(cycleStart), neighbor]);
         }
+      } else if (!visited.has(neighbor)) {
+        dfs(neighbor, [...path]);
       }
-      return;
-    }
-    visited.set(node, false);
-    path.push(node);
-    for (const neighbor of graph.get(node) || []) {
-      visit(neighbor);
     }
+    recursionStack.delete(node);
     path.pop();
-    visited.set(node, true);
   }
   for (const node of graph.keys()) {
     if (!visited.has(node)) {
-      visit(node);
+      dfs(node, []);
     }
   }
   return cycles;
@@ -1111,36 +1127,45 @@ function topologicalSort(graphData) {
   const { graph, inDegree } = graphData;
   const order = [];
   const queue = [];
-  logger$1.debug("\nDependency Analysis:");
+  logger$1.debug("\nStarting topological sort:");
   logger$1.debug("Initial in-degrees:", Object.fromEntries(inDegree));
   for (const [node, degree] of inDegree.entries()) {
     if (degree === 0) {
       queue.push(node);
-      logger$1.debug(`Starting with zero-dependency module: ${node}`);
+      logger$1.debug(`Adding initial module: ${node} (no dependencies)`);
     }
   }
+  if (queue.length === 0) {
+    logger$1.warn("No modules without dependencies found - possible circular reference");
+  }
   while (queue.length > 0) {
     const node = queue.shift();
     order.push(node);
-    logger$1.debug(`Processing module: ${node}`);
+    logger$1.debug(`
+Processing: ${node}`);
     for (const neighbor of graph.get(node) || []) {
       const newDegree = (inDegree.get(neighbor) || 0) - 1;
       inDegree.set(neighbor, newDegree);
-      logger$1.debug(`  Reduced in-degree of ${neighbor} to ${newDegree}`);
+      logger$1.debug(`  ${neighbor} dependencies remaining: ${newDegree}`);
       if (newDegree === 0) {
         queue.push(neighbor);
-        logger$1.debug(`  Added ${neighbor} to processing queue`);
+        logger$1.debug(`  Queuing: ${neighbor}`);
       }
     }
   }
   if (order.length !== graph.size) {
     const cycles = findCyclicDependencies(graph);
+    logger$1.debug("\nDependency graph state:");
+    graph.forEach((deps, module) => {
+      logger$1.debug(`${module} -> ${Array.from(deps).join(", ")}`);
+    });
     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");
+      const unresolvedModules = Array.from(graph.keys()).filter((key) => !order.includes(key));
+      throw new Error(`Unable to resolve dependencies for modules: ${unresolvedModules.join(", ")}`);
     }
   }
   logger$1.debug("\nFinal module order:", order.join(" -> "));

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.8.25";
+const version = "0.8.26";
 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.25";
+const version = "0.8.26";
 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.25",
+  "version": "0.8.26",
   "private": false,
   "sideEffects": false,
   "exports": {