@awsless/awsless 0.0.111 → 0.0.113

package/dist/bin.js

@@ -1423,18 +1423,18 @@ var TypeObject = class {
     this.readonly = readonly;
   }
   types = /* @__PURE__ */ new Map();
-  addType(name, type) {
+  add(name, type) {
     const value = type.toString();
     if (value) {
-      this.types.set(camelCase(name), value);
+      this.types.set(name, value);
     }
     return this;
   }
+  addType(name, type) {
+    return this.add(camelCase(name), type);
+  }
   addConst(name, type) {
-    if (type) {
-      this.types.set(constantCase3(name), type);
-    }
-    return this;
+    return this.add(constantCase3(name), type);
   }
   toString() {
     if (!this.types.size) {
@@ -4417,8 +4417,10 @@ var ElbEventSource = class extends Group {
 };
 
 // src/plugins/http.ts
+import { relative as relative4 } from "path";
+import { camelCase as camelCase4 } from "change-case";
 var RouteSchema = z18.custom((route) => {
-  return z18.string().regex(/^(POST|GET|PUT|DELETE|HEAD|OPTIONS)(\s\/[a-z0-9\+\_\-\/]*)$/ig).safeParse(route).success;
+  return z18.string().regex(/^(POST|GET|PUT|DELETE|HEAD|OPTIONS)(\s\/[a-z0-9\+\_\-\/\{\}]*)$/gi).safeParse(route).success;
 }, "Invalid route");
 var parseRoute = (route) => {
   const [method, ...paths] = route.split(" ");
@@ -4471,12 +4473,51 @@ var httpPlugin = definePlugin({
        *   }
        * }
        */
-      http: z18.record(
-        ResourceIdSchema,
-        z18.record(RouteSchema, FunctionSchema)
-      ).optional()
+      http: z18.record(ResourceIdSchema, z18.record(RouteSchema, FunctionSchema)).optional()
     }).array()
   }),
+  onTypeGen({ config: config2 }) {
+    const types2 = new TypeGen("@awsless/awsless");
+    const resources = new TypeObject(1);
+    const api = {};
+    for (const stack of config2.stacks) {
+      for (const [id, routes] of Object.entries(stack.http || {})) {
+        if (!(id in api))
+          api[id] = {};
+        for (const [route, props] of Object.entries(routes)) {
+          const { path, method } = parseRoute(route);
+          const file = typeof props === "string" ? props : props.file;
+          if (!(method in api[id]))
+            api[id][method] = {};
+          api[id][method][path] = file;
+        }
+      }
+    }
+    for (const [id, routes] of Object.entries(api)) {
+      const idType = new TypeObject(2);
+      for (const [method, paths] of Object.entries(routes)) {
+        const methodType = new TypeObject(3);
+        for (const [path, file] of Object.entries(paths)) {
+          const paramType = new TypeObject(4);
+          for (const param of path.matchAll(/{([a-z0-9]+)}/g)) {
+            paramType.addType(param[0], "string | number");
+          }
+          const varName = camelCase4(`${id}-${path}-${method}`);
+          const relFile = relative4(directories.types, file);
+          types2.addImport(varName, relFile);
+          methodType.add(`'${path}'`, `Route<typeof ${varName}, ${paramType.toString() || "never"}>`);
+        }
+        idType.addConst(method, methodType);
+      }
+      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);
+    return types2.toString();
+  },
   onApp({ config: config2, bootstrap: bootstrap2 }) {
     if (Object.keys(config2.defaults?.http || {}).length === 0) {
       return;
@@ -4494,18 +4535,13 @@ var httpPlugin = definePlugin({
         name: `${config2.name}-${id}`,
         type: "application",
         securityGroups: [securityGroup.id],
-        subnets: [
-          bootstrap2.get("public-subnet-1"),
-          bootstrap2.get("public-subnet-2")
-        ]
+        subnets: [bootstrap2.get("public-subnet-1"), bootstrap2.get("public-subnet-2")]
       }).dependsOn(securityGroup);
       const listener = new Listener(id, {
         loadBalancerArn: loadBalancer.arn,
         port: 443,
         protocol: "https",
-        certificates: [
-          bootstrap2.get(`certificate-${props.domain}-arn`)
-        ],
+        certificates: [bootstrap2.get(`certificate-${props.domain}-arn`)],
         defaultActions: [
           ListenerAction.fixedResponse(404, {
             contentType: "application/json",
@@ -5356,7 +5392,7 @@ var LocalDirectorySchema = z24.string().refine(async (path) => {
 }, `Directory doesn't exist`);
 
 // src/formation/resource/cloud-front/origin-request-policy.ts
-import { camelCase as camelCase4 } from "change-case";
+import { camelCase as camelCase5 } from "change-case";
 var OriginRequestPolicy = class extends Resource {
   constructor(logicalId, props = {}) {
     super("AWS::CloudFront::OriginRequestPolicy", logicalId);
@@ -5372,15 +5408,15 @@ var OriginRequestPolicy = class extends Resource {
       OriginRequestPolicyConfig: {
         Name: this.name,
         CookiesConfig: {
-          CookieBehavior: camelCase4(this.props.cookie?.behavior ?? "all"),
+          CookieBehavior: camelCase5(this.props.cookie?.behavior ?? "all"),
           ...this.attr("Cookies", this.props.cookie?.values)
         },
         HeadersConfig: {
-          HeaderBehavior: camelCase4(this.props.header?.behavior ?? "allViewer"),
+          HeaderBehavior: camelCase5(this.props.header?.behavior ?? "allViewer"),
           ...this.attr("Headers", this.props.header?.values)
         },
         QueryStringsConfig: {
-          QueryStringBehavior: camelCase4(this.props.query?.behavior ?? "all"),
+          QueryStringBehavior: camelCase5(this.props.query?.behavior ?? "all"),
           ...this.attr("QueryStrings", this.props.query?.values)
         }
       }
@@ -8310,7 +8346,7 @@ import commonjs3 from "@rollup/plugin-commonjs";
 import nodeResolve3 from "@rollup/plugin-node-resolve";
 import { swc as swc4 } from "rollup-plugin-swc3";
 import { getSuites, getTests } from "@vitest/runner/utils";
-import { basename as basename3, dirname as dirname6, extname as extname2, join as join11, relative as relative4 } from "path";
+import { basename as basename3, dirname as dirname6, extname as extname2, join as join11, relative as relative5 } from "path";
 
 // src/cli/ui/layout/text-box.ts
 import wrapAnsi3 from "wrap-ansi";
@@ -8391,16 +8427,19 @@ var CustomReporter = class {
     return [task];
   }
 };
-var singleTester = (stack, dir) => {
+var singleTester = (stack, dir, filters) => {
   const formatFileName = (path) => {
     if (!path) {
       return "";
     }
-    path = join11(process.cwd(), path);
-    path = relative4(dir, path);
-    const ext = extname2(path);
-    const name = basename3(path, ext);
-    const base = dirname6(path);
+    const abs = join11(process.cwd(), path);
+    const rel = relative5(dir, abs);
+    const ext = extname2(rel);
+    if (!ext) {
+      return path;
+    }
+    const name = basename3(rel, ext);
+    const base = dirname6(rel);
     const start = base === "." ? "" : style.placeholder(base + "/");
     return `${start}${name}${style.placeholder(ext)}`;
   };
@@ -8550,7 +8589,7 @@ var singleTester = (stack, dir) => {
     });
     const result = await startVitest(
       "test",
-      [],
+      filters,
       {
         // name: config.name,
         watch: false,
@@ -8587,11 +8626,11 @@ var singleTester = (stack, dir) => {
     return result?.state.getCountOfFailedTests() === 0;
   };
 };
-var runTester = (tests) => {
+var runTester = (tests, filters = []) => {
   return async (term) => {
     for (const [name, paths] of tests.entries()) {
       for (const path of paths) {
-        const result = await term.out.write(singleTester(name, path));
+        const result = await term.out.write(singleTester(name, path, filters));
         if (!result) {
           return false;
         }
@@ -8808,14 +8847,14 @@ var config = (program2) => {
 
 // src/cli/command/test.ts
 var test = (program2) => {
-  program2.command("test").argument("[stacks...]", "Optionally filter stacks to test").description("Test your app").action(async (filters) => {
+  program2.command("test").argument("[stacks...]", "Optionally filter stacks to test").option("-f --filters <string...>", "Optionally filter test files").description("Test your app").action(async (stacks, options) => {
     await layout(async (config2, write) => {
-      const { tests } = await toApp(config2, filters);
+      const { tests } = await toApp(config2, stacks);
       if (tests.size === 0) {
         write(dialog("warning", ["No tests found"]));
         return;
       }
-      await write(runTester(tests));
+      await write(runTester(tests, options?.filters));
     });
   });
 };

package/dist/index.d.ts

@@ -11241,6 +11241,44 @@ interface SearchResources {
 }
 declare const Search: SearchResources;
 
+interface Http {
+}
+type Method = 'GET' | 'POST';
+type Path = string;
+type Params = Record<string, string | number>;
+type Query = Record<string, string>;
+type Body = unknown;
+type Route = {
+    param?: Params;
+    query?: Query;
+    body?: Body;
+    response: unknown;
+};
+type Routes = Record<Path, Route>;
+type Schema = Partial<Record<Method, Routes>>;
+type GetRoute<S extends Schema, M extends keyof S, P extends keyof S[M]> = S[M] extends Routes ? S[M][P] : never;
+type Props<R extends Route> = {
+    headers?: Record<string, string>;
+    params?: R['param'] extends Params ? R['param'] : never;
+    query?: R['query'] extends Query ? R['query'] : never;
+    body?: R['body'] extends Body ? R['body'] : never;
+};
+type HttpClientHandle = (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"]>;
+}
+
 type FunctionProps<H extends Handler<S>, S extends BaseSchema> = {
     handle: H;
     schema?: S;
@@ -12101,4 +12139,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, 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, topic };
+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 };

package/dist/index.js

@@ -250,6 +250,49 @@ var Search = /* @__PURE__ */ createProxy((stack) => {
   });
 });
 
+// src/node/http.ts
+var simpleHttpHandler = (host) => {
+  return async ({ method, path, headers, body, query }) => {
+    const url = new URL(host, path);
+    if (query) {
+      for (const [key, value] of Object.entries(query)) {
+        url.searchParams.set(key, value);
+      }
+    }
+    headers.set("content-type", "application/json");
+    const response = await fetch(url, {
+      method,
+      headers,
+      body: body ? JSON.stringify(body) : void 0
+    });
+    const result = await response.json();
+    return result;
+  };
+};
+var HttpClient = class {
+  constructor(handle) {
+    this.handle = handle;
+  }
+  fetch(method, routeKey, props) {
+    const path = routeKey.replaceAll(/{([a-z0-1-]+)}/, (key) => {
+      return props?.params?.[key.substring(1, key.length - 1)].toString() ?? "";
+    });
+    return this.handle({
+      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);
+  }
+};
+
 // src/node/handle/function.ts
 import { lambda } from "@awsless/lambda";
 var func = (props) => {
@@ -358,6 +401,7 @@ export {
   Config,
   Fn,
   Function,
+  HttpClient,
   Queue,
   STACK,
   Search,
@@ -385,5 +429,6 @@ export {
   mockQueue,
   mockTopic,
   queue,
+  simpleHttpHandler,
   topic
 };

package/package.json

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