silgi 0.4.3 → 0.4.4

package/dist/_chunks/index.mjs

@@ -1,6 +1,6 @@
 const name = "silgi";
 const type = "module";
-const version = "0.4.3";
+const version = "0.4.4";
 const packageManager = "pnpm@9.15.1";
 const sideEffects = false;
 const exports = {
@@ -92,7 +92,7 @@ const files = [
 ];
 const scripts = {
 	build: "pnpm gen-presets && pnpm build:package && pnpm --filter './modules/*' generate && pnpm build:module",
-	"build:prepare": "pnpm gen-presets && pnpm build:package && pnpm --filter './modules/*' generate && pnpm build:prepare",
+	"build:prepare": "pnpm build:stub && pnpm --filter './modules/*' silgi:prepare",
 	"build:package": "unbuild",
 	"build:module": "pnpm --filter '@silgi/*' build",
 	"build:stub": "pnpm gen-presets && unbuild --stub && pnpm --filter './modules/*' build:stub && pnpm --filter './module-builder' build:stub",

package/dist/cli/prepare.mjs

@@ -33,6 +33,11 @@ import 'unctx';
 async function h3Framework(silgi, skip = false) {
   if (silgi.options.preset !== "h3" && skip === false)
     return;
+  if (silgi.options.preset === "h3") {
+    silgi.hook("after:prepare:schema.ts", (data) => {
+      data.unshift("type FrameworkContextExtends = NitroApp");
+    });
+  }
   silgi.hook("prepare:schema.ts", (data) => {
     data.importItems.nitropack = {
       import: [
@@ -53,9 +58,6 @@ async function h3Framework(silgi, skip = false) {
       isSilgiContext: false
     });
   });
-  silgi.hook("after:prepare:schema.ts", (data) => {
-    data.unshift("type FrameworkContextExtends = NitroApp");
-  });
   silgi.hook("prepare:createDTSFramework", (data) => {
     data.importItems["silgi/types"] = {
       import: [
@@ -104,9 +106,6 @@ const frameworkSetup = [h3Framework, nitroFramework, nuxtFramework];
 
 async function prepare$1(silgi) {
   await prepareDir(silgi.options.output.dir);
-  if (!silgi.options.static) {
-    await prepareDir(silgi.options.output.serverDir);
-  }
 }
 async function prepareDir(dir) {
   await fsp.rm(dir, { recursive: true, force: true });
@@ -254,7 +253,7 @@ async function generateRouterDTS(silgi) {
       const tag = "srn";
       const groupedRoutes = Object.entries(uris || {}).reduce((acc, [key, _value]) => {
         const [service, resource, method, action] = key.split("/");
-        const routePath = `${tag}/${service}/${resource}/${action}`;
+        const routePath = `${tag}/${service}/${resource}/${action}/${_value}`;
         if (!acc[routePath]) {
           acc[routePath] = {};
         }
@@ -309,12 +308,6 @@ async function createCoreFramework(silgi) {
   if (silgi.options.preset !== "nitro" && silgi.options.preset !== "h3")
     return;
   const importItems = {
-    "silgi": {
-      import: [
-        { name: "useSilgi" }
-      ],
-      from: "silgi"
-    },
     "silgi/types": {
       import: [
         { name: "SilgiModuleContext", type: true }
@@ -342,11 +335,12 @@ async function createCoreFramework(silgi) {
     functions
   });
   const content = [
-    ...functions.map((f) => `  ${f}(framework)`)
+    ...functions.map((f) => ` await ${f}(framework)`)
   ];
   return {
     content,
-    importItems
+    importItems,
+    customImports
   };
 }
 async function createDTSFramework(silgi) {
@@ -503,9 +497,9 @@ async function schemaTemplate(silgi) {
   return importData;
 }
 
-async function silgiCoreFile(_importItems, frameworkContext, silgi) {
+async function silgiCoreFile(data, frameworkContext, silgi) {
   const relativeRootDir = relativeWithDot(silgi.options.rootDir, silgi.options.serverDir);
-  const importItems = {
+  let importItems = {
     "silgi/core": {
       import: [
         { name: "createSilgi" }
@@ -521,7 +515,7 @@ async function silgiCoreFile(_importItems, frameworkContext, silgi) {
       from: "silgi/types"
     }
   };
-  _importItems = { ..._importItems, ...importItems };
+  importItems = { ...data._importItems, ...importItems };
   await Promise.all([...silgi.options.modules, ...silgi.options._modules].map(async (id) => {
     if (typeof id !== "string") {
       return;
@@ -534,7 +528,7 @@ async function silgiCoreFile(_importItems, frameworkContext, silgi) {
       importItems[pkg.name].from = isAbsolute(id) ? relativeWithDot(relativeRootDir, id) : id;
     }
   }));
-  const customImports = [];
+  const customImports = data._customImports || [];
   const uris = [];
   const services = [];
   const shareds = [];
@@ -594,7 +588,6 @@ async function silgiCoreFile(_importItems, frameworkContext, silgi) {
     }),
     shareds.length > 0 ? "])" : "}",
     "",
-    "export const silgiOptions: Partial<SilgiOptions> = {}",
     "",
     "export async function buildSilgi(framework: FrameworkContext, options?: Partial<SilgiModuleOptions>) {",
     "  const silgi = await createSilgi({",
@@ -607,7 +600,6 @@ async function silgiCoreFile(_importItems, frameworkContext, silgi) {
     `      plugins: [${plugins.join(", ")}],`,
     "",
     "      options: {",
-    "      ...silgiOptions,",
     "      ...options,",
     "     },",
     "    })",
@@ -635,7 +627,10 @@ async function writeTypesAndFiles(silgi) {
     opts.references.push({ path: "./framework.d.ts" });
   });
   const schemaContent = await schemaTemplate(silgi);
-  const coreContent = await silgiCoreFile(data?.importItems ?? {}, data?.content ?? [], silgi);
+  const coreContent = await silgiCoreFile({
+    _importItems: data?.importItems ?? {},
+    _customImports: data?.customImports ?? []
+  }, data?.content ?? [], silgi);
   const frameworkDTS = await createDTSFramework(silgi);
   const { declarations, tsConfig } = await silgiGenerateType(silgi);
   const tsConfigPath = resolve(
@@ -814,7 +809,7 @@ function moduleScanHooks(silgi) {
         let importName;
         options.importItems[module.meta.configKey] = {
           import: [],
-          from: module.meta._packageName
+          from: module.meta.name || module.meta._packageName
         };
         if (exports.interface.config) {
           importName = pascalCase(`${module.meta.configKey}Config`);

package/dist/core/index.d.mts

@@ -1,4 +1,4 @@
-import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiModuleShared, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
+import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiModuleShared, SilgiEvent, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
 import { TSConfig } from 'pkg-types';
 import { FetchOptions } from 'ofetch';
 export { c as createStorage, s as silgi } from '../shared/silgi.40ZJYm8F.mjs';
@@ -14,28 +14,49 @@ declare function silgiGenerateType(silgi: SilgiCLI): Promise<{
 
 declare function createSilgi(config: SilgiConfig): Promise<Silgi>;
 
-type FetchResponseData<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
-    output: any;
-} ? SilgiRouterTypes[Route][Method]['output'] : never;
-type RequestBodyOption<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
-    input: any;
+type StaticRoutes = keyof SilgiRouterTypes;
+type ExtractStaticPath<T extends string> = T extends `${infer Start}/:${string}` ? Start : T;
+type RouteWithParams<T extends string> = T | `${T}/${string}`;
+type ValidRoute = StaticRoutes | RouteWithParams<ExtractStaticPath<StaticRoutes & string>>;
+type FindMatchingRoute<T extends string> = {
+    [K in StaticRoutes]: ExtractStaticPath<K & string> extends never ? never : T extends `${ExtractStaticPath<K & string>}${string}` ? K : never;
+}[StaticRoutes];
+type Method<R extends ValidRoute> = R extends StaticRoutes ? keyof SilgiRouterTypes[R] : keyof SilgiRouterTypes[FindMatchingRoute<R & string>];
+type DefaultMethodType = 'get' | 'post' | 'put' | 'delete';
+type FetchResponseData<R extends ValidRoute, M extends Method<R>> = R extends StaticRoutes ? SilgiRouterTypes[R][M & keyof SilgiRouterTypes[R]]['output'] : SilgiRouterTypes[FindMatchingRoute<R & string>][M & keyof SilgiRouterTypes[FindMatchingRoute<R & string>]]['output'];
+type RequestBodyOption<R extends ValidRoute, M extends Method<R>> = R extends StaticRoutes ? SilgiRouterTypes[R][M & keyof SilgiRouterTypes[R]] extends {
+    input: infer I;
 } ? {
-    body: SilgiRouterTypes[Route][Method]['input'];
+    body: I;
+} : {
+    body?: never;
+} : SilgiRouterTypes[FindMatchingRoute<R & string>][M & keyof SilgiRouterTypes[FindMatchingRoute<R & string>]] extends {
+    input: infer I;
+} ? {
+    body: I;
 } : {
     body?: never;
 };
-type RouterParams<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
-    params: any;
+type ExtractParams<T extends string> = T extends `${string}:${infer Param}/${infer Rest}` ? {
+    [K in Param]: string;
+} & ExtractParams<Rest> : T extends `${string}:${infer Param}` ? {
+    [K in Param]: string;
+} : object;
+type RouterParams<R extends ValidRoute, M extends Method<R>> = R extends StaticRoutes ? SilgiRouterTypes[R][M & keyof SilgiRouterTypes[R]] extends {
+    params: infer P;
 } ? {
-    params?: SilgiRouterTypes[Route][Method]['params'];
+    params: P;
+} : R extends `${string}:${string}` ? {
+    params: ExtractParams<R>;
 } : {
     params?: never;
+} : {
+    params: ExtractParams<FindMatchingRoute<R & string>>;
 };
-type DefaultMethod<Route extends keyof SilgiRouterTypes> = keyof SilgiRouterTypes[Route];
-type SilgiFetchOptions<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>> = {
-    method?: Method;
-} & RequestBodyOption<Route, Method> & RouterParams<Route, Method> & Omit<FetchOptions, 'query' | 'body' | 'method'>;
-type SilgiFetchClient = <Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>, ResT = FetchResponseData<Route, Method>>(url: Route, options?: SilgiFetchOptions<Route, Method>) => Promise<ResT>;
+type SilgiFetchOptions<R extends ValidRoute, M extends Method<R>> = {
+    method: M;
+} & RequestBodyOption<R, M> & RouterParams<R, M> & Omit<FetchOptions, 'query' | 'body' | 'method'>;
+type SilgiFetchClient = <R extends ValidRoute, M extends Method<R> | DefaultMethodType = 'get'>(url: R, options: SilgiFetchOptions<R, M extends Method<R> ? M : Extract<Method<R>, DefaultMethodType>>) => Promise<FetchResponseData<R, M extends Method<R> ? M : Extract<Method<R>, DefaultMethodType>>>;
 declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
 
 interface Options {
@@ -80,6 +101,8 @@ declare function mergeSchemas<T extends MergedSilgiSchema[]>(typesOrArray: [...T
 declare function mergeServices<T extends ServiceType<SilgiSchema>[]>(servicesOrArray: [...T] | T): RequiredServiceType<SilgiSchema>;
 declare function mergeShared<T extends SilgiModuleShared[]>(sharedOrArray: [...T] | T): UnionToIntersection<T[number]>;
 
+declare function getEvent<T>(event?: SilgiEvent): T;
+
 declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<StandardSchemaV1>>>>>(silgiType: T): {
     [K in keyof T]: {
         [P in keyof T[K]]: T[K][P];
@@ -133,4 +156,4 @@ declare class SilgiError extends Error {
 
 declare function useSilgi(): Silgi;
 
-export { SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiGenerateType, useSilgi };
+export { SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, getEvent, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiGenerateType, useSilgi };

package/dist/core/index.d.ts

@@ -1,4 +1,4 @@
-import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiModuleShared, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
+import { SilgiCLIConfig, LoadConfigOptions, SilgiCLIOptions, SilgiCLI, SilgiConfig, Silgi, SilgiRouterTypes, SilgiOperation, MergedSilgiSchema, ServiceType, SilgiSchema, RequiredServiceType, SilgiModuleShared, SilgiEvent, DefaultNamespaces, BaseSchemaType } from 'silgi/types';
 import { TSConfig } from 'pkg-types';
 import { FetchOptions } from 'ofetch';
 export { c as createStorage, s as silgi } from '../shared/silgi.40ZJYm8F.js';
@@ -14,28 +14,49 @@ declare function silgiGenerateType(silgi: SilgiCLI): Promise<{
 
 declare function createSilgi(config: SilgiConfig): Promise<Silgi>;
 
-type FetchResponseData<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
-    output: any;
-} ? SilgiRouterTypes[Route][Method]['output'] : never;
-type RequestBodyOption<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
-    input: any;
+type StaticRoutes = keyof SilgiRouterTypes;
+type ExtractStaticPath<T extends string> = T extends `${infer Start}/:${string}` ? Start : T;
+type RouteWithParams<T extends string> = T | `${T}/${string}`;
+type ValidRoute = StaticRoutes | RouteWithParams<ExtractStaticPath<StaticRoutes & string>>;
+type FindMatchingRoute<T extends string> = {
+    [K in StaticRoutes]: ExtractStaticPath<K & string> extends never ? never : T extends `${ExtractStaticPath<K & string>}${string}` ? K : never;
+}[StaticRoutes];
+type Method<R extends ValidRoute> = R extends StaticRoutes ? keyof SilgiRouterTypes[R] : keyof SilgiRouterTypes[FindMatchingRoute<R & string>];
+type DefaultMethodType = 'get' | 'post' | 'put' | 'delete';
+type FetchResponseData<R extends ValidRoute, M extends Method<R>> = R extends StaticRoutes ? SilgiRouterTypes[R][M & keyof SilgiRouterTypes[R]]['output'] : SilgiRouterTypes[FindMatchingRoute<R & string>][M & keyof SilgiRouterTypes[FindMatchingRoute<R & string>]]['output'];
+type RequestBodyOption<R extends ValidRoute, M extends Method<R>> = R extends StaticRoutes ? SilgiRouterTypes[R][M & keyof SilgiRouterTypes[R]] extends {
+    input: infer I;
 } ? {
-    body: SilgiRouterTypes[Route][Method]['input'];
+    body: I;
+} : {
+    body?: never;
+} : SilgiRouterTypes[FindMatchingRoute<R & string>][M & keyof SilgiRouterTypes[FindMatchingRoute<R & string>]] extends {
+    input: infer I;
+} ? {
+    body: I;
 } : {
     body?: never;
 };
-type RouterParams<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route]> = SilgiRouterTypes[Route][Method] extends {
-    params: any;
+type ExtractParams<T extends string> = T extends `${string}:${infer Param}/${infer Rest}` ? {
+    [K in Param]: string;
+} & ExtractParams<Rest> : T extends `${string}:${infer Param}` ? {
+    [K in Param]: string;
+} : object;
+type RouterParams<R extends ValidRoute, M extends Method<R>> = R extends StaticRoutes ? SilgiRouterTypes[R][M & keyof SilgiRouterTypes[R]] extends {
+    params: infer P;
 } ? {
-    params?: SilgiRouterTypes[Route][Method]['params'];
+    params: P;
+} : R extends `${string}:${string}` ? {
+    params: ExtractParams<R>;
 } : {
     params?: never;
+} : {
+    params: ExtractParams<FindMatchingRoute<R & string>>;
 };
-type DefaultMethod<Route extends keyof SilgiRouterTypes> = keyof SilgiRouterTypes[Route];
-type SilgiFetchOptions<Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>> = {
-    method?: Method;
-} & RequestBodyOption<Route, Method> & RouterParams<Route, Method> & Omit<FetchOptions, 'query' | 'body' | 'method'>;
-type SilgiFetchClient = <Route extends keyof SilgiRouterTypes, Method extends keyof SilgiRouterTypes[Route] = DefaultMethod<Route>, ResT = FetchResponseData<Route, Method>>(url: Route, options?: SilgiFetchOptions<Route, Method>) => Promise<ResT>;
+type SilgiFetchOptions<R extends ValidRoute, M extends Method<R>> = {
+    method: M;
+} & RequestBodyOption<R, M> & RouterParams<R, M> & Omit<FetchOptions, 'query' | 'body' | 'method'>;
+type SilgiFetchClient = <R extends ValidRoute, M extends Method<R> | DefaultMethodType = 'get'>(url: R, options: SilgiFetchOptions<R, M extends Method<R> ? M : Extract<Method<R>, DefaultMethodType>>) => Promise<FetchResponseData<R, M extends Method<R> ? M : Extract<Method<R>, DefaultMethodType>>>;
 declare function createSilgiFetch(options: FetchOptions | ((options: FetchOptions) => FetchOptions), localFetch?: typeof globalThis.$fetch): SilgiFetchClient;
 
 interface Options {
@@ -80,6 +101,8 @@ declare function mergeSchemas<T extends MergedSilgiSchema[]>(typesOrArray: [...T
 declare function mergeServices<T extends ServiceType<SilgiSchema>[]>(servicesOrArray: [...T] | T): RequiredServiceType<SilgiSchema>;
 declare function mergeShared<T extends SilgiModuleShared[]>(sharedOrArray: [...T] | T): UnionToIntersection<T[number]>;
 
+declare function getEvent<T>(event?: SilgiEvent): T;
+
 declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<StandardSchemaV1>>>>>(silgiType: T): {
     [K in keyof T]: {
         [P in keyof T[K]]: T[K][P];
@@ -133,4 +156,4 @@ declare class SilgiError extends Error {
 
 declare function useSilgi(): Silgi;
 
-export { SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiGenerateType, useSilgi };
+export { SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, getEvent, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgiGenerateType, useSilgi };

package/dist/core/index.mjs

@@ -112,7 +112,8 @@ const SilgiCLIDefaults = {
     name: "h3",
     version: ""
   },
-  extensions: [".js", ".jsx", ".mjs", ".ts", ".tsx", ".vue"]
+  extensions: [".js", ".jsx", ".mjs", ".ts", ".tsx", ".vue"],
+  ignoreOptions: undefined
 };
 
 const fallbackCompatibilityDate = "2025-02-04";
@@ -1139,10 +1140,14 @@ function getFetch(url, opts, localFetch) {
   }
   return globalThis.$fetch;
 }
-function fillPath(path, params = {}) {
-  for (const [k, v] of Object.entries(params))
-    path = path.replace(`{${k}}`, encodeURIComponent(String(v)));
-  return path;
+function fillPath(path, params) {
+  if (!params)
+    return path;
+  let result = path;
+  for (const [key, value] of Object.entries(params)) {
+    result = result.replace(`:${key}`, value);
+  }
+  return result;
 }
 
 class SchemaParser {
@@ -1306,11 +1311,6 @@ async function execute(uriString, input, event) {
     event
   };
   try {
-    await silgiCtx.callHook("method:before", {
-      operation,
-      input,
-      event
-    });
     const handler = silgiCtx.scannedHandlers.get(operation.uri);
     if (!handler) {
       return {
@@ -1321,10 +1321,14 @@ async function execute(uriString, input, event) {
         }
       };
     }
-    if (event)
-      await silgiCtx.callHook("event:before", event);
-    const cacheData = await cacheExecute(operation.uri, input, operation, handler, event);
-    await callModules(operation, handler, input, result, event);
+    await silgiCtx.callHook("action:before", {
+      operation,
+      input,
+      event,
+      modules: handler.modules,
+      result
+    });
+    const cacheData = await cacheExecute(input, operation, handler, event);
     if (cacheData?.success) {
       result = cacheData.data;
       success = cacheData.success;
@@ -1338,12 +1342,13 @@ async function execute(uriString, input, event) {
       result = await handler?.handler(router, input, silgiCtx.shared, event);
       success = true;
     }
-    await silgiCtx.callHook("method:after", {
+    await silgiCtx.callHook("action:after", {
       operation,
       input,
       event,
       result,
-      success
+      success,
+      modules: handler.modules
     });
     if (!cached) {
       if (success && cacheData?.cachedKey && handler.storage) {
@@ -1363,7 +1368,7 @@ async function execute(uriString, input, event) {
         }
       };
     }
-    await silgiCtx.callHook("method:error", {
+    await silgiCtx.callHook("action:error", {
       ...hookContext,
       error,
       timestamp: Date.now()
@@ -1377,17 +1382,7 @@ async function execute(uriString, input, event) {
     };
   }
 }
-async function callModules(operation, handler, input, result, event) {
-  useSilgi();
-  if (!handler.modules)
-    return;
-  for (const [moduleKey, config] of Object.entries(handler.modules)) {
-    if (moduleKey) {
-      if (module) ;
-    }
-  }
-}
-async function cacheExecute(uriString, input, operation, handler, event) {
+async function cacheExecute(input, operation, handler, event) {
   if (!handler.storage)
     return;
   const cacheKey = handler.storage ? await generateStorageKey({
@@ -1429,6 +1424,10 @@ function mergeShared(sharedOrArray) {
   return merge(sharedOrArray);
 }
 
+function getEvent(event) {
+  return event.event || event || {};
+}
+
 function createSchema(silgiType) {
   return silgiType;
 }
@@ -1441,4 +1440,4 @@ function createShared(shared) {
   return shared;
 }
 
-export { SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, createStorage, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgi, silgiGenerateType, useSilgi };
+export { SchemaParser, SilgiError, createSchema, createService, createShared, createSilgi, createSilgiFetch, createStorage, getEvent, loadOptions, mergeSchemas, mergeServices, mergeShared, parseURI, silgi, silgiGenerateType, useSilgi };

package/dist/kit/index.d.mts

@@ -1,13 +1,14 @@
 import { Buffer } from 'node:buffer';
 import { GraphQLSchema } from 'graphql';
 import { SilgiCLI, GraphQLJSON, SilgiPreset, SilgiPresetMeta } from 'silgi/types';
-import { w as ModuleOptions, y as ModuleDefinition, F as SilgiModule } from '../shared/silgi.CzUPBllI.mjs';
+import { w as ModuleOptions, y as ModuleDefinition, F as SilgiModule } from '../shared/silgi.DQSwjP5u.mjs';
 import 'defu';
 import '@graphql-tools/utils';
 import 'pkg-types';
 import '@standard-schema/spec';
 import 'consola';
 import 'hookable';
+import 'ignore';
 import 'silgi/presets';
 import 'unimport';
 import 'unstorage';
@@ -17,7 +18,6 @@ import 'compatx';
 import 'unimport/unplugin';
 import 'std-env';
 import '../shared/silgi.40ZJYm8F.mjs';
-import 'ignore';
 
 /**
  * Resolve a module from a given root path using an algorithm patterned on

package/dist/kit/index.d.ts

@@ -1,13 +1,14 @@
 import { Buffer } from 'node:buffer';
 import { GraphQLSchema } from 'graphql';
 import { SilgiCLI, GraphQLJSON, SilgiPreset, SilgiPresetMeta } from 'silgi/types';
-import { w as ModuleOptions, y as ModuleDefinition, F as SilgiModule } from '../shared/silgi.D_LzzCtJ.js';
+import { w as ModuleOptions, y as ModuleDefinition, F as SilgiModule } from '../shared/silgi.yr8vHHvd.js';
 import 'defu';
 import '@graphql-tools/utils';
 import 'pkg-types';
 import '@standard-schema/spec';
 import 'consola';
 import 'hookable';
+import 'ignore';
 import 'silgi/presets';
 import 'unimport';
 import 'unstorage';
@@ -17,7 +18,6 @@ import 'compatx';
 import 'unimport/unplugin';
 import 'std-env';
 import '../shared/silgi.40ZJYm8F.js';
-import 'ignore';
 
 /**
  * Resolve a module from a given root path using an algorithm patterned on

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "0.4.3";
+const version = "0.4.4";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "0.4.3";
+const version = "0.4.4";
 
 export { version };

package/dist/shared/{silgi.CzUPBllI.d.mts → silgi.DQSwjP5u.d.mts}

@@ -4,6 +4,7 @@ import { TSConfig } from 'pkg-types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { ConsolaOptions, ConsolaInstance, LogLevel } from 'consola';
 import { Hookable } from 'hookable';
+import { Ignore, Options } from 'ignore';
 import { PresetOptions, PresetName, PresetNameInput } from 'silgi/presets';
 import { StorageMounts as StorageMounts$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1, ResolvedServiceType as ResolvedServiceType$1, SilgiDefaultShared as SilgiDefaultShared$1, SilgiModules as SilgiModules$1, ModuleMeta as ModuleMeta$1 } from 'silgi/types';
 import { Unimport } from 'unimport';
@@ -14,7 +15,6 @@ import { DateString, CompatibilityDates, CompatibilityDateSpec } from 'compatx';
 import { UnimportPluginOptions } from 'unimport/unplugin';
 import { ProviderName } from 'std-env';
 import { s as silgi, u as useStorage } from './silgi.40ZJYm8F.mjs';
-import { Ignore } from 'ignore';
 
 type HookResult = Promise<void> | void;
 
@@ -90,8 +90,8 @@ type ExtractRouterParamsFromURI<TURI extends keyof SilgiURIs> = GetRouterParams<
  * @example
  * namespace: 'coreApi'
  * serviceName: 'basket'
- * action: 'post'
- * method: 'createBasket'
+ * method: 'post'
+ * action: 'createBasket'
  */
 interface SilgiOperation {
     /**
@@ -205,10 +205,10 @@ interface SilgiHooks {
      */
     'close': (silgi: Silgi) => HookResult;
     'app:setup:start': (silgi: Silgi) => HookResult;
-    'method:before': (context: ModuleHookContext) => HookResult;
-    'method:after': (context: ModuleHookContext) => HookResult;
-    'method:error': (context: ModuleHookContext) => HookResult;
-    'method:finally': (context: ModuleHookContext) => HookResult;
+    'action:before': (context: ModuleHookContext) => HookResult;
+    'action:after': (context: ModuleHookContext) => HookResult;
+    'action:error': (context: ModuleHookContext) => HookResult;
+    'action:finally': (context: ModuleHookContext) => HookResult;
     'event:before': (event: SilgiEvent) => HookResult;
     'error': CaptureError;
 }
@@ -527,6 +527,20 @@ interface SilgiCLIOptions extends PresetOptions {
      * @default ['silgi']
      */
     conditions: string[];
+    /**
+     * Pass options directly to `node-ignore` (which is used by Nuxt to ignore files).
+     *
+     *
+     * @see [node-ignore](https://github.com/kaelzhang/node-ignore)
+     *
+     * @example
+     * ```js
+     * ignoreOptions: {
+     *   ignorecase: false
+     * }
+     * ```
+     */
+    ignoreOptions: Options;
 }
 /**
  * Silgi input config (silgi.config)
@@ -557,9 +571,9 @@ interface ImportItem {
     };
     customImports: string[];
     customContent?: string[];
-    functions?: string[];
 }
 interface SilgiCLI {
+    _ignore?: Ignore;
     services: ResolvedServiceType$1;
     shareds: SilgiDefaultShared$1;
     uris: Record<string, any>;
@@ -634,10 +648,9 @@ interface SilgiCLIHooks {
     'module:register:before': (module: SilgiModule) => HookResult;
     'module:register:after': (module: SilgiCLI['scanModules'][number]) => HookResult;
     'module:setup:finish': (module: SilgiModule) => HookResult;
-    'module:before:excute': (context: ModuleHookContext) => HookResult;
-    'module:after:excute': (context: ModuleHookContext) => HookResult;
-    'module:error': (context: ModuleHookContext) => HookResult;
-    'prepare:createCoreFramework': (options: ImportItem) => HookResult;
+    'prepare:createCoreFramework': (options: Pick<ImportItem, 'customImports' | 'importItems'> & {
+        functions?: string[];
+    }) => HookResult;
     'prepare:createDTSFramework': (options: ImportItem) => HookResult;
     /**
      * Allows extending compatibility checks.
@@ -780,11 +793,9 @@ type ModuleHookContext = Readonly<{
     input?: unknown;
     result?: unknown;
     modules?: ModuleConfigurations;
-    config?: unknown;
     timestamp?: number;
     meta?: Record<string, unknown>;
     error?: Error;
-    hookName?: string;
     success?: boolean;
 }>;
 /** The options received.  */

package/dist/shared/{silgi.D_LzzCtJ.d.ts → silgi.yr8vHHvd.d.ts}

@@ -4,6 +4,7 @@ import { TSConfig } from 'pkg-types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { ConsolaOptions, ConsolaInstance, LogLevel } from 'consola';
 import { Hookable } from 'hookable';
+import { Ignore, Options } from 'ignore';
 import { PresetOptions, PresetName, PresetNameInput } from 'silgi/presets';
 import { StorageMounts as StorageMounts$1, SilgiFrameworkInfo as SilgiFrameworkInfo$1, ResolvedServiceType as ResolvedServiceType$1, SilgiDefaultShared as SilgiDefaultShared$1, SilgiModules as SilgiModules$1, ModuleMeta as ModuleMeta$1 } from 'silgi/types';
 import { Unimport } from 'unimport';
@@ -14,7 +15,6 @@ import { DateString, CompatibilityDates, CompatibilityDateSpec } from 'compatx';
 import { UnimportPluginOptions } from 'unimport/unplugin';
 import { ProviderName } from 'std-env';
 import { s as silgi, u as useStorage } from './silgi.40ZJYm8F.js';
-import { Ignore } from 'ignore';
 
 type HookResult = Promise<void> | void;
 
@@ -90,8 +90,8 @@ type ExtractRouterParamsFromURI<TURI extends keyof SilgiURIs> = GetRouterParams<
  * @example
  * namespace: 'coreApi'
  * serviceName: 'basket'
- * action: 'post'
- * method: 'createBasket'
+ * method: 'post'
+ * action: 'createBasket'
  */
 interface SilgiOperation {
     /**
@@ -205,10 +205,10 @@ interface SilgiHooks {
      */
     'close': (silgi: Silgi) => HookResult;
     'app:setup:start': (silgi: Silgi) => HookResult;
-    'method:before': (context: ModuleHookContext) => HookResult;
-    'method:after': (context: ModuleHookContext) => HookResult;
-    'method:error': (context: ModuleHookContext) => HookResult;
-    'method:finally': (context: ModuleHookContext) => HookResult;
+    'action:before': (context: ModuleHookContext) => HookResult;
+    'action:after': (context: ModuleHookContext) => HookResult;
+    'action:error': (context: ModuleHookContext) => HookResult;
+    'action:finally': (context: ModuleHookContext) => HookResult;
     'event:before': (event: SilgiEvent) => HookResult;
     'error': CaptureError;
 }
@@ -527,6 +527,20 @@ interface SilgiCLIOptions extends PresetOptions {
      * @default ['silgi']
      */
     conditions: string[];
+    /**
+     * Pass options directly to `node-ignore` (which is used by Nuxt to ignore files).
+     *
+     *
+     * @see [node-ignore](https://github.com/kaelzhang/node-ignore)
+     *
+     * @example
+     * ```js
+     * ignoreOptions: {
+     *   ignorecase: false
+     * }
+     * ```
+     */
+    ignoreOptions: Options;
 }
 /**
  * Silgi input config (silgi.config)
@@ -557,9 +571,9 @@ interface ImportItem {
     };
     customImports: string[];
     customContent?: string[];
-    functions?: string[];
 }
 interface SilgiCLI {
+    _ignore?: Ignore;
     services: ResolvedServiceType$1;
     shareds: SilgiDefaultShared$1;
     uris: Record<string, any>;
@@ -634,10 +648,9 @@ interface SilgiCLIHooks {
     'module:register:before': (module: SilgiModule) => HookResult;
     'module:register:after': (module: SilgiCLI['scanModules'][number]) => HookResult;
     'module:setup:finish': (module: SilgiModule) => HookResult;
-    'module:before:excute': (context: ModuleHookContext) => HookResult;
-    'module:after:excute': (context: ModuleHookContext) => HookResult;
-    'module:error': (context: ModuleHookContext) => HookResult;
-    'prepare:createCoreFramework': (options: ImportItem) => HookResult;
+    'prepare:createCoreFramework': (options: Pick<ImportItem, 'customImports' | 'importItems'> & {
+        functions?: string[];
+    }) => HookResult;
     'prepare:createDTSFramework': (options: ImportItem) => HookResult;
     /**
      * Allows extending compatibility checks.
@@ -780,11 +793,9 @@ type ModuleHookContext = Readonly<{
     input?: unknown;
     result?: unknown;
     modules?: ModuleConfigurations;
-    config?: unknown;
     timestamp?: number;
     meta?: Record<string, unknown>;
     error?: Error;
-    hookName?: string;
     success?: boolean;
 }>;
 /** The options received.  */

package/dist/types/index.d.mts

@@ -1,11 +1,12 @@
-import { D as DefaultNamespaces, B as BaseSchemaType, S as SilgiServiceInterface } from '../shared/silgi.CzUPBllI.mjs';
-export { A as AppConfig, o as Awaitable, l as BaseSilgiMethodType, W as CaptureError, V as CapturedErrorContext, C as CreateScope, n as DeepPartial, m as DefaultHooks, N as EventHandlerResponse, a2 as ExtendShared, ae as ExtractInputFromURI, af as ExtractOutputFromURI, ag as ExtractRouterParamsFromURI, a3 as FrameworkContext, a7 as ImportItem, L as LoadConfigOptions, Y as MergedSilgiSchema, O as MethodHandlerType, Q as MethodResponse, K as MethodSchemaType, G as ModuleConfigurations, y as ModuleDefinition, v as ModuleHookContext, M as ModuleMeta, w as ModuleOptions, z as ModuleSetupInstallResult, E as ModuleSetupReturn, ab as NitroBuildInfo, _ as RequiredServiceType, P as ResolvedMethodHandlerType, R as ResolvedModuleMeta, x as ResolvedModuleOptions, $ as ResolvedServiceType, Z as ServiceType, a4 as Silgi, U as SilgiAppPlugin, a8 as SilgiCLI, b as SilgiCLIConfig, a9 as SilgiCLIDynamicConfig, c as SilgiCLIHooks, a as SilgiCLIOptions, u as SilgiCompatibility, d as SilgiCompatibilityIssue, e as SilgiCompatibilityIssues, a5 as SilgiConfig, a0 as SilgiDefaultShared, g as SilgiEvent, aa as SilgiFrameworkInfo, a6 as SilgiFunction, k as SilgiHook, p as SilgiHooks, h as SilgiMethods, F as SilgiModule, t as SilgiModuleInput, r as SilgiModuleMethods, s as SilgiModuleOptions, a1 as SilgiModuleShared, q as SilgiModules, i as SilgiNamespaces, H as SilgiOperation, f as SilgiOptions, I as SilgiPreset, J as SilgiPresetMeta, j as SilgiRouterTypes, X as SilgiSchema, ai as SilgiStorageBase, ac as SilgiURIs, ak as StorageConfig, aj as StorageKeyGenerator, al as StorageKeyParams, ah as StorageMounts, T as TSReference, ad as URIsTypes } from '../shared/silgi.CzUPBllI.mjs';
+import { D as DefaultNamespaces, B as BaseSchemaType, S as SilgiServiceInterface } from '../shared/silgi.DQSwjP5u.mjs';
+export { A as AppConfig, o as Awaitable, l as BaseSilgiMethodType, W as CaptureError, V as CapturedErrorContext, C as CreateScope, n as DeepPartial, m as DefaultHooks, N as EventHandlerResponse, a2 as ExtendShared, ae as ExtractInputFromURI, af as ExtractOutputFromURI, ag as ExtractRouterParamsFromURI, a3 as FrameworkContext, a7 as ImportItem, L as LoadConfigOptions, Y as MergedSilgiSchema, O as MethodHandlerType, Q as MethodResponse, K as MethodSchemaType, G as ModuleConfigurations, y as ModuleDefinition, v as ModuleHookContext, M as ModuleMeta, w as ModuleOptions, z as ModuleSetupInstallResult, E as ModuleSetupReturn, ab as NitroBuildInfo, _ as RequiredServiceType, P as ResolvedMethodHandlerType, R as ResolvedModuleMeta, x as ResolvedModuleOptions, $ as ResolvedServiceType, Z as ServiceType, a4 as Silgi, U as SilgiAppPlugin, a8 as SilgiCLI, b as SilgiCLIConfig, a9 as SilgiCLIDynamicConfig, c as SilgiCLIHooks, a as SilgiCLIOptions, u as SilgiCompatibility, d as SilgiCompatibilityIssue, e as SilgiCompatibilityIssues, a5 as SilgiConfig, a0 as SilgiDefaultShared, g as SilgiEvent, aa as SilgiFrameworkInfo, a6 as SilgiFunction, k as SilgiHook, p as SilgiHooks, h as SilgiMethods, F as SilgiModule, t as SilgiModuleInput, r as SilgiModuleMethods, s as SilgiModuleOptions, a1 as SilgiModuleShared, q as SilgiModules, i as SilgiNamespaces, H as SilgiOperation, f as SilgiOptions, I as SilgiPreset, J as SilgiPresetMeta, j as SilgiRouterTypes, X as SilgiSchema, ai as SilgiStorageBase, ac as SilgiURIs, ak as StorageConfig, aj as StorageKeyGenerator, al as StorageKeyParams, ah as StorageMounts, T as TSReference, ad as URIsTypes } from '../shared/silgi.DQSwjP5u.mjs';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import 'defu';
 import '@graphql-tools/utils';
 import 'pkg-types';
 import 'consola';
 import 'hookable';
+import 'ignore';
 import 'silgi/presets';
 import 'silgi/types';
 import 'unimport';
@@ -16,7 +17,6 @@ import 'compatx';
 import 'unimport/unplugin';
 import 'std-env';
 import '../shared/silgi.40ZJYm8F.mjs';
-import 'ignore';
 
 interface SilgiModuleContext extends Record<string, any> {
 }

package/dist/types/index.d.ts

@@ -1,11 +1,12 @@
-import { D as DefaultNamespaces, B as BaseSchemaType, S as SilgiServiceInterface } from '../shared/silgi.D_LzzCtJ.js';
-export { A as AppConfig, o as Awaitable, l as BaseSilgiMethodType, W as CaptureError, V as CapturedErrorContext, C as CreateScope, n as DeepPartial, m as DefaultHooks, N as EventHandlerResponse, a2 as ExtendShared, ae as ExtractInputFromURI, af as ExtractOutputFromURI, ag as ExtractRouterParamsFromURI, a3 as FrameworkContext, a7 as ImportItem, L as LoadConfigOptions, Y as MergedSilgiSchema, O as MethodHandlerType, Q as MethodResponse, K as MethodSchemaType, G as ModuleConfigurations, y as ModuleDefinition, v as ModuleHookContext, M as ModuleMeta, w as ModuleOptions, z as ModuleSetupInstallResult, E as ModuleSetupReturn, ab as NitroBuildInfo, _ as RequiredServiceType, P as ResolvedMethodHandlerType, R as ResolvedModuleMeta, x as ResolvedModuleOptions, $ as ResolvedServiceType, Z as ServiceType, a4 as Silgi, U as SilgiAppPlugin, a8 as SilgiCLI, b as SilgiCLIConfig, a9 as SilgiCLIDynamicConfig, c as SilgiCLIHooks, a as SilgiCLIOptions, u as SilgiCompatibility, d as SilgiCompatibilityIssue, e as SilgiCompatibilityIssues, a5 as SilgiConfig, a0 as SilgiDefaultShared, g as SilgiEvent, aa as SilgiFrameworkInfo, a6 as SilgiFunction, k as SilgiHook, p as SilgiHooks, h as SilgiMethods, F as SilgiModule, t as SilgiModuleInput, r as SilgiModuleMethods, s as SilgiModuleOptions, a1 as SilgiModuleShared, q as SilgiModules, i as SilgiNamespaces, H as SilgiOperation, f as SilgiOptions, I as SilgiPreset, J as SilgiPresetMeta, j as SilgiRouterTypes, X as SilgiSchema, ai as SilgiStorageBase, ac as SilgiURIs, ak as StorageConfig, aj as StorageKeyGenerator, al as StorageKeyParams, ah as StorageMounts, T as TSReference, ad as URIsTypes } from '../shared/silgi.D_LzzCtJ.js';
+import { D as DefaultNamespaces, B as BaseSchemaType, S as SilgiServiceInterface } from '../shared/silgi.yr8vHHvd.js';
+export { A as AppConfig, o as Awaitable, l as BaseSilgiMethodType, W as CaptureError, V as CapturedErrorContext, C as CreateScope, n as DeepPartial, m as DefaultHooks, N as EventHandlerResponse, a2 as ExtendShared, ae as ExtractInputFromURI, af as ExtractOutputFromURI, ag as ExtractRouterParamsFromURI, a3 as FrameworkContext, a7 as ImportItem, L as LoadConfigOptions, Y as MergedSilgiSchema, O as MethodHandlerType, Q as MethodResponse, K as MethodSchemaType, G as ModuleConfigurations, y as ModuleDefinition, v as ModuleHookContext, M as ModuleMeta, w as ModuleOptions, z as ModuleSetupInstallResult, E as ModuleSetupReturn, ab as NitroBuildInfo, _ as RequiredServiceType, P as ResolvedMethodHandlerType, R as ResolvedModuleMeta, x as ResolvedModuleOptions, $ as ResolvedServiceType, Z as ServiceType, a4 as Silgi, U as SilgiAppPlugin, a8 as SilgiCLI, b as SilgiCLIConfig, a9 as SilgiCLIDynamicConfig, c as SilgiCLIHooks, a as SilgiCLIOptions, u as SilgiCompatibility, d as SilgiCompatibilityIssue, e as SilgiCompatibilityIssues, a5 as SilgiConfig, a0 as SilgiDefaultShared, g as SilgiEvent, aa as SilgiFrameworkInfo, a6 as SilgiFunction, k as SilgiHook, p as SilgiHooks, h as SilgiMethods, F as SilgiModule, t as SilgiModuleInput, r as SilgiModuleMethods, s as SilgiModuleOptions, a1 as SilgiModuleShared, q as SilgiModules, i as SilgiNamespaces, H as SilgiOperation, f as SilgiOptions, I as SilgiPreset, J as SilgiPresetMeta, j as SilgiRouterTypes, X as SilgiSchema, ai as SilgiStorageBase, ac as SilgiURIs, ak as StorageConfig, aj as StorageKeyGenerator, al as StorageKeyParams, ah as StorageMounts, T as TSReference, ad as URIsTypes } from '../shared/silgi.yr8vHHvd.js';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import 'defu';
 import '@graphql-tools/utils';
 import 'pkg-types';
 import 'consola';
 import 'hookable';
+import 'ignore';
 import 'silgi/presets';
 import 'silgi/types';
 import 'unimport';
@@ -16,7 +17,6 @@ import 'compatx';
 import 'unimport/unplugin';
 import 'std-env';
 import '../shared/silgi.40ZJYm8F.js';
-import 'ignore';
 
 interface SilgiModuleContext extends Record<string, any> {
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "sideEffects": false,
   "exports": {
     "./cli": {
@@ -189,7 +189,7 @@
   },
   "scripts": {
     "build": "pnpm gen-presets && pnpm build:package && pnpm --filter './modules/*' generate && pnpm build:module",
-    "build:prepare": "pnpm gen-presets && pnpm build:package && pnpm --filter './modules/*' generate && pnpm build:prepare",
+    "build:prepare": "pnpm build:stub && pnpm --filter './modules/*' silgi:prepare",
     "build:package": "unbuild",
     "build:module": "pnpm --filter '@silgi/*' build",
     "build:stub": "pnpm gen-presets && unbuild --stub && pnpm --filter './modules/*' build:stub && pnpm --filter './module-builder' build:stub",