@awsless/awsless 0.0.321 → 0.0.323

package/dist/bin.js

@@ -10,48 +10,6 @@ import {
 // src/cli/program.ts
 import { Command as Command2 } from "commander";
 
-// src/cli/ui/style.ts
-import chalk from "chalk";
-var icon = {
-  // info: 'ℹ',
-  // success: '✓',
-  // warning: '⚠',
-  // question: '?',
-  error: "\xD7",
-  dot: "\xB7",
-  // line: '─',
-  // ellipsis: '…',
-  arrow: {
-    top: "^",
-    right: "\u203A"
-  }
-  // pointer: '❯',
-};
-var color = {
-  primary: chalk.bold.hex("#FF9000"),
-  // primary: chalk.bold.magentaBright,
-  // title: chalk.white,
-  // normal: chalk.white,
-  label: chalk.reset.white.bold,
-  dim: chalk.dim,
-  line: chalk.black,
-  // link: chalk.cyan,
-  info: chalk.blue,
-  success: chalk.green,
-  warning: chalk.yellow,
-  error: chalk.red,
-  attr: chalk.yellow
-  // cursor: chalk.bgWhite.blackBright,
-};
-var char = {
-  br: "\n"
-};
-
-// src/cli/ui/logo.ts
-var logo = () => {
-  return `${color.primary`AWS`}${color.primary.dim`LESS`}`;
-};
-
 // src/util/aws.ts
 import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
 import { fromIni } from "@aws-sdk/credential-providers";
@@ -186,6 +144,45 @@ var pushRemoteState = async (app, stateProvider) => {
 
 // src/cli/ui/util.ts
 import wrapAnsi from "wrap-ansi";
+
+// src/cli/ui/style.ts
+import chalk from "chalk";
+var icon = {
+  // info: 'ℹ',
+  // success: '✓',
+  // warning: '⚠',
+  // question: '?',
+  error: "\xD7",
+  dot: "\xB7",
+  // line: '─',
+  // ellipsis: '…',
+  arrow: {
+    top: "^",
+    right: "\u203A"
+  }
+  // pointer: '❯',
+};
+var color = {
+  primary: chalk.bold.hex("#FF9000"),
+  // primary: chalk.bold.magentaBright,
+  // title: chalk.white,
+  // normal: chalk.white,
+  label: chalk.reset.white.bold,
+  dim: chalk.dim,
+  line: chalk.black,
+  // link: chalk.cyan,
+  info: chalk.blue,
+  success: chalk.green,
+  warning: chalk.yellow,
+  error: chalk.red,
+  attr: chalk.yellow
+  // cursor: chalk.bgWhite.blackBright,
+};
+var char = {
+  br: "\n"
+};
+
+// src/cli/ui/util.ts
 import Table from "cli-table3";
 import { capitalCase } from "change-case";
 import { spinner } from "@clack/prompts";
@@ -352,6 +349,7 @@ var bootstrapAwsless = async (props) => {
 import { intro, outro } from "@clack/prompts";
 
 // src/config/load/load.ts
+import { glob } from "glob";
 import { basename as basename2, dirname as dirname3, join as join5 } from "path";
 
 // src/cli/debug.ts
@@ -383,7 +381,7 @@ import { z } from "zod";
 var ResourceIdSchema = z.string().min(3).max(24).regex(/^[a-z0-9\-]+$/i, "Invalid resource ID").transform((value) => paramCase(value));
 
 // src/feature/function/schema.ts
-import { days, minutes as minutes2, seconds } from "@awsless/duration";
+import { days, minutes as minutes2, seconds, toDays } from "@awsless/duration";
 import { gibibytes, mebibytes } from "@awsless/size";
 import { z as z5 } from "zod";
 
@@ -478,9 +476,19 @@ var MinifySchema = z5.boolean().describe("Minify the function code.");
 var HandlerSchema = z5.string().describe("The name of the exported method within your code that Lambda calls to run your function.");
 var FileSchema = LocalFileSchema.describe("The file path of the function code.");
 var DescriptionSchema = z5.string().describe("A description of the function.");
+var validLogRetentionDays = [
+  ...[1n, 3n, 5n, 7n, 14n, 30n, 60n, 90n, 120n, 150n],
+  ...[180n, 365n, 400n, 545n, 731n, 1096n, 1827n, 2192n],
+  ...[2557n, 2922n, 3288n, 3653n]
+];
 var LogRetentionSchema = DurationSchema.refine(
   durationMin(days(0)),
   "Minimum log retention is 0 day, which will disable logging."
+).refine(
+  (duration) => {
+    return validLogRetentionDays.includes(toDays(duration));
+  },
+  `Invalid log retention. Valid days are: ${validLogRetentionDays.map((days5) => `${days5}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema = z5.union([
   z5.boolean().transform((enabled) => ({ retention: enabled ? days(7) : days(0) })),
@@ -963,9 +971,6 @@ var AppSchema = z18.object({
   }).default({}).describe("Default properties")
 });
 
-// src/config/load/load.ts
-import { glob } from "glob";
-
 // src/config/stack.ts
 import { z as z32 } from "zod";
 
@@ -1483,10 +1488,10 @@ var StackSchema = z32.object({
 });
 
 // src/config/load/read.ts
-import { basename, dirname as dirname2, extname, join as join4 } from "path";
+import merge from "deepmerge";
 import { readFile as readFile2 } from "fs/promises";
 import JSON5 from "json5";
-import merge from "deepmerge";
+import { basename, dirname as dirname2, extname, join as join4 } from "path";
 var readConfig = async (file) => {
   try {
     const json4 = await readFile2(file, "utf8");
@@ -1501,6 +1506,9 @@ var readConfig = async (file) => {
 };
 var readConfigWithStage = async (file, stage) => {
   const config2 = await readConfig(file);
+  if (!stage) {
+    return config2;
+  }
   const ext = extname(file);
   const stageFileName = basename(file, ext) + "." + stage + ext;
   const stageFile = join4(dirname2(file), stageFileName);
@@ -1569,17 +1577,16 @@ var loadStackConfigs = async (options) => {
 
 // src/cli/ui/app.ts
 import { note } from "@clack/prompts";
-var logApp = (app) => {
-  note(
-    wrap(
-      list({
-        App: app.name,
-        Region: app.region,
-        Profile: app.profile
-      })
-    ),
-    "App Config"
-  );
+var logApp = (app, opt) => {
+  const data = {
+    App: app.name,
+    Region: app.region,
+    Profile: app.profile
+  };
+  if (opt.stage) {
+    data.Stage = color.warning(opt.stage);
+  }
+  note(wrap(list(data)), "App Config");
 };
 
 // src/cli/ui/error/error.ts
@@ -1790,6 +1797,11 @@ var logError = (error) => {
   }
 };
 
+// src/cli/ui/logo.ts
+var logo = () => {
+  return `${color.primary`AWS`}${color.primary.dim`LESS`}`;
+};
+
 // src/cli/ui/complex/layout.ts
 var layout = async (command, cb) => {
   console.log();
@@ -1797,7 +1809,7 @@ var layout = async (command, cb) => {
   try {
     const options = program.optsWithGlobals();
     const appConfig = await loadAppConfig(options);
-    logApp(appConfig);
+    logApp(appConfig, options);
     const stackConfigs = await loadStackConfigs(options);
     const result = await cb({
       options,
@@ -5886,7 +5898,7 @@ var commands6 = [
 var program = new Command2();
 program.name(logo());
 program.option("--config-file <string>", "The app config file location");
-program.option("--stage <string>", "The stage to use, defaults to prod stage", "prod");
+program.option("--stage <string>", "The stage to use");
 program.option("-c --no-cache", "Always build & test without the cache");
 program.option("-s --skip-prompt", "Skip prompts");
 program.option("-v --verbose", "Print verbose logs");

package/dist/build-json-schema.js

@@ -13,7 +13,7 @@ import { z } from "zod";
 var ResourceIdSchema = z.string().min(3).max(24).regex(/^[a-z0-9\-]+$/i, "Invalid resource ID").transform((value) => paramCase(value));
 
 // src/feature/function/schema.ts
-import { days, minutes, seconds } from "@awsless/duration";
+import { days, minutes, seconds, toDays } from "@awsless/duration";
 import { gibibytes, mebibytes } from "@awsless/size";
 import { z as z5 } from "zod";
 
@@ -135,9 +135,19 @@ var MinifySchema = z5.boolean().describe("Minify the function code.");
 var HandlerSchema = z5.string().describe("The name of the exported method within your code that Lambda calls to run your function.");
 var FileSchema = LocalFileSchema.describe("The file path of the function code.");
 var DescriptionSchema = z5.string().describe("A description of the function.");
+var validLogRetentionDays = [
+  ...[1n, 3n, 5n, 7n, 14n, 30n, 60n, 90n, 120n, 150n],
+  ...[180n, 365n, 400n, 545n, 731n, 1096n, 1827n, 2192n],
+  ...[2557n, 2922n, 3288n, 3653n]
+];
 var LogRetentionSchema = DurationSchema.refine(
   durationMin(days(0)),
   "Minimum log retention is 0 day, which will disable logging."
+).refine(
+  (duration) => {
+    return validLogRetentionDays.includes(toDays(duration));
+  },
+  `Invalid log retention. Valid days are: ${validLogRetentionDays.map((days3) => `${days3}`).join(", ")}`
 ).describe("The log retention duration.");
 var LogSchema = z5.union([
   z5.boolean().transform((enabled) => ({ retention: enabled ? days(7) : days(0) })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.321",
+  "version": "0.0.323",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,14 +28,14 @@
     }
   },
   "peerDependencies": {
+    "@awsless/lambda": "^0.0.26",
     "@awsless/s3": "^0.0.18",
     "@awsless/open-search": "^0.0.15",
-    "@awsless/lambda": "^0.0.25",
+    "@awsless/sns": "^0.0.7",
     "@awsless/validate": "^0.0.14",
-    "@awsless/redis": "^0.0.12",
     "@awsless/iot": "^0.0.2",
-    "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
+    "@awsless/redis": "^0.0.12",
     "@awsless/ssm": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1"
   },
@@ -107,12 +107,12 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
-    "@awsless/graphql": "^0.0.9",
     "@awsless/formation": "^0.0.45",
-    "@awsless/code": "^0.0.10",
     "@awsless/size": "^0.0.1",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/validate": "^0.0.14",
-    "@awsless/ts-file-cache": "^0.0.1"
+    "@awsless/ts-file-cache": "^0.0.1",
+    "@awsless/code": "^0.0.10"
   },
   "scripts": {
     "test": "pnpm code test",