silgi 0.37.0 → 0.37.2

package/dist/cli/index.mjs

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

package/dist/core/index.mjs

@@ -8,7 +8,6 @@ import { klona } from 'klona';
 import { useSilgiRuntimeConfig } from 'silgi/runtime';
 import { createStorage as createStorage$1, builtinDrivers, prefixStorage } from 'unstorage';
 import { FastURL, FastResponse } from 'srvx';
-import { isRuntimePresents } from 'silgi/kit';
 export { s as silgiCLICtx, t as tryUseSilgiCLI, u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
 
 const silgiCtx = getContext("silgi");
@@ -307,7 +306,7 @@ async function createSilgi(config) {
         addRoute(silgi.router, _method, route, {
           method: _method,
           route,
-          setup: methodObject,
+          service: methodObject,
           schema: schemaWrapper
         });
       }
@@ -532,56 +531,73 @@ function getUrlPrefix(path, method) {
 }
 
 async function orchestrate(route, event) {
-  const input = await parseRequestInput(event.req);
   const silgiCtx = useSilgi();
   const silgiURL = getUrlPrefix(route.route, event.req.method);
+  const input = await parseRequestInput(event.req);
   try {
     const routerParams = getRouterParams(event);
     const queryParams = getQuery(event);
-    let success = false;
-    let cached = false;
-    let result;
-    const setup = route.setup;
-    const cacheData = await cacheExecute(input, route, silgiURL, event);
+    const service = route.service;
+    const cachePromise = cacheExecute(input, route, silgiURL, event);
+    const beforeHookPromise = silgiCtx.callHook("fetch:before", {
+      url: silgiURL,
+      input,
+      event,
+      route
+    });
+    const cacheData = await cachePromise;
+    await beforeHookPromise;
     if (cacheData?.success) {
-      result = cacheData.data;
-      success = cacheData.success;
-      cached = cacheData.cached;
-    } else {
-      silgiCtx.shared.$fetch = silgiFetch;
-      silgiCtx.shared.silgi = silgiCtx;
-      result = await setup?.handler(
-        {
-          args: input,
-          parameters: {
-            query: queryParams,
-            path: routerParams
-          }
-        },
-        silgiCtx.shared,
+      await silgiCtx.callHook("fetch:after", {
         event,
-        event.context.source
-      );
-      success = true;
+        url: silgiURL,
+        input,
+        result: cacheData.data,
+        success: true,
+        // modules: setup.modules,
+        route
+      });
+      return cacheData.data;
     }
+    silgiCtx.shared.$fetch = silgiFetch;
+    silgiCtx.shared.silgi = silgiCtx;
+    const result = await service?.handler(
+      {
+        args: input,
+        parameters: {
+          query: queryParams,
+          path: routerParams
+        }
+      },
+      silgiCtx.shared,
+      event,
+      event.context.source
+    );
     await silgiCtx.callHook("fetch:after", {
+      event,
       url: silgiURL,
       input,
       result,
-      success,
-      modules: setup.modules
+      success: true,
+      // modules: setup.modules,
+      route
     });
-    if (!cached) {
-      if (success && cacheData?.cachedKey && setup.storage) {
-        await useSilgiStorage(setup.storage.base).setItem(cacheData.cachedKey, result, setup.storage.options);
-      }
+    if (service.storage && cacheData?.cachedKey) {
+      await useSilgiStorage(service.storage.base).setItem(
+        cacheData.cachedKey,
+        result,
+        // Cast to StorageValue if needed
+        service.storage.options
+      );
     }
     return result;
   } catch (err) {
     await silgiCtx.callHook("fetch:error", {
+      event,
       input,
       error: err instanceof Error ? err : new Error(String(err)),
-      url: silgiURL
+      url: silgiURL,
+      route
     });
     silgiCtx.captureError(
       silgiCtx,
@@ -600,7 +616,7 @@ async function orchestrate(route, event) {
   }
 }
 async function cacheExecute(input, route, silgiURL, event) {
-  const setup = route.setup;
+  const setup = route.service;
   if (!setup.storage)
     return;
   const cacheKey = setup.storage ? await generateStorageKey({
@@ -869,17 +885,11 @@ function getEvent(event) {
   if (event?.event) {
     return getEvent(event.event);
   }
-  if (isRuntimePresents(["h3", "nitro", "nuxt"])) {
-    return event;
-  }
   return event;
 }
 function getEventContext(event) {
   const _event = getEvent(event);
-  if (isRuntimePresents(["h3", "nitro", "nuxt"])) {
-    return _event.context;
-  }
-  return _event;
+  return _event.context;
 }
 
 function createSchema(params) {

package/dist/index.mjs

@@ -10,4 +10,3 @@ import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
 import 'srvx';
-import 'silgi/kit';

package/dist/runtime/internal/next.mjs

@@ -1,10 +1,9 @@
-import { createError, getUrlPrefix, isError, silgiFetch, useSilgi } from "silgi";
+import { createError, silgiFetch, useSilgi } from "silgi";
 export function toNextJsHandler(silgiContext = useSilgi()) {
   const handler = async (request) => {
     if (!silgiContext) {
       throw new Error("Silgi context is not defined");
     }
-    const silgiURL = getUrlPrefix(request.url, request.method);
     try {
       const res = await silgiFetch(request);
       if (!res.ok) {
@@ -22,30 +21,6 @@ export function toNextJsHandler(silgiContext = useSilgi()) {
       }
       return res;
     } catch (err) {
-      if (isError(err)) {
-        throw createError({
-          statusCode: 500,
-          statusMessage: "Internal Server Error",
-          cause: err
-        });
-      }
-      await silgiContext.callHook("fetch:error", {
-        error: err instanceof Error ? err : new Error(String(err)),
-        url: silgiURL
-      });
-      silgiContext.captureError(
-        silgiContext,
-        createError({
-          message: err instanceof Error ? err.message : String(err),
-          statusCode: 500,
-          statusMessage: "Internal Server Error",
-          cause: err
-        }),
-        {
-          url: silgiURL,
-          tags: ["execute"]
-        }
-      );
       throw createError({
         statusCode: 500,
         message: "Internal Server Error",

package/dist/runtime/internal/nitro.mjs

@@ -1,13 +1,10 @@
 import {
-  createError as createH3Error,
   defineEventHandler,
-  getRequestWebStream,
-  H3Error
+  getRequestWebStream
 } from "h3";
 import {
   createError,
   getUrlPrefix,
-  isError,
   silgiFetch,
   useSilgi
 } from "silgi";
@@ -53,34 +50,6 @@ export async function addNitroApp(silgiContext = useSilgi()) {
         }
         return resolvedRoute;
       } catch (err) {
-        if (err instanceof H3Error) {
-          throw err;
-        }
-        if (isError(err)) {
-          throw createH3Error({
-            statusCode: 500,
-            statusMessage: "Internal Server Error",
-            cause: err
-          });
-        }
-        await silgiContext.callHook("fetch:error", {
-          error: err instanceof Error ? err : new Error(String(err)),
-          url: silgiURL
-        });
-        silgiContext.captureError(
-          silgiContext,
-          createError({
-            message: err instanceof Error ? err.message : String(err),
-            statusCode: 500,
-            statusMessage: "Internal Server Error",
-            cause: err
-          }),
-          {
-            event,
-            url: silgiURL,
-            tags: ["execute"]
-          }
-        );
         throw createError({
           statusCode: 500,
           message: "Internal Server Error",