@awsless/awsless 0.0.126 → 0.0.127

package/dist/bin.js

@@ -104,10 +104,13 @@ var formatArn = (props) => {
   if (!props.resourceName) {
     return sub("arn:${AWS::Partition}:${service}:${AWS::Region}:${AWS::AccountId}:${resource}", props);
   }
-  return sub("arn:${AWS::Partition}:${service}:${AWS::Region}:${AWS::AccountId}:${resource}${seperator}${resourceName}", {
-    seperator: "/",
-    ...props
-  });
+  return sub(
+    "arn:${AWS::Partition}:${service}:${AWS::Region}:${AWS::AccountId}:${resource}${seperator}${resourceName}",
+    {
+      seperator: "/",
+      ...props
+    }
+  );
 };
 
 // src/formation/resource.ts
@@ -3709,10 +3712,10 @@ var onFailurePlugin = definePlugin({
     if (!hasOnFailure(config2)) {
       return;
     }
-    const queue2 = new Queue("on-failure", {
+    const queue3 = new Queue("on-failure", {
       name: `${config2.app.name}-failure`
     });
-    bootstrap2.add(queue2).export("on-failure-queue-arn", queue2.arn);
+    bootstrap2.add(queue3).export("on-failure-queue-arn", queue3.arn);
   },
   onStack(ctx) {
     const { stack, stackConfig, bootstrap: bootstrap2 } = ctx;
@@ -3859,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 queue2 = new Queue(id, {
+      const queue3 = 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: queue2.arn,
+        queueArn: queue3.arn,
         batchSize: props.batchSize,
         maxConcurrency: props.maxConcurrency,
         maxBatchingWindow: props.maxBatchingWindow
       });
-      stack.add(queue2, lambda, source);
+      stack.add(queue3, lambda, source);
       bind((lambda2) => {
-        lambda2.addPermissions(queue2.permissions);
-        lambda2.addEnvironment(`QUEUE_${constantCase10(stack.name)}_${constantCase10(id)}_URL`, queue2.url);
+        lambda2.addPermissions(queue3.permissions);
+        lambda2.addEnvironment(`QUEUE_${constantCase10(stack.name)}_${constantCase10(id)}_URL`, queue3.url);
       });
     }
   }
@@ -6326,6 +6329,17 @@ var readConfig = async (file) => {
     throw error;
   }
 };
+var parseConfig = async (schema, file, data) => {
+  try {
+    const result = await schema.parseAsync(data);
+    return result;
+  } catch (error) {
+    if (error instanceof z29.ZodError) {
+      throw new ConfigError(file, error, data);
+    }
+    throw error;
+  }
+};
 var loadConfig = async (options) => {
   debug("Find the root directory");
   const configFile = options.configFile || "app.json";
@@ -6337,22 +6351,15 @@ var loadConfig = async (options) => {
   const appFileName = join7(root2, configFile);
   const appConfig = await readConfig(appFileName);
   debug("Validate app config file");
-  let app;
-  try {
-    app = await AppSchema.parseAsync(appConfig);
-  } catch (error) {
-    if (error instanceof z29.ZodError) {
-      throw new ConfigError(appFileName, error, appConfig);
-    }
-    throw error;
-  }
+  const app = await parseConfig(AppSchema, appFileName, appConfig);
   debug("Load credentials", style.info(app.profile));
   const credentials = getCredentials(app.profile);
   debug("Load AWS account ID");
   const account = await getAccountId(credentials, app.region);
   debug("Account ID:", style.info(account));
   debug("Load stacks config files");
-  const stackFiles = await glob(["**/stack.{json,jsonc,json5}", "**/*.stack.{json,jsonc,json5}"], {
+  const ext = "{json,jsonc,json5}";
+  const stackFiles = await glob([`**/stack.${ext}`, `**/*.stack.${ext}`], {
     ignore: ["**/node_modules/**", "**/dist/**"],
     cwd: root2
   });
@@ -6361,15 +6368,8 @@ var loadConfig = async (options) => {
     debug(`Load stack: ${style.info(file)}`);
     const stackConfig = await readConfig(file);
     setLocalBasePath(join7(process.cwd(), dirname5(file)));
-    try {
-      const stack = await StackSchema.parseAsync(stackConfig);
-      stacks.push(stack);
-    } catch (error) {
-      if (error instanceof z29.ZodError) {
-        throw new ConfigError(file, error, stackConfig);
-      }
-      throw error;
-    }
+    const stack = await parseConfig(StackSchema, file, stackConfig);
+    stacks.push(stack);
   }
   return {
     app,
@@ -6988,6 +6988,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";
 var assetBuilder = (app) => {
   return async (term) => {
     const assets = [];
@@ -7003,7 +7004,7 @@ var assetBuilder = (app) => {
     if (assets.length === 0) {
       return;
     }
-    const showDetailedView = assets.length <= term.out.height() - 2;
+    const showDetailedView = true;
     const done = term.out.write(loadingDialog("Building stack assets..."));
     const groups = new Signal([""]);
     if (showDetailedView) {
@@ -7012,6 +7013,52 @@ var assetBuilder = (app) => {
     }
     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 getFullPath = (file) => {
+        return join8(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+      };
+      const getFingerPrint = async () => {
+        try {
+          const value = await readFile6(getFullPath("FINGER_PRINT"), "utf8");
+          return value;
+        } catch (_) {
+          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([]);
@@ -7053,51 +7100,8 @@ var assetBuilder = (app) => {
             );
             group.update((group2) => [...group2, line2]);
             const timer = createTimer();
-            const getFullPath = (file) => {
-              return join8(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-            };
-            const getFingerPrint = async () => {
-              try {
-                const value = await readFile6(getFullPath("FINGER_PRINT"), "utf8");
-                return value;
-              } catch (_) {
-                return void 0;
-              }
-            };
             try {
-              const data = await asset.build({
-                async write(fingerprint, cb) {
-                  const prev = await getFingerPrint();
-                  if (prev === fingerprint && !process.env.NO_CACHE) {
-                    return;
-                  }
-                  try {
-                    await cb(async (file2, data2) => {
-                      const fullpath = getFullPath(file2);
-                      const basepath2 = dirname6(fullpath);
-                      await mkdir2(basepath2, { recursive: true });
-                      await writeFile2(fullpath, data2);
-                    });
-                  } 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));
-                    })
-                  );
-                }
-              });
+              const data = await q.push({ asset, stack });
               details.set({
                 ...data,
                 time: timer()
@@ -8328,7 +8332,8 @@ var watchConfig = async (options, resolve, reject) => {
   const ext = "{json,jsonc,json5}";
   const watcher = watch([`app.${ext}`, `**/stack.${ext}`, `**/*.stack.${ext}`], {
     cwd: root2,
-    ignored: ["**/node_modules/**", "**/dist/**"]
+    ignored: ["**/node_modules/**", "**/dist/**"],
+    awaitWriteFinish: true
   });
   watcher.on("change", async () => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.126",
+  "version": "0.0.127",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -32,8 +32,8 @@
     "@awsless/redis": "^0.0.10",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/validate": "^0.0.10",
     "@awsless/ssm": "^0.0.7",
+    "@awsless/validate": "^0.0.10",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
@@ -67,6 +67,7 @@
     "commander": "^9.4.1",
     "decompress": "^4.2.1",
     "event-iterator": "^2.0.0",
+    "fastq": "^1.16.0",
     "filesize": "^10.0.7",
     "glob": "^10.3.9",
     "graphql": "^16.7.1",
@@ -85,8 +86,8 @@
     "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/graphql": "^0.0.6",
-    "@awsless/code": "^0.0.10"
+    "@awsless/code": "^0.0.10",
+    "@awsless/graphql": "^0.0.6"
   },
   "scripts": {
     "test": "pnpm code test",