@awsless/awsless 0.0.127 → 0.0.129

package/dist/bin.js

@@ -1044,8 +1044,8 @@ var generateFileHashes = async (file, hashes) => {
 var fingerprintFromFile = async (file) => {
   const hashes = /* @__PURE__ */ new Map();
   await generateFileHashes(file, hashes);
-  const merge = Buffer.concat(Array.from(hashes.values()).sort());
-  return createHash2("sha1").update(merge).digest("hex");
+  const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
+  return createHash2("sha1").update(merge2).digest("hex");
 };
 var fingerprintFromDirectory = async (dir) => {
   const hashes = /* @__PURE__ */ new Map();
@@ -1055,8 +1055,8 @@ var fingerprintFromDirectory = async (dir) => {
       await generateFileHashes(join3(dir, file), hashes);
     }
   }
-  const merge = Buffer.concat(Array.from(hashes.values()).sort());
-  return createHash2("sha1").update(merge).digest("hex");
+  const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
+  return createHash2("sha1").update(merge2).digest("hex");
 };
 var readModuleFile = (file) => {
   if (file.endsWith(".js")) {
@@ -3712,10 +3712,10 @@ var onFailurePlugin = definePlugin({
     if (!hasOnFailure(config2)) {
       return;
     }
-    const queue3 = new Queue("on-failure", {
+    const queue2 = new Queue("on-failure", {
       name: `${config2.app.name}-failure`
     });
-    bootstrap2.add(queue3).export("on-failure-queue-arn", queue3.arn);
+    bootstrap2.add(queue2).export("on-failure-queue-arn", queue2.arn);
   },
   onStack(ctx) {
     const { stack, stackConfig, bootstrap: bootstrap2 } = ctx;
@@ -3862,22 +3862,22 @@ var queuePlugin = definePlugin({
     const { stack, config: config2, stackConfig, bind } = ctx;
     for (const [id, functionOrProps] of Object.entries(stackConfig.queues || {})) {
       const props = typeof functionOrProps === "string" ? { ...config2.app.defaults.queue, consumer: functionOrProps } : { ...config2.app.defaults.queue, ...functionOrProps };
-      const queue3 = new Queue(id, {
+      const queue2 = new Queue(id, {
         name: `${config2.app.name}-${stack.name}-${id}`,
         deadLetterArn: getGlobalOnFailure(ctx),
         ...props
       });
       const lambda = toLambdaFunction(ctx, `queue-${id}`, props.consumer);
       const source = new SqsEventSource(id, lambda, {
-        queueArn: queue3.arn,
+        queueArn: queue2.arn,
         batchSize: props.batchSize,
         maxConcurrency: props.maxConcurrency,
         maxBatchingWindow: props.maxBatchingWindow
       });
-      stack.add(queue3, lambda, source);
+      stack.add(queue2, lambda, source);
       bind((lambda2) => {
-        lambda2.addPermissions(queue3.permissions);
-        lambda2.addEnvironment(`QUEUE_${constantCase10(stack.name)}_${constantCase10(id)}_URL`, queue3.url);
+        lambda2.addPermissions(queue2.permissions);
+        lambda2.addEnvironment(`QUEUE_${constantCase10(stack.name)}_${constantCase10(id)}_URL`, queue2.url);
       });
     }
   }
@@ -5498,7 +5498,7 @@ var toApp = async (config2, filters) => {
 };
 
 // src/config/load.ts
-import { dirname as dirname5, join as join7 } from "path";
+import { basename as basename3, dirname as dirname5, extname as extname2, join as join7 } from "path";
 
 // src/util/account.ts
 import { STSClient, GetCallerIdentityCommand } from "@aws-sdk/client-sts";
@@ -6317,6 +6317,7 @@ var Cancelled = class extends Error {
 
 // src/config/load.ts
 import JSON5 from "json5";
+import merge from "deepmerge";
 var readConfig = async (file) => {
   try {
     const json4 = await readFile5(file, "utf8");
@@ -6329,6 +6330,19 @@ var readConfig = async (file) => {
     throw error;
   }
 };
+var readConfigWithStage = async (file, stage) => {
+  const config2 = await readConfig(file);
+  const ext = extname2(file);
+  const stageFileName = basename3(file, ext) + "." + stage + ext;
+  const stageFile = join7(dirname5(file), stageFileName);
+  const stageFileExists = await fileExist(stageFile);
+  if (!stageFileExists) {
+    return config2;
+  }
+  debug("Load env file:", style.info(stageFile));
+  const stageConfig = await readConfig(stageFile);
+  return merge(config2, stageConfig);
+};
 var parseConfig = async (schema, file, data) => {
   try {
     const result = await schema.parseAsync(data);
@@ -6349,7 +6363,7 @@ var loadConfig = async (options) => {
   debug("CWD:", style.info(root2));
   debug("Load app config file");
   const appFileName = join7(root2, configFile);
-  const appConfig = await readConfig(appFileName);
+  const appConfig = await readConfigWithStage(appFileName, options.stage);
   debug("Validate app config file");
   const app = await parseConfig(AppSchema, appFileName, appConfig);
   debug("Load credentials", style.info(app.profile));
@@ -6365,8 +6379,8 @@ var loadConfig = async (options) => {
   });
   const stacks = [];
   for (const file of stackFiles) {
-    debug(`Load stack: ${style.info(file)}`);
-    const stackConfig = await readConfig(file);
+    debug("Load stack file:", style.info(file));
+    const stackConfig = await readConfigWithStage(file, options.stage);
     setLocalBasePath(join7(process.cwd(), dirname5(file)));
     const stack = await parseConfig(StackSchema, file, stackConfig);
     stacks.push(stack);
@@ -6988,7 +7002,7 @@ var flexLine = (term, left, right, reserveSpace = 0) => {
 
 // src/cli/ui/complex/builder.ts
 import { dirname as dirname6, join as join8 } from "path";
-import queue2 from "fastq";
+import { promise } from "fastq";
 var assetBuilder = (app) => {
   return async (term) => {
     const assets = [];
@@ -7006,14 +7020,49 @@ var assetBuilder = (app) => {
     }
     const showDetailedView = true;
     const done = term.out.write(loadingDialog("Building stack assets..."));
-    const groups = new Signal([""]);
+    const group = new Signal([]);
     if (showDetailedView) {
       term.out.gap();
-      term.out.write(groups);
+      term.out.write(group);
     }
     const stackNameSize = Math.max(...stacks.map((stack) => stack.name.length));
     const assetTypeSize = Math.max(...assets.map((asset) => asset.type.length));
-    const q = queue2.promise(async ({ stack, asset }) => {
+    const queue2 = promise(async ({ stack, asset }) => {
+      if (!asset.build) {
+        return;
+      }
+      const [icon, stop] = createSpinner();
+      const details = new Signal({});
+      const line2 = flexLine(
+        term,
+        [
+          icon,
+          " ",
+          style.label(stack.name),
+          " ".repeat(stackNameSize - stack.name.length),
+          " ",
+          style.placeholder(symbol.pointerSmall),
+          " ",
+          style.warning(asset.type),
+          " ".repeat(assetTypeSize - asset.type.length),
+          " ",
+          style.placeholder(symbol.pointerSmall),
+          " ",
+          style.info(asset.id),
+          " "
+        ],
+        [
+          " ",
+          derive([details], (details2) => {
+            return Object.entries(details2).map(([key, value]) => {
+              return `${style.label(key)} ${value}`;
+            }).join(style.placeholder(" \u2500 "));
+          }),
+          br()
+        ]
+      );
+      group.update((group2) => [...group2, line2]);
+      const timer = createTimer();
       const getFullPath = (file) => {
         return join8(directories.asset, asset.type, app.name, stack.name, asset.id, file);
       };
@@ -7025,94 +7074,57 @@ var assetBuilder = (app) => {
           return void 0;
         }
       };
-      return asset.build({
-        async write(fingerprint, cb) {
-          const prev = await getFingerPrint();
-          if (prev === fingerprint && !process.env.NO_CACHE) {
-            return;
-          }
-          try {
-            await cb(async (file2, data) => {
-              const fullpath = getFullPath(file2);
-              const basepath2 = dirname6(fullpath);
-              await mkdir2(basepath2, { recursive: true });
-              await writeFile2(fullpath, data);
-            });
-          } catch (error) {
-            throw error;
-          }
-          const file = getFullPath("FINGER_PRINT");
-          const basepath = dirname6(file);
-          await mkdir2(basepath, { recursive: true });
-          await writeFile2(file, fingerprint);
-        },
-        async read(fingerprint, files) {
-          const prev = await getFingerPrint();
-          if (prev !== fingerprint) {
-            throw new TypeError(`Outdated fingerprint: ${fingerprint}`);
-          }
-          return Promise.all(
-            files.map((file) => {
-              return readFile6(getFullPath(file));
-            })
-          );
-        }
-      });
-    }, 3);
-    await Promise.all(
-      app.stacks.map(async (stack) => {
-        const group = new Signal([]);
-        groups.update((groups2) => [...groups2, group]);
-        await Promise.all(
-          [...stack.assets].map(async (asset) => {
-            if (!asset.build) {
+      try {
+        const data = await asset.build({
+          async write(fingerprint, cb) {
+            const prev = await getFingerPrint();
+            if (prev === fingerprint && !process.env.NO_CACHE) {
               return;
             }
-            const [icon, stop] = createSpinner();
-            const details = new Signal({});
-            const line2 = flexLine(
-              term,
-              [
-                icon,
-                " ",
-                style.label(stack.name),
-                " ".repeat(stackNameSize - stack.name.length),
-                " ",
-                style.placeholder(symbol.pointerSmall),
-                " ",
-                style.warning(asset.type),
-                " ".repeat(assetTypeSize - asset.type.length),
-                " ",
-                style.placeholder(symbol.pointerSmall),
-                " ",
-                style.info(asset.id),
-                " "
-              ],
-              [
-                " ",
-                derive([details], (details2) => {
-                  return Object.entries(details2).map(([key, value]) => {
-                    return `${style.label(key)} ${value}`;
-                  }).join(style.placeholder(" \u2500 "));
-                }),
-                br()
-              ]
-            );
-            group.update((group2) => [...group2, line2]);
-            const timer = createTimer();
             try {
-              const data = await q.push({ asset, stack });
-              details.set({
-                ...data,
-                time: timer()
+              await cb(async (file2, data2) => {
+                const fullpath = getFullPath(file2);
+                const basepath2 = dirname6(fullpath);
+                await mkdir2(basepath2, { recursive: true });
+                await writeFile2(fullpath, data2);
               });
-              icon.set(style.success(symbol.success));
             } catch (error) {
-              icon.set(style.error(symbol.error));
               throw error;
-            } finally {
-              stop();
             }
+            const file = getFullPath("FINGER_PRINT");
+            const basepath = dirname6(file);
+            await mkdir2(basepath, { recursive: true });
+            await writeFile2(file, fingerprint);
+          },
+          async read(fingerprint, files) {
+            const prev = await getFingerPrint();
+            if (prev !== fingerprint) {
+              throw new TypeError(`Outdated fingerprint: ${fingerprint}`);
+            }
+            return Promise.all(
+              files.map((file) => {
+                return readFile6(getFullPath(file));
+              })
+            );
+          }
+        });
+        details.set({
+          ...data,
+          time: timer()
+        });
+        icon.set(style.success(symbol.success));
+      } catch (error) {
+        icon.set(style.error(symbol.error));
+        throw error;
+      } finally {
+        stop();
+      }
+    }, 3);
+    await Promise.all(
+      app.stacks.map(async (stack) => {
+        await Promise.all(
+          [...stack.assets].map(async (asset) => {
+            await queue2.push({ stack, asset });
           })
         );
       })
@@ -7158,13 +7170,15 @@ import { join as join9 } from "path";
 var templateBuilder = (app) => {
   return async (term) => {
     const done = term.out.write(loadingDialog("Building stack templates..."));
-    await Promise.all(app.stacks.map(async (stack) => {
-      const template = stack.toString(true);
-      const path = join9(directories.template, app.name);
-      const file = join9(path, `${stack.name}.json`);
-      await mkdir4(path, { recursive: true });
-      await writeFile3(file, template);
-    }));
+    await Promise.all(
+      app.stacks.map(async (stack) => {
+        const template = stack.toString(true);
+        const path = join9(directories.template, app.name);
+        const file = join9(path, `${stack.name}.json`);
+        await mkdir4(path, { recursive: true });
+        await writeFile3(file, template);
+      })
+    );
     done("Done building stack templates");
   };
 };
@@ -7713,6 +7727,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";
 var assetPublisher = (config2, app) => {
   const client = new S3Client2({
     credentials: config2.credentials,
@@ -7721,68 +7736,71 @@ 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 getFullPath = (file) => {
+        return join10(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+      };
+      await asset.publish?.({
+        async read(fingerprint, files) {
+          const prev = await readFile7(getFullPath("FINGER_PRINT"), "utf8");
+          if (prev !== fingerprint) {
+            throw new TypeError(`Outdated fingerprint: ${fingerprint}`);
+          }
+          return Promise.all(
+            files.map((file) => {
+              return readFile7(getFullPath(file));
+            })
+          );
+        },
+        async publish(name, data, hash) {
+          const key = `${app.name}/${stack.name}/${asset.type}/${name}`;
+          const bucket = assetBucketName(config2.account, config2.app.region);
+          let getResult;
+          try {
+            getResult = await client.send(
+              new GetObjectCommand({
+                Bucket: bucket,
+                Key: key
+              })
+            );
+          } catch (error) {
+            if (error instanceof Error && error.name === "NoSuchKey") {
+            } else {
+              throw error;
+            }
+          }
+          if (getResult?.Metadata?.hash === hash) {
+            return {
+              bucket,
+              key,
+              version: getResult.VersionId
+            };
+          }
+          const putResult = await client.send(
+            new PutObjectCommand2({
+              Bucket: bucket,
+              Key: key,
+              Body: data,
+              ACL: ObjectCannedACL2.private,
+              StorageClass: StorageClass2.STANDARD,
+              Metadata: {
+                hash: hash.toString("utf8")
+              }
+            })
+          );
+          return {
+            bucket,
+            key,
+            version: putResult.VersionId
+          };
+        }
+      });
+    }, 5);
     await Promise.all(
       app.stacks.map(async (stack) => {
         await Promise.all(
           [...stack.assets].map(async (asset) => {
-            const getFullPath = (file) => {
-              return join10(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-            };
-            await asset.publish?.({
-              async read(fingerprint, files) {
-                const prev = await readFile7(getFullPath("FINGER_PRINT"), "utf8");
-                if (prev !== fingerprint) {
-                  throw new TypeError(`Outdated fingerprint: ${fingerprint}`);
-                }
-                return Promise.all(
-                  files.map((file) => {
-                    return readFile7(getFullPath(file));
-                  })
-                );
-              },
-              async publish(name, data, hash) {
-                const key = `${app.name}/${stack.name}/${asset.type}/${name}`;
-                const bucket = assetBucketName(config2.account, config2.app.region);
-                let getResult;
-                try {
-                  getResult = await client.send(
-                    new GetObjectCommand({
-                      Bucket: bucket,
-                      Key: key
-                    })
-                  );
-                } catch (error) {
-                  if (error instanceof Error && error.name === "NoSuchKey") {
-                  } else {
-                    throw error;
-                  }
-                }
-                if (getResult?.Metadata?.hash === hash) {
-                  return {
-                    bucket,
-                    key,
-                    version: getResult.VersionId
-                  };
-                }
-                const putResult = await client.send(
-                  new PutObjectCommand2({
-                    Bucket: bucket,
-                    Key: key,
-                    Body: data,
-                    ACL: ObjectCannedACL2.private,
-                    StorageClass: StorageClass2.STANDARD,
-                    Metadata: {
-                      hash: hash.toString("utf8")
-                    }
-                  })
-                );
-                return {
-                  bucket,
-                  key,
-                  version: putResult.VersionId
-                };
-              }
-            });
+            await queue2.push({ stack, asset });
           })
         );
       })
@@ -7798,7 +7816,7 @@ import commonjs3 from "@rollup/plugin-commonjs";
 import nodeResolve3 from "@rollup/plugin-node-resolve";
 import { swc as swc3 } from "rollup-plugin-swc3";
 import { getSuites, getTests } from "@vitest/runner/utils";
-import { basename as basename3, dirname as dirname7, extname as extname2, join as join11, relative as relative5 } from "path";
+import { basename as basename4, dirname as dirname7, extname as extname3, join as join11, relative as relative5 } from "path";
 
 // src/cli/ui/layout/text-box.ts
 import wrapAnsi3 from "wrap-ansi";
@@ -7886,11 +7904,11 @@ var singleTester = (stack, dir, filters) => {
     }
     const abs = join11(process.cwd(), path);
     const rel = relative5(dir, abs);
-    const ext = extname2(rel);
+    const ext = extname3(rel);
     if (!ext) {
       return path;
     }
-    const name = basename3(rel, ext);
+    const name = basename4(rel, ext);
     const base = dirname7(rel);
     const start = base === "." ? "" : style.placeholder(base + "/");
     return `${start}${name}${style.placeholder(ext)}`;
@@ -8438,8 +8456,6 @@ var program = new Command();
 program.name(logo().join("").replace(/\s+/, ""));
 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("--profile <string>", "The AWS profile to use");
-program.option("--region <string>", "The AWS region 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.127",
+  "version": "0.0.129",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,12 +29,12 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.15",
-    "@awsless/redis": "^0.0.10",
     "@awsless/sns": "^0.0.7",
-    "@awsless/sqs": "^0.0.7",
+    "@awsless/redis": "^0.0.10",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/validate": "^0.0.10",
-    "@awsless/weak-cache": "^0.0.1"
+    "@awsless/sqs": "^0.0.7",
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/validate": "^0.0.10"
   },
   "dependencies": {
     "@aws-appsync/utils": "^1.5.0",
@@ -66,6 +66,7 @@
     "chunk": "^0.0.3",
     "commander": "^9.4.1",
     "decompress": "^4.2.1",
+    "deepmerge": "^4.3.1",
     "event-iterator": "^2.0.0",
     "fastq": "^1.16.0",
     "filesize": "^10.0.7",
@@ -86,8 +87,8 @@
     "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/code": "^0.0.10",
-    "@awsless/graphql": "^0.0.6"
+    "@awsless/graphql": "^0.0.6",
+    "@awsless/code": "^0.0.10"
   },
   "scripts": {
     "test": "pnpm code test",