silgi 0.8.22 → 0.8.24

package/dist/_chunks/index.mjs

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

package/dist/cli/prepare.mjs

@@ -1053,18 +1053,52 @@ function createDependencyGraph(modules) {
   });
   modules.forEach((module) => {
     const key = module.meta?.configKey;
-    const deps = module.meta?.dependencies || [];
-    if (key && deps.length > 0) {
-      deps.forEach((dep) => {
-        if (graph.has(dep)) {
-          graph.get(dep)?.add(key);
-          inDegree.set(key, (inDegree.get(key) || 0) + 1);
-        }
-      });
-    }
+    if (!key)
+      return;
+    const beforeDeps = module.meta?.beforeDependencies || [];
+    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);
+        inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
+      }
+    });
   });
   return { graph, inDegree };
 }
+function findCyclicDependencies(graph) {
+  const visited = /* @__PURE__ */ new Set();
+  const recursionStack = /* @__PURE__ */ new Set();
+  const cycles = [];
+  function dfs(node, path = []) {
+    if (recursionStack.has(node)) {
+      const cycleStart = path.indexOf(node);
+      cycles.push(path.slice(cycleStart));
+      return;
+    }
+    if (visited.has(node))
+      return;
+    visited.add(node);
+    recursionStack.add(node);
+    path.push(node);
+    for (const neighbor of graph.get(node) || []) {
+      dfs(neighbor, [...path]);
+    }
+    recursionStack.delete(node);
+  }
+  for (const node of graph.keys()) {
+    if (!visited.has(node)) {
+      dfs(node);
+    }
+  }
+  return cycles;
+}
 function topologicalSort(graphData) {
   const { graph, inDegree } = graphData;
   const order = [];
@@ -1082,8 +1116,12 @@ function topologicalSort(graphData) {
         queue.push(neighbor);
     }
   }
-  if (order.length !== graph.size)
-    throw new Error("Circular dependency detected");
+  if (order.length !== graph.size) {
+    const cycles = findCyclicDependencies(graph);
+    const cycleStr = cycles.map((cycle) => cycle.join(" -> ")).join("\n");
+    throw new Error(`Circular dependencies detected:
+${cycleStr}`);
+  }
   return order;
 }
 

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.8.22";
+const version = "0.8.24";
 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.22";
+const version = "0.8.24";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.2.0",
 	"@fastify/deepmerge": "^2.0.2",

package/dist/types/index.d.mts

@@ -467,7 +467,8 @@ interface ModuleMeta {
      * @private
      */
     _packageName?: string;
-    readonly dependencies?: ReadonlyArray<string>;
+    readonly afterDependencies?: ReadonlyArray<string>;
+    readonly beforeDependencies?: ReadonlyArray<string>;
     [key: string]: unknown;
 }
 interface ResolvedModuleMeta extends ModuleMeta {
@@ -503,7 +504,7 @@ interface ModuleDefinition<TOptions extends ModuleOptionsCustom, TOptionsDefault
     meta?: ModuleMeta;
     defaults?: TOptionsDefaults | ((silgi: SilgiCLI) => Awaitable<TOptionsDefaults>);
     hooks?: Partial<SilgiCLIHooks>;
-    setup?: (this: void, resolvedOptions: TWith extends true ? ResolvedModuleOptions<TOptions, TOptionsDefaults> : TOptions, silgi: SilgiCLI) => ModuleSetupReturn;
+    setup?: (this: void, resolvedOptions: TWith extends true ? ResolvedModuleOptions<TOptions, TOptionsDefaults> : TOptions, silgi: SilgiCLI & SilgiModuleOptions) => ModuleSetupReturn;
 }
 interface ModuleSetupInstallResult {
     /**

package/dist/types/index.d.ts

@@ -467,7 +467,8 @@ interface ModuleMeta {
      * @private
      */
     _packageName?: string;
-    readonly dependencies?: ReadonlyArray<string>;
+    readonly afterDependencies?: ReadonlyArray<string>;
+    readonly beforeDependencies?: ReadonlyArray<string>;
     [key: string]: unknown;
 }
 interface ResolvedModuleMeta extends ModuleMeta {
@@ -503,7 +504,7 @@ interface ModuleDefinition<TOptions extends ModuleOptionsCustom, TOptionsDefault
     meta?: ModuleMeta;
     defaults?: TOptionsDefaults | ((silgi: SilgiCLI) => Awaitable<TOptionsDefaults>);
     hooks?: Partial<SilgiCLIHooks>;
-    setup?: (this: void, resolvedOptions: TWith extends true ? ResolvedModuleOptions<TOptions, TOptionsDefaults> : TOptions, silgi: SilgiCLI) => ModuleSetupReturn;
+    setup?: (this: void, resolvedOptions: TWith extends true ? ResolvedModuleOptions<TOptions, TOptionsDefaults> : TOptions, silgi: SilgiCLI & SilgiModuleOptions) => ModuleSetupReturn;
 }
 interface ModuleSetupInstallResult {
     /**

package/package.json

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