effortless-aws 0.34.0 → 0.36.0

package/dist/index.js

@@ -116,11 +116,32 @@ var defineApp = () => (options) => ({
 });
 
 // src/handlers/define-static-site.ts
-var isBucketRoute = (v) => v != null && typeof v === "object" && "bucket" in v && v.bucket != null && typeof v.bucket === "object" && v.bucket.__brand === "effortless-bucket";
-var defineStaticSite = () => (options) => ({
-  __brand: "effortless-static-site",
-  __spec: options
-});
+function defineStaticSite(options) {
+  const state = {
+    spec: { ...options },
+    routes: [],
+    middleware: void 0
+  };
+  const builder = {
+    route(pattern, origin, opts) {
+      state.routes.push({ pattern, origin, ...opts?.access ? { access: opts.access } : {} });
+      return builder;
+    },
+    middleware(fn) {
+      state.middleware = fn;
+      return builder;
+    },
+    build() {
+      return {
+        __brand: "effortless-static-site",
+        __spec: state.spec,
+        routes: state.routes,
+        ...state.middleware ? { middleware: state.middleware } : {}
+      };
+    }
+  };
+  return builder;
+}
 
 // src/handlers/define-fifo-queue.ts
 function defineFifoQueue(options) {
@@ -301,13 +322,14 @@ function defineApi(options) {
     },
     routes: []
   };
-  const addRoute = (method, path, handler, opts) => {
-    const routeCache = opts?.cache != null ? resolveCache(opts.cache) : void 0;
+  const addRoute = (method, def, handler) => {
+    const routeCache = def.cache != null ? resolveCache(def.cache) : void 0;
     state.routes.push({
       method,
-      path,
+      path: def.path,
       onRequest: handler,
-      ...opts?.public ? { public: true } : {},
+      ...def.input ? { schema: def.input } : {},
+      ...def.public ? { public: true } : {},
       ...routeCache ? { cache: routeCache } : {}
     });
   };
@@ -324,13 +346,14 @@ function defineApi(options) {
       ...state.onError ? { onError: state.onError } : {},
       ...state.onCleanup ? { onCleanup: state.onCleanup } : {},
       ...state.setup ? { setup: state.setup } : {},
+      ...state.authFn ? { authFn: state.authFn } : {},
       ...state.deps ? { deps: state.deps } : {},
       ...state.config ? { config: state.config } : {},
       ...state.static ? { static: state.static } : {}
     };
     for (const m of ["get", "post", "put", "patch", "delete"]) {
-      handler[m] = (path, fn, opts) => {
-        addRoute(m.toUpperCase(), path, fn, opts);
+      handler[m] = (def, fn) => {
+        addRoute(m.toUpperCase(), def, fn);
         handler.routes = state.routes;
         return handler;
       };
@@ -350,6 +373,10 @@ function defineApi(options) {
       state.static = [...state.static ?? [], glob];
       return builder;
     },
+    auth(fn) {
+      state.authFn = fn;
+      return builder;
+    },
     setup(fnOrLambda, maybeLambda) {
       if (typeof fnOrLambda === "function") {
         state.setup = fnOrLambda;
@@ -367,24 +394,24 @@ function defineApi(options) {
       state.onCleanup = fn;
       return builder;
     },
-    get(path, handler, opts) {
-      addRoute("GET", path, handler, opts);
+    get(def, fn) {
+      addRoute("GET", def, fn);
       return finalize();
     },
-    post(path, handler, opts) {
-      addRoute("POST", path, handler, opts);
+    post(def, fn) {
+      addRoute("POST", def, fn);
       return finalize();
     },
-    put(path, handler, opts) {
-      addRoute("PUT", path, handler, opts);
+    put(def, fn) {
+      addRoute("PUT", def, fn);
       return finalize();
     },
-    patch(path, handler, opts) {
-      addRoute("PATCH", path, handler, opts);
+    patch(def, fn) {
+      addRoute("PATCH", def, fn);
       return finalize();
     },
-    delete(path, handler, opts) {
-      addRoute("DELETE", path, handler, opts);
+    delete(def, fn) {
+      addRoute("DELETE", def, fn);
       return finalize();
     }
   };
@@ -522,25 +549,55 @@ function defineMcp(options) {
     ...options.version ? { version: options.version } : {},
     ...options.instructions ? { instructions: options.instructions } : {}
   };
-  const state = { spec };
+  const state = { spec, toolEntries: [], resourceEntries: [], promptEntries: [] };
   const applyLambdaOptions = (lambda) => {
     if (Object.keys(lambda).length > 0) {
       state.spec = { ...state.spec, lambda: { ...state.spec.lambda, ...lambda } };
     }
   };
-  const finalize = () => ({
-    __brand: "effortless-mcp",
-    __spec: state.spec,
-    ...state.onError ? { onError: state.onError } : {},
-    ...state.onCleanup ? { onCleanup: state.onCleanup } : {},
-    ...state.setup ? { setup: state.setup } : {},
-    ...state.deps ? { deps: state.deps } : {},
-    ...state.config ? { config: state.config } : {},
-    ...state.static ? { static: state.static } : {},
-    ...state.resources ? { resources: state.resources } : {},
-    ...state.prompts ? { prompts: state.prompts } : {},
-    ...state.tools ? { tools: state.tools } : {}
-  });
+  const buildToolsFactory = () => state.toolEntries.length > 0 ? () => Object.fromEntries(state.toolEntries) : void 0;
+  const buildResourcesFactory = () => state.resourceEntries.length > 0 ? () => Object.fromEntries(state.resourceEntries) : void 0;
+  const buildPromptsFactory = () => state.promptEntries.length > 0 ? () => Object.fromEntries(state.promptEntries) : void 0;
+  const finalize = () => {
+    const tools = buildToolsFactory();
+    const resources = buildResourcesFactory();
+    const prompts = buildPromptsFactory();
+    return {
+      __brand: "effortless-mcp",
+      __spec: state.spec,
+      ...state.onError ? { onError: state.onError } : {},
+      ...state.onCleanup ? { onCleanup: state.onCleanup } : {},
+      ...state.setup ? { setup: state.setup } : {},
+      ...state.authFn ? { authFn: state.authFn } : {},
+      ...state.deps ? { deps: state.deps } : {},
+      ...state.config ? { config: state.config } : {},
+      ...state.static ? { static: state.static } : {},
+      ...resources ? { resources } : {},
+      ...prompts ? { prompts } : {},
+      ...tools ? { tools } : {}
+    };
+  };
+  const finalizeWithEntries = () => {
+    const handler = finalize();
+    handler.tool = (def, fn) => {
+      state.toolEntries.push([def.name, { description: def.description, input: def.input, handler: fn }]);
+      handler.tools = buildToolsFactory();
+      return handler;
+    };
+    handler.resource = (def, fn) => {
+      const entry = { name: def.name, ...def.description ? { description: def.description } : {}, ...def.mimeType ? { mimeType: def.mimeType } : {}, handler: fn, ...def.params ? { params: def.params } : {} };
+      state.resourceEntries.push([def.uri, entry]);
+      handler.resources = buildResourcesFactory();
+      return handler;
+    };
+    handler.prompt = (def, fn) => {
+      const entry = { ...def.description ? { description: def.description } : {}, args: def.args, handler: fn };
+      state.promptEntries.push([def.name, entry]);
+      handler.prompts = buildPromptsFactory();
+      return handler;
+    };
+    return handler;
+  };
   const builder = {
     deps(fn) {
       state.deps = fn;
@@ -554,6 +611,10 @@ function defineMcp(options) {
       state.static = [...state.static ?? [], glob];
       return builder;
     },
+    auth(fn) {
+      state.authFn = fn;
+      return builder;
+    },
     setup(fnOrLambda, maybeLambda) {
       if (typeof fnOrLambda === "function") {
         state.setup = fnOrLambda;
@@ -571,16 +632,21 @@ function defineMcp(options) {
       state.onCleanup = fn;
       return builder;
     },
-    resources(fn) {
-      state.resources = fn;
-      return builder;
+    tool(def, fn) {
+      state.toolEntries.push([def.name, { description: def.description, input: def.input, handler: fn }]);
+      return finalizeWithEntries();
     },
-    prompts(fn) {
-      state.prompts = fn;
-      return builder;
+    resource(def, fn) {
+      const entry = { name: def.name, ...def.description ? { description: def.description } : {}, ...def.mimeType ? { mimeType: def.mimeType } : {}, handler: fn, ...def.params ? { params: def.params } : {} };
+      state.resourceEntries.push([def.uri, entry]);
+      return finalizeWithEntries();
     },
-    tools(fn) {
-      state.tools = fn;
+    prompt(def, fn) {
+      const entry = { ...def.description ? { description: def.description } : {}, args: def.args, handler: fn };
+      state.promptEntries.push([def.name, entry]);
+      return finalizeWithEntries();
+    },
+    build() {
       return finalize();
     }
   };
@@ -602,7 +668,6 @@ export {
   generateBase64,
   generateHex,
   generateUuid,
-  isBucketRoute,
   param,
   secret,
   toSeconds