@awsless/awsless 0.0.291 → 0.0.293

package/README.MD

@@ -14,12 +14,14 @@
 
 - VPC
 - Tests
+- Commands
 - Auth
 - Config
 - Domains
 - Sites
 - Functions
 - Tasks
+- Instances
 - Database
   - Tables
   - Stores
@@ -78,6 +80,24 @@ Tasks are an lower cost alternative to queues.
 }
 ```
 
+## Instances
+
+We use AWS EC2 Instances to provide low level server instances.
+Tasks are an lower cost alternative to queues.
+
+```json
+{
+  "instances": {
+  	"INSTANCE_NAME": {
+	  "type": "t4g.nano",
+	  "image": "ami-000000",
+	  "code": "./src",
+	  "command": "sh ./startup.sh",
+	}
+  }
+}
+```
+
 ## Tables
 
 We use AWS DynamoDB to provide serverless tables.
@@ -239,3 +259,32 @@ We use AWS AppSync to provide a serverless GraphQL API.
   }
 }
 ```
+
+## Auth
+
+We use AWS Cognito to provide a serverless Authentication API.
+
+```json
+{
+  "auth": {
+    "AUTH_USER_POOL_NAME": {
+   	  "allowUserRegistration": false,
+   	  "password": {
+   	    "minLength": 24
+   	  }
+    }
+  }
+}
+```
+
+## Commands
+
+You can define custom cli commands that you can run from the awsless cli tool.
+
+```json
+{
+  "commands": {
+    "COMMAND_NAME": "./cli/your-command.ts"
+  }
+}
+```

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CommandOptions
-} from "./chunk-DVWXAVM2.js";
+} from "./chunk-S76KJGMT.js";
 
 // src/cli/program.ts
 import { Command as Command2 } from "commander";
@@ -71,9 +71,11 @@ import {
   ScalarAttributeType
 } from "@aws-sdk/client-dynamodb";
 import { CreateBucketCommand, HeadBucketCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
-import { confirm, log } from "@clack/prompts";
+import { confirm, isCancel, log } from "@clack/prompts";
 
 // src/error.ts
+var ExpectedError = class extends Error {
+};
 var ConfigError = class extends Error {
   constructor(file, error, data) {
     super(error.message);
@@ -347,7 +349,7 @@ var bootstrapAwsless = async (props) => {
       const confirmed = await confirm({
         message: "Would you like to bootstrap now?"
       });
-      if (!confirmed) {
+      if (!confirmed || isCancel(confirmed)) {
         throw new Cancelled();
       }
     }
@@ -981,8 +983,8 @@ import { z as z19 } from "zod";
 var CommandSchema2 = z19.union([
   z19.object({
     file: LocalFileSchema,
-    handler: z19.string().default("default"),
-    description: z19.string().optional()
+    handler: z19.string().default("default").describe("The name of the handler that needs to run"),
+    description: z19.string().optional().describe("A description of the command")
     // options: z.record(ResourceIdSchema, OptionSchema).optional(),
     // arguments: z.record(ResourceIdSchema, ArgumentSchema).optional(),
   }),
@@ -992,7 +994,7 @@ var CommandSchema2 = z19.union([
     description: void 0
   }))
 ]);
-var CommandsSchema = z19.record(ResourceIdSchema, CommandSchema2).optional().describe("Define the config values for your stack.");
+var CommandsSchema = z19.record(ResourceIdSchema, CommandSchema2).optional().describe("Define the custom commands for your stack.");
 
 // src/feature/config/schema.ts
 import { z as z20 } from "zod";
@@ -1568,8 +1570,81 @@ var logApp = (app) => {
 };
 
 // src/cli/ui/error/error.ts
+import { AppError as AppError2, StackError as StackError3 } from "@awsless/formation";
 import { log as log6 } from "@clack/prompts";
 
+// src/cli/ui/error/app-error.ts
+import { StackError as StackError2 } from "@awsless/formation";
+import { log as log3 } from "@clack/prompts";
+
+// src/cli/ui/error/stack-error.ts
+import { ResourceError } from "@awsless/formation";
+import { log as log2 } from "@clack/prompts";
+import { capitalCase as capitalCase2 } from "change-case";
+var formatOperation = (operation) => {
+  const value = ` ${capitalCase2(operation)} `;
+  switch (operation) {
+    case "create":
+      return color.success.bold.inverse(value);
+    case "update":
+      return color.warning.bold.inverse(value);
+    case "delete":
+      return color.error.bold.inverse(value);
+    case "heal":
+      return color.warning.bold.inverse(value);
+    case "get":
+      return color.info.bold.inverse(value);
+  }
+};
+var logStackError = (error) => {
+  log2.message(
+    wrap([color.error(error.message), `Stack: ${error.stack}`].join("\n"), {
+      hard: true
+    }),
+    { symbol: color.error(icon.error) }
+  );
+  for (const issue of error.issues) {
+    if (issue instanceof ResourceError) {
+      log2.message(
+        [
+          formatOperation(issue.operation),
+          "\n",
+          wrap("URN: " + issue.urn, { hard: true }),
+          "\n",
+          wrap("ID: " + issue.id, { hard: true }),
+          "\n\n",
+          wrap(color.error(issue.message), { hard: true })
+          // , '\n', color.error(issue.message)
+        ].join(""),
+        { symbol: color.error(icon.error) }
+      );
+    } else if (issue instanceof Error) {
+      log2.message(wrap(color.error(issue.message), { hard: true }), {
+        symbol: color.error(icon.error)
+      });
+    }
+  }
+};
+
+// src/cli/ui/error/app-error.ts
+var logAppError = (error) => {
+  log3.message(
+    wrap([color.error(error.message), `App: ${error.app}`].join("\n"), {
+      hard: true
+    }),
+    { symbol: color.error(icon.error) }
+  );
+  for (const issue of error.issues) {
+    if (issue instanceof StackError2) {
+      logStackError(issue);
+    } else if (issue instanceof Error) {
+      log3.message(wrap(color.error(issue.message), { hard: true }), {
+        symbol: color.error(icon.error)
+      });
+    }
+  }
+};
+
 // src/cli/ui/error/config-error.ts
 import * as p from "@clack/prompts";
 var codeLine = (value, level = 0) => {
@@ -1653,88 +1728,15 @@ var logConfigError = (error) => {
   }
 };
 
-// src/cli/ui/error/error.ts
-import { AppError as AppError2, StackError as StackError3 } from "@awsless/formation";
-
-// src/cli/ui/error/stack-error.ts
-import { ResourceError } from "@awsless/formation";
-import { log as log3 } from "@clack/prompts";
-import { capitalCase as capitalCase2 } from "change-case";
-var formatOperation = (operation) => {
-  const value = ` ${capitalCase2(operation)} `;
-  switch (operation) {
-    case "create":
-      return color.success.bold.inverse(value);
-    case "update":
-      return color.warning.bold.inverse(value);
-    case "delete":
-      return color.error.bold.inverse(value);
-    case "heal":
-      return color.warning.bold.inverse(value);
-    case "get":
-      return color.info.bold.inverse(value);
-  }
-};
-var logStackError = (error) => {
-  log3.message(
-    wrap([color.error(error.message), `Stack: ${error.stack}`].join("\n"), {
-      hard: true
-    }),
-    { symbol: color.error(icon.error) }
-  );
-  for (const issue of error.issues) {
-    if (issue instanceof ResourceError) {
-      log3.message(
-        [
-          formatOperation(issue.operation),
-          "\n",
-          wrap("URN: " + issue.urn, { hard: true }),
-          "\n",
-          wrap("ID: " + issue.id, { hard: true }),
-          "\n\n",
-          wrap(color.error(issue.message), { hard: true })
-          // , '\n', color.error(issue.message)
-        ].join(""),
-        { symbol: color.error(icon.error) }
-      );
-    } else if (issue instanceof Error) {
-      log3.message(wrap(color.error(issue.message), { hard: true }), {
-        symbol: color.error(icon.error)
-      });
-    }
-  }
-};
-
 // src/cli/ui/error/file-error.ts
-import { log as log4 } from "@clack/prompts";
-var logFileError = (error) => {
-  log4.message(
-    wrap([color.error(error.message), color.dim(error.file)].join("\n"), {
-      hard: true
-    }),
-    { symbol: color.error(icon.error) }
-  );
-};
-
-// src/cli/ui/error/app-error.ts
-import { StackError as StackError2 } from "@awsless/formation";
 import { log as log5 } from "@clack/prompts";
-var logAppError = (error) => {
+var logFileError = (error) => {
   log5.message(
-    wrap([color.error(error.message), `App: ${error.app}`].join("\n"), {
+    wrap([color.error(error.message), color.dim(error.file)].join("\n"), {
       hard: true
     }),
     { symbol: color.error(icon.error) }
   );
-  for (const issue of error.issues) {
-    if (issue instanceof StackError2) {
-      logStackError(issue);
-    } else if (issue instanceof Error) {
-      log5.message(wrap(color.error(issue.message), { hard: true }), {
-        symbol: color.error(icon.error)
-      });
-    }
-  }
 };
 
 // src/cli/ui/error/error.ts
@@ -1745,6 +1747,10 @@ var logError = (error) => {
     log6.message(color.error("Cancelled."), {
       symbol: color.error(icon.error)
     });
+  } else if (error instanceof ExpectedError) {
+    log6.message(error.message, {
+      symbol: color.error(icon.error)
+    });
   } else if (error instanceof AppError2) {
     logAppError(error);
   } else if (error instanceof StackError3) {
@@ -2571,7 +2577,13 @@ var cacheFeature = defineFeature({
 var commandFeature = defineFeature({
   name: "command",
   onStack(ctx) {
+    const names = /* @__PURE__ */ new Set();
     for (const [name, props] of Object.entries(ctx.stackConfig.commands ?? {})) {
+      if (!names.has(name)) {
+        names.add(name);
+      } else {
+        throw new FileError(ctx.stackConfig.file, `Duplicate command names aren't allowed: ${name}`);
+      }
       ctx.registerCommand({ name, ...props });
     }
   }
@@ -3478,7 +3490,7 @@ var httpFeature = defineFeature({
     for (const [id, routes] of Object.entries(ctx.stackConfig.http ?? {})) {
       const props = ctx.appConfig.defaults.http?.[id];
       if (!props) {
-        throw new Error(`Http definition is not defined on app level for "${id}"`);
+        throw new FileError(ctx.stackConfig.file, `Http definition is not defined on app level for "${id}"`);
       }
       const group = new Node8(ctx.stack, "http", id);
       for (const [routeKey, routeProps] of Object.entries(routes)) {
@@ -4862,7 +4874,7 @@ var build2 = (program2) => {
 };
 
 // src/cli/command/config/set.ts
-import { spinner as spinner2, text } from "@clack/prompts";
+import { isCancel as isCancel2, spinner as spinner2, text } from "@clack/prompts";
 var set = (program2) => {
   program2.command("set <name>").description("Set a config value").action(async (name) => {
     await layout("config set", async ({ appConfig }) => {
@@ -4882,9 +4894,12 @@ var set = (program2) => {
           return;
         }
       });
+      if (isCancel2(value)) {
+        throw new Cancelled();
+      }
       const spin = spinner2();
       spin.start("Saving remote config parameter");
-      await params.set(name, value.toString());
+      await params.set(name, value);
       spin.stop(`Done saving remote config parameter.`);
     });
   });
@@ -4916,7 +4931,7 @@ var get = (program2) => {
 };
 
 // src/cli/command/config/delete.ts
-import { confirm as confirm2, spinner as spinner4 } from "@clack/prompts";
+import { confirm as confirm2, isCancel as isCancel3, spinner as spinner4 } from "@clack/prompts";
 var del = (program2) => {
   program2.command("delete <name>").description("Delete a config value").action(async (name) => {
     await layout("config delete", async ({ appConfig }) => {
@@ -4929,7 +4944,7 @@ var del = (program2) => {
         message: `Your deleting the ${color.info(name)} config parameter. Are you sure?`,
         initialValue: false
       });
-      if (!ok) {
+      if (!ok || isCancel3(ok)) {
         throw new Cancelled();
       }
       const spin = spinner4();
@@ -5000,7 +5015,7 @@ var config = (program2) => {
 };
 
 // src/cli/command/delete.ts
-import { confirm as confirm3 } from "@clack/prompts";
+import { confirm as confirm3, isCancel as isCancel4 } from "@clack/prompts";
 var del2 = (program2) => {
   program2.command("delete").argument("[stacks...]", "Optionally filter stacks to delete").description("Delete your app from AWS").action(async (filters) => {
     await layout("delete", async ({ appConfig, stackConfigs }) => {
@@ -5019,7 +5034,7 @@ var del2 = (program2) => {
             "delete"
           )} the [ ${formattedFilter} ] stacks?`
         });
-        if (!ok) {
+        if (!ok || isCancel4(ok)) {
           throw new Cancelled();
         }
       }
@@ -5039,7 +5054,7 @@ var del2 = (program2) => {
 };
 
 // src/cli/command/deploy.ts
-import { confirm as confirm4 } from "@clack/prompts";
+import { confirm as confirm4, isCancel as isCancel5 } from "@clack/prompts";
 
 // src/cli/ui/complex/run-tests.ts
 import { join as join11 } from "path";
@@ -5321,7 +5336,7 @@ var deploy = (program2) => {
         const ok = await confirm4({
           message: deployAll ? `Are you sure you want to deploy ${color.warning("all")} stacks?` : deploySingle ? `Are you sure you want to deploy the ${formattedFilter} stack?` : `Are you sure you want to deploy the [ ${formattedFilter} ] stacks?`
         });
-        if (!ok) {
+        if (!ok || isCancel5(ok)) {
           throw new Cancelled();
         }
       }
@@ -5352,7 +5367,7 @@ import {
   CognitoIdentityProviderClient
 } from "@aws-sdk/client-cognito-identity-provider";
 import { unwrap as unwrap2 } from "@awsless/formation";
-import { password, select, text as text2 } from "@clack/prompts";
+import { isCancel as isCancel6, password, select, text as text2 } from "@clack/prompts";
 var create = (program2) => {
   program2.command("create").argument("[name]", "The name of the auth instance").description("Create an user for your userpool").action(async (name) => {
     await layout("auth user create", async ({ appConfig, stackConfigs }) => {
@@ -5360,13 +5375,18 @@ var create = (program2) => {
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
       if (!name) {
-        name = await select({
+        const selectedName = await select({
           message: "Select the auth userpool:",
+          initialValue: Object.keys(appConfig.defaults.auth)[0],
           options: Object.keys(appConfig.defaults.auth).map((name2) => ({
             label: name2,
             value: name2
           }))
         });
+        if (isCancel6(selectedName)) {
+          throw new Cancelled();
+        }
+        name = selectedName;
       }
       if (!(name in appConfig.defaults.auth)) {
         throw new Error(`Provided auth name doesn't exist inside your app config.`);
@@ -5393,6 +5413,9 @@ var create = (program2) => {
           return;
         }
       });
+      if (isCancel6(user2)) {
+        throw new Cancelled();
+      }
       const pass = await password({
         message: "Password:",
         mask: "*",
@@ -5403,6 +5426,9 @@ var create = (program2) => {
           return;
         }
       });
+      if (isCancel6(user2)) {
+        throw new Cancelled();
+      }
       const client = new CognitoIdentityProviderClient({
         region,
         credentials
@@ -5613,11 +5639,11 @@ var resource = (program2) => {
 };
 
 // src/cli/command/run.ts
-import { isCancel, select as select2 } from "@clack/prompts";
+import { isCancel as isCancel7, select as select2 } from "@clack/prompts";
 import { tsImport } from "tsx/esm/api";
 var run = (program2) => {
   program2.command("run").allowUnknownOption(true).argument("[command]", "The command you want to run").description("Run one of your defined commands.").action(async (selected) => {
-    await layout(`run ${selected}`, async ({ appConfig, stackConfigs }) => {
+    await layout(`run ${selected ?? ""}`, async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
@@ -5637,13 +5663,13 @@ var run = (program2) => {
             hint: cmd.description
           }))
         });
-        if (isCancel(selected2)) {
+        if (isCancel7(selected2)) {
           throw new Cancelled();
         }
         command = selected2;
       }
       if (!command) {
-        throw new Error(`The provided command doesn't exist.`);
+        throw new ExpectedError(`The provided command doesn't exist.`);
       }
       process.env.APP = appConfig.name;
       const module = await tsImport(command.file, {
@@ -5651,7 +5677,7 @@ var run = (program2) => {
       });
       const handler = module[command.handler];
       if (!handler) {
-        throw new Error(`No "${command.handler}" handler found.`);
+        throw new ExpectedError(`No "${command.handler}" handler found.`);
       }
       const result = await task("Running", (update) => {
         const options = new CommandOptions(program2.args);
@@ -5683,7 +5709,7 @@ var pull = (program2) => {
 };
 
 // src/cli/command/state/push.ts
-import { confirm as confirm5 } from "@clack/prompts";
+import { confirm as confirm5, isCancel as isCancel8 } from "@clack/prompts";
 var push = (program2) => {
   program2.command("push").description("Push the local state to the remote server").action(async () => {
     await layout("state pull", async ({ appConfig, stackConfigs }) => {
@@ -5696,7 +5722,7 @@ var push = (program2) => {
         message: "Pushing up the local state might corrupt your remote state. Are you sure?",
         initialValue: false
       });
-      if (!ok) {
+      if (!ok || isCancel8(ok)) {
         throw new Cancelled();
       }
       await pushRemoteState(app, stateProvider);
@@ -5706,7 +5732,7 @@ var push = (program2) => {
 };
 
 // src/cli/command/state/unlock.ts
-import { confirm as confirm6 } from "@clack/prompts";
+import { confirm as confirm6, isCancel as isCancel9 } from "@clack/prompts";
 var unlock = (program2) => {
   program2.command("unlock").description("Release the lock that ensures sequential deployments").action(async () => {
     await layout("state unlock", async ({ appConfig, stackConfigs }) => {
@@ -5723,7 +5749,7 @@ var unlock = (program2) => {
         message: "Releasing the lock that ensures sequential deployments might result in corrupt state if a deployment is still running. Are you sure?",
         initialValue: false
       });
-      if (!ok) {
+      if (!ok || isCancel9(ok)) {
         throw new Cancelled();
       }
       await lockProvider.insecureReleaseLock(app.urn);

package/dist/build-json-schema.js

@@ -311,8 +311,8 @@ import { z as z9 } from "zod";
 var CommandSchema = z9.union([
   z9.object({
     file: LocalFileSchema,
-    handler: z9.string().default("default"),
-    description: z9.string().optional()
+    handler: z9.string().default("default").describe("The name of the handler that needs to run"),
+    description: z9.string().optional().describe("A description of the command")
     // options: z.record(ResourceIdSchema, OptionSchema).optional(),
     // arguments: z.record(ResourceIdSchema, ArgumentSchema).optional(),
   }),
@@ -322,7 +322,7 @@ var CommandSchema = z9.union([
     description: void 0
   }))
 ]);
-var CommandsSchema = z9.record(ResourceIdSchema, CommandSchema).optional().describe("Define the config values for your stack.");
+var CommandsSchema = z9.record(ResourceIdSchema, CommandSchema).optional().describe("Define the custom commands for your stack.");
 
 // src/feature/config/schema.ts
 import { z as z10 } from "zod";

package/dist/{chunk-DVWXAVM2.js → chunk-S76KJGMT.js}

@@ -9,14 +9,14 @@ var CommandOptions = class {
     if (name in this.opts) {
       return this.opts[name];
     }
-    throw new Error(`Option "${name}" not found`);
+    throw new Error(`CLI option "${name}" not found`);
   }
   getAssertType(name, type) {
     const value = this.get(name);
     if (typeof value === type) {
       return value;
     }
-    throw new Error(`Option "${name}" is not type of ${type}`);
+    throw new Error(`CLI option "${name}" isn't a ${type} type`);
   }
   number(name) {
     return this.getAssertType(name, "number");

package/dist/server.js

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2LRBH7VV.js";
 import {
   CommandOptions
-} from "./chunk-DVWXAVM2.js";
+} from "./chunk-S76KJGMT.js";
 
 // src/lib/handle/cron.ts
 import { lambda } from "@awsless/lambda";