silgi 0.38.5 → 0.38.7

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -14,6 +14,10 @@ declare function silgiFetch<Schema extends SilgiSchema = SilgiSchema, Route exte
 declare function silgiFetch(_request: Request | URL, options?: RequestInit & {
     pathParams?: Record<string, any>;
 }, context?: SilgiRuntimeContext): Promise<Response | Promise<Response>>;
+declare function middleware(event: SilgiEvent, url?: {
+    path: string;
+    method: string;
+}): Promise<any>;
 declare function handler(event: SilgiEvent, url?: {
     path: string;
     method: string;
@@ -243,7 +247,7 @@ declare function createService<Schema extends SilgiSchema, Path extends keyof Sc
 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 MiddlewareParams<Schema extends SilgiSchema, Path extends keyof Schema & string, S extends string = WildcardVariants<Path>, Service extends MiddlewareDefinition = MiddlewareDefinition, Method extends string = HttpMethod, UsedMethod extends readonly Method[] = readonly never[]> = ({
     path: S;
-    method?: UsedMethod;
+    method: UsedMethod;
     setup: Service;
 }) | ({
     global: true;
@@ -255,9 +259,10 @@ type MiddlewareReturn<S extends string, Service extends MiddlewareDefinition, Us
     [K in S]: {
         method: boolean;
         global: boolean;
-    } & (UsedMethod extends readonly [] | undefined ? Service : {
-        [M in UsedMethod[number]]: Service;
-    }) & (S extends string ? (never extends S ? object : object) : Service) & (Service);
+        methods: UsedMethod extends readonly [] | undefined ? object : {
+            [M in UsedMethod[number]]: Service;
+        };
+    };
 };
 declare function createMiddleware<Schema extends SilgiSchema, Path extends keyof Schema & string, S extends string = WildcardVariants<Path>, Service extends MiddlewareDefinition = MiddlewareDefinition, Method extends string = HttpMethod, UsedMethod extends readonly Method[] = readonly never[]>(params: MiddlewareParams<Schema, Path, S, Service, Method, UsedMethod>): MiddlewareReturn<S, Service, UsedMethod>;
 
@@ -312,4 +317,4 @@ declare function useRuntime(): SilgiRuntimeConfig;
 
 declare const autoImportTypes: string[];
 
-export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };
+export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };

package/dist/core/index.mjs

@@ -322,37 +322,40 @@ async function createSilgi(config) {
   }
   for (const route in silgi.middlewares) {
     const routeObject = silgi.middlewares[route];
-    if ("global" in routeObject) {
-      const global = routeObject.global ?? false;
-      const method = routeObject.method ?? false;
-      if (global && !method) {
-        silgi.globalMiddlewares.push({
-          setup: routeObject.setup,
-          route
-        });
-      } else if (method) {
-        for (const methodKey in routeObject) {
-          if (["global", "setup", "method"].includes(methodKey))
-            continue;
+    const global = routeObject.global ?? false;
+    if (global) {
+      if ("methods" in routeObject && routeObject.methods && Object.keys(routeObject.methods).length > 0) {
+        for (const methodKey in routeObject.methods) {
           const _method = (methodKey || "").toUpperCase();
-          const object = routeObject[methodKey];
+          const object = routeObject.methods[methodKey];
+          if (!object)
+            continue;
           silgi.globalMiddlewares.push({
             setup: object.setup,
             method: _method,
             route
           });
         }
-      }
-    } else {
-      for (const method in routeObject) {
-        const _method = (method || "").toUpperCase();
-        const routeObjectMethod = routeObject[method];
-        addRoute(silgi._middlewareRouter, _method, route, {
-          setup: routeObjectMethod.setup,
-          method: _method,
+      } else {
+        silgi.globalMiddlewares.push({
+          setup: routeObject.setup,
           route
         });
       }
+    } else {
+      if ("methods" in routeObject && routeObject.methods) {
+        for (const method in routeObject.methods) {
+          const _method = (method || "").toUpperCase();
+          const routeObjectMethod = routeObject.methods[method];
+          if (!routeObjectMethod)
+            continue;
+          addRoute(silgi._middlewareRouter, _method, route, {
+            setup: routeObjectMethod.setup,
+            method: _method,
+            route
+          });
+        }
+      }
     }
   }
   silgi.hooks.addHooks(silgi.options.hooks);
@@ -909,7 +912,6 @@ function withDuplexIfBody(options) {
   return options;
 }
 async function silgiFetch(_request, options, context) {
-  useSilgi();
   let request;
   if (typeof _request === "string") {
     _request = substitutePathParams(_request, options?.pathParams);
@@ -949,9 +951,6 @@ async function middleware(event, url) {
         if (m.method && m.method !== event.req.method) {
           return;
         }
-        if (m.method && m.method !== event.req.method) {
-          return;
-        }
         await silgiContext.callHook("middleware:global:on", event, m.setup);
         return m.setup.handler(event, silgiContext);
       });
@@ -1066,44 +1065,41 @@ function createMiddleware(params) {
         [params.key]: {
           method: false,
           global: params.global,
-          setup: params.setup
+          methods: {}
         }
       };
     }
-    const result2 = {
-      [params.key]: {
-        global: params.global,
-        method: true
-      }
-    };
+    const methods2 = {};
     for (const m of params.method) {
-      result2[params.key][m] = {
+      methods2[m] = {
         setup: params.setup,
         global: true,
         method: m
       };
     }
-    return result2;
-  }
-  if (!params.method || params.method.length === 0) {
     return {
-      [params.path]: {
+      [params.key]: {
+        global: params.global,
         method: true,
-        global: false,
-        setup: params.setup
+        methods: methods2
       }
     };
   }
-  const result = {
-    [params.path]: {}
-  };
+  const methods = {};
   for (const m of params.method) {
-    result[params.path][m] = {
+    methods[m] = {
       setup: params.setup,
-      method: m
+      method: m,
+      global: false
     };
   }
-  return result;
+  return {
+    [params.path]: {
+      method: true,
+      global: false,
+      methods
+    }
+  };
 }
 
 function createShared(shared) {
@@ -1149,4 +1145,4 @@ const autoImportTypes = [
   "ExtractQueryParamsFromURI"
 ];
 
-export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };
+export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, middleware, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
 import 'silgi/types';
 import 'unstorage';
 import 'unctx';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, autoImportTypes, createError, createMiddleware, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, middleware, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage } from './core/index.mjs';
 export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from './_chunks/silgiApp.mjs';
 import 'consola';
 import 'defu';

package/dist/types/index.d.mts

@@ -399,23 +399,22 @@ interface MiddlewareSetup {
     storage?: StorageConfig;
 }
 type MiddlewareDefinition = MiddlewareSetup;
-type ResolvedMiddlewareDefinition = {
+interface ResolvedMiddlewareDefinition {
     [routePath: string]: {
-        global: boolean;
+        global: true;
         method: false;
         setup: MiddlewareSetup;
-    };
-} | {
-    [routePath: string]: {
-        [method: string]: {
-            setup: MiddlewareSetup;
-            method: string;
-        } & {
-            global: boolean;
-            method: boolean;
+    } | {
+        global: false;
+        method: true;
+        methods: {
+            [method: string]: {
+                setup: MiddlewareSetup;
+                method: string;
+            };
         };
     };
-};
+}
 
 interface SilgiCLI {
     _ignore?: Ignore;

package/package.json

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