silgi 0.41.7 → 0.41.9

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -170,6 +170,7 @@ 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]: {

package/dist/core/index.mjs

@@ -305,6 +305,14 @@ async function createSilgi(config) {
         silgi.routerPrefixs.push(prefix);
       }
     }
+    if (object.mode === "graphql") {
+      addRoute(silgi.router, "GRAPHQL", route, {
+        method: ["GRAPHQL"],
+        route,
+        service: object
+      });
+      continue;
+    }
     const methods = object.methods?.length ? object.methods : ["ALL"];
     for (const method of methods) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
@@ -605,7 +613,7 @@ async function orchestrate(route, event, _input) {
     }
   };
   try {
-    if (!route.service) {
+    if (!route.service && !route.graphql) {
       throw createError({
         statusCode: 404,
         statusMessage: "Service not found"
@@ -640,11 +648,14 @@ async function orchestrate(route, event, _input) {
     }
     silgiCtx.shared.$fetch = silgiFetch;
     silgiCtx.shared.silgi = silgiCtx;
-    const result = await route.service?.setup.handler(
-      inputData,
-      silgiCtx.shared,
-      event
-    );
+    let result;
+    if (!route.graphql) {
+      result = await route.service?.setup.handler?.(
+        inputData,
+        silgiCtx.shared,
+        event
+      );
+    }
     await silgiCtx.callHook("fetch:after", {
       event,
       url: silgiURL,
@@ -654,7 +665,7 @@ async function orchestrate(route, event, _input) {
       route,
       hookContext
     });
-    if (route.service.setup.storage && cacheData?.cachedKey) {
+    if (route.service?.setup.storage && cacheData?.cachedKey) {
       await useSilgiStorage(route.service.setup.storage.base).setItem(
         cacheData.cachedKey,
         result,
@@ -689,7 +700,7 @@ async function orchestrate(route, event, _input) {
   }
 }
 async function cacheExecute(input, route, silgiURL, event) {
-  if (!route.service || !route.service.setup.storage)
+  if (!route.service || !route.service.setup?.storage)
     return;
   const cacheKey = route.service.setup.storage ? await generateStorageKey({
     url: silgiURL,
@@ -996,14 +1007,7 @@ async function handler(event, url, input) {
   const data = middleware(event, url);
   _chain = data;
   if (silgiCtx.router) {
-    const match = !url?.graphql ? findRoute(silgiCtx.router, url?.method || event.req.method, pathname) : {
-      data: {
-        graphql: true,
-        method: url?.method || event.req.method,
-        route: url.path
-      },
-      params: {}
-    };
+    const match = findRoute(silgiCtx.router, url?.method || event.req.method, pathname);
     if (match) {
       if (_chain) {
         return _chain.then(async (_previous) => {
@@ -1078,8 +1082,9 @@ function createService(params) {
     );
   }
   const result = {};
-  const { path, setup, methods, input, output, queryParams } = params;
+  const { path, setup, methods, input, output, queryParams, mode } = params;
   result[path] = {
+    mode,
     setup,
     methods,
     input,

package/dist/types/index.d.mts

@@ -261,12 +261,12 @@ 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<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>> : (input: ServiceHandlerInput<Input, PathParams, QueryParams, HiddenParameters>, shared: SilgiRuntimeShareds, event: SilgiEvent) => Promise<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<Input extends StandardSchemaV1 = StandardSchemaV1, Output extends StandardSchemaV1 = StandardSchemaV1, PathParams extends StandardSchemaV1 | never | undefined = never, QueryParams extends StandardSchemaV1 | never | undefined = never, Resolved extends boolean = false, HiddenParameters extends boolean = false> {
-    handler: ServiceHandler<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    handler?: ServiceHandler<Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
     rules?: RouteRules & {
         readBeforeBody?: boolean;
     };
@@ -285,6 +285,7 @@ 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;
@@ -691,7 +692,7 @@ interface ResolvedSchemaDefinition {
     [methodAndRoutePath: string]: BaseMethodSchema;
 }
 
-type StandardHTTPMethod = 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'ALL';
+type StandardHTTPMethod = 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'ALL' | 'GRAPHQL';
 type HTTPMethod = SilgiRuntimeMethods extends Record<string, any> ? keyof SilgiRuntimeMethods | StandardHTTPMethod : StandardHTTPMethod;
 interface MetaData extends Record<string, unknown> {
 }

package/package.json

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