silgi 0.8.27 → 0.8.29

package/dist/_chunks/index.mjs

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

package/dist/cli/prepare.mjs

@@ -1060,10 +1060,17 @@ function createDependencyGraph(modules) {
       return;
     const beforeDeps = module.meta?.beforeDependencies || [];
     const afterDeps = module.meta?.afterDependencies || [];
-    const missingDeps = [...beforeDeps, ...afterDeps].filter((dep) => !graph.has(dep));
-    if (missingDeps.length > 0) {
-      logger$1.error(`Module ${key} has missing dependencies: ${missingDeps.join(", ")}`);
+    const conflicts = beforeDeps.filter((dep) => afterDeps.includes(dep));
+    if (conflicts.length > 0) {
+      logger$1.error(`Module ${key} has conflicting dependencies: ${conflicts.join(", ")}`);
+      return;
     }
+    logger$1.debug(`
+Module ${key} dependencies:`);
+    if (beforeDeps.length)
+      logger$1.debug(`  Must run after: ${beforeDeps.join(", ")}`);
+    if (afterDeps.length)
+      logger$1.debug(`  Must run before: ${afterDeps.join(", ")}`);
   });
   modules.forEach((module) => {
     const key = module.meta?.configKey;
@@ -1071,26 +1078,29 @@ function createDependencyGraph(modules) {
       return;
     const beforeDeps = module.meta?.beforeDependencies || [];
     const afterDeps = module.meta?.afterDependencies || [];
-    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);
-        logger$1.debug(`  ${key} must run after ${dep}`);
+      if (!graph.has(dep)) {
+        logger$1.warn(`Missing module: ${dep} required by ${key}`);
+        return;
       }
+      graph.get(dep)?.add(key);
+      inDegree.set(key, (inDegree.get(key) || 0) + 1);
+      logger$1.debug(`${key} depends on ${dep}`);
     });
     afterDeps.forEach((dep) => {
-      if (graph.has(dep)) {
-        graph.get(key)?.add(dep);
-        inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
-        logger$1.debug(`  ${key} must run before ${dep}`);
+      if (!graph.has(key)) {
+        logger$1.warn(`Missing module: ${key} required by ${dep}`);
+        return;
       }
+      graph.get(key)?.add(dep);
+      inDegree.set(dep, (inDegree.get(dep) || 0) + 1);
+      logger$1.debug(`${dep} depends on ${key}`);
     });
   });
   logger$1.debug("\nDependency Graph:");
   for (const [module, deps] of graph.entries()) {
-    logger$1.debug(`${module} -> ${Array.from(deps).join(", ")} (in-degree: ${inDegree.get(module)})`);
+    const depsStr = Array.from(deps).join(", ");
+    logger$1.debug(`${module} -> [${depsStr}] (in-degree: ${inDegree.get(module)})`);
   }
   return { graph, inDegree };
 }

package/dist/kit/index.d.mts

@@ -91,5 +91,13 @@ declare function toArray<T>(value: T | T[]): T[];
  */
 declare function filterInPlace<T>(array: T[], predicate: (item: T, index: number, arr: T[]) => unknown): T[];
 declare const MODE_RE: RegExp;
+/**
+ * Check if a Silgi module is installed by name.
+ *
+ * This will check both the installed modules and the modules to be installed. Note
+ * that it cannot detect if a module is _going to be_ installed programmatically by another module.
+ */
+declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
+declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };

package/dist/kit/index.d.ts

@@ -91,5 +91,13 @@ declare function toArray<T>(value: T | T[]): T[];
  */
 declare function filterInPlace<T>(array: T[], predicate: (item: T, index: number, arr: T[]) => unknown): T[];
 declare const MODE_RE: RegExp;
+/**
+ * Check if a Silgi module is installed by name.
+ *
+ * This will check both the installed modules and the modules to be installed. Note
+ * that it cannot detect if a module is _going to be_ installed programmatically by another module.
+ */
+declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
+declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };

package/dist/kit/index.mjs

@@ -255,6 +255,13 @@ function filterInPlace(array, predicate) {
   return array;
 }
 const MODE_RE = /\.(server|client)(\.\w+)*$/;
+function hasSilgiModule(moduleKey, silgi = useSilgiCLI()) {
+  return silgi.scanModules.some(({ meta }) => meta.configKey === moduleKey) || Object.keys(silgi.scanModules).includes(moduleKey);
+}
+function hasInstalledModule(moduleKey, silgi = useSilgiCLI()) {
+  const find = silgi.scanModules.find(({ meta }) => meta.configKey === moduleKey);
+  return find?.installed ?? false;
+}
 
 function addTemplate(_template) {
   const silgi = useSilgiCLI();
@@ -298,4 +305,4 @@ function normalizeTemplate(template, buildDir) {
   return template;
 }
 
-export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };
+export { MODE_RE, addTemplate, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, writeFile };

package/dist/meta/index.d.mts

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