silgi 0.41.34 → 0.41.36

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -1,6 +1,5 @@
 import { SilgiRuntimeConfig, SilgiConfig, Silgi, SilgiEvent, SilgiRuntimeContext, SilgiSchema, RouteEntry, CustomRequestInit, SilgiCLI, SilgiStorageBase, MergeAll, Routers, HTTPMethod, MiddlewareSetup, Resolvers, SilgiURL, BaseMethodSchema, ServiceSetupsForMethods, ServiceDefinitionByMethodAndPath, ServiceSetup, SilgiRuntimeShareds, StorageConfig } from 'silgi/types';
 import { ServerRequest } from 'srvx';
-import { GraphQLResolveInfo } from 'graphql';
 import { UseContext } from 'unctx';
 import { Storage, StorageValue } from 'unstorage';
 import { StandardSchemaV1 } from '@standard-schema/spec';
@@ -136,7 +135,7 @@ declare function silgiFetch(_request: Request | URL, options?: RequestInit & {
     pathParams?: Record<string, any>;
 }, context?: SilgiRuntimeContext): Promise<Response | Promise<Response>>;
 declare function middleware(event: SilgiEvent): Promise<any>;
-declare function handler(event: SilgiEvent, middlewareMode?: boolean, input?: any, parent?: any, info?: GraphQLResolveInfo, callBack?: () => any | Promise<any>): Promise<any>;
+declare function handler(event: SilgiEvent): Promise<any>;
 
 declare const silgiCLICtx: UseContext<SilgiCLI>;
 declare function useSilgiCLI(): SilgiCLI;

package/dist/core/index.mjs

@@ -780,27 +780,20 @@ function getUrlPrefix(path, method) {
   };
 }
 
-async function orchestrate(route, event, _input, parent, info) {
+async function orchestrate(route, event) {
   const silgiCtx = useSilgi();
-  const isGraphQL = event.context.protocol === "GRAPHQL";
   const silgiURL = getUrlPrefix(route.route || event.req.url, route.method);
-  const input = _input || (route.service?.rules?.readBeforeBody === false || isGraphQL ? {} : await parseRequestInput(event.req));
+  const input = route.service?.rules?.readBeforeBody === false ? {} : await parseRequestInput(event.req);
   const hookContext = { earlyReturnValue: false };
-  const routerParams = _input ? input.path : getRouterParams(event);
-  const queryParams = _input ? input.query : getQuery(event);
-  if (_input?.path) {
-    delete _input.path;
-  }
-  if (_input?.query) {
-    delete _input.query;
-  }
+  const routerParams = input.path || getRouterParams(event);
+  const queryParams = input.query || getQuery(event);
   const inputData = {
     args: input,
     query: queryParams,
     path: routerParams
   };
   try {
-    if (!route.service && !isGraphQL) {
+    if (!route.service) {
       throw createError({
         statusCode: 404,
         statusMessage: "Service not found"
@@ -841,11 +834,7 @@ async function orchestrate(route, event, _input, parent, info) {
       // shared
       silgiCtx.shared,
       // event
-      event,
-      // parent - graphql
-      parent,
-      // info - graphql
-      info
+      event
     );
     await silgiCtx.callHook("fetch:after", {
       event,
@@ -989,12 +978,7 @@ async function middleware(event) {
         if (_previous !== void 0 && _previous !== kNotFound) {
           return _previous;
         }
-        const allowedMethod = m.method ?? "";
-        const methodIsAllowed = allowedMethod === event.req.method || event.protocol === "GRAPHQL";
-        if (!methodIsAllowed) {
-          return;
-        }
-        if (!m.middleware) {
+        if (!(m.method === event.req.method) || !m.middleware) {
           return;
         }
         try {
@@ -1048,17 +1032,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) {
+  await middleware(event);
   const silgiContext = useSilgi();
   if (silgiContext.router) {
     const match = findRoute(silgiContext.router, event.req.method, event.url.pathname);
@@ -1070,12 +1052,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);
+          return orchestrate(match.data, event);
         });
       } else {
         event.context.params = match.params;
         event.context.matchedRoute = match.data;
-        return orchestrate(match.data, event, input, parent, info);
+        return orchestrate(match.data, event);
       }
     }
   }

package/dist/index.d.mts

@@ -1,7 +1,6 @@
 export { SilgiError, SilgiHttpEvent, autoImportTypes, createError, createMiddleware, createResolver, createSchema, createService, createShared, createSilgi, createStorage, deepMergeObjects, defineServiceSetup, getEvent, getEventContext, getUrlPrefix, handleResponse, handler, isError, kHandled, kNotFound, middleware, replaceRuntimeValues, silgiCLICtx, silgiCtx, silgiFetch, storageMount, tryUseSilgi, tryUseSilgiCLI, updateRuntimeStorage, useRuntime, useSilgi, useSilgiCLI, useSilgiStorage } from './core/index.mjs';
 import 'silgi/types';
 import 'srvx';
-import 'graphql';
 import 'unctx';
 import 'unstorage';
 import '@standard-schema/spec';

package/dist/types/index.d.mts

@@ -23,7 +23,6 @@ import { RouterContext } from 'rou3';
 import { TransactionOptions, BuiltinDriverName, StorageValue, Storage } from 'unstorage';
 import { ServerRequest } from 'srvx';
 import { Defu } from 'defu';
-import { GraphQLResolveInfo } from 'graphql';
 import { silgiFetch } from 'silgi';
 import { useRuntimeConfig } from 'silgi/runtime';
 import { Unimport } from 'unimport';
@@ -264,14 +263,14 @@ type ServiceHandlerInput<Input extends StandardSchemaV1 = StandardSchemaV1, Path
  * Resolved = false  -> handler(input, shared, event, source) // all required
  * Resolved = true -> handler(input, shared?, event?, source?) // only input required
  */
-type ServiceHandler<Parent extends StandardSchemaV1, Input extends StandardSchemaV1, Output extends StandardSchemaV1, PathParams extends StandardSchemaV1 | never | undefined = never, QueryParams extends StandardSchemaV1 | never | undefined = never, Resolved extends boolean = false, HiddenParameters extends boolean = false> = Resolved extends true ? (input: ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>, shared?: SilgiRuntimeShareds, event?: SilgiEvent, parent?: Parent, info?: GraphQLResolveInfo) => Promise<InferOutput<Output>> | InferOutput<Output> : (input: ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>, shared: SilgiRuntimeShareds, event: SilgiEvent, parent?: Parent, info?: GraphQLResolveInfo) => Promise<InferOutput<Output>> | InferOutput<Output>;
+type ServiceHandler<Input extends StandardSchemaV1, Output extends StandardSchemaV1, PathParams extends StandardSchemaV1 | never | undefined = never, QueryParams extends StandardSchemaV1 | never | undefined = never, Resolved extends boolean = false, HiddenParameters extends boolean = false> = Resolved extends true ? (input: ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>, shared?: SilgiRuntimeShareds, event?: SilgiEvent) => Promise<InferOutput<Output>> | InferOutput<Output> : (input: ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>, shared: SilgiRuntimeShareds, event: SilgiEvent) => Promise<InferOutput<Output>> | InferOutput<Output>;
 /**
  * Servis setup tipi
  */
-interface ServiceSetup<Parent extends StandardSchemaV1 = StandardSchemaV1, Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> {
+interface ServiceSetup<Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> {
     path: Path;
     method: Method;
-    handler?: ServiceHandler<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    handler?: ServiceHandler<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
     rules?: MergeRouteRules;
     modules?: Partial<SetupModuleOption>;
     storage?: StorageConfig<ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>>;
@@ -304,7 +303,7 @@ interface SilgiURL {
     pathParams?: Record<string, string | undefined>;
     queryParams?: Record<string, string>;
 }
-type ServiceSetupsForMethods<Parent extends StandardSchemaV1 = StandardSchemaV1, Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = ServiceSetup<Parent, Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+type ServiceSetupsForMethods<Method extends HTTPMethod = HTTPMethod, Path extends string = string, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = ServiceSetup<Method, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
 /**
  * Sadece belirtilen HTTP methodları için anahtar üretir.
  * Varsayılan olarak tüm methodlar çıkar.
@@ -313,8 +312,8 @@ type ServiceSetupsForMethods<Parent extends StandardSchemaV1 = StandardSchemaV1,
  *   ServiceDefinitionByMethodAndPath<'/foo', ..., 'GET' | 'POST'>
  *   // Sadece "GET:/foo" ve "POST:/foo" anahtarları olur.
  */
-type ServiceDefinitionByMethodAndPath<Path extends string, Method extends HTTPMethod = HTTPMethod, Parent extends StandardSchemaV1 = StandardSchemaV1, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = {
-    [M in Method as `${M}:${Path}`]?: ServiceSetup<Parent, M, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+type ServiceDefinitionByMethodAndPath<Path extends string, Method extends HTTPMethod = HTTPMethod, Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | undefined | never = undefined, QueryParams extends StandardSchemaV1 | undefined | never = undefined, Resolved extends boolean = false, HiddenParameters extends boolean = false> = {
+    [M in Method as `${M}:${Path}`]?: ServiceSetup<M, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
 };
 
 interface SilgiCLI {

package/package.json

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