silgi 0.37.43 → 0.37.45

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -1,17 +1,9 @@
-import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, ServiceSetup, CustomRequestInit, SilgiRuntimeContext, AllPrefixes, NamespacesForPrefix, RoutesForPrefixAndNamespace, MethodSchemas, MergeAll, ServiceMethods, SilgiRuntimeShareds, RouteConfig, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
-import { StandardSchemaV1 } from '@standard-schema/spec';
+import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, CustomRequestInit, SilgiRuntimeContext, AllPrefixes, NamespacesForPrefix, RoutesForPrefixAndNamespace, MethodSchemas, MergeAll, ServiceMethods, SilgiRuntimeShareds, RouteConfig, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
 import { Storage, StorageValue } from 'unstorage';
 import { UseContext } from 'unctx';
 
 declare function createSilgi(config: SilgiConfig): Promise<Silgi>;
 
-declare function createSilgiCore(event: SilgiEvent): {
-    resolve: <Schema extends SilgiSchema = SilgiSchema, Route extends keyof Schema = keyof Schema, Method extends keyof Schema[Route] = keyof Schema[Route], Resolved extends boolean = true, HiddenParameters extends boolean = false>(path: Route, method: Method, context: {
-        pathParams?: Route extends keyof Schema ? Method extends keyof Schema[Route] ? Schema[Route][Method] extends {
-            pathParams?: infer P;
-        } ? P extends StandardSchemaV1 ? StandardSchemaV1.InferInput<P> : undefined : undefined : undefined : undefined;
-    }) => Promise<Route extends keyof Schema ? Method extends keyof Schema[Route] ? ServiceSetup<Schema, Route, Method, Resolved, HiddenParameters> : undefined : undefined>;
-};
 /**
  * Fetch API for Silgi framework
  */
@@ -22,6 +14,10 @@ declare function silgiFetch<Schema extends SilgiSchema = SilgiSchema, Route exte
 declare function silgiFetch(_request: Request | URL | string, options?: RequestInit & {
     pathParams?: Record<string, any>;
 }, context?: SilgiRuntimeContext): Promise<Response | Promise<Response>>;
+declare function handler(event: SilgiEvent, url?: {
+    path: string;
+    method: string;
+}, input?: any): Promise<any>;
 
 /**
  * LICENSE: MIT
@@ -292,4 +288,4 @@ declare function useRuntime(): SilgiRuntimeConfig;
 
 declare const autoImportTypes: string[];
 
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage };
+export { SilgiError, autoImportTypes, createError, 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 };

package/dist/core/index.mjs

@@ -532,14 +532,27 @@ function getUrlPrefix(path, method) {
   };
 }
 
-async function orchestrate(route, event) {
+async function orchestrate(route, event, _input) {
   const silgiCtx = useSilgi();
-  const silgiURL = getUrlPrefix(route.route, event.req.method);
-  const input = route.service.routerRule?.readBeforeBody === false ? {} : await parseRequestInput(event.req);
+  const silgiURL = getUrlPrefix(route.route, route.method);
+  const input = _input || (route.service.routerRule?.readBeforeBody === false ? {} : await parseRequestInput(event.req));
   const hookContext = { earlyReturnValue: false };
+  const routerParams = _input.path ?? getRouterParams(event);
+  const queryParams = _input.query ?? getQuery(event);
+  if (_input.path) {
+    delete _input.path;
+  }
+  if (_input.query) {
+    delete _input.query;
+  }
+  const inputData = {
+    args: input,
+    parameters: {
+      query: queryParams,
+      path: routerParams
+    }
+  };
   try {
-    const routerParams = getRouterParams(event);
-    const queryParams = getQuery(event);
     const service = route.service;
     const cachePromise = cacheExecute(input, route, silgiURL, event);
     const beforeHookPromise = silgiCtx.callHook("fetch:before", {
@@ -571,13 +584,7 @@ async function orchestrate(route, event) {
     silgiCtx.shared.$fetch = silgiFetch;
     silgiCtx.shared.silgi = silgiCtx;
     const result = await service?.handler(
-      {
-        args: input,
-        parameters: {
-          query: queryParams,
-          path: routerParams
-        }
-      },
+      inputData,
       silgiCtx.shared,
       event,
       event.context.source
@@ -585,7 +592,7 @@ async function orchestrate(route, event) {
     await silgiCtx.callHook("fetch:after", {
       event,
       url: silgiURL,
-      input,
+      input: inputData,
       result,
       success: true,
       route,
@@ -603,7 +610,7 @@ async function orchestrate(route, event) {
   } catch (err) {
     await silgiCtx.callHook("fetch:error", {
       event,
-      input,
+      input: inputData,
       error: err instanceof Error ? err : new Error(String(err)),
       url: silgiURL,
       route,
@@ -821,20 +828,6 @@ function withDuplexIfBody(options) {
   }
   return options;
 }
-function createSilgiCore(event) {
-  return {
-    resolve: async (path, method, context) => {
-      const silgiCtx = useSilgi();
-      if (!silgiCtx.router) {
-        return void 0;
-      }
-      const routeStr = substitutePathParams(String(path), context?.pathParams);
-      const methodStr = String(method);
-      const match = findRoute(silgiCtx.router, methodStr, routeStr);
-      return match?.data?.service;
-    }
-  };
-}
 async function silgiFetch(_request, options, context) {
   const silgiCtx = useSilgi();
   let request;
@@ -870,13 +863,13 @@ async function silgiFetch(_request, options, context) {
   }
   return handleResponse(handlerRes, silgiEvent, {});
 }
-async function handler(event) {
+async function handler(event, url, input) {
   const silgiCtx = useSilgi();
-  const pathname = event.url.pathname;
+  const pathname = url?.path || event.url.pathname;
   let _chain = void 0;
   _chain = Promise.resolve(await silgiCtx.callHook("request:on", event));
   if (silgiCtx.router) {
-    const match = findRoute(silgiCtx.router, event.req.method, pathname);
+    const match = findRoute(silgiCtx.router, url?.method || event.req.method, pathname);
     if (match) {
       if (_chain) {
         return _chain.then(async (_previous) => {
@@ -885,12 +878,12 @@ async function handler(event) {
           }
           event.context.params = match.params;
           event.context.matchedRoute = match.data;
-          return orchestrate(match.data, event);
+          return orchestrate(match.data, event, input);
         });
       } else {
         event.context.params = match.params;
         event.context.matchedRoute = match.data;
-        return orchestrate(match.data, event);
+        return orchestrate(match.data, event, input);
       }
     }
   }
@@ -991,4 +984,4 @@ const autoImportTypes = [
   "ExtractQueryParamsFromURI"
 ];
 
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };
+export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, replaceRuntimeValues, silgiCtx, silgiFetch, storageMount, tryUseSilgi, updateRuntimeStorage, useRuntime, useSilgi, useSilgiStorage };

package/dist/index.d.mts

@@ -1,5 +1,4 @@
-export { SilgiError, autoImportTypes, createError, createRoute, createSchema, createService, createShared, createSilgi, createSilgiCore, createStorage, deepMergeObjects, getEvent, getEventContext, getUrlPrefix, handleResponse, isError, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
+export { SilgiError, autoImportTypes, createError, 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';
 import 'silgi/types';
-import '@standard-schema/spec';
 import 'unstorage';
 import 'unctx';

package/dist/index.mjs

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

package/dist/types/index.d.mts

@@ -673,7 +673,7 @@ interface SilgiMeta extends Record<string, unknown> {
 }
 interface SilgiRoute {
     route: string;
-    method?: HTTPMethod;
+    method: HTTPMethod;
     service: ServiceSetup;
     schema: ResolvedSchemaDefinition;
 }

package/package.json

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