@awsless/awsless 0.0.13 → 0.0.14

package/dist/bin.cjs

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_commander = require("commander");
 
 // src/app.ts
-var import_aws_cdk_lib7 = require("aws-cdk-lib");
+var import_aws_cdk_lib9 = require("aws-cdk-lib");
 
 // src/stack.ts
 var import_aws_cdk_lib = require("aws-cdk-lib");
@@ -170,6 +170,10 @@ var toStack = ({ config, assets, app, stackConfig, plugins }) => {
   const stackName = `${config.name}-${stackConfig.name}`;
   const stack = new import_aws_cdk_lib.Stack(app, stackConfig.name, {
     stackName,
+    env: {
+      account: config.account,
+      region: config.region
+    },
     tags: {
       APP: config.name,
       STAGE: config.stage,
@@ -230,7 +234,7 @@ var assetDir = (0, import_path.join)(outDir, "asset");
 var cacheDir = (0, import_path.join)(outDir, "cache");
 
 // src/stack/app-bootstrap.ts
-var import_aws_cdk_lib6 = require("aws-cdk-lib");
+var import_aws_cdk_lib8 = require("aws-cdk-lib");
 
 // src/plugin.ts
 var definePlugin = (plugin) => plugin;
@@ -282,6 +286,9 @@ var toId = (resource, id) => {
 var toName = (stack, id) => {
   return (0, import_change_case.paramCase)(`${stack.stackName}-${id}`);
 };
+var toExportName = (name) => {
+  return (0, import_change_case.paramCase)(name);
+};
 var toEnvKey = (resource, id) => {
   return `RESOURCE_${resource.toUpperCase()}_${id}`;
 };
@@ -415,7 +422,7 @@ var writeBuildFiles = async (config, stack, id, files) => {
   await (0, import_promises2.writeFile)(bundleFile, bundle);
   await Promise.all(files.map(async (file) => {
     const fileName = (0, import_path3.join)(filesPath, file.name);
-    await (0, import_promises2.mkdir)((0, import_path3.basename)(fileName), { recursive: true });
+    await (0, import_promises2.mkdir)((0, import_path3.dirname)(fileName), { recursive: true });
     await (0, import_promises2.writeFile)(fileName, file.code);
     if (file.map) {
       const mapName = (0, import_path3.join)(filesPath, `${file.name}.map`);
@@ -443,7 +450,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 import_aws_cdk_lib2.Stack(app, "bootstrap", {
     stackName: `awsless-bootstrap`
@@ -918,35 +925,8 @@ var topicPlugin = definePlugin({
   }
 });
 
-// src/plugins/search.ts
-var import_zod19 = require("zod");
-var import_aws_opensearchserverless = require("aws-cdk-lib/aws-opensearchserverless");
-var import_aws_iam2 = require("aws-cdk-lib/aws-iam");
-var searchPlugin = definePlugin({
-  name: "search",
-  schema: import_zod19.z.object({
-    stacks: import_zod19.z.object({
-      searchs: import_zod19.z.array(ResourceIdSchema).optional()
-    }).array()
-  }),
-  onStack({ stack, stackConfig, bind }) {
-    (stackConfig.searchs || []).forEach((id) => {
-      const collection = new import_aws_opensearchserverless.CfnCollection(stack, toId("search", id), {
-        name: toName(stack, id),
-        type: "SEARCH"
-      });
-      bind((lambda) => {
-        lambda.addToRolePolicy(new import_aws_iam2.PolicyStatement({
-          actions: ["aoss:APIAccessAll"],
-          resources: [collection.attrArn]
-        }));
-      });
-    });
-  }
-});
-
 // src/plugins/graphql/index.ts
-var import_zod21 = require("zod");
+var import_zod20 = require("zod");
 var import_aws_appsync = require("aws-cdk-lib/aws-appsync");
 var import_merge = require("@graphql-tools/merge");
 var import_promises4 = require("fs/promises");
@@ -965,35 +945,35 @@ var import_graphql = require("graphql");
 var import_change_case2 = require("change-case");
 
 // src/plugins/graphql/schema/resolver-field.ts
-var import_zod20 = require("zod");
-var ResolverFieldSchema = import_zod20.z.custom((value) => {
-  return import_zod20.z.string().regex(/([a-z0-9\_]+)(\s){1}([a-z0-9\_]+)/gi).safeParse(value).success;
+var import_zod19 = require("zod");
+var ResolverFieldSchema = import_zod19.z.custom((value) => {
+  return import_zod19.z.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
 var import_aws_cdk_lib5 = require("aws-cdk-lib");
 var graphqlPlugin = definePlugin({
   name: "graphql",
-  schema: import_zod21.z.object({
-    defaults: import_zod21.z.object({
-      graphql: import_zod21.z.record(ResourceIdSchema, import_zod21.z.object({
-        authorization: import_zod21.z.object({
+  schema: import_zod20.z.object({
+    defaults: import_zod20.z.object({
+      graphql: import_zod20.z.record(ResourceIdSchema, import_zod20.z.object({
+        authorization: import_zod20.z.object({
           authorizer: FunctionSchema,
           ttl: DurationSchema.default("1 hour")
         }).optional(),
-        mappingTemplate: import_zod21.z.object({
+        mappingTemplate: import_zod20.z.object({
           request: LocalFileSchema.optional(),
           response: LocalFileSchema.optional()
         }).optional()
       })).optional()
     }).default({}),
-    stacks: import_zod21.z.object({
-      graphql: import_zod21.z.record(ResourceIdSchema, import_zod21.z.object({
-        schema: import_zod21.z.union([
+    stacks: import_zod20.z.object({
+      graphql: import_zod20.z.record(ResourceIdSchema, import_zod20.z.object({
+        schema: import_zod20.z.union([
           LocalFileSchema,
-          import_zod21.z.array(LocalFileSchema).min(1)
+          import_zod20.z.array(LocalFileSchema).min(1)
         ]).optional(),
-        resolvers: import_zod21.z.record(ResolverFieldSchema, FunctionSchema).optional()
+        resolvers: import_zod20.z.record(ResolverFieldSchema, FunctionSchema).optional()
       })).optional()
     }).array()
   }),
@@ -1078,16 +1058,17 @@ var graphqlPlugin = definePlugin({
 });
 
 // src/plugins/pubsub.ts
-var import_zod22 = require("zod");
+var import_zod21 = require("zod");
 var import_aws_iot = require("aws-cdk-lib/aws-iot");
-var import_aws_iam3 = require("aws-cdk-lib/aws-iam");
+var import_aws_iam2 = require("aws-cdk-lib/aws-iam");
+var import_change_case3 = require("change-case");
 var pubsubPlugin = definePlugin({
   name: "pubsub",
-  schema: import_zod22.z.object({
-    stacks: import_zod22.z.object({
-      pubsub: import_zod22.z.record(ResourceIdSchema, import_zod22.z.object({
-        sql: import_zod22.z.string(),
-        sqlVersion: import_zod22.z.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23"),
+  schema: import_zod21.z.object({
+    stacks: import_zod21.z.object({
+      pubsub: import_zod21.z.record(ResourceIdSchema, import_zod21.z.object({
+        sql: import_zod21.z.string(),
+        sqlVersion: import_zod21.z.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23"),
         consumer: FunctionSchema
       })).optional()
     }).array()
@@ -1095,7 +1076,7 @@ var pubsubPlugin = definePlugin({
   onStack(ctx) {
     const { stack, stackConfig, bind } = ctx;
     bind((lambda) => {
-      lambda.addToRolePolicy(new import_aws_iam3.PolicyStatement({
+      lambda.addToRolePolicy(new import_aws_iam2.PolicyStatement({
         actions: ["iot:publish"],
         resources: ["*"]
       }));
@@ -1103,7 +1084,7 @@ var pubsubPlugin = definePlugin({
     return Object.entries(stackConfig.pubsub || {}).map(([id, props]) => {
       const lambda = toFunction(ctx, id, props.consumer);
       new import_aws_iot.CfnTopicRule(stack, toId("pubsub", id), {
-        ruleName: toName(stack, id),
+        ruleName: (0, import_change_case3.snakeCase)(toName(stack, id)),
         topicRulePayload: {
           sql: props.sql,
           awsIotSqlVersion: props.sqlVersion,
@@ -1119,6 +1100,229 @@ var pubsubPlugin = definePlugin({
   }
 });
 
+// src/plugins/http/index.ts
+var import_zod23 = require("zod");
+var import_aws_ec2 = require("aws-cdk-lib/aws-ec2");
+var import_aws_elasticloadbalancingv2 = require("aws-cdk-lib/aws-elasticloadbalancingv2");
+var import_aws_route53 = require("aws-cdk-lib/aws-route53");
+var import_aws_route53_targets = require("aws-cdk-lib/aws-route53-targets");
+var import_aws_elasticloadbalancingv2_targets = require("aws-cdk-lib/aws-elasticloadbalancingv2-targets");
+var import_aws_cdk_lib6 = require("aws-cdk-lib");
+var import_aws_certificatemanager = require("aws-cdk-lib/aws-certificatemanager");
+var import_change_case4 = require("change-case");
+
+// src/plugins/http/schema/route.ts
+var import_zod22 = require("zod");
+var RouteSchema = import_zod22.z.custom((route) => {
+  return import_zod22.z.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: import_zod23.z.object({
+    defaults: import_zod23.z.object({
+      http: import_zod23.z.record(
+        ResourceIdSchema,
+        import_zod23.z.object({
+          domain: import_zod23.z.string(),
+          subDomain: import_zod23.z.string()
+        })
+      ).optional()
+    }).default({}),
+    stacks: import_zod23.z.object({
+      http: import_zod23.z.record(
+        ResourceIdSchema,
+        import_zod23.z.record(RouteSchema, FunctionSchema)
+      ).optional()
+    }).array()
+  }),
+  onBootstrap({ stack, config }) {
+    if (Object.keys(config.defaults?.http || {}).length === 0) {
+      return;
+    }
+    const vpc = new import_aws_ec2.Vpc(stack, toId("vpc", "http"), {
+      subnetConfiguration: [{
+        name: "public",
+        subnetType: import_aws_ec2.SubnetType.PUBLIC,
+        cidrMask: 24
+      }],
+      availabilityZones: [
+        config.region + "a",
+        config.region + "b",
+        config.region + "c"
+      ]
+    });
+    const securityGroup = new import_aws_ec2.SecurityGroup(stack, toId("security-group", "http"), {
+      vpc
+    });
+    securityGroup.addIngressRule(import_aws_ec2.Peer.anyIpv4(), import_aws_ec2.Port.tcp(443));
+    securityGroup.addIngressRule(import_aws_ec2.Peer.anyIpv6(), import_aws_ec2.Port.tcp(443));
+    new import_aws_cdk_lib6.CfnOutput(stack, toId("output", "http-vpc"), {
+      exportName: "http-vpc-id",
+      value: vpc.vpcId
+    });
+    new import_aws_cdk_lib6.CfnOutput(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 import_aws_elasticloadbalancingv2.ApplicationLoadBalancer(stack, toId("load-balancer", id), {
+        vpc,
+        securityGroup
+      });
+      const zone = import_aws_route53.HostedZone.fromHostedZoneAttributes(
+        stack,
+        toId("hosted-zone", id),
+        {
+          hostedZoneId: import_aws_cdk_lib6.Token.asString(import_aws_cdk_lib6.Fn.ref(toId("hosted-zone", props.domain))),
+          zoneName: props.domain + "."
+        }
+      );
+      const certificate = import_aws_certificatemanager.Certificate.fromCertificateArn(
+        stack,
+        toId("certificate", id),
+        import_aws_cdk_lib6.Token.asString(import_aws_cdk_lib6.Fn.ref(toId("certificate", props.domain)))
+      );
+      const target = import_aws_route53.RecordTarget.fromAlias(new import_aws_route53_targets.LoadBalancerTarget(loadBalancer));
+      const recordName = props.subDomain ? `${props.subDomain}.${props.domain}` : props.domain;
+      new import_aws_route53.RecordSet(stack, toId("record-set", id), {
+        zone,
+        target,
+        recordName,
+        recordType: import_aws_route53.RecordType.A
+      });
+      const listener = loadBalancer.addListener(toId("listener", id), {
+        port: 443,
+        protocol: import_aws_elasticloadbalancingv2.ApplicationProtocol.HTTPS,
+        certificates: [certificate],
+        defaultAction: import_aws_elasticloadbalancingv2.ListenerAction.fixedResponse(404, {
+          contentType: "application/json",
+          messageBody: JSON.stringify({
+            message: "Route not found"
+          })
+        })
+      });
+      new import_aws_cdk_lib6.CfnOutput(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 = import_aws_elasticloadbalancingv2.ApplicationListener.fromApplicationListenerAttributes(stack, toId("listener", id), {
+        listenerArn: import_aws_cdk_lib6.Fn.importValue(`http-${id}-listener-arn`),
+        securityGroup: import_aws_ec2.SecurityGroup.fromLookupById(
+          stack,
+          toId("security-group", id),
+          "http-security-group-id"
+        )
+      });
+      return Object.entries(routes).map(([route, props]) => {
+        const lambda = toFunction(ctx, (0, import_change_case4.paramCase)(route), props);
+        const [method, ...paths] = route.split(" ");
+        const path = paths.join(" ");
+        new import_aws_elasticloadbalancingv2.ApplicationListenerRule(stack, toId("listener-rule", route), {
+          listener,
+          priority: generatePriority(stackConfig.name, route),
+          action: import_aws_elasticloadbalancingv2.ListenerAction.forward([
+            new import_aws_elasticloadbalancingv2.ApplicationTargetGroup(stack, toId("target-group", route), {
+              targets: [new import_aws_elasticloadbalancingv2_targets.LambdaTarget(lambda)]
+            })
+          ]),
+          conditions: [
+            import_aws_elasticloadbalancingv2.ListenerCondition.httpRequestMethods([method]),
+            import_aws_elasticloadbalancingv2.ListenerCondition.pathPatterns([path])
+          ]
+        });
+        return lambda;
+      });
+    }).flat();
+  }
+});
+
+// src/plugins/domain/index.ts
+var import_zod26 = require("zod");
+var import_aws_route533 = require("aws-cdk-lib/aws-route53");
+var import_aws_certificatemanager2 = require("aws-cdk-lib/aws-certificatemanager");
+
+// src/plugins/domain/schema/record-type.ts
+var import_aws_route532 = require("aws-cdk-lib/aws-route53");
+var import_zod24 = require("zod");
+var types4 = {
+  "A": import_aws_route532.RecordType.A,
+  "AAAA": import_aws_route532.RecordType.AAAA,
+  "MX": import_aws_route532.RecordType.MX,
+  "TXT": import_aws_route532.RecordType.TXT,
+  "CNAME": import_aws_route532.RecordType.CNAME
+};
+var RecordTypeSchema = import_zod24.z.enum(Object.keys(types4)).transform((value) => types4[value]);
+
+// src/plugins/domain/schema/domain-name.ts
+var import_zod25 = require("zod");
+var DomainNameSchema = import_zod25.z.string().regex(/[a-z\-\_\.]/g, "Invalid domain name");
+
+// src/plugins/domain/index.ts
+var import_aws_cdk_lib7 = require("aws-cdk-lib");
+var domainPlugin = definePlugin({
+  name: "domain",
+  schema: import_zod26.z.object({
+    domains: import_zod26.z.record(DomainNameSchema, import_zod26.z.object({
+      name: DomainNameSchema.optional(),
+      type: RecordTypeSchema,
+      ttl: DurationSchema,
+      records: import_zod26.z.string().array()
+    }).array()).optional()
+  }),
+  onBootstrap({ config, stack }) {
+    Object.entries(config.domains || {}).forEach(([domain, dnsRecords]) => {
+      const hostedZone = new import_aws_route533.HostedZone(stack, toId("hosted-zone", domain), {
+        zoneName: domain,
+        addTrailingDot: true
+      });
+      hostedZone.node.defaultChild.overrideLogicalId(toId("hosted-zone", domain));
+      const certificate = new import_aws_certificatemanager2.Certificate(stack, toId("certificate", domain), {
+        domainName: domain,
+        validation: import_aws_certificatemanager2.CertificateValidation.fromDns(hostedZone),
+        subjectAlternativeNames: [`*.${domain}`]
+      });
+      certificate.node.defaultChild.overrideLogicalId(toId("certificate", domain));
+      new import_aws_cdk_lib7.CfnOutput(stack, toId("output-hosted-zone", domain), {
+        exportName: toExportName(`hosted-zone-${domain}-id`),
+        value: hostedZone.hostedZoneId
+      });
+      new import_aws_cdk_lib7.CfnOutput(stack, toId("output-certificate", domain), {
+        exportName: toExportName(`certificate-${domain}-arn`),
+        value: certificate.certificateArn
+      });
+      if (dnsRecords.length > 0) {
+        new import_aws_route533.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,
@@ -1127,14 +1331,16 @@ var defaultPlugins = [
   tablePlugin,
   storePlugin,
   topicPlugin,
-  searchPlugin,
+  // searchPlugin,
   graphqlPlugin,
-  pubsubPlugin
+  pubsubPlugin,
+  domainPlugin,
+  httpPlugin
 ];
 
 // src/stack/app-bootstrap.ts
 var appBootstrapStack = ({ config, app, assets }) => {
-  const stack = new import_aws_cdk_lib6.Stack(app, "bootstrap", {
+  const stack = new import_aws_cdk_lib8.Stack(app, "bootstrap", {
     stackName: `${config.name}-bootstrap`
   });
   const plugins = [
@@ -1242,9 +1448,9 @@ var Assets = class {
 
 // src/app.ts
 var makeApp = (config) => {
-  return new import_aws_cdk_lib7.App({
+  return new import_aws_cdk_lib9.App({
     outdir: assemblyDir,
-    defaultStackSynthesizer: new import_aws_cdk_lib7.DefaultStackSynthesizer({
+    defaultStackSynthesizer: new import_aws_cdk_lib9.DefaultStackSynthesizer({
       fileAssetsBucketName: assetBucketName(config),
       fileAssetPublishingRoleArn: "",
       generateBootstrapVersionRule: false
@@ -1309,63 +1515,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
-var import_wrap_ansi = __toESM(require("wrap-ansi"), 1);
-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 (0, import_wrap_ansi.default)([
-          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
 var import_path11 = require("path");
 
@@ -1386,17 +1535,17 @@ var getCredentials = (profile) => {
 };
 
 // src/schema/app.ts
-var import_zod26 = require("zod");
+var import_zod30 = require("zod");
 
 // src/schema/stack.ts
-var import_zod23 = require("zod");
-var StackSchema = import_zod23.z.object({
+var import_zod27 = require("zod");
+var StackSchema = import_zod27.z.object({
   name: ResourceIdSchema,
-  depends: import_zod23.z.array(import_zod23.z.lazy(() => StackSchema)).optional()
+  depends: import_zod27.z.array(import_zod27.z.lazy(() => StackSchema)).optional()
 });
 
 // src/schema/region.ts
-var import_zod24 = require("zod");
+var import_zod28 = require("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"];
@@ -1413,29 +1562,29 @@ var regions = [
   ...ME,
   ...SA
 ];
-var RegionSchema = import_zod24.z.enum(regions);
+var RegionSchema = import_zod28.z.enum(regions);
 
 // src/schema/plugin.ts
-var import_zod25 = require("zod");
-var PluginSchema = import_zod25.z.object({
-  name: import_zod25.z.string(),
-  schema: import_zod25.z.custom().optional(),
+var import_zod29 = require("zod");
+var PluginSchema = import_zod29.z.object({
+  name: import_zod29.z.string(),
+  schema: import_zod29.z.custom().optional(),
   // depends: z.array(z.lazy(() => PluginSchema)).optional(),
-  onBootstrap: import_zod25.z.function().returns(import_zod25.z.any()).optional(),
-  onStack: import_zod25.z.function().returns(import_zod25.z.any()).optional(),
-  onApp: import_zod25.z.function().returns(import_zod25.z.void()).optional()
+  onBootstrap: import_zod29.z.function().returns(import_zod29.z.any()).optional(),
+  onStack: import_zod29.z.function().returns(import_zod29.z.any()).optional(),
+  onApp: import_zod29.z.function().returns(import_zod29.z.void()).optional()
   // bind: z.function().optional(),
 });
 
 // src/schema/app.ts
-var AppSchema = import_zod26.z.object({
+var AppSchema = import_zod30.z.object({
   name: ResourceIdSchema,
   region: RegionSchema,
-  profile: import_zod26.z.string(),
-  stage: import_zod26.z.string().regex(/[a-z]+/).default("prod"),
-  defaults: import_zod26.z.object({}).default({}),
-  stacks: import_zod26.z.array(StackSchema).min(1),
-  plugins: import_zod26.z.array(PluginSchema).optional()
+  profile: import_zod30.z.string(),
+  stage: import_zod30.z.string().regex(/[a-z]+/).default("prod"),
+  defaults: import_zod30.z.object({}).default({}),
+  stacks: import_zod30.z.array(StackSchema).min(1),
+  plugins: import_zod30.z.array(PluginSchema).optional()
 });
 
 // src/util/import.ts
@@ -1451,7 +1600,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 (0, import_promises5.lstat)(file);
@@ -1469,17 +1618,18 @@ var resolveDir = (path) => {
 };
 var importFile = async (path) => {
   const load = async (file) => {
+    debug("Load file", file);
     let { code: code2 } = await (0, import_core3.transformFile)(file, {
       isModule: true
     });
     const path2 = (0, import_path9.dirname)(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((0, import_path9.join)(path2, from));
       const result = await load(file2);
@@ -1499,11 +1649,7 @@ var importConfig = async (options) => {
   debug("Import config file");
   const fileName = (0, import_path11.join)(process.cwd(), options.configFile || "awsless.config.ts");
   const module2 = await importFile(fileName);
-  const appConfig = typeof module2.default === "function" ? await module2.default({
-    profile: options.profile,
-    region: options.region,
-    stage: options.stage
-  }) : module2.default;
+  const appConfig = typeof module2.default === "function" ? await module2.default(options) : module2.default;
   debug("Validate config file");
   const plugins = [
     ...defaultPlugins,
@@ -1528,6 +1674,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;
@@ -1535,26 +1694,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
@@ -1621,16 +1780,16 @@ var createSpinner = () => {
 };
 
 // src/cli/ui/layout/dialog.ts
-var import_wrap_ansi2 = __toESM(require("wrap-ansi"), 1);
+var import_wrap_ansi = __toESM(require("wrap-ansi"), 1);
 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 + (0, import_wrap_ansi2.default)(line, term.out.width(), { hard: true });
+        return icon + (0, import_wrap_ansi.default)(line, term.out.width(), { hard: true });
       }
-      return (0, import_wrap_ansi2.default)(" ".repeat(padding) + line, term.out.width(), { hard: true });
+      return (0, import_wrap_ansi.default)(" ".repeat(padding) + line, term.out.width(), { hard: true });
     }).join(br()) + br());
   };
 };
@@ -1772,6 +1931,7 @@ var Renderer = class {
   fragments = [];
   unsubs = [];
   timeout;
+  flushing = false;
   screen = [];
   width() {
     return this.output.columns;
@@ -1791,14 +1951,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;
@@ -1814,34 +2018,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?.();
   }
 };
 
@@ -1857,22 +2067,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
+var import_wrap_ansi2 = __toESM(require("wrap-ansi"), 1);
+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 (0, import_wrap_ansi2.default)([
+          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") {
@@ -1883,7 +2133,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);
@@ -1915,7 +2167,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());
@@ -1961,6 +2214,7 @@ var assetBuilder = (assets) => {
       }));
     }));
     done("Done building stack assets");
+    term.out.gap();
   };
 };
 
@@ -2300,7 +2554,9 @@ var stackTree = (nodes, statuses) => {
         render(node.children, deep + 1, [...parents, more]);
       });
     };
+    term.out.gap();
     render(nodes);
+    term.out.gap();
   };
 };
 
@@ -2311,7 +2567,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);
@@ -2320,9 +2575,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);
@@ -2367,8 +2620,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) => {
@@ -2382,9 +2633,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) {
@@ -2482,7 +2731,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`]));
@@ -2503,7 +2751,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)")
@@ -2526,7 +2773,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)")
@@ -2544,7 +2790,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"]));
@@ -2567,13 +2812,16 @@ var secrets = (program2) => {
 
 // src/cli/program.ts
 var program = new import_commander.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;
 });
@@ -2585,10 +2833,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);