silgi 0.21.8 → 0.22.1

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.21.8";
+const version = "0.22.1";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/compatibility.mjs

@@ -1,15 +1,7 @@
-import { tryUseSilgiCLI, useSilgiCLI } from 'silgi/core';
 import satisfies from 'semver/functions/satisfies.js';
+import { useSilgiCLI } from 'silgi/core';
 import { version } from 'silgi/meta';
 
-function hasError(type, silgi) {
-  silgi = silgi ?? tryUseSilgiCLI() ?? void 0;
-  if (silgi && silgi.errors.some((error) => error.type === type)) {
-    return true;
-  }
-  return false;
-}
-
 const SEMANTIC_VERSION_RE = /-\d+\.[0-9a-f]+/;
 function normalizeSemanticVersion(version) {
   return version.replace(SEMANTIC_VERSION_RE, "");
@@ -35,4 +27,4 @@ function hasInstalledModule(moduleKey, silgi = useSilgiCLI()) {
   return find?.installed ?? false;
 }
 
-export { hasInstalledModule as a, checkSilgiCompatibility as c, hasError as h };
+export { checkSilgiCompatibility as c, hasInstalledModule as h };

package/dist/cli/prepare.mjs

@@ -1,10 +1,10 @@
 import { defineCommand, runCommand } from 'citty';
 import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
 import { peerDependencies, version } from 'silgi/meta';
-import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, parseServices, normalizeTemplate, useLogger, initRuntimeConfig, resolveSilgiPath, isDirectory } from 'silgi/kit';
+import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, normalizeTemplate, useLogger, initRuntimeConfig, resolveSilgiPath, isDirectory } from 'silgi/kit';
 import { existsSync, promises, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
-import consola$1, { consola } from 'consola';
+import consola, { consola as consola$1 } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
 import { useSilgiCLI, silgiCLICtx } from 'silgi/core';
 import { runtimeDir } from 'silgi/runtime/meta';
@@ -15,7 +15,7 @@ import * as p from '@clack/prompts';
 import * as dotenv from 'dotenv';
 import { resolveModuleExportNames, findTypeExports, findExports, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { createJiti } from 'dev-jiti';
-import { a as hasInstalledModule, h as hasError } from './compatibility.mjs';
+import { h as hasInstalledModule } from './compatibility.mjs';
 import { fileURLToPath } from 'node:url';
 import defu, { defu as defu$1 } from 'defu';
 import { resolveModuleURL } from 'exsolve';
@@ -435,6 +435,9 @@ async function registerModuleExportScan(silgi) {
   silgi.hook("prepare:schema.ts", async (options) => {
     for (const module of silgi.scanModules) {
       const moduleReExports = [];
+      if (!module.entryPath) {
+        continue;
+      }
       const moduleTypes = await promises.readFile(module.entryPath.replace(/\.mjs$/, "Types.d.ts"), "utf8").catch(() => "");
       const normalisedModuleTypes = moduleTypes.replace(/export\s*\{.*?\}/gs, (match) => match.replace(/\b(type|interface)\b/g, ""));
       for (const e of findTypeExports(normalisedModuleTypes)) {
@@ -574,10 +577,10 @@ async function installModules(silgi, prepare = false) {
       silgi.logger.info(`Module ${module.meta.configKey} installed`);
     }
     try {
-      const silgiModule = await jiti.import(module.entryPath, {
+      const silgiModule = module.entryPath !== void 0 ? await jiti.import(module.entryPath, {
         default: true,
         conditions: silgi.options.conditions
-      });
+      }) : module.module;
       if (silgiModule.name !== "silgiNormalizedModule") {
         silgi.scanModules = silgi.scanModules.filter((m) => m.entryPath !== module.entryPath);
         continue;
@@ -612,7 +615,9 @@ async function _resolveSilgiModule(silgiModule, silgi) {
   let resolvedModulePath;
   let buildTimeModuleMeta = {};
   const jiti = createJiti(silgi.options.rootDir, {
-    alias: silgi.options.alias
+    alias: silgi.options.alias,
+    fsCache: true,
+    moduleCache: true
   });
   if (typeof silgiModule === "string") {
     silgiModule = resolveAlias(silgiModule, silgi.options.alias);
@@ -666,6 +671,13 @@ async function _resolveSilgiModule(silgiModule, silgi) {
     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`);
     }
@@ -680,9 +692,10 @@ async function _resolveSilgiModule(silgiModule, silgi) {
     }
     silgi.scanModules.push({
       meta: buildTimeModuleMeta,
-      entryPath: resolvedModulePath || "",
+      entryPath: resolvedModulePath || void 0,
       installed: false,
-      options
+      options,
+      module: silgiModule
     });
   }
 }
@@ -855,252 +868,6 @@ async function commands(silgi) {
   });
 }
 
-function buildUriMap(silgi, currentPath = []) {
-  const uriMap = /* @__PURE__ */ new Map();
-  function traverse(node, path = []) {
-    if (!node || typeof node !== "object")
-      return;
-    if (path.length === 4) {
-      const basePath = path.join("/");
-      let pathString = "";
-      if (node.pathParams) {
-        let paths = null;
-        if (node.pathParams?._def?.typeName !== void 0) {
-          try {
-            const shape = node.pathParams?.shape;
-            paths = shape ? Object.keys(shape) : null;
-          } catch {
-            paths = null;
-          }
-        }
-        if (paths?.length) {
-          pathString = paths.map((p) => `:${p}`).join("/");
-        }
-      }
-      uriMap.set(basePath, pathString);
-      return;
-    }
-    for (const key in node) {
-      if (!["_type", "fields"].includes(key)) {
-        traverse(node[key], [...path, key]);
-      }
-    }
-  }
-  traverse(silgi.schemas, currentPath);
-  silgi.uris = defu$1(silgi.uris, Object.fromEntries(uriMap));
-  return uriMap;
-}
-
-async function readScanFile(silgi) {
-  const path = resolve(silgi.options.silgi.serverDir, "scan.ts");
-  const context = await promises.readFile(path, { encoding: "utf-8" });
-  silgi.unimport = createUnimport(silgi.options.imports || {});
-  await silgi.unimport.init();
-  const injectedResult = await silgi.unimport.injectImports(context, path);
-  if (!injectedResult) {
-    throw new Error("Failed to inject imports");
-  }
-  const jiti = createJiti(silgi.options.rootDir, {
-    fsCache: true,
-    moduleCache: false,
-    debug: silgi.options.debug,
-    alias: silgi.options.alias
-  });
-  try {
-    if (silgi.options.commandType === "prepare") {
-      globalThis.$silgiSharedRuntimeConfig = silgi.options.runtimeConfig;
-      injectedResult.code = `globalThis.$silgiSharedRuntimeConfig = ${JSON.stringify(silgi.options.runtimeConfig)};
-${injectedResult.code}`;
-      injectedResult.code = injectedResult.code.replace(/runtimeConfig: \{\}/, `runtimeConfig: ${JSON.stringify(silgi.options.runtimeConfig)}`);
-    }
-    const scanFile = await jiti.evalModule(
-      injectedResult.code,
-      {
-        filename: path,
-        async: true,
-        conditions: silgi.options.conditions
-      },
-      async (data, name) => {
-        return (await silgi.unimport.injectImports(data, name)).code;
-      }
-    );
-    silgi.uris = defu$1(silgi.uris, scanFile.uris) || {};
-    silgi.schemas = defu$1(scanFile.schemas, scanFile.uris) || {};
-    silgi.services = defu$1(scanFile.services, scanFile.uris) || {};
-    silgi.shareds = defu$1(scanFile.shareds, scanFile.shareds) || {};
-    silgi.modulesURIs = defu$1(scanFile.modulesURIs, scanFile.modulesURIs) || {};
-    return {
-      context,
-      object: {
-        schemas: scanFile.schemas,
-        uris: scanFile.uris,
-        services: scanFile.services,
-        shareds: scanFile.shareds,
-        modulesURIs: scanFile.modulesURIs
-      },
-      path
-    };
-  } catch (error) {
-    if (silgi.options.debug) {
-      console.error("Failed to read scan.ts file:", error);
-    } else {
-      if (error instanceof Error) {
-        consola.withTag("silgi").info(error.message);
-      }
-    }
-    return {
-      context,
-      object: {
-        schemas: {},
-        uris: {},
-        services: {},
-        shareds: {},
-        modulesURIs: {}
-      },
-      path
-    };
-  }
-}
-
-async function prepareServerFiles(silgi) {
-  const importItems = {
-    "silgi": {
-      import: [
-        { name: "createSilgi", key: "createSilgi" },
-        { name: "createShared", key: "createShared" }
-      ],
-      from: "silgi"
-    },
-    "silgi/types": {
-      import: [
-        { name: "SilgiRuntimeOptions", type: true, key: "SilgiRuntimeOptions" },
-        { name: "FrameworkContext", type: true, key: "FrameworkContext" }
-      ],
-      from: "silgi/types"
-    },
-    "#silgi/vfs": {
-      import: [],
-      from: "./vfs"
-    },
-    "configs.ts": {
-      import: [
-        {
-          name: "cliConfigs",
-          type: false,
-          key: "cliConfigs"
-        }
-      ],
-      from: "./configs.ts"
-    }
-  };
-  const scanned = {
-    uris: {},
-    services: [],
-    shareds: [
-      `createShared({
-        modulesURIs,
-      })`
-    ],
-    schemas: [],
-    modulesURIs: {},
-    customImports: [],
-    importItems
-  };
-  if (silgi.uris) {
-    defu$1(scanned.uris, silgi.uris);
-  }
-  if (silgi.modulesURIs) {
-    defu$1(scanned.modulesURIs, silgi.modulesURIs);
-  }
-  await silgi.callHook("prepare:scan.ts", scanned);
-  if (importItems["#silgi/vfs"].import.length === 0) {
-    delete importItems["#silgi/vfs"];
-  }
-  if (scanned.services.length > 0) {
-    importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
-  }
-  if (scanned.shareds.length > 0) {
-    importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
-  }
-  if (scanned.schemas.length > 0) {
-    importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
-  }
-  for (const key in importItems) {
-    importItems[key].import = deduplicateImportsByKey(importItems[key].import);
-  }
-  const importsContent = [
-    ...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
-      if (silgi.options.typescript.removeFileExtension) {
-        from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
-      }
-      return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${from}'`;
-    }),
-    "",
-    ...scanned.customImports,
-    ""
-  ];
-  const importData = [
-    `export const uris = ${JSON.stringify(scanned.uris, null, 2)}`,
-    "",
-    `export const modulesURIs = ${JSON.stringify(scanned.modulesURIs, null, 2)}`,
-    "",
-    scanned.schemas.length > 0 ? "export const schemas = mergeSchemas([" : "export const schemas = {",
-    ...scanned.schemas.map((name) => {
-      return `  ${name},`;
-    }),
-    scanned.schemas.length > 0 ? "])" : "}",
-    "",
-    scanned.services.length > 0 ? "export const services = mergeServices([" : "export const services = {",
-    ...scanned.services.map((name) => {
-      return `  ${name},`;
-    }),
-    scanned.services.length > 0 ? "])" : "}",
-    "",
-    scanned.shareds.length > 0 ? "export const shareds = mergeShared([" : "export const shareds = {",
-    ...scanned.shareds.map((name) => {
-      return `  ${name},`;
-    }),
-    scanned.shareds.length > 0 ? "])" : "}",
-    ""
-  ];
-  await silgi.callHook("after:prepare:scan.ts", importData);
-  importData.unshift(...importsContent);
-  return importData;
-}
-function deduplicateImportsByKey(imports) {
-  const seenKeys = /* @__PURE__ */ new Map();
-  return imports.filter((item) => {
-    if (seenKeys.has(item.key)) {
-      return false;
-    }
-    seenKeys.set(item.key, true);
-    return true;
-  });
-}
-
-async function writeScanFiles(silgi) {
-  const data = await prepareServerFiles(silgi);
-  if (!silgi.errors.length) {
-    await writeFile(
-      resolve(silgi.options.silgi.serverDir, "scan.ts"),
-      data.join("\n")
-    );
-  }
-  await readScanFile(silgi);
-  buildUriMap(silgi);
-  parseServices(silgi);
-  silgi.hook("prepare:scan.ts", (file) => {
-    file.uris = {
-      ...file.uris,
-      ...silgi.uris
-    };
-    file.modulesURIs = {
-      ...file.modulesURIs,
-      ...silgi.modulesURIs
-    };
-  });
-}
-
 function resolveIgnorePatterns(silgi, relativePath) {
   if (!silgi) {
     return [];
@@ -1172,7 +939,7 @@ class SchemaParser {
         type: "Parser",
         path
       });
-      consola$1.warn("This file has a problem:", path);
+      consola.warn("This file has a problem:", path);
     }
     const variableDeclarations = ast.program.body.filter((i) => i.type === "ExportNamedDeclaration").filter((i) => i.declaration?.type === "VariableDeclaration");
     return variableDeclarations;
@@ -1184,7 +951,7 @@ class SchemaParser {
         type: "Parser",
         path
       });
-      consola$1.warn("This file has a problem:", path);
+      consola.warn("This file has a problem:", path);
     }
     const interfaceDeclarations = ast.program.body.filter((i) => i.type === "ExportNamedDeclaration").filter((i) => i.declaration?.type === "TSInterfaceDeclaration");
     return interfaceDeclarations;
@@ -1293,7 +1060,7 @@ class SchemaParser {
   // }
 }
 
-async function scanFiles$1(silgi, watchFiles) {
+async function scanExportFile(silgi) {
   const filePaths = /* @__PURE__ */ new Set();
   const scannedPaths = [];
   const dir = silgi.options.serverDir;
@@ -1307,7 +1074,7 @@ async function scanFiles$1(silgi, watchFiles) {
       if (caseCorrected) {
         const original = relative(silgi.options.serverDir, dir);
         const corrected = relative(silgi.options.serverDir, join(dirname(dir), caseCorrected));
-        consola.warn(`Components not scanned from \`~/${corrected}\`. Did you mean to name the directory \`~/${original}\` instead?`);
+        consola$1.warn(`Components not scanned from \`~/${corrected}\`. Did you mean to name the directory \`~/${original}\` instead?`);
       }
     }
   }
@@ -1334,7 +1101,6 @@ async function scanFiles$1(silgi, watchFiles) {
       const schemaTS = [];
       if (createServices.length > 0) {
         scanTS.push(...createServices.map(({ exportName, path }) => {
-          silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
           return { exportName, path, _name, type: "service" };
@@ -1346,7 +1112,6 @@ async function scanFiles$1(silgi, watchFiles) {
       }
       if (createSchemas.length > 0) {
         scanTS.push(...createSchemas.map(({ exportName, path }) => {
-          silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
           return { exportName, path, _name, type: "schema" };
@@ -1358,7 +1123,6 @@ async function scanFiles$1(silgi, watchFiles) {
       }
       if (createShareds.length > 0) {
         scanTS.push(...createShareds.map(({ exportName, path }) => {
-          silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
           return { exportName, path, _name, type: "shared" };
@@ -1370,7 +1134,6 @@ async function scanFiles$1(silgi, watchFiles) {
       }
       if (sharedsTypes.length > 0) {
         schemaTS.push(...sharedsTypes.map(({ exportName, path }) => {
-          silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
           return { exportName, path, _name, type: "shared" };
@@ -1382,7 +1145,6 @@ async function scanFiles$1(silgi, watchFiles) {
       }
       if (contextTypes.length > 0) {
         schemaTS.push(...contextTypes.map(({ exportName, path }) => {
-          silgi.options.devServer.watch.push(path);
           const randomString = hash(basename(path) + exportName);
           const _name = `_v${randomString}`;
           return { exportName, path, _name, type: "context" };
@@ -1390,6 +1152,9 @@ async function scanFiles$1(silgi, watchFiles) {
       }
       silgi.hook("prepare:scan.ts", (options) => {
         for (const { exportName, path, _name, type } of scanTS) {
+          if (!path.includes("vfs")) {
+            silgi.options.devServer.watch.push(path);
+          }
           if (type === "service") {
             options.services.push(_name);
           }
@@ -1411,6 +1176,9 @@ async function scanFiles$1(silgi, watchFiles) {
       });
       silgi.hook("prepare:schema.ts", (options) => {
         for (const { exportName, path, _name, type } of schemaTS) {
+          if (!path.includes("vfs")) {
+            silgi.options.devServer.watch.push(path);
+          }
           if (type === "shared") {
             options.shareds.push({
               key: _name,
@@ -1437,6 +1205,252 @@ async function scanFiles$1(silgi, watchFiles) {
   }
 }
 
+function buildUriMap(silgi, currentPath = []) {
+  const uriMap = /* @__PURE__ */ new Map();
+  function traverse(node, path = []) {
+    if (!node || typeof node !== "object")
+      return;
+    if (path.length === 4) {
+      const basePath = path.join("/");
+      let pathString = "";
+      if (node.pathParams) {
+        let paths = null;
+        if (node.pathParams?._def?.typeName !== void 0) {
+          try {
+            const shape = node.pathParams?.shape;
+            paths = shape ? Object.keys(shape) : null;
+          } catch {
+            paths = null;
+          }
+        }
+        if (paths?.length) {
+          pathString = paths.map((p) => `:${p}`).join("/");
+        }
+      }
+      uriMap.set(basePath, pathString);
+      return;
+    }
+    for (const key in node) {
+      if (!["_type", "fields"].includes(key)) {
+        traverse(node[key], [...path, key]);
+      }
+    }
+  }
+  traverse(silgi.schemas, currentPath);
+  silgi.uris = defu$1(silgi.uris, Object.fromEntries(uriMap));
+  return uriMap;
+}
+
+async function readScanFile(silgi) {
+  const path = resolve(silgi.options.silgi.serverDir, "scan.ts");
+  const context = await promises.readFile(path, { encoding: "utf-8" });
+  silgi.unimport = createUnimport(silgi.options.imports || {});
+  await silgi.unimport.init();
+  const injectedResult = await silgi.unimport.injectImports(context, path);
+  if (!injectedResult) {
+    throw new Error("Failed to inject imports");
+  }
+  const jiti = createJiti(silgi.options.rootDir, {
+    fsCache: true,
+    moduleCache: false,
+    debug: silgi.options.debug,
+    alias: silgi.options.alias
+  });
+  try {
+    if (silgi.options.commandType === "prepare") {
+      globalThis.$silgiSharedRuntimeConfig = silgi.options.runtimeConfig;
+      injectedResult.code = `globalThis.$silgiSharedRuntimeConfig = ${JSON.stringify(silgi.options.runtimeConfig)};
+${injectedResult.code}`;
+      injectedResult.code = injectedResult.code.replace(/runtimeConfig: \{\}/, `runtimeConfig: ${JSON.stringify(silgi.options.runtimeConfig)}`);
+    }
+    const scanFile = await jiti.evalModule(
+      injectedResult.code,
+      {
+        filename: path,
+        async: true,
+        conditions: silgi.options.conditions
+      },
+      async (data, name) => {
+        return (await silgi.unimport.injectImports(data, name)).code;
+      }
+    );
+    silgi.uris = defu$1(silgi.uris, scanFile.uris) || {};
+    silgi.schemas = defu$1(scanFile.schemas, scanFile.uris) || {};
+    silgi.services = defu$1(scanFile.services, scanFile.uris) || {};
+    silgi.shareds = defu$1(scanFile.shareds, scanFile.shareds) || {};
+    silgi.modulesURIs = defu$1(scanFile.modulesURIs, scanFile.modulesURIs) || {};
+    return {
+      context,
+      object: {
+        schemas: scanFile.schemas,
+        uris: scanFile.uris,
+        services: scanFile.services,
+        shareds: scanFile.shareds,
+        modulesURIs: scanFile.modulesURIs
+      },
+      path
+    };
+  } catch (error) {
+    if (silgi.options.debug) {
+      console.error("Failed to read scan.ts file:", error);
+    } else {
+      if (error instanceof Error) {
+        consola$1.withTag("silgi").info(error.message);
+      }
+    }
+    return {
+      context,
+      object: {
+        schemas: {},
+        uris: {},
+        services: {},
+        shareds: {},
+        modulesURIs: {}
+      },
+      path
+    };
+  }
+}
+
+async function prepareServerFiles(silgi) {
+  const importItems = {
+    "silgi": {
+      import: [
+        { name: "createSilgi", key: "createSilgi" },
+        { name: "createShared", key: "createShared" }
+      ],
+      from: "silgi"
+    },
+    "silgi/types": {
+      import: [
+        { name: "SilgiRuntimeOptions", type: true, key: "SilgiRuntimeOptions" },
+        { name: "FrameworkContext", type: true, key: "FrameworkContext" }
+      ],
+      from: "silgi/types"
+    },
+    "#silgi/vfs": {
+      import: [],
+      from: "./vfs"
+    },
+    "configs.ts": {
+      import: [
+        {
+          name: "cliConfigs",
+          type: false,
+          key: "cliConfigs"
+        }
+      ],
+      from: "./configs.ts"
+    }
+  };
+  const scanned = {
+    uris: {},
+    services: [],
+    shareds: [
+      `createShared({
+        modulesURIs,
+      })`
+    ],
+    schemas: [],
+    modulesURIs: {},
+    customImports: [],
+    importItems
+  };
+  if (silgi.uris) {
+    defu$1(scanned.uris, silgi.uris);
+  }
+  if (silgi.modulesURIs) {
+    defu$1(scanned.modulesURIs, silgi.modulesURIs);
+  }
+  await silgi.callHook("prepare:scan.ts", scanned);
+  if (importItems["#silgi/vfs"].import.length === 0) {
+    delete importItems["#silgi/vfs"];
+  }
+  if (scanned.services.length > 0) {
+    importItems.silgi.import.push({ name: "mergeServices", key: "mergeServices" });
+  }
+  if (scanned.shareds.length > 0) {
+    importItems.silgi.import.push({ name: "mergeShared", key: "mergeShared" });
+  }
+  if (scanned.schemas.length > 0) {
+    importItems.silgi.import.push({ name: "mergeSchemas", key: "mergeSchemas" });
+  }
+  for (const key in importItems) {
+    importItems[key].import = deduplicateImportsByKey(importItems[key].import);
+  }
+  const importsContent = [
+    ...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
+      if (silgi.options.typescript.removeFileExtension) {
+        from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
+      }
+      return `import { ${imports.map(({ type, name }) => type ? `type ${name}` : name).join(", ")} } from '${from}'`;
+    }),
+    "",
+    ...scanned.customImports,
+    ""
+  ];
+  const importData = [
+    `export const uris = ${JSON.stringify(scanned.uris, null, 2)}`,
+    "",
+    `export const modulesURIs = ${JSON.stringify(scanned.modulesURIs, null, 2)}`,
+    "",
+    scanned.schemas.length > 0 ? "export const schemas = mergeSchemas([" : "export const schemas = {",
+    ...scanned.schemas.map((name) => {
+      return `  ${name},`;
+    }),
+    scanned.schemas.length > 0 ? "])" : "}",
+    "",
+    scanned.services.length > 0 ? "export const services = mergeServices([" : "export const services = {",
+    ...scanned.services.map((name) => {
+      return `  ${name},`;
+    }),
+    scanned.services.length > 0 ? "])" : "}",
+    "",
+    scanned.shareds.length > 0 ? "export const shareds = mergeShared([" : "export const shareds = {",
+    ...scanned.shareds.map((name) => {
+      return `  ${name},`;
+    }),
+    scanned.shareds.length > 0 ? "])" : "}",
+    ""
+  ];
+  await silgi.callHook("after:prepare:scan.ts", importData);
+  importData.unshift(...importsContent);
+  return importData;
+}
+function deduplicateImportsByKey(imports) {
+  const seenKeys = /* @__PURE__ */ new Map();
+  return imports.filter((item) => {
+    if (seenKeys.has(item.key)) {
+      return false;
+    }
+    seenKeys.set(item.key, true);
+    return true;
+  });
+}
+
+async function writeScanFiles(silgi) {
+  const data = await prepareServerFiles(silgi);
+  if (!silgi.errors.length) {
+    await writeFile(
+      resolve(silgi.options.silgi.serverDir, "scan.ts"),
+      data.join("\n")
+    );
+  }
+  await readScanFile(silgi);
+  buildUriMap(silgi);
+  parseServices(silgi);
+  silgi.hook("prepare:scan.ts", (file) => {
+    file.uris = {
+      ...file.uris,
+      ...silgi.uris
+    };
+    file.modulesURIs = {
+      ...file.modulesURIs,
+      ...silgi.modulesURIs
+    };
+  });
+}
+
 async function createStorageCLI(silgi) {
   const storage = createStorage();
   const mounts = klona({
@@ -1661,7 +1675,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
     errors: [],
     commands: {},
     _requiredModules: {},
-    logger: consola.withTag("silgi"),
+    logger: consola$1.withTag("silgi"),
     close: () => silgi.hooks.callHook("close", silgi),
     storage: void 0,
     scanModules: [],
@@ -1696,7 +1710,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
   }
   await scanAndSyncOptions(silgi);
   await scanModules$1(silgi);
-  await scanFiles$1(silgi);
+  await scanExportFile(silgi);
   await installModules(silgi, true);
   await writeScanFiles(silgi);
   silgi.storage = await createStorageCLI(silgi);
@@ -2477,7 +2491,7 @@ const run = defineCommand({
       rawArgs: ["--commands", "run"]
     }) : void 0;
     if (!data?.result?.silgi && args.active) {
-      consola.error("Silgi not found");
+      consola$1.error("Silgi not found");
       return;
     }
     const silgi = useSilgiCLI();
@@ -2508,11 +2522,11 @@ const run = defineCommand({
       }
     } else {
       if (!silgi) {
-        consola.error("Silgi not found");
+        consola$1.error("Silgi not found");
         return;
       }
       if (Object.keys(cliJson).length === 0) {
-        consola.warn("No commands found in cli.json");
+        consola$1.warn("No commands found in cli.json");
         return;
       }
       const allTags = Object.values(silgi.commands).reduce((acc, commandGroup) => {

package/dist/cli/types.mjs

@@ -557,7 +557,6 @@ async function _loadUserConfig(configOverrides = {}, opts = {}) {
     defaults: SilgiCLIDefaults,
     jitiOptions: {
       alias: {
-        "silgi": "silgi/config",
         "silgi/config": "silgi/config"
       }
     },

package/dist/kit/index.mjs

@@ -1,16 +1,15 @@
-import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
-export { h as hasError } from '../cli/compatibility.mjs';
+import { tryUseSilgiCLI, useSilgiCLI, useSilgi, tryUseSilgi } from 'silgi/core';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { resolvePath as resolvePath$1 } from 'mlly';
 import fsp from 'node:fs/promises';
 import consola, { consola as consola$1 } from 'consola';
 import { relative, resolve, dirname, normalize, isAbsolute, join, parse, basename } from 'pathe';
-import { useSilgiCLI, useSilgi, tryUseSilgiCLI, tryUseSilgi } from 'silgi/core';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
 import { hash as hash$1 } from 'ohash';
 import { camelCase, snakeCase } from 'scule';
 import { defu } from 'defu';
+import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { withLeadingSlash } from 'ufo';
 import { existsSync, promises } from 'node:fs';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
@@ -20,6 +19,14 @@ import { hash as hash$2 } from 'silgi/kit';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
 
+function hasError(type, silgi) {
+  silgi = silgi ?? tryUseSilgiCLI() ?? void 0;
+  if (silgi && silgi.errors.some((error) => error.type === type)) {
+    return true;
+  }
+  return false;
+}
+
 function directoryToURL(dir) {
   return pathToFileURL(`${dir}/`);
 }
@@ -563,4 +570,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.21.8";
+const version = "0.22.1";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.21.8";
+const version = "0.22.1";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/types/index.d.mts

@@ -6,7 +6,7 @@ import { Hookable, NestedHooks } from 'hookable';
 import { Ignore, Options } from 'ignore';
 import { TSConfig } from 'pkg-types';
 import { PresetName, PresetOptions, PresetNameInput } from 'silgi/presets';
-import { ResolvedServiceType as ResolvedServiceType$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, SilgiRuntimeOptions as SilgiRuntimeOptions$1, RouteRules as RouteRules$1, ModuleMeta as ModuleMeta$1, SilgiRouteRules as SilgiRouteRules$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, ServiceParseModule as ServiceParseModule$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
+import { ResolvedServiceType as ResolvedServiceType$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, SilgiRuntimeOptions as SilgiRuntimeOptions$1, RouteRules as RouteRules$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, SilgiRouteRules as SilgiRouteRules$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, ServiceParseModule as ServiceParseModule$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
 import { UnimportPluginOptions } from 'unimport/unplugin';
 import { Defu } from 'defu';
 import { Stats } from 'node:fs';
@@ -70,8 +70,9 @@ interface SilgiCLI {
     updateConfig: (config: SilgiCLIDynamicConfig) => void | Promise<void>;
     scanModules: Array<{
         meta: ModuleMeta$1;
+        module: SilgiModule$1;
         timings?: Record<string, number | undefined>;
-        entryPath: string;
+        entryPath?: string;
         installed?: boolean;
         options: Record<string, any>;
     }>;

package/dist/types/index.d.ts

@@ -6,7 +6,7 @@ import { Hookable, NestedHooks } from 'hookable';
 import { Ignore, Options } from 'ignore';
 import { TSConfig } from 'pkg-types';
 import { PresetName, PresetOptions, PresetNameInput } from 'silgi/presets';
-import { ResolvedServiceType as ResolvedServiceType$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, SilgiRuntimeOptions as SilgiRuntimeOptions$1, RouteRules as RouteRules$1, ModuleMeta as ModuleMeta$1, SilgiRouteRules as SilgiRouteRules$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, ServiceParseModule as ServiceParseModule$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
+import { ResolvedServiceType as ResolvedServiceType$1, SilgiRuntimeShareds as SilgiRuntimeShareds$1, SilgiRuntimeOptions as SilgiRuntimeOptions$1, RouteRules as RouteRules$1, ModuleMeta as ModuleMeta$1, SilgiModule as SilgiModule$1, SilgiRouteRules as SilgiRouteRules$1, DotenvOptions as DotenvOptions$1, EnvOptions as EnvOptions$1, SilgiRuntimeConfig as SilgiRuntimeConfig$1, ServiceParseModule as ServiceParseModule$1, SilgiCLIHooks as SilgiCLIHooks$1, StorageMounts as StorageMounts$1, SilgiTemplate as SilgiTemplate$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1 } from 'silgi/types';
 import { UnimportPluginOptions } from 'unimport/unplugin';
 import { Defu } from 'defu';
 import { Stats } from 'node:fs';
@@ -70,8 +70,9 @@ interface SilgiCLI {
     updateConfig: (config: SilgiCLIDynamicConfig) => void | Promise<void>;
     scanModules: Array<{
         meta: ModuleMeta$1;
+        module: SilgiModule$1;
         timings?: Record<string, number | undefined>;
-        entryPath: string;
+        entryPath?: string;
         installed?: boolean;
         options: Record<string, any>;
     }>;

package/package.json

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