silgi 0.41.10 → 0.41.12

package/dist/cli/index.mjs

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

package/dist/core/index.mjs

@@ -308,7 +308,7 @@ async function createSilgi(config) {
     const methods = object.methods?.length ? object.methods : ["ALL"];
     if (methods.includes("GRAPHQL")) {
       addRoute(silgi.router, "GRAPHQL", route, {
-        method: ["GRAPHQL"],
+        method: "GRAPHQL",
         route,
         service: object
       });
@@ -317,7 +317,7 @@ async function createSilgi(config) {
     for (const method of methods) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
       addRoute(silgi.router, globalMethod, route, {
-        method: [method],
+        method,
         route,
         service: object
       });
@@ -334,11 +334,13 @@ async function createSilgi(config) {
       _route = routeParts.join(":");
     }
     if (_route === "global") {
-      silgi.globalMiddlewares.push({
-        middleware: routeObject.setup,
-        method: routeObject.methods?.length ? routeObject.methods : ["ALL"],
-        route: _route
-      });
+      for (const method of routeObject.methods?.length ? routeObject.methods : ["ALL"]) {
+        silgi.globalMiddlewares.push({
+          middleware: routeObject.setup,
+          method: method === "ALL" ? "" : method.toUpperCase(),
+          route: _route
+        });
+      }
       continue;
     }
     const methods = routeObject.methods?.length ? routeObject.methods : ["ALL"];
@@ -346,7 +348,7 @@ async function createSilgi(config) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
       addRoute(silgi._middlewareRouter, globalMethod, _route, {
         middleware: routeObject.setup,
-        method: [method],
+        method,
         route: _route
       });
     }
@@ -586,7 +588,8 @@ function getUrlPrefix(path, method) {
 
 async function orchestrate(route, event, _input) {
   const silgiCtx = useSilgi();
-  const silgiURL = !route.graphql ? getUrlPrefix(route.route || event.req.url, route.method) : {
+  const isGraphQL = route.method === "GRAPHQL";
+  const silgiURL = !isGraphQL ? getUrlPrefix(route.route || event.req.url, route.method) : {
     methodName: route.method || "GET",
     namespaceName: "graphql",
     prefixName: "/api",
@@ -595,7 +598,7 @@ async function orchestrate(route, event, _input) {
     pathParams: {},
     queryParams: {}
   };
-  const input = _input || (route.service?.setup.rules?.readBeforeBody === false || route.graphql ? {} : await parseRequestInput(event.req));
+  const input = _input || (route.service?.setup.rules?.readBeforeBody === false || isGraphQL ? {} : await parseRequestInput(event.req));
   const hookContext = { earlyReturnValue: false };
   const routerParams = _input ? input.path : getRouterParams(event);
   const queryParams = _input ? input.query : getQuery(event);
@@ -613,7 +616,7 @@ async function orchestrate(route, event, _input) {
     }
   };
   try {
-    if (!route.service && !route.graphql) {
+    if (!route.service && route.method !== "GRAPHQL") {
       throw createError({
         statusCode: 404,
         statusMessage: "Service not found"
@@ -649,7 +652,7 @@ async function orchestrate(route, event, _input) {
     silgiCtx.shared.$fetch = silgiFetch;
     silgiCtx.shared.silgi = silgiCtx;
     let result;
-    if (!route.graphql) {
+    if (!isGraphQL) {
       result = await route.service?.setup.handler?.(
         inputData,
         silgiCtx.shared,
@@ -931,11 +934,8 @@ async function middleware(event, url) {
         if (_previous !== void 0 && _previous !== kNotFound) {
           return _previous;
         }
-        let allowedMethods = m.method ?? [];
-        if (!Array.isArray(allowedMethods)) {
-          allowedMethods = [allowedMethods];
-        }
-        const methodIsAllowed = allowedMethods.length === 0 || allowedMethods.includes("ALL") || allowedMethods.includes(event.req.method);
+        let allowedMethod = m.method ?? "";
+        const methodIsAllowed = allowedMethod === "ALL" || allowedMethod === event.req.method;
         if (!methodIsAllowed) {
           return;
         }
@@ -969,11 +969,8 @@ async function middleware(event, url) {
           if (_previous !== void 0 && _previous !== kNotFound) {
             return _previous;
           }
-          let allowedMethods = match.data.method ?? [];
-          if (!Array.isArray(allowedMethods)) {
-            allowedMethods = [allowedMethods];
-          }
-          const methodIsAllowed = allowedMethods.length === 0 || allowedMethods.includes("ALL") || allowedMethods.includes(event.req.method);
+          const allowedMethod = match.data.method ?? "";
+          const methodIsAllowed = allowedMethod === "ALL" || allowedMethod === event.req.method;
           if (!methodIsAllowed || !match.data.middleware) {
             return;
           }
@@ -1011,7 +1008,6 @@ async function handler(event, url, input) {
     if (!match && url?.method === "GRAPHQL") {
       match = {
         data: {
-          graphql: true,
           method: url?.method || event.req.method,
           route: url?.path,
           service: {

package/dist/types/index.d.mts

@@ -696,8 +696,7 @@ interface MetaData extends Record<string, unknown> {
 }
 interface SilgiRoute {
     route?: string;
-    graphql?: boolean;
-    method?: HTTPMethod | HTTPMethod[];
+    method?: HTTPMethod;
     service?: ResolvedServiceDefinition[string];
     middleware?: MiddlewareSetup;
 }

package/package.json

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