silgi 0.41.57 → 0.41.58

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.41.57";
+const version = "0.41.58";
 const packageJson = {
 	version: version};
 

package/dist/core/index.d.mts

@@ -1,7 +1,8 @@
-import { SilgiRuntimeConfig, SilgiConfig, Silgi, SilgiEvent, SilgiRuntimeContext, SilgiSchema, RouteEntry, CustomRequestInit, WebSocketOptions, SilgiCLI, SilgiStorageBase, MergeAll, Routers, HTTPMethod, MiddlewareSetup, Resolvers, SilgiURL, BaseMethodSchema, ServiceSetupsForMethods, ServiceDefinitionByMethodAndPath, ServiceSetup, SilgiRuntimeShareds, StorageConfig } from 'silgi/types';
-import { ServerRequest } from 'srvx';
+import { SilgiRuntimeConfig, SilgiConfig, Silgi, SilgiEvent, SilgiRuntimeContext, WebSocketOptions, SilgiSchema, RouteEntry, CustomRequestInit, SilgiCLI, SilgiStorageBase, MergeAll, Resolvers, SilgiURL, BaseMethodSchema, HTTPMethod, ServiceSetupsForMethods, ServiceDefinitionByMethodAndPath, Routers, ServiceSetup, SilgiRuntimeShareds, StorageConfig } from 'silgi/types';
+import { ServerRequest, ServerRuntimeContext } from 'srvx';
 import { UseContext } from 'unctx';
 import { Storage, StorageValue } from 'unstorage';
+export { c as createMiddleware } from '../shared/silgi.DTwQEdSr.mjs';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 
 declare function updateRuntimeStorage(runtime: any): void;
@@ -93,11 +94,12 @@ declare class SilgiHttpEvent implements SilgiEvent {
     context: SilgiRuntimeContext;
     _res?: SilgiEventResponse;
     constructor(req: ServerRequest, context?: SilgiRuntimeContext);
-    _chain: Promise<unknown> | undefined;
-    [x: string]: unknown;
+    get _chain(): Promise<unknown> | undefined;
     get res(): SilgiEventResponse;
+    get runtime(): ServerRuntimeContext | undefined;
     toString(): string;
     toJSON(): string;
+    [x: string]: unknown;
 }
 declare class SilgiEventResponse {
     status?: number;
@@ -259,26 +261,6 @@ declare function getEventContext<T extends SilgiRuntimeContext>(event?: SilgiEve
  */
 declare function deepMergeObjects<T extends readonly Record<string, any>[]>(schemas: [...T]): MergeAll<T>;
 
-type WildcardVariants<Path extends string, Acc extends string = ''> = Path extends `${infer Head}/${infer Tail}` ? Tail extends '' ? `${Acc}${Head}` : `${Acc}${Head}/${Tail}` | `${Acc}${Head}/*` | `${Acc}${Head}/**` | WildcardVariants<Tail, `${Acc}${Head}/`> : `${Acc}${Path}`;
-type MiddlewarePath<S extends WildcardVariants<keyof Routers>> = S | 'global';
-interface CreateMiddlewareParams<S extends WildcardVariants<keyof Routers>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> {
-    path: MiddlewarePath<S>;
-    methods?: UsedMethod;
-    setup: MiddlewareSetup;
-    key: Key;
-}
-type CreateMiddlewareResult<Path extends string, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> = {
-    [K in `${Key}:${Path}`]: {
-        setup: MiddlewareSetup;
-        methods?: UsedMethod;
-        key: Key;
-        path: Path;
-    };
-};
-declare function createMiddleware<S extends WildcardVariants<keyof Routers>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Path extends MiddlewarePath<S> = MiddlewarePath<S>, Key extends string = string>(params: CreateMiddlewareParams<S, UsedMethod, Key> & {
-    path: Path;
-}): CreateMiddlewareResult<Path, UsedMethod, Key>;
-
 declare function createResolver(resolver: Resolvers): Resolvers;
 declare function getUrlPrefix(path: string, method?: string): SilgiURL;
 
@@ -293,20 +275,18 @@ declare function replaceRuntimeValues(obj: any, runtime: any): any;
  * This utility function helps you define API schemas with proper typing for
  * input, output, path parameters, and query parameters.
  *
- * @template Path - API path from Routers type
- * @template Method - HTTP method
+ * @template Key - API key
+ * @template Schema - Schema definition type
  *
  * @param params - Schema configuration parameters
- * @param params.path - Complete API path
- * @param params.method - HTTP method(s) as an array (optional)
+ * @param params.key - Unique key for the schema
  * @param params.setup - Schema definition for the specified methods
  * @returns Route schema object with complete type information
  *
  * @example
- * // Define a user API schema with GET and POST methods sharing the same schema
+ * // Define a user API schema
  * const userSchema = createSchema({
- *   path: '/api/v1/users',
- *   method: ['GET', 'POST'],
+ *   key: '/api/v1/users',
  *   setup: {
  *     output: z.object({
  *       users: z.array(z.object({ id: z.string(), name: z.string() }))
@@ -335,4 +315,4 @@ declare function useSilgiStorage<T extends StorageValue = StorageValue>(base?: S
 
 declare const autoImportTypes: string[];
 
-export { SilgiError, SilgiHttpEvent, autoImportTypes, createError, createEventStream, createMiddleware, createResolver, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, defineServiceSetup, getEvent, getEventContext, getUrlPrefix, getWebsocket, handleResponse, handler, isError, kHandled, kNotFound, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };
+export { SilgiError, SilgiHttpEvent, autoImportTypes, createError, createEventStream, createResolver, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, defineServiceSetup, getEvent, getEventContext, getUrlPrefix, getWebsocket, handleResponse, handler, isError, kHandled, kNotFound, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.mjs

@@ -450,13 +450,18 @@ class SilgiHttpEvent {
     const _url = req._url;
     this.url = _url && _url instanceof URL ? _url : new FastURL(req.url);
   }
-  _chain;
+  get _chain() {
+    return this._chain;
+  }
   get res() {
     if (!this._res) {
       this._res = new SilgiEventResponse();
     }
     return this._res;
   }
+  get runtime() {
+    return this.req.runtime;
+  }
   toString() {
     return `[${this.req.method}] ${this.req.url}`;
   }
@@ -1070,13 +1075,11 @@ function getWebsocket(silgi = useSilgi()) {
   return {
     ...silgi.options.websocket,
     resolve: async (request) => {
-      console.log("WebSocket resolve");
-      getPathname(request.url || "/");
       request.method || "GET";
       const event = new SilgiHttpEvent(request, {});
       const silgiContext = useSilgi();
       const handler2 = silgiContext.router && findRoute(silgiContext.router, event.req.method, event.url.pathname);
-      return handler2?.data.service?.websocket?.hooks || {};
+      return handler2?.data.service?.websocket || {};
     }
   };
 }

package/dist/index.d.mts

@@ -1,4 +1,5 @@
-export { SilgiError, SilgiHttpEvent, autoImportTypes, createError, createEventStream, createMiddleware, createResolver, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, defineServiceSetup, getEvent, getEventContext, getUrlPrefix, getWebsocket, handleResponse, handler, isError, kHandled, kNotFound, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, SilgiHttpEvent, autoImportTypes, createError, createEventStream, createResolver, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, defineServiceSetup, getEvent, getEventContext, getUrlPrefix, getWebsocket, handleResponse, handler, isError, kHandled, kNotFound, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
+export { c as createMiddleware } from './shared/silgi.DTwQEdSr.mjs';
 import 'silgi/types';
 import 'srvx';
 import 'unctx';

package/dist/shared/silgi.DTwQEdSr.d.mts

@@ -0,0 +1,16 @@
+import { WildcardVariants, Routers, HTTPMethod, MiddlewarePath, CreateMiddlewareParams, MiddlewareSetup } from 'silgi/types';
+
+type CreateMiddlewareResult<Path extends string, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> = {
+    [K in `${Key}:${Path}`]: {
+        setup: MiddlewareSetup;
+        methods?: UsedMethod;
+        key: Key;
+        path: Path;
+    };
+};
+declare function createMiddleware<S extends WildcardVariants<keyof Routers>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Path extends MiddlewarePath<S> = MiddlewarePath<S>, Key extends string = string>(params: CreateMiddlewareParams<S, UsedMethod, Key> & {
+    path: Path;
+}): CreateMiddlewareResult<Path, UsedMethod, Key>;
+
+export { createMiddleware as c };
+export type { CreateMiddlewareResult as C };

package/dist/types/index.d.mts

@@ -22,6 +22,7 @@ import { NitroApp } from 'nitropack';
 import { RouterContext } from 'rou3';
 import { TransactionOptions, BuiltinDriverName, StorageValue, Storage } from 'unstorage';
 import { ServerRequest } from 'srvx';
+import { C as CreateMiddlewareResult } from '../shared/silgi.DTwQEdSr.mjs';
 import { Defu } from 'defu';
 import * as crossws from 'crossws';
 import { silgiFetch } from 'silgi';
@@ -29,6 +30,7 @@ import { useRuntimeConfig } from 'silgi/runtime';
 import { Unimport } from 'unimport';
 import { ProviderName } from 'std-env';
 import { FetchOptions, FetchResponse } from 'ofetch';
+import 'silgi/types';
 
 interface SilgiCompatibilityIssue {
     name: string;
@@ -121,7 +123,7 @@ interface SilgiEvent extends Record<string, unknown> {
      * Access to runtime specific additional context.
      *
      */
-    runtime: ServerRequest["runtime"];
+    runtime: ServerRequest['runtime'];
     /**
      * Access to the parsed request URL.
      *
@@ -297,7 +299,7 @@ interface ServiceSetup<Method extends HTTPMethod = HTTPMethod, Path extends stri
  * Format: "routePath" => setup + methods + input + output + queryParams
  */
 interface ResolvedServiceDefinition {
-    [key: string]: ServiceSetup;
+    [key: string]: ServiceSetup<any, any, any, any, any, any, any, any>;
 }
 /**
  * SilgiURL tipi
@@ -321,7 +323,7 @@ type ServiceSetupsForMethods<Method extends HTTPMethod = HTTPMethod, Path extend
  *   // Sadece "GET:/foo" ve "POST:/foo" anahtarları olur.
  */
 type ServiceDefinitionByMethodAndPath<Path extends string, Method extends HTTPMethod = HTTPMethod, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = {
-    [M in Method as `${M}:${Path}`]?: ServiceSetup<M, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    [M in Method as `${M}:${Path}`]: ServiceSetup<M, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
 };
 
 interface SilgiCLI {
@@ -521,6 +523,14 @@ interface SilgiModule<TOptions extends ModuleOptionsCustom = ModuleOptionsCustom
     getMeta?: () => Promise<ModuleMeta>;
 }
 
+type WildcardVariants<Path extends string, Acc extends string = ''> = Path extends `${infer Head}/${infer Tail}` ? Tail extends '' ? `${Acc}${Head}` : `${Acc}${Head}/${Tail}` | `${Acc}${Head}/*` | `${Acc}${Head}/**` | WildcardVariants<Tail, `${Acc}${Head}/`> : `${Acc}${Path}`;
+type MiddlewarePath<S extends WildcardVariants<keyof Routers>> = S | 'global';
+interface CreateMiddlewareParams<S extends WildcardVariants<keyof Routers>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> {
+    path: MiddlewarePath<S>;
+    methods?: UsedMethod;
+    setup: MiddlewareSetup;
+    key: Key;
+}
 type MiddlewareHandler<Response extends EventHandlerResponse = EventHandlerResponse> = (event: SilgiEvent, silgi: Silgi) => Response;
 /**
  * Middleware Setup tipi
@@ -531,12 +541,7 @@ interface MiddlewareSetup {
     modules?: Partial<SetupModuleOption>;
     storage?: StorageConfig;
 }
-interface ResolvedMiddlewareDefinition {
-    [methodAndPath: string]: {
-        setup: MiddlewareSetup;
-        methods?: HTTPMethod[];
-    };
-}
+type ResolvedMiddlewareDefinition = CreateMiddlewareResult<string, readonly HTTPMethod[], string>;
 
 type TrimAfterFourSlashes<T extends string> = T extends `/${infer S1}/${infer S2}/${infer S3}/${infer S4}/${infer _}` ? `/${S1}/${S2}/${S3}/${S4}` : T;
 type AllPaths = SilgiRouterTypes extends {
@@ -1242,4 +1247,4 @@ interface LoadConfigOptions {
     consola?: ConsolaInstance;
 }
 
-export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BaseMethodSchema, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, EventProtocol, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, HTTPMethod, HasPathParams, HookResult, LoadConfigOptions, Max4Slashes, MergeAll, MergeRouteRules, MergedSilgiSchema, MetaData, MethodSchemas, MiddlewareHandler, MiddlewareSetup, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedMiddlewareDefinition, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, Resolvers, RouteEntry, RouteRules, RouterParams, Routers, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceDefinitionByMethodAndPath, ServiceHandler, ServiceHandlerInput, ServiceSetup, ServiceSetupsForMethods, ServicesObject, SetupModuleOption, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeDefaultConfig, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WebSocketOptions, WithPathParams };
+export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BaseMethodSchema, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CreateMiddlewareParams, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, EventProtocol, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, HTTPMethod, HasPathParams, HookResult, LoadConfigOptions, Max4Slashes, MergeAll, MergeRouteRules, MergedSilgiSchema, MetaData, MethodSchemas, MiddlewareHandler, MiddlewarePath, MiddlewareSetup, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedMiddlewareDefinition, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, Resolvers, RouteEntry, RouteRules, RouterParams, Routers, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceDefinitionByMethodAndPath, ServiceHandler, ServiceHandlerInput, ServiceSetup, ServiceSetupsForMethods, ServicesObject, SetupModuleOption, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeDefaultConfig, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WebSocketOptions, WildcardVariants, WithPathParams };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.41.57",
+  "version": "0.41.58",
   "private": false,
   "sideEffects": false,
   "exports": {
@@ -107,6 +107,7 @@
     "citty": "^0.1.6",
     "compatx": "^0.2.0",
     "consola": "^3.4.2",
+    "crossws": "^0.4.1",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "dev-jiti": "^2.4.2",