silgi 0.21.8 → 0.22.0

package/dist/_chunks/index.mjs

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

package/dist/cli/prepare.mjs

@@ -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
     });
   }
 }

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/meta/index.d.mts

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