@awsless/awsless 0.0.113 → 0.0.114

package/dist/bin.js

@@ -3399,6 +3399,8 @@ var graphqlPlugin = definePlugin({
       ).optional()
     }).array()
   }),
+  onTypeGen({ config: config2 }) {
+  },
   onApp(ctx) {
     const { config: config2, bootstrap: bootstrap2 } = ctx;
     const apis = /* @__PURE__ */ new Set();
@@ -4511,11 +4513,20 @@ var httpPlugin = definePlugin({
       }
       resources.addType(id, idType);
     }
-    types2.addCode(`type Query<F> = Parameters<F>[0]['request']['query']`);
-    types2.addCode(`type Body<F> = Parameters<F>[0]['request']['body']`);
-    types2.addCode(`type Response<F> = Awaited<ReturnType<F>>`);
-    types2.addCode(`type Route<F, P> = { param: P, query: Query<F>, body: Body<F>, response: Response<F> }`);
-    types2.addInterface("Http", resources);
+    const code = [
+      `import { InvokeResponse } from '@awsless/lambda'`,
+      `type Function = (...args: any) => any`,
+      `type Event<F extends Function> = Parameters<F>[0]`,
+      `type RequestWithQuery = { request: { queryStringParameters: any } }`,
+      `type RequestWithBody = { request: { body: any } }`,
+      `type ResponseWithBody = { statusCode: number, body: any }`,
+      `type Query<F extends Function> = Event<F> extends RequestWithQuery ? Event<F>['request']['queryStringParameters'] : never`,
+      `type Body<F extends Function> = Event<F> extends RequestWithBody ? Exclude<Event<F>['request']['body'], string> : never`,
+      `type Response<F extends Function> = Awaited<InvokeResponse<F>> extends ResponseWithBody ? Promise<Awaited<InvokeResponse<F>>['body']> : Promise<never>`,
+      `type Route<F extends Function, P> = { param: P; query: Query<F>; body: Body<F>; response: Response<F> }`
+    ];
+    code.map((code2) => types2.addCode(code2));
+    types2.addInterface("HTTP", resources);
     return types2.toString();
   },
   onApp({ config: config2, bootstrap: bootstrap2 }) {

package/dist/index.d.ts

@@ -11241,7 +11241,7 @@ interface SearchResources {
 }
 declare const Search: SearchResources;
 
-interface Http {
+interface HTTP {
 }
 type Method = 'GET' | 'POST';
 type Path = string;
@@ -11263,21 +11263,19 @@ type Props<R extends Route> = {
     query?: R['query'] extends Query ? R['query'] : never;
     body?: R['body'] extends Body ? R['body'] : never;
 };
-type HttpClientHandle = (props: {
+type HttpFetcher = (props: {
     method: Method;
     path: Path;
     headers: Headers;
     query?: Query;
     body?: Body;
 }) => unknown;
-declare const simpleHttpHandler: (host: string) => HttpClientHandle;
-declare class HttpClient<S extends Schema> {
-    private handle;
-    constructor(handle: HttpClientHandle);
-    fetch<M extends keyof S, P extends keyof S[M]>(method: M, routeKey: Extract<P, string>, props?: Props<GetRoute<S, M, P>>): Promise<GetRoute<S, M, P>["response"]>;
-    get<P extends keyof S['GET']>(routeKey: Extract<P, string>, props?: Props<GetRoute<S, 'GET', P>>): Promise<GetRoute<S, "GET", P>["response"]>;
-    post<P extends keyof S['POST']>(routeKey: Extract<P, string>, props?: Props<GetRoute<S, 'POST', P>>): Promise<GetRoute<S, "POST", P>["response"]>;
-}
+declare const createHttpFetcher: (host: string) => HttpFetcher;
+declare const createHttpClient: <S extends Partial<Record<Method, Routes>>>(fetcher: HttpFetcher) => {
+    fetch: <M extends keyof S, P extends keyof S[M]>(method: M, routeKey: Extract<P, string>, props?: Props<GetRoute<S, M, P>> | undefined) => Promise<GetRoute<S, M, P>["response"]>;
+    get<P_1 extends keyof S["GET"]>(routeKey: Extract<P_1, string>, props?: Props<GetRoute<S, "GET", P_1>> | undefined): Promise<GetRoute<S, "GET", P_1>["response"]>;
+    post<P_2 extends keyof S["POST"]>(routeKey: Extract<P_2, string>, props?: Props<GetRoute<S, "POST", P_2>> | undefined): Promise<GetRoute<S, "POST", P_2>["response"]>;
+};
 
 type FunctionProps<H extends Handler<S>, S extends BaseSchema> = {
     handle: H;
@@ -12139,4 +12137,4 @@ declare const defineStackConfig: (config: StackConfig) => StackConfig$1 | (Stack
 });
 declare const defineAppConfig: (config: AppConfig | AppConfigFactory<AppConfig>) => CombinedDefaultPluginsConfigInput | AppConfigFactory<CombinedDefaultPluginsConfigInput>;
 
-export { APP, AppConfig, Auth, AuthResources, Cache, CacheResources, Config, ConfigResources, CronProps, Fn, Function, FunctionMock, FunctionMockResponse, FunctionProps, FunctionResources, Http, HttpClient, HttpClientHandle, Plugin, Queue, QueueMock, QueueMockResponse, QueueProps, QueueResources, STACK, Search, SearchResources, StackConfig, Store, StoreResources, Table, TableResources, Topic, TopicMock, TopicMockResponse, TopicProps, TopicResources, cron, defineAppConfig, definePlugin, defineStackConfig, func, getAuthName, getAuthProps, getCacheProps, getConfigName, getFunctionName, getGlobalResourceName, getLocalResourceName, getQueueName, getSearchName, getStoreName, getTableName, getTopicName, mockFunction, mockQueue, mockTopic, queue, simpleHttpHandler, topic };
+export { APP, AppConfig, Auth, AuthResources, Cache, CacheResources, Config, ConfigResources, CronProps, Fn, Function, FunctionMock, FunctionMockResponse, FunctionProps, FunctionResources, HTTP, HttpFetcher, Plugin, Queue, QueueMock, QueueMockResponse, QueueProps, QueueResources, STACK, Search, SearchResources, StackConfig, Store, StoreResources, Table, TableResources, Topic, TopicMock, TopicMockResponse, TopicProps, TopicResources, createHttpClient, createHttpFetcher, cron, defineAppConfig, definePlugin, defineStackConfig, func, getAuthName, getAuthProps, getCacheProps, getConfigName, getFunctionName, getGlobalResourceName, getLocalResourceName, getQueueName, getSearchName, getStoreName, getTableName, getTopicName, mockFunction, mockQueue, mockTopic, queue, topic };

package/dist/index.js

@@ -251,7 +251,7 @@ var Search = /* @__PURE__ */ createProxy((stack) => {
 });
 
 // src/node/http.ts
-var simpleHttpHandler = (host) => {
+var createHttpFetcher = (host) => {
   return async ({ method, path, headers, body, query }) => {
     const url = new URL(host, path);
     if (query) {
@@ -269,28 +269,28 @@ var simpleHttpHandler = (host) => {
     return result;
   };
 };
-var HttpClient = class {
-  constructor(handle) {
-    this.handle = handle;
-  }
-  fetch(method, routeKey, props) {
+var createHttpClient = (fetcher) => {
+  const fetch2 = (method, routeKey, props) => {
     const path = routeKey.replaceAll(/{([a-z0-1-]+)}/, (key) => {
       return props?.params?.[key.substring(1, key.length - 1)].toString() ?? "";
     });
-    return this.handle({
+    return fetcher({
       headers: new Headers(props?.headers),
       query: props?.query,
       body: props?.body,
       method,
       path
     });
-  }
-  get(routeKey, props) {
-    return this.fetch("GET", routeKey, props);
-  }
-  post(routeKey, props) {
-    return this.fetch("POST", routeKey, props);
-  }
+  };
+  return {
+    fetch: fetch2,
+    get(routeKey, props) {
+      return fetch2("GET", routeKey, props);
+    },
+    post(routeKey, props) {
+      return fetch2("POST", routeKey, props);
+    }
+  };
 };
 
 // src/node/handle/function.ts
@@ -401,13 +401,14 @@ export {
   Config,
   Fn,
   Function,
-  HttpClient,
   Queue,
   STACK,
   Search,
   Store,
   Table,
   Topic,
+  createHttpClient,
+  createHttpFetcher,
   cron,
   defineAppConfig,
   definePlugin,
@@ -429,6 +430,5 @@ export {
   mockQueue,
   mockTopic,
   queue,
-  simpleHttpHandler,
   topic
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.113",
+  "version": "0.0.114",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -25,12 +25,12 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.14",
+    "@awsless/redis": "^0.0.8",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/redis": "^0.0.8",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.10",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/ssm": "^0.0.7"
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@aws-appsync/utils": "^1.5.0",