@awsless/awsless 0.0.476 → 0.0.478

package/dist/bin.js

@@ -1393,9 +1393,9 @@ var SitesSchema = z29.record(
 // src/feature/store/schema.ts
 import { z as z30 } from "zod";
 var StoresSchema = z30.union([
-  z30.array(ResourceIdSchema).transform((list5) => {
+  z30.array(ResourceIdSchema).transform((list4) => {
     const stores = {};
-    for (const key of list5) {
+    for (const key of list4) {
       stores[key] = {};
     }
     return stores;
@@ -1854,11 +1854,11 @@ var authFeature = defineFeature({
   name: "auth",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     for (const name of Object.keys(ctx.appConfig.defaults.auth)) {
-      resources.addType(name, `{ readonly userPoolId: string, readonly clientId: string }`);
+      resources2.addType(name, `{ readonly userPoolId: string, readonly clientId: string }`);
     }
-    gen.addInterface("AuthResources", resources);
+    gen.addInterface("AuthResources", resources2);
     await ctx.write("auth.d.ts", gen, true);
   },
   // onStack(ctx) {
@@ -1988,7 +1988,7 @@ var authFeature = defineFeature({
           deletionProtection: "ACTIVE"
         },
         {
-          retainOnDelete: true,
+          retainOnDelete: ctx.appConfig.removal === "retain",
           import: ctx.import ? name : void 0
         }
       );
@@ -2037,16 +2037,16 @@ var cacheFeature = defineFeature({
   name: "cache",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const resource2 = new TypeObject(2);
+      const resource = new TypeObject(2);
       for (const name of Object.keys(stack.caches || {})) {
-        resource2.addType(name, `Command`);
+        resource.addType(name, `Command`);
       }
-      resources.addType(stack.name, resource2);
+      resources2.addType(stack.name, resource);
     }
     gen.addCode(typeGenCode);
-    gen.addInterface("CacheResources", resources);
+    gen.addInterface("CacheResources", resources2);
     await ctx.write("cache.d.ts", gen, true);
   },
   onStack(ctx) {
@@ -2281,13 +2281,13 @@ var configFeature = defineFeature({
   name: "config",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(0, false);
+    const resources2 = new TypeObject(0, false);
     for (const stack of ctx.stackConfigs) {
       for (const name of stack.configs ?? []) {
-        resources.addConst(name, "string");
+        resources2.addConst(name, "string");
       }
     }
-    gen.addInterface("ConfigResources", resources.toString());
+    gen.addInterface("ConfigResources", resources2.toString());
     await ctx.write("config.d.ts", gen, true);
   },
   onApp(ctx) {
@@ -2541,9 +2541,9 @@ var createHashFromFile = (file) => {
     stream.on("end", () => resolve(hash.digest("hex")));
   });
 };
-var listAllFiles = async (list5) => {
+var listAllFiles = async (list4) => {
   const files = [];
-  for (const entry of list5) {
+  for (const entry of list4) {
     const stat5 = await lstat2(entry);
     if (stat5.isDirectory()) {
       const dirents = await readdir(entry, {
@@ -2602,11 +2602,11 @@ import { readdir as readdir3 } from "node:fs/promises";
 import { join as join9, relative as relative2 } from "node:path";
 var zipBundle = async ({ directory }) => {
   const zip = new JSZip2();
-  const list5 = await readdir3(directory, {
+  const list4 = await readdir3(directory, {
     recursive: true,
     withFileTypes: true
   });
-  for (const file of list5) {
+  for (const file of list4) {
     if (file.isFile()) {
       const path = join9(file.path, file.name);
       const rel = relative2(directory, path);
@@ -2747,11 +2747,11 @@ var createLambdaFunction = (group, ctx, ns, id, local) => {
     role: role.name,
     name: "lambda-policy",
     policy: new Future(async (resolve) => {
-      const list5 = await resolveInputs(statements);
+      const list4 = await resolveInputs(statements);
       resolve(
         JSON.stringify({
           Version: "2012-10-17",
-          Statement: list5.map((statement) => ({
+          Statement: list4.map((statement) => ({
             Effect: pascalCase(statement.effect ?? "allow"),
             Action: statement.actions,
             Resource: statement.resources
@@ -3196,11 +3196,11 @@ var functionFeature = defineFeature({
   name: "function",
   async onTypeGen(ctx) {
     const types2 = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     const mocks = new TypeObject(1);
     const mockResponses = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const resource2 = new TypeObject(2);
+      const resource = new TypeObject(2);
       const mock = new TypeObject(2);
       const mockResponse = new TypeObject(2);
       for (const [name, local] of Object.entries(stack.functions || {})) {
@@ -3215,23 +3215,23 @@ var functionFeature = defineFeature({
         if ("file" in local.code) {
           const relFile = relative3(directories.types, local.code.file);
           if (props.runtime === "container") {
-            resource2.addType(name, `Invoke<'${funcName}', Func>`);
+            resource.addType(name, `Invoke<'${funcName}', Func>`);
             mock.addType(name, `MockBuilder<Func>`);
             mockResponse.addType(name, `MockObject<Func>`);
           } else {
             types2.addImport(varName, relFile);
-            resource2.addType(name, `Invoke<'${funcName}', typeof ${varName}>`);
+            resource.addType(name, `Invoke<'${funcName}', typeof ${varName}>`);
             mock.addType(name, `MockBuilder<typeof ${varName}>`);
             mockResponse.addType(name, `MockObject<typeof ${varName}>`);
           }
         }
       }
       mocks.addType(stack.name, mock);
-      resources.addType(stack.name, resource2);
+      resources2.addType(stack.name, resource);
       mockResponses.addType(stack.name, mockResponse);
     }
     types2.addCode(typeGenCode2);
-    types2.addInterface("FunctionResources", resources);
+    types2.addInterface("FunctionResources", resources2);
     types2.addInterface("FunctionMock", mocks);
     types2.addInterface("FunctionMockResponse", mockResponses);
     await ctx.write("function.d.ts", types2, true);
@@ -3508,11 +3508,11 @@ var queueFeature = defineFeature({
   name: "queue",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     const mocks = new TypeObject(1);
     const mockResponses = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const resource2 = new TypeObject(2);
+      const resource = new TypeObject(2);
       const mock = new TypeObject(2);
       const mockResponse = new TypeObject(2);
       for (const [name, props] of Object.entries(stack.queues || {})) {
@@ -3527,16 +3527,16 @@ var queueFeature = defineFeature({
           const relFile = relative4(directories.types, props.consumer.code.file);
           gen.addImport(varName, relFile);
           mock.addType(name, `MockBuilder<typeof ${varName}>`);
-          resource2.addType(name, `Send<'${queueName}', typeof ${varName}>`);
+          resource.addType(name, `Send<'${queueName}', typeof ${varName}>`);
           mockResponse.addType(name, `MockObject<typeof ${varName}>`);
         }
       }
       mocks.addType(stack.name, mock);
-      resources.addType(stack.name, resource2);
+      resources2.addType(stack.name, resource);
       mockResponses.addType(stack.name, mockResponse);
     }
     gen.addCode(typeGenCode3);
-    gen.addInterface("QueueResources", resources);
+    gen.addInterface("QueueResources", resources2);
     gen.addInterface("QueueMock", mocks);
     gen.addInterface("QueueMockResponse", mockResponses);
     await ctx.write("queue.d.ts", gen, true);
@@ -3784,11 +3784,11 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
     role: role.name,
     name: "lambda-policy",
     policy: new Future2(async (resolve) => {
-      const list5 = await resolveInputs2(statements);
+      const list4 = await resolveInputs2(statements);
       resolve(
         JSON.stringify({
           Version: "2012-10-17",
-          Statement: list5.map((statement) => ({
+          Statement: list4.map((statement) => ({
             Effect: pascalCase2(statement.effect ?? "allow"),
             Action: statement.actions,
             Resource: statement.resources
@@ -3925,15 +3925,15 @@ var rpcFeature = defineFeature({
     }
     for (const stack of ctx.stackConfigs) {
       for (const [id, queries] of Object.entries(stack.rpc ?? {})) {
-        const list5 = names[id];
-        if (!list5) {
+        const list4 = names[id];
+        if (!list4) {
           throw new FileError(stack.file, `The RPC API for "${id}" isn't defined on app level.`);
         }
         for (const [name, props] of Object.entries(queries ?? {})) {
-          if (list5.has(name)) {
+          if (list4.has(name)) {
             throw new FileError(stack.file, `Duplicate RPC API function "${id}.${name}"`);
           } else {
-            list5.add(name);
+            list4.add(name);
           }
           const timeout = toSeconds5(props.timeout ?? ctx.appConfig.defaults.function.timeout);
           const maxTimeout = toSeconds5(ctx.appConfig.defaults.rpc[id].timeout) * 0.8;
@@ -4191,16 +4191,16 @@ var searchFeature = defineFeature({
   name: "search",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const list5 = new TypeObject(2);
+      const list4 = new TypeObject(2);
       for (const id of Object.keys(stack.searchs ?? {})) {
-        list5.addType(id, `Search`);
+        list4.addType(id, `Search`);
       }
-      resources.addType(stack.name, list5);
+      resources2.addType(stack.name, list4);
     }
     gen.addCode(typeGenCode4);
-    gen.addInterface("SearchResources", resources);
+    gen.addInterface("SearchResources", resources2);
     await ctx.write("search.d.ts", gen, true);
   },
   onStack(ctx) {
@@ -4305,7 +4305,14 @@ var getForwardHostFunctionCode = () => {
 
 // src/feature/site/index.ts
 import { camelCase as camelCase6, constantCase as constantCase10 } from "change-case";
+
+// src/util/exec.ts
 import { exec } from "promisify-child-process";
+var execCommand = async ({ cwd, command }) => {
+  await exec(command, { cwd });
+};
+
+// src/feature/site/index.ts
 var siteFeature = defineFeature({
   name: "site",
   onStack(ctx) {
@@ -4323,7 +4330,10 @@ var siteFeature = defineFeature({
           const fingerprint = await generateCacheKey(buildProps.cacheKey);
           return build3(fingerprint, async (write) => {
             const cwd = join11(directories.root, dirname7(ctx.stackConfig.file));
-            await exec(buildProps.command, { cwd });
+            await execCommand({
+              cwd,
+              command: buildProps.command
+            });
             await write("HASH", fingerprint);
             return {
               size: "n/a"
@@ -4418,24 +4428,26 @@ var siteFeature = defineFeature({
           signingBehavior: "always",
           signingProtocol: "sigv4"
         });
-        if (typeof props.static === "string") {
-          const files = glob2.sync("**", {
-            cwd: props.static,
-            nodir: true
-          });
-          for (const file of files) {
-            const object = new $15.aws.s3.BucketObject(group, file, {
-              bucket: bucket.bucket,
-              key: file,
-              cacheControl: getCacheControl(file),
-              contentType: getContentType(file),
-              source: join11(props.static, file),
-              sourceHash: $hash(join11(props.static, file))
+        ctx.onReady(() => {
+          if (typeof props.static === "string") {
+            const files = glob2.sync("**", {
+              cwd: props.static,
+              nodir: true
             });
-            versions.push(object.key);
-            versions.push(object.etag);
+            for (const file of files) {
+              const object = new $15.aws.s3.BucketObject(group, file, {
+                bucket: bucket.bucket,
+                key: file,
+                cacheControl: getCacheControl(file),
+                contentType: getContentType(file),
+                source: join11(props.static, file),
+                sourceHash: $hash(join11(props.static, file))
+              });
+              versions.push(object.key);
+              versions.push(object.etag);
+            }
           }
-        }
+        });
         origins.push({
           originId: "static",
           domainName: bucket.bucketRegionalDomainName,
@@ -4678,9 +4690,9 @@ var storeFeature = defineFeature({
   name: "store",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const list5 = new TypeObject(2);
+      const list4 = new TypeObject(2);
       for (const id of Object.keys(stack.stores ?? {})) {
         const storeName = formatLocalResourceName({
           appName: ctx.appConfig.name,
@@ -4688,12 +4700,12 @@ var storeFeature = defineFeature({
           resourceType: "store",
           resourceName: id
         });
-        list5.addType(id, `Store<'${storeName}'>`);
+        list4.addType(id, `Store<'${storeName}'>`);
       }
-      resources.addType(stack.name, list5);
+      resources2.addType(stack.name, list4);
     }
     gen.addCode(typeGenCode5);
-    gen.addInterface("StoreResources", resources);
+    gen.addInterface("StoreResources", resources2);
     await ctx.write("store.d.ts", gen, true);
   },
   onApp(ctx) {
@@ -4817,9 +4829,9 @@ var tableFeature = defineFeature({
   name: "table",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const list5 = new TypeObject(2);
+      const list4 = new TypeObject(2);
       for (const name of Object.keys(stack.tables || {})) {
         const tableName = formatLocalResourceName({
           appName: ctx.appConfig.name,
@@ -4827,11 +4839,11 @@ var tableFeature = defineFeature({
           resourceType: "table",
           resourceName: name
         });
-        list5.addType(name, `'${tableName}'`);
+        list4.addType(name, `'${tableName}'`);
       }
-      resources.addType(stack.name, list5);
+      resources2.addType(stack.name, list4);
     }
-    gen.addInterface("TableResources", resources);
+    gen.addInterface("TableResources", resources2);
     await ctx.write("table.d.ts", gen, true);
   },
   onApp(ctx) {
@@ -5016,11 +5028,11 @@ var taskFeature = defineFeature({
   name: "task",
   async onTypeGen(ctx) {
     const types2 = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     const mocks = new TypeObject(1);
     const mockResponses = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
-      const resource2 = new TypeObject(2);
+      const resource = new TypeObject(2);
       const mock = new TypeObject(2);
       const mockResponse = new TypeObject(2);
       for (const [name, props] of Object.entries(stack.tasks || {})) {
@@ -5034,17 +5046,17 @@ var taskFeature = defineFeature({
         if ("file" in props.consumer.code) {
           const relFile = relative6(directories.types, props.consumer.code.file);
           types2.addImport(varName, relFile);
-          resource2.addType(name, `Invoke<'${funcName}', typeof ${varName}>`);
+          resource.addType(name, `Invoke<'${funcName}', typeof ${varName}>`);
           mock.addType(name, `MockBuilder<typeof ${varName}>`);
           mockResponse.addType(name, `MockObject<typeof ${varName}>`);
         }
       }
       mocks.addType(stack.name, mock);
-      resources.addType(stack.name, resource2);
+      resources2.addType(stack.name, resource);
       mockResponses.addType(stack.name, mockResponse);
     }
     types2.addCode(typeGenCode6);
-    types2.addInterface("TaskResources", resources);
+    types2.addInterface("TaskResources", resources2);
     types2.addInterface("TaskMock", mocks);
     types2.addInterface("TaskMockResponse", mockResponses);
     await ctx.write("task.d.ts", types2, true);
@@ -5084,7 +5096,7 @@ var topicFeature = defineFeature({
   name: "topic",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     const mocks = new TypeObject(1);
     const mockResponses = new TypeObject(1);
     for (const stack of ctx.stackConfigs) {
@@ -5095,12 +5107,12 @@ var topicFeature = defineFeature({
           resourceName: topic
         });
         mockResponses.addType(topic, "Mock");
-        resources.addType(topic, `Publish<'${name}'>`);
+        resources2.addType(topic, `Publish<'${name}'>`);
         mocks.addType(topic, `MockBuilder`);
       }
     }
     gen.addCode(typeGenCode7);
-    gen.addInterface("TopicResources", resources);
+    gen.addInterface("TopicResources", resources2);
     gen.addInterface("TopicMock", mocks);
     gen.addInterface("TopicMockResponse", mockResponses);
     await ctx.write("topic.d.ts", gen, true);
@@ -5270,7 +5282,7 @@ var alertFeature = defineFeature({
   name: "alert",
   async onTypeGen(ctx) {
     const gen = new TypeFile("@awsless/awsless");
-    const resources = new TypeObject(1);
+    const resources2 = new TypeObject(1);
     const mocks = new TypeObject(1);
     const mockResponses = new TypeObject(1);
     for (const alert of Object.keys(ctx.appConfig.defaults.alerts ?? {})) {
@@ -5279,12 +5291,12 @@ var alertFeature = defineFeature({
         resourceType: "alert",
         resourceName: alert
       });
-      resources.addType(alert, `Alert<'${name}'>`);
+      resources2.addType(alert, `Alert<'${name}'>`);
       mockResponses.addType(alert, "Mock");
       mocks.addType(alert, `MockBuilder`);
     }
     gen.addCode(typeGenCode8);
-    gen.addInterface("AlertResources", resources);
+    gen.addInterface("AlertResources", resources2);
     gen.addInterface("AlertMock", mocks);
     gen.addInterface("AlertMockResponse", mockResponses);
     await ctx.write("alert.d.ts", gen, true);
@@ -5789,7 +5801,7 @@ var createApp = (props) => {
     region: props.appConfig.region,
     appName: props.appConfig.name
   });
-  const commands8 = [];
+  const commands7 = [];
   const configs = /* @__PURE__ */ new Set();
   const tests = [];
   const builders = [];
@@ -5849,7 +5861,7 @@ var createApp = (props) => {
         });
       },
       registerCommand(command) {
-        commands8.push(command);
+        commands7.push(command);
       },
       registerDomainZone(zone) {
         domainZones.push(zone);
@@ -5941,7 +5953,7 @@ var createApp = (props) => {
           configs.add(name);
         },
         registerCommand(command) {
-          commands8.push(command);
+          commands7.push(command);
         },
         registerDomainZone(zone) {
           domainZones.push(zone);
@@ -6013,20 +6025,23 @@ var createApp = (props) => {
       }
     }
   }
-  for (const listener of readyListeners) {
-    listener();
-  }
+  const ready = () => {
+    for (const listener of readyListeners) {
+      listener();
+    }
+  };
   return {
     app,
     base,
     zones,
+    ready,
     domainZones,
     tests,
     binds,
     shared,
     configs,
     builders,
-    commands: commands8
+    commands: commands7
     // deploymentLine,
   };
 };
@@ -6239,7 +6254,8 @@ var del2 = (program2) => {
       const profile = appConfig.profile;
       const credentials = getCredentials(profile);
       const accountId = await getAccountId(credentials, region);
-      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const { app, ready } = createApp({ appConfig, stackConfigs, accountId });
+      ready();
       const stackNames = app.stacks.filter((stack) => {
         return !!filters.find((f) => wildstring2.match(f, stack.name));
       }).map((s) => s.name);
@@ -6621,7 +6637,7 @@ var deploy = (program2) => {
       const credentials = getCredentials(profile);
       const accountId = await getAccountId(credentials, region);
       await bootstrapAwsless({ credentials, region, accountId });
-      const { app, tests, builders } = createApp({
+      const { app, tests, builders, ready } = createApp({
         appConfig,
         stackConfigs,
         accountId,
@@ -6649,6 +6665,7 @@ var deploy = (program2) => {
         }
       }
       await buildAssets(builders, filters);
+      ready();
       const { workspace, state: state2 } = await createWorkSpace({
         credentials,
         accountId,
@@ -6781,7 +6798,7 @@ import { log as log10, note as note3 } from "@clack/prompts";
 import { constantCase as constantCase12 } 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 (commands8 = [], opts) => {
+  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 (commands7 = [], opts) => {
     await layout("bind", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const profile = appConfig.profile;
@@ -6812,10 +6829,10 @@ var bind = (program2) => {
       if (configList.length ?? 0 > 0) {
         note3(wrap(configList.map((v) => color.label(constantCase12(v)))), "Bind Config");
       }
-      if (commands8.length === 0) {
+      if (commands7.length === 0) {
         return "No command to execute.";
       }
-      const command = commands8.join(" ");
+      const command = commands7.join(" ");
       const freshCred = await credentials();
       spawn(command, {
         env: {
@@ -6926,13 +6943,13 @@ var dev = (program2) => {
   });
 };
 
-// src/cli/command/resource/list.ts
+// src/cli/command/resources.ts
 import { log as log12 } from "@clack/prompts";
 import chalk6 from "chalk";
 import wildstring5 from "wildstring";
-var list3 = (program2) => {
-  program2.command("list").argument("[stacks...]", "Optionally filter stack resources to list").description(`List all defined resources`).action(async (filters) => {
-    await layout("resource list", async ({ appConfig, stackConfigs }) => {
+var resources = (program2) => {
+  program2.command("resources").argument("[stacks...]", "Optionally filter stack resources to list").description(`List all defined resources in your app`).action(async (filters) => {
+    await layout("resources", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
@@ -6951,21 +6968,14 @@ var list3 = (program2) => {
         }
         log12.step(chalk6.magenta(stack.name));
         line("");
-        for (const resource2 of stack.resources) {
-          line(formatResource(stack, resource2.$.urn));
+        for (const resource of stack.resources) {
+          line(formatResource(stack, resource.$.urn));
         }
       }
     });
   });
 };
 
-// src/cli/command/resource/index.ts
-var commands4 = [list3];
-var resource = (program2) => {
-  const command = program2.command("resource").description(`Manage app resources`);
-  commands4.forEach((cb) => cb(command));
-};
-
 // src/cli/command/run.ts
 import { DynamoDBClient, dynamoDBClient } from "@awsless/dynamodb";
 import { iotClient, IoTDataPlaneClient } from "@awsless/iot";
@@ -6981,17 +6991,17 @@ var run = (program2) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { commands: commands8 } = createApp({ appConfig, stackConfigs, accountId });
+      const { commands: commands7 } = createApp({ appConfig, stackConfigs, accountId });
       let command;
       if (selected) {
-        command = commands8.find((cmd) => {
+        command = commands7.find((cmd) => {
           return cmd.name === selected;
         });
       } else {
         const selected2 = await select2({
           message: "Pick the command you want to run:",
-          initialValue: commands8[0],
-          options: commands8.map((cmd) => ({
+          initialValue: commands7[0],
+          options: commands7.map((cmd) => ({
             value: cmd,
             label: cmd.name,
             hint: cmd.description
@@ -7104,10 +7114,10 @@ var unlock = (program2) => {
 };
 
 // src/cli/command/state/index.ts
-var commands5 = [pull, push, unlock];
+var commands4 = [pull, push, unlock];
 var state = (program2) => {
   const command = program2.command("state").description(`Manage app state`);
-  commands5.forEach((cb) => cb(command));
+  commands4.forEach((cb) => cb(command));
 };
 
 // src/cli/command/test.ts
@@ -7139,7 +7149,7 @@ var types = (program2) => {
 
 // src/cli/command/domain/list.ts
 import { log as log13 } from "@clack/prompts";
-var list4 = (program2) => {
+var list3 = (program2) => {
   program2.command("list").description("List all domains").action(async () => {
     await layout("domain list", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
@@ -7215,14 +7225,14 @@ var deploy2 = (program2) => {
 };
 
 // src/cli/command/domain/index.ts
-var commands6 = [
+var commands5 = [
   //
   deploy2,
-  list4
+  list3
 ];
 var domain = (program2) => {
   const command = program2.command("domain").description(`Manage domains`);
-  commands6.forEach((cb) => cb(command));
+  commands5.forEach((cb) => cb(command));
 };
 
 // src/cli/command/logs.ts
@@ -7250,9 +7260,9 @@ var logs = (program2) => {
       const logGroupArns = [];
       for (const stack of app.stacks) {
         if (filters.find((f) => wildstring6.match(f, stack.name))) {
-          for (const resource2 of stack.resources) {
-            if (resource2.$.type === "aws_cloudwatch_log_group") {
-              const logGroup = resource2;
+          for (const resource of stack.resources) {
+            if (resource.$.type === "aws_cloudwatch_log_group") {
+              const logGroup = resource;
               logGroupArns.push(await logGroup.arn);
             }
           }
@@ -7343,10 +7353,10 @@ var parseJsonLog = (message) => {
     json3 = JSON.parse(message);
   } catch (error) {
   }
-  if ("level" in json3 && typeof json3.level === "string" && "message" in json3 && typeof json3.message === "string" && "timestamp" in json3 && typeof json3.timestamp === "string") {
+  if ("level" in json3 && typeof json3.level === "string" && "timestamp" in json3 && typeof json3.timestamp === "string" && "message" in json3) {
     return {
       level: json3.level,
-      message: json3.message,
+      message: typeof json3.message === "string" ? json3.message : JSON.stringify(json3.message, void 0, 2),
       date: new Date(json3.timestamp)
     };
   }
@@ -7364,7 +7374,7 @@ var parseJsonLog = (message) => {
 };
 
 // src/cli/command/index.ts
-var commands7 = [
+var commands6 = [
   bootstrap,
   types,
   build2,
@@ -7378,7 +7388,7 @@ var commands7 = [
   auth,
   domain,
   state,
-  resource,
+  resources,
   config,
   test
 ];
@@ -7403,7 +7413,7 @@ program.on("option:skip-prompt", () => {
 program.on("option:no-cache", () => {
   process.env.NO_CACHE = program.opts().noCache ? "1" : void 0;
 });
-commands7.forEach((fn) => fn(program));
+commands6.forEach((fn) => fn(program));
 
 // src/bin.ts
 program.parse(process.argv);

package/dist/client.js

@@ -89,13 +89,14 @@ var createPubSubClient = (app, props) => {
       password: config.token
     };
   });
+  const getApp = () => {
+    return typeof app === "string" ? app : app();
+  };
   const getPubSubTopic = (name) => {
-    const appName = typeof app === "string" ? app : app();
-    return `${appName}/pubsub/${name}`;
+    return `${getApp()}/pubsub/${name}`;
   };
   const fromPubSubTopic = (name) => {
-    const appName = typeof app === "string" ? app : app();
-    return name.replace(`${appName}/pubsub/`, "");
+    return name.replace(`${getApp()}/pubsub/`, "");
   };
   return {
     ...mqtt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.476",
+  "version": "0.0.478",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,19 +28,19 @@
     }
   },
   "peerDependencies": {
-    "@awsless/json": "^0.0.8",
-    "@awsless/iot": "^0.0.3",
     "@awsless/dynamodb": "^0.1.5",
+    "@awsless/iot": "^0.0.3",
+    "@awsless/json": "^0.0.8",
     "@awsless/lambda": "^0.0.32",
-    "@awsless/redis": "^0.0.14",
-    "@awsless/s3": "^0.0.20",
     "@awsless/open-search": "^0.0.17",
-    "@awsless/sns": "^0.0.10",
-    "@awsless/validate": "^0.0.19",
+    "@awsless/redis": "^0.0.14",
     "@awsless/mqtt": "^0.0.2",
+    "@awsless/validate": "^0.0.19",
+    "@awsless/sns": "^0.0.10",
+    "@awsless/sqs": "^0.0.8",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/sqs": "^0.0.8"
+    "@awsless/s3": "^0.0.20",
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -120,11 +120,11 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "@awsless/code": "^0.0.10",
+    "@awsless/json": "^0.0.8",
     "@awsless/formation": "^0.0.73",
     "@awsless/duration": "^0.0.3",
-    "@awsless/size": "^0.0.2",
     "@awsless/graphql": "^0.0.9",
-    "@awsless/json": "^0.0.8",
+    "@awsless/size": "^0.0.2",
     "@awsless/ts-file-cache": "^0.0.12",
     "@awsless/validate": "^0.0.19"
   },