silgi 0.41.9 → 0.41.11

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -1,4 +1,4 @@
-import { SilgiConfig, Silgi, SilgiEvent, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, BaseMethodSchema, MergeAll, HTTPMethod, ServiceSetup, ServicesObject, HttpMethod, MiddlewareSetup, SilgiRuntimeShareds, Resolvers, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
+import { SilgiConfig, Silgi, SilgiEvent, HTTPMethod, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, BaseMethodSchema, MergeAll, ServiceSetup, ServicesObject, MiddlewareSetup, SilgiRuntimeShareds, Resolvers, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Storage, StorageValue } from 'unstorage';
 import { UseContext } from 'unctx';
@@ -25,8 +25,7 @@ declare function middleware(event: SilgiEvent, url?: {
 }): Promise<any>;
 declare function handler(event: SilgiEvent, url?: {
     path?: string;
-    method?: string;
-    graphql?: boolean;
+    method?: HTTPMethod;
 }, input?: any): Promise<any>;
 
 /**
@@ -170,12 +169,11 @@ declare function createService<Path extends string = string, Input extends Stand
         path?: PathParams;
         query?: QueryParams;
     };
-    mode: 'graphql';
     setup: ServiceSetup<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
 }): {
     [K in Path]: {
         setup: ServiceSetup<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-        methods: HTTPMethod[];
+        methods?: HTTPMethod[];
         input?: Input;
         output?: Output;
         queryParams?: {
@@ -187,13 +185,13 @@ declare function createService<Path extends string = string, Input extends Stand
 
 type WildcardVariants<Path extends string, Acc extends string = ''> = Path extends `${infer Head}/${infer Tail}` ? Tail extends '' ? `${Acc}${Head}` : `${Acc}${Head}/${Tail}` | `${Acc}${Head}/*` | `${Acc}${Head}/**` | WildcardVariants<Tail, `${Acc}${Head}/`> : `${Acc}${Path}`;
 type MiddlewarePath<S extends WildcardVariants<keyof ServicesObject>> = S | 'global';
-interface CreateMiddlewareParams<S extends WildcardVariants<keyof ServicesObject>, UsedMethod extends readonly HttpMethod[] = readonly HttpMethod[], Key extends string = string> {
+interface CreateMiddlewareParams<S extends WildcardVariants<keyof ServicesObject>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> {
     path: MiddlewarePath<S>;
     methods?: UsedMethod;
     setup: MiddlewareSetup;
     key: Key;
 }
-type CreateMiddlewareResult<Path extends string, UsedMethod extends readonly HttpMethod[] = readonly HttpMethod[], Key extends string = string> = {
+type CreateMiddlewareResult<Path extends string, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Key extends string = string> = {
     [K in `${Key}:${Path}`]: {
         setup: MiddlewareSetup;
         methods?: UsedMethod;
@@ -201,7 +199,7 @@ type CreateMiddlewareResult<Path extends string, UsedMethod extends readonly Htt
         path: Path;
     };
 };
-declare function createMiddleware<S extends WildcardVariants<keyof ServicesObject>, UsedMethod extends readonly HttpMethod[] = readonly HttpMethod[], Path extends MiddlewarePath<S> = MiddlewarePath<S>, Key extends string = string>(params: CreateMiddlewareParams<S, UsedMethod, Key> & {
+declare function createMiddleware<S extends WildcardVariants<keyof ServicesObject>, UsedMethod extends readonly HTTPMethod[] = readonly HTTPMethod[], Path extends MiddlewarePath<S> = MiddlewarePath<S>, Key extends string = string>(params: CreateMiddlewareParams<S, UsedMethod, Key> & {
     path: Path;
 }): CreateMiddlewareResult<Path, UsedMethod, Key>;
 

package/dist/core/index.mjs

@@ -305,7 +305,8 @@ async function createSilgi(config) {
         silgi.routerPrefixs.push(prefix);
       }
     }
-    if (object.mode === "graphql") {
+    const methods = object.methods?.length ? object.methods : ["ALL"];
+    if (methods.includes("GRAPHQL")) {
       addRoute(silgi.router, "GRAPHQL", route, {
         method: ["GRAPHQL"],
         route,
@@ -313,7 +314,6 @@ async function createSilgi(config) {
       });
       continue;
     }
-    const methods = object.methods?.length ? object.methods : ["ALL"];
     for (const method of methods) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
       addRoute(silgi.router, globalMethod, route, {
@@ -586,7 +586,8 @@ function getUrlPrefix(path, method) {
 
 async function orchestrate(route, event, _input) {
   const silgiCtx = useSilgi();
-  const silgiURL = !route.graphql ? getUrlPrefix(route.route || event.req.url, route.method) : {
+  const isGraphQL = route.method === "GRAPHQL";
+  const silgiURL = !isGraphQL ? getUrlPrefix(route.route || event.req.url, route.method) : {
     methodName: route.method || "GET",
     namespaceName: "graphql",
     prefixName: "/api",
@@ -595,7 +596,7 @@ async function orchestrate(route, event, _input) {
     pathParams: {},
     queryParams: {}
   };
-  const input = _input || (route.service?.setup.rules?.readBeforeBody === false || route.graphql ? {} : await parseRequestInput(event.req));
+  const input = _input || (route.service?.setup.rules?.readBeforeBody === false || isGraphQL ? {} : await parseRequestInput(event.req));
   const hookContext = { earlyReturnValue: false };
   const routerParams = _input ? input.path : getRouterParams(event);
   const queryParams = _input ? input.query : getQuery(event);
@@ -613,7 +614,7 @@ async function orchestrate(route, event, _input) {
     }
   };
   try {
-    if (!route.service && !route.graphql) {
+    if (!route.service && route.method !== "GRAPHQL") {
       throw createError({
         statusCode: 404,
         statusMessage: "Service not found"
@@ -649,7 +650,7 @@ async function orchestrate(route, event, _input) {
     silgiCtx.shared.$fetch = silgiFetch;
     silgiCtx.shared.silgi = silgiCtx;
     let result;
-    if (!route.graphql) {
+    if (!isGraphQL) {
       result = await route.service?.setup.handler?.(
         inputData,
         silgiCtx.shared,
@@ -1007,7 +1008,20 @@ async function handler(event, url, input) {
   const data = middleware(event, url);
   _chain = data;
   if (silgiCtx.router) {
-    const match = findRoute(silgiCtx.router, url?.method || event.req.method, pathname);
+    let match = findRoute(silgiCtx.router, url?.method || event.req.method, pathname);
+    if (!match && url?.method === "GRAPHQL") {
+      match = {
+        data: {
+          method: url?.method || event.req.method,
+          route: url?.path,
+          service: {
+            setup: {},
+            methods: ["GRAPHQL"]
+          }
+        },
+        params: {}
+      };
+    }
     if (match) {
       if (_chain) {
         return _chain.then(async (_previous) => {
@@ -1082,9 +1096,8 @@ function createService(params) {
     );
   }
   const result = {};
-  const { path, setup, methods, input, output, queryParams, mode } = params;
+  const { path, setup, methods, input, output, queryParams } = params;
   result[path] = {
-    mode,
     setup,
     methods,
     input,

package/dist/types/index.d.mts

@@ -285,7 +285,6 @@ interface ServiceSetup<Input extends StandardSchemaV1 = StandardSchemaV1, Output
 interface ResolvedServiceDefinition {
     [routePath: string]: {
         setup: ServiceSetup<any, any, any, any, any, any>;
-        mode: 'graphql';
         methods: HTTPMethod[];
         input?: StandardSchemaV1;
         output?: StandardSchemaV1;
@@ -531,7 +530,6 @@ type ExtractPathParams<T extends string> = T extends `${infer _Start}:${infer Pa
     [K in Param]: string;
 } : unknown;
 
-type HttpMethod = 'get' | 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'head' | 'patch' | 'post' | 'put' | 'delete' | 'connect' | 'options' | 'trace';
 type RouterParams<R extends AllPaths | (string & {})> = ExtractPathParams<R>;
 type SilgiFetchOptions<P extends AllPaths | (string & {}), BasePath extends keyof SilgiRouterTypes = TrimAfterFourSlashes<P> extends keyof SilgiRouterTypes ? TrimAfterFourSlashes<P> : never, M extends keyof SilgiRouterTypes[BasePath] = keyof SilgiRouterTypes[BasePath]> = {
     method?: M;
@@ -693,12 +691,11 @@ interface ResolvedSchemaDefinition {
 }
 
 type StandardHTTPMethod = 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'ALL' | 'GRAPHQL';
-type HTTPMethod = SilgiRuntimeMethods extends Record<string, any> ? keyof SilgiRuntimeMethods | StandardHTTPMethod : StandardHTTPMethod;
+type HTTPMethod = StandardHTTPMethod | (keyof SilgiRuntimeMethods extends string ? keyof SilgiRuntimeMethods : never);
 interface MetaData extends Record<string, unknown> {
 }
 interface SilgiRoute {
     route?: string;
-    graphql?: boolean;
     method?: HTTPMethod | HTTPMethod[];
     service?: ResolvedServiceDefinition[string];
     middleware?: MiddlewareSetup;
@@ -1224,4 +1221,4 @@ interface LoadConfigOptions {
     consola?: ConsolaInstance;
 }
 
-export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BaseMethodSchema, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, HTTPMethod, HasPathParams, HookResult, HttpMethod, LoadConfigOptions, MergeAll, MergedSilgiSchema, MetaData, MethodSchemas, MiddlewareHandler, MiddlewareSetup, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedMiddlewareDefinition, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, Resolvers, RouteEntry, RouteRules, RouterParams, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceSetup, ServicesObject, SetupModuleOption, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeDefaultConfig, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WithPathParams };
+export type { AllPaths, AllPrefixes, AppConfig, Awaitable, BaseMethodSchema, BuildSilgi, CaptureError, CapturedErrorContext, CommandType, Commands, CustomRequestInit, DeepPartial, DeepRequired, DefaultHooks, DefineFrameworkOptions, DotenvOptions, EnvOptions, EventHandlerResponse, ExtendContext, ExtendShared, ExtractNamespace, ExtractPathParamKeys, ExtractPathParams, ExtractPrefix, ExtractRoute, GenImport, GenerateAppOptions, HTTPMethod, HasPathParams, HookResult, LoadConfigOptions, MergeAll, MergedSilgiSchema, MetaData, MethodSchemas, MiddlewareHandler, MiddlewareSetup, ModuleDefinition, ModuleHookContext, ModuleMeta, ModuleOptionsCustom, ModuleSetupInstallResult, ModuleSetupReturn, NamespacesForPrefix, NitroBuildInfo, RequiredServiceType, ResolvedMiddlewareDefinition, ResolvedModuleMeta, ResolvedModuleOptions, ResolvedSchema, ResolvedSchemaDefinition, ResolvedServiceDefinition, ResolvedSilgiTemplate, Resolvers, RouteEntry, RouteRules, RouterParams, RoutesForPrefixAndNamespace, ScanFile, Schema, ServiceHandler, ServiceHandlerInput, ServiceSetup, ServicesObject, SetupModuleOption, Silgi, SilgiAppPlugin, SilgiCLI, SilgiCLIConfig, SilgiCLIHooks, SilgiCLIOptions, SilgiCommands, SilgiCompatibility, SilgiCompatibilityIssue, SilgiCompatibilityIssues, SilgiConfig, SilgiEvent, SilgiFetchClient, SilgiFetchOptions, SilgiFrameworkInfo, SilgiHooks, SilgiModule, SilgiModuleInput, SilgiModuleOptions, SilgiOptions, SilgiPreset, SilgiPresetMeta, SilgiRoute, SilgiRouterTypes, SilgiRuntimeConfig, SilgiRuntimeContext, SilgiRuntimeDefaultConfig, SilgiRuntimeHooks, SilgiRuntimeMethods, SilgiRuntimeOptions, SilgiRuntimeShareds, SilgiRuntimeSharedsExtend, SilgiSchema, SilgiStorageBase, SilgiTemplate, SilgiURL, StandardHTTPMethod, StorageConfig, StorageKeyGenerator, StorageKeyParams, StorageMounts, TSReference, TrimAfterFourSlashes, WithPathParams };

package/package.json

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