silgi 0.9.17 → 0.9.20

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.9.17";
+const version = "0.9.20";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/cli/prepare.mjs

@@ -627,12 +627,12 @@ async function silgiCoreFile(data, frameworkContext, silgi) {
     "      modulesURIs,",
     `      plugins: [${plugins.join(", ")}],`,
     _data._silgiConfigs.length > 0 ? `      ${_data._silgiConfigs.map((config) => typeof config === "string" ? config : typeof config === "object" ? Object.entries(config).map(([key, value]) => `${key}: ${value}`).join(",\n      ") : "").join(",\n      ")},` : "",
+    "      runtimeConfig: {},",
     "      ...buildOptions,",
     "      options: mergeDeep(",
     "        moduleOptions || {},",
     "        {",
     `          present: '${silgi.options.preset}',`,
-    "          runtimeConfig: {},",
     "          ...cliOptions,",
     "        },",
     "      ) as any,",
@@ -1179,36 +1179,43 @@ function createDependencyGraph(modules) {
     if (key) {
       graph.set(key, /* @__PURE__ */ new Set());
       inDegree.set(key, 0);
-      logger$1.debug(`Module registered: ${key}`);
     }
   });
   modules.forEach((module) => {
     const key = module.meta?.configKey;
-    if (!key)
+    if (!key) {
       return;
+    }
     const requiredDeps = module.meta?.requiredDependencies || [];
+    const beforeDeps = module.meta?.beforeDependencies || [];
     const afterDeps = module.meta?.afterDependencies || [];
-    const allDeps = /* @__PURE__ */ new Set([...requiredDeps, ...afterDeps]);
-    allDeps.forEach((dep) => {
+    const processedDeps = /* @__PURE__ */ new Set();
+    requiredDeps.forEach((dep) => {
+      if (!graph.has(dep)) {
+        throw new Error(`Required dependency "${dep}" for module "${key}" is missing`);
+      }
+      graph.get(dep)?.add(key);
+      inDegree.set(key, (inDegree.get(key) || 0) + 1);
+      processedDeps.add(dep);
+    });
+    beforeDeps.forEach((dep) => {
+      if (!graph.has(dep)) {
+        return;
+      }
+      graph.get(key)?.add(dep);
+      inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
+    });
+    afterDeps.forEach((dep) => {
+      if (processedDeps.has(dep)) {
+        return;
+      }
       if (!graph.has(dep)) {
-        if (requiredDeps.includes(dep)) {
-          throw new Error(`Required dependency "${dep}" for module "${key}" is missing`);
-        }
-        logger$1.debug(`Optional dependency for ${key}: "${dep}" not found, skipping`);
         return;
       }
       graph.get(dep)?.add(key);
       inDegree.set(key, (inDegree.get(key) || 0) + 1);
-      const depType = requiredDeps.includes(dep) ? "required" : "after";
-      logger$1.debug(`${key} depends on ${dep} (${depType})`);
     });
   });
-  logger$1.debug("\nDependency Graph:");
-  for (const [module, deps] of graph.entries()) {
-    const depsStr = Array.from(deps).join(", ");
-    logger$1.debug(`${module} -> ${depsStr} (deps run after this module)`);
-    logger$1.debug(`${module} in-degree: ${inDegree.get(module)}`);
-  }
   return { graph, inDegree };
 }
 function findCyclicDependencies(graph) {
@@ -1243,35 +1250,25 @@ function topologicalSort(graphData) {
   const { graph, inDegree } = graphData;
   const order = [];
   const queue = [];
-  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(`Adding initial module: ${node} (no dependencies)`);
     }
   }
   while (queue.length > 0) {
     const node = queue.shift();
     order.push(node);
-    logger$1.debug(`
-Processing: ${node}`);
-    for (const neighbor of graph.get(node) || []) {
+    const neighbors = Array.from(graph.get(node) || []);
+    for (const neighbor of neighbors) {
       const newDegree = (inDegree.get(neighbor) || 0) - 1;
       inDegree.set(neighbor, newDegree);
-      logger$1.debug(`  ${neighbor} dependencies remaining: ${newDegree}`);
       if (newDegree === 0) {
         queue.push(neighbor);
-        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:
@@ -1281,7 +1278,6 @@ ${cycleStr}`);
       throw new Error(`Unable to resolve dependencies for modules: ${unresolvedModules.join(", ")}`);
     }
   }
-  logger$1.debug("\nFinal module order:", order.join(" -> "));
   return order;
 }
 

package/dist/core/index.mjs

@@ -503,6 +503,8 @@ async function createSilgi(config) {
     ready: () => {
       return hooks.callHook("ready", silgi);
     },
+    envOptions: config.envOptions ?? {},
+    runtimeConfig: config.runtimeConfig ?? {},
     close: () => hooks.callHook("close", silgi),
     logger: createConsola(defu(config.options?.consolaOptions ?? {}, {
       tag: "silgi"

package/dist/kit/index.mjs

@@ -248,12 +248,12 @@ function useSilgiRuntimeConfig() {
   if (!silgi) {
     return globalThis.$silgiSharedRuntimeConfig;
   }
-  return applyEnv(klona(silgi.options.runtimeConfig), {
+  return applyEnv(klona(silgi.runtimeConfig), {
     prefix: "NITRO_",
     altPrefix: "NUXT_",
     silgiPrefix: "SILGI_",
     envExpansion: silgi.options.experimental?.envExpansion ?? !!process$1.env.NITRO_ENV_EXPANSION,
-    ...silgi.options.envOptions
+    ...silgi.envOptions
   });
 }
 function getEnv(key, opts, env = process$1.env) {

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.9.17";
+const version = "0.9.20";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.9.17";
+const version = "0.9.20";
 const devDependencies = {
 	"@antfu/eslint-config": "^4.3.0",
 	"@nuxt/kit": "^3.15.4",

package/dist/types/index.d.mts

@@ -934,6 +934,10 @@ interface Silgi {
     close: () => Promise<void>;
     logger: ConsolaInstance;
     storage: Storage;
+    envOptions: EnvOptions;
+    runtimeConfig: SilgiRuntimeOptions & {
+        [key: string]: any;
+    };
     options: SilgiOptions & SilgiRuntimeOptions;
     captureError: CaptureError;
 }
@@ -957,10 +961,6 @@ type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 interface SilgiOptions {
     consolaOptions?: Partial<ConsolaOptions>;
     present: PresetNameInput;
-    envOptions: EnvOptions;
-    runtimeConfig: SilgiRuntimeOptions & {
-        [key: string]: any;
-    };
     /**
      * Set to `true` to enable debug mode.
      *

package/dist/types/index.d.ts

@@ -934,6 +934,10 @@ interface Silgi {
     close: () => Promise<void>;
     logger: ConsolaInstance;
     storage: Storage;
+    envOptions: EnvOptions;
+    runtimeConfig: SilgiRuntimeOptions & {
+        [key: string]: any;
+    };
     options: SilgiOptions & SilgiRuntimeOptions;
     captureError: CaptureError;
 }
@@ -957,10 +961,6 @@ type CaptureError = (error: Error, context: CapturedErrorContext) => void;
 interface SilgiOptions {
     consolaOptions?: Partial<ConsolaOptions>;
     present: PresetNameInput;
-    envOptions: EnvOptions;
-    runtimeConfig: SilgiRuntimeOptions & {
-        [key: string]: any;
-    };
     /**
      * Set to `true` to enable debug mode.
      *

package/package.json

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