@awsless/awsless 0.0.41 → 0.0.43

package/dist/bin.cjs

@@ -617,7 +617,7 @@ var createDeploymentLine = (stacks) => {
     depends: config?.depends?.map((dep) => dep.name) || []
   }));
   const names = stacks.map(({ stack }) => stack.name);
-  const line = [];
+  const line2 = [];
   const deps = [];
   let limit = 100;
   while (deps.length < list3.length) {
@@ -632,9 +632,9 @@ var createDeploymentLine = (stacks) => {
       throw new Error(`Circular stack dependencies arn't allowed: ${circularNames}`);
     }
     deps.push(...local.map((stack) => stack.name));
-    line.push(local);
+    line2.push(local);
   }
-  return line;
+  return line2;
 };
 
 // src/plugins/cron/index.ts
@@ -647,23 +647,30 @@ var definePlugin = (plugin) => plugin;
 var import_zod = require("zod");
 var import_aws_cron_expression_validator = require("aws-cron-expression-validator");
 var RateExpressionSchema = import_zod.z.custom((value) => {
-  return import_zod.z.string().regex(/rate\([0-9]+ (seconds?|minutes?|hours?|days?)\)/).refine((rate) => {
-    const [str] = rate.substring(5).split(" ");
+  return import_zod.z.string().regex(/^[0-9]+ (seconds?|minutes?|hours?|days?)$/).refine((rate) => {
+    const [str] = rate.split(" ");
     const number = parseInt(str);
     return number > 0;
   }).safeParse(value).success;
-}, "Invalid rate expression");
+}, { message: "Invalid rate expression" }).transform((rate) => {
+  const [str] = rate.split(" ");
+  const number = parseInt(str);
+  const more = rate.endsWith("s");
+  if (more && number === 1) {
+    return `rate(${rate.substring(0, rate.length - 1)})`;
+  }
+  return `rate(${rate})`;
+});
 var CronExpressionSchema = import_zod.z.custom((value) => {
-  return import_zod.z.string().startsWith("cron(").endsWith(")").safeParse(value).success;
-}, "Invalid cron expression").superRefine((value, ctx) => {
-  const cron = value.substring(5, value.length - 1);
+  return import_zod.z.string().safeParse(value).success;
+}, { message: "Invalid cron expression" }).superRefine((value, ctx) => {
   try {
-    (0, import_aws_cron_expression_validator.awsCronExpressionValidator)(cron);
+    (0, import_aws_cron_expression_validator.awsCronExpressionValidator)(value);
   } catch (error) {
     if (error instanceof Error) {
       ctx.addIssue({
         code: import_zod.z.ZodIssueCode.custom,
-        message: error.message
+        message: `Invalid cron expression: ${error.message}`
       });
     } else {
       ctx.addIssue({
@@ -672,6 +679,8 @@ var CronExpressionSchema = import_zod.z.custom((value) => {
       });
     }
   }
+}).transform((value) => {
+  return `cron(${value.trim()})`;
 });
 var ScheduleExpressionSchema = RateExpressionSchema.or(CronExpressionSchema);
 
@@ -735,7 +744,7 @@ function toDuration(duration) {
   return Duration.days(0);
 }
 var DurationSchema = import_zod2.z.custom((value) => {
-  return import_zod2.z.string().regex(/[0-9]+ (seconds?|minutes?|hours?|days?)/).safeParse(value).success;
+  return import_zod2.z.string().regex(/^[0-9]+ (seconds?|minutes?|hours?|days?)$/).safeParse(value).success;
 }, "Invalid duration").transform(toDuration);
 var durationMin = (min) => {
   return (duration) => {
@@ -761,8 +770,9 @@ var LocalFileSchema = import_zod3.z.string().refine(async (path) => {
 }, `File doesn't exist`);
 
 // src/schema/resource-id.ts
+var import_change_case3 = require("change-case");
 var import_zod4 = require("zod");
-var ResourceIdSchema = import_zod4.z.string().min(3).max(24).regex(/[a-z\-]+/, "Invalid resource ID");
+var ResourceIdSchema = import_zod4.z.string().min(3).max(24).regex(/^[a-z\-]+$/i, "Invalid resource ID").transform((value) => (0, import_change_case3.paramCase)(value));
 
 // src/schema/size.ts
 var import_zod5 = require("zod");
@@ -812,7 +822,7 @@ function toSize(size) {
   throw new TypeError(`Invalid size ${size}`);
 }
 var SizeSchema = import_zod5.z.custom((value) => {
-  return import_zod5.z.string().regex(/[0-9]+ (KB|MB|GB)/).safeParse(value).success;
+  return import_zod5.z.string().regex(/^[0-9]+ (KB|MB|GB)$/).safeParse(value).success;
 }, "Invalid size").transform(toSize);
 var sizeMin = (min) => {
   return (size) => {
@@ -1021,7 +1031,7 @@ var hasOnFailure = (config) => {
 };
 
 // src/plugins/function.ts
-var import_change_case4 = require("change-case");
+var import_change_case5 = require("change-case");
 
 // src/util/path.ts
 var import_promises2 = require("fs/promises");
@@ -1076,7 +1086,7 @@ var import_path6 = require("path");
 // src/util/type-gen.ts
 var import_promises3 = require("fs/promises");
 var import_path4 = require("path");
-var import_change_case3 = require("change-case");
+var import_change_case4 = require("change-case");
 var generateResourceTypes = async (config) => {
   const plugins = [
     ...defaultPlugins,
@@ -1128,7 +1138,7 @@ var TypeGen = class {
       lines.push(...[
         "// Imports",
         ...Array.from(this.imports.entries()).map(([varName, path]) => {
-          return `import ${(0, import_change_case3.camelCase)(varName)} from '${path}'`;
+          return `import ${(0, import_change_case4.camelCase)(varName)} from '${path}'`;
         }),
         ""
       ]);
@@ -1146,7 +1156,7 @@ var TypeGen = class {
       `declare module '${this.module}' {`,
       `	interface ${this.interfaceName} {`,
       ...Array.from(this.types.entries()).map(([propName, type]) => {
-        return `		readonly ${(0, import_change_case3.camelCase)(propName)}: ${type}`;
+        return `		readonly ${(0, import_change_case4.camelCase)(propName)}: ${type}`;
       }),
       `	}`,
       `}`,
@@ -1169,7 +1179,7 @@ var TypeObject = class {
     return [
       "{",
       ...Array.from(this.types.entries()).map(([propName, type]) => {
-        return `			readonly ${(0, import_change_case3.camelCase)(propName)}: ${type}`;
+        return `			readonly ${(0, import_change_case4.camelCase)(propName)}: ${type}`;
       }),
       "		}"
     ].join("\n");
@@ -1328,7 +1338,7 @@ var functionPlugin = definePlugin({
     for (const stack of config.stacks) {
       const list3 = new TypeObject();
       for (const [name, fileOrProps] of Object.entries(stack.functions || {})) {
-        const varName = (0, import_change_case4.camelCase)(`${stack.name}-${name}`);
+        const varName = (0, import_change_case5.camelCase)(`${stack.name}-${name}`);
         const funcName = formatName(`${config.name}-${stack.name}-${name}`);
         const file = typeof fileOrProps === "string" ? fileOrProps : fileOrProps.file;
         const relFile = (0, import_path6.relative)(directories.types, file);
@@ -1479,7 +1489,7 @@ var cronPlugin = definePlugin({
        *   crons: {
        *     CRON_NAME: {
        *       consumer: 'function.ts',
-       *       schedule: 'rate(5 minutes)',
+       *       schedule: '5 minutes',
        *     }
        *   }
        * }
@@ -1488,8 +1498,8 @@ var cronPlugin = definePlugin({
         /** The consuming lambda function properties. */
         consumer: FunctionSchema,
         /** The scheduling expression.
-         * @example 'cron(0 20 * * ? *)'
-         * @example 'rate(5 minutes)'
+         * @example '0 20 * * ? *'
+         * @example '5 minutes'
          */
         schedule: ScheduleExpressionSchema,
         // Valid JSON passed to the consumer.
@@ -1568,7 +1578,7 @@ var Queue = class extends Resource {
 };
 
 // src/formation/resource/lambda/event-source-mapping.ts
-var import_change_case5 = require("change-case");
+var import_change_case6 = require("change-case");
 var EventSourceMapping = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::Lambda::EventSourceMapping", logicalId);
@@ -1590,7 +1600,7 @@ var EventSourceMapping = class extends Resource {
       ...this.attr("ParallelizationFactor", this.props.parallelizationFactor),
       ...this.attr("TumblingWindowInSeconds", this.props.tumblingWindow?.toSeconds()),
       ...this.attr("BisectBatchOnFunctionError", this.props.bisectBatchOnError),
-      ...this.attr("StartingPosition", this.props.startingPosition && (0, import_change_case5.constantCase)(this.props.startingPosition)),
+      ...this.attr("StartingPosition", this.props.startingPosition && (0, import_change_case6.constantCase)(this.props.startingPosition)),
       ...this.attr("StartingPositionTimestamp", this.props.startingPositionTimestamp),
       ...this.props.maxConcurrency ? {
         ScalingConfig: {
@@ -1631,7 +1641,8 @@ var SqsEventSource = class extends Group {
 };
 
 // src/plugins/queue.ts
-var import_change_case6 = require("change-case");
+var import_change_case7 = require("change-case");
+var import_path8 = require("path");
 var RetentionPeriodSchema = DurationSchema.refine(durationMin(Duration.minutes(1)), "Minimum retention period is 1 minute").refine(durationMax(Duration.days(14)), "Maximum retention period is 14 days");
 var VisibilityTimeoutSchema = DurationSchema.refine(durationMax(Duration.hours(12)), "Maximum visibility timeout is 12 hours");
 var DeliveryDelaySchema = DurationSchema.refine(durationMax(Duration.minutes(15)), "Maximum delivery delay is 15 minutes");
@@ -1643,10 +1654,12 @@ var MaxBatchingWindow = DurationSchema.refine(durationMax(Duration.minutes(5)),
 var typeGenCode2 = `
 import { SendMessageOptions, SendMessageBatchOptions, BatchItem } from '@awsless/sqs'
 
-type Send<Name extends string> = {
+type Payload<Func extends (...args: any[]) => any> = Parameters<Func>[0]['Records'][number]['body']
+
+type Send<Name extends string, Func extends (...args: any[]) => any> = {
 	name: Name
-	batch(items:BatchItem[], options?:Omit<SendMessageBatchOptions, 'queue' | 'items'>): Promise<void>
-	(payload: unknown, options?: Omit<SendMessageOptions, 'queue' | 'payload'>): Promise<void>
+	batch(items:BatchItem<Payload<Func>>[], options?:Omit<SendMessageBatchOptions, 'queue' | 'items'>): Promise<void>
+	(payload: Payload<Func>, options?: Omit<SendMessageOptions, 'queue' | 'payload'>): Promise<void>
 }`;
 var queuePlugin = definePlugin({
   name: "queue",
@@ -1752,9 +1765,13 @@ var queuePlugin = definePlugin({
     types2.addCode(typeGenCode2);
     for (const stack of config.stacks) {
       const list3 = new TypeObject();
-      for (const name of Object.keys(stack.queues || {})) {
+      for (const [name, fileOrProps] of Object.entries(stack.queues || {})) {
+        const varName = (0, import_change_case7.camelCase)(`${stack.name}-${name}`);
         const queueName = formatName(`${config.name}-${stack.name}-${name}`);
-        list3.addType(name, `Send<'${queueName}'>`);
+        const file = typeof fileOrProps === "string" ? fileOrProps : typeof fileOrProps.consumer === "string" ? fileOrProps.consumer : fileOrProps.consumer.file;
+        const relFile = (0, import_path8.relative)(directories.types, file);
+        types2.addImport(varName, relFile);
+        list3.addType(name, `Send<'${queueName}', typeof ${varName}>`);
       }
       types2.addType(stack.name, list3.toString());
     }
@@ -1779,7 +1796,7 @@ var queuePlugin = definePlugin({
       stack.add(queue2, lambda, source);
       bind((lambda2) => {
         lambda2.addPermissions(queue2.permissions);
-        lambda2.addEnvironment(`QUEUE_${(0, import_change_case6.constantCase)(stack.name)}_${(0, import_change_case6.constantCase)(id)}_URL`, queue2.url);
+        lambda2.addEnvironment(`QUEUE_${(0, import_change_case7.constantCase)(stack.name)}_${(0, import_change_case7.constantCase)(id)}_URL`, queue2.url);
       });
     }
   }
@@ -1789,7 +1806,7 @@ var queuePlugin = definePlugin({
 var import_zod9 = require("zod");
 
 // src/formation/resource/dynamodb/table.ts
-var import_change_case7 = require("change-case");
+var import_change_case8 = require("change-case");
 var Table = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::DynamoDB::Table", logicalId);
@@ -1862,7 +1879,7 @@ var Table = class extends Resource {
     return {
       TableName: this.name,
       BillingMode: "PAY_PER_REQUEST",
-      TableClass: (0, import_change_case7.constantCase)(this.props.class || "standard"),
+      TableClass: (0, import_change_case8.constantCase)(this.props.class || "standard"),
       PointInTimeRecoverySpecification: {
         PointInTimeRecoveryEnabled: this.props.pointInTimeRecovery || false
       },
@@ -1873,7 +1890,7 @@ var Table = class extends Resource {
       AttributeDefinitions: this.attributeDefinitions(),
       ...this.props.stream ? {
         StreamSpecification: {
-          StreamViewType: (0, import_change_case7.constantCase)(this.props.stream)
+          StreamViewType: (0, import_change_case8.constantCase)(this.props.stream)
         }
       } : {},
       ...this.props.timeToLiveAttribute ? {
@@ -1890,7 +1907,7 @@ var Table = class extends Resource {
             ...props.sort ? [{ KeyType: "RANGE", AttributeName: props.sort }] : []
           ],
           Projection: {
-            ProjectionType: (0, import_change_case7.constantCase)(props.projection || "all")
+            ProjectionType: (0, import_change_case8.constantCase)(props.projection || "all")
           }
         }))
       } : {}
@@ -2075,7 +2092,7 @@ var tablePlugin = definePlugin({
 var import_zod10 = require("zod");
 
 // src/formation/resource/s3/bucket.ts
-var import_change_case8 = require("change-case");
+var import_change_case9 = require("change-case");
 var Bucket = class extends Resource {
   constructor(logicalId, props = {}) {
     super("AWS::S3::Bucket", logicalId);
@@ -2110,7 +2127,7 @@ var Bucket = class extends Resource {
   properties() {
     return {
       BucketName: this.name,
-      AccessControl: (0, import_change_case8.pascalCase)(this.props.accessControl ?? "private"),
+      AccessControl: (0, import_change_case9.pascalCase)(this.props.accessControl ?? "private"),
       ...this.props.versioned ? {
         VersioningConfiguration: {
           Status: "Enabled"
@@ -2321,12 +2338,12 @@ var extendPlugin = definePlugin({
 var import_zod13 = require("zod");
 
 // src/formation/resource/iot/topic-rule.ts
-var import_change_case9 = require("change-case");
+var import_change_case10 = require("change-case");
 var TopicRule = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::IoT::TopicRule", logicalId);
     this.props = props;
-    this.name = (0, import_change_case9.snakeCase)(this.props.name || logicalId);
+    this.name = (0, import_change_case10.snakeCase)(this.props.name || logicalId);
   }
   name;
   get arn() {
@@ -2426,10 +2443,10 @@ var toArray = (value) => {
 };
 
 // src/plugins/graphql.ts
-var import_change_case13 = require("change-case");
+var import_change_case14 = require("change-case");
 
 // src/formation/resource/appsync/graphql-api.ts
-var import_change_case10 = require("change-case");
+var import_change_case11 = require("change-case");
 var GraphQLApi = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::AppSync::GraphQLApi", logicalId);
@@ -2461,7 +2478,7 @@ var GraphQLApi = class extends Resource {
   properties() {
     return {
       Name: this.name,
-      AuthenticationType: (0, import_change_case10.constantCase)(this.props.authenticationType || "api-key"),
+      AuthenticationType: (0, import_change_case11.constantCase)(this.props.authenticationType || "api-key"),
       AdditionalAuthenticationProviders: this.lambdaAuthProviders.map((provider) => ({
         AuthenticationType: "AWS_LAMBDA",
         LambdaAuthorizerConfig: {
@@ -2588,12 +2605,12 @@ var FileCode2 = class extends Asset {
 };
 
 // src/formation/resource/appsync/data-source.ts
-var import_change_case11 = require("change-case");
+var import_change_case12 = require("change-case");
 var DataSource = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::AppSync::DataSource", logicalId);
     this.props = props;
-    this.name = (0, import_change_case11.snakeCase)(this.props.name || logicalId);
+    this.name = (0, import_change_case12.snakeCase)(this.props.name || logicalId);
   }
   static fromLambda(logicalId, apiId, props) {
     return new DataSource(logicalId, {
@@ -2633,14 +2650,14 @@ var DataSource = class extends Resource {
 };
 
 // src/formation/resource/appsync/function-configuration.ts
-var import_change_case12 = require("change-case");
+var import_change_case13 = require("change-case");
 var FunctionConfiguration = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::AppSync::FunctionConfiguration", logicalId, [
       props.code
     ]);
     this.props = props;
-    this.name = (0, import_change_case12.snakeCase)(this.props.name || logicalId);
+    this.name = (0, import_change_case13.snakeCase)(this.props.name || logicalId);
   }
   name;
   get id() {
@@ -2769,9 +2786,6 @@ export function response(ctx) {
 	return ctx.result
 }
 `;
-var ResolverFieldSchema = import_zod14.z.custom((value) => {
-  return import_zod14.z.string().regex(/([a-z0-9\_]+)(\s){1}([a-z0-9\_]+)/gi).safeParse(value).success;
-}, `Invalid resolver field. Valid example: "Query list"`);
 var graphqlPlugin = definePlugin({
   name: "graphql",
   schema: import_zod14.z.object({
@@ -2792,7 +2806,13 @@ var graphqlPlugin = definePlugin({
           LocalFileSchema,
           import_zod14.z.array(LocalFileSchema).min(1)
         ]).optional(),
-        resolvers: import_zod14.z.record(ResolverFieldSchema, FunctionSchema).optional()
+        resolvers: import_zod14.z.record(
+          import_zod14.z.string(),
+          import_zod14.z.record(
+            import_zod14.z.string(),
+            FunctionSchema
+          )
+        ).optional()
       })).optional()
     }).array()
   }),
@@ -2857,17 +2877,18 @@ var graphqlPlugin = definePlugin({
     const { stack, stackConfig, bootstrap: bootstrap2 } = ctx;
     for (const [id, props] of Object.entries(stackConfig.graphql || {})) {
       const apiId = bootstrap2.import(`graphql-${id}`);
-      for (const [typeAndField, functionProps] of Object.entries(props.resolvers || {})) {
-        const [typeName, fieldName] = typeAndField.split(/[\s]+/g);
-        const entryId = (0, import_change_case13.paramCase)(`${id}-${typeName}-${fieldName}`);
-        const lambda = toLambdaFunction(ctx, `graphql-${entryId}`, functionProps);
-        const source = new AppsyncEventSource(entryId, lambda, {
-          apiId,
-          typeName,
-          fieldName,
-          code: Code2.fromInline(entryId, defaultResolver)
-        });
-        stack.add(lambda, source);
+      for (const [typeName, fields] of Object.entries(props.resolvers || {})) {
+        for (const [fieldName, functionProps] of Object.entries(fields || {})) {
+          const entryId = (0, import_change_case14.paramCase)(`${id}-${typeName}-${fieldName}`);
+          const lambda = toLambdaFunction(ctx, `graphql-${entryId}`, functionProps);
+          const source = new AppsyncEventSource(entryId, lambda, {
+            apiId,
+            typeName,
+            fieldName,
+            code: Code2.fromInline(entryId, defaultResolver)
+          });
+          stack.add(lambda, source);
+        }
       }
     }
   }
@@ -3543,7 +3564,7 @@ var LoadBalancer = class extends Resource {
 };
 
 // src/formation/resource/elb/listener.ts
-var import_change_case14 = require("change-case");
+var import_change_case15 = require("change-case");
 var Listener = class extends Resource {
   constructor(logicalId, props) {
     super("AWS::ElasticLoadBalancingV2::Listener", logicalId);
@@ -3559,7 +3580,7 @@ var Listener = class extends Resource {
     return {
       LoadBalancerArn: this.props.loadBalancerArn,
       Port: this.props.port,
-      Protocol: (0, import_change_case14.constantCase)(this.props.protocol),
+      Protocol: (0, import_change_case15.constantCase)(this.props.protocol),
       Certificates: this.props.certificates.map((arn) => ({
         CertificateArn: arn
       })),
@@ -3998,7 +4019,7 @@ var SubnetGroup = class extends Resource {
 };
 
 // src/plugins/cache.ts
-var import_change_case15 = require("change-case");
+var import_change_case16 = require("change-case");
 var TypeSchema = import_zod19.z.enum([
   "t4g.small",
   "t4g.medium",
@@ -4084,7 +4105,7 @@ var cachePlugin = definePlugin({
       }).dependsOn(subnetGroup, securityGroup);
       stack.add(subnetGroup, securityGroup, cluster);
       bind((lambda) => {
-        lambda.addEnvironment(`CACHE_${(0, import_change_case15.constantCase)(stack.name)}_${(0, import_change_case15.constantCase)(id)}_HOST`, cluster.address).addEnvironment(`CACHE_${(0, import_change_case15.constantCase)(stack.name)}_${(0, import_change_case15.constantCase)(id)}_PORT`, props.port.toString());
+        lambda.addEnvironment(`CACHE_${(0, import_change_case16.constantCase)(stack.name)}_${(0, import_change_case16.constantCase)(id)}_HOST`, cluster.address).addEnvironment(`CACHE_${(0, import_change_case16.constantCase)(stack.name)}_${(0, import_change_case16.constantCase)(id)}_PORT`, props.port.toString());
       });
     }
   }
@@ -4340,7 +4361,7 @@ var toApp = async (config, filters) => {
 };
 
 // src/config.ts
-var import_path9 = require("path");
+var import_path11 = require("path");
 
 // src/util/account.ts
 var import_client_sts = require("@aws-sdk/client-sts");
@@ -4411,7 +4432,7 @@ var AppSchema = import_zod23.z.object({
   /** The deployment stage.
    * @default 'prod'
    */
-  stage: import_zod23.z.string().regex(/[a-z]+/).default("prod"),
+  stage: import_zod23.z.string().regex(/^[a-z]+$/).default("prod"),
   /** Default properties. */
   defaults: import_zod23.z.object({}).default({}),
   /** The application stacks. */
@@ -4428,7 +4449,7 @@ var import_rollup3 = require("rollup");
 var import_rollup_plugin_swc32 = require("rollup-plugin-swc3");
 var import_rollup_plugin_replace = __toESM(require("rollup-plugin-replace"), 1);
 var import_event_iterator = require("event-iterator");
-var import_path7 = require("path");
+var import_path9 = require("path");
 var import_promises6 = require("fs/promises");
 var importFile = async (path) => {
   const bundle = await (0, import_rollup3.rollup)({
@@ -4438,17 +4459,17 @@ var importFile = async (path) => {
     },
     plugins: [
       (0, import_rollup_plugin_replace.default)({
-        __dirname: (id) => `'${(0, import_path7.dirname)(id)}'`
+        __dirname: (id) => `'${(0, import_path9.dirname)(id)}'`
       }),
       (0, import_rollup_plugin_swc32.swc)({
         minify: false,
         jsc: {
-          baseUrl: (0, import_path7.dirname)(path)
+          baseUrl: (0, import_path9.dirname)(path)
         }
       })
     ]
   });
-  const outputFile = (0, import_path7.join)(directories.cache, "config.js");
+  const outputFile = (0, import_path9.join)(directories.cache, "config.js");
   const result = await bundle.generate({
     format: "esm",
     exports: "default"
@@ -4472,12 +4493,12 @@ var watchFile = (path) => {
       },
       plugins: [
         (0, import_rollup_plugin_replace.default)({
-          __dirname: (id) => `'${(0, import_path7.dirname)(id)}'`
+          __dirname: (id) => `'${(0, import_path9.dirname)(id)}'`
         }),
         (0, import_rollup_plugin_swc32.swc)({
           minify: false,
           jsc: {
-            baseUrl: (0, import_path7.dirname)(path)
+            baseUrl: (0, import_path9.dirname)(path)
           }
         })
       ]
@@ -4499,7 +4520,7 @@ var watchFile = (path) => {
         event.result.close();
         const output = result.output[0];
         const code = output.code;
-        const outputFile = (0, import_path7.join)(directories.cache, "config.js");
+        const outputFile = (0, import_path9.join)(directories.cache, "config.js");
         await (0, import_promises6.mkdir)(directories.cache, { recursive: true });
         await (0, import_promises6.writeFile)(outputFile, code);
         debug("Save config file:", style.info(outputFile));
@@ -4517,6 +4538,14 @@ var watchFile = (path) => {
 };
 
 // src/config.ts
+var import_zod24 = require("zod");
+var ConfigError = class extends Error {
+  constructor(error, data) {
+    super(error.message);
+    this.error = error;
+    this.data = data;
+  }
+};
 var importConfig = async (options) => {
   debug("Find the root directory");
   const configFile = options.configFile || "awsless.config.ts";
@@ -4524,7 +4553,7 @@ var importConfig = async (options) => {
   setRoot(root2);
   debug("CWD:", style.info(root2));
   debug("Import config file");
-  const fileName = (0, import_path9.join)(root2, configFile);
+  const fileName = (0, import_path11.join)(root2, configFile);
   const module2 = await importFile(fileName);
   const appConfig = typeof module2.default === "function" ? await module2.default(options) : module2.default;
   debug("Validate config file");
@@ -4538,7 +4567,15 @@ var importConfig = async (options) => {
       schema2 = schema2.and(plugin.schema);
     }
   }
-  const config = await schema2.parseAsync(appConfig);
+  let config;
+  try {
+    config = await schema2.parseAsync(appConfig);
+  } catch (error) {
+    if (error instanceof import_zod24.z.ZodError) {
+      throw new ConfigError(error, appConfig);
+    }
+    throw error;
+  }
   debug("Load credentials", style.info(config.profile));
   const credentials = getCredentials(config.profile);
   debug("Load AWS account ID");
@@ -4557,7 +4594,7 @@ var watchConfig = async function* (options) {
   setRoot(root2);
   debug("CWD:", style.info(root2));
   debug("Import config file");
-  const fileName = (0, import_path9.join)(root2, configFile);
+  const fileName = (0, import_path11.join)(root2, configFile);
   for await (const module2 of watchFile(fileName)) {
     const appConfig = typeof module2.default === "function" ? await module2.default(options) : module2.default;
     debug("Validate config file");
@@ -4571,7 +4608,15 @@ var watchConfig = async function* (options) {
         schema2 = schema2.and(plugin.schema);
       }
     }
-    const config = await schema2.parseAsync(appConfig);
+    let config;
+    try {
+      config = await schema2.parseAsync(appConfig);
+    } catch (error) {
+      if (error instanceof import_zod24.z.ZodError) {
+        throw new ConfigError(error, appConfig);
+      }
+      throw error;
+    }
     debug("Load credentials", style.info(config.profile));
     const credentials = getCredentials(config.profile);
     debug("Load AWS account ID");
@@ -4696,11 +4741,11 @@ var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
   return (term) => {
-    term.out.write(lines.map((line, i) => {
+    term.out.write(lines.map((line2, i) => {
       if (i === 0) {
-        return icon + (0, import_wrap_ansi.default)(line, term.out.width(), { hard: true });
+        return icon + (0, import_wrap_ansi.default)(line2, term.out.width(), { hard: true });
       }
-      return (0, import_wrap_ansi.default)(" ".repeat(padding) + line, term.out.width(), { hard: true });
+      return (0, import_wrap_ansi.default)(" ".repeat(padding) + line2, term.out.width(), { hard: true });
     }).join(br()) + br());
   };
 };
@@ -5023,6 +5068,87 @@ var logs = () => {
   };
 };
 
+// src/cli/ui/layout/zod-error.ts
+var line = (value, level = 0, highlight = false) => {
+  return [
+    highlight ? style.error(symbol.pointerSmall) + style.placeholder("  | ") : style.placeholder.dim("   | "),
+    "   ".repeat(level),
+    value,
+    br()
+  ];
+};
+var format = (value) => {
+  if (Array.isArray(value)) {
+    return "[ ... ]";
+  }
+  if (value === null) {
+    return "null";
+  }
+  switch (typeof value) {
+    case "function":
+      return "() => { ... }";
+    case "bigint":
+      return `${value}n`;
+    case "symbol":
+      return "Symbol()";
+    case "object":
+      return "{ ... }";
+    case "undefined":
+    case "string":
+    case "number":
+    case "boolean":
+      return JSON.stringify(value);
+  }
+  return "";
+};
+var zodError = (error, data) => {
+  return (term) => {
+    term.out.write(JSON.stringify(error.errors));
+    for (const issue of error.issues) {
+      term.out.gap();
+      term.out.write(dialog("error", [
+        style.error(issue.message)
+      ]));
+      term.out.gap();
+      term.out.write(line("{"));
+      let context = data;
+      const inStack = issue.path[0] === "stacks" && typeof issue.path[1] === "number";
+      const length2 = issue.path.length;
+      const end = [];
+      issue.path.forEach((path, i) => {
+        const index = i + 1;
+        context = context[path];
+        if (typeof path === "string") {
+          const key = path + `: `;
+          if (index === length2) {
+            const space = " ".repeat(key.length);
+            const value = format(context);
+            const error2 = "^".repeat(value.length);
+            term.out.write(line(key + style.warning(value), index));
+            term.out.write(line(space + style.error(error2), index, true));
+          } else if (Array.isArray(context)) {
+            term.out.write(line(key + "[", index));
+            end.unshift(line("]", index));
+          } else if (typeof context === "object") {
+            if (inStack && index === 3) {
+              const name = data.stacks[issue.path[1]].name;
+              term.out.write(line("name: " + style.info(`"${name}"`) + ",", index));
+            }
+            term.out.write(line(key + "{", index));
+            end.unshift(line("}", index));
+          }
+        } else if (typeof context === "object") {
+          term.out.write(line("{", index));
+          end.unshift(line("}", index));
+        }
+      });
+      term.out.write(end);
+      term.out.write(line("}"));
+      term.out.gap();
+    }
+  };
+};
+
 // src/cli/ui/layout/layout.ts
 var layout = async (cb) => {
   const term = createTerminal();
@@ -5038,7 +5164,9 @@ var layout = async (cb) => {
     await cb(config, term.out.write.bind(term.out), term);
   } catch (error) {
     term.out.gap();
-    if (error instanceof Error) {
+    if (error instanceof ConfigError) {
+      term.out.write(zodError(error.error, error.data));
+    } else if (error instanceof Error) {
       term.out.write(dialog("error", [error.message]));
     } else if (typeof error === "string") {
       term.out.write(dialog("error", [error]));
@@ -5082,7 +5210,7 @@ var flexLine = (term, left, right, reserveSpace = 0) => {
 };
 
 // src/cli/ui/complex/builder.ts
-var import_path12 = require("path");
+var import_path14 = require("path");
 var assetBuilder = (app) => {
   return async (term) => {
     const assets = [];
@@ -5116,7 +5244,7 @@ var assetBuilder = (app) => {
         }
         const [icon, stop] = createSpinner();
         const details = new Signal({});
-        const line = flexLine(term, [
+        const line2 = flexLine(term, [
           icon,
           "  ",
           style.label(stack.name),
@@ -5140,13 +5268,13 @@ var assetBuilder = (app) => {
           }),
           br()
         ]);
-        group.update((group2) => [...group2, line]);
+        group.update((group2) => [...group2, line2]);
         const timer = createTimer();
         try {
           const data = await asset.build({
             async write(file, data2) {
-              const fullpath = (0, import_path12.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-              const basepath = (0, import_path12.dirname)(fullpath);
+              const fullpath = (0, import_path14.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+              const basepath = (0, import_path14.dirname)(fullpath);
               await (0, import_promises7.mkdir)(basepath, { recursive: true });
               await (0, import_promises7.writeFile)(fullpath, data2);
             }
@@ -5193,14 +5321,14 @@ var cleanUp = async () => {
 
 // src/cli/ui/complex/template.ts
 var import_promises9 = require("fs/promises");
-var import_path15 = require("path");
+var import_path17 = require("path");
 var templateBuilder = (app) => {
   return async (term) => {
     const done = term.out.write(loadingDialog("Building stack templates..."));
     await Promise.all(app.stacks.map(async (stack) => {
       const template = stack.toString(true);
-      const path = (0, import_path15.join)(directories.template, app.name);
-      const file = (0, import_path15.join)(path, `${stack.name}.json`);
+      const path = (0, import_path17.join)(directories.template, app.name);
+      const file = (0, import_path17.join)(path, `${stack.name}.json`);
       await (0, import_promises9.mkdir)(path, { recursive: true });
       await (0, import_promises9.writeFile)(file, template);
     }));
@@ -5260,7 +5388,7 @@ var shouldDeployBootstrap = async (client, stack) => {
 // src/formation/client.ts
 var import_client_cloudformation = require("@aws-sdk/client-cloudformation");
 var import_client_s3 = require("@aws-sdk/client-s3");
-var import_change_case16 = require("change-case");
+var import_change_case17 = require("change-case");
 var StackClient = class {
   constructor(app, account, region, credentials) {
     this.app = app;
@@ -5293,7 +5421,7 @@ var StackClient = class {
     };
   }
   stackName(stackName) {
-    return (0, import_change_case16.paramCase)(`${this.app.name}-${stackName}`);
+    return (0, import_change_case17.paramCase)(`${this.app.name}-${stackName}`);
   }
   tags(stack) {
     const tags = [];
@@ -5611,13 +5739,13 @@ var bootstrap = (program2) => {
 
 // src/cli/ui/complex/deployer.ts
 var stacksDeployer = (deploymentLine) => {
-  const stackNames = deploymentLine.map((line) => line.map((stack) => stack.name)).flat();
+  const stackNames = deploymentLine.map((line2) => line2.map((stack) => stack.name)).flat();
   const stackNameSize = Math.max(...stackNames.map((name) => name.length));
   return (term) => {
     const ui = {};
     term.out.gap();
     for (const i in deploymentLine) {
-      const line = flexLine(
+      const line2 = flexLine(
         term,
         ["   "],
         [
@@ -5626,7 +5754,7 @@ var stacksDeployer = (deploymentLine) => {
           style.placeholder(" \u2500\u2500")
         ]
       );
-      term.out.write(line);
+      term.out.write(line2);
       term.out.write(br());
       for (const stack of deploymentLine[i]) {
         const icon = new Signal(" ");
@@ -5721,7 +5849,7 @@ var status = (program2) => {
 
 // src/cli/ui/complex/publisher.ts
 var import_promises10 = require("fs/promises");
-var import_path17 = require("path");
+var import_path19 = require("path");
 var import_client_s32 = require("@aws-sdk/client-s3");
 var assetPublisher = (config, app) => {
   const client = new import_client_s32.S3Client({
@@ -5734,7 +5862,7 @@ var assetPublisher = (config, app) => {
       await Promise.all([...stack.assets].map(async (asset) => {
         await asset.publish?.({
           async read(file) {
-            const path = (0, import_path17.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+            const path = (0, import_path19.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
             const data = await (0, import_promises10.readFile)(path);
             return data;
           },
@@ -5806,8 +5934,8 @@ var deploy = (program2) => {
       const doneDeploying = write(loadingDialog("Deploying stacks to AWS..."));
       const client = new StackClient(app, config.account, config.region, config.credentials);
       const ui = write(stacksDeployer(deploymentLine));
-      for (const line of deploymentLine) {
-        const results = await Promise.allSettled(line.map(async (stack) => {
+      for (const line2 of deploymentLine) {
+        const results = await Promise.allSettled(line2.map(async (stack) => {
           const item = ui[stack.name];
           item.start("deploying");
           try {