silgi 0.34.5 → 0.34.6

package/dist/cli/build.mjs

@@ -2,7 +2,7 @@ import { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { resolve, join, relative, extname, basename, dirname, isAbsolute } from 'pathe';
 import { useSilgiCLI, replaceRuntimeValues, silgiCLICtx, autoImportTypes } from 'silgi';
-import { isPresents, addTemplate, addCoreFile, relativeWithDot, hash, resolveAlias, directoryToURL, removeExtension, addImports, baseHeaderBannerComment, writeFile, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, genEnsureSafeVar, toArray, isDirectory } from 'silgi/kit';
+import { isPresents, addTemplate, addCoreFile, relativeWithDot, hash, removeExtension, resolveAlias, directoryToURL, addImports, baseHeaderBannerComment, writeFile, normalizeTemplate, useLogger, resolveSilgiPath, hasSilgiModule, genEnsureSafeVar, toArray, isDirectory } from 'silgi/kit';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { scanExports, createUnimport, toExports } from 'unimport';
 import * as p from '@clack/prompts';
@@ -14,7 +14,7 @@ import { h as hasInstalledModule } from './compatibility.mjs';
 import { fileURLToPath } from 'node:url';
 import { defu } from 'defu';
 import { resolveModuleURL } from 'exsolve';
-import { isRelative, withTrailingSlash } from 'ufo';
+import { withTrailingSlash, isRelative } from 'ufo';
 import { readFile, readdir } from 'node:fs/promises';
 import { globby } from 'globby';
 import ignore from 'ignore';
@@ -473,221 +473,6 @@ async function installModule(moduleToInstall, silgi = useSilgiCLI(), inlineOptio
   }
 }
 
-const MissingModuleMatcher = /Cannot find module\s+['"]?([^'")\s]+)['"]?/i;
-async function _resolveSilgiModule(silgiModule, silgi) {
-  let resolvedModulePath;
-  let buildTimeModuleMeta = {};
-  const jiti = createJiti(silgi.options.rootDir, {
-    alias: silgi.options.alias,
-    fsCache: true,
-    moduleCache: true
-  });
-  if (typeof silgiModule === "string") {
-    silgiModule = resolveAlias(silgiModule, silgi.options.alias);
-    if (isRelative(silgiModule)) {
-      silgiModule = resolve(silgi.options.rootDir, silgiModule);
-    }
-    try {
-      const src = resolveModuleURL(silgiModule, {
-        from: silgi.options.modulesDir.map((m) => directoryToURL(m.replace(/\/node_modules\/?$/, "/"))),
-        suffixes: ["silgi", "silgi/index", "module", "module/index", "", "index"],
-        extensions: [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
-        // Maybe add https://github.com/unjs/exsolve/blob/dfff3e9bbc4a3a173a2d56b9b9ff731ab15598be/src/resolve.ts#L7
-        // conditions: silgi.options.conditions,
-      });
-      resolvedModulePath = fileURLToPath(src);
-      const resolvedSilgiModule = await jiti.import(src, { default: true });
-      if (typeof resolvedSilgiModule !== "function") {
-        throw new TypeError(`Nuxt module should be a function: ${silgiModule}.`);
-      }
-      silgiModule = await jiti.import(src, {
-        default: true,
-        conditions: silgi.options.conditions
-      });
-      const moduleMetadataPath = new URL("module.json", src);
-      if (existsSync(moduleMetadataPath)) {
-        buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
-      } else {
-        if (typeof silgiModule === "function") {
-          const meta = await silgiModule.getMeta?.();
-          const _exports = await scanExports(resolvedModulePath, true);
-          buildTimeModuleMeta = {
-            ...meta,
-            exports: _exports.map(({ from, ...rest }) => rest)
-          };
-        }
-      }
-    } catch (error) {
-      const code = error.code;
-      if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {
-        throw new TypeError(`Could not load \`${silgiModule}\`. Is it installed?`);
-      }
-      if (code === "MODULE_NOT_FOUND" || code === "ERR_MODULE_NOT_FOUND") {
-        const module = MissingModuleMatcher.exec(error.message)?.[1];
-        if (module && !module.includes(silgiModule)) {
-          throw new TypeError(`Error while importing module \`${silgiModule}\`: ${error}`);
-        }
-      }
-    }
-  }
-  if (!buildTimeModuleMeta) {
-    throw new Error(`Module ${silgiModule} is not a valid Silgi module`);
-  }
-  if (typeof silgiModule === "function") {
-    if (!buildTimeModuleMeta.configKey) {
-      const meta = await silgiModule.getMeta?.();
-      buildTimeModuleMeta = {
-        ...meta,
-        exports: []
-      };
-    }
-    if (silgi.scanModules.some((m) => m.meta?.configKey === buildTimeModuleMeta.configKey)) {
-      throw new Error(`Module with key \`${buildTimeModuleMeta.configKey}\` already exists`);
-    }
-    const options = await silgiModule.getOptions?.() || {};
-    if (options) {
-      silgi.options._c12.config[buildTimeModuleMeta.configKey] = defu(
-        silgi.options._c12.config[buildTimeModuleMeta.configKey] || {},
-        options || {}
-      );
-    } else {
-      throw new TypeError(`Could not load \`${silgiModule}\`. Is it installed?`);
-    }
-    silgi.scanModules.push({
-      meta: buildTimeModuleMeta,
-      entryPath: resolvedModulePath || void 0,
-      installed: false,
-      options,
-      module: silgiModule
-    });
-  }
-}
-async function scanModules$1(silgi) {
-  const _modules = [
-    ...silgi.options._modules,
-    ...silgi.options.modules
-  ];
-  for await (const mod of _modules) {
-    await _resolveSilgiModule(mod, silgi);
-  }
-  const moduleMap = new Map(
-    silgi.scanModules.map((m) => [m.meta?.configKey, m])
-  );
-  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;
-    if (!key) {
-      return;
-    }
-    const requiredDeps = module.meta?.requiredDependencies || [];
-    const beforeDeps = module.meta?.beforeDependencies || [];
-    const afterDeps = module.meta?.afterDependencies || [];
-    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)) {
-        return;
-      }
-      graph.get(dep)?.add(key);
-      inDegree.set(key, (inDegree.get(key) || 0) + 1);
-    });
-  });
-  return { graph, inDegree };
-}
-function findCyclicDependencies(graph) {
-  const visited = /* @__PURE__ */ new Set();
-  const recursionStack = /* @__PURE__ */ new Set();
-  const cycles = [];
-  function dfs(node, path = []) {
-    visited.add(node);
-    recursionStack.add(node);
-    path.push(node);
-    for (const neighbor of graph.get(node) || []) {
-      if (recursionStack.has(neighbor)) {
-        const cycleStart = path.indexOf(neighbor);
-        if (cycleStart !== -1) {
-          cycles.push([...path.slice(cycleStart), neighbor]);
-        }
-      } else if (!visited.has(neighbor)) {
-        dfs(neighbor, [...path]);
-      }
-    }
-    recursionStack.delete(node);
-    path.pop();
-  }
-  for (const node of graph.keys()) {
-    if (!visited.has(node)) {
-      dfs(node, []);
-    }
-  }
-  return cycles;
-}
-function topologicalSort(graphData) {
-  const { graph, inDegree } = graphData;
-  const order = [];
-  const queue = [];
-  for (const [node, degree] of inDegree.entries()) {
-    if (degree === 0) {
-      queue.push(node);
-    }
-  }
-  while (queue.length > 0) {
-    const node = queue.shift();
-    order.push(node);
-    const neighbors = Array.from(graph.get(node) || []);
-    for (const neighbor of neighbors) {
-      const newDegree = (inDegree.get(neighbor) || 0) - 1;
-      inDegree.set(neighbor, newDegree);
-      if (newDegree === 0) {
-        queue.push(neighbor);
-      }
-    }
-  }
-  if (order.length !== graph.size) {
-    const cycles = findCyclicDependencies(graph);
-    if (cycles.length > 0) {
-      const cycleStr = cycles.map((cycle) => `  ${cycle.join(" -> ")}`).join("\n");
-      throw new Error(`Circular dependencies detected:
-${cycleStr}`);
-    } else {
-      const unresolvedModules = Array.from(graph.keys()).filter((key) => !order.includes(key));
-      throw new Error(`Unable to resolve dependencies for modules: ${unresolvedModules.join(", ")}`);
-    }
-  }
-  return order;
-}
-
 function resolveIgnorePatterns(silgi, relativePath) {
   if (!silgi) {
     return [];
@@ -867,10 +652,10 @@ async function verifyDirectoryCaseSensitivity(directoryPath, rootDirectory) {
   } catch {
   }
 }
-async function scanExportFile(silgiInstance) {
+async function scanSilgiExports(path, silgiInstance = useSilgiCLI()) {
   const processedFilePaths = /* @__PURE__ */ new Set();
   const alreadyScannedPaths = [];
-  const serverDirectory = silgiInstance.options.serverDir;
+  const serverDirectory = path || silgiInstance.options.serverDir;
   if (!serverDirectory) {
     consola.warn("No server directory specified for scanning");
     return;
@@ -888,7 +673,7 @@ async function scanExportFile(silgiInstance) {
     }
     for (const relativeFilePath of matchedFiles.sort()) {
       const absoluteFilePath = resolve(silgiInstance.options.rootDir, relativeFilePath);
-      if (alreadyScannedPaths.find((path) => absoluteFilePath.startsWith(withTrailingSlash(path))) || isIgnored(absoluteFilePath, silgiInstance) || processedFilePaths.has(absoluteFilePath)) {
+      if (alreadyScannedPaths.find((path2) => absoluteFilePath.startsWith(withTrailingSlash(path2))) || isIgnored(absoluteFilePath, silgiInstance) || processedFilePaths.has(absoluteFilePath)) {
         continue;
       }
       processedFilePaths.add(absoluteFilePath);
@@ -923,6 +708,222 @@ async function scanExportFile(silgiInstance) {
   }
 }
 
+const MissingModuleMatcher = /Cannot find module\s+['"]?([^'")\s]+)['"]?/i;
+async function _resolveSilgiModule(silgiModule, silgi) {
+  let resolvedModulePath;
+  let buildTimeModuleMeta = {};
+  const jiti = createJiti(silgi.options.rootDir, {
+    alias: silgi.options.alias,
+    fsCache: true,
+    moduleCache: true
+  });
+  if (typeof silgiModule === "string") {
+    silgiModule = resolveAlias(silgiModule, silgi.options.alias);
+    if (isRelative(silgiModule)) {
+      silgiModule = resolve(silgi.options.rootDir, silgiModule);
+    }
+    try {
+      const src = resolveModuleURL(silgiModule, {
+        from: silgi.options.modulesDir.map((m) => directoryToURL(m.replace(/\/node_modules\/?$/, "/"))),
+        suffixes: ["silgi", "silgi/index", "module", "module/index", "", "index"],
+        extensions: [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
+        // Maybe add https://github.com/unjs/exsolve/blob/dfff3e9bbc4a3a173a2d56b9b9ff731ab15598be/src/resolve.ts#L7
+        // conditions: silgi.options.conditions,
+      });
+      resolvedModulePath = fileURLToPath(src);
+      const resolvedSilgiModule = await jiti.import(src, { default: true });
+      if (typeof resolvedSilgiModule !== "function") {
+        throw new TypeError(`Nuxt module should be a function: ${silgiModule}.`);
+      }
+      silgiModule = await jiti.import(src, {
+        default: true,
+        conditions: silgi.options.conditions
+      });
+      const moduleMetadataPath = new URL("module.json", src);
+      scanSilgiExports(join(src, "runtime"));
+      if (existsSync(moduleMetadataPath)) {
+        buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
+      } else {
+        if (typeof silgiModule === "function") {
+          const meta = await silgiModule.getMeta?.();
+          const _exports = await scanExports(resolvedModulePath, true);
+          buildTimeModuleMeta = {
+            ...meta,
+            exports: _exports.map(({ from, ...rest }) => rest)
+          };
+        }
+      }
+    } catch (error) {
+      const code = error.code;
+      if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "ERR_MODULE_NOT_FOUND" || code === "ERR_UNSUPPORTED_DIR_IMPORT" || code === "ENOTDIR") {
+        throw new TypeError(`Could not load \`${silgiModule}\`. Is it installed?`);
+      }
+      if (code === "MODULE_NOT_FOUND" || code === "ERR_MODULE_NOT_FOUND") {
+        const module = MissingModuleMatcher.exec(error.message)?.[1];
+        if (module && !module.includes(silgiModule)) {
+          throw new TypeError(`Error while importing module \`${silgiModule}\`: ${error}`);
+        }
+      }
+    }
+  }
+  if (!buildTimeModuleMeta) {
+    throw new Error(`Module ${silgiModule} is not a valid Silgi module`);
+  }
+  if (typeof silgiModule === "function") {
+    if (!buildTimeModuleMeta.configKey) {
+      const meta = await silgiModule.getMeta?.();
+      buildTimeModuleMeta = {
+        ...meta,
+        exports: []
+      };
+    }
+    if (silgi.scanModules.some((m) => m.meta?.configKey === buildTimeModuleMeta.configKey)) {
+      throw new Error(`Module with key \`${buildTimeModuleMeta.configKey}\` already exists`);
+    }
+    const options = await silgiModule.getOptions?.() || {};
+    if (options) {
+      silgi.options._c12.config[buildTimeModuleMeta.configKey] = defu(
+        silgi.options._c12.config[buildTimeModuleMeta.configKey] || {},
+        options || {}
+      );
+    } else {
+      throw new TypeError(`Could not load \`${silgiModule}\`. Is it installed?`);
+    }
+    silgi.scanModules.push({
+      meta: buildTimeModuleMeta,
+      entryPath: resolvedModulePath || void 0,
+      installed: false,
+      options,
+      module: silgiModule
+    });
+  }
+}
+async function scanModules$1(silgi) {
+  const _modules = [
+    ...silgi.options._modules,
+    ...silgi.options.modules
+  ];
+  for await (const mod of _modules) {
+    await _resolveSilgiModule(mod, silgi);
+  }
+  const moduleMap = new Map(
+    silgi.scanModules.map((m) => [m.meta?.configKey, m])
+  );
+  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;
+    if (!key) {
+      return;
+    }
+    const requiredDeps = module.meta?.requiredDependencies || [];
+    const beforeDeps = module.meta?.beforeDependencies || [];
+    const afterDeps = module.meta?.afterDependencies || [];
+    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)) {
+        return;
+      }
+      graph.get(dep)?.add(key);
+      inDegree.set(key, (inDegree.get(key) || 0) + 1);
+    });
+  });
+  return { graph, inDegree };
+}
+function findCyclicDependencies(graph) {
+  const visited = /* @__PURE__ */ new Set();
+  const recursionStack = /* @__PURE__ */ new Set();
+  const cycles = [];
+  function dfs(node, path = []) {
+    visited.add(node);
+    recursionStack.add(node);
+    path.push(node);
+    for (const neighbor of graph.get(node) || []) {
+      if (recursionStack.has(neighbor)) {
+        const cycleStart = path.indexOf(neighbor);
+        if (cycleStart !== -1) {
+          cycles.push([...path.slice(cycleStart), neighbor]);
+        }
+      } else if (!visited.has(neighbor)) {
+        dfs(neighbor, [...path]);
+      }
+    }
+    recursionStack.delete(node);
+    path.pop();
+  }
+  for (const node of graph.keys()) {
+    if (!visited.has(node)) {
+      dfs(node, []);
+    }
+  }
+  return cycles;
+}
+function topologicalSort(graphData) {
+  const { graph, inDegree } = graphData;
+  const order = [];
+  const queue = [];
+  for (const [node, degree] of inDegree.entries()) {
+    if (degree === 0) {
+      queue.push(node);
+    }
+  }
+  while (queue.length > 0) {
+    const node = queue.shift();
+    order.push(node);
+    const neighbors = Array.from(graph.get(node) || []);
+    for (const neighbor of neighbors) {
+      const newDegree = (inDegree.get(neighbor) || 0) - 1;
+      inDegree.set(neighbor, newDegree);
+      if (newDegree === 0) {
+        queue.push(neighbor);
+      }
+    }
+  }
+  if (order.length !== graph.size) {
+    const cycles = findCyclicDependencies(graph);
+    if (cycles.length > 0) {
+      const cycleStr = cycles.map((cycle) => `  ${cycle.join(" -> ")}`).join("\n");
+      throw new Error(`Circular dependencies detected:
+${cycleStr}`);
+    } else {
+      const unresolvedModules = Array.from(graph.keys()).filter((key) => !order.includes(key));
+      throw new Error(`Unable to resolve dependencies for modules: ${unresolvedModules.join(", ")}`);
+    }
+  }
+  return order;
+}
+
 async function readScanFile(silgi) {
   const path = resolve(silgi.options.silgi.serverDir, "scan.ts");
   const context = await promises.readFile(path, { encoding: "utf-8" });
@@ -1382,7 +1383,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
   }
   await scanAndSyncOptions(silgi);
   await scanModules$1(silgi);
-  await scanExportFile(silgi);
+  await scanSilgiExports();
   await installModules(silgi, true);
   useCLIRuntimeConfig(silgi);
   await writeScanFiles(silgi);

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.34.5";
+const version = "0.34.6";
 const packageJson = {
 	version: version};
 

package/package.json

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