silgi 0.8.8 → 0.8.10

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.8.8";
+const version = "0.8.10";
 const packageJson = {
 	version: version};
 

package/dist/cli/prepare.mjs

@@ -1036,60 +1036,54 @@ async function scanModules$1(silgi) {
   const moduleMap = new Map(
     silgi.scanModules.map((m) => [m.meta?.configKey, m])
   );
-  const graph = createDependencyGraph(silgi.scanModules);
-  const sortedKeys = topologicalSort(graph);
+  const graphData = createDependencyGraph(silgi.scanModules);
+  const sortedKeys = topologicalSort(graphData);
   const modules = sortedKeys.map((key) => moduleMap.get(key)).filter((module) => Boolean(module));
   silgi.scanModules = modules;
 }
 function createDependencyGraph(modules) {
   const graph = /* @__PURE__ */ new Map();
+  const inDegree = /* @__PURE__ */ new Map();
   modules.forEach((module) => {
     const key = module.meta?.configKey;
     if (key) {
       graph.set(key, /* @__PURE__ */ new Set());
+      inDegree.set(key, 0);
     }
   });
   modules.forEach((module) => {
     const key = module.meta?.configKey;
     const deps = module.meta?.dependencies || [];
     if (key && deps.length > 0) {
-      const modulesDeps = graph.get(key) || /* @__PURE__ */ new Set();
       deps.forEach((dep) => {
         if (graph.has(dep)) {
-          modulesDeps.add(dep);
+          graph.get(dep)?.add(key);
+          inDegree.set(key, (inDegree.get(key) || 0) + 1);
         }
       });
-      graph.set(key, modulesDeps);
     }
   });
-  return graph;
+  return { graph, inDegree };
 }
-function topologicalSort(graph) {
-  const visited = /* @__PURE__ */ new Set();
-  const temp = /* @__PURE__ */ new Set();
+function topologicalSort(graphData) {
+  const { graph, inDegree } = graphData;
   const order = [];
-  function visit(node) {
-    if (temp.has(node))
-      throw new Error(`Circular dependency detected: ${node}`);
-    if (visited.has(node))
-      return;
-    temp.add(node);
-    const deps = graph.get(node) || /* @__PURE__ */ new Set();
-    for (const dep of deps) {
-      visit(dep);
-    }
-    temp.delete(node);
-    visited.add(node);
-    order.unshift(node);
-  }
-  for (const [node, deps] of graph.entries()) {
-    if (deps.size === 0 && !visited.has(node))
-      visit(node);
+  const queue = [];
+  for (const [node, degree] of inDegree.entries()) {
+    if (degree === 0)
+      queue.push(node);
   }
-  for (const node of graph.keys()) {
-    if (!visited.has(node))
-      visit(node);
+  while (queue.length > 0) {
+    const node = queue.shift();
+    order.push(node);
+    for (const neighbor of graph.get(node) || []) {
+      inDegree.set(neighbor, (inDegree.get(neighbor) || 0) - 1);
+      if (inDegree.get(neighbor) === 0)
+        queue.push(neighbor);
+    }
   }
+  if (order.length !== graph.size)
+    throw new Error("Circular dependency detected");
   return order;
 }
 
@@ -1664,23 +1658,27 @@ const prepare = defineCommand({
     }
   },
   async run({ args }) {
-    const rootDir = resolve(args.dir || args._dir || ".");
-    const silgi = await createSilgiCLI({
-      rootDir,
-      dev: args.stub,
-      stub: args.stub,
-      preset: args.preset
-    });
-    await prepare$1();
-    for (const framework of frameworkSetup) {
-      await framework(silgi);
+    async function generate() {
+      const rootDir = resolve(args.dir || args._dir || ".");
+      const silgi = await createSilgiCLI({
+        rootDir,
+        dev: args.stub,
+        stub: args.stub,
+        preset: args.preset
+      });
+      await prepare$1();
+      for (const framework of frameworkSetup) {
+        await framework(silgi);
+      }
+      await writeTypesAndFiles(silgi);
+      await silgi.callHook("read:core.ts", async () => {
+        const data = await readCoreFile(silgi);
+        return data;
+      });
+      await silgi.close();
     }
-    await writeTypesAndFiles(silgi);
-    await silgi.callHook("read:core.ts", async () => {
-      const data = await readCoreFile(silgi);
-      return data;
-    });
-    await silgi.close();
+    await generate();
+    await generate();
   }
 });
 

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "0.8.8";
+const version = "0.8.10";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "0.8.8";
+const version = "0.8.10";
 
 export { version };

package/dist/types/index.d.mts

@@ -356,6 +356,7 @@ interface SilgiCLIHooks extends SilgiHooks {
         handler: string;
         description?: string;
     }>>) => HookResult;
+    'prepare:installPackages': (packages: string[]) => HookResult;
 }
 
 /**
@@ -736,6 +737,7 @@ interface SilgiCLIOptions extends PresetOptions {
         handler: string;
         description?: string;
     }>>;
+    installPackages: string[];
 }
 /**
  * Silgi input config (silgi.config)

package/dist/types/index.d.ts

@@ -356,6 +356,7 @@ interface SilgiCLIHooks extends SilgiHooks {
         handler: string;
         description?: string;
     }>>) => HookResult;
+    'prepare:installPackages': (packages: string[]) => HookResult;
 }
 
 /**
@@ -736,6 +737,7 @@ interface SilgiCLIOptions extends PresetOptions {
         handler: string;
         description?: string;
     }>>;
+    installPackages: string[];
 }
 /**
  * Silgi input config (silgi.config)

package/package.json

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