silgi 0.41.28 → 0.41.30

package/dist/cli/index.mjs

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

package/dist/core/index.d.mts

@@ -1,4 +1,5 @@
 import { SilgiConfig, Silgi, SilgiEvent, HTTPMethod, SilgiSchema, RouteEntry, CustomRequestInit, SilgiRuntimeContext, BaseMethodSchema, MergeAll, ServiceSetupsForMethods, ServiceDefinitionByMethodAndPath, Routers, ServiceSetup, MiddlewareSetup, SilgiRuntimeShareds, Resolvers, SilgiURL, StorageConfig, SilgiCLI, SilgiStorageBase, SilgiRuntimeConfig } from 'silgi/types';
+import { GraphQLResolveInfo } from 'graphql';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Storage, StorageValue } from 'unstorage';
 import { UseContext } from 'unctx';
@@ -26,7 +27,7 @@ declare function middleware(event: SilgiEvent, url?: {
 declare function handler(event: SilgiEvent, url?: {
     path?: string;
     method?: HTTPMethod | '';
-}, input?: any): Promise<any>;
+}, input?: any, parent?: any, info?: GraphQLResolveInfo): Promise<any>;
 
 /**
  * LICENSE: MIT

package/dist/core/index.mjs

@@ -312,9 +312,20 @@ async function createSilgi(config) {
       }
     }
     let routeWithParams = path;
+    let pathParamNames = {};
+    let queryParamNames = {};
     if (object.pathParams) {
       const jsonSchema = await toJsonSchema(object.pathParams);
       if (jsonSchema && jsonSchema.properties) {
+        pathParamNames = Object.keys(jsonSchema.properties).reduce((acc, key) => {
+          const prop = jsonSchema.properties?.[key];
+          if (typeof prop === "object" && prop !== null && "type" in prop) {
+            acc[key] = prop.type ?? "string";
+          } else {
+            acc[key] = "string";
+          }
+          return acc;
+        }, {});
         const paramNames = Object.keys(jsonSchema.properties);
         if (paramNames.length > 0) {
           const routeParts2 = routeWithParams.split("/");
@@ -329,22 +340,42 @@ async function createSilgi(config) {
         }
       }
     }
+    if (object.queryParams) {
+      const jsonSchema = await toJsonSchema(object.queryParams);
+      if (jsonSchema && jsonSchema.properties) {
+        queryParamNames = Object.keys(jsonSchema.properties).reduce((acc, key) => {
+          const prop = jsonSchema.properties?.[key];
+          if (typeof prop === "object" && prop !== null && "type" in prop) {
+            acc[key] = prop.type ?? "string";
+          } else {
+            acc[key] = "string";
+          }
+          return acc;
+        }, {});
+      }
+    }
     if (object.apiType === "rest-graphql") {
       addRoute(silgi.router, "", routeWithParams, {
         method: "",
         route: routeWithParams,
-        service: object
+        service: object,
+        queryParams: queryParamNames,
+        pathParams: pathParamNames
       });
       addRoute(silgi.router, method, routeWithParams, {
         method,
         route: routeWithParams,
-        service: object
+        service: object,
+        queryParams: queryParamNames,
+        pathParams: pathParamNames
       });
     } else {
       addRoute(silgi.router, method, routeWithParams, {
         method,
         route: routeWithParams,
-        service: object
+        service: object,
+        queryParams: queryParamNames,
+        pathParams: pathParamNames
       });
     }
   }
@@ -612,7 +643,7 @@ function getUrlPrefix(path, method) {
   };
 }
 
-async function orchestrate(route, event, _input) {
+async function orchestrate(route, event, _input, parent, info) {
   const silgiCtx = useSilgi();
   const isGraphQL = event.context.protocol === "GRAPHQL";
   const silgiURL = !isGraphQL ? getUrlPrefix(route.route || event.req.url, route.method) : {
@@ -1024,7 +1055,7 @@ async function middleware(event, url) {
   }
   return _chain;
 }
-async function handler(event, url, input) {
+async function handler(event, url, input, parent, info) {
   url ??= {};
   url.method = event.context.protocol === "GRAPHQL" ? "" : url.method || event.req.method;
   const silgiCtx = useSilgi();
@@ -1036,6 +1067,36 @@ async function handler(event, url, input) {
   if (silgiCtx.router) {
     const match = findRoute(silgiCtx.router, url.method, pathname);
     if (match) {
+      if (url.method === "" && input) {
+        if (input?.path) {
+          const expectedPathKeys = Object.keys(match.data.pathParams ?? {});
+          const inputPathKeys = Object.keys(input.path);
+          for (const key of inputPathKeys) {
+            if (!expectedPathKeys.includes(key)) {
+              throw createError({
+                message: `Unexpected path param key: ${key}`,
+                statusCode: 400,
+                statusMessage: "Invalid path parameter"
+              });
+            }
+          }
+          match.data.pathParams = input.path;
+        }
+        if (input?.query) {
+          const expectedQueryKeys = Object.keys(match.data.queryParams ?? {});
+          const inputQueryKeys = Object.keys(input.query);
+          for (const key of inputQueryKeys) {
+            if (!expectedQueryKeys.includes(key)) {
+              throw createError({
+                message: `Unexpected query param key: ${key}`,
+                statusCode: 400,
+                statusMessage: "Invalid query parameter"
+              });
+            }
+          }
+          match.data.queryParams = input.query;
+        }
+      }
       if (_chain) {
         return _chain.then(async (_previous) => {
           if (_previous !== void 0 && _previous !== kNotFound) {

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 export { SilgiError, 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 'graphql';
 import '@standard-schema/spec';
 import 'unstorage';
 import 'unctx';

package/dist/types/index.d.mts

@@ -709,6 +709,8 @@ interface SilgiRoute {
     method?: HTTPMethod;
     service?: ResolvedServiceDefinition[keyof ResolvedServiceDefinition];
     middleware?: MiddlewareSetup;
+    queryParams?: Record<string, string>;
+    pathParams?: Record<string, string>;
 }
 interface Silgi {
     router: RouterContext<SilgiRoute>;

package/package.json

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