silgi 0.1.12 → 0.2.0

package/dist/chunks/generate.mjs

@@ -9,7 +9,7 @@ import { r as relativeWithDot } from '../shared/silgi.C0NIj2vN.mjs';
 import { defu } from 'defu';
 import { withTrailingSlash } from 'ufo';
 import { resolvePath, resolve as resolve$1 } from 'mlly';
-import { j as getDirectory, r as resolveSilgiModule, k as resolvePath$1, m as generateUris, o as generateSilgiStorageBaseType } from '../shared/silgi.DTGmgpWE.mjs';
+import { i as getDirectory, r as resolveSilgiModule, j as resolvePath$1, k as generateUris, m as generateSilgiStorageBaseType } from '../shared/silgi.BLxo8kmF.mjs';
 import { readdir } from 'node:fs/promises';
 import { consola } from 'consola';
 import { globby } from 'globby';
@@ -157,7 +157,7 @@ async function _generateSchemaFile(silgi) {
     ...(silgi.options.namespaces || []).map((key) => `  ${key}: string,`),
     "}",
     "",
-    `type SilgiTypeExtends = Namespaces<typeof import('${silgiExport}')['types']>`,
+    `type SchemaExtends = Namespaces<typeof import('${silgiExport}')['schemas']>`,
     "",
     `type SilgiURIsMerge = URIsTypes<typeof import('${silgiExport}')['uris']>`,
     "",
@@ -187,7 +187,7 @@ async function _generateSchemaFile(silgi) {
     "}",
     "",
     "declare module 'silgi' {",
-    " interface SilgiServiceTypes extends SilgiTypeExtends {}",
+    " interface SilgiSchema extends SchemaExtends {}",
     "",
     " interface SilgiValidationSchema {",
     `  validationLibrary: '${silgi.options.validationLibrary}'`,
@@ -261,7 +261,7 @@ async function _generateSilgiFile(silgi) {
   const uris = [];
   const services = [];
   const shareds = [];
-  const types = [];
+  const schemas = [];
   const modules = [];
   await silgi.callHook("prepare:core.ts", {
     importedItems,
@@ -269,7 +269,7 @@ async function _generateSilgiFile(silgi) {
     uris,
     services,
     shareds,
-    types,
+    schemas,
     modules
   });
   if (services.length > 0) {
@@ -278,8 +278,8 @@ async function _generateSilgiFile(silgi) {
   if (shareds.length > 0) {
     importedItems.silgi.import.push({ name: "mergeShared" });
   }
-  if (types.length > 0) {
-    importedItems.silgi.import.push({ name: "mergeSilgiTypes" });
+  if (schemas.length > 0) {
+    importedItems.silgi.import.push({ name: "mergeSchemas" });
   }
   const importData = [
     ...Object.entries(importedItems).map(([_name, { from, import: imports2 }]) => {
@@ -289,11 +289,11 @@ async function _generateSilgiFile(silgi) {
     "",
     "export const uris = {}",
     "",
-    types.length > 0 ? "export const types = mergeSilgiTypes([" : "export const types = {",
-    ...types.map((name) => {
+    schemas.length > 0 ? "export const schemas = mergeSchemas([" : "export const schemas = {",
+    ...schemas.map((name) => {
       return `  ${name},`;
     }),
-    types.length > 0 ? "])" : "}",
+    schemas.length > 0 ? "])" : "}",
     "",
     services.length > 0 ? "export const services = mergeServices([" : "export const services = {",
     ...services.map((name) => {
@@ -313,7 +313,7 @@ async function _generateSilgiFile(silgi) {
     "  const silgi = await createSilgi({",
     "      shared: shareds as any,",
     "      services: services as any,",
-    "      types: types as any,",
+    "      schemas: schemas as any,",
     "      uris,",
     "      _initializedModules: {",
     ...modules.map((name) => {
@@ -335,6 +335,7 @@ async function _generateSilgiFile(silgi) {
     "    uris,",
     "    services,",
     "    shareds,",
+    "    schemas,",
     "  }",
     "  return returnObject",
     "}",
@@ -790,12 +791,12 @@ async function scanFiles(silgi) {
           });
         }
       }
-      const createTypes = exportVariables("createType", filePath);
-      if (createTypes.length > 0) {
-        for (const createType of createTypes) {
-          const { exportName, path } = createType;
+      const createSchemas = exportVariables("createSchema", filePath);
+      if (createSchemas.length > 0) {
+        for (const createSchema of createSchemas) {
+          const { exportName, path } = createSchema;
           silgi.hook("prepare:core.ts", (options) => {
-            options.types.push(exportName);
+            options.schemas.push(exportName);
           });
           silgi.hook("prepare:core.ts", (options) => {
             options.importedItems[path] ??= {
@@ -1156,7 +1157,7 @@ async function generate$1(mergeConfig) {
     uris: {},
     _initializedModules: {},
     scannedHandlers: /* @__PURE__ */ new Map(),
-    types: {},
+    schemas: {},
     storage: undefined,
     hooks,
     callHook: hooks.callHook,

package/dist/cli/config.d.mts

@@ -1,13 +1,13 @@
 import * as unstorage from 'unstorage';
 import * as net from 'net';
 import * as consola from 'consola';
-import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions, V as ValidationLibrary } from '../shared/silgi.BaeZYxPa.mjs';
+import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions, V as ValidationLibrary } from '../shared/silgi.wMv9BQmS.mjs';
 import 'hookable';
 import 'ignore';
 import 'defu';
+import 'zod';
 import 'h3';
 import 'pkg-types';
-import 'zod';
 import 'nitropack/types';
 
 declare function defineSilgiConfig(config: DeepPartial<SilgiOptions> & Partial<SilgiModuleOptions>): {
@@ -1379,6 +1379,7 @@ declare function defineSilgiConfig(config: DeepPartial<SilgiOptions> & Partial<S
                     shared?: true | undefined;
                     context?: true | undefined;
                     method?: true | undefined;
+                    schema?: true | undefined;
                     event?: true | undefined;
                 } | undefined;
                 variable?: {

package/dist/cli/config.d.ts

@@ -1,13 +1,13 @@
 import * as unstorage from 'unstorage';
 import * as net from 'net';
 import * as consola from 'consola';
-import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions, V as ValidationLibrary } from '../shared/silgi.BaeZYxPa.js';
+import { D as DeepPartial, S as SilgiOptions, a as SilgiModuleOptions, V as ValidationLibrary } from '../shared/silgi.wMv9BQmS.js';
 import 'hookable';
 import 'ignore';
 import 'defu';
+import 'zod';
 import 'h3';
 import 'pkg-types';
-import 'zod';
 import 'nitropack/types';
 
 declare function defineSilgiConfig(config: DeepPartial<SilgiOptions> & Partial<SilgiModuleOptions>): {
@@ -1379,6 +1379,7 @@ declare function defineSilgiConfig(config: DeepPartial<SilgiOptions> & Partial<S
                     shared?: true | undefined;
                     context?: true | undefined;
                     method?: true | undefined;
+                    schema?: true | undefined;
                     event?: true | undefined;
                 } | undefined;
                 variable?: {

package/dist/cli/index.mjs

@@ -3,7 +3,7 @@ import consola from 'consola';
 
 const name = "silgi";
 const type = "module";
-const version = "0.1.12";
+const version = "0.2.0";
 const packageManager = "pnpm@9.15.1";
 const sideEffects = false;
 const exports = {

package/dist/index.d.mts

@@ -1,14 +1,14 @@
-import { b as SilgiConfig, c as SilgiHelper, M as ModuleOptions, d as ModuleDefinition, e as SilgiModule, B as BaseSchemaType, f as SelectedValidationLibrary, g as SilgiServiceInterface, h as DefaultNamespaces, i as Silgi, j as SilgiOperation, k as MergeSilgiType, l as ServiceType, m as SilgiServiceTypes, R as RequiredServiceType, n as SilgiModuleShared } from './shared/silgi.BaeZYxPa.mjs';
-export { A as Awaitable, C as CreateScope, D as DeepPartial, z as DefaultHooks, y as DefaultMethods, E as ExtendShared, t as SilgiDefaultShared, o as SilgiEvent, x as SilgiHook, p as SilgiModuleMethods, a as SilgiModuleOptions, q as SilgiModules, r as SilgiNamespaces, S as SilgiOptions, v as SilgiStorageBase, u as SilgiURIs, s as SilgiValidationSchema, U as URIsTypes, w as silgi } from './shared/silgi.BaeZYxPa.mjs';
+import { b as SilgiConfig, c as SilgiHelper, M as ModuleOptions, d as ModuleDefinition, e as SilgiModule, B as BaseSchemaType, f as SelectedValidationLibrary, g as SilgiServiceInterface, h as DefaultNamespaces, i as Silgi, j as SilgiOperation, k as MergedSilgiSchema, l as ServiceType, m as SilgiSchema, R as RequiredServiceType, n as SilgiModuleShared } from './shared/silgi.wMv9BQmS.mjs';
+export { A as Awaitable, C as CreateScope, D as DeepPartial, z as DefaultHooks, y as DefaultMethods, E as ExtendShared, t as SilgiDefaultShared, o as SilgiEvent, x as SilgiHook, p as SilgiModuleMethods, a as SilgiModuleOptions, q as SilgiModules, r as SilgiNamespaces, S as SilgiOptions, v as SilgiStorageBase, u as SilgiURIs, s as SilgiValidationSchema, U as URIsTypes, w as silgi } from './shared/silgi.wMv9BQmS.mjs';
 import * as unctx_index from 'unctx/index';
 import 'consola';
 import 'hookable';
 import 'ignore';
 import 'unstorage';
 import 'defu';
+import 'zod';
 import 'h3';
 import 'pkg-types';
-import 'zod';
 import 'nitropack/types';
 
 declare function createSilgi(config: SilgiConfig): Promise<SilgiHelper>;
@@ -121,7 +121,6 @@ declare function normalizeResult<T>(result: T): T;
  */
 declare function tryUseSilgi(): Silgi | null;
 
-declare function generateURI(paths: string[], depth?: number): string;
 /**
  *
  *
@@ -135,21 +134,21 @@ declare function generateURI(paths: string[], depth?: number): string;
  * method: 'createBasket'
  *
  */
-declare function parseURI(uri: string): SilgiOperation;
+declare function parseURI(uri: string, uris?: object): SilgiOperation;
 
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
-declare function mergeSilgiTypes<T extends MergeSilgiType[]>(typesOrArray: [...T] | T): UnionToIntersection<T[number]>;
-declare function mergeServices<T extends ServiceType<SilgiServiceTypes>[]>(servicesOrArray: [...T] | T): RequiredServiceType<SilgiServiceTypes>;
+declare function mergeSchemas<T extends MergedSilgiSchema[]>(typesOrArray: [...T] | T): UnionToIntersection<T[number]>;
+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 createService<T extends SilgiServiceTypes>(variables: ServiceType<T>): ServiceType<T>;
+declare function createService<T extends SilgiSchema>(variables: ServiceType<T>): ServiceType<T>;
 
 declare function createShared(shared: Partial<SilgiModuleShared>): SilgiModuleShared;
 
-declare function createType<T extends Partial<Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<SelectedValidationLibrary>>>>>(silgiType: T): {
+declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<SelectedValidationLibrary>>>>>(silgiType: T): {
     [K in keyof T]: {
         [P in keyof T[K]]: T[K][P];
     };
 };
 
-export { DefaultNamespaces, type ExtendContext, MergeSilgiType, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiServiceTypes, createResolver, createService, createShared, createSilgi, createType, defineSilgiModule, generateURI, mergeServices, mergeShared, mergeSilgiTypes, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };
+export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-import { b as SilgiConfig, c as SilgiHelper, M as ModuleOptions, d as ModuleDefinition, e as SilgiModule, B as BaseSchemaType, f as SelectedValidationLibrary, g as SilgiServiceInterface, h as DefaultNamespaces, i as Silgi, j as SilgiOperation, k as MergeSilgiType, l as ServiceType, m as SilgiServiceTypes, R as RequiredServiceType, n as SilgiModuleShared } from './shared/silgi.BaeZYxPa.js';
-export { A as Awaitable, C as CreateScope, D as DeepPartial, z as DefaultHooks, y as DefaultMethods, E as ExtendShared, t as SilgiDefaultShared, o as SilgiEvent, x as SilgiHook, p as SilgiModuleMethods, a as SilgiModuleOptions, q as SilgiModules, r as SilgiNamespaces, S as SilgiOptions, v as SilgiStorageBase, u as SilgiURIs, s as SilgiValidationSchema, U as URIsTypes, w as silgi } from './shared/silgi.BaeZYxPa.js';
+import { b as SilgiConfig, c as SilgiHelper, M as ModuleOptions, d as ModuleDefinition, e as SilgiModule, B as BaseSchemaType, f as SelectedValidationLibrary, g as SilgiServiceInterface, h as DefaultNamespaces, i as Silgi, j as SilgiOperation, k as MergedSilgiSchema, l as ServiceType, m as SilgiSchema, R as RequiredServiceType, n as SilgiModuleShared } from './shared/silgi.wMv9BQmS.js';
+export { A as Awaitable, C as CreateScope, D as DeepPartial, z as DefaultHooks, y as DefaultMethods, E as ExtendShared, t as SilgiDefaultShared, o as SilgiEvent, x as SilgiHook, p as SilgiModuleMethods, a as SilgiModuleOptions, q as SilgiModules, r as SilgiNamespaces, S as SilgiOptions, v as SilgiStorageBase, u as SilgiURIs, s as SilgiValidationSchema, U as URIsTypes, w as silgi } from './shared/silgi.wMv9BQmS.js';
 import * as unctx_index from 'unctx/index';
 import 'consola';
 import 'hookable';
 import 'ignore';
 import 'unstorage';
 import 'defu';
+import 'zod';
 import 'h3';
 import 'pkg-types';
-import 'zod';
 import 'nitropack/types';
 
 declare function createSilgi(config: SilgiConfig): Promise<SilgiHelper>;
@@ -121,7 +121,6 @@ declare function normalizeResult<T>(result: T): T;
  */
 declare function tryUseSilgi(): Silgi | null;
 
-declare function generateURI(paths: string[], depth?: number): string;
 /**
  *
  *
@@ -135,21 +134,21 @@ declare function generateURI(paths: string[], depth?: number): string;
  * method: 'createBasket'
  *
  */
-declare function parseURI(uri: string): SilgiOperation;
+declare function parseURI(uri: string, uris?: object): SilgiOperation;
 
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
-declare function mergeSilgiTypes<T extends MergeSilgiType[]>(typesOrArray: [...T] | T): UnionToIntersection<T[number]>;
-declare function mergeServices<T extends ServiceType<SilgiServiceTypes>[]>(servicesOrArray: [...T] | T): RequiredServiceType<SilgiServiceTypes>;
+declare function mergeSchemas<T extends MergedSilgiSchema[]>(typesOrArray: [...T] | T): UnionToIntersection<T[number]>;
+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 createService<T extends SilgiServiceTypes>(variables: ServiceType<T>): ServiceType<T>;
+declare function createService<T extends SilgiSchema>(variables: ServiceType<T>): ServiceType<T>;
 
 declare function createShared(shared: Partial<SilgiModuleShared>): SilgiModuleShared;
 
-declare function createType<T extends Partial<Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<SelectedValidationLibrary>>>>>(silgiType: T): {
+declare function createSchema<T extends Partial<Record<keyof DefaultNamespaces, Record<string, BaseSchemaType<SelectedValidationLibrary>>>>>(silgiType: T): {
     [K in keyof T]: {
         [P in keyof T[K]]: T[K][P];
     };
 };
 
-export { DefaultNamespaces, type ExtendContext, MergeSilgiType, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiServiceTypes, createResolver, createService, createShared, createSilgi, createType, defineSilgiModule, generateURI, mergeServices, mergeShared, mergeSilgiTypes, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };
+export { DefaultNamespaces, type ExtendContext, MergedSilgiSchema, type Namespaces, ServiceType, Silgi, SilgiError, SilgiHelper, type SilgiModuleContext, SilgiModuleShared, SilgiSchema, createResolver, createSchema, createService, createShared, createSilgi, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, relativeWithDot, silgiCtx, tryUseSilgi, useHook, useShared, useSilgi };

package/dist/index.mjs

@@ -2,8 +2,8 @@ import { createConsola } from 'consola';
 import defu, { defu as defu$1 } from 'defu';
 import { createHooks } from 'hookable';
 import { applyDefaults } from 'untyped';
-import { u as useSilgi, l as loadSilgiModuleInstance, p as parseURI, S as SilgiError, a as useStorage, n as normalizeResult, b as SilgiErrorCode, g as generateStorageKey, s as scanHandler, c as createStorage, d as silgiCtx, t as tryUseSilgi } from './shared/silgi.DTGmgpWE.mjs';
-export { e as createResolver, i as generateURI, f as useHook, h as useShared } from './shared/silgi.DTGmgpWE.mjs';
+import { u as useSilgi, l as loadSilgiModuleInstance, p as parseURI, S as SilgiError, a as useStorage, n as normalizeResult, b as SilgiErrorCode, g as generateStorageKey, s as scanAction, c as createStorage, d as silgiCtx, t as tryUseSilgi } from './shared/silgi.BLxo8kmF.mjs';
+export { e as createResolver, f as useHook, h as useShared } from './shared/silgi.BLxo8kmF.mjs';
 import satisfies from 'semver/functions/satisfies.js';
 import { S as SilgiConfigSchema } from './shared/silgi.C0NIj2vN.mjs';
 export { r as relativeWithDot } from './shared/silgi.C0NIj2vN.mjs';
@@ -104,7 +104,7 @@ async function execute(uriString, input, event) {
   let result;
   let operation;
   try {
-    operation = parseURI(uriString);
+    operation = parseURI(uriString, silgiCtx.uris);
   } catch {
     throw new SilgiError({
       code: "INVALID_URI",
@@ -128,7 +128,7 @@ async function execute(uriString, input, event) {
       input,
       event
     });
-    const handler = silgiCtx.scannedHandlers.get(operation.raw);
+    const handler = silgiCtx.scannedHandlers.get(operation.uri);
     if (!handler) {
       return {
         success: false,
@@ -147,8 +147,12 @@ async function execute(uriString, input, event) {
       success = cacheData.success;
       cached = cacheData.cached;
     } else {
+      const router = {
+        params: operation.routerParams,
+        query: operation.query
+      };
       silgiCtx.shared.silgi = (_event) => silgi(_event || event);
-      result = await handler?.handler(input, silgiCtx.shared, event);
+      result = await handler?.handler(router, input, silgiCtx.shared, event);
       success = true;
     }
     await silgiCtx.callHook("method:after", {
@@ -323,7 +327,7 @@ async function createSilgi(config) {
   const hooks = createHooks();
   await applyDefaults(SilgiConfigSchema, config.options);
   const silgi = {
-    types: config.types,
+    schemas: config.schemas,
     _version: version,
     services: config.services,
     shared: config.shared,
@@ -346,7 +350,7 @@ async function createSilgi(config) {
     })).withTag("silgi")
     // TODO: shared, uris, services burada olacak
   };
-  await scanHandler(silgi);
+  await scanAction(silgi);
   silgi.storage = await createStorage(silgi);
   silgi.shared.storage = (...data) => {
     return useStorage(...data);
@@ -440,7 +444,7 @@ ${issues.toString()}`);
 function merge(items) {
   return Object.assign({}, ...Array.isArray(items) ? items : [items]);
 }
-function mergeSilgiTypes(typesOrArray) {
+function mergeSchemas(typesOrArray) {
   return merge(typesOrArray);
 }
 function mergeServices(servicesOrArray) {
@@ -458,8 +462,8 @@ function createShared(shared) {
   return shared;
 }
 
-function createType(silgiType) {
+function createSchema(silgiType) {
   return silgiType;
 }
 
-export { SilgiError, SilgiHelper, createService, createShared, createSilgi, createType, defineSilgiModule, mergeServices, mergeShared, mergeSilgiTypes, normalizeResult, parseURI, silgi, silgiCtx, tryUseSilgi, useSilgi };
+export { SilgiError, SilgiHelper, createSchema, createService, createShared, createSilgi, defineSilgiModule, mergeSchemas, mergeServices, mergeShared, normalizeResult, parseURI, silgi, silgiCtx, tryUseSilgi, useSilgi };

package/dist/shared/{silgi.DTGmgpWE.mjs → silgi.BLxo8kmF.mjs}

@@ -139,48 +139,119 @@ ${this.stack}`;
   }
 }
 
-function generateURI(paths, depth = 3) {
-  if (paths.length > depth) {
-    paths = paths.slice(0, depth);
+const plugins = {
+  zod: {
+    name: "zod",
+    isSchemaType: (obj) => obj?._def?.typeName !== undefined,
+    getRouterParams: (routerObj) => {
+      try {
+        const shape = routerObj?.shape?.params?.shape;
+        return shape ? Object.keys(shape) : null;
+      } catch {
+        return null;
+      }
+    }
+  },
+  yup: {
+    name: "yup",
+    isSchemaType: (obj) => obj?._type !== undefined,
+    getRouterParams: (routerObj) => {
+      return routerObj?.fields ? Object.keys(routerObj.fields) : null;
+    }
+  }
+};
+class SchemaValidatorRegistry {
+  validators = [];
+  constructor(validationLibrary = "zod") {
+    this.setValidationLibrary(validationLibrary);
+  }
+  setValidationLibrary(library) {
+    this.validators = [];
+    const plugin = plugins[library];
+    if (plugin) {
+      this.register(plugin);
+    }
+  }
+  register(plugin) {
+    this.validators.push(plugin);
+  }
+  getParams(routerObj) {
+    for (const validator of this.validators) {
+      if (validator.isSchemaType(routerObj)) {
+        return validator.getRouterParams(routerObj);
+      }
+    }
+    return null;
   }
-  return paths.join("/");
 }
-function traverseObject(obj, currentPath = [], depth = 4) {
-  if (currentPath.length === depth || typeof obj !== "object" || obj === null) {
-    if (currentPath.length > 2 && currentPath[2] === "options") {
-      return [];
+const schemaRegistry = new SchemaValidatorRegistry();
+
+function traverseObject(silgi, obj, currentPath = []) {
+  schemaRegistry.setValidationLibrary(silgi.options.validationLibrary || "zod");
+  const uriMap = /* @__PURE__ */ new Map();
+  function traverse(node, path = []) {
+    if (node && typeof node === "object" && node.input && node.output) {
+      const basePath = path.join("/");
+      if (node.router) {
+        const params = schemaRegistry.getParams(node.router);
+        if (params?.length) {
+          const paramString = params.map((p) => `:${p}`).join("/");
+          uriMap.set(basePath, paramString);
+        } else {
+          uriMap.set(basePath, "");
+        }
+      } else {
+        uriMap.set(basePath, "");
+      }
+      return;
+    }
+    if (node && typeof node === "object") {
+      for (const key in node) {
+        if (!["router", "input", "output", "_def", "shape"].includes(key)) {
+          traverse(node[key], [...path, key]);
+        }
+      }
     }
-    return currentPath.length > 0 ? [generateURI(currentPath, depth)] : [];
   }
-  return Object.entries(obj).flatMap(([key, value]) => {
-    return traverseObject(value, [...currentPath, key], depth);
-  });
+  traverse(obj, currentPath);
+  return uriMap;
 }
-function parseURI(uri) {
+function parseURI(uri, uris) {
+  if (!uris) {
+    const silgiCtx = useSilgi();
+    uris = silgiCtx.uris;
+  }
   uri = uri.replace("/srn", "");
   const [cleanPath, queryString] = uri.split("?");
-  const params = new URLSearchParams(queryString);
-  Object.fromEntries(params);
+  const query = new URLSearchParams(queryString);
+  const methodQuery = query.get("method")?.toLowerCase();
   const parts = cleanPath.split("/").filter(Boolean);
-  if (parts.length < 4) {
-    if (parts.length === 3) {
-      const method = params.get("method") || "get";
-      parts.splice(3, 0, method.toLowerCase());
-      uri = `${parts[0]}/${parts[1]}/${parts[3]}/${parts[2]}`;
-    } else {
-      throw new SilgiError({
-        code: "INVALID_SRN_RESOURCE",
-        message: `Invalid SRN resource: ${uri}`
-      });
-    }
+  const [namespace, service, methodOrAction, action, ...routerParams] = parts;
+  let uriKey = `${namespace}/${service}/${methodOrAction}/${action}`;
+  if (methodQuery) {
+    uriKey = `${namespace}/${service}/${methodQuery}/${methodOrAction}`;
+    routerParams.unshift(action);
+  }
+  const paramTemplate = uris[uriKey];
+  const routerParamsData = {};
+  if (paramTemplate && routerParams.length > 0) {
+    const paramNames = paramTemplate.split("/").map((p) => p.replace(":", ""));
+    routerParams.forEach((value, index) => {
+      if (paramNames[index]) {
+        routerParamsData[paramNames[index]] = value;
+      }
+    });
   }
   return {
-    namespaceName: parts[0],
-    serviceName: parts[1],
-    actionName: parts[3],
-    methodName: parts[2],
+    namespaceName: namespace,
+    serviceName: service,
+    methodName: methodQuery || methodOrAction,
+    actionName: methodQuery ? methodOrAction : action,
     raw: uri,
-    parts
+    parts: [namespace, service, methodQuery || methodOrAction, action],
+    routerParams: routerParamsData,
+    query: query.toString() ? Object.fromEntries(query) : undefined,
+    uri: uriKey
   };
 }
 
@@ -248,21 +319,22 @@ async function generateSilgiStorageBaseType(silgi) {
   });
 }
 
-async function generateUris(silgi, depth = 4) {
+async function generateUris(silgi) {
   silgi.hook("read:core.ts", async (data) => {
     const { context, object, path } = await data();
-    const uris = traverseObject(object.services, [], depth);
-    const newContenxt = context.replace("export const uris = {}", `export const uris = {
-  ${uris.map((r) => {
-      return `'${r}': ''`;
-    }).join(",\n  ")}
-}
-        `);
-    await promises.writeFile(path, newContenxt);
+    const uriMap = traverseObject(silgi, object.schemas, []);
+    const uriContent = Array.from(uriMap.entries()).map(([uri, params]) => `  '${uri}': '${params}',`).join("\n");
+    const newContext = context.replace(
+      "export const uris = {}",
+      `export const uris = {
+${uriContent}
+}`
+    );
+    await promises.writeFile(path, newContext);
   });
 }
-async function findHandler(silgi, uri) {
-  const { action, method, namespace, service, parts } = parseURI(uri);
+async function findAction(silgi, uri) {
+  const { parts } = parseURI(uri, silgi);
   let result = silgi.services;
   for (const part of parts) {
     if (result && Object.prototype.hasOwnProperty.call(result, part)) {
@@ -274,9 +346,9 @@ async function findHandler(silgi, uri) {
   }
   return result;
 }
-async function scanHandler(silgi) {
+async function scanAction(silgi) {
   for (const [key, _value] of Object.entries(silgi.uris)) {
-    const handler = await findHandler(silgi, key);
+    const handler = await findAction(silgi, key);
     silgi.scannedHandlers.set(key, handler);
   }
 }
@@ -352,4 +424,4 @@ async function resolveSilgiModule(base, paths) {
   return resolved;
 }
 
-export { SilgiError as S, useStorage as a, SilgiErrorCode as b, createStorage as c, silgiCtx as d, createResolver as e, useHook as f, generateStorageKey as g, useShared as h, generateURI as i, getDirectory as j, resolvePath as k, loadSilgiModuleInstance as l, generateUris as m, normalizeResult as n, generateSilgiStorageBaseType as o, parseURI as p, resolveSilgiModule as r, scanHandler as s, tryUseSilgi as t, useSilgi as u };
+export { SilgiError as S, useStorage as a, SilgiErrorCode as b, createStorage as c, silgiCtx as d, createResolver as e, useHook as f, generateStorageKey as g, useShared as h, getDirectory as i, resolvePath as j, generateUris as k, loadSilgiModuleInstance as l, generateSilgiStorageBaseType as m, normalizeResult as n, parseURI as p, resolveSilgiModule as r, scanAction as s, tryUseSilgi as t, useSilgi as u };

package/dist/shared/{silgi.BaeZYxPa.d.mts → silgi.wMv9BQmS.d.mts}

@@ -3,14 +3,51 @@ import { Hookable } from 'hookable';
 import { Ignore } from 'ignore';
 import { BuiltinDriverName, TransactionOptions, StorageValue, Storage } from 'unstorage';
 import { Defu } from 'defu';
+import { z } from 'zod';
 import { Router, H3Event } from 'h3';
 import { TSConfig } from 'pkg-types';
-import { z } from 'zod';
 import { NitroApp } from 'nitropack/types';
 
 interface SilgiEvent extends Record<string, unknown> {
 }
 
+interface SilgiMethods {
+}
+interface SilgiNamespaces {
+}
+type BaseSilgiMethodType = 'post' | 'delete' | 'put' | 'get' | keyof SilgiMethods;
+interface DefaultNamespaces extends SilgiNamespaces {
+}
+
+interface SilgiSchema {
+}
+interface MergedSilgiSchema {
+}
+interface SilgiValidationSchema {
+}
+type ValidationLibrary = 'zod' | 'yup';
+type SelectedValidationLibrary = SilgiValidationSchema extends {
+    validationLibrary: infer V;
+} ? V extends ValidationLibrary ? V : 'zod' : 'zod';
+/**
+ * A map of validation library names to their type definitions.
+ *
+ * @see {@link https://zod.dev/ | Zod}
+ * @see {@link https://github.com/jquense/yup | Yup}
+ */
+interface SchemaTypes {
+    zod: z.ZodTypeAny;
+    yup: any;
+}
+type InferSchemaType<V extends SelectedValidationLibrary, T> = V extends 'zod' ? T extends z.ZodTypeAny ? z.infer<T> : never : V extends 'yup' ? any : never;
+type BaseSchemaType<V extends SelectedValidationLibrary> = {
+    [Action in BaseSilgiMethodType]?: Record<string, {
+        input?: SchemaTypes[V];
+        output?: SchemaTypes[V];
+        routerParams?: SchemaTypes[V];
+    }>;
+};
+
 interface SilgiURIs {
 }
 type URIsTypes<T extends Record<string, string>> = {
@@ -27,22 +64,18 @@ type GetInput<T extends {
     entity: string;
     method: string;
     action: string;
-}> = T['service'] extends keyof SilgiServiceTypes ? T['entity'] extends keyof SilgiServiceTypes[T['service']] ? T['method'] extends keyof SilgiServiceTypes[T['service']][T['entity']] ? T['action'] extends keyof SilgiServiceTypes[T['service']][T['entity']][T['method']] ? SilgiServiceTypes[T['service']][T['entity']][T['method']][T['action']]['input'] : never : never : never : never;
+}> = T['service'] extends keyof SilgiSchema ? T['entity'] extends keyof SilgiSchema[T['service']] ? T['method'] extends keyof SilgiSchema[T['service']][T['entity']] ? T['action'] extends keyof SilgiSchema[T['service']][T['entity']][T['method']] ? SilgiSchema[T['service']][T['entity']][T['method']][T['action']]['input'] : never : never : never : never;
 type GetOutput<T extends {
     service: string;
     entity: string;
     method: string;
     action: string;
-}> = T['service'] extends keyof SilgiServiceTypes ? T['entity'] extends keyof SilgiServiceTypes[T['service']] ? T['method'] extends keyof SilgiServiceTypes[T['service']][T['entity']] ? T['action'] extends keyof SilgiServiceTypes[T['service']][T['entity']][T['method']] ? SilgiServiceTypes[T['service']][T['entity']][T['method']][T['action']]['output'] : never : never : never : never;
+}> = T['service'] extends keyof SilgiSchema ? T['entity'] extends keyof SilgiSchema[T['service']] ? T['method'] extends keyof SilgiSchema[T['service']][T['entity']] ? T['action'] extends keyof SilgiSchema[T['service']][T['entity']][T['method']] ? SilgiSchema[T['service']][T['entity']][T['method']][T['action']]['output'] : never : never : never : never;
 type ExtractInputFromURI<TURI extends keyof SilgiURIs> = GetInput<ExtractPath<TURI>>;
 type ExtractOutputFromURI<TURI extends keyof SilgiURIs> = GetOutput<ExtractPath<TURI>>;
 
 interface SilgiHook {
 }
-interface SilgiServiceTypes {
-}
-interface MergeSilgiType {
-}
 interface DefaultHooks {
 }
 interface DefaultMethods {
@@ -117,38 +150,6 @@ declare class SRNManager {
     getAllServices(): any;
 }
 
-interface SilgiMethods {
-}
-interface SilgiNamespaces {
-}
-type BaseSilgiMethodType = 'post' | 'delete' | 'put' | 'get' | keyof SilgiMethods;
-interface DefaultNamespaces extends SilgiNamespaces {
-}
-
-interface SilgiValidationSchema {
-}
-type ValidationLibrary = 'zod' | 'yup';
-type SelectedValidationLibrary = SilgiValidationSchema extends {
-    validationLibrary: infer V;
-} ? V extends ValidationLibrary ? V : 'zod' : 'zod';
-/**
- * A map of validation library names to their type definitions.
- *
- * @see {@link https://zod.dev/ | Zod}
- * @see {@link https://github.com/jquense/yup | Yup}
- */
-interface SchemaTypes {
-    zod: z.ZodTypeAny;
-    yup: any;
-}
-type InferSchemaType<V extends SelectedValidationLibrary, T> = V extends 'zod' ? T extends z.ZodTypeAny ? z.infer<T> : never : V extends 'yup' ? any : never;
-type BaseSchemaType<V extends SelectedValidationLibrary> = {
-    [Action in BaseSilgiMethodType]?: Record<string, {
-        input?: SchemaTypes[V];
-        output?: SchemaTypes[V];
-    }>;
-};
-
 /**
  * @example
  * namespace: 'coreApi'
@@ -181,7 +182,13 @@ interface SilgiOperation {
      * 'coreApi/basket/post/createBasket'
      */
     raw: keyof SilgiURIs;
+    /**
+     * '/book/basket/getAllBaskets'
+     */
+    uri: string;
     parts: string[];
+    routerParams?: Record<string, string>;
+    query?: Record<string, string>;
 }
 
 type CustomDriverName = string & {
@@ -517,7 +524,7 @@ interface SilgiHooks {
         uris: string[];
         services: string[];
         shareds: string[];
-        types: string[];
+        schemas: string[];
         modules: string[];
     }) => HookResult;
     'prepare:schema.ts': (options: {
@@ -573,6 +580,7 @@ interface SilgiHooks {
             uris?: string[];
             services?: string[];
             shareds?: string[];
+            schemas?: string[];
         };
         path: string;
     }>) => HookResult;
@@ -607,6 +615,7 @@ interface ModuleMeta {
             shared?: true;
             context?: true;
             method?: true;
+            schema?: true;
             event?: true;
         };
         variable?: {
@@ -697,7 +706,7 @@ type MethodHandlerType<T> = {
                 input?: T[Action][Method]['input'] extends infer U ? U : never;
                 output?: T[Action][Method]['output'] extends infer U ? U : never;
             };
-            handler: (input: T[Action][Method]['input'], shared: SilgiDefaultShared, event: SilgiEvent) => EventHandlerResponse<T[Action][Method]['output'] extends infer U ? U : undefined>;
+            handler: (router: T[Action][Method]['router'] extends infer U ? U : never, input: T[Action][Method]['input'], shared: SilgiDefaultShared, event: SilgiEvent) => EventHandlerResponse<T[Action][Method]['output'] extends infer U ? U : undefined>;
             modules?: ModuleConfigurations;
             storage?: StorageConfig<T[Action][Method]['input']>;
         };
@@ -706,7 +715,7 @@ type MethodHandlerType<T> = {
 interface ResolvedMethodHandlerType {
     input?: Partial<InferSchemaType<SelectedValidationLibrary, any>>;
     output: Partial<InferSchemaType<SelectedValidationLibrary, any>>;
-    handler: (input: InferSchemaType<SelectedValidationLibrary, any>, shared: SilgiDefaultShared, event: SilgiEvent) => Promise<InferSchemaType<SelectedValidationLibrary, any>>;
+    handler: (router: InferSchemaType<SelectedValidationLibrary, any>, input: InferSchemaType<SelectedValidationLibrary, any>, shared: SilgiDefaultShared, event: SilgiEvent) => Promise<InferSchemaType<SelectedValidationLibrary, any>>;
     modules?: ModuleConfigurations;
     storage?: StorageConfig<InferSchemaType<SelectedValidationLibrary, any>>;
     execute: (input: InferSchemaType<SelectedValidationLibrary, any>, shared: SilgiDefaultShared, event: SilgiEvent) => Promise<InferSchemaType<SelectedValidationLibrary, any>>;
@@ -735,7 +744,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["entity"] extends keyof SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["entity"] extends keyof SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -745,7 +754,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["method"] extends keyof SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["method"] extends keyof SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -760,7 +769,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["action"] extends keyof SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["action"] extends keyof SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -775,7 +784,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["method"]] ? SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["method"]] ? SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -803,6 +812,7 @@ type SilgiServiceInterface<T extends BaseSchemaType<SelectedValidationLibrary>>
         [Method in keyof T[Action]]: {
             input: InferSchemaType<SelectedValidationLibrary, T[Action][Method]['input']>;
             output?: InferSchemaType<SelectedValidationLibrary, T[Action][Method]['output']>;
+            router?: InferSchemaType<SelectedValidationLibrary, T[Action][Method]['router']>;
         };
     } : never;
 };
@@ -840,7 +850,7 @@ type ResolvedServiceType = {
 };
 
 interface Silgi {
-    types: any;
+    schemas: any;
     services: ResolvedServiceType;
     shared: SilgiDefaultShared;
     uris: Record<string, any>;
@@ -863,9 +873,9 @@ interface Silgi {
     storage: Storage;
     options: SilgiOptions;
 }
-interface SilgiConfig extends Pick<Silgi, 'services' | 'shared' | 'uris' | 'types' | '_initializedModules'> {
+interface SilgiConfig extends Pick<Silgi, 'services' | 'shared' | 'uris' | 'schemas' | '_initializedModules'> {
     options: DeepPartial<SilgiOptions>;
 }
 type SilgiFunction = typeof silgi;
 
-export { type Awaitable as A, type BaseSchemaType as B, type CreateScope as C, type DeepPartial as D, type ExtendShared as E, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type ValidationLibrary as V, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type ModuleDefinition as d, type SilgiModule as e, type SelectedValidationLibrary as f, type SilgiServiceInterface as g, type DefaultNamespaces as h, type Silgi as i, type SilgiOperation as j, type MergeSilgiType as k, type ServiceType as l, type SilgiServiceTypes as m, type SilgiModuleShared as n, type SilgiEvent as o, type SilgiModuleMethods as p, type SilgiModules as q, type SilgiNamespaces as r, type SilgiValidationSchema as s, type SilgiDefaultShared as t, type SilgiURIs as u, type SilgiStorageBase as v, silgi as w, type SilgiHook as x, type DefaultMethods as y, type DefaultHooks as z };
+export { type Awaitable as A, type BaseSchemaType as B, type CreateScope as C, type DeepPartial as D, type ExtendShared as E, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type ValidationLibrary as V, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type ModuleDefinition as d, type SilgiModule as e, type SelectedValidationLibrary as f, type SilgiServiceInterface as g, type DefaultNamespaces as h, type Silgi as i, type SilgiOperation as j, type MergedSilgiSchema as k, type ServiceType as l, type SilgiSchema as m, type SilgiModuleShared as n, type SilgiEvent as o, type SilgiModuleMethods as p, type SilgiModules as q, type SilgiNamespaces as r, type SilgiValidationSchema as s, type SilgiDefaultShared as t, type SilgiURIs as u, type SilgiStorageBase as v, silgi as w, type SilgiHook as x, type DefaultMethods as y, type DefaultHooks as z };

package/dist/shared/{silgi.BaeZYxPa.d.ts → silgi.wMv9BQmS.d.ts}

@@ -3,14 +3,51 @@ import { Hookable } from 'hookable';
 import { Ignore } from 'ignore';
 import { BuiltinDriverName, TransactionOptions, StorageValue, Storage } from 'unstorage';
 import { Defu } from 'defu';
+import { z } from 'zod';
 import { Router, H3Event } from 'h3';
 import { TSConfig } from 'pkg-types';
-import { z } from 'zod';
 import { NitroApp } from 'nitropack/types';
 
 interface SilgiEvent extends Record<string, unknown> {
 }
 
+interface SilgiMethods {
+}
+interface SilgiNamespaces {
+}
+type BaseSilgiMethodType = 'post' | 'delete' | 'put' | 'get' | keyof SilgiMethods;
+interface DefaultNamespaces extends SilgiNamespaces {
+}
+
+interface SilgiSchema {
+}
+interface MergedSilgiSchema {
+}
+interface SilgiValidationSchema {
+}
+type ValidationLibrary = 'zod' | 'yup';
+type SelectedValidationLibrary = SilgiValidationSchema extends {
+    validationLibrary: infer V;
+} ? V extends ValidationLibrary ? V : 'zod' : 'zod';
+/**
+ * A map of validation library names to their type definitions.
+ *
+ * @see {@link https://zod.dev/ | Zod}
+ * @see {@link https://github.com/jquense/yup | Yup}
+ */
+interface SchemaTypes {
+    zod: z.ZodTypeAny;
+    yup: any;
+}
+type InferSchemaType<V extends SelectedValidationLibrary, T> = V extends 'zod' ? T extends z.ZodTypeAny ? z.infer<T> : never : V extends 'yup' ? any : never;
+type BaseSchemaType<V extends SelectedValidationLibrary> = {
+    [Action in BaseSilgiMethodType]?: Record<string, {
+        input?: SchemaTypes[V];
+        output?: SchemaTypes[V];
+        routerParams?: SchemaTypes[V];
+    }>;
+};
+
 interface SilgiURIs {
 }
 type URIsTypes<T extends Record<string, string>> = {
@@ -27,22 +64,18 @@ type GetInput<T extends {
     entity: string;
     method: string;
     action: string;
-}> = T['service'] extends keyof SilgiServiceTypes ? T['entity'] extends keyof SilgiServiceTypes[T['service']] ? T['method'] extends keyof SilgiServiceTypes[T['service']][T['entity']] ? T['action'] extends keyof SilgiServiceTypes[T['service']][T['entity']][T['method']] ? SilgiServiceTypes[T['service']][T['entity']][T['method']][T['action']]['input'] : never : never : never : never;
+}> = T['service'] extends keyof SilgiSchema ? T['entity'] extends keyof SilgiSchema[T['service']] ? T['method'] extends keyof SilgiSchema[T['service']][T['entity']] ? T['action'] extends keyof SilgiSchema[T['service']][T['entity']][T['method']] ? SilgiSchema[T['service']][T['entity']][T['method']][T['action']]['input'] : never : never : never : never;
 type GetOutput<T extends {
     service: string;
     entity: string;
     method: string;
     action: string;
-}> = T['service'] extends keyof SilgiServiceTypes ? T['entity'] extends keyof SilgiServiceTypes[T['service']] ? T['method'] extends keyof SilgiServiceTypes[T['service']][T['entity']] ? T['action'] extends keyof SilgiServiceTypes[T['service']][T['entity']][T['method']] ? SilgiServiceTypes[T['service']][T['entity']][T['method']][T['action']]['output'] : never : never : never : never;
+}> = T['service'] extends keyof SilgiSchema ? T['entity'] extends keyof SilgiSchema[T['service']] ? T['method'] extends keyof SilgiSchema[T['service']][T['entity']] ? T['action'] extends keyof SilgiSchema[T['service']][T['entity']][T['method']] ? SilgiSchema[T['service']][T['entity']][T['method']][T['action']]['output'] : never : never : never : never;
 type ExtractInputFromURI<TURI extends keyof SilgiURIs> = GetInput<ExtractPath<TURI>>;
 type ExtractOutputFromURI<TURI extends keyof SilgiURIs> = GetOutput<ExtractPath<TURI>>;
 
 interface SilgiHook {
 }
-interface SilgiServiceTypes {
-}
-interface MergeSilgiType {
-}
 interface DefaultHooks {
 }
 interface DefaultMethods {
@@ -117,38 +150,6 @@ declare class SRNManager {
     getAllServices(): any;
 }
 
-interface SilgiMethods {
-}
-interface SilgiNamespaces {
-}
-type BaseSilgiMethodType = 'post' | 'delete' | 'put' | 'get' | keyof SilgiMethods;
-interface DefaultNamespaces extends SilgiNamespaces {
-}
-
-interface SilgiValidationSchema {
-}
-type ValidationLibrary = 'zod' | 'yup';
-type SelectedValidationLibrary = SilgiValidationSchema extends {
-    validationLibrary: infer V;
-} ? V extends ValidationLibrary ? V : 'zod' : 'zod';
-/**
- * A map of validation library names to their type definitions.
- *
- * @see {@link https://zod.dev/ | Zod}
- * @see {@link https://github.com/jquense/yup | Yup}
- */
-interface SchemaTypes {
-    zod: z.ZodTypeAny;
-    yup: any;
-}
-type InferSchemaType<V extends SelectedValidationLibrary, T> = V extends 'zod' ? T extends z.ZodTypeAny ? z.infer<T> : never : V extends 'yup' ? any : never;
-type BaseSchemaType<V extends SelectedValidationLibrary> = {
-    [Action in BaseSilgiMethodType]?: Record<string, {
-        input?: SchemaTypes[V];
-        output?: SchemaTypes[V];
-    }>;
-};
-
 /**
  * @example
  * namespace: 'coreApi'
@@ -181,7 +182,13 @@ interface SilgiOperation {
      * 'coreApi/basket/post/createBasket'
      */
     raw: keyof SilgiURIs;
+    /**
+     * '/book/basket/getAllBaskets'
+     */
+    uri: string;
     parts: string[];
+    routerParams?: Record<string, string>;
+    query?: Record<string, string>;
 }
 
 type CustomDriverName = string & {
@@ -517,7 +524,7 @@ interface SilgiHooks {
         uris: string[];
         services: string[];
         shareds: string[];
-        types: string[];
+        schemas: string[];
         modules: string[];
     }) => HookResult;
     'prepare:schema.ts': (options: {
@@ -573,6 +580,7 @@ interface SilgiHooks {
             uris?: string[];
             services?: string[];
             shareds?: string[];
+            schemas?: string[];
         };
         path: string;
     }>) => HookResult;
@@ -607,6 +615,7 @@ interface ModuleMeta {
             shared?: true;
             context?: true;
             method?: true;
+            schema?: true;
             event?: true;
         };
         variable?: {
@@ -697,7 +706,7 @@ type MethodHandlerType<T> = {
                 input?: T[Action][Method]['input'] extends infer U ? U : never;
                 output?: T[Action][Method]['output'] extends infer U ? U : never;
             };
-            handler: (input: T[Action][Method]['input'], shared: SilgiDefaultShared, event: SilgiEvent) => EventHandlerResponse<T[Action][Method]['output'] extends infer U ? U : undefined>;
+            handler: (router: T[Action][Method]['router'] extends infer U ? U : never, input: T[Action][Method]['input'], shared: SilgiDefaultShared, event: SilgiEvent) => EventHandlerResponse<T[Action][Method]['output'] extends infer U ? U : undefined>;
             modules?: ModuleConfigurations;
             storage?: StorageConfig<T[Action][Method]['input']>;
         };
@@ -706,7 +715,7 @@ type MethodHandlerType<T> = {
 interface ResolvedMethodHandlerType {
     input?: Partial<InferSchemaType<SelectedValidationLibrary, any>>;
     output: Partial<InferSchemaType<SelectedValidationLibrary, any>>;
-    handler: (input: InferSchemaType<SelectedValidationLibrary, any>, shared: SilgiDefaultShared, event: SilgiEvent) => Promise<InferSchemaType<SelectedValidationLibrary, any>>;
+    handler: (router: InferSchemaType<SelectedValidationLibrary, any>, input: InferSchemaType<SelectedValidationLibrary, any>, shared: SilgiDefaultShared, event: SilgiEvent) => Promise<InferSchemaType<SelectedValidationLibrary, any>>;
     modules?: ModuleConfigurations;
     storage?: StorageConfig<InferSchemaType<SelectedValidationLibrary, any>>;
     execute: (input: InferSchemaType<SelectedValidationLibrary, any>, shared: SilgiDefaultShared, event: SilgiEvent) => Promise<InferSchemaType<SelectedValidationLibrary, any>>;
@@ -735,7 +744,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["entity"] extends keyof SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["entity"] extends keyof SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -745,7 +754,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["method"] extends keyof SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["method"] extends keyof SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -760,7 +769,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["action"] extends keyof SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["action"] extends keyof SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -775,7 +784,7 @@ declare function silgi(event?: SilgiEvent | Record<string, any>): {
         entity: Entity;
         method: Method;
         action: Action;
-    } : never : never)["method"]] ? SilgiServiceTypes[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
+    } : never : never)["method"]] ? SilgiSchema[(TURI extends `${infer Path}` ? Path extends `${infer Service}/${infer Entity}/${infer Method}/${infer Action}` ? {
         service: Service;
         entity: Entity;
         method: Method;
@@ -803,6 +812,7 @@ type SilgiServiceInterface<T extends BaseSchemaType<SelectedValidationLibrary>>
         [Method in keyof T[Action]]: {
             input: InferSchemaType<SelectedValidationLibrary, T[Action][Method]['input']>;
             output?: InferSchemaType<SelectedValidationLibrary, T[Action][Method]['output']>;
+            router?: InferSchemaType<SelectedValidationLibrary, T[Action][Method]['router']>;
         };
     } : never;
 };
@@ -840,7 +850,7 @@ type ResolvedServiceType = {
 };
 
 interface Silgi {
-    types: any;
+    schemas: any;
     services: ResolvedServiceType;
     shared: SilgiDefaultShared;
     uris: Record<string, any>;
@@ -863,9 +873,9 @@ interface Silgi {
     storage: Storage;
     options: SilgiOptions;
 }
-interface SilgiConfig extends Pick<Silgi, 'services' | 'shared' | 'uris' | 'types' | '_initializedModules'> {
+interface SilgiConfig extends Pick<Silgi, 'services' | 'shared' | 'uris' | 'schemas' | '_initializedModules'> {
     options: DeepPartial<SilgiOptions>;
 }
 type SilgiFunction = typeof silgi;
 
-export { type Awaitable as A, type BaseSchemaType as B, type CreateScope as C, type DeepPartial as D, type ExtendShared as E, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type ValidationLibrary as V, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type ModuleDefinition as d, type SilgiModule as e, type SelectedValidationLibrary as f, type SilgiServiceInterface as g, type DefaultNamespaces as h, type Silgi as i, type SilgiOperation as j, type MergeSilgiType as k, type ServiceType as l, type SilgiServiceTypes as m, type SilgiModuleShared as n, type SilgiEvent as o, type SilgiModuleMethods as p, type SilgiModules as q, type SilgiNamespaces as r, type SilgiValidationSchema as s, type SilgiDefaultShared as t, type SilgiURIs as u, type SilgiStorageBase as v, silgi as w, type SilgiHook as x, type DefaultMethods as y, type DefaultHooks as z };
+export { type Awaitable as A, type BaseSchemaType as B, type CreateScope as C, type DeepPartial as D, type ExtendShared as E, type ModuleOptions as M, type RequiredServiceType as R, type SilgiOptions as S, type URIsTypes as U, type ValidationLibrary as V, type SilgiModuleOptions as a, type SilgiConfig as b, SilgiHelper as c, type ModuleDefinition as d, type SilgiModule as e, type SelectedValidationLibrary as f, type SilgiServiceInterface as g, type DefaultNamespaces as h, type Silgi as i, type SilgiOperation as j, type MergedSilgiSchema as k, type ServiceType as l, type SilgiSchema as m, type SilgiModuleShared as n, type SilgiEvent as o, type SilgiModuleMethods as p, type SilgiModules as q, type SilgiNamespaces as r, type SilgiValidationSchema as s, type SilgiDefaultShared as t, type SilgiURIs as u, type SilgiStorageBase as v, silgi as w, type SilgiHook as x, type DefaultMethods as y, type DefaultHooks as z };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.1.12",
+  "version": "0.2.0",
   "sideEffects": false,
   "exports": {
     ".": {