silgi 0.41.14 → 0.41.16

package/dist/cli/index.mjs

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

package/dist/core/index.mjs

@@ -298,13 +298,6 @@ async function createSilgi(config) {
     silgi.router = createRouter();
   }
   for (const [route, object] of Object.entries(silgi.services)) {
-    const routeParts = route.split("/").filter(Boolean);
-    if (routeParts.length > 0) {
-      const prefix = `/${routeParts[0]}`;
-      if (!silgi.routerPrefixs.includes(prefix)) {
-        silgi.routerPrefixs.push(prefix);
-      }
-    }
     const methods = object.methods?.length ? object.methods : ["ALL"];
     if (methods.includes("GRAPHQL")) {
       addRoute(silgi.router, "GRAPHQL", route, {
@@ -313,6 +306,14 @@ async function createSilgi(config) {
         service: object
       });
       continue;
+    } else {
+      const routeParts = route.split("/").filter(Boolean);
+      if (routeParts.length > 0) {
+        const prefix = `/${routeParts[0]}`;
+        if (!silgi.routerPrefixs.includes(prefix)) {
+          silgi.routerPrefixs.push(prefix);
+        }
+      }
     }
     for (const method of methods) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
@@ -344,6 +345,14 @@ async function createSilgi(config) {
       continue;
     }
     const methods = routeObject.methods?.length ? routeObject.methods : ["ALL"];
+    if (methods.includes("GRAPHQL")) {
+      addRoute(silgi._middlewareRouter, "GRAPHQL", _route, {
+        method: "GRAPHQL",
+        route: _route,
+        middleware: routeObject.setup
+      });
+      continue;
+    }
     for (const method of methods) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
       addRoute(silgi._middlewareRouter, globalMethod, _route, {
@@ -958,7 +967,7 @@ async function middleware(event, url) {
   }
   const _mRouter = silgiContext._middlewareRouter;
   if (_mRouter) {
-    const matches = findAllRoutes(_mRouter, event.req.method, pathname);
+    const matches = findAllRoutes(_mRouter, url?.method || event.req.method, pathname);
     if (matches.length > 0) {
       _chain = _chain || Promise.resolve();
       for (const match of matches) {

package/package.json

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