@awsless/awsless 0.0.548 → 0.0.550

package/dist/bin.js

@@ -370,7 +370,7 @@ var createWorkSpace = async (props) => {
   if (process.env.VERBOSE) {
     enableDebug();
   }
-  const aws = await terraform.install("hashicorp", "aws", "5.98.0");
+  const aws = await terraform.install("hashicorp", "aws", "6.9.0");
   const workspace = new WorkSpace({
     providers: [
       createLambdaProvider(props),
@@ -609,7 +609,7 @@ var debug = (...parts) => {
 };
 
 // src/config/app.ts
-import { z as z25 } from "zod";
+import { z as z26 } from "zod";
 
 // src/feature/alert/schema.ts
 import { kebabCase } from "change-case";
@@ -969,7 +969,13 @@ var LayerSchema = z16.record(
 
 // src/feature/on-failure/schema.ts
 var OnFailureDefaultSchema = FunctionSchema.optional().describe(
-  "Defining a onFailure handler will add a global onFailure handler for the following resources:\n- Async lambda functions\n- SQS queues\n- DynamoDB streams"
+  [
+    "Defining a onFailure handler will add a global onFailure handler for the following resources:",
+    "- CloudWatch Scheduler",
+    "- Async lambda functions",
+    "- SQS queues",
+    "- DynamoDB streams"
+  ].join("\n")
 );
 
 // src/feature/on-log/schema.ts
@@ -992,32 +998,30 @@ var DomainSchema = ResourceIdSchema.describe("The domain id to link your Pubsub
 var PubSubDefaultSchema = z18.record(
   ResourceIdSchema,
   z18.object({
-    auth: FunctionSchema,
+    auth: FunctionSchema.describe("The authentication function for the pubsub API."),
     domain: DomainSchema.optional(),
-    subDomain: z18.string().optional()
-    // auth: z.union([
-    // 	ResourceIdSchema,
-    // 	z.object({
-    // 		authorizer: FunctionSchema,
-    // 		// ttl: AuthorizerTtl.default('1 hour'),
-    // 	}),
-    // ]),
-    // policy: z
-    // 	.object({
-    // 		publish: z.array(z.string()).optional(),
-    // 		subscribe: z.array(z.string()).optional(),
-    // 	})
-    // 	.optional(),
+    subDomain: z18.string().optional(),
+    namespaces: z18.array(z18.string()).optional().describe('The namespaces for the PubSub API. If not set, a single "default" namespace is created.'),
+    logLevel: z18.enum(["none", "info", "error", "debug", "all"]).optional().describe("The logging level for AppSync API. When set, logging is enabled.")
   })
-).optional().describe("Define the pubsub subscriber in your stack.");
+).optional().describe("Define the pubsub API configuration in your stack.");
 var PubSubSchema = z18.record(
   ResourceIdSchema,
   z18.object({
-    sql: z18.string().describe("The SQL statement used to query the IOT topic."),
-    sqlVersion: z18.enum(["2015-10-08", "2016-03-23", "beta"]).default("2016-03-23").describe("The version of the SQL rules engine to use when evaluating the rule."),
-    consumer: FunctionSchema.describe("The consuming lambda function properties.")
+    channels: z18.array(z18.string()).describe("The event channels this subscriber listens to."),
+    filter: z18.object({
+      eventType: z18.string().optional().describe("Filter events by event type.")
+      // Add more filter options as needed
+      // userId: z.string().optional(),
+      // custom: z.record(z.string(), z.any()).optional(),
+    }).optional().describe("Event filtering options."),
+    consumer: FunctionSchema.describe("The consuming lambda function properties."),
+    batchSize: z18.number().int().min(1).max(100).default(1).describe("Number of events to batch before invoking the consumer function."),
+    retryPolicy: z18.object({
+      maxRetries: z18.number().int().min(0).max(3).default(2).describe("Maximum number of retry attempts.")
+    }).optional().describe("Retry policy for failed event processing.")
   })
-).optional().describe("Define the pubsub subscriber in your stack.");
+).optional().describe("Define the pubsub event subscribers in your stack.");
 
 // src/feature/queue/schema.ts
 import { days as days2, hours, minutes as minutes2, seconds as seconds2 } from "@awsless/duration";
@@ -1285,8 +1289,17 @@ var InstanceDefaultSchema = z23.object({
   }))
 }).default({});
 
-// src/config/schema/region.ts
+// src/feature/topic/schema.ts
+import { kebabCase as kebabCase3 } from "change-case";
 import { z as z24 } from "zod";
+var TopicNameSchema = z24.string().min(3).max(256).regex(/^[a-z0-9\-]+$/i, "Invalid topic name").transform((value) => kebabCase3(value)).describe("Define event topic name.");
+var TopicsDefaultSchema = z24.array(TopicNameSchema).refine((topics) => {
+  return topics.length === new Set(topics).size;
+}, "Must be a list of unique topic names").optional().describe("Define the event topics for your app.");
+var SubscribersSchema = z24.record(TopicNameSchema, FunctionSchema).optional().describe("Define the event topics to subscribe too in your stack.");
+
+// src/config/schema/region.ts
+import { z as z25 } from "zod";
 var US = ["us-east-2", "us-east-1", "us-west-1", "us-west-2"];
 var AF = ["af-south-1"];
 var AP = [
@@ -1315,16 +1328,16 @@ var EU = [
 var ME = ["me-south-1", "me-central-1"];
 var SA = ["sa-east-1"];
 var regions = [...US, ...AF, ...AP, ...CA, ...EU, ...ME, ...SA];
-var RegionSchema = z24.enum(regions);
+var RegionSchema = z25.enum(regions);
 
 // src/config/app.ts
-var AppSchema = z25.object({
-  $schema: z25.string().optional(),
+var AppSchema = z26.object({
+  $schema: z26.string().optional(),
   name: ResourceIdSchema.describe("App name."),
   region: RegionSchema.describe("The AWS region to deploy to."),
-  profile: z25.string().describe("The AWS profile to deploy to."),
-  protect: z25.boolean().default(false).describe("Protect your app & stacks from being deleted."),
-  removal: z25.enum(["remove", "retain"]).default("remove").describe(
+  profile: z26.string().describe("The AWS profile to deploy to."),
+  protect: z26.boolean().default(false).describe("Protect your app & stacks from being deleted."),
+  removal: z26.enum(["remove", "retain"]).default("remove").describe(
     [
       "Configure how your resources are handled when they have to be removed.",
       "",
@@ -1338,7 +1351,7 @@ var AppSchema = z25.object({
   // 	.default('prod')
   // 	.describe('The deployment stage.'),
   // onFailure: OnFailureSchema,
-  defaults: z25.object({
+  defaults: z26.object({
     onFailure: OnFailureDefaultSchema,
     onLog: OnLogDefaultSchema,
     auth: AuthDefaultSchema,
@@ -1354,17 +1367,18 @@ var AppSchema = z25.object({
     // table: TableDefaultSchema,
     // store: StoreDefaultSchema,
     alerts: AlertsDefaultSchema,
+    topics: TopicsDefaultSchema,
     layers: LayerSchema
     // dataRetention: z.boolean().describe('Configure how your resources are handled on delete.').default(false),
   }).default({}).describe("Default properties")
 });
 
 // src/config/stack.ts
-import { z as z41 } from "zod";
+import { z as z42 } from "zod";
 
 // src/feature/cache/schema.ts
 import { gibibytes as gibibytes2 } from "@awsless/size";
-import { z as z26 } from "zod";
+import { z as z27 } from "zod";
 var StorageSchema = SizeSchema.refine(sizeMin(gibibytes2(1)), "Minimum storage size is 1 GB").refine(
   sizeMax(gibibytes2(5e3)),
   "Maximum storage size is 5000 GB"
@@ -1375,31 +1389,31 @@ var MinimumStorageSchema = StorageSchema.describe(
 var MaximumStorageSchema = StorageSchema.describe(
   "The upper limit for data storage the cache is set to use. You can specify a size value from 1 GB to 5000 GB."
 );
-var EcpuSchema = z26.number().int().min(1e3).max(15e6);
+var EcpuSchema = z27.number().int().min(1e3).max(15e6);
 var MinimumEcpuSchema = EcpuSchema.describe(
   "The minimum number of ECPUs the cache can consume per second. You can specify a integer from 1,000 to 15,000,000."
 );
 var MaximumEcpuSchema = EcpuSchema.describe(
   "The maximum number of ECPUs the cache can consume per second. You can specify a integer from 1,000 to 15,000,000."
 );
-var CachesSchema = z26.record(
+var CachesSchema = z27.record(
   ResourceIdSchema,
-  z26.object({
+  z27.object({
     minStorage: MinimumStorageSchema.optional(),
     maxStorage: MaximumStorageSchema.optional(),
     minECPU: MinimumEcpuSchema.optional(),
     maxECPU: MaximumEcpuSchema.optional(),
-    snapshotRetentionLimit: z26.number().int().positive().default(1)
+    snapshotRetentionLimit: z27.number().int().positive().default(1)
   })
 ).optional().describe("Define the caches in your stack. For access to the cache put your functions inside the global VPC.");
 
 // src/feature/command/schema.ts
-import { z as z27 } from "zod";
-var CommandSchema = z27.union([
-  z27.object({
+import { z as z28 } from "zod";
+var CommandSchema = z28.union([
+  z28.object({
     file: LocalFileSchema,
-    handler: z27.string().default("default").describe("The name of the handler that needs to run"),
-    description: z27.string().optional().describe("A description of the command")
+    handler: z28.string().default("default").describe("The name of the handler that needs to run"),
+    description: z28.string().optional().describe("A description of the command")
     // options: z.record(ResourceIdSchema, OptionSchema).optional(),
     // arguments: z.record(ResourceIdSchema, ArgumentSchema).optional(),
   }),
@@ -1409,22 +1423,22 @@ var CommandSchema = z27.union([
     description: void 0
   }))
 ]);
-var CommandsSchema = z27.record(ResourceIdSchema, CommandSchema).optional().describe("Define the custom commands for your stack.");
+var CommandsSchema = z28.record(ResourceIdSchema, CommandSchema).optional().describe("Define the custom commands for your stack.");
 
 // src/feature/config/schema.ts
-import { z as z28 } from "zod";
-var ConfigNameSchema = z28.string().regex(/[a-z0-9\-]/g, "Invalid config name");
-var ConfigsSchema = z28.array(ConfigNameSchema).optional().describe("Define the config values for your stack.");
+import { z as z29 } from "zod";
+var ConfigNameSchema = z29.string().regex(/[a-z0-9\-]/g, "Invalid config name");
+var ConfigsSchema = z29.array(ConfigNameSchema).optional().describe("Define the config values for your stack.");
 
 // src/feature/cron/schema/index.ts
-import { z as z30 } from "zod";
+import { z as z31 } from "zod";
 
 // src/feature/cron/schema/schedule.ts
-import { z as z29 } from "zod";
+import { z as z30 } from "zod";
 import { awsCronExpressionValidator } from "aws-cron-expression-validator";
-var RateExpressionSchema = z29.custom(
+var RateExpressionSchema = z30.custom(
   (value) => {
-    return z29.string().regex(/^[0-9]+ (seconds?|minutes?|hours?|days?)$/).refine((rate) => {
+    return z30.string().regex(/^[0-9]+ (seconds?|minutes?|hours?|days?)$/).refine((rate) => {
       const [str] = rate.split(" ");
       const number = parseInt(str);
       return number > 0;
@@ -1440,9 +1454,9 @@ var RateExpressionSchema = z29.custom(
   }
   return `rate(${rate})`;
 });
-var CronExpressionSchema = z29.custom(
+var CronExpressionSchema = z30.custom(
   (value) => {
-    return z29.string().safeParse(value).success;
+    return z30.string().safeParse(value).success;
   },
   { message: "Invalid cron expression" }
 ).superRefine((value, ctx) => {
@@ -1451,12 +1465,12 @@ var CronExpressionSchema = z29.custom(
   } catch (error) {
     if (error instanceof Error) {
       ctx.addIssue({
-        code: z29.ZodIssueCode.custom,
+        code: z30.ZodIssueCode.custom,
         message: `Invalid cron expression: ${error.message}`
       });
     } else {
       ctx.addIssue({
-        code: z29.ZodIssueCode.custom,
+        code: z30.ZodIssueCode.custom,
         message: "Invalid cron expression"
       });
     }
@@ -1467,28 +1481,28 @@ var CronExpressionSchema = z29.custom(
 var ScheduleExpressionSchema = RateExpressionSchema.or(CronExpressionSchema);
 
 // src/feature/cron/schema/index.ts
-var CronsSchema = z30.record(
+var CronsSchema = z31.record(
   ResourceIdSchema,
-  z30.object({
-    enabled: z30.boolean().default(true).describe("If the cron is enabled."),
+  z31.object({
+    enabled: z31.boolean().default(true).describe("If the cron is enabled."),
     consumer: FunctionSchema.describe("The consuming lambda function properties."),
     schedule: ScheduleExpressionSchema.describe(
       'The scheduling expression.\n\nexample: "0 20 * * ? *"\nexample: "5 minutes"'
     ),
-    payload: z30.unknown().optional().describe("The JSON payload that will be passed to the consumer.")
+    payload: z31.unknown().optional().describe("The JSON payload that will be passed to the consumer.")
   })
 ).optional().describe(`Define the cron jobs in your stack.`);
 
 // src/feature/search/schema.ts
 import { gibibytes as gibibytes3 } from "@awsless/size";
-import { z as z31 } from "zod";
-var VersionSchema = z31.union([
+import { z as z32 } from "zod";
+var VersionSchema = z32.union([
   //
-  z31.enum(["2.13", "2.11", "2.9", "2.7", "2.5", "2.3", "1.3"]),
-  z31.string()
+  z32.enum(["2.13", "2.11", "2.9", "2.7", "2.5", "2.3", "1.3"]),
+  z32.string()
 ]).describe("Specify the OpenSearch engine version.");
-var TypeSchema = z31.union([
-  z31.enum([
+var TypeSchema = z32.union([
+  z32.enum([
     "t3.small",
     "t3.medium",
     "m3.medium",
@@ -1562,13 +1576,13 @@ var TypeSchema = z31.union([
     "r6gd.12xlarge",
     "r6gd.16xlarge"
   ]),
-  z31.string()
+  z32.string()
 ]).describe("Instance type of data nodes in the cluster.");
-var CountSchema = z31.number().int().min(1).describe("Number of instances in the cluster.");
+var CountSchema = z32.number().int().min(1).describe("Number of instances in the cluster.");
 var StorageSizeSchema = SizeSchema.refine(sizeMin(gibibytes3(10)), "Minimum storage size is 10 GB").refine(sizeMax(gibibytes3(100)), "Maximum storage size is 100 GB").describe("The size of the function's /tmp directory. You can specify a size value from 512 MB to 10 GiB.");
-var SearchsSchema = z31.record(
+var SearchsSchema = z32.record(
   ResourceIdSchema,
-  z31.object({
+  z32.object({
     type: TypeSchema.default("t3.small"),
     count: CountSchema.default(1),
     version: VersionSchema.default("2.13"),
@@ -1579,12 +1593,12 @@ var SearchsSchema = z31.record(
 ).optional().describe("Define the search instances in your stack. Backed by OpenSearch.");
 
 // src/feature/site/schema.ts
-import { z as z33 } from "zod";
+import { z as z34 } from "zod";
 
 // src/config/schema/local-entry.ts
 import { stat as stat3 } from "fs/promises";
-import { z as z32 } from "zod";
-var LocalEntrySchema = z32.union([
+import { z as z33 } from "zod";
+var LocalEntrySchema = z33.union([
   RelativePathSchema.refine(async (path) => {
     try {
       const s = await stat3(path);
@@ -1593,7 +1607,7 @@ var LocalEntrySchema = z32.union([
       return false;
     }
   }, `File or directory doesn't exist`),
-  z32.object({
+  z33.object({
     nocheck: RelativePathSchema.describe(
       "Specifies a local file or directory without checking if the file or directory exists."
     )
@@ -1601,14 +1615,14 @@ var LocalEntrySchema = z32.union([
 ]);
 
 // src/feature/site/schema.ts
-var ErrorResponsePathSchema = z33.string().describe(
+var ErrorResponsePathSchema = z34.string().describe(
   [
     "The path to the custom error page that you want to return to the viewer when your origin returns the HTTP status code specified.",
     "- We recommend that you store custom error pages in an Amazon S3 bucket.",
     "If you store custom error pages on an HTTP server and the server starts to return 5xx errors, CloudFront can't get the files that you want to return to viewers because the origin server is unavailable."
   ].join("\n")
 );
-var StatusCodeSchema = z33.number().int().positive().optional().describe(
+var StatusCodeSchema = z34.number().int().positive().optional().describe(
   [
     "The HTTP status code that you want CloudFront to return to the viewer along with the custom error page.",
     "There are a variety of reasons that you might want CloudFront to return a status code different from the status code that your origin returned to CloudFront, for example:",
@@ -1621,19 +1635,19 @@ var StatusCodeSchema = z33.number().int().positive().optional().describe(
 var MinTTLSchema = DurationSchema.describe(
   "The minimum amount of time, that you want to cache the error response. When this time period has elapsed, CloudFront queries your origin to see whether the problem that caused the error has been resolved and the requested object is now available."
 );
-var ErrorResponseSchema = z33.union([
+var ErrorResponseSchema = z34.union([
   ErrorResponsePathSchema,
-  z33.object({
+  z34.object({
     path: ErrorResponsePathSchema,
     statusCode: StatusCodeSchema.optional(),
     minTTL: MinTTLSchema.optional()
   })
 ]).optional();
-var SitesSchema = z33.record(
+var SitesSchema = z34.record(
   ResourceIdSchema,
-  z33.object({
+  z34.object({
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
-    subDomain: z33.string().optional(),
+    subDomain: z34.string().optional(),
     // bind: z
     // 	.object({
     // 		auth: z.array(ResourceIdSchema),
@@ -1642,16 +1656,16 @@ var SitesSchema = z33.record(
     // 		// rest: z.array(ResourceIdSchema),
     // 	})
     // 	.optional(),
-    build: z33.object({
-      command: z33.string().describe(
+    build: z34.object({
+      command: z34.string().describe(
         `Specifies the files and directories to generate the cache key for your custom build command.`
       ),
-      cacheKey: z33.union([LocalEntrySchema.transform((v) => [v]), LocalEntrySchema.array()]).describe(
+      cacheKey: z34.union([LocalEntrySchema.transform((v) => [v]), LocalEntrySchema.array()]).describe(
         `Specifies the files and directories to generate the cache key for your custom build command.`
       ),
-      configs: z33.string().array().describe("Define the config values for your build command.")
+      configs: z34.string().array().describe("Define the config values for your build command.")
     }).optional().describe(`Specifies the build process for sites that need a build step.`),
-    static: z33.union([LocalDirectorySchema, z33.boolean()]).optional().describe(
+    static: z34.union([LocalDirectorySchema, z34.boolean()]).optional().describe(
       "Specifies the path to the static files directory. Additionally you can also pass `true` when you don't have local static files, but still want to make an S3 bucket."
     ),
     ssr: FunctionSchema.optional().describe("Specifies the file that will render the site on the server."),
@@ -1672,7 +1686,7 @@ var SitesSchema = z33.record(
     // 		build: z.string().optional(),
     // 	}),
     // ]),
-    geoRestrictions: z33.array(z33.string().length(2).toUpperCase()).default([]).describe("Specifies a blacklist of countries that should be blocked."),
+    geoRestrictions: z34.array(z34.string().length(2).toUpperCase()).default([]).describe("Specifies a blacklist of countries that should be blocked."),
     // forwardHost: z
     // 	.boolean()
     // 	.default(false)
@@ -1683,7 +1697,7 @@ var SitesSchema = z33.record(
     // 			'Keep in mind that this requires an extra CloudFront Function.',
     // 		].join('\n')
     // 	),
-    errors: z33.object({
+    errors: z34.object({
       400: ErrorResponseSchema.describe("Customize a `400 Bad Request` response."),
       403: ErrorResponseSchema.describe("Customize a `403 Forbidden` response."),
       404: ErrorResponseSchema.describe("Customize a `404 Not Found` response."),
@@ -1696,20 +1710,20 @@ var SitesSchema = z33.record(
       503: ErrorResponseSchema.describe("Customize a `503 Service Unavailable` response."),
       504: ErrorResponseSchema.describe("Customize a `504 Gateway Timeout` response.")
     }).optional().describe("Customize the error responses for specific HTTP status codes."),
-    cors: z33.object({
-      override: z33.boolean().default(false),
+    cors: z34.object({
+      override: z34.boolean().default(false),
       maxAge: DurationSchema.default("365 days"),
-      exposeHeaders: z33.string().array().optional(),
-      credentials: z33.boolean().default(false),
-      headers: z33.string().array().default(["*"]),
-      origins: z33.string().array().default(["*"]),
-      methods: z33.enum(["GET", "DELETE", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "ALL"]).array().default(["ALL"])
+      exposeHeaders: z34.string().array().optional(),
+      credentials: z34.boolean().default(false),
+      headers: z34.string().array().default(["*"]),
+      origins: z34.string().array().default(["*"]),
+      methods: z34.enum(["GET", "DELETE", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", "ALL"]).array().default(["ALL"])
     }).optional().describe("Specify the cors headers."),
-    auth: z33.object({
-      username: z33.string().describe("Basic auth username"),
-      password: z33.string().describe("Basic auth password")
+    auth: z34.object({
+      username: z34.string().describe("Basic auth username"),
+      password: z34.string().describe("Basic auth password")
     }).optional().describe("Enable basic authentication for the site"),
-    security: z33.object({
+    security: z34.object({
       // contentSecurityPolicy: z.object({
       // 	override: z.boolean().default(false),
       // 	policy: z.string(),
@@ -1751,10 +1765,10 @@ var SitesSchema = z33.record(
       // 	reportUri?: string
       // }
     }).optional().describe("Specify the security policy."),
-    cache: z33.object({
-      cookies: z33.string().array().optional().describe("Specifies the cookies that CloudFront includes in the cache key."),
-      headers: z33.string().array().optional().describe("Specifies the headers that CloudFront includes in the cache key."),
-      queries: z33.string().array().optional().describe("Specifies the query values that CloudFront includes in the cache key.")
+    cache: z34.object({
+      cookies: z34.string().array().optional().describe("Specifies the cookies that CloudFront includes in the cache key."),
+      headers: z34.string().array().optional().describe("Specifies the headers that CloudFront includes in the cache key."),
+      queries: z34.string().array().optional().describe("Specifies the query values that CloudFront includes in the cache key.")
     }).optional().describe(
       "Specifies the cookies, headers, and query values that CloudFront includes in the cache key."
     )
@@ -1762,22 +1776,21 @@ var SitesSchema = z33.record(
 ).optional().describe("Define the sites in your stack.");
 
 // src/feature/store/schema.ts
-import { z as z34 } from "zod";
-var StoresSchema = z34.union([
-  z34.array(ResourceIdSchema).transform((list3) => {
+import { z as z35 } from "zod";
+var StoresSchema = z35.union([
+  z35.array(ResourceIdSchema).transform((list3) => {
     const stores = {};
     for (const key of list3) {
       stores[key] = {};
     }
     return stores;
   }),
-  z34.record(
+  z35.record(
     ResourceIdSchema,
-    z34.object({
-      // cors: CorsSchema,
-      // deletionProtection: DeletionProtectionSchema.optional(),
-      versioning: z34.boolean().default(false).describe("Enable versioning of your store."),
-      events: z34.object({
+    z35.object({
+      static: LocalDirectorySchema.optional().describe("Specifies the path to the static files directory."),
+      versioning: z35.boolean().default(false).describe("Enable versioning of your store."),
+      events: z35.object({
         // create
         "created:*": FunctionSchema.optional().describe(
           "Subscribe to notifications regardless of the API that was used to create an object."
@@ -1810,58 +1823,58 @@ var StoresSchema = z34.union([
 ]).optional().describe("Define the stores in your stack.");
 
 // src/feature/icon/schema.ts
-import { z as z35 } from "zod";
+import { z as z36 } from "zod";
 var staticOriginSchema = LocalDirectorySchema.describe(
   "Specifies the path to a local image directory that will be uploaded in S3."
 );
 var functionOriginSchema = FunctionSchema.describe(
   "Specifies the file that will be called when an image isn't found in the (cache) bucket."
 );
-var IconsSchema = z35.record(
+var IconsSchema = z36.record(
   ResourceIdSchema,
-  z35.object({
+  z36.object({
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
-    subDomain: z35.string().optional(),
+    subDomain: z36.string().optional(),
     log: LogSchema.optional(),
     cacheDuration: DurationSchema.optional().describe("The cache duration of the cached icons."),
-    preserveId: z35.boolean().optional().default(false).describe("Preserve the IDs of the icons."),
-    symbols: z35.boolean().optional().default(false).describe("Use SVG symbols for icons."),
-    origin: z35.union([
-      z35.object({
+    preserveId: z36.boolean().optional().default(false).describe("Preserve the IDs of the icons."),
+    symbols: z36.boolean().optional().default(false).describe("Use SVG symbols for icons."),
+    origin: z36.union([
+      z36.object({
         static: staticOriginSchema,
         function: functionOriginSchema.optional()
       }),
-      z35.object({
+      z36.object({
         static: staticOriginSchema.optional(),
         function: functionOriginSchema
       }),
-      z35.object({
+      z36.object({
         static: staticOriginSchema,
         function: functionOriginSchema
       })
     ]).describe(
       "Image transformation will be applied from a base image. Base images orginates from a local directory that will be uploaded to S3 or from a lambda function."
     ),
-    cors: z35.object({
-      override: z35.boolean().default(true),
+    cors: z36.object({
+      override: z36.boolean().default(true),
       maxAge: DurationSchema.default("365 days"),
-      exposeHeaders: z35.string().array().optional(),
-      credentials: z35.boolean().default(false),
-      headers: z35.string().array().default(["*"]),
-      origins: z35.string().array().default(["*"])
+      exposeHeaders: z36.string().array().optional(),
+      credentials: z36.boolean().default(false),
+      headers: z36.string().array().default(["*"]),
+      origins: z36.string().array().default(["*"])
     }).optional().describe("Specify the cors headers.")
     // version: z.number().int().min(1).optional().describe('Version of the icon configuration.'),
   })
 ).optional().describe("Define an icon proxy in your stack. Store, optimize, and deliver icons at scale.");
 
 // src/feature/image/schema.ts
-import { z as z36 } from "zod";
-var transformationOptionsSchema = z36.object({
-  width: z36.number().int().positive().optional(),
-  height: z36.number().int().positive().optional(),
-  fit: z36.enum(["cover", "contain", "fill", "inside", "outside"]).optional(),
-  position: z36.enum(["top", "right top", "right", "right bottom", "bottom", "left bottom", "left", "left top", "center"]).optional(),
-  quality: z36.number().int().min(1).max(100).optional()
+import { z as z37 } from "zod";
+var transformationOptionsSchema = z37.object({
+  width: z37.number().int().positive().optional(),
+  height: z37.number().int().positive().optional(),
+  fit: z37.enum(["cover", "contain", "fill", "inside", "outside"]).optional(),
+  position: z37.enum(["top", "right top", "right", "right bottom", "bottom", "left bottom", "left", "left top", "center"]).optional(),
+  quality: z37.number().int().min(1).max(100).optional()
 });
 var staticOriginSchema2 = LocalDirectorySchema.describe(
   "Specifies the path to a local image directory that will be uploaded in S3."
@@ -1869,68 +1882,115 @@ var staticOriginSchema2 = LocalDirectorySchema.describe(
 var functionOriginSchema2 = FunctionSchema.describe(
   "Specifies the file that will be called when an image isn't found in the (cache) bucket."
 );
-var ImagesSchema = z36.record(
+var ImagesSchema = z37.record(
   ResourceIdSchema,
-  z36.object({
+  z37.object({
     domain: ResourceIdSchema.describe("The domain id to link your site with.").optional(),
-    subDomain: z36.string().optional(),
+    subDomain: z37.string().optional(),
     log: LogSchema.optional(),
     cacheDuration: DurationSchema.optional().describe("Cache duration of the cached images."),
-    presets: z36.record(z36.string(), transformationOptionsSchema).describe("Named presets for image transformations"),
-    extensions: z36.object({
-      jpeg: z36.object({
-        mozjpeg: z36.boolean().optional(),
-        progressive: z36.boolean().optional()
+    presets: z37.record(z37.string(), transformationOptionsSchema).describe("Named presets for image transformations"),
+    extensions: z37.object({
+      jpeg: z37.object({
+        mozjpeg: z37.boolean().optional(),
+        progressive: z37.boolean().optional()
       }).optional(),
-      webp: z36.object({
-        effort: z36.number().int().min(1).max(10).default(7).optional(),
-        lossless: z36.boolean().optional(),
-        nearLossless: z36.boolean().optional()
+      webp: z37.object({
+        effort: z37.number().int().min(1).max(10).default(7).optional(),
+        lossless: z37.boolean().optional(),
+        nearLossless: z37.boolean().optional()
       }).optional(),
-      png: z36.object({
-        compressionLevel: z36.number().int().min(0).max(9).default(6).optional()
+      png: z37.object({
+        compressionLevel: z37.number().int().min(0).max(9).default(6).optional()
       }).optional()
     }).refine((data) => {
       return Object.keys(data).length > 0;
     }, "At least one extension must be defined.").describe("Specify the allowed extensions."),
-    origin: z36.union([
-      z36.object({
+    origin: z37.union([
+      z37.object({
         static: staticOriginSchema2,
         function: functionOriginSchema2.optional()
       }),
-      z36.object({
+      z37.object({
         static: staticOriginSchema2.optional(),
         function: functionOriginSchema2
       }),
-      z36.object({
+      z37.object({
         static: staticOriginSchema2,
         function: functionOriginSchema2
       })
     ]).describe(
       "Specify the origin of your images. Image transformation will be applied from a base image. Base images can be loaded from a S3 bucket (that is synced from a local directory) or dynamicly from a lambda function."
     ),
-    version: z36.number().int().min(1).optional().describe("Version of the image configuration.")
+    version: z37.number().int().min(1).optional().describe("Version of the image configuration.")
   })
 ).optional().describe("Define an image proxy in your stack. Store, transform, optimize, and deliver images at scale.");
 
+// src/feature/metric/schema.ts
+import { z as z38 } from "zod";
+var ops = {
+  ">": "GreaterThanThreshold",
+  ">=": "GreaterThanOrEqualToThreshold",
+  "<": "LessThanThreshold",
+  "<=": "LessThanOrEqualToThreshold"
+};
+var stats = {
+  count: "SampleCount",
+  avg: "Average",
+  sum: "Sum",
+  min: "Minimum",
+  max: "Maximum"
+};
+var WhereSchema = z38.union([
+  z38.string().regex(/(count|avg|sum|min|max) (>|>=|<|<=) (\d)/, "Invalid where query").transform((where) => {
+    const [stat5, op, value] = where.split(" ");
+    return { stat: stat5, op, value: parseFloat(value) };
+  }),
+  z38.object({
+    stat: z38.enum(["count", "avg", "sum", "min", "max"]),
+    op: z38.enum([">", ">=", "<", "<="]),
+    value: z38.number()
+  })
+]).transform((where) => {
+  return {
+    stat: stats[where.stat],
+    op: ops[where.op],
+    value: where.value
+  };
+});
+var AlarmSchema = z38.object({
+  description: z38.string().optional(),
+  where: WhereSchema,
+  period: DurationSchema,
+  minDataPoints: z38.number().int().default(1),
+  trigger: z38.union([EmailSchema.transform((v) => [v]), EmailSchema.array(), FunctionSchema])
+});
+var MetricsSchema = z38.record(
+  ResourceIdSchema,
+  z38.object({
+    type: z38.enum(["number", "size", "duration"]),
+    alarms: AlarmSchema.array().optional()
+  })
+).optional().describe("Define the metrics in your stack.");
+
 // src/feature/table/schema.ts
 import { minutes as minutes4, seconds as seconds4 } from "@awsless/duration";
-import { z as z37 } from "zod";
-var KeySchema = z37.string().min(1).max(255);
-var TablesSchema = z37.record(
+import { z as z39 } from "zod";
+var KeySchema = z39.string().min(1).max(255);
+var TablesSchema = z39.record(
   ResourceIdSchema,
-  z37.object({
+  z39.object({
     hash: KeySchema.describe(
       "Specifies the name of the partition / hash key that makes up the primary key for the table."
     ),
     sort: KeySchema.optional().describe(
       "Specifies the name of the range / sort key that makes up the primary key for the table."
     ),
-    fields: z37.record(z37.string(), z37.enum(["string", "number", "binary"])).optional().describe(
+    fields: z39.record(z39.string(), z39.enum(["string", "number", "binary"])).optional().describe(
       'A list of attributes that describe the key schema for the table and indexes. If no attribute field is defined we default to "string".'
     ),
-    class: z37.enum(["standard", "standard-infrequent-access"]).default("standard").describe("The table class of the table."),
-    pointInTimeRecovery: z37.boolean().default(false).describe("Indicates whether point in time recovery is enabled on the table."),
+    class: z39.enum(["standard", "standard-infrequent-access"]).default("standard").describe("The table class of the table."),
+    pointInTimeRecovery: z39.boolean().default(false).describe("Indicates whether point in time recovery is enabled on the table."),
     ttl: KeySchema.optional().describe(
       [
         "The name of the TTL attribute used to store the expiration time for items in the table.",
@@ -1938,8 +1998,8 @@ var TablesSchema = z37.record(
       ].join("\n")
     ),
     // deletionProtection: DeletionProtectionSchema.optional(),
-    stream: z37.object({
-      type: z37.enum(["keys-only", "new-image", "old-image", "new-and-old-images"]).describe(
+    stream: z39.object({
+      type: z39.enum(["keys-only", "new-image", "old-image", "new-and-old-images"]).describe(
         [
           "When an item in the table is modified, you can determines what information is written to the stream for this table.",
           "Valid values are:",
@@ -1949,7 +2009,7 @@ var TablesSchema = z37.record(
           "- new-and-old-images - Both the new and the old item images of the item are written to the stream."
         ].join("\n")
       ),
-      batchSize: z37.number().min(1).max(1e4).default(1).describe(
+      batchSize: z39.number().min(1).max(1e4).default(1).describe(
         [
           "The maximum number of records in each batch that Lambda pulls from your stream and sends to your function.",
           "Lambda passes all of the records in the batch to the function in a single call, up to the payload limit for synchronous invocation (6 MB).",
@@ -1979,7 +2039,7 @@ var TablesSchema = z37.record(
       // 			'You can specify a number from -1 to 10000.',
       // 		].join('\n')
       // 	),
-      retryAttempts: z37.number().min(-1).max(1e4).default(-1).describe(
+      retryAttempts: z39.number().min(-1).max(1e4).default(-1).describe(
         [
           "Discard records after the specified number of retries.",
           "The default value is -1, which sets the maximum number of retries to infinite.",
@@ -1987,7 +2047,7 @@ var TablesSchema = z37.record(
           "You can specify a number from -1 to 10000."
         ].join("\n")
       ),
-      concurrencyPerShard: z37.number().min(1).max(10).default(1).describe(
+      concurrencyPerShard: z39.number().min(1).max(10).default(1).describe(
         [
           "The number of batches to process concurrently from each shard.",
           "You can specify a number from 1 to 10."
@@ -1997,16 +2057,16 @@ var TablesSchema = z37.record(
     }).optional().describe(
       "The settings for the DynamoDB table stream, which capture changes to items stored in the table."
     ),
-    indexes: z37.record(
-      z37.string(),
-      z37.object({
+    indexes: z39.record(
+      z39.string(),
+      z39.object({
         hash: KeySchema.describe(
           "Specifies the name of the partition / hash key that makes up the primary key for the global secondary index."
         ),
         sort: KeySchema.optional().describe(
           "Specifies the name of the range / sort key that makes up the primary key for the global secondary index."
         ),
-        projection: z37.enum(["all", "keys-only"]).default("all").describe(
+        projection: z39.enum(["all", "keys-only"]).default("all").describe(
           [
             "The set of attributes that are projected into the index:",
             "- all - All of the table attributes are projected into the index.",
@@ -2020,11 +2080,11 @@ var TablesSchema = z37.record(
 ).optional().describe("Define the tables in your stack.");
 
 // src/feature/task/schema.ts
-import { z as z38 } from "zod";
-var RetryAttemptsSchema2 = z38.number().int().min(0).max(2).describe(
+import { z as z40 } from "zod";
+var RetryAttemptsSchema2 = z40.number().int().min(0).max(2).describe(
   "The maximum number of times to retry when the function returns an error. You can specify a number from 0 to 2."
 );
-var TaskSchema = z38.union([
+var TaskSchema = z40.union([
   LocalFileSchema.transform((file) => ({
     consumer: {
       code: {
@@ -2035,33 +2095,24 @@ var TaskSchema = z38.union([
     },
     retryAttempts: void 0
   })),
-  z38.object({
+  z40.object({
     consumer: FunctionSchema,
     retryAttempts: RetryAttemptsSchema2.optional()
   })
 ]);
-var TasksSchema = z38.record(ResourceIdSchema, TaskSchema).optional().describe("Define the tasks in your stack.");
+var TasksSchema = z40.record(ResourceIdSchema, TaskSchema).optional().describe("Define the tasks in your stack.");
 
 // src/feature/test/schema.ts
-import { z as z39 } from "zod";
-var TestsSchema = z39.union([LocalDirectorySchema.transform((v) => [v]), LocalDirectorySchema.array()]).describe("Define the location of your tests for your stack.").optional();
-
-// src/feature/topic/schema.ts
-import { kebabCase as kebabCase3 } from "change-case";
-import { z as z40 } from "zod";
-var TopicNameSchema = z40.string().min(3).max(256).regex(/^[a-z0-9\-]+$/i, "Invalid topic name").transform((value) => kebabCase3(value)).describe("Define event topic name.");
-var TopicsSchema = z40.array(TopicNameSchema).refine((topics) => {
-  return topics.length === new Set(topics).size;
-}, "Must be a list of unique topic names").optional().describe("Define the event topics to publish too in your stack.");
-var SubscribersSchema = z40.record(TopicNameSchema, FunctionSchema).optional().describe("Define the event topics to subscribe too in your stack.");
+import { z as z41 } from "zod";
+var TestsSchema = z41.union([LocalDirectorySchema.transform((v) => [v]), LocalDirectorySchema.array()]).describe("Define the location of your tests for your stack.").optional();
 
 // src/config/stack.ts
 var DependsSchema = ResourceIdSchema.array().optional().describe("Define the stacks that this stack is depended on.");
 var NameSchema = ResourceIdSchema.refine((name) => !["base", "hostedzones"].includes(name), {
   message: `Stack name can't be a reserved name.`
 }).describe("Stack name.");
-var StackSchema = z41.object({
-  $schema: z41.string().optional(),
+var StackSchema = z42.object({
+  $schema: z42.string().optional(),
   name: NameSchema,
   depends: DependsSchema,
   commands: CommandsSchema,
@@ -2074,7 +2125,7 @@ var StackSchema = z41.object({
   configs: ConfigsSchema,
   crons: CronsSchema,
   caches: CachesSchema,
-  topics: TopicsSchema,
+  // topics: TopicsSchema,
   subscribers: SubscribersSchema,
   functions: FunctionsSchema,
   instances: InstancesSchema,
@@ -2088,7 +2139,8 @@ var StackSchema = z41.object({
   sites: SitesSchema,
   tests: TestsSchema,
   images: ImagesSchema,
-  icons: IconsSchema
+  icons: IconsSchema,
+  metrics: MetricsSchema
 });
 
 // src/config/load/read.ts
@@ -2130,13 +2182,13 @@ var readConfigWithStage = async (file, stage) => {
 };
 
 // src/config/load/validate.ts
-import { z as z42 } from "zod";
+import { z as z43 } from "zod";
 var validateConfig = async (schema, file, data) => {
   try {
     const result = await schema.parseAsync(data);
     return result;
   } catch (error) {
-    if (error instanceof z42.ZodError) {
+    if (error instanceof z43.ZodError) {
       throw new ConfigError(file, error, data);
     }
     throw error;
@@ -2889,7 +2941,7 @@ var formatByteSize = (size) => {
 
 // src/feature/on-failure/util.ts
 var getGlobalOnFailure = (ctx) => {
-  return ctx.appConfig.defaults.onFailure ? ctx.shared.get("on-failure", "queue-arn") : void 0;
+  return ctx.shared.get("on-failure", "queue-arn");
 };
 
 // src/feature/function/build/typescript/bundle.ts
@@ -3226,7 +3278,8 @@ var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
           Statement: list3.map((statement) => ({
             Effect: pascalCase(statement.effect ?? "allow"),
             Action: statement.actions,
-            Resource: statement.resources
+            Resource: statement.resources,
+            Condition: statement.conditions
           }))
         })
       );
@@ -3432,19 +3485,17 @@ var createAsyncLambdaFunction = (group, ctx, ns, id, local) => {
       functionName: result.lambda.arn,
       maximumRetryAttempts: props.retryAttempts,
       destinationConfig: {
-        onFailure: onFailure ? { destination: onFailure } : void 0
+        onFailure: { destination: onFailure }
       }
     },
     {
       dependsOn: [result.policy]
     }
   );
-  if (onFailure) {
-    result.addPermission({
-      actions: ["sqs:SendMessage", "sqs:GetQueueUrl"],
-      resources: [onFailure]
-    });
-  }
+  result.addPermission({
+    actions: ["sqs:SendMessage", "sqs:GetQueueUrl"],
+    resources: [onFailure]
+  });
   return result;
 };
 
@@ -3796,7 +3847,7 @@ var functionFeature = defineFeature({
       // forceDelete: true,
     });
     ctx.shared.set("function", "bucket-name", bucket.bucket);
-    const warmGroup = new $6.aws.scheduler.ScheduleGroup(ctx.base, "warm", {
+    const warmGroup = new $6.aws.scheduler.ScheduleGroup(group, "warm", {
       name: formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "function",
@@ -3859,9 +3910,6 @@ var onFailureFeature = defineFeature({
   // 	}
   // },
   onApp(ctx) {
-    if (!ctx.appConfig.defaults.onFailure) {
-      return;
-    }
     const group = new Group8(ctx.base, "on-failure", "main");
     const queue2 = new $8.aws.sqs.Queue(group, "on-failure", {
       name: formatGlobalResourceName({
@@ -3870,8 +3918,10 @@ var onFailureFeature = defineFeature({
         resourceName: "failure"
       })
     });
-    ctx.addEnv("ON_FAILURE_QUEUE_ARN", queue2.arn);
     ctx.shared.set("on-failure", "queue-arn", queue2.arn);
+    if (!ctx.appConfig.defaults.onFailure) {
+      return;
+    }
     const result = createLambdaFunction(group, ctx, "on-failure", "consumer", ctx.appConfig.defaults.onFailure);
     new $8.aws.lambda.EventSourceMapping(
       group,
@@ -3896,31 +3946,6 @@ var onFailureFeature = defineFeature({
       resources: [queue2.arn]
     });
   }
-  // onStack(ctx) {
-  // 	const onFailure = ctx.stackConfig.onFailure
-  // 	if (!onFailure) {
-  // 		return
-  // 	}
-  // 	const queueArn = ctx.shared.get<aws.ARN>('on-failure-queue-arn')
-  // 	const group = new Node(ctx.stack, 'on-failure', 'failure')
-  // 	const { lambda, policy } = createLambdaFunction(group, ctx, 'on-failure', 'failure', onFailure)
-  // 	const source = new aws.lambda.EventSourceMapping(group, 'on-failure', {
-  // 		functionArn: lambda.arn,
-  // 		sourceArn: queueArn,
-  // 		batchSize: 10,
-  // 	})
-  // 	source.dependsOn(policy)
-  // 	policy.addStatement({
-  // 		actions: [
-  // 			'sqs:SendMessage',
-  // 			'sqs:DeleteMessage',
-  // 			'sqs:ReceiveMessage',
-  // 			'sqs:GetQueueUrl',
-  // 			'sqs:GetQueueAttributes',
-  // 		],
-  // 		resources: [queueArn],
-  // 	})
-  // },
 });
 
 // src/feature/pubsub/index.ts
@@ -3949,87 +3974,137 @@ var formatFullDomainName = (config2, id, subDomain) => {
 var pubsubFeature = defineFeature({
   name: "pubsub",
   onApp(ctx) {
-    for (const [id, props] of Object.entries(ctx.appConfig.defaults.pubsub ?? {})) {
+    for (const [id, props] of Object.entries(ctx.appConfig.defaults?.pubsub ?? {})) {
       const group = new Group9(ctx.base, "pubsub", id);
-      const { lambda } = createLambdaFunction(group, ctx, "pubsub-authorizer", id, props.auth);
+      const shortName = `${ctx.app.name}--${id}`;
       const name = formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "pubsub",
         resourceName: id
       });
-      const authorizer = new $9.aws.iot.Authorizer(group, "authorizer", {
-        name,
-        authorizerFunctionArn: lambda.arn,
-        status: "ACTIVE",
-        signingDisabled: true,
-        enableCachingForHttp: false
+      const authGroup = new Group9(group, "auth", "lambda");
+      const { lambda: authLambda } = createLambdaFunction(authGroup, ctx, "pubsub", `${id}-auth`, {
+        ...props.auth,
+        description: `PubSub ${id} authorizer`
       });
-      new $9.aws.lambda.Permission(group, "permission", {
-        functionName: lambda.functionName,
-        action: "lambda:InvokeFunction",
-        principal: "iot.amazonaws.com",
-        sourceArn: authorizer.arn
+      let loggingRole;
+      if (props.logLevel) {
+        loggingRole = new $9.aws.iam.Role(group, "logging-role", {
+          name: shortId(`${name}-logging-role`),
+          assumeRolePolicy: JSON.stringify({
+            Version: "2012-10-17",
+            Statement: [
+              {
+                Effect: "Allow",
+                Principal: {
+                  Service: "appsync.amazonaws.com"
+                },
+                Action: "sts:AssumeRole"
+              }
+            ]
+          })
+        });
+        new $9.aws.iam.RolePolicyAttachment(group, "logs-policy", {
+          role: loggingRole.name,
+          policyArn: "arn:aws:iam::aws:policy/service-role/AWSAppSyncPushToCloudWatchLogs"
+        });
+      }
+      const api = new $9.aws.appsync.Api(group, "api", {
+        name: shortName,
+        eventConfig: [
+          {
+            connectionAuthMode: [{ authType: "AWS_IAM" }, { authType: "AWS_LAMBDA" }],
+            authProvider: [
+              {
+                authType: "AWS_LAMBDA",
+                lambdaAuthorizerConfig: [
+                  {
+                    authorizerUri: authLambda.arn,
+                    authorizerResultTtlInSeconds: 300
+                  }
+                ]
+              },
+              {
+                authType: "AWS_IAM"
+              }
+            ],
+            defaultPublishAuthMode: [
+              {
+                authType: "AWS_IAM"
+              }
+            ],
+            defaultSubscribeAuthMode: [
+              {
+                authType: "AWS_LAMBDA"
+              },
+              {
+                authType: "AWS_IAM"
+              }
+            ],
+            logConfig: props.logLevel ? [
+              {
+                logLevel: props.logLevel.toUpperCase(),
+                cloudwatchLogsRoleArn: loggingRole.arn
+              }
+            ] : void 0
+          }
+        ]
       });
-      ctx.bind(`PUBSUB_${constantCase5(id)}_AUTHORIZER`, name);
-      const endpoint = $9.aws.iot.getEndpoint(group, "endpoint", {
-        endpointType: "iot:Data-ATS"
+      const namespaces = props.namespaces ?? ["default"];
+      for (const namespace of namespaces) {
+        new $9.aws.appsync.ChannelNamespace(group, `namespace-${namespace}`, {
+          name: namespace,
+          apiId: api.apiId
+        });
+      }
+      new $9.aws.lambda.Permission(group, "auth-permission", {
+        action: "lambda:InvokeFunction",
+        principal: "appsync.amazonaws.com",
+        functionName: authLambda.functionName,
+        sourceArn: api.apiArn
       });
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
-        new $9.aws.iot.DomainConfiguration(group, "domain", {
-          name,
+        const zoneId = ctx.shared.entry("domain", `zone-id`, props.domain);
+        const certificateArn = ctx.shared.entry("domain", `certificate-arn`, props.domain);
+        const apiDomain = new $9.aws.appsync.DomainName(group, "domain", {
           domainName,
-          serverCertificateArns: [ctx.shared.entry("domain", `certificate-arn`, props.domain)],
-          authorizerConfig: {
-            defaultAuthorizerName: authorizer.name
-          }
-          // validationCertificate: ctx.shared.get(`global-certificate-${props.domain}-arn`),
+          certificateArn
+        });
+        new $9.aws.appsync.DomainNameApiAssociation(group, "domain-association", {
+          apiId: api.apiArn,
+          domainName: apiDomain.domainName
         });
         new $9.aws.route53.Record(group, "record", {
-          zoneId: ctx.shared.entry("domain", `zone-id`, props.domain),
-          name: domainName,
+          zoneId,
           type: "CNAME",
-          records: [endpoint.endpointAddress]
+          name: domainName,
+          records: [apiDomain.appsyncDomainName],
+          ttl: 300
         });
-        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, domainName);
+        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, `${domainName}/event`);
+        ctx.bind(`PUBSUB_${constantCase5(id)}_REALTIME_ENDPOINT`, `${domainName}/event/realtime`);
       } else {
-        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, endpoint.endpointAddress);
+        ctx.bind(
+          `PUBSUB_${constantCase5(id)}_ENDPOINT`,
+          api.dns.pipe((dns) => dns.HTTP)
+        );
+        ctx.bind(
+          `PUBSUB_${constantCase5(id)}_REALTIME_ENDPOINT`,
+          api.dns.pipe((dns) => dns.REALTIME)
+        );
       }
     }
-    ctx.addGlobalPermission({
-      actions: [`iot:Publish`],
-      resources: [
-        //
-        `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`,
-        `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/${ctx.app.name}/pubsub/*`
-      ]
-    });
-  },
-  onStack(ctx) {
-    for (const [id, props] of Object.entries(ctx.stackConfig.pubsub ?? {})) {
-      const group = new Group9(ctx.stack, "pubsub", id);
-      const { lambda } = createAsyncLambdaFunction(group, ctx, `pubsub`, id, props.consumer);
-      const name = formatLocalResourceName({
-        appName: ctx.app.name,
-        stackName: ctx.stack.name,
-        resourceType: "pubsub",
-        resourceName: id
-      });
-      const topic = new $9.aws.iot.TopicRule(group, "rule", {
-        name: name.replaceAll("-", "_"),
-        enabled: true,
-        sql: props.sql,
-        sqlVersion: props.sqlVersion,
-        lambda: [{ functionArn: lambda.arn }]
-      });
-      new $9.aws.lambda.Permission(group, "permission", {
-        action: "lambda:InvokeFunction",
-        principal: "iot.amazonaws.com",
-        functionName: lambda.functionName,
-        sourceArn: topic.arn
-      });
-    }
   }
+  // Note: The onStack method would handle channel namespaces and subscriptions
+  // but is commented out for now as it needs to be refactored for AppSync Event API
+  // onStack(ctx) {
+  // 	// Channel namespaces and event handlers would be configured here
+  // 	// This would include:
+  // 	// 1. Creating channel namespaces with their own auth modes (overriding defaults)
+  // 	// 2. Setting up event handlers (Lambda functions) for specific channels
+  // 	// 3. Configuring event filtering and routing rules
+  // },
 });
 
 // src/feature/queue/index.ts
@@ -4111,7 +4186,7 @@ var queueFeature = defineFeature({
         receiveWaitTimeSeconds: toSeconds3(props.receiveMessageWaitTime ?? seconds5(0)),
         messageRetentionSeconds: toSeconds3(props.retentionPeriod),
         maxMessageSize: toBytes(props.maxMessageSize),
-        redrivePolicy: onFailure && onFailure.pipe(
+        redrivePolicy: onFailure.pipe(
           (arn) => JSON.stringify({
             deadLetterTargetArn: arn,
             maxReceiveCount: 100
@@ -5403,6 +5478,30 @@ var siteFeature = defineFeature({
 import { Group as Group16 } from "@awsless/formation";
 import { kebabCase as kebabCase7 } from "change-case";
 import { $ as $16 } from "@awsless/formation";
+import { glob as glob3 } from "glob";
+
+// src/feature/store/util.ts
+import { contentType as contentType2, lookup as lookup2 } from "mime-types";
+import { extname as extname3 } from "path";
+var getCacheControl2 = (file) => {
+  switch (lookup2(file)) {
+    case false:
+    case "text/html":
+    case "application/json":
+    case "application/manifest+json":
+    case "application/manifest":
+    case "text/markdown":
+      return "s-maxage=31536000, max-age=0";
+    default:
+      return `public, max-age=31536000, immutable`;
+  }
+};
+var getContentType2 = (file) => {
+  return contentType2(extname3(file)) || "text/html; charset=utf-8";
+};
+
+// src/feature/store/index.ts
+import { join as join12 } from "path";
 var typeGenCode5 = `
 import { Body, PutObjectProps, BodyStream } from '@awsless/s3'
 
@@ -5495,6 +5594,24 @@ var storeFeature = defineFeature({
           import: ctx.import ? name : void 0
         }
       );
+      ctx.onReady(() => {
+        if (typeof props.static === "string" && bucket) {
+          const files = glob3.sync("**", {
+            cwd: props.static,
+            nodir: true
+          });
+          for (const file of files) {
+            new $16.aws.s3.BucketObject(group, file, {
+              bucket: bucket.bucket,
+              key: file,
+              cacheControl: getCacheControl2(file),
+              contentType: getContentType2(file),
+              source: join12(props.static, file),
+              sourceHash: $hash(join12(props.static, file))
+            });
+          }
+        }
+      });
       const eventMap = {
         "created:*": "s3:ObjectCreated:*",
         "created:put": "s3:ObjectCreated:Put",
@@ -5678,7 +5795,9 @@ var tableFeature = defineFeature({
             functionResponseTypes: ["ReportBatchItemFailures"],
             startingPosition: "LATEST",
             destinationConfig: {
-              onFailure: onFailure ? { destinationArn: onFailure } : void 0
+              onFailure: {
+                destinationArn: onFailure
+              }
             }
           },
           { dependsOn: [result.policy] }
@@ -5692,12 +5811,10 @@ var tableFeature = defineFeature({
           ],
           resources: [table.streamArn]
         });
-        if (onFailure) {
-          result.addPermission({
-            actions: ["sqs:SendMessage", "sqs:GetQueueUrl"],
-            resources: [onFailure]
-          });
-        }
+        result.addPermission({
+          actions: ["sqs:SendMessage", "sqs:GetQueueUrl"],
+          resources: [onFailure]
+        });
       }
       ctx.addStackPermission({
         actions: [
@@ -5891,17 +6008,15 @@ var topicFeature = defineFeature({
     const resources2 = new TypeObject(1);
     const mocks = new TypeObject(1);
     const mockResponses = new TypeObject(1);
-    for (const stack of ctx.stackConfigs) {
-      for (const topic of stack.topics || []) {
-        const name = formatGlobalResourceName({
-          appName: ctx.appConfig.name,
-          resourceType: "topic",
-          resourceName: topic
-        });
-        mockResponses.addType(topic, "Mock");
-        resources2.addType(topic, `Publish<'${name}'>`);
-        mocks.addType(topic, `MockBuilder`);
-      }
+    for (const topic of ctx.appConfig.defaults.topics ?? []) {
+      const name = formatGlobalResourceName({
+        appName: ctx.appConfig.name,
+        resourceType: "topic",
+        resourceName: topic
+      });
+      mockResponses.addType(topic, "Mock");
+      resources2.addType(topic, `Publish<'${name}'>`);
+      mocks.addType(topic, `MockBuilder`);
     }
     gen.addCode(typeGenCode7);
     gen.addInterface("TopicResources", resources2);
@@ -5910,40 +6025,29 @@ var topicFeature = defineFeature({
     await ctx.write("topic.d.ts", gen, true);
   },
   onValidate(ctx) {
-    const unique = [];
-    for (const stack of ctx.stackConfigs) {
-      for (const topic of stack.topics ?? []) {
-        if (unique.includes(topic)) {
-          throw new FileError(stack.file, `Duplicate topic "${topic}"`);
-        } else {
-          unique.push(topic);
-        }
-      }
-    }
+    const topics = ctx.appConfig.defaults.topics ?? [];
     for (const stack of ctx.stackConfigs) {
       for (const topic of Object.keys(stack.subscribers ?? {})) {
-        if (!unique.includes(topic)) {
-          throw new FileError(stack.file, `Subscription to a undefined topic "${topic}"`);
+        if (!topics.includes(topic)) {
+          throw new FileError(stack.file, `Subscription to a non existent topic "${topic}"`);
         }
       }
     }
   },
   onApp(ctx) {
-    for (const stack of ctx.stackConfigs) {
-      for (const id of stack.topics ?? []) {
-        const group = new Group19(ctx.base, "topic", id);
-        const name = formatGlobalResourceName({
-          appName: ctx.appConfig.name,
-          resourceType: "topic",
-          resourceName: id
-        });
-        const topic = new $19.aws.sns.Topic(group, "topic", {
-          name
-        });
-        ctx.shared.add("topic", `arn`, id, topic.arn);
-      }
+    for (const id of ctx.appConfig.defaults.topics ?? []) {
+      const group = new Group19(ctx.base, "topic", id);
+      const name = formatGlobalResourceName({
+        appName: ctx.appConfig.name,
+        resourceType: "topic",
+        resourceName: id
+      });
+      const topic = new $19.aws.sns.Topic(group, "topic", {
+        name
+      });
+      ctx.shared.add("topic", `arn`, id, topic.arn);
     }
-    ctx.addAppPermission({
+    ctx.addGlobalPermission({
       actions: ["sns:Publish"],
       resources: [
         `arn:aws:sns:${ctx.appConfig.region}:${ctx.accountId}:${formatGlobalResourceName({
@@ -5955,12 +6059,6 @@ var topicFeature = defineFeature({
     });
   },
   onStack(ctx) {
-    for (const id of ctx.stackConfig.topics ?? []) {
-      ctx.addStackPermission({
-        actions: ["sns:Publish"],
-        resources: [ctx.shared.entry("topic", "arn", id)]
-      });
-    }
     for (const [id, props] of Object.entries(ctx.stackConfig.subscribers ?? {})) {
       const group = new Group19(ctx.stack, "topic", id);
       const topicArn = ctx.shared.entry("topic", "arn", id);
@@ -6107,7 +6205,7 @@ var alertFeature = defineFeature({
         name
       });
       for (const email of emails) {
-        new $21.aws.sns.TopicSubscription(group, id, {
+        new $21.aws.sns.TopicSubscription(group, email, {
           topicArn: topic.arn,
           protocol: "email",
           endpoint: email
@@ -6204,12 +6302,12 @@ var layerFeature = defineFeature({
 
 // src/feature/image/index.ts
 import { $ as $23, Group as Group23 } from "@awsless/formation";
-import { join as join12, dirname as dirname8 } from "path";
+import { join as join13, dirname as dirname8 } from "path";
 import { mebibytes as mebibytes4 } from "@awsless/size";
 import { days as days7, seconds as seconds9, toDays as toDays6, toSeconds as toSeconds8 } from "@awsless/duration";
 import { constantCase as constantCase12 } from "change-case";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { glob as glob3 } from "glob";
+import { glob as glob4 } from "glob";
 var __dirname2 = dirname8(fileURLToPath2(import.meta.url));
 var imageFeature = defineFeature({
   name: "image",
@@ -6221,7 +6319,7 @@ var imageFeature = defineFeature({
       return;
     }
     const group = new Group23(ctx.base, "image", "layer");
-    const path = join12(__dirname2, "/layers/sharp-arm.zip");
+    const path = join13(__dirname2, "/layers/sharp-arm.zip");
     const layerId = formatGlobalResourceName({
       appName: ctx.appConfig.name,
       resourceType: "layer",
@@ -6304,8 +6402,8 @@ var imageFeature = defineFeature({
         resourceName: "sharp"
       });
       const serverLambda = createPrebuildLambdaFunction(group, ctx, "image", id, {
-        bundleFile: join12(__dirname2, "/prebuild/image/bundle.zip"),
-        bundleHash: join12(__dirname2, "/prebuild/image/HASH"),
+        bundleFile: join13(__dirname2, "/prebuild/image/bundle.zip"),
+        bundleHash: join13(__dirname2, "/prebuild/image/HASH"),
         memorySize: mebibytes4(512),
         timeout: seconds9(10),
         handler: "index.default",
@@ -6363,7 +6461,7 @@ var imageFeature = defineFeature({
       }
       ctx.onReady(() => {
         if (props.origin.static && s3Origin) {
-          const files = glob3.sync("**", {
+          const files = glob4.sync("**", {
             cwd: props.origin.static,
             nodir: true
           });
@@ -6371,8 +6469,8 @@ var imageFeature = defineFeature({
             new $23.aws.s3.BucketObject(group, `static-${file}`, {
               bucket: s3Origin.bucket,
               key: file,
-              source: join12(props.origin.static, file),
-              sourceHash: $hash(join12(props.origin.static, file))
+              source: join13(props.origin.static, file),
+              sourceHash: $hash(join13(props.origin.static, file))
             });
           }
         }
@@ -6524,12 +6622,12 @@ var imageFeature = defineFeature({
 
 // src/feature/icon/index.ts
 import { $ as $24, Group as Group24 } from "@awsless/formation";
-import { join as join13, dirname as dirname9 } from "path";
+import { join as join14, dirname as dirname9 } from "path";
 import { mebibytes as mebibytes5 } from "@awsless/size";
 import { days as days8, seconds as seconds10, toDays as toDays7, toSeconds as toSeconds9 } from "@awsless/duration";
 import { constantCase as constantCase13 } from "change-case";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { glob as glob4 } from "glob";
+import { glob as glob5 } from "glob";
 var __dirname3 = dirname9(fileURLToPath3(import.meta.url));
 var iconFeature = defineFeature({
   name: "icon",
@@ -6582,8 +6680,8 @@ var iconFeature = defineFeature({
         } : {}
       });
       const serverLambda = createPrebuildLambdaFunction(group, ctx, "icon", id, {
-        bundleFile: join13(__dirname3, "/prebuild/icon/bundle.zip"),
-        bundleHash: join13(__dirname3, "/prebuild/icon/HASH"),
+        bundleFile: join14(__dirname3, "/prebuild/icon/bundle.zip"),
+        bundleHash: join14(__dirname3, "/prebuild/icon/HASH"),
         memorySize: mebibytes5(512),
         timeout: seconds10(10),
         handler: "index.default",
@@ -6639,7 +6737,7 @@ var iconFeature = defineFeature({
       }
       ctx.onReady(() => {
         if (props.origin.static && s3Origin) {
-          const files = glob4.sync("**", {
+          const files = glob5.sync("**", {
             cwd: props.origin.static,
             nodir: true
           });
@@ -6650,8 +6748,8 @@ var iconFeature = defineFeature({
             new $24.aws.s3.BucketObject(group, `static-${file}`, {
               bucket: s3Origin.bucket,
               key: file,
-              source: join13(props.origin.static, file),
-              sourceHash: $hash(join13(props.origin.static, file))
+              source: join14(props.origin.static, file),
+              sourceHash: $hash(join14(props.origin.static, file))
             });
           }
         }
@@ -6811,15 +6909,15 @@ import { toMebibytes as toMebibytes4 } from "@awsless/size";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
 import { constantCase as constantCase14, pascalCase as pascalCase3 } from "change-case";
 import deepmerge4 from "deepmerge";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // src/feature/instance/build/executable.ts
 import { createHash as createHash4 } from "crypto";
 import { readFile as readFile4 } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import { exec as exec2 } from "promisify-child-process";
 var buildExecutable = async (input, outputPath) => {
-  const filePath = join14(outputPath, "program");
+  const filePath = join15(outputPath, "program");
   const args = ["build", input, "--compile", "--target", "bun-linux-x64-modern", "--outfile", filePath];
   try {
     await exec2(`bun ${args.join(" ")}`);
@@ -7039,7 +7137,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
               healthCheck: props.healthCheck ? {
                 command: [
                   "CMD-SHELL",
-                  `curl -f http://${join15("localhost", props.healthCheck.path)} || exit 1`
+                  `curl -f http://${join16("localhost", props.healthCheck.path)} || exit 1`
                 ],
                 interval: toSeconds10(props.healthCheck.interval),
                 retries: props.healthCheck.retries,
@@ -7214,6 +7312,133 @@ var instanceFeature = defineFeature({
   }
 });
 
+// src/feature/metric/index.ts
+import { $ as $27, Group as Group27 } from "@awsless/formation";
+import { kebabCase as kebabCase8, constantCase as constantCase15 } from "change-case";
+import { toSeconds as toSeconds11 } from "@awsless/duration";
+var typeGenCode9 = `
+import { type PutDataProps, putData, batchPutData } from '@awsless/cloudwatch'
+
+type PutResponse = ReturnType<typeof putData>
+type Batch = typeof batchPutData
+
+type MetricBase<NS extends string, N extends string> = {
+	readonly namespace: NS
+	readonly name: N
+}
+
+type NumberMetric = {
+	readonly unit: 'number'
+	put(value: number | number[], options?: PutDataProps): PutResponse
+}
+
+type DurationMetric = {
+	readonly unit: 'duration'
+	put(value: Duration | Duration[], options?: PutDataProps): PutResponse
+}
+
+type SizeMetric = {
+	readonly unit: 'size'
+	put(value: Size | Size[], options?: PutDataProps): PutResponse
+}
+`;
+var metricFeature = defineFeature({
+  name: "metric",
+  async onTypeGen(ctx) {
+    const gen = new TypeFile("@awsless/awsless");
+    const resources2 = new TypeObject(1);
+    for (const stack of ctx.stackConfigs ?? []) {
+      const namespace = `awsless/${kebabCase8(ctx.appConfig.name)}/${kebabCase8(stack.name)}`;
+      const stackResources = new TypeObject(2);
+      for (const [id, metric] of Object.entries(stack.metrics ?? {})) {
+        const name = kebabCase8(id);
+        const types2 = {
+          number: "NumberMetric",
+          duration: "DurationMetric",
+          size: "SizeMetric"
+        };
+        stackResources.addType(id, `MetricBase<'${namespace}', '${name}'> & ${types2[metric.type]}`);
+      }
+      resources2.addType(stack.name, stackResources);
+    }
+    resources2.addType("batch", "Batch");
+    gen.addCode(typeGenCode9);
+    gen.addInterface("MetricResources", resources2);
+    await ctx.write("metric.d.ts", gen, true);
+  },
+  onStack(ctx) {
+    const namespace = `awsless/${kebabCase8(ctx.app.name)}/${kebabCase8(ctx.stack.name)}`;
+    ctx.addStackPermission({
+      actions: ["cloudwatch:PutMetricData"],
+      resources: ["*"],
+      conditions: {
+        StringEquals: {
+          // Luckily we can limit access to only the namespace.
+          "cloudwatch:namespace": namespace
+        }
+      }
+    });
+    for (const [id, props] of Object.entries(ctx.stackConfig.metrics ?? {})) {
+      const group = new Group27(ctx.stack, "metric", id);
+      ctx.addEnv(`METRIC_${constantCase15(id)}`, props.type);
+      for (const alarmId in props.alarms ?? []) {
+        const alarmGroup = new Group27(group, "alarm", alarmId);
+        const alarmName = kebabCase8(`${id}-${alarmId}`);
+        const alarmProps = props.alarms[alarmId];
+        let alarmAction;
+        let alarmLambda;
+        if (Array.isArray(alarmProps.trigger)) {
+          const topic = new $27.aws.sns.Topic(alarmGroup, "alarm-trigger", {
+            name: formatLocalResourceName({
+              appName: ctx.app.name,
+              stackName: ctx.stack.name,
+              resourceType: "metric",
+              resourceName: alarmName
+            })
+          });
+          alarmAction = topic.arn;
+          for (const email of alarmProps.trigger) {
+            new $27.aws.sns.TopicSubscription(alarmGroup, email, {
+              topicArn: topic.arn,
+              protocol: "email",
+              endpoint: email
+            });
+          }
+        } else {
+          const { lambda } = createLambdaFunction(alarmGroup, ctx, "metric", alarmName, alarmProps.trigger);
+          alarmLambda = lambda;
+          alarmAction = lambda.arn;
+        }
+        const alarm = new $27.aws.cloudwatch.MetricAlarm(alarmGroup, "alarm", {
+          namespace,
+          metricName: kebabCase8(id),
+          alarmName: formatLocalResourceName({
+            appName: ctx.app.name,
+            stackName: ctx.stack.name,
+            resourceType: "metric",
+            resourceName: alarmName
+          }),
+          alarmDescription: alarmProps.description,
+          statistic: alarmProps.where.stat,
+          threshold: alarmProps.where.value,
+          period: toSeconds11(alarmProps.period),
+          evaluationPeriods: alarmProps.minDataPoints,
+          comparisonOperator: alarmProps.where.op,
+          alarmActions: [alarmAction]
+        });
+        if (alarmLambda) {
+          new $27.aws.lambda.Permission(alarmGroup, "permission", {
+            action: "lambda:InvokeFunction",
+            principal: "lambda.alarms.cloudwatch.amazonaws.com",
+            functionName: alarmLambda.functionName,
+            sourceArn: alarm.arn
+          });
+        }
+      }
+    }
+  }
+});
+
 // src/feature/index.ts
 var features = [
   // 1
@@ -7233,6 +7458,7 @@ var features = [
   configFeature,
   searchFeature,
   pubsubFeature,
+  metricFeature,
   // streamFeature,
   tableFeature,
   topicFeature,
@@ -8112,13 +8338,13 @@ import wildstring4 from "wildstring";
 import { log as log15 } from "@awsless/clui";
 import chalk4 from "chalk";
 import { mkdir as mkdir4, readFile as readFile6, writeFile as writeFile3 } from "fs/promises";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 import wildstring3 from "wildstring";
 
 // src/build/__fingerprint.ts
 import { createHash as createHash5 } from "crypto";
 import { readdir as readdir4, readFile as readFile5, stat as stat4 } from "fs/promises";
-import { basename as basename4, dirname as dirname10, extname as extname3, join as join16 } from "path";
+import { basename as basename4, dirname as dirname10, extname as extname4, join as join17 } from "path";
 import parseStaticImports from "parse-static-imports";
 var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
 var generateFileHashes = async (file, hashes) => {
@@ -8139,8 +8365,8 @@ var fingerprintFromDirectory = async (dir) => {
   const hashes = /* @__PURE__ */ new Map();
   const files = await readdir4(dir, { recursive: true });
   for (const file of files) {
-    if (extensions.includes(extname3(file).substring(1)) && file.at(0) !== "_") {
-      await generateFileHashes(join16(dir, file), hashes);
+    if (extensions.includes(extname4(file).substring(1)) && file.at(0) !== "_") {
+      await generateFileHashes(join17(dir, file), hashes);
     }
   }
   const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
@@ -8154,7 +8380,7 @@ var readModuleFile = (file) => {
     return readFiles([
       file,
       ...extensions.map((exp) => `${file}.${exp}`),
-      ...extensions.map((exp) => join16(file, `/index.${exp}`))
+      ...extensions.map((exp) => join17(file, `/index.${exp}`))
     ]);
   }
   return readFile5(file, "utf8");
@@ -8174,7 +8400,7 @@ var readFiles = async (files) => {
 };
 var findDependencies = async (file, code) => {
   const imports = await parseStaticImports(code);
-  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join16(dirname10(file), value) : value);
+  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join17(dirname10(file), value) : value);
 };
 
 // src/test/reporter.ts
@@ -8254,7 +8480,7 @@ var CustomReporter = class {
 import commonjs2 from "@rollup/plugin-commonjs";
 import json2 from "@rollup/plugin-json";
 import nodeResolve2 from "@rollup/plugin-node-resolve";
-import { dirname as dirname11, join as join17 } from "path";
+import { dirname as dirname11, join as join18 } from "path";
 import { swc as swc2 } from "rollup-plugin-swc3";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { configDefaults } from "vitest/config";
@@ -8276,7 +8502,7 @@ var startTest = async (props) => {
       reporters: props.reporter,
       setupFiles: [
         //
-        join17(__dirname4, "test-global-setup.js")
+        join18(__dirname4, "test-global-setup.js")
       ]
       // globalSetup: [
       // 	//
@@ -8366,7 +8592,7 @@ var logTestErrors = (event) => {
 var runTest = async (stack, dir, filters, opts) => {
   await mkdir4(directories.test, { recursive: true });
   const fingerprint = await fingerprintFromDirectory(dir);
-  const file = join18(directories.test, `${stack}.json`);
+  const file = join19(directories.test, `${stack}.json`);
   const exists = await fileExist(file);
   if (exists && !process.env.NO_CACHE) {
     const raw = await readFile6(file, { encoding: "utf8" });
@@ -8609,7 +8835,7 @@ var auth = (program2) => {
 
 // src/cli/command/bind.ts
 import { log as log17 } from "@awsless/clui";
-import { constantCase as constantCase15 } from "change-case";
+import { constantCase as constantCase16 } from "change-case";
 import { spawn } from "child_process";
 var bind = (program2) => {
   program2.command("bind").argument("[command...]", "The command to execute").option("--config <string...>", "List of config values that will be accessable", (v) => v.split(",")).description(`Bind your site environment variables to a command`).action(async (commands9 = [], opts) => {
@@ -8638,10 +8864,10 @@ var bind = (program2) => {
       const configList = opts.config ?? [];
       const configs = {};
       for (const name of configList) {
-        configs[`CONFIG_${constantCase15(name)}`] = name;
+        configs[`CONFIG_${constantCase16(name)}`] = name;
       }
       if (configList.length ?? 0 > 0) {
-        log17.note("Bind Config", configList.map((v) => color.label(constantCase15(v))).join("\n"));
+        log17.note("Bind Config", configList.map((v) => color.label(constantCase16(v))).join("\n"));
       }
       if (commands9.length === 0) {
         return "No command to execute.";
@@ -8704,7 +8930,7 @@ import { log as log18 } from "@awsless/clui";
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname12, join as join19, relative as relative7 } from "path";
+import { dirname as dirname12, join as join20, relative as relative7 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -8713,7 +8939,7 @@ var generateTypes = async (props) => {
         ...props,
         async write(file, data, include = false) {
           const code = data?.toString("utf8");
-          const path = join19(directories.types, file);
+          const path = join20(directories.types, file);
           if (code) {
             if (include) {
               files.push(relative7(directories.root, path));
@@ -8727,7 +8953,7 @@ var generateTypes = async (props) => {
   );
   if (files.length) {
     const code = files.map((file) => `/// <reference path='${file}' />`).join("\n");
-    await writeFile4(join19(directories.root, `awsless.d.ts`), code);
+    await writeFile4(join20(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -8769,7 +8995,7 @@ var resources = (program2) => {
       const accountId = await getAccountId(credentials, region);
       const { app } = createApp({ appConfig, stackConfigs, accountId });
       const formatResource = (stack, urn) => {
-        return urn.replace(stack.urn + ":", "").replace(/\{([a-z0-9\-\s\/\._]+)\}/gi, (_, v) => {
+        return urn.replace(stack.urn + ":", "").replace(/\{([a-z0-9\-\s\/\.\@\_]+)\}/gi, (_, v) => {
           return `${color.dim("{")}${color.warning(v)}${color.dim("}")}`;
         }).replaceAll(":", color.dim(":"));
       };