silgi 0.41.32 → 0.41.35

package/dist/cli/index.mjs

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

package/dist/core/index.mjs

@@ -780,7 +780,7 @@ function getUrlPrefix(path, method) {
   };
 }
 
-async function orchestrate(route, event, _input, parent, info, callBack) {
+async function orchestrate(route, event, _input, parent, info) {
   const silgiCtx = useSilgi();
   const isGraphQL = event.context.protocol === "GRAPHQL";
   const silgiURL = getUrlPrefix(route.route || event.req.url, route.method);
@@ -835,7 +835,7 @@ async function orchestrate(route, event, _input, parent, info, callBack) {
     }
     silgiCtx.shared.$fetch = silgiFetch;
     silgiCtx.shared.silgi = silgiCtx;
-    const result = callBack ? await callBack() : await route.service?.handler?.(
+    const result = await route.service?.handler?.(
       // input
       inputData,
       // shared
@@ -1048,17 +1048,15 @@ async function middleware(event) {
     }
   }
   event._chain = _chain;
-}
-async function handler(event, middlewareMode = false, input, parent, info, callBack) {
-  event._chain = middleware(event);
-  if (middlewareMode) {
-    if (event._chain) {
-      const data = await event._chain;
-      if (data !== void 0 && data !== kNotFound) {
-        return data;
-      }
+  if (event._chain) {
+    const data = await event._chain;
+    if (data !== void 0 && data !== kNotFound) {
+      return data;
     }
   }
+}
+async function handler(event, middlewareMode = false, input, parent, info, callBack) {
+  await middleware(event);
   const silgiContext = useSilgi();
   if (silgiContext.router) {
     const match = findRoute(silgiContext.router, event.req.method, event.url.pathname);
@@ -1070,12 +1068,12 @@ async function handler(event, middlewareMode = false, input, parent, info, callB
           }
           event.context.params = match.params;
           event.context.matchedRoute = match.data;
-          return orchestrate(match.data, event, input, parent, info, callBack);
+          return orchestrate(match.data, event, input, parent, info);
         });
       } else {
         event.context.params = match.params;
         event.context.matchedRoute = match.data;
-        return orchestrate(match.data, event, input, parent, info, callBack);
+        return orchestrate(match.data, event, input, parent, info);
       }
     }
   }

package/dist/types/index.d.mts

@@ -469,7 +469,7 @@ interface ResolvedModuleMeta extends ModuleMeta {
 }
 type ModuleHookContext = Readonly<{
     event?: SilgiEvent;
-    url: SilgiURL;
+    url?: SilgiURL;
     input?: unknown;
     result?: unknown;
     route?: SilgiRoute;
@@ -477,7 +477,7 @@ type ModuleHookContext = Readonly<{
     success?: boolean;
     cached?: boolean;
 }> & {
-    hookContext: {
+    hookContext?: {
         earlyReturnValue: any | false;
     };
 };

package/package.json

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