silgi 0.10.3 → 0.10.4

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.10.3";
+const version = "0.10.4";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/writeTypesAndFiles.mjs

@@ -566,6 +566,16 @@ async function prepareServerFiles(silgi) {
     "#silgi/vfs": {
       import: [],
       from: "./vfs"
+    },
+    "configs.ts": {
+      import: [
+        {
+          name: "cliConfigs",
+          type: false,
+          key: "cliConfigs"
+        }
+      ],
+      from: "./configs.ts"
     }
   };
   const scanned = {
@@ -1376,8 +1386,8 @@ function useCLIRuntimeConfig(silgi) {
     envExpansion: process.env.NITRO_ENV_EXPANSION ?? process.env.SILGI_ENV_EXPANSION ?? false,
     ...silgi.options.envOptions
   };
-  silgi.hook("prepare:core.ts", (data) => {
-    data.cliOptions.envOptions = envOptions;
+  silgi.hook("prepare:configs.ts", (data) => {
+    data.envOptions = envOptions;
   });
   const _sharedRuntimeConfig = _deepFreeze(
     applyEnv(klona(_inlineRuntimeConfig), envOptions)
@@ -1525,19 +1535,58 @@ async function generateSilgiStorageBaseType(silgi) {
   });
 }
 
+async function prepareConfigs(silgi) {
+  const _data = {};
+  for (const module of silgi.scanModules) {
+    if (module.meta.cliToRuntimeOptionsKeys && module.meta.cliToRuntimeOptionsKeys?.length > 0) {
+      for (const key of module.meta.cliToRuntimeOptionsKeys) {
+        _data[module.meta.configKey] = {
+          ..._data[module.meta.configKey],
+          [key]: module.options[key]
+        };
+      }
+    } else {
+      _data[module.meta.configKey] = {};
+    }
+  }
+  await silgi.callHook("prepare:configs.ts", _data);
+  const importData = [
+    "import type { SilgiRuntimeOptions } from 'silgi/types'",
+    "",
+    `export const cliConfigs: Partial<SilgiRuntimeOptions> = ${JSON.stringify(_data, null, 2)}`,
+    ""
+  ];
+  return importData;
+}
+
 async function prepareCoreFile(data, frameworkContext, silgi) {
   let importItems = {
     "silgi/core": {
       import: [
-        { name: "createSilgi" }
+        {
+          name: "createSilgi",
+          key: "createSilgi"
+        }
       ],
       from: "silgi/core"
     },
     "silgi/types": {
       import: [
-        { name: "SilgiRuntimeOptions", type: true },
-        { name: "FrameworkContext", type: true },
-        { name: "BuildConfig", type: true }
+        {
+          name: "SilgiRuntimeOptions",
+          type: true,
+          key: "SilgiRuntimeOptions"
+        },
+        {
+          name: "FrameworkContext",
+          type: true,
+          key: "FrameworkContext"
+        },
+        {
+          name: "BuildConfig",
+          type: true,
+          key: "Build"
+        }
       ],
       from: "silgi/types"
     },
@@ -1548,29 +1597,51 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     "silgi/runtime/internal/defu": {
       import: [
         {
-          name: "mergeDeep"
+          name: "mergeDeep",
+          key: "mergeDeep"
         }
       ],
       from: "silgi/runtime/internal/defu"
     },
     "scan.ts": {
-      import: [{
-        name: "uris",
-        type: false
-      }, {
-        name: "services",
-        type: false
-      }, {
-        name: "shareds",
-        type: false
-      }, {
-        name: "schemas",
-        type: false
-      }, {
-        name: "modulesURIs",
-        type: false
-      }],
+      import: [
+        {
+          name: "uris",
+          type: false,
+          key: "uris"
+        },
+        {
+          name: "services",
+          type: false,
+          key: "services"
+        },
+        {
+          name: "shareds",
+          type: false,
+          key: "shareds"
+        },
+        {
+          name: "schemas",
+          type: false,
+          key: "schemas"
+        },
+        {
+          name: "modulesURIs",
+          type: false,
+          key: "modulesURIs"
+        }
+      ],
       from: "./scan.ts"
+    },
+    "configs.ts": {
+      import: [
+        {
+          name: "cliConfigs",
+          type: false,
+          key: "cliConfigs"
+        }
+      ],
+      from: "./configs.ts"
     }
   };
   importItems = { ...data._importItems, ...importItems };
@@ -1578,24 +1649,11 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     customImports: data._customImports || [],
     buildSilgiExtraContent: [],
     beforeBuildSilgiExtraContent: [],
-    cliOptions: {},
     afterCliOptions: [],
     _silgiConfigs: [],
     customContent: [],
     importItems
   };
-  for (const module of silgi.scanModules) {
-    if (module.meta.cliToRuntimeOptionsKeys && module.meta.cliToRuntimeOptionsKeys?.length > 0) {
-      for (const key of module.meta.cliToRuntimeOptionsKeys) {
-        _data.cliOptions[module.meta.configKey] = {
-          ..._data.cliOptions[module.meta.configKey],
-          [key]: module.options[key]
-        };
-      }
-    } else {
-      _data.cliOptions[module.meta.configKey] = {};
-    }
-  }
   await silgi.callHook("prepare:core.ts", _data);
   if (importItems["#silgi/vfs"].import.length === 0) {
     delete importItems["#silgi/vfs"];
@@ -1615,9 +1673,6 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     ""
   ];
   const importData = [
-    `export const cliOptions: Partial<SilgiRuntimeOptions> = ${JSON.stringify(_data.cliOptions, null, 2)}`,
-    "",
-    ..._data.afterCliOptions,
     "",
     "export async function buildSilgi(framework: FrameworkContext, moduleOptions?: Partial<SilgiRuntimeOptions>,buildOptions?: Partial<BuildConfig>) {",
     "",
@@ -1640,7 +1695,7 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     "        moduleOptions || {},",
     "        {",
     `          present: '${silgi.options.preset}',`,
-    "          ...cliOptions,",
+    "          ...cliConfigs,",
     "        },",
     "      ) as any,",
     "    })",
@@ -1723,12 +1778,17 @@ async function writeCoreFile(silgi) {
     _importItems: data?.importItems ?? {},
     _customImports: data?.customImports ?? []
   }, data?.content ?? [], silgi);
+  const configs = await prepareConfigs(silgi);
   const silgiDir = resolve(silgi.options.silgi.serverDir);
   const buildFiles = [];
   buildFiles.push({
     path: join(silgiDir, "core.ts"),
     contents: coreContent.join("\n")
   });
+  buildFiles.push({
+    path: join(silgiDir, "configs.ts"),
+    contents: configs.join("\n")
+  });
   for await (const file of buildFiles) {
     await writeFile(
       resolve(silgi.options.build.dir, file.path),

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.10.3";
+const version = "0.10.4";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.10.3";
+const version = "0.10.4";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/types/index.d.mts

@@ -154,9 +154,6 @@ interface PrepareCore extends ImportItem {
         value: string;
         type: 'function' | 'variable';
     }[];
-    cliOptions: {
-        [key: string]: any;
-    };
     afterCliOptions: string[];
     _silgiConfigs: any[];
 }
@@ -255,6 +252,7 @@ interface SilgiCLIHooks extends SilgiHooks {
     'prepare:schema.ts': (options: SchemaPreparationOptions) => HookResult;
     'after:prepare:schema.ts': (content: string[]) => HookResult;
     'prepare:framework.d.ts': (options: {} & ImportItem) => HookResult;
+    'prepare:configs.ts': (cliOptions: Record<string, any>) => HookResult;
     /**
      * Called during `SilgiCLI` generation, to allow customizing, modifying or adding new files to the build directory (either virtually or to written to `.nuxt`).
      * @param app The configured `SilgiCLI` object

package/dist/types/index.d.ts

@@ -154,9 +154,6 @@ interface PrepareCore extends ImportItem {
         value: string;
         type: 'function' | 'variable';
     }[];
-    cliOptions: {
-        [key: string]: any;
-    };
     afterCliOptions: string[];
     _silgiConfigs: any[];
 }
@@ -255,6 +252,7 @@ interface SilgiCLIHooks extends SilgiHooks {
     'prepare:schema.ts': (options: SchemaPreparationOptions) => HookResult;
     'after:prepare:schema.ts': (content: string[]) => HookResult;
     'prepare:framework.d.ts': (options: {} & ImportItem) => HookResult;
+    'prepare:configs.ts': (cliOptions: Record<string, any>) => HookResult;
     /**
      * Called during `SilgiCLI` generation, to allow customizing, modifying or adding new files to the build directory (either virtually or to written to `.nuxt`).
      * @param app The configured `SilgiCLI` object

package/package.json

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