effortless-aws 0.34.0 → 0.36.0

package/dist/runtime/wrap-api.js

@@ -1,7 +1,7 @@
 import {
   AUTH_COOKIE_NAME,
   createHandlerRuntime
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-api.ts
 var CONTENT_TYPE_MAP = {
@@ -131,7 +131,7 @@ var wrapApi = (handler) => {
       }
       const { entry, params: routeParams } = routeMatch;
       const query = event.queryStringParameters ?? {};
-      const params = { ...event.pathParameters ?? {}, ...routeParams };
+      const params = { ...event.pathParameters, ...routeParams };
       const merged = {
         ...query,
         ...typeof body === "object" && body !== null ? body : {},
@@ -162,10 +162,26 @@ var wrapApi = (handler) => {
           return unauthorized();
         }
       }
+      let validatedInput = merged;
+      if (entry.schema && typeof entry.schema === "object" && "~standard" in entry.schema) {
+        const schema = entry.schema;
+        if (typeof schema["~standard"].validate === "function") {
+          const result = await schema["~standard"].validate(merged);
+          if (result.issues) {
+            const issues = result.issues.map((i) => {
+              const path2 = i.path?.map((p) => typeof p === "object" ? p.key : p).join(".");
+              return path2 ? `${path2}: ${i.message}` : i.message;
+            });
+            rt.logExecution(startTime, logInput, { status: 400 });
+            return { statusCode: 400, headers: { "Content-Type": "application/json" }, body: JSON.stringify({ error: "Validation failed", issues }) };
+          }
+          validatedInput = result.value;
+        }
+      }
       const { ctx, auth, ...rest } = sharedArgs;
       ctxProps = ctx && typeof ctx === "object" ? { ...ctx } : {};
       delete ctxProps.auth;
-      const args = { ...ctxProps, req, input: merged, ok, fail, ...rest };
+      const args = { ...ctxProps, req, input: validatedInput, ok, fail, ...rest };
       if (auth) args.auth = auth;
       if (streamCtx) args.stream = streamCtx.stream;
       try {

package/dist/runtime/wrap-bucket.js

@@ -3,7 +3,7 @@ import {
   createBucketClientWithEntities,
   createHandlerRuntime,
   toSeconds
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-bucket.ts
 var ENV_DEP_SELF = "EFF_DEP_SELF";

package/dist/runtime/wrap-cron.js

@@ -1,6 +1,6 @@
 import {
   createHandlerRuntime
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-cron.ts
 var wrapCron = (handler) => {

package/dist/runtime/wrap-fifo-queue.js

@@ -1,6 +1,6 @@
 import {
   createHandlerRuntime
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-fifo-queue.ts
 var parseMessages = (rawRecords, schema) => {

package/dist/runtime/wrap-mcp.js

@@ -1,6 +1,6 @@
 import {
   createHandlerRuntime
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-mcp.ts
 var ErrorCode = {
@@ -39,6 +39,39 @@ var jsonResponse = (body, status = 200) => ({
   body: JSON.stringify(body)
 });
 var RESOURCE_NOT_FOUND = -32002;
+var isStandardSchema = (input) => input != null && typeof input === "object" && "~standard" in input && typeof input["~standard"]?.jsonSchema?.input === "function";
+var validateInput = async (schema, rawArgs, toolName) => {
+  const validate = schema["~standard"].validate;
+  if (typeof validate !== "function") return rawArgs;
+  const result = await validate(rawArgs);
+  if (result.issues) {
+    const messages = result.issues.map((i) => {
+      const path = i.path?.map((p) => typeof p === "object" ? p.key : p).join(".");
+      return path ? `${path}: ${i.message}` : i.message;
+    });
+    throw new Error(`Validation failed for tool "${toolName}": ${messages.join("; ")}`);
+  }
+  return result.value;
+};
+var wrapResourceResult = (raw, uri) => {
+  if (raw == null) return [{ uri, text: "null" }];
+  if (Array.isArray(raw)) {
+    if (raw.length > 0 && typeof raw[0] === "object" && raw[0] !== null && "uri" in raw[0]) return raw;
+    return [{ uri, text: JSON.stringify(raw) }];
+  }
+  if (typeof raw === "object" && "uri" in raw && ("text" in raw || "blob" in raw)) {
+    return [raw];
+  }
+  const text = typeof raw === "string" ? raw : JSON.stringify(raw);
+  return [{ uri, text }];
+};
+var wrapToolResult = (raw) => {
+  if (raw != null && typeof raw === "object" && "content" in raw && Array.isArray(raw.content)) {
+    return raw;
+  }
+  const text = typeof raw === "string" ? raw : JSON.stringify(raw ?? null);
+  return { content: [{ type: "text", text }] };
+};
 var wrapMcp = (handler) => {
   const rt = createHandlerRuntime(handler, "mcp", handler.__spec.lambda?.logLevel ?? "info");
   const serverName = handler.__spec.name;
@@ -138,7 +171,7 @@ async function handleMethod(req, ctx, tools, resourceMap, prompts, serverName, s
           tools: Object.entries(tools).map(([name, def]) => ({
             name,
             description: def.description,
-            inputSchema: def.input
+            inputSchema: isStandardSchema(def.input) ? def.input["~standard"].jsonSchema.input({ target: "draft-07" }) : def.input
           }))
         }
       };
@@ -149,8 +182,10 @@ async function handleMethod(req, ctx, tools, resourceMap, prompts, serverName, s
       }
       const tool = tools[toolName];
       try {
-        const result = await tool.handler(req.params?.arguments ?? {}, ctx);
-        return { jsonrpc: "2.0", id: req.id, result };
+        const rawArgs = req.params?.arguments ?? {};
+        const input = isStandardSchema(tool.input) ? await validateInput(tool.input, rawArgs, toolName) : rawArgs;
+        const raw = await tool.handler(input, ctx);
+        return { jsonrpc: "2.0", id: req.id, result: wrapToolResult(raw) };
       } catch (error) {
         return {
           jsonrpc: "2.0",
@@ -188,28 +223,47 @@ async function handleMethod(req, ctx, tools, resourceMap, prompts, serverName, s
       }
       const staticDef = resourceMap[uri];
       if (staticDef && !isTemplate(uri)) {
-        const result = await staticDef.handler(ctx);
-        const contents = Array.isArray(result) ? result : [result];
-        return { jsonrpc: "2.0", id: req.id, result: { contents } };
+        const raw = await staticDef.handler(ctx);
+        return { jsonrpc: "2.0", id: req.id, result: { contents: wrapResourceResult(raw, uri) } };
       }
       for (const [template, def] of Object.entries(resourceMap)) {
         if (!isTemplate(template)) continue;
-        const params = matchTemplate(template, uri);
-        if (params) {
-          const result = await def.handler(params, ctx);
-          const contents = Array.isArray(result) ? result : [result];
-          return { jsonrpc: "2.0", id: req.id, result: { contents } };
+        const rawParams = matchTemplate(template, uri);
+        if (rawParams) {
+          const defAny = def;
+          const params = defAny.params && typeof defAny.params === "object" && "~standard" in defAny.params ? await validateInput(defAny.params, rawParams, `resource ${template}`) : rawParams;
+          const raw = await def.handler(params, ctx);
+          return { jsonrpc: "2.0", id: req.id, result: { contents: wrapResourceResult(raw, uri) } };
         }
       }
       return { jsonrpc: "2.0", id: req.id, error: { code: RESOURCE_NOT_FOUND, message: "Resource not found", data: { uri } } };
     }
     // ── Prompts ──
     case "prompts/list": {
-      const promptList = Object.entries(prompts).map(([name, def]) => ({
-        name,
-        ...def.description ? { description: def.description } : {},
-        ...def.arguments ? { arguments: def.arguments } : {}
-      }));
+      const promptList = Object.entries(prompts).map(([name, def]) => {
+        const defAny = def;
+        let args;
+        if (defAny.args && typeof defAny.args === "object" && "~standard" in defAny.args) {
+          const jsonSchema = defAny.args["~standard"].jsonSchema?.input?.({ target: "draft-07" });
+          if (jsonSchema?.properties) {
+            const required = new Set(jsonSchema.required ?? []);
+            args = Object.entries(jsonSchema.properties).map(([key, prop]) => ({
+              name: key,
+              ...prop.description ? { description: prop.description } : {},
+              ...required.has(key) ? { required: true } : {}
+            }));
+          }
+        } else if (Array.isArray(defAny.args)) {
+          args = defAny.args;
+        } else if (defAny.arguments) {
+          args = defAny.arguments;
+        }
+        return {
+          name,
+          ...def.description ? { description: def.description } : {},
+          ...args ? { arguments: args } : {}
+        };
+      });
       return { jsonrpc: "2.0", id: req.id, result: { prompts: promptList } };
     }
     case "prompts/get": {
@@ -218,9 +272,12 @@ async function handleMethod(req, ctx, tools, resourceMap, prompts, serverName, s
         return { jsonrpc: "2.0", id: req.id, error: { code: ErrorCode.InvalidParams, message: `Unknown prompt: ${promptName}` } };
       }
       const prompt = prompts[promptName];
-      const args = req.params?.arguments ?? {};
+      const rawArgs = req.params?.arguments ?? {};
       try {
-        const result = await prompt.handler(args, ctx);
+        const defAny = prompt;
+        const args = defAny.args && typeof defAny.args === "object" && "~standard" in defAny.args ? await validateInput(defAny.args, rawArgs, `prompt ${promptName}`) : rawArgs;
+        const raw = await prompt.handler(args, ctx);
+        const result = typeof raw === "string" ? { messages: [{ role: "user", content: { type: "text", text: raw } }] } : raw;
         return { jsonrpc: "2.0", id: req.id, result };
       } catch (error) {
         return { jsonrpc: "2.0", id: req.id, error: { code: ErrorCode.InternalError, message: error instanceof Error ? error.message : String(error) } };

package/dist/runtime/wrap-middleware.js

@@ -78,7 +78,7 @@ var wrapMiddlewareFn = (middleware) => {
   };
 };
 var wrapMiddleware = (handler) => {
-  const middleware = handler.__spec.middleware;
+  const middleware = handler.middleware;
   return wrapMiddlewareFn(middleware);
 };
 export {

package/dist/runtime/wrap-table-stream.js

@@ -1,7 +1,7 @@
 import {
   createHandlerRuntime,
   createTableClient
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-table-stream.ts
 import { unmarshall } from "@aws-sdk/util-dynamodb";

package/dist/runtime/wrap-worker.js

@@ -1,7 +1,7 @@
 import {
   buildDeps,
   buildParams
-} from "../chunk-6HFS224S.js";
+} from "../chunk-Q3ZDMZF3.js";
 
 // src/runtime/wrap-worker.ts
 import { SQS } from "@aws-sdk/client-sqs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effortless-aws",
-  "version": "0.34.0",
+  "version": "0.36.0",
   "license": "MIT",
   "type": "module",
   "description": "Code-first AWS Lambda framework. Export handlers, deploy with one command.",
@@ -49,6 +49,7 @@
     "typescript": "^5.9.3",
     "vite-tsconfig-paths": "^6.1.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
+    "@standard-schema/spec": "^1.1.0",
     "vitest": "^4.0.18"
   },
   "scripts": {