silgi 0.41.16 → 0.41.18

package/dist/cli/build.mjs

@@ -1953,15 +1953,30 @@ async function prepareSchema(silgi) {
     generateTypes(
       await resolveSchema(
         {
-          ...silgi.options.storages?.reduce((acc, key) => ({ ...acc, [key]: "" }), {}) || {},
-          // 'redis': {} -> 'redis': string
-          ...Object.entries(silgi.options.storage).map(([key]) => ({
-            [key]: ""
-          })).reduce((acc, obj) => ({ ...acc, ...obj }), {})
+          ...Object.fromEntries(
+            Object.entries(silgi.options.runtimeConfig).filter(
+              ([key]) => !["app", "nitro", "nuxt"].includes(key)
+            )
+          )
+        }
+      ),
+      {
+        interfaceName: "SilgiRuntimeConfigExtends",
+        addExport: false,
+        addDefaults: false,
+        allowExtraKeys: false,
+        indentation: 0
+      }
+    ),
+    "",
+    generateTypes(
+      await resolveSchema(
+        {
+          ...silgi.services ? Object.keys(silgi.services).reduce((acc, key) => ({ ...acc, [key]: "" }), {}) : {}
         }
       ),
       {
-        interfaceName: "SilgiStorageBaseExtends",
+        interfaceName: "RoutersExtend",
         addExport: false,
         addDefaults: false,
         allowExtraKeys: false,
@@ -1977,7 +1992,6 @@ async function prepareSchema(silgi) {
       SilgiSchema: [{}, { extends: ["SchemaExtends"] }],
       ServicesObject: [{}, { extends: ["BaseServices"] }],
       SilgiStorageBase: [{}, { extends: ["SilgiStorageBaseExtends"] }],
-      SilgiURIs: [{}, { extends: ["SilgiURIsMerge"] }],
       SilgiRuntimeContext: [{}, { extends: ["SilgiModuleContextExtends"] }],
       SilgiEvent: [{}, { extends: ["SilgiModuleEventsExtends"] }],
       SilgiRuntimeSharedsExtend: [{}, { extends: ["SilgiModuleSharedExtends"] }],
@@ -1991,7 +2005,8 @@ async function prepareSchema(silgi) {
       SilgiModuleOptions: [{}, { extends: ["SilgiModuleOptionExtend"] }],
       // TODO: bunu kontrol et.
       RouteRules: [{}, { extends: ["RouteRulesExtend"] }],
-      MetaData: [{}, { extends: ["MetaDataExtend"] }]
+      MetaData: [{}, { extends: ["MetaDataExtend"] }],
+      Routers: [{}, { extends: ["RoutersExtend"] }]
     }).replace(/,\s*/g, "\n"),
     "",
     "export {}"

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -1,4 +1,4 @@
-import { SilgiConfig, Silgi, SilgiEvent, HTTPMethod, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, BaseMethodSchema, MergeAll, ServiceSetup, ServicesObject, MiddlewareSetup, SilgiRuntimeShareds, Resolvers, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
+import { SilgiConfig, Silgi, SilgiEvent, HTTPMethod, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, BaseMethodSchema, MergeAll, Routers, ServiceSetup, MiddlewareSetup, SilgiRuntimeShareds, Resolvers, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Storage, StorageValue } from 'unstorage';
 import { UseContext } from 'unctx';
@@ -159,8 +159,8 @@ declare function deepMergeObjects<T extends readonly Record<string, any>[]>(sche
  * Tip güvenliğini artırmak için ServiceSetup objesini doğrudan döndürür.
  */
 type SlashCount<S extends string, Count extends any[] = []> = S extends `${infer _Prefix}/${infer Rest}` ? SlashCount<Rest, [any, ...Count]> : Count['length'];
-type Max4Slashes<S extends string> = SlashCount<S> extends 0 | 1 | 2 | 3 | 4 ? S : never;
-declare function createService<Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | never | undefined = never, QueryParams extends StandardSchemaV1 | never | undefined = never, Resolved extends boolean = false, HiddenParameters extends boolean = false>(params: {
+type Max4Slashes<S extends keyof Routers> = SlashCount<S> extends 0 | 1 | 2 | 3 | 4 ? S : never;
+declare function createService<Path extends keyof Routers = keyof Routers, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | never | undefined = never, QueryParams extends StandardSchemaV1 | never | undefined = never, Resolved extends boolean = false, HiddenParameters extends boolean = false>(params: {
     path: Max4Slashes<Path>;
     methods: HTTPMethod[];
     input?: Input;
@@ -184,8 +184,8 @@ declare function createService<Path extends string = string, Input extends Stand
 };
 
 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 ServicesObject>> = S | 'global';
-interface CreateMiddlewareParams<S extends WildcardVariants<keyof ServicesObject>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> {
+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;
@@ -199,7 +199,7 @@ type CreateMiddlewareResult<Path extends string, UsedMethod extends readonly HTT
         path: Path;
     };
 };
-declare function createMiddleware<S extends WildcardVariants<keyof ServicesObject>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Path extends MiddlewarePath<S> = MiddlewarePath<S>, Key extends string = string>(params: CreateMiddlewareParams<S, UsedMethod, Key> & {
+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>;
 

package/dist/core/index.mjs

@@ -961,7 +961,7 @@ async function middleware(event, url) {
             cause: error
           });
         }
-        return m.middleware.handler(event, silgiContext);
+        return m.middleware.handler?.(event, silgiContext);
       });
     }
   }
@@ -995,7 +995,7 @@ async function middleware(event, url) {
               cause: error
             });
           }
-          return match.data.middleware.handler(event, silgiContext);
+          return match.data.middleware.handler?.(event, silgiContext);
         });
       }
     }
@@ -1091,7 +1091,7 @@ function deepMergeObjects(schemas) {
 }
 
 function createService(params) {
-  const slashCount = (params.path.match(/\//g) || []).length;
+  const slashCount = (String(params.path).match(/\//g) || []).length;
   if (slashCount > 4) {
     throw new Error(
       `Path '${params.path}' is invalid: maximum 4 '/' allowed (found ${slashCount})`

package/dist/types/index.d.mts

@@ -134,8 +134,13 @@ interface SilgiEvent extends Record<string, unknown> {
  */
 interface Resolvers {
 }
+interface Routers {
+}
 interface RouteRules extends Record<string, unknown> {
 }
+type MergeRouteRules = Partial<RouteRules> & {
+    readBeforeBody?: boolean;
+};
 /**
  * Extracts the prefix (first segment) from a URL, including the leading slash.
  * @example ExtractPrefix<'/api/blueSpace/basket'> // '/api'
@@ -155,7 +160,7 @@ type ExtractRoute<URL extends string> = URL extends `/${string}/${string}/${infe
  * Gets all route keys from Routers as strings.
  * All keys should start with a leading slash.
  */
-type RouterKeys = keyof ServicesObject & string;
+type RouterKeys = (keyof ServicesObject extends string ? keyof ServicesObject : never) & (keyof Routers extends string ? keyof Routers : never);
 /**
  * Extracts all prefixes (first segment) in the system, including the leading slash.
  * @example AllPrefixes // '/api' | ...
@@ -267,9 +272,7 @@ type ServiceHandler<Input extends StandardSchemaV1, Output extends StandardSchem
  */
 interface ServiceSetup<Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | never | undefined = never, QueryParams extends StandardSchemaV1 | never | undefined = never, Resolved extends boolean = false, HiddenParameters extends boolean = false> {
     handler?: ServiceHandler<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    rules?: RouteRules & {
-        readBeforeBody?: boolean;
-    };
+    rules?: MergeRouteRules;
     modules?: Partial<SetupModuleOption>;
     storage?: StorageConfig<ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>>;
 }
@@ -508,8 +511,8 @@ type MiddlewareHandler<Response extends EventHandlerResponse = EventHandlerRespo
  * Middleware Setup tipi
  */
 interface MiddlewareSetup {
-    handler: MiddlewareHandler;
-    rules?: RouteRules;
+    handler?: MiddlewareHandler;
+    rules?: MergeRouteRules;
     modules?: Partial<SetupModuleOption>;
     storage?: StorageConfig;
 }
@@ -1221,4 +1224,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, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, HTTPMethod, HasPathParams, HookResult, LoadConfigOptions, MergeAll, 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, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceSetup, 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, WithPathParams };
+export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BaseMethodSchema, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, HTTPMethod, HasPathParams, HookResult, LoadConfigOptions, 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, ServiceHandler, ServiceHandlerInput, ServiceSetup, 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, WithPathParams };

package/package.json

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