silgi 0.41.21 → 0.41.23

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -25,7 +25,7 @@ declare function middleware(event: SilgiEvent, url?: {
 }): Promise<any>;
 declare function handler(event: SilgiEvent, url?: {
     path?: string;
-    method?: HTTPMethod;
+    method?: HTTPMethod | '';
 }, input?: any): Promise<any>;
 
 /**
@@ -158,25 +158,19 @@ declare function deepMergeObjects<T extends readonly Record<string, any>[]>(sche
  * ServiceSetup tipinden oluşan bir yardımcı fonksiyon.
  * Tip güvenliğini artırmak için ServiceSetup objesini doğrudan döndürür.
  */
-declare function defineServiceSetup<Parent extends 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>(setup: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>): ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-type SlashCount<S extends string, Count extends any[] = []> = S extends `${infer _Prefix}/${infer Rest}` ? SlashCount<Rest, [any, ...Count]> : Count['length'];
-type Max4Slashes<S extends keyof Routers> = SlashCount<S> extends 0 | 1 | 2 | 3 ? S : never;
-type ServiceSetupsForMethods<Parent extends 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> = {
-    GET?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    POST?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    PUT?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    PATCH?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    DELETE?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    OPTIONS?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    HEAD?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    CONNECT?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-    TRACE?: ServiceSetup<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
-};
-declare function createService<Parent extends StandardSchemaV1, Path extends keyof Routers = keyof Routers, 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>(params: {
-    path: Max4Slashes<Path>;
-} & ServiceSetupsForMethods<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>): {
-    [K in Path]: ServiceSetupsForMethods<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+declare function defineServiceSetup<Parent extends StandardSchemaV1, Path extends keyof Routers, 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>(setup: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>): ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+type ServiceSetupsForMethods<Parent extends StandardSchemaV1 = StandardSchemaV1, Path extends keyof Routers = keyof Routers, 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> = {
+    GET?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    POST?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    PUT?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    PATCH?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    DELETE?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    OPTIONS?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    HEAD?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    CONNECT?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
+    TRACE?: ServiceSetup<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
 };
+declare function createService<Parent extends StandardSchemaV1 = StandardSchemaV1, Path extends keyof Routers = keyof Routers, 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>(params: ServiceSetupsForMethods<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>): ServiceSetupsForMethods<Parent, Path, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
 
 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 Routers>> = S | 'global';

package/dist/core/index.mjs

@@ -298,39 +298,39 @@ async function createSilgi(config) {
   if (!silgi.router) {
     silgi.router = createRouter();
   }
-  for (const [route, object] of Object.entries(silgi.services)) {
-    const routeParts = route.split("/").filter(Boolean);
+  for (const [method, object] of Object.entries(silgi.services)) {
+    if (!object) continue;
+    const path = String(object.path);
+    const routeParts = path.split("/").filter(Boolean);
     if (routeParts.length > 0) {
       const prefix = `/${routeParts[0]}`;
       if (!silgi.routerPrefixs.includes(prefix)) {
         silgi.routerPrefixs.push(prefix);
       }
     }
-    for (const [method, routeObject] of Object.entries(object)) {
-      let routeWithParams = route;
-      if (routeObject.pathParams) {
-        const jsonSchema = await toJsonSchema(routeObject.pathParams);
-        if (jsonSchema && jsonSchema.properties) {
-          const paramNames = Object.keys(jsonSchema.properties);
-          if (paramNames.length > 0) {
-            const routeParts2 = routeWithParams.split("/");
-            const lastParts = routeParts2.slice(-paramNames.length);
-            const alreadyHasParams = paramNames.every((name, idx) => lastParts[idx] === `:${name}`);
-            if (!alreadyHasParams) {
-              routeWithParams = routeWithParams.replace(/\/+$/, "");
-              for (const param of paramNames) {
-                routeWithParams += `/:${param}`;
-              }
+    let routeWithParams = path;
+    if (object.pathParams) {
+      const jsonSchema = await toJsonSchema(object.pathParams);
+      if (jsonSchema && jsonSchema.properties) {
+        const paramNames = Object.keys(jsonSchema.properties);
+        if (paramNames.length > 0) {
+          const routeParts2 = routeWithParams.split("/");
+          const lastParts = routeParts2.slice(-paramNames.length);
+          const alreadyHasParams = paramNames.every((name, idx) => lastParts[idx] === `:${name}`);
+          if (!alreadyHasParams) {
+            routeWithParams = routeWithParams.replace(/\/+$/, "");
+            for (const param of paramNames) {
+              routeWithParams += `/:${param}`;
             }
           }
         }
       }
-      addRoute(silgi.router, method, routeWithParams, {
-        method,
-        route: routeWithParams,
-        service: routeObject
-      });
     }
+    addRoute(silgi.router, object.apiType === "graphql" ? "" : method, routeWithParams, {
+      method: object.apiType === "graphql" ? "" : method,
+      route: routeWithParams,
+      service: object
+    });
   }
   if (!silgi._middlewareRouter) {
     silgi._middlewareRouter = createRouter();
@@ -353,14 +353,6 @@ async function createSilgi(config) {
       continue;
     }
     const methods = routeObject.methods?.length ? routeObject.methods : ["ALL"];
-    if (methods.includes("GRAPHQL")) {
-      addRoute(silgi._middlewareRouter, "GRAPHQL", _route, {
-        method: "GRAPHQL",
-        route: _route,
-        middleware: routeObject.setup
-      });
-      continue;
-    }
     for (const method of methods) {
       const globalMethod = method === "ALL" ? "" : method.toUpperCase();
       addRoute(silgi._middlewareRouter, globalMethod, _route, {
@@ -606,7 +598,7 @@ function getUrlPrefix(path, method) {
 
 async function orchestrate(route, event, _input) {
   const silgiCtx = useSilgi();
-  const isGraphQL = route.method === "GRAPHQL";
+  const isGraphQL = event.context.protocol === "GRAPHQL";
   const silgiURL = !isGraphQL ? getUrlPrefix(route.route || event.req.url, route.method) : {
     methodName: route.method || "GET",
     namespaceName: "graphql",
@@ -632,7 +624,7 @@ async function orchestrate(route, event, _input) {
     path: routerParams
   };
   try {
-    if (!route.service && route.method !== "GRAPHQL") {
+    if (!route.service && !isGraphQL) {
       throw createError({
         statusCode: 404,
         statusMessage: "Service not found"
@@ -675,7 +667,7 @@ async function orchestrate(route, event, _input) {
       // event
       event,
       // parent - graphql
-      {},
+      void 0,
       // info - graphql
       {}
     );
@@ -1017,6 +1009,8 @@ async function middleware(event, url) {
   return _chain;
 }
 async function handler(event, url, input) {
+  url ??= {};
+  url.method = event.context.protocol === "GRAPHQL" ? "" : url.method || event.req.method;
   const silgiCtx = useSilgi();
   const pathname = url?.path || event.url.pathname;
   let _chain = void 0;
@@ -1024,17 +1018,7 @@ async function handler(event, url, input) {
   const data = middleware(event, url);
   _chain = data;
   if (silgiCtx.router) {
-    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: {}
-        },
-        params: {}
-      };
-    }
+    let match = findRoute(silgiCtx.router, url.method, pathname);
     if (match) {
       if (_chain) {
         return _chain.then(async (_previous) => {
@@ -1105,18 +1089,7 @@ function defineServiceSetup(setup) {
   return setup;
 }
 function createService(params) {
-  const slashCount = (String(params.path).match(/\//g) || []).length;
-  if (slashCount > 4) {
-    throw new Error(
-      `Path '${params.path}' is invalid: maximum 4 '/' allowed (found ${slashCount})`
-    );
-  }
-  const { path, ...objects } = params;
-  return {
-    [path]: {
-      ...objects
-    }
-  };
+  return params;
 }
 
 function createMiddleware(params) {

package/dist/types/index.d.mts

@@ -227,6 +227,8 @@ interface ExtendShared {
 
 interface ServicesObject {
 }
+type SlashCount<S extends string, Count extends any[] = []> = S extends `${infer _Prefix}/${infer Rest}` ? SlashCount<Rest, [any, ...Count]> : Count['length'];
+type Max4Slashes<S extends keyof Routers> = SlashCount<S> extends 0 | 1 | 2 | 3 ? S : never;
 /**
  * Yardımcı tipler
  */
@@ -267,7 +269,9 @@ type ServiceHandler<Parent extends StandardSchemaV1, Input extends StandardSchem
 /**
  * Servis setup tipi
  */
-interface ServiceSetup<Parent extends 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> {
+interface ServiceSetup<Parent extends StandardSchemaV1 = StandardSchemaV1, Path extends keyof Routers = keyof Routers, 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: Max4Slashes<Path>;
+    apiType: 'rest' | 'graphql';
     handler?: ServiceHandler<Parent, Input, Output, PathParams, QueryParams, Resolved, HiddenParameters>;
     rules?: MergeRouteRules;
     modules?: Partial<SetupModuleOption>;
@@ -287,17 +291,15 @@ interface ServiceSetup<Parent extends StandardSchemaV1, Input extends StandardSc
  * Format: "routePath" => setup + methods + input + output + queryParams
  */
 interface ResolvedServiceDefinition {
-    [routePath: string]: {
-        GET?: ServiceSetup<any, any, any, any, any, any>;
-        POST?: ServiceSetup<any, any, any, any, any, any>;
-        PUT?: ServiceSetup<any, any, any, any, any, any>;
-        PATCH?: ServiceSetup<any, any, any, any, any, any>;
-        DELETE?: ServiceSetup<any, any, any, any, any, any>;
-        OPTIONS?: ServiceSetup<any, any, any, any, any, any>;
-        HEAD?: ServiceSetup<any, any, any, any, any, any>;
-        CONNECT?: ServiceSetup<any, any, any, any, any, any>;
-        TRACE?: ServiceSetup<any, any, any, any, any, any>;
-    };
+    GET?: ServiceSetup;
+    POST?: ServiceSetup;
+    PUT?: ServiceSetup;
+    PATCH?: ServiceSetup;
+    DELETE?: ServiceSetup;
+    OPTIONS?: ServiceSetup;
+    HEAD?: ServiceSetup;
+    CONNECT?: ServiceSetup;
+    TRACE?: ServiceSetup;
 }
 /**
  * SilgiURL tipi
@@ -696,13 +698,13 @@ interface ResolvedSchemaDefinition {
 }
 
 type StandardHTTPMethod = 'GET' | 'HEAD' | 'PATCH' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE';
-type HTTPMethod = StandardHTTPMethod | (keyof SilgiRuntimeMethods extends string ? keyof SilgiRuntimeMethods : never);
+type HTTPMethod = StandardHTTPMethod;
 interface MetaData extends Record<string, unknown> {
 }
 interface SilgiRoute {
     route?: string;
     method?: HTTPMethod;
-    service?: ResolvedServiceDefinition[string][keyof ResolvedServiceDefinition[string]];
+    service?: ResolvedServiceDefinition[keyof ResolvedServiceDefinition];
     middleware?: MiddlewareSetup;
 }
 interface Silgi {

package/package.json

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