@awsless/awsless 0.0.13 → 0.0.14

package/dist/bin.js

@@ -150,6 +150,10 @@ var toStack = ({ config, assets, app, stackConfig, plugins }) => {
   const stackName = `${config.name}-${stackConfig.name}`;
   const stack = new Stack(app, stackConfig.name, {
     stackName,
+    env: {
+      account: config.account,
+      region: config.region
+    },
     tags: {
       APP: config.name,
       STAGE: config.stage,
@@ -259,6 +263,9 @@ var toId = (resource, id) => {
 var toName = (stack, id) => {
   return paramCase(`${stack.stackName}-${id}`);
 };
+var toExportName = (name) => {
+  return paramCase(name);
+};
 var toEnvKey = (resource, id) => {
   return `RESOURCE_${resource.toUpperCase()}_${id}`;
 };
@@ -361,7 +368,7 @@ var SizeSchema = z7.custom((value) => {
 
 // src/plugins/function/util/build.ts
 import JSZip from "jszip";
-import { basename, join as join2 } from "path";
+import { dirname, join as join2 } from "path";
 import { mkdir, writeFile } from "fs/promises";
 import { filesize } from "filesize";
 var zipFiles = (files) => {
@@ -392,7 +399,7 @@ var writeBuildFiles = async (config, stack, id, files) => {
   await writeFile(bundleFile, bundle);
   await Promise.all(files.map(async (file) => {
     const fileName = join2(filesPath, file.name);
-    await mkdir(basename(fileName), { recursive: true });
+    await mkdir(dirname(fileName), { recursive: true });
     await writeFile(fileName, file.code);
     if (file.map) {
       const mapName = join2(filesPath, `${file.name}.map`);
@@ -420,7 +427,7 @@ var assetBucketUrl = (config, stackName) => {
   const bucket = assetBucketName(config);
   return `https://s3-${config.region}.amazonaws.com/${bucket}/${stackName}/cloudformation.json`;
 };
-var version = "2";
+var version = "1";
 var bootstrapStack = (config, app) => {
   const stack = new Stack2(app, "bootstrap", {
     stackName: `awsless-bootstrap`
@@ -895,35 +902,8 @@ var topicPlugin = definePlugin({
   }
 });
 
-// src/plugins/search.ts
-import { z as z19 } from "zod";
-import { CfnCollection } from "aws-cdk-lib/aws-opensearchserverless";
-import { PolicyStatement as PolicyStatement2 } from "aws-cdk-lib/aws-iam";
-var searchPlugin = definePlugin({
-  name: "search",
-  schema: z19.object({
-    stacks: z19.object({
-      searchs: z19.array(ResourceIdSchema).optional()
-    }).array()
-  }),
-  onStack({ stack, stackConfig, bind }) {
-    (stackConfig.searchs || []).forEach((id) => {
-      const collection = new CfnCollection(stack, toId("search", id), {
-        name: toName(stack, id),
-        type: "SEARCH"
-      });
-      bind((lambda) => {
-        lambda.addToRolePolicy(new PolicyStatement2({
-          actions: ["aoss:APIAccessAll"],
-          resources: [collection.attrArn]
-        }));
-      });
-    });
-  }
-});
-
 // src/plugins/graphql/index.ts
-import { z as z21 } from "zod";
+import { z as z20 } from "zod";
 import { AuthorizationType, CfnGraphQLApi, CfnGraphQLSchema, GraphqlApi, MappingTemplate } from "aws-cdk-lib/aws-appsync";
 import { mergeTypeDefs } from "@graphql-tools/merge";
 import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
@@ -937,40 +917,40 @@ var toArray = (value) => {
 };
 
 // src/plugins/graphql/index.ts
-import { dirname, join as join4 } from "path";
+import { dirname as dirname2, join as join4 } from "path";
 import { print } from "graphql";
 import { paramCase as paramCase2 } from "change-case";
 
 // src/plugins/graphql/schema/resolver-field.ts
-import { z as z20 } from "zod";
-var ResolverFieldSchema = z20.custom((value) => {
-  return z20.string().regex(/([a-z0-9\_]+)(\s){1}([a-z0-9\_]+)/gi).safeParse(value).success;
+import { z as z19 } from "zod";
+var ResolverFieldSchema = z19.custom((value) => {
+  return z19.string().regex(/([a-z0-9\_]+)(\s){1}([a-z0-9\_]+)/gi).safeParse(value).success;
 }, `Invalid resolver field. Valid example: "Query list"`);
 
 // src/plugins/graphql/index.ts
 import { CfnOutput as CfnOutput2, Fn } from "aws-cdk-lib";
 var graphqlPlugin = definePlugin({
   name: "graphql",
-  schema: z21.object({
-    defaults: z21.object({
-      graphql: z21.record(ResourceIdSchema, z21.object({
-        authorization: z21.object({
+  schema: z20.object({
+    defaults: z20.object({
+      graphql: z20.record(ResourceIdSchema, z20.object({
+        authorization: z20.object({
           authorizer: FunctionSchema,
           ttl: DurationSchema.default("1 hour")
         }).optional(),
-        mappingTemplate: z21.object({
+        mappingTemplate: z20.object({
           request: LocalFileSchema.optional(),
           response: LocalFileSchema.optional()
         }).optional()
       })).optional()
     }).default({}),
-    stacks: z21.object({
-      graphql: z21.record(ResourceIdSchema, z21.object({
-        schema: z21.union([
+    stacks: z20.object({
+      graphql: z20.record(ResourceIdSchema, z20.object({
+        schema: z20.union([
           LocalFileSchema,
-          z21.array(LocalFileSchema).min(1)
+          z20.array(LocalFileSchema).min(1)
         ]).optional(),
-        resolvers: z21.record(ResolverFieldSchema, FunctionSchema).optional()
+        resolvers: z20.record(ResolverFieldSchema, FunctionSchema).optional()
       })).optional()
     }).array()
   }),
@@ -1018,7 +998,7 @@ var graphqlPlugin = definePlugin({
             }));
           }));
           const schema2 = print(mergeTypeDefs(schemas));
-          await mkdir2(dirname(file), { recursive: true });
+          await mkdir2(dirname2(file), { recursive: true });
           await writeFile2(file, schema2);
           new CfnGraphQLSchema(stack, toId("schema", id), {
             apiId: api.attrApiId,
@@ -1055,16 +1035,17 @@ var graphqlPlugin = definePlugin({
 });
 
 // src/plugins/pubsub.ts
-import { z as z22 } from "zod";
+import { z as z21 } from "zod";
 import { CfnTopicRule } from "aws-cdk-lib/aws-iot";
-import { PolicyStatement as PolicyStatement3 } from "aws-cdk-lib/aws-iam";
+import { PolicyStatement as PolicyStatement2 } from "aws-cdk-lib/aws-iam";
+import { snakeCase } from "change-case";
 var pubsubPlugin = definePlugin({
   name: "pubsub",
-  schema: z22.object({
-    stacks: z22.object({
-      pubsub: z22.record(ResourceIdSchema, z22.object({
-        sql: z22.string(),
-        sqlVersion: z22.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23"),
+  schema: z21.object({
+    stacks: z21.object({
+      pubsub: z21.record(ResourceIdSchema, z21.object({
+        sql: z21.string(),
+        sqlVersion: z21.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23"),
         consumer: FunctionSchema
       })).optional()
     }).array()
@@ -1072,7 +1053,7 @@ var pubsubPlugin = definePlugin({
   onStack(ctx) {
     const { stack, stackConfig, bind } = ctx;
     bind((lambda) => {
-      lambda.addToRolePolicy(new PolicyStatement3({
+      lambda.addToRolePolicy(new PolicyStatement2({
         actions: ["iot:publish"],
         resources: ["*"]
       }));
@@ -1080,7 +1061,7 @@ var pubsubPlugin = definePlugin({
     return Object.entries(stackConfig.pubsub || {}).map(([id, props]) => {
       const lambda = toFunction(ctx, id, props.consumer);
       new CfnTopicRule(stack, toId("pubsub", id), {
-        ruleName: toName(stack, id),
+        ruleName: snakeCase(toName(stack, id)),
         topicRulePayload: {
           sql: props.sql,
           awsIotSqlVersion: props.sqlVersion,
@@ -1096,6 +1077,229 @@ var pubsubPlugin = definePlugin({
   }
 });
 
+// src/plugins/http/index.ts
+import { z as z23 } from "zod";
+import { Peer, Port, SecurityGroup, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
+import { ApplicationListener, ApplicationListenerRule, ApplicationLoadBalancer, ApplicationProtocol, ApplicationTargetGroup, ListenerAction, ListenerCondition } from "aws-cdk-lib/aws-elasticloadbalancingv2";
+import { HostedZone, RecordSet, RecordType, RecordTarget } from "aws-cdk-lib/aws-route53";
+import { LoadBalancerTarget } from "aws-cdk-lib/aws-route53-targets";
+import { LambdaTarget } from "aws-cdk-lib/aws-elasticloadbalancingv2-targets";
+import { CfnOutput as CfnOutput3, Fn as Fn2, Token } from "aws-cdk-lib";
+import { Certificate } from "aws-cdk-lib/aws-certificatemanager";
+import { paramCase as paramCase3 } from "change-case";
+
+// src/plugins/http/schema/route.ts
+import { z as z22 } from "zod";
+var RouteSchema = z22.custom((route) => {
+  return z22.string().regex(/^(POST|GET|PUT|DELETE|HEAD|OPTIONS)(\s\/[a-z0-9\+\_\-\/]*)$/ig).safeParse(route).success;
+}, "Invalid route");
+
+// src/plugins/http/util/priority.ts
+var strToInt = (str) => {
+  return parseInt(Buffer.from(str, "utf8").toString("hex"), 16);
+};
+var generatePriority = (stackName, route) => {
+  const start = strToInt(stackName) % 500 + 1;
+  const end = strToInt(route) % 100;
+  const priority = start + "" + end;
+  return parseInt(priority, 10);
+};
+
+// src/plugins/http/index.ts
+var httpPlugin = definePlugin({
+  name: "http",
+  schema: z23.object({
+    defaults: z23.object({
+      http: z23.record(
+        ResourceIdSchema,
+        z23.object({
+          domain: z23.string(),
+          subDomain: z23.string()
+        })
+      ).optional()
+    }).default({}),
+    stacks: z23.object({
+      http: z23.record(
+        ResourceIdSchema,
+        z23.record(RouteSchema, FunctionSchema)
+      ).optional()
+    }).array()
+  }),
+  onBootstrap({ stack, config }) {
+    if (Object.keys(config.defaults?.http || {}).length === 0) {
+      return;
+    }
+    const vpc = new Vpc(stack, toId("vpc", "http"), {
+      subnetConfiguration: [{
+        name: "public",
+        subnetType: SubnetType.PUBLIC,
+        cidrMask: 24
+      }],
+      availabilityZones: [
+        config.region + "a",
+        config.region + "b",
+        config.region + "c"
+      ]
+    });
+    const securityGroup = new SecurityGroup(stack, toId("security-group", "http"), {
+      vpc
+    });
+    securityGroup.addIngressRule(Peer.anyIpv4(), Port.tcp(443));
+    securityGroup.addIngressRule(Peer.anyIpv6(), Port.tcp(443));
+    new CfnOutput3(stack, toId("output", "http-vpc"), {
+      exportName: "http-vpc-id",
+      value: vpc.vpcId
+    });
+    new CfnOutput3(stack, toId("output", "http-security-group"), {
+      exportName: "http-security-group-id",
+      value: securityGroup.securityGroupId
+    });
+    Object.entries(config.defaults?.http || {}).forEach(([id, props]) => {
+      const loadBalancer = new ApplicationLoadBalancer(stack, toId("load-balancer", id), {
+        vpc,
+        securityGroup
+      });
+      const zone = HostedZone.fromHostedZoneAttributes(
+        stack,
+        toId("hosted-zone", id),
+        {
+          hostedZoneId: Token.asString(Fn2.ref(toId("hosted-zone", props.domain))),
+          zoneName: props.domain + "."
+        }
+      );
+      const certificate = Certificate.fromCertificateArn(
+        stack,
+        toId("certificate", id),
+        Token.asString(Fn2.ref(toId("certificate", props.domain)))
+      );
+      const target = RecordTarget.fromAlias(new LoadBalancerTarget(loadBalancer));
+      const recordName = props.subDomain ? `${props.subDomain}.${props.domain}` : props.domain;
+      new RecordSet(stack, toId("record-set", id), {
+        zone,
+        target,
+        recordName,
+        recordType: RecordType.A
+      });
+      const listener = loadBalancer.addListener(toId("listener", id), {
+        port: 443,
+        protocol: ApplicationProtocol.HTTPS,
+        certificates: [certificate],
+        defaultAction: ListenerAction.fixedResponse(404, {
+          contentType: "application/json",
+          messageBody: JSON.stringify({
+            message: "Route not found"
+          })
+        })
+      });
+      new CfnOutput3(stack, toId("output", `http-${id}-listener`), {
+        exportName: `http-${id}-listener-arn`,
+        value: listener.listenerArn
+      });
+    });
+  },
+  onStack(ctx) {
+    const { stack, stackConfig } = ctx;
+    return Object.entries(stackConfig.http || {}).map(([id, routes]) => {
+      const listener = ApplicationListener.fromApplicationListenerAttributes(stack, toId("listener", id), {
+        listenerArn: Fn2.importValue(`http-${id}-listener-arn`),
+        securityGroup: SecurityGroup.fromLookupById(
+          stack,
+          toId("security-group", id),
+          "http-security-group-id"
+        )
+      });
+      return Object.entries(routes).map(([route, props]) => {
+        const lambda = toFunction(ctx, paramCase3(route), props);
+        const [method, ...paths] = route.split(" ");
+        const path = paths.join(" ");
+        new ApplicationListenerRule(stack, toId("listener-rule", route), {
+          listener,
+          priority: generatePriority(stackConfig.name, route),
+          action: ListenerAction.forward([
+            new ApplicationTargetGroup(stack, toId("target-group", route), {
+              targets: [new LambdaTarget(lambda)]
+            })
+          ]),
+          conditions: [
+            ListenerCondition.httpRequestMethods([method]),
+            ListenerCondition.pathPatterns([path])
+          ]
+        });
+        return lambda;
+      });
+    }).flat();
+  }
+});
+
+// src/plugins/domain/index.ts
+import { z as z26 } from "zod";
+import { HostedZone as HostedZone2, CfnRecordSetGroup } from "aws-cdk-lib/aws-route53";
+import { Certificate as Certificate2, CertificateValidation } from "aws-cdk-lib/aws-certificatemanager";
+
+// src/plugins/domain/schema/record-type.ts
+import { RecordType as RecordType2 } from "aws-cdk-lib/aws-route53";
+import { z as z24 } from "zod";
+var types4 = {
+  "A": RecordType2.A,
+  "AAAA": RecordType2.AAAA,
+  "MX": RecordType2.MX,
+  "TXT": RecordType2.TXT,
+  "CNAME": RecordType2.CNAME
+};
+var RecordTypeSchema = z24.enum(Object.keys(types4)).transform((value) => types4[value]);
+
+// src/plugins/domain/schema/domain-name.ts
+import { z as z25 } from "zod";
+var DomainNameSchema = z25.string().regex(/[a-z\-\_\.]/g, "Invalid domain name");
+
+// src/plugins/domain/index.ts
+import { CfnOutput as CfnOutput4 } from "aws-cdk-lib";
+var domainPlugin = definePlugin({
+  name: "domain",
+  schema: z26.object({
+    domains: z26.record(DomainNameSchema, z26.object({
+      name: DomainNameSchema.optional(),
+      type: RecordTypeSchema,
+      ttl: DurationSchema,
+      records: z26.string().array()
+    }).array()).optional()
+  }),
+  onBootstrap({ config, stack }) {
+    Object.entries(config.domains || {}).forEach(([domain, dnsRecords]) => {
+      const hostedZone = new HostedZone2(stack, toId("hosted-zone", domain), {
+        zoneName: domain,
+        addTrailingDot: true
+      });
+      hostedZone.node.defaultChild.overrideLogicalId(toId("hosted-zone", domain));
+      const certificate = new Certificate2(stack, toId("certificate", domain), {
+        domainName: domain,
+        validation: CertificateValidation.fromDns(hostedZone),
+        subjectAlternativeNames: [`*.${domain}`]
+      });
+      certificate.node.defaultChild.overrideLogicalId(toId("certificate", domain));
+      new CfnOutput4(stack, toId("output-hosted-zone", domain), {
+        exportName: toExportName(`hosted-zone-${domain}-id`),
+        value: hostedZone.hostedZoneId
+      });
+      new CfnOutput4(stack, toId("output-certificate", domain), {
+        exportName: toExportName(`certificate-${domain}-arn`),
+        value: certificate.certificateArn
+      });
+      if (dnsRecords.length > 0) {
+        new CfnRecordSetGroup(stack, toId("record-set-group", domain), {
+          hostedZoneId: hostedZone.hostedZoneId,
+          recordSets: dnsRecords.map((props) => ({
+            name: props.name || "",
+            type: props.type,
+            ttl: props.ttl.toSeconds().toString(),
+            resourceRecords: props.records
+          }))
+        });
+      }
+    });
+  }
+});
+
 // src/plugins/index.ts
 var defaultPlugins = [
   functionPlugin,
@@ -1104,9 +1308,11 @@ var defaultPlugins = [
   tablePlugin,
   storePlugin,
   topicPlugin,
-  searchPlugin,
+  // searchPlugin,
   graphqlPlugin,
-  pubsubPlugin
+  pubsubPlugin,
+  domainPlugin,
+  httpPlugin
 ];
 
 // src/stack/app-bootstrap.ts
@@ -1286,63 +1492,6 @@ var toApp = async (config, filters) => {
   };
 };
 
-// src/cli/ui/layout/basic.ts
-var br = () => {
-  return "\n";
-};
-var hr = () => {
-  return (term) => {
-    term.out.write([
-      style.placeholder("\u2500".repeat(term.out.width())),
-      br()
-    ]);
-  };
-};
-
-// src/cli/ui/layout/logs.ts
-import wrapAnsi from "wrap-ansi";
-var previous = /* @__PURE__ */ new Date();
-var logs = () => {
-  if (!process.env.VERBOSE) {
-    return [];
-  }
-  const logs2 = flushDebug();
-  return (term) => {
-    term.out.write([
-      hr(),
-      br(),
-      " ".repeat(3),
-      style.label("Debug Logs:"),
-      br(),
-      br(),
-      logs2.map((log) => {
-        const diff = log.date.getTime() - previous.getTime();
-        const time = `+${diff}`.padStart(8);
-        previous = log.date;
-        return wrapAnsi([
-          style.attr(`${time}${style.attr.dim("ms")}`),
-          " [ ",
-          log.type,
-          " ] ",
-          log.message,
-          br(),
-          log.type === "error" ? br() : ""
-        ].join(""), term.out.width(), { hard: true, trim: false });
-      }),
-      br(),
-      hr()
-    ]);
-  };
-};
-
-// src/cli/ui/layout/footer.ts
-var footer = () => {
-  return [
-    br(),
-    logs()
-  ];
-};
-
 // src/config.ts
 import { join as join6 } from "path";
 
@@ -1363,17 +1512,17 @@ var getCredentials = (profile) => {
 };
 
 // src/schema/app.ts
-import { z as z26 } from "zod";
+import { z as z30 } from "zod";
 
 // src/schema/stack.ts
-import { z as z23 } from "zod";
-var StackSchema = z23.object({
+import { z as z27 } from "zod";
+var StackSchema = z27.object({
   name: ResourceIdSchema,
-  depends: z23.array(z23.lazy(() => StackSchema)).optional()
+  depends: z27.array(z27.lazy(() => StackSchema)).optional()
 });
 
 // src/schema/region.ts
-import { z as z24 } from "zod";
+import { z as z28 } from "zod";
 var US = ["us-east-2", "us-east-1", "us-west-1", "us-west-2"];
 var AF = ["af-south-1"];
 var AP = ["ap-east-1", "ap-south-2", "ap-southeast-3", "ap-southeast-4", "ap-south-1", "ap-northeast-3", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1"];
@@ -1390,34 +1539,34 @@ var regions = [
   ...ME,
   ...SA
 ];
-var RegionSchema = z24.enum(regions);
+var RegionSchema = z28.enum(regions);
 
 // src/schema/plugin.ts
-import { z as z25 } from "zod";
-var PluginSchema = z25.object({
-  name: z25.string(),
-  schema: z25.custom().optional(),
+import { z as z29 } from "zod";
+var PluginSchema = z29.object({
+  name: z29.string(),
+  schema: z29.custom().optional(),
   // depends: z.array(z.lazy(() => PluginSchema)).optional(),
-  onBootstrap: z25.function().returns(z25.any()).optional(),
-  onStack: z25.function().returns(z25.any()).optional(),
-  onApp: z25.function().returns(z25.void()).optional()
+  onBootstrap: z29.function().returns(z29.any()).optional(),
+  onStack: z29.function().returns(z29.any()).optional(),
+  onApp: z29.function().returns(z29.void()).optional()
   // bind: z.function().optional(),
 });
 
 // src/schema/app.ts
-var AppSchema = z26.object({
+var AppSchema = z30.object({
   name: ResourceIdSchema,
   region: RegionSchema,
-  profile: z26.string(),
-  stage: z26.string().regex(/[a-z]+/).default("prod"),
-  defaults: z26.object({}).default({}),
-  stacks: z26.array(StackSchema).min(1),
-  plugins: z26.array(PluginSchema).optional()
+  profile: z30.string(),
+  stage: z30.string().regex(/[a-z]+/).default("prod"),
+  defaults: z30.object({}).default({}),
+  stacks: z30.array(StackSchema).min(1),
+  plugins: z30.array(PluginSchema).optional()
 });
 
 // src/util/import.ts
 import { transformFile } from "@swc/core";
-import { dirname as dirname2, join as join5 } from "path";
+import { dirname as dirname3, join as join5 } from "path";
 import { lstat, mkdir as mkdir3, writeFile as writeFile3 } from "fs/promises";
 var resolveFileNameExtension = async (path) => {
   const options = [
@@ -1428,7 +1577,7 @@ var resolveFileNameExtension = async (path) => {
     "/index.js"
   ];
   for (const option of options) {
-    const file = path + option;
+    const file = path.replace(/\.js$/, "") + option;
     let stat;
     try {
       stat = await lstat(file);
@@ -1442,21 +1591,22 @@ var resolveFileNameExtension = async (path) => {
   throw new Error(`Failed to load file: ${path}`);
 };
 var resolveDir = (path) => {
-  return dirname2(path).replace(rootDir + "/", "");
+  return dirname3(path).replace(rootDir + "/", "");
 };
 var importFile = async (path) => {
   const load = async (file) => {
+    debug("Load file", file);
     let { code: code2 } = await transformFile(file, {
       isModule: true
     });
-    const path2 = dirname2(file);
+    const path2 = dirname3(file);
     const dir = resolveDir(file);
     code2 = code2.replaceAll("__dirname", `"${dir}"`);
-    const matches = code2.match(/import\s*{\s*[a-z0-9\_]+\s*}\s*from\s*('|")(\.[\/a-z0-9\_\-]+)('|");?/ig);
+    const matches = code2.match(/(import|export)\s*{\s*[a-z0-9\_\,\s\*]+\s*}\s*from\s*('|")(\.\.?[\/a-z0-9\_\-\.]+)('|");?/ig);
     if (!matches)
       return code2;
     await Promise.all(matches?.map(async (match) => {
-      const parts = /('|")(\.[\/a-z0-9\_\-]+)('|")/ig.exec(match);
+      const parts = /('|")(\.\.?[\/a-z0-9\_\-\.]+)('|")/ig.exec(match);
       const from = parts[2];
       const file2 = await resolveFileNameExtension(join5(path2, from));
       const result = await load(file2);
@@ -1476,11 +1626,7 @@ var importConfig = async (options) => {
   debug("Import config file");
   const fileName = join6(process.cwd(), options.configFile || "awsless.config.ts");
   const module = await importFile(fileName);
-  const appConfig = typeof module.default === "function" ? await module.default({
-    profile: options.profile,
-    region: options.region,
-    stage: options.stage
-  }) : module.default;
+  const appConfig = typeof module.default === "function" ? await module.default(options) : module.default;
   debug("Validate config file");
   const plugins = [
     ...defaultPlugins,
@@ -1505,6 +1651,19 @@ var importConfig = async (options) => {
   };
 };
 
+// src/cli/ui/layout/basic.ts
+var br = () => {
+  return "\n";
+};
+var hr = () => {
+  return (term) => {
+    term.out.write([
+      style.placeholder("\u2500".repeat(term.out.width())),
+      br()
+    ]);
+  };
+};
+
 // src/cli/ui/layout/list.ts
 var list = (data) => {
   const padding = 3;
@@ -1512,26 +1671,26 @@ var list = (data) => {
   const size = Object.keys(data).reduce((total, name) => {
     return name.length > total ? name.length : total;
   }, 0);
-  return Object.entries(data).map(([name, value]) => [
-    " ".repeat(padding),
-    style.label((name + ":").padEnd(size + gap + 1)),
-    value,
-    br()
-  ]);
+  return (term) => {
+    term.out.gap();
+    term.out.write(Object.entries(data).map(([name, value]) => [
+      " ".repeat(padding),
+      style.label((name + ":").padEnd(size + gap + 1)),
+      value,
+      br()
+    ]));
+    term.out.gap();
+  };
 };
 
 // src/cli/ui/layout/header.ts
 var header = (config) => {
-  return [
-    br(),
-    list({
-      App: config.name,
-      Stage: config.stage,
-      Region: config.region,
-      Profile: config.profile
-    }),
-    br()
-  ];
+  return list({
+    App: config.name,
+    Stage: config.stage,
+    Region: config.region,
+    Profile: config.profile
+  });
 };
 
 // src/util/timer.ts
@@ -1598,16 +1757,16 @@ var createSpinner = () => {
 };
 
 // src/cli/ui/layout/dialog.ts
-import wrapAnsi2 from "wrap-ansi";
+import wrapAnsi from "wrap-ansi";
 var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
   return (term) => {
     term.out.write(lines.map((line, i) => {
       if (i === 0) {
-        return icon + wrapAnsi2(line, term.out.width(), { hard: true });
+        return icon + wrapAnsi(line, term.out.width(), { hard: true });
       }
-      return wrapAnsi2(" ".repeat(padding) + line, term.out.width(), { hard: true });
+      return wrapAnsi(" ".repeat(padding) + line, term.out.width(), { hard: true });
     }).join(br()) + br());
   };
 };
@@ -1749,6 +1908,7 @@ var Renderer = class {
   fragments = [];
   unsubs = [];
   timeout;
+  flushing = false;
   screen = [];
   width() {
     return this.output.columns;
@@ -1768,14 +1928,58 @@ var Renderer = class {
     this.update();
     return fragment;
   }
+  gap() {
+    const walk = (fragment) => {
+      if (typeof fragment === "string") {
+        return fragment;
+      }
+      if (Array.isArray(fragment)) {
+        return fragment.map(walk).join("");
+      }
+      return walk(fragment.get());
+    };
+    const end = walk(this.fragments.slice(-2));
+    if (end.endsWith("\n\n")) {
+    } else if (end.endsWith("\n")) {
+      this.fragments.push("\n");
+    } else {
+      this.fragments.push("\n\n");
+    }
+    this.update();
+  }
   update() {
     clearTimeout(this.timeout);
     this.timeout = setTimeout(() => {
       this.flush();
     }, 0);
   }
-  flush() {
+  async end() {
+    this.gap();
+    await this.flush();
+    const y = this.screen.length - 1;
+    await this.setCursor(0, y);
+  }
+  setCursor(x, y) {
+    return new Promise((resolve) => {
+      this.output.cursorTo?.(x, y, () => resolve(void 0));
+    });
+  }
+  writeString(value) {
+    return new Promise((resolve) => {
+      this.output.write?.(value, () => resolve(void 0));
+    });
+  }
+  clearLine() {
+    return new Promise((resolve) => {
+      this.output.clearLine?.(1, () => resolve(void 0));
+    });
+  }
+  async flush() {
     clearTimeout(this.timeout);
+    if (this.flushing) {
+      this.update();
+      return;
+    }
     const walk = (fragment) => {
       if (typeof fragment === "string") {
         return fragment;
@@ -1791,34 +1995,40 @@ var Renderer = class {
     this.unsubs.forEach((unsub) => unsub());
     this.unsubs = [];
     const screen = walk(this.fragments).split("\n");
+    const height = this.height();
     const oldSize = this.screen.length;
     const newSize = screen.length;
     const size = Math.max(oldSize, newSize);
-    const height = this.height();
     const start = Math.max(oldSize - height, 0);
+    this.flushing = true;
     for (let y = start; y < size; y++) {
-      const line = screen[y];
-      if (line !== this.screen[y]) {
-        if (y > oldSize) {
-          const x = (this.screen[y - 1]?.length || 0) - 1;
-          this.output.cursorTo?.(x, y - 1 - start);
-          this.output.write?.("\n" + line);
+      const newLine = screen[y];
+      const oldLine = this.screen[y];
+      if (newLine !== oldLine) {
+        if (y >= oldSize && y !== 0) {
+          const p = y - start - 1;
+          const x = screen[y - 1]?.length || 0;
+          await this.setCursor(x, p);
+          await this.writeString("\n" + newLine);
         } else {
-          this.output.cursorTo?.(0, y - start);
-          this.output.write?.(line);
+          await this.setCursor(0, y - start);
+          await this.writeString(newLine);
+          await this.clearLine();
         }
-        this.output.clearLine?.(1);
       }
     }
     this.screen = screen;
-  }
-  clear() {
-    let count = this.output.rows;
-    while (count--) {
-      this.output.write("\n");
+    this.flushing = false;
+  }
+  async clear() {
+    await this.setCursor(0, 0);
+    await this.writeString("\n".repeat(this.height()));
+    await this.setCursor(0, 0);
+    if (this.output.clearScreenDown) {
+      await new Promise((resolve) => {
+        this.output.clearScreenDown(() => resolve(void 0));
+      });
     }
-    this.output.cursorTo?.(0, 0);
-    this.output.clearScreenDown?.();
   }
 };
 
@@ -1834,22 +2044,62 @@ var logo = () => {
   return [
     style.warning("\u26A1\uFE0F "),
     style.primary("AWS"),
-    style.primary.dim("LESS"),
-    br()
+    style.primary.dim("LESS")
   ];
 };
 
+// src/cli/ui/layout/logs.ts
+import wrapAnsi2 from "wrap-ansi";
+var previous = /* @__PURE__ */ new Date();
+var logs = () => {
+  if (!process.env.VERBOSE) {
+    return [];
+  }
+  const logs2 = flushDebug();
+  return (term) => {
+    term.out.gap();
+    term.out.write([
+      hr(),
+      br(),
+      " ".repeat(3),
+      style.label("Debug Logs:"),
+      br(),
+      br(),
+      logs2.map((log) => {
+        const diff = log.date.getTime() - previous.getTime();
+        const time = `+${diff}`.padStart(8);
+        previous = log.date;
+        return wrapAnsi2([
+          style.attr(`${time}${style.attr.dim("ms")}`),
+          " [ ",
+          log.type,
+          " ] ",
+          log.message,
+          br(),
+          log.type === "error" ? br() : ""
+        ].join(""), term.out.width(), { hard: true, trim: false });
+      }),
+      br(),
+      hr()
+    ]);
+  };
+};
+
 // src/cli/ui/layout/layout.ts
 var layout = async (cb) => {
   const term = createTerminal();
-  term.out.clear();
+  await term.out.clear();
+  term.out.write(br());
   term.out.write(logo());
+  term.out.gap();
   try {
     const options = program.optsWithGlobals();
     const config = await importConfig(options);
     term.out.write(header(config));
+    term.out.gap();
     await cb(config, term.out.write.bind(term.out), term);
   } catch (error) {
+    term.out.gap();
     if (error instanceof Error) {
       term.out.write(dialog("error", [error.message]));
     } else if (typeof error === "string") {
@@ -1860,7 +2110,9 @@ var layout = async (cb) => {
     debugError(error);
   } finally {
     debug("Exit");
-    term.out.write(footer());
+    term.out.gap();
+    term.out.write(logs());
+    await term.out.end();
     term.in.unref();
     setTimeout(() => {
       process.exit(0);
@@ -1892,7 +2144,8 @@ var flexLine = (term, left, right, reserveSpace = 0) => {
 var assetBuilder = (assets) => {
   return async (term) => {
     const done = term.out.write(loadingDialog("Building stack assets..."));
-    const groups = new Signal([br()]);
+    const groups = new Signal([""]);
+    term.out.gap();
     term.out.write(groups);
     const stackNameSize = Math.max(...Object.keys(assets.list()).map((stack) => stack.length));
     const resourceSize = Math.max(...Object.values(assets.list()).map((assets2) => assets2.map((asset) => asset.resource.length)).flat());
@@ -1938,6 +2191,7 @@ var assetBuilder = (assets) => {
       }));
     }));
     done("Done building stack assets");
+    term.out.gap();
   };
 };
 
@@ -2277,7 +2531,9 @@ var stackTree = (nodes, statuses) => {
         render(node.children, deep + 1, [...parents, more]);
       });
     };
+    term.out.gap();
     render(nodes);
+    term.out.gap();
   };
 };
 
@@ -2288,7 +2544,6 @@ var status = (program2) => {
       const { app, assets, dependencyTree } = await toApp(config, filters);
       await cleanUp();
       await write(assetBuilder(assets));
-      write(br());
       const assembly = app.synth();
       const doneLoading = write(loadingDialog("Loading stack information..."));
       const client = new StackClient(config);
@@ -2297,9 +2552,7 @@ var status = (program2) => {
       assembly.stacks.forEach((stack) => {
         stackStatuses[stack.id] = new Signal(style.info("Loading..."));
       });
-      write(br());
       write(stackTree(dependencyTree, stackStatuses));
-      write(br());
       debug("Load metadata for all deployed stacks on AWS");
       await Promise.all(assembly.stacks.map(async (stack, i) => {
         const info = await client.get(stack.stackName);
@@ -2344,8 +2597,6 @@ var deploy = (program2) => {
       }
       await cleanUp();
       await write(assetBuilder(assets));
-      write(br());
-      write(br());
       const donePublishing = write(loadingDialog("Publishing stack assets to AWS..."));
       await Promise.all(assets.map(async (_, assets2) => {
         await Promise.all(assets2.map(async (asset) => {
@@ -2359,9 +2610,7 @@ var deploy = (program2) => {
         statuses[stack.id] = new Signal(style.info("waiting"));
       });
       const doneDeploying = write(loadingDialog("Deploying stacks to AWS..."));
-      write(br());
       write(stackTree(dependencyTree, statuses));
-      write(br());
       const client = new StackClient(config);
       const deploymentLine = createDeploymentLine(dependencyTree);
       for (const stacks of deploymentLine) {
@@ -2459,7 +2708,6 @@ var set = (program2) => {
       write(list({
         "Set secret parameter": style.info(name)
       }));
-      write(br());
       const value = await write(textPrompt("Enter secret value"));
       if (value === "") {
         write(dialog("error", [`Provided secret value can't be empty`]));
@@ -2480,7 +2728,6 @@ var get = (program2) => {
       const done = write(loadingDialog(`Getting remote secret parameter`));
       const value = await params.get(name);
       done(`Done getting remote secret parameter`);
-      write(br());
       write(list({
         Name: name,
         Value: value || style.error("(empty)")
@@ -2503,7 +2750,6 @@ var del = (program2) => {
       const value = await params.get(name);
       await params.delete(name);
       done(`Done deleting remote secret parameter`);
-      write(br());
       write(list({
         Name: name,
         Value: value || style.error("(empty)")
@@ -2521,7 +2767,6 @@ var list2 = (program2) => {
       const values = await params.list();
       done("Done loading secret values");
       if (Object.keys(values).length > 0) {
-        write(br());
         write(list(values));
       } else {
         write(dialog("warning", ["No secret parameters found"]));
@@ -2544,13 +2789,16 @@ var secrets = (program2) => {
 
 // src/cli/program.ts
 var program = new Command();
-program.name("awsless");
+program.name(logo().join("").replace(/\s+/, ""));
 program.option("--config-file <string>", "The config file location");
 program.option("--stage <string>", "The stage to use, defaults to prod stage", "prod");
 program.option("--profile <string>", "The AWS profile to use");
 program.option("--region <string>", "The AWS region to use");
 program.option("-m --mute", "Mute sound effects");
 program.option("-v --verbose", "Print verbose logs");
+program.exitOverride(() => {
+  process.exit(0);
+});
 program.on("option:verbose", () => {
   process.env.VERBOSE = program.opts().verbose ? "1" : void 0;
 });
@@ -2562,10 +2810,8 @@ var commands2 = [
   secrets
   // diff,
   // remove,
-  // test,
-  // test2,
 ];
-commands2.forEach((command) => command(program));
+commands2.forEach((fn) => fn(program));
 
 // src/bin.ts
 program.parse(process.argv);