@awsless/awsless 0.0.141 → 0.0.143

package/dist/bin.js

@@ -4098,7 +4098,7 @@ var restPlugin = definePlugin({
       }).dependsOn(api);
       bootstrap2.add(api, stage).export(`rest-${id}-id`, api.id);
       if (props.domain) {
-        const domainName = props.subDomain ? `${props.subDomain}.${props.domain}` : props.domain;
+        const domainName = formatFullDomainName(config2, props.domain, props.subDomain);
         const hostedZoneId = bootstrap2.import(`hosted-zone-${props.domain}-id`);
         const certificateArn = bootstrap2.import(`certificate-${props.domain}-arn`);
         const domain = new DomainName2(id, {
@@ -6456,19 +6456,24 @@ var hr = () => {
   };
 };
 
+// src/cli/ui/layout/pad-text.ts
+var padText = (texts) => {
+  const size = Math.max(...texts.map((text) => text.length));
+  return (text, padding = 0) => {
+    return text.padEnd(size + padding);
+  };
+};
+
 // src/cli/ui/layout/list.ts
 var list = (data) => {
   const padding = 2;
-  const gap = 1;
-  const size = Object.keys(data).reduce((total, name) => {
-    return name.length > total ? name.length : total;
-  }, 0);
+  const padName = padText(Object.keys(data));
   return (term) => {
     term.out.gap();
     term.out.write(
       Object.entries(data).map(([name, value]) => [
         " ".repeat(padding),
-        style.label((name + ":").padEnd(size + gap + 1)),
+        style.label(padName(name + ":", 2)),
         value,
         br()
       ])
@@ -7173,15 +7178,23 @@ var assetBuilder = (app) => {
         stop();
       }
     }, 3);
+    let failure;
     await Promise.all(
       app.stacks.map(async (stack) => {
         await Promise.all(
           [...stack.assets].map(async (asset) => {
-            await queue2.push({ stack, asset });
+            try {
+              await queue2.push({ stack, asset });
+            } catch (error) {
+              failure = error;
+            }
           })
         );
       })
     );
+    if (failure) {
+      throw failure;
+    }
     done("Done building stack assets");
     if (showDetailedView) {
       term.out.gap();
@@ -7675,69 +7688,68 @@ var bootstrap = (program2) => {
   });
 };
 
-// src/cli/ui/complex/deployer.ts
-var stacksDeployer = (deploymentLine) => {
-  const stackNames = deploymentLine.map((line2) => line2.map((stack) => stack.name)).flat();
-  const stackNameSize = Math.max(...stackNames.map((name) => name.length));
-  return (term) => {
-    const ui = {};
-    term.out.gap();
-    for (const i in deploymentLine) {
-      const line2 = flexLine(term, ["  "], [" ", style.placeholder(Number(i) + 1), style.placeholder(" \u2500\u2500")]);
-      term.out.write(line2);
-      term.out.write(br());
-      for (const stack of deploymentLine[i]) {
-        const icon = new Signal(" ");
-        const name = new Signal(style.label.dim(stack.name));
-        const status2 = new Signal(style.info.dim("waiting"));
-        let stopSpinner;
-        term.out.write([
-          icon,
-          " ",
-          name,
-          " ".repeat(stackNameSize - stack.name.length),
-          " ",
-          style.placeholder(symbol.pointerSmall),
-          " ",
-          status2,
-          br()
-        ]);
-        ui[stack.name] = {
-          start: (value) => {
-            const [spinner, stop] = createSpinner();
-            name.set(style.label(stack.name));
-            icon.set(spinner);
-            status2.set(style.warning(value));
-            stopSpinner = stop;
-          },
-          done(value) {
-            stopSpinner();
-            icon.set(style.success(symbol.success));
-            status2.set(style.success(value));
-          },
-          fail(value) {
-            stopSpinner();
-            icon.set(style.error(symbol.error));
-            status2.set(style.error(value));
-          },
-          warn(value) {
-            stopSpinner();
-            icon.set(style.warning(symbol.warning));
-            status2.set(style.warning(value));
-          }
-        };
+// src/cli/ui/complex/task-group.ts
+import { promise as promise2 } from "fastq";
+var runTaskGroup = (concurrency, tasks) => {
+  const formatLabel = padText(tasks.map((task) => task?.label ?? ""));
+  return async (term) => {
+    const queue2 = promise2(async (task) => {
+      const [icon, stop] = createSpinner();
+      const status2 = new Signal("");
+      const entry = new Signal([
+        icon,
+        " ",
+        style.label(formatLabel(task.label)),
+        " ",
+        style.placeholder(symbol.pointerSmall),
+        " ",
+        status2,
+        br()
+      ]);
+      term.out.write(entry);
+      let result;
+      try {
+        result = await task.task((text) => {
+          status2.set(text);
+        });
+      } catch (error) {
+        result = "fail";
+        throw error;
+      } finally {
+        stop();
+      }
+      switch (result) {
+        case "done":
+          icon.set(style.success(symbol.success));
+          status2.update(style.success);
+          break;
+        case "fail":
+          icon.set(style.error(symbol.error));
+          status2.update(style.error);
+          break;
+        case "warn":
+          icon.set(style.warning(symbol.warning));
+          status2.update(style.warning);
+          break;
+      }
+    }, concurrency);
+    const results = await Promise.allSettled(
+      tasks.map((task) => {
+        return queue2.push(task);
+      })
+    );
+    for (const result of results) {
+      if (result.status === "rejected") {
+        throw result.reason;
       }
     }
-    term.out.write(flexLine(term, ["  "], [" ", style.warning("\u26A1\uFE0F"), style.placeholder("\u2500\u2500")]));
-    term.out.gap();
-    return ui;
   };
 };
 
 // src/cli/command/status.ts
 var status = (program2) => {
   program2.command("status").argument("[stacks...]", "Optionally filter stacks to lookup status").description("View the app status").action(async (filters) => {
-    await layout(async (config2, write) => {
+    await layout(async (config2, write, term) => {
       const { app, deploymentLine } = await toApp(config2, filters);
       await cleanUp();
       await write(typesGenerator(config2));
@@ -7746,25 +7758,34 @@ var status = (program2) => {
       const doneLoading = write(loadingDialog("Loading stack information..."));
       const client = new StackClient(app, config2.account, config2.app.region, config2.credentials);
       const statuses = [];
-      const ui = write(stacksDeployer(deploymentLine));
       debug("Load metadata for all deployed stacks on AWS");
-      await Promise.all(
-        app.stacks.map(async (stack) => {
-          const item = ui[stack.name];
-          item.start("loading");
-          const info = await client.get(stack.name, stack.region);
-          if (!info) {
-            item.fail("NON EXISTENT");
-            statuses.push("non-existent");
-          } else if (info.template !== stack.toString()) {
-            item.warn("OUT OF DATE");
-            statuses.push("out-of-date");
-          } else {
-            item.done("UP TO DATE");
-            statuses.push("up-to-date");
-          }
-        })
+      term.out.gap();
+      await write(
+        runTaskGroup(
+          5,
+          deploymentLine.flat().map((stack) => ({
+            label: stack.name,
+            task: async (update) => {
+              update("Loading...");
+              const info = await client.get(stack.name, stack.region);
+              if (!info) {
+                update("NON EXISTENT");
+                statuses.push("non-existent");
+                return "fail";
+              } else if (info.template !== stack.toString()) {
+                update("OUT OF DATE");
+                statuses.push("out-of-date");
+                return "warn";
+              } else {
+                update("UP TO DATE");
+                statuses.push("up-to-date");
+                return "done";
+              }
+            }
+          }))
+        )
       );
+      term.out.gap();
       doneLoading("Done loading stack information");
       debug("Done loading data for all deployed stacks on AWS");
       if (statuses.includes("non-existent") || statuses.includes("out-of-date")) {
@@ -7780,7 +7801,7 @@ var status = (program2) => {
 import { readFile as readFile7 } from "fs/promises";
 import { join as join10 } from "path";
 import { GetObjectCommand, ObjectCannedACL as ObjectCannedACL2, PutObjectCommand as PutObjectCommand2, S3Client as S3Client2, StorageClass as StorageClass2 } from "@aws-sdk/client-s3";
-import { promise as promise2 } from "fastq";
+import { promise as promise3 } from "fastq";
 var assetPublisher = (config2, app) => {
   const client = new S3Client2({
     credentials: config2.credentials,
@@ -7789,7 +7810,7 @@ var assetPublisher = (config2, app) => {
   });
   return async (term) => {
     const done = term.out.write(loadingDialog("Publishing stack assets to AWS..."));
-    const queue2 = promise2(async ({ stack, asset }) => {
+    const queue2 = promise3(async ({ stack, asset }) => {
       const getFullPath = (file) => {
         return join10(directories.asset, asset.type, app.name, stack.name, asset.id, file);
       };
@@ -8151,6 +8172,7 @@ var singleTester = (stack, dir, filters) => {
 };
 var runTester = (tests, filters = []) => {
   return async (term) => {
+    term.out.gap();
     for (const [name, paths] of tests.entries()) {
       for (const path of paths) {
         const result = await term.out.write(singleTester(name, path, filters));
@@ -8159,6 +8181,7 @@ var runTester = (tests, filters = []) => {
         }
       }
     }
+    term.out.gap();
     return true;
   };
 };
@@ -8166,7 +8189,7 @@ var runTester = (tests, filters = []) => {
 // src/cli/command/deploy.ts
 var deploy = (program2) => {
   program2.command("deploy").argument("[stacks...]", "Optionally filter stacks to deploy").description("Deploy your app to AWS").action(async (filters) => {
-    await layout(async (config2, write) => {
+    await layout(async (config2, write, term) => {
       await write(bootstrapDeployer(config2));
       const { app, deploymentLine, tests } = await toApp(config2, filters);
       const stackNames = app.stacks.map((stack) => stack.name);
@@ -8195,28 +8218,30 @@ var deploy = (program2) => {
       await write(templateBuilder(app));
       const doneDeploying = write(loadingDialog("Deploying stacks to AWS..."));
       const client = new StackClient(app, config2.account, config2.app.region, config2.credentials);
-      const ui = write(stacksDeployer(deploymentLine));
-      for (const line2 of deploymentLine) {
-        const results = await Promise.allSettled(
-          line2.map(async (stack) => {
-            const item = ui[stack.name];
-            item.start("deploying");
-            try {
-              await client.deploy(stack);
-            } catch (error) {
-              debugError(error);
-              item.fail("failed");
-              throw error;
-            }
-            item.done("deployed");
-          })
+      term.out.gap();
+      for (const stacks of deploymentLine) {
+        await write(
+          runTaskGroup(
+            5,
+            stacks.map((stack) => ({
+              label: stack.name,
+              task: async (update) => {
+                update("deploying...");
+                try {
+                  await client.deploy(stack);
+                } catch (error) {
+                  debugError(error);
+                  update("failed");
+                  throw error;
+                }
+                update("deployed");
+                return "done";
+              }
+            }))
+          )
         );
-        for (const result of results) {
-          if (result.status === "rejected") {
-            throw result.reason;
-          }
-        }
       }
+      term.out.gap();
       doneDeploying("Done deploying stacks to AWS");
     });
   });
@@ -8453,7 +8478,7 @@ var dev = (program2) => {
 // src/cli/command/delete.ts
 var del2 = (program2) => {
   program2.command("delete").argument("[stacks...]", "Optionally filter stacks to delete").description("Delete your app from AWS").action(async (filters) => {
-    await layout(async (config2, write) => {
+    await layout(async (config2, write, term) => {
       const { app, deploymentLine } = await toApp(config2, filters);
       const deletingLine = deploymentLine.reverse();
       const stackNames = app.stacks.map((stack) => stack.name);
@@ -8477,33 +8502,65 @@ var del2 = (program2) => {
       }
       const doneDeploying = write(loadingDialog("Deleting stacks from AWS..."));
       const client = new StackClient(app, config2.account, config2.app.region, config2.credentials);
-      const ui = write(stacksDeployer(deletingLine));
-      for (const line2 of deletingLine) {
-        const results = await Promise.allSettled(
-          line2.map(async (stack) => {
-            const item = ui[stack.name];
-            item.start("deleting");
-            try {
-              await client.delete(stack.name, stack.region);
-            } catch (error) {
-              debugError(error);
-              item.fail("failed");
-              throw error;
-            }
-            item.done("deleted");
-          })
+      term.out.gap();
+      for (const stacks of deletingLine) {
+        await write(
+          runTaskGroup(
+            5,
+            stacks.map((stack) => ({
+              label: stack.name,
+              task: async (update) => {
+                update("deleting...");
+                try {
+                  await client.delete(stack.name, stack.region);
+                } catch (error) {
+                  debugError(error);
+                  update("failed");
+                  throw error;
+                }
+                update("deleted");
+                return "done";
+              }
+            }))
+          )
         );
-        for (const result of results) {
-          if (result.status === "rejected") {
-            throw result.reason;
-          }
-        }
       }
+      term.out.gap();
       doneDeploying("Done deleting stacks from AWS");
     });
   });
 };
 
+// src/cli/command/draw.ts
+var draw = (program2) => {
+  program2.command("draw").description("Test your app").action(async () => {
+    await layout(async (config2, write) => {
+      await write(
+        runTaskGroup(1, [
+          {
+            label: "stack-1",
+            task: async (update) => {
+              update("Loading...");
+              await new Promise((resolve) => setTimeout(resolve, 1e3));
+              update("Done");
+              return "warn";
+            }
+          },
+          {
+            label: "stack-2",
+            task: async (update) => {
+              update("Loading...");
+              await new Promise((resolve) => setTimeout(resolve, 1e3));
+              update("Done");
+              return "done";
+            }
+          }
+        ])
+      );
+    });
+  });
+};
+
 // src/cli/program.ts
 var program = new Command();
 program.name(logo().join("").replace(/\s+/, ""));
@@ -8533,7 +8590,8 @@ var commands2 = [
   del2,
   dev,
   config,
-  test
+  test,
+  draw
   // diff,
   // remove,
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.141",
+  "version": "0.0.143",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,11 +29,11 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.15",
+    "@awsless/redis": "^0.0.10",
+    "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.10",
-    "@awsless/redis": "^0.0.10",
-    "@awsless/sns": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {