silgi 0.8.29 → 0.8.31

package/dist/_chunks/index.mjs

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

package/dist/cli/prepare.mjs

@@ -35,6 +35,14 @@ import 'std-env';
 import 'consola/utils';
 import 'escape-string-regexp';
 
+async function emptyFramework(silgi) {
+  if (silgi.options.preset === "npm-package" || !silgi.options.preset) {
+    silgi.hook("after:prepare:schema.ts", (data) => {
+      data.unshift("type FrameworkContextExtends = {}");
+    });
+  }
+}
+
 async function h3Framework(silgi, skip = false) {
   if (silgi.options.preset !== "h3" && skip === false)
     return;
@@ -128,7 +136,7 @@ async function nuxtFramework(silgi, skip = false) {
   await nitroFramework(silgi, true);
 }
 
-const frameworkSetup = [h3Framework, nitroFramework, nuxtFramework];
+const frameworkSetup = [emptyFramework, h3Framework, nitroFramework, nuxtFramework];
 
 async function prepare$1(_silgi) {
 }
@@ -1050,7 +1058,7 @@ function createDependencyGraph(modules) {
     if (key) {
       graph.set(key, /* @__PURE__ */ new Set());
       inDegree.set(key, 0);
-      dependencyRelations.set(key, { before: [], after: [] });
+      dependencyRelations.set(key, { required: [], before: [], after: [] });
       logger$1.debug(`Module registered: ${key}`);
     }
   });
@@ -1058,15 +1066,22 @@ function createDependencyGraph(modules) {
     const key = module.meta?.configKey;
     if (!key)
       return;
+    const requiredDeps = module.meta?.requiredDependencies || [];
     const beforeDeps = module.meta?.beforeDependencies || [];
     const afterDeps = module.meta?.afterDependencies || [];
-    const conflicts = beforeDeps.filter((dep) => afterDeps.includes(dep));
-    if (conflicts.length > 0) {
-      logger$1.error(`Module ${key} has conflicting dependencies: ${conflicts.join(", ")}`);
+    const missingRequired = requiredDeps.filter((dep) => !graph.has(dep));
+    if (missingRequired.length > 0) {
+      throw new Error(`Module ${key} is missing required dependencies: ${missingRequired.join(", ")}`);
+    }
+    const allDeps = /* @__PURE__ */ new Set([...requiredDeps, ...beforeDeps, ...afterDeps]);
+    if (allDeps.size < requiredDeps.length + beforeDeps.length + afterDeps.length) {
+      logger$1.error(`Module ${key} has overlapping dependencies`);
       return;
     }
     logger$1.debug(`
 Module ${key} dependencies:`);
+    if (requiredDeps.length)
+      logger$1.debug(`  Required: ${requiredDeps.join(", ")}`);
     if (beforeDeps.length)
       logger$1.debug(`  Must run after: ${beforeDeps.join(", ")}`);
     if (afterDeps.length)
@@ -1076,31 +1091,41 @@ Module ${key} dependencies:`);
     const key = module.meta?.configKey;
     if (!key)
       return;
+    const requiredDeps = module.meta?.requiredDependencies || [];
     const beforeDeps = module.meta?.beforeDependencies || [];
     const afterDeps = module.meta?.afterDependencies || [];
+    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);
+      logger$1.debug(`${key} requires ${dep}`);
+    });
     beforeDeps.forEach((dep) => {
       if (!graph.has(dep)) {
-        logger$1.warn(`Missing module: ${dep} required by ${key}`);
+        logger$1.debug(`Optional dependency for ${key}: "${dep}" (beforeDependencies) not found, skipping`);
         return;
       }
       graph.get(dep)?.add(key);
       inDegree.set(key, (inDegree.get(key) || 0) + 1);
-      logger$1.debug(`${key} depends on ${dep}`);
+      logger$1.debug(`${key} will run after ${dep}`);
     });
     afterDeps.forEach((dep) => {
-      if (!graph.has(key)) {
-        logger$1.warn(`Missing module: ${key} required by ${dep}`);
+      if (!graph.has(dep)) {
+        logger$1.debug(`Optional dependency for ${key}: "${dep}" (afterDependencies) not found, skipping`);
         return;
       }
       graph.get(key)?.add(dep);
       inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
-      logger$1.debug(`${dep} depends on ${key}`);
+      logger$1.debug(`${key} will run before ${dep}`);
     });
   });
   logger$1.debug("\nDependency Graph:");
   for (const [module, deps] of graph.entries()) {
     const depsStr = Array.from(deps).join(", ");
-    logger$1.debug(`${module} -> [${depsStr}] (in-degree: ${inDegree.get(module)})`);
+    const required = dependencyRelations.get(module)?.required || [];
+    logger$1.debug(`${module} -> [${depsStr}] (required: ${required.join(", ")}) (in-degree: ${inDegree.get(module)})`);
   }
   return { graph, inDegree };
 }
@@ -1144,9 +1169,6 @@ function topologicalSort(graphData) {
       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);

package/dist/meta/index.d.mts

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

package/dist/types/index.d.mts

@@ -469,6 +469,7 @@ interface ModuleMeta {
     _packageName?: string;
     readonly afterDependencies?: ReadonlyArray<string>;
     readonly beforeDependencies?: ReadonlyArray<string>;
+    readonly requiredDependencies?: ReadonlyArray<string>;
     [key: string]: unknown;
 }
 interface ResolvedModuleMeta extends ModuleMeta {

package/dist/types/index.d.ts

@@ -469,6 +469,7 @@ interface ModuleMeta {
     _packageName?: string;
     readonly afterDependencies?: ReadonlyArray<string>;
     readonly beforeDependencies?: ReadonlyArray<string>;
+    readonly requiredDependencies?: ReadonlyArray<string>;
     [key: string]: unknown;
 }
 interface ResolvedModuleMeta extends ModuleMeta {

package/package.json

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