silgi 0.39.8 → 0.39.10

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -1,4 +1,4 @@
-import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, Routers, HTTPMethod, HasPathParams, BaseMethodSchema, WithPathParams, MergeAll, MiddlewareSetup, HttpMethod, ServiceSetup, SilgiRuntimeShareds, RouterConfig, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
+import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, Routers, HTTPMethod, HasPathParams, BaseMethodSchema, WithPathParams, MergeAll, ServiceSetup, HttpMethod, MiddlewareSetup, SilgiRuntimeShareds, RouterConfig, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
 import { Storage, StorageValue } from 'unstorage';
 import { UseContext } from 'unctx';
 
@@ -168,11 +168,25 @@ declare function createService<Schema extends SilgiSchema, Path extends keyof Sc
 }): {
     [K in Path]: ServiceSetup<Schema, Path, Resolved, HiddenParameters>;
 };
+
 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}`;
+declare function createMiddleware<S extends WildcardVariants<keyof Routers>, Method extends HttpMethod, UsedMethod extends readonly Method[]>(params: {
+    path: S;
+    method: UsedMethod;
+    setup: MiddlewareSetup;
+    global?: undefined;
+}): {
+    [K in `${UsedMethod[number]}:${S}`]: {
+        setup: MiddlewareSetup;
+        method: UsedMethod[number];
+        global: undefined;
+    };
+};
 declare function createMiddleware<Global extends string>(params: {
     global: Global;
     setup: MiddlewareSetup;
     method?: undefined | readonly [];
+    path?: undefined;
 }): {
     [K in `GLOBAL:${Global}`]: {
         setup: MiddlewareSetup;
@@ -184,6 +198,7 @@ declare function createMiddleware<Global extends string, Method extends HttpMeth
     global: Global;
     setup: MiddlewareSetup;
     method: UsedMethod;
+    path?: undefined;
 }): {
     [K in `${UsedMethod[number]}:${Global}`]: {
         setup: MiddlewareSetup;
@@ -191,18 +206,6 @@ declare function createMiddleware<Global extends string, Method extends HttpMeth
         method: UsedMethod[number];
     };
 };
-declare function createMiddleware<S extends WildcardVariants<keyof Routers>, Method extends HttpMethod, UsedMethod extends readonly Method[]>(params: {
-    path: S;
-    method: UsedMethod;
-    setup: MiddlewareSetup;
-    global?: undefined;
-}): {
-    [K in `${UsedMethod[number]}:${S}`]: {
-        setup: MiddlewareSetup;
-        method: UsedMethod[number];
-        global: undefined;
-    };
-};
 
 declare function createShared(shared: Partial<SilgiRuntimeShareds>): SilgiRuntimeShareds;
 

package/dist/core/index.mjs

@@ -332,7 +332,6 @@ async function createSilgi(config) {
   }
   for (const routeKey in silgi.middlewares) {
     const routeObject = silgi.middlewares[routeKey];
-    const global = routeObject.global ?? false;
     let method = "ALL";
     let route = routeKey;
     if (routeKey.includes(":")) {
@@ -340,12 +339,22 @@ async function createSilgi(config) {
       method = methodPart.toUpperCase();
       route = routeParts.join(":");
     }
-    if (global) {
-      silgi.globalMiddlewares.push({
-        middleware: routeObject.setup,
-        method,
-        route
-      });
+    if (routeObject.global) {
+      if (routeObject.method) {
+        for (const method2 of routeObject.method) {
+          silgi.globalMiddlewares.push({
+            middleware: routeObject.setup,
+            method: method2,
+            route
+          });
+        }
+      } else {
+        silgi.globalMiddlewares.push({
+          middleware: routeObject.setup,
+          method,
+          route
+        });
+      }
     } else {
       addRoute(silgi._middlewareRouter, method, route, {
         middleware: routeObject.setup,
@@ -1031,7 +1040,7 @@ function createSchema(params) {
   const { path, method, setup } = params;
   const result = {};
   if (!method) {
-    throw new Error("Method is required createSchema " + path);
+    throw new Error(`Method is required createSchema ${path}`);
   }
   for (let i = 0; i < method.length; i++) {
     const methodName = method[i];
@@ -1072,6 +1081,7 @@ function createService(params) {
     [path]: setup
   };
 }
+
 function createMiddleware(params) {
   if (params.global) {
     const globalKey = params.global;

package/dist/types/index.d.mts

@@ -395,25 +395,6 @@ interface SilgiURL {
     pathParams?: Record<string, string | undefined>;
     queryParams?: Record<string, string>;
 }
-interface RouteRules extends Record<string, unknown> {
-}
-type MiddlewareHandler<Response extends EventHandlerResponse = EventHandlerResponse> = (event: SilgiEvent, silgi: Silgi) => Response;
-/**
- * Middleware Setup tipi
- */
-interface MiddlewareSetup {
-    handler: MiddlewareHandler;
-    rules?: RouteRules;
-    modules?: Partial<SetupModuleOption>;
-    storage?: StorageConfig;
-}
-interface ResolvedMiddlewareDefinition {
-    [methodAndPath: string]: {
-        setup: MiddlewareSetup;
-        global?: string | undefined;
-        method: HTTPMethod | false;
-    };
-}
 
 interface SilgiCLI {
     _ignore?: Ignore;
@@ -612,6 +593,26 @@ interface SilgiModule<TOptions extends ModuleOptionsCustom = ModuleOptionsCustom
     getMeta?: () => Promise<ModuleMeta>;
 }
 
+interface RouteRules extends Record<string, unknown> {
+}
+type MiddlewareHandler<Response extends EventHandlerResponse = EventHandlerResponse> = (event: SilgiEvent, silgi: Silgi) => Response;
+/**
+ * Middleware Setup tipi
+ */
+interface MiddlewareSetup {
+    handler: MiddlewareHandler;
+    rules?: RouteRules;
+    modules?: Partial<SetupModuleOption>;
+    storage?: StorageConfig;
+}
+interface ResolvedMiddlewareDefinition {
+    [methodAndPath: string]: {
+        setup: MiddlewareSetup;
+        global?: string | undefined;
+        method?: HTTPMethod[];
+    };
+}
+
 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 {
     keys: infer U;

package/package.json

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