silgi 0.17.8 → 0.18.0

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.17.8";
+const version = "0.18.0";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",
@@ -27,6 +27,7 @@ const dependencies = {
 	"dot-prop": "catalog:",
 	dotenv: "catalog:",
 	"escape-string-regexp": "catalog:",
+	exsolve: "^1.0.4",
 	globby: "catalog:",
 	hookable: "catalog:",
 	ignore: "catalog:",

package/dist/cli/dev.mjs

@@ -24,6 +24,7 @@ import 'mlly';
 import 'dev-jiti';
 import 'node:url';
 import 'defu';
+import 'exsolve';
 import 'globby';
 import 'ignore';
 import '@oxc-parser/wasm';

package/dist/cli/prepare.mjs

@@ -23,6 +23,7 @@ import './compatibility.mjs';
 import 'semver/functions/satisfies.js';
 import 'node:url';
 import 'defu';
+import 'exsolve';
 import 'globby';
 import 'ignore';
 import '@oxc-parser/wasm';

package/dist/cli/writeTypesAndFiles.mjs

@@ -2,19 +2,20 @@ import { existsSync, promises, readFileSync, writeFileSync, mkdirSync } from 'no
 import { readdir, readFile } from 'node:fs/promises';
 import consola$1, { consola } from 'consola';
 import { createHooks, createDebugger } from 'hookable';
-import { join, resolve, isAbsolute, relative, dirname, basename, extname } from 'pathe';
+import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
 import { useSilgiCLI, silgiCLICtx } from 'silgi/core';
-import { relativeWithDot, hash, resolveAlias, resolvePath, writeFile, parseServices, normalizeTemplate, useLogger, addTemplate, initRuntimeConfig, hasError as hasError$1, resolveSilgiPath, isDirectory } from 'silgi/kit';
+import { relativeWithDot, hash, resolveAlias, directoryToURL, writeFile, parseServices, normalizeTemplate, useLogger, addTemplate, initRuntimeConfig, hasError as hasError$1, resolveSilgiPath, isDirectory } from 'silgi/kit';
 import { runtimeDir } from 'silgi/runtime/meta';
 import { autoImportTypes } from 'silgi/types';
 import { scanExports, createUnimport, toExports } from 'unimport';
 import { c as createRouteRules } from '../_chunks/routeRules.mjs';
 import { p as prepareEnv } from './env.mjs';
-import { resolveModuleExportNames, resolve as resolve$1, resolvePath as resolvePath$1, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
+import { resolveModuleExportNames, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { createJiti } from 'dev-jiti';
 import { a as hasInstalledModule, h as hasError } from './compatibility.mjs';
-import { pathToFileURL, fileURLToPath } from 'node:url';
+import { fileURLToPath } from 'node:url';
 import defu, { defu as defu$1 } from 'defu';
+import { resolveModuleURL } from 'exsolve';
 import { isRelative, withTrailingSlash } from 'ufo';
 import { globby } from 'globby';
 import ignore from 'ignore';
@@ -387,70 +388,81 @@ async function installModule(moduleToInstall, silgi = useSilgiCLI(), inlineOptio
   }
 }
 
-const logger$1 = consola;
-async function _resolveSilgiModule(mod, silgi) {
-  let _url;
+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
   });
-  if (typeof mod === "string") {
-    const paths = /* @__PURE__ */ new Set();
-    mod = resolveAlias(mod, silgi.options.alias);
-    if (isRelative(mod)) {
-      mod = resolve(silgi.options.rootDir, mod);
+  if (typeof silgiModule === "string") {
+    silgiModule = resolveAlias(silgiModule, silgi.options.alias);
+    if (isRelative(silgiModule)) {
+      silgiModule = resolve(silgi.options.rootDir, silgiModule);
     }
-    paths.add(join(mod, "module"));
-    paths.add(mod);
-    for (const path of paths) {
-      try {
-        const src = isAbsolute(path) ? pathToFileURL(await resolvePath(path, { fallbackToOriginal: false, extensions: silgi.options.extensions })).href : await resolve$1(path, { url: silgi.options.modulesDir.map((m) => pathToFileURL(m.replace(/\/node_modules\/?$/, ""))), extensions: silgi.options.extensions });
-        mod = await jiti.import(src, {
-          default: true,
-          conditions: silgi.options.conditions
-        });
-        _url = fileURLToPath(new URL(src));
-        const moduleMetadataPath = new URL("module.json", src);
-        if (existsSync(moduleMetadataPath)) {
-          buildTimeModuleMeta = JSON.parse(await promises.readFile(moduleMetadataPath, "utf-8"));
-        } else {
-          if (typeof mod === "function") {
-            const meta = await mod.getMeta?.();
-            const _exports = await scanExports(_url, true);
-            buildTimeModuleMeta = {
-              ...meta,
-              exports: _exports.map(({ from, ...rest }) => rest)
-            };
-          }
+    try {
+      console.log(silgi.options.conditions);
+      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)
+          };
         }
-        break;
-      } 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") {
-          continue;
+      }
+    } 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}`);
         }
-        logger$1.error(`Error while importing module \`${mod}\`: ${error}`);
-        throw error;
       }
     }
   }
   if (!buildTimeModuleMeta) {
-    throw new Error(`Module ${mod} is not a valid Silgi module`);
+    throw new Error(`Module ${silgiModule} is not a valid Silgi module`);
   }
-  if (typeof mod === "function") {
+  if (typeof silgiModule === "function") {
     if (silgi.scanModules.some((m) => m.meta?.configKey === buildTimeModuleMeta.configKey)) {
       throw new Error(`Module with key \`${buildTimeModuleMeta.configKey}\` already exists`);
     }
-    const options = await mod.getOptions?.() || {};
+    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: _url,
+      entryPath: resolvedModulePath || "",
       installed: false,
       options
     });
@@ -2126,7 +2138,7 @@ async function writeTypesAndFiles(silgi) {
       }
       let path = resolveAlias$1(i.from, silgi.options.alias);
       if (isAbsolute(path)) {
-        const resolvedPath = await resolvePath$1(i.from, {
+        const resolvedPath = await resolvePath(i.from, {
           url: silgi.options.nodeModulesDirs
         }).catch(() => null);
         if (resolvedPath) {

package/dist/kit/index.d.mts

@@ -6,6 +6,7 @@ import { IncomingMessage } from 'node:http';
 
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
+declare function directoryToURL(dir: string): URL;
 /**
  * Resolve a module from a given root path using an algorithm patterned on
  * the upcoming `import.meta.resolve`. It returns a file URL
@@ -149,4 +150,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.d.ts

@@ -6,6 +6,7 @@ import { IncomingMessage } from 'node:http';
 
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
+declare function directoryToURL(dir: string): URL;
 /**
  * Resolve a module from a given root path using an algorithm patterned on
  * the upcoming `import.meta.resolve`. It returns a file URL
@@ -149,4 +150,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.mjs

@@ -1,5 +1,6 @@
 import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 export { h as hasError } from '../cli/compatibility.mjs';
+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';
@@ -12,7 +13,6 @@ import { useSilgi, tryUseSilgiCLI, useSilgiCLI, tryUseSilgi } from 'silgi/core';
 import { defu } from 'defu';
 import { withLeadingSlash } from 'ufo';
 import { existsSync, promises } from 'node:fs';
-import { fileURLToPath } from 'node:url';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import destr from 'destr';
 import { klona } from 'klona';
@@ -20,6 +20,9 @@ import { hash as hash$2 } from 'silgi/kit';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
 
+function directoryToURL(dir) {
+  return pathToFileURL(`${dir}/`);
+}
 async function tryResolveModule(id, url = import.meta.url) {
   try {
     return await resolvePath$1(id, { url });
@@ -296,6 +299,7 @@ async function isDirectory(path) {
   return (await promises.lstat(path)).isDirectory();
 }
 function resolveAlias(path, alias) {
+  alias ||= tryUseSilgiCLI()?.options.alias || {};
   return resolveAlias$1(path, alias || {});
 }
 function createResolver(base) {
@@ -571,4 +575,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, 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, useSilgiRuntimeConfig, writeFile };
+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, useSilgiRuntimeConfig, writeFile };

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.17.8";
+const version = "0.18.0";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",
@@ -27,6 +27,7 @@ const dependencies = {
 	"dot-prop": "catalog:",
 	dotenv: "catalog:",
 	"escape-string-regexp": "catalog:",
+	exsolve: "^1.0.4",
 	globby: "catalog:",
 	hookable: "catalog:",
 	ignore: "catalog:",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.17.8";
+const version = "0.18.0";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",
@@ -27,6 +27,7 @@ const dependencies = {
 	"dot-prop": "catalog:",
 	dotenv: "catalog:",
 	"escape-string-regexp": "catalog:",
+	exsolve: "^1.0.4",
 	globby: "catalog:",
 	hookable: "catalog:",
 	ignore: "catalog:",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.17.8",
+  "version": "0.18.0",
   "private": false,
   "sideEffects": false,
   "exports": {
@@ -126,6 +126,7 @@
     "dot-prop": "^9.0.0",
     "dotenv": "^16.4.7",
     "escape-string-regexp": "^5.0.0",
+    "exsolve": "^1.0.4",
     "globby": "^14.1.0",
     "hookable": "^5.5.3",
     "ignore": "^7.0.3",