@awsless/awsless 0.0.41 → 0.0.43

package/dist/bin.js

@@ -597,7 +597,7 @@ var createDeploymentLine = (stacks) => {
     depends: config?.depends?.map((dep) => dep.name) || []
   }));
   const names = stacks.map(({ stack }) => stack.name);
-  const line = [];
+  const line2 = [];
   const deps = [];
   let limit = 100;
   while (deps.length < list3.length) {
@@ -612,9 +612,9 @@ var createDeploymentLine = (stacks) => {
       throw new Error(`Circular stack dependencies arn't allowed: ${circularNames}`);
     }
     deps.push(...local.map((stack) => stack.name));
-    line.push(local);
+    line2.push(local);
   }
-  return line;
+  return line2;
 };
 
 // src/plugins/cron/index.ts
@@ -624,23 +624,30 @@ import { z as z7 } from "zod";
 import { z } from "zod";
 import { awsCronExpressionValidator } from "aws-cron-expression-validator";
 var RateExpressionSchema = z.custom((value) => {
-  return z.string().regex(/rate\([0-9]+ (seconds?|minutes?|hours?|days?)\)/).refine((rate) => {
-    const [str] = rate.substring(5).split(" ");
+  return z.string().regex(/^[0-9]+ (seconds?|minutes?|hours?|days?)$/).refine((rate) => {
+    const [str] = rate.split(" ");
     const number = parseInt(str);
     return number > 0;
   }).safeParse(value).success;
-}, "Invalid rate expression");
+}, { message: "Invalid rate expression" }).transform((rate) => {
+  const [str] = rate.split(" ");
+  const number = parseInt(str);
+  const more = rate.endsWith("s");
+  if (more && number === 1) {
+    return `rate(${rate.substring(0, rate.length - 1)})`;
+  }
+  return `rate(${rate})`;
+});
 var CronExpressionSchema = z.custom((value) => {
-  return z.string().startsWith("cron(").endsWith(")").safeParse(value).success;
-}, "Invalid cron expression").superRefine((value, ctx) => {
-  const cron = value.substring(5, value.length - 1);
+  return z.string().safeParse(value).success;
+}, { message: "Invalid cron expression" }).superRefine((value, ctx) => {
   try {
-    awsCronExpressionValidator(cron);
+    awsCronExpressionValidator(value);
   } catch (error) {
     if (error instanceof Error) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: error.message
+        message: `Invalid cron expression: ${error.message}`
       });
     } else {
       ctx.addIssue({
@@ -649,6 +656,8 @@ var CronExpressionSchema = z.custom((value) => {
       });
     }
   }
+}).transform((value) => {
+  return `cron(${value.trim()})`;
 });
 var ScheduleExpressionSchema = RateExpressionSchema.or(CronExpressionSchema);
 
@@ -712,7 +721,7 @@ function toDuration(duration) {
   return Duration.days(0);
 }
 var DurationSchema = z2.custom((value) => {
-  return z2.string().regex(/[0-9]+ (seconds?|minutes?|hours?|days?)/).safeParse(value).success;
+  return z2.string().regex(/^[0-9]+ (seconds?|minutes?|hours?|days?)$/).safeParse(value).success;
 }, "Invalid duration").transform(toDuration);
 var durationMin = (min) => {
   return (duration) => {
@@ -738,8 +747,9 @@ var LocalFileSchema = z3.string().refine(async (path) => {
 }, `File doesn't exist`);
 
 // src/schema/resource-id.ts
+import { paramCase as paramCase3 } from "change-case";
 import { z as z4 } from "zod";
-var ResourceIdSchema = z4.string().min(3).max(24).regex(/[a-z\-]+/, "Invalid resource ID");
+var ResourceIdSchema = z4.string().min(3).max(24).regex(/^[a-z\-]+$/i, "Invalid resource ID").transform((value) => paramCase3(value));
 
 // src/schema/size.ts
 import { z as z5 } from "zod";
@@ -789,7 +799,7 @@ function toSize(size) {
   throw new TypeError(`Invalid size ${size}`);
 }
 var SizeSchema = z5.custom((value) => {
-  return z5.string().regex(/[0-9]+ (KB|MB|GB)/).safeParse(value).success;
+  return z5.string().regex(/^[0-9]+ (KB|MB|GB)$/).safeParse(value).success;
 }, "Invalid size").transform(toSize);
 var sizeMin = (min) => {
   return (size) => {
@@ -1456,7 +1466,7 @@ var cronPlugin = definePlugin({
        *   crons: {
        *     CRON_NAME: {
        *       consumer: 'function.ts',
-       *       schedule: 'rate(5 minutes)',
+       *       schedule: '5 minutes',
        *     }
        *   }
        * }
@@ -1465,8 +1475,8 @@ var cronPlugin = definePlugin({
         /** The consuming lambda function properties. */
         consumer: FunctionSchema,
         /** The scheduling expression.
-         * @example 'cron(0 20 * * ? *)'
-         * @example 'rate(5 minutes)'
+         * @example '0 20 * * ? *'
+         * @example '5 minutes'
          */
         schedule: ScheduleExpressionSchema,
         // Valid JSON passed to the consumer.
@@ -1608,7 +1618,8 @@ var SqsEventSource = class extends Group {
 };
 
 // src/plugins/queue.ts
-import { constantCase as constantCase2 } from "change-case";
+import { camelCase as camelCase3, constantCase as constantCase2 } from "change-case";
+import { relative as relative3 } from "path";
 var RetentionPeriodSchema = DurationSchema.refine(durationMin(Duration.minutes(1)), "Minimum retention period is 1 minute").refine(durationMax(Duration.days(14)), "Maximum retention period is 14 days");
 var VisibilityTimeoutSchema = DurationSchema.refine(durationMax(Duration.hours(12)), "Maximum visibility timeout is 12 hours");
 var DeliveryDelaySchema = DurationSchema.refine(durationMax(Duration.minutes(15)), "Maximum delivery delay is 15 minutes");
@@ -1620,10 +1631,12 @@ var MaxBatchingWindow = DurationSchema.refine(durationMax(Duration.minutes(5)),
 var typeGenCode2 = `
 import { SendMessageOptions, SendMessageBatchOptions, BatchItem } from '@awsless/sqs'
 
-type Send<Name extends string> = {
+type Payload<Func extends (...args: any[]) => any> = Parameters<Func>[0]['Records'][number]['body']
+
+type Send<Name extends string, Func extends (...args: any[]) => any> = {
 	name: Name
-	batch(items:BatchItem[], options?:Omit<SendMessageBatchOptions, 'queue' | 'items'>): Promise<void>
-	(payload: unknown, options?: Omit<SendMessageOptions, 'queue' | 'payload'>): Promise<void>
+	batch(items:BatchItem<Payload<Func>>[], options?:Omit<SendMessageBatchOptions, 'queue' | 'items'>): Promise<void>
+	(payload: Payload<Func>, options?: Omit<SendMessageOptions, 'queue' | 'payload'>): Promise<void>
 }`;
 var queuePlugin = definePlugin({
   name: "queue",
@@ -1729,9 +1742,13 @@ var queuePlugin = definePlugin({
     types2.addCode(typeGenCode2);
     for (const stack of config.stacks) {
       const list3 = new TypeObject();
-      for (const name of Object.keys(stack.queues || {})) {
+      for (const [name, fileOrProps] of Object.entries(stack.queues || {})) {
+        const varName = camelCase3(`${stack.name}-${name}`);
         const queueName = formatName(`${config.name}-${stack.name}-${name}`);
-        list3.addType(name, `Send<'${queueName}'>`);
+        const file = typeof fileOrProps === "string" ? fileOrProps : typeof fileOrProps.consumer === "string" ? fileOrProps.consumer : fileOrProps.consumer.file;
+        const relFile = relative3(directories.types, file);
+        types2.addImport(varName, relFile);
+        list3.addType(name, `Send<'${queueName}', typeof ${varName}>`);
       }
       types2.addType(stack.name, list3.toString());
     }
@@ -2403,7 +2420,7 @@ var toArray = (value) => {
 };
 
 // src/plugins/graphql.ts
-import { paramCase as paramCase3 } from "change-case";
+import { paramCase as paramCase4 } from "change-case";
 
 // src/formation/resource/appsync/graphql-api.ts
 import { constantCase as constantCase4 } from "change-case";
@@ -2746,9 +2763,6 @@ export function response(ctx) {
 	return ctx.result
 }
 `;
-var ResolverFieldSchema = z14.custom((value) => {
-  return z14.string().regex(/([a-z0-9\_]+)(\s){1}([a-z0-9\_]+)/gi).safeParse(value).success;
-}, `Invalid resolver field. Valid example: "Query list"`);
 var graphqlPlugin = definePlugin({
   name: "graphql",
   schema: z14.object({
@@ -2769,7 +2783,13 @@ var graphqlPlugin = definePlugin({
           LocalFileSchema,
           z14.array(LocalFileSchema).min(1)
         ]).optional(),
-        resolvers: z14.record(ResolverFieldSchema, FunctionSchema).optional()
+        resolvers: z14.record(
+          z14.string(),
+          z14.record(
+            z14.string(),
+            FunctionSchema
+          )
+        ).optional()
       })).optional()
     }).array()
   }),
@@ -2834,17 +2854,18 @@ var graphqlPlugin = definePlugin({
     const { stack, stackConfig, bootstrap: bootstrap2 } = ctx;
     for (const [id, props] of Object.entries(stackConfig.graphql || {})) {
       const apiId = bootstrap2.import(`graphql-${id}`);
-      for (const [typeAndField, functionProps] of Object.entries(props.resolvers || {})) {
-        const [typeName, fieldName] = typeAndField.split(/[\s]+/g);
-        const entryId = paramCase3(`${id}-${typeName}-${fieldName}`);
-        const lambda = toLambdaFunction(ctx, `graphql-${entryId}`, functionProps);
-        const source = new AppsyncEventSource(entryId, lambda, {
-          apiId,
-          typeName,
-          fieldName,
-          code: Code2.fromInline(entryId, defaultResolver)
-        });
-        stack.add(lambda, source);
+      for (const [typeName, fields] of Object.entries(props.resolvers || {})) {
+        for (const [fieldName, functionProps] of Object.entries(fields || {})) {
+          const entryId = paramCase4(`${id}-${typeName}-${fieldName}`);
+          const lambda = toLambdaFunction(ctx, `graphql-${entryId}`, functionProps);
+          const source = new AppsyncEventSource(entryId, lambda, {
+            apiId,
+            typeName,
+            fieldName,
+            code: Code2.fromInline(entryId, defaultResolver)
+          });
+          stack.add(lambda, source);
+        }
       }
     }
   }
@@ -4388,7 +4409,7 @@ var AppSchema = z23.object({
   /** The deployment stage.
    * @default 'prod'
    */
-  stage: z23.string().regex(/[a-z]+/).default("prod"),
+  stage: z23.string().regex(/^[a-z]+$/).default("prod"),
   /** Default properties. */
   defaults: z23.object({}).default({}),
   /** The application stacks. */
@@ -4494,6 +4515,14 @@ var watchFile = (path) => {
 };
 
 // src/config.ts
+import { z as z24 } from "zod";
+var ConfigError = class extends Error {
+  constructor(error, data) {
+    super(error.message);
+    this.error = error;
+    this.data = data;
+  }
+};
 var importConfig = async (options) => {
   debug("Find the root directory");
   const configFile = options.configFile || "awsless.config.ts";
@@ -4515,7 +4544,15 @@ var importConfig = async (options) => {
       schema2 = schema2.and(plugin.schema);
     }
   }
-  const config = await schema2.parseAsync(appConfig);
+  let config;
+  try {
+    config = await schema2.parseAsync(appConfig);
+  } catch (error) {
+    if (error instanceof z24.ZodError) {
+      throw new ConfigError(error, appConfig);
+    }
+    throw error;
+  }
   debug("Load credentials", style.info(config.profile));
   const credentials = getCredentials(config.profile);
   debug("Load AWS account ID");
@@ -4548,7 +4585,15 @@ var watchConfig = async function* (options) {
         schema2 = schema2.and(plugin.schema);
       }
     }
-    const config = await schema2.parseAsync(appConfig);
+    let config;
+    try {
+      config = await schema2.parseAsync(appConfig);
+    } catch (error) {
+      if (error instanceof z24.ZodError) {
+        throw new ConfigError(error, appConfig);
+      }
+      throw error;
+    }
     debug("Load credentials", style.info(config.profile));
     const credentials = getCredentials(config.profile);
     debug("Load AWS account ID");
@@ -4673,11 +4718,11 @@ var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
   return (term) => {
-    term.out.write(lines.map((line, i) => {
+    term.out.write(lines.map((line2, i) => {
       if (i === 0) {
-        return icon + wrapAnsi(line, term.out.width(), { hard: true });
+        return icon + wrapAnsi(line2, term.out.width(), { hard: true });
       }
-      return wrapAnsi(" ".repeat(padding) + line, term.out.width(), { hard: true });
+      return wrapAnsi(" ".repeat(padding) + line2, term.out.width(), { hard: true });
     }).join(br()) + br());
   };
 };
@@ -5000,6 +5045,87 @@ var logs = () => {
   };
 };
 
+// src/cli/ui/layout/zod-error.ts
+var line = (value, level = 0, highlight = false) => {
+  return [
+    highlight ? style.error(symbol.pointerSmall) + style.placeholder("  | ") : style.placeholder.dim("   | "),
+    "   ".repeat(level),
+    value,
+    br()
+  ];
+};
+var format = (value) => {
+  if (Array.isArray(value)) {
+    return "[ ... ]";
+  }
+  if (value === null) {
+    return "null";
+  }
+  switch (typeof value) {
+    case "function":
+      return "() => { ... }";
+    case "bigint":
+      return `${value}n`;
+    case "symbol":
+      return "Symbol()";
+    case "object":
+      return "{ ... }";
+    case "undefined":
+    case "string":
+    case "number":
+    case "boolean":
+      return JSON.stringify(value);
+  }
+  return "";
+};
+var zodError = (error, data) => {
+  return (term) => {
+    term.out.write(JSON.stringify(error.errors));
+    for (const issue of error.issues) {
+      term.out.gap();
+      term.out.write(dialog("error", [
+        style.error(issue.message)
+      ]));
+      term.out.gap();
+      term.out.write(line("{"));
+      let context = data;
+      const inStack = issue.path[0] === "stacks" && typeof issue.path[1] === "number";
+      const length2 = issue.path.length;
+      const end = [];
+      issue.path.forEach((path, i) => {
+        const index = i + 1;
+        context = context[path];
+        if (typeof path === "string") {
+          const key = path + `: `;
+          if (index === length2) {
+            const space = " ".repeat(key.length);
+            const value = format(context);
+            const error2 = "^".repeat(value.length);
+            term.out.write(line(key + style.warning(value), index));
+            term.out.write(line(space + style.error(error2), index, true));
+          } else if (Array.isArray(context)) {
+            term.out.write(line(key + "[", index));
+            end.unshift(line("]", index));
+          } else if (typeof context === "object") {
+            if (inStack && index === 3) {
+              const name = data.stacks[issue.path[1]].name;
+              term.out.write(line("name: " + style.info(`"${name}"`) + ",", index));
+            }
+            term.out.write(line(key + "{", index));
+            end.unshift(line("}", index));
+          }
+        } else if (typeof context === "object") {
+          term.out.write(line("{", index));
+          end.unshift(line("}", index));
+        }
+      });
+      term.out.write(end);
+      term.out.write(line("}"));
+      term.out.gap();
+    }
+  };
+};
+
 // src/cli/ui/layout/layout.ts
 var layout = async (cb) => {
   const term = createTerminal();
@@ -5015,7 +5141,9 @@ var layout = async (cb) => {
     await cb(config, term.out.write.bind(term.out), term);
   } catch (error) {
     term.out.gap();
-    if (error instanceof Error) {
+    if (error instanceof ConfigError) {
+      term.out.write(zodError(error.error, error.data));
+    } else if (error instanceof Error) {
       term.out.write(dialog("error", [error.message]));
     } else if (typeof error === "string") {
       term.out.write(dialog("error", [error]));
@@ -5093,7 +5221,7 @@ var assetBuilder = (app) => {
         }
         const [icon, stop] = createSpinner();
         const details = new Signal({});
-        const line = flexLine(term, [
+        const line2 = flexLine(term, [
           icon,
           "  ",
           style.label(stack.name),
@@ -5117,7 +5245,7 @@ var assetBuilder = (app) => {
           }),
           br()
         ]);
-        group.update((group2) => [...group2, line]);
+        group.update((group2) => [...group2, line2]);
         const timer = createTimer();
         try {
           const data = await asset.build({
@@ -5237,7 +5365,7 @@ var shouldDeployBootstrap = async (client, stack) => {
 // src/formation/client.ts
 import { CloudFormationClient, CreateStackCommand, DeleteStackCommand, DescribeStackEventsCommand, DescribeStacksCommand, GetTemplateCommand, OnFailure, TemplateStage, UpdateStackCommand, ValidateTemplateCommand, waitUntilStackCreateComplete, waitUntilStackDeleteComplete, waitUntilStackUpdateComplete } from "@aws-sdk/client-cloudformation";
 import { S3Client, PutObjectCommand, ObjectCannedACL, StorageClass } from "@aws-sdk/client-s3";
-import { paramCase as paramCase4 } from "change-case";
+import { paramCase as paramCase5 } from "change-case";
 var StackClient = class {
   constructor(app, account, region, credentials) {
     this.app = app;
@@ -5270,7 +5398,7 @@ var StackClient = class {
     };
   }
   stackName(stackName) {
-    return paramCase4(`${this.app.name}-${stackName}`);
+    return paramCase5(`${this.app.name}-${stackName}`);
   }
   tags(stack) {
     const tags = [];
@@ -5588,13 +5716,13 @@ var bootstrap = (program2) => {
 
 // src/cli/ui/complex/deployer.ts
 var stacksDeployer = (deploymentLine) => {
-  const stackNames = deploymentLine.map((line) => line.map((stack) => stack.name)).flat();
+  const stackNames = deploymentLine.map((line2) => line2.map((stack) => stack.name)).flat();
   const stackNameSize = Math.max(...stackNames.map((name) => name.length));
   return (term) => {
     const ui = {};
     term.out.gap();
     for (const i in deploymentLine) {
-      const line = flexLine(
+      const line2 = flexLine(
         term,
         ["   "],
         [
@@ -5603,7 +5731,7 @@ var stacksDeployer = (deploymentLine) => {
           style.placeholder(" \u2500\u2500")
         ]
       );
-      term.out.write(line);
+      term.out.write(line2);
       term.out.write(br());
       for (const stack of deploymentLine[i]) {
         const icon = new Signal(" ");
@@ -5783,8 +5911,8 @@ var deploy = (program2) => {
       const doneDeploying = write(loadingDialog("Deploying stacks to AWS..."));
       const client = new StackClient(app, config.account, config.region, config.credentials);
       const ui = write(stacksDeployer(deploymentLine));
-      for (const line of deploymentLine) {
-        const results = await Promise.allSettled(line.map(async (stack) => {
+      for (const line2 of deploymentLine) {
+        const results = await Promise.allSettled(line2.map(async (stack) => {
           const item = ui[stack.name];
           item.start("deploying");
           try {

package/dist/index.cjs

@@ -172,7 +172,12 @@ var getCacheProps = (name, stack = STACK) => {
 };
 var Cache = createProxy((stack) => {
   return createProxy((name) => {
-    return getCacheProps(name, stack);
+    const call = () => {
+    };
+    const { host, port } = getCacheProps(name, stack);
+    call.host = host;
+    call.port = port;
+    return call;
   });
 });