@awsless/cli 0.0.46-next.2 → 0.0.46-next.3

package/dist/bin.js

@@ -173,7 +173,7 @@ import { DynamoDBClient as DynamoDBClient2, migrate } from "@awsless/dynamodb";
 // src/util/deployment.ts
 import { CloudFrontClient as CloudFrontClient2 } from "@aws-sdk/client-cloudfront";
 import { CloudFrontKeyValueStoreClient as CloudFrontKeyValueStoreClient2 } from "@aws-sdk/client-cloudfront-keyvaluestore";
-import { GetFunctionCommand, LambdaClient as LambdaClient3 } from "@aws-sdk/client-lambda";
+import { DeleteFunctionCommand, GetFunctionCommand, LambdaClient as LambdaClient3 } from "@aws-sdk/client-lambda";
 import {
   define,
   deleteItem,
@@ -366,6 +366,7 @@ import {
   DeleteFunctionUrlConfigCommand,
   GetAliasCommand,
   LambdaClient,
+  ListAliasesCommand,
   UpdateAliasCommand,
   UpdateFunctionCodeCommand
 } from "@aws-sdk/client-lambda";
@@ -386,6 +387,22 @@ var getLambdaAlias = async (lambda, functionName, name) => {
     return;
   }
 };
+var listLambdaAliases = async (lambda, functionName, functionVersion) => {
+  const aliases = [];
+  let marker;
+  do {
+    const result = await lambda.send(
+      new ListAliasesCommand({
+        FunctionName: functionName,
+        FunctionVersion: functionVersion,
+        Marker: marker
+      })
+    );
+    aliases.push(...result.Aliases ?? []);
+    marker = result.NextMarker;
+  } while (marker);
+  return aliases;
+};
 var upsertLambdaAlias = async (lambda, props) => {
   const input = {
     FunctionName: props.functionName,
@@ -809,17 +826,18 @@ var createLambdaProvider = ({ credentials, region }) => {
         await configureVersion(proposed);
         const url = await createDeploymentUrl(proposed.functionName, deploymentAlias, proposed.sourceAccount);
         if (proposed.sourceAccount && prior.sourceAccount !== proposed.sourceAccount) {
-          await Promise.all(
-            deploymentAliases.filter((name) => name !== deploymentAlias).map(
-              (name) => createDeploymentUrl(proposed.functionName, name, proposed.sourceAccount).catch(
-                (error) => {
-                  if (!isError(error, "ResourceNotFoundException")) {
-                    throw error;
-                  }
-                }
-              )
-            )
-          );
+          for (const name of deploymentAliases) {
+            if (name === deploymentAlias) {
+              continue;
+            }
+            try {
+              await createDeploymentUrl(proposed.functionName, name, proposed.sourceAccount);
+            } catch (error) {
+              if (!isError(error, "ResourceNotFoundException")) {
+                throw error;
+              }
+            }
+          }
         }
         return {
           ...proposed,
@@ -1310,6 +1328,60 @@ var markPromoted = async (client, appId, id) => {
 var removeDeployment = async (client, appId, id) => {
   await deleteItem(table, { appId, id }, { client });
 };
+var selectPrunableDeployments = (items, liveId, options) => {
+  const rollbackTarget = items.filter((item) => item.promotedAt && item.id !== liveId).sort((a, b) => b.promotedAt.localeCompare(a.promotedAt))[0];
+  const keep = Math.max(1, Number(options.keep) || 10);
+  const mainSlug = slugifyBranch(options.main);
+  const keptMain = new Set(
+    items.filter((item) => item.branch === mainSlug && item.functionVersion).map((item) => item.seq).sort((a, b) => b - a).slice(0, keep)
+  );
+  const dayAgo = new Date(Date.now() - 24 * 60 * 60 * 1e3).toISOString();
+  return items.filter((item) => {
+    if (item.id === liveId || item.id === rollbackTarget?.id) {
+      return false;
+    }
+    if (options.branch) {
+      return item.branch === slugifyBranch(options.branch);
+    }
+    if (!item.functionVersion) {
+      return item.createdAt < dayAgo;
+    }
+    if (item.branch === mainSlug) {
+      return !keptMain.has(item.seq);
+    }
+    return item.commit ? isCommitMerged(item.commit, options.main) : false;
+  });
+};
+var pruneFunctionVersion = async (lambda, functionName, version) => {
+  for (const alias of await listLambdaAliases(lambda, functionName, version)) {
+    if (alias.Name && alias.Name !== LIVE_LAMBDA_ALIAS) {
+      await deleteLambdaAlias(lambda, functionName, alias.Name);
+    }
+  }
+  try {
+    await lambda.send(
+      new DeleteFunctionCommand({
+        FunctionName: functionName,
+        Qualifier: version
+      })
+    );
+  } catch (error) {
+    if (!isError(error, "ResourceNotFoundException")) {
+      throw error;
+    }
+  }
+};
+var selectPrunableVersions = async (props) => {
+  const surviving = props.items.filter((item) => !props.prunable.includes(item));
+  const kept = new Set(surviving.map((item) => item.functionVersion));
+  const live = await getLambdaAlias(props.lambda, props.functionName, LIVE_LAMBDA_ALIAS);
+  if (live?.FunctionVersion) {
+    kept.add(live.FunctionVersion);
+  }
+  return new Set(
+    props.prunable.map((item) => item.functionVersion).filter((version) => Boolean(version && !kept.has(version)))
+  );
+};
 var readLiveDeploymentId = async (lambda, functionName) => {
   return (await getLambdaAlias(lambda, functionName, LIVE_LAMBDA_ALIAS))?.Description || void 0;
 };
@@ -1326,17 +1398,21 @@ var readDeployedFunctionVersion = (state2) => {
   return;
 };
 var formatDeploymentSummary = (props) => {
-  let previewUrl;
+  const previewUrls = /* @__PURE__ */ new Map();
   for (const [urn, node] of readStateNodes(props.state)) {
     if (node.type === "aws_cloudfront_distribution" && urn.endsWith(":{preview}")) {
-      previewUrl = `https://${node.output.domainName}`;
+      const router = urn.match(/router:\{([^}]+)\}/)?.[1];
+      if (router) {
+        previewUrls.set(router, `https://${node.output.domainName}`);
+      }
     }
   }
-  return Object.keys(props.appConfig.defaults.router ?? {}).map((routerId, index) => {
+  return Object.keys(props.appConfig.defaults.router ?? {}).map((routerId) => {
+    const previewUrl = previewUrls.get(routerId);
     return [
       `${routerId}: deployment #${props.id}`,
-      index === 0 ? previewUrl : void 0,
-      index === 0 && previewUrl ? `${previewUrl}/?awsless-deployment=${props.id}` : void 0
+      previewUrl,
+      previewUrl ? `${previewUrl}/?awsless-deployment=${props.id}` : void 0
     ].filter(Boolean).join("\n");
   });
 };
@@ -3900,25 +3976,10 @@ var bundleTypeScriptWithRolldown = async ({
       return importee.startsWith("@aws-sdk") || importee.startsWith("aws-sdk") || external?.includes(importee);
     },
     treeshake: {
-      // The @awsless packages are pure clients, but their entry points
-      // also export test helpers that pull in local server
-      // implementations like dynamo-db-local, which crash the ESM
-      // runtime with CJS globals like __dirname. Treating the scope as
-      // side-effect free prunes those unused chains from production
-      // bundles, while every other dependency keeps its import side
-      // effects, like the fs patching of graceful-fs.
-      moduleSideEffects: (id, isExternal) => {
-        if (isExternal) {
-          return external?.includes(id) === true;
-        }
-        if (id.includes("/node_modules/@awsless/")) {
-          return false;
-        }
-        if (id.includes("/node_modules/")) {
-          return true;
-        }
-        return id.startsWith(`${directories.root}/`);
-      }
+      // Dependencies are treated as side-effect free, so unused imports
+      // like the local test servers never reach the production bundle.
+      // The bundle guard below fails the build if one slips through.
+      moduleSideEffects: (id, isExternal) => isExternal ? external?.includes(id) === true : id.startsWith(`${directories.root}/`) && !id.includes("/node_modules/")
     },
     onwarn: (error) => {
       debugError(error.message);
@@ -4119,6 +4180,11 @@ var bundleFeature = defineFeature({
     const addLayer = (layer) => {
       layers.push(layer);
     };
+    const layerIds = Object.keys(ctx.appConfig.defaults.layers ?? {});
+    const layerPackages = layerIds.flatMap((id) => ctx.shared.entry("layer", "packages", id));
+    for (const id of layerIds) {
+      addLayer(ctx.shared.entry("layer", "arn", id));
+    }
     const name = getBundleFunctionName(ctx.app.name);
     const shortName = formatGlobalResourceName({
       appName: ctx.app.name,
@@ -4132,7 +4198,7 @@ var bundleFeature = defineFeature({
         name,
         handlers,
         minify: defaults.minify,
-        external: defaults.external
+        external: [...defaults.external ?? [], ...layerPackages]
       })
     );
     const sourceHash = new Output3(envDeps, async (resolve2) => {
@@ -7004,14 +7070,15 @@ var siteFeature = defineFeature({
               env,
               stdout: "pipe",
               stderr: "pipe"
-              // stdout: 'ignore',
-              // stderr: ''
-              // stdout: 'inherit',
-              // stderr: 'inherit',
             });
-            await instance.exited;
+            const [output, errors] = await Promise.all([
+              new Response(instance.stdout).text(),
+              new Response(instance.stderr).text(),
+              instance.exited
+            ]);
             if (instance.exitCode !== null && instance.exitCode > 0) {
-              throw new Error("Site build failed");
+              throw new ExpectedError(`Site build failed:
+${(errors.trim() || output.trim()).slice(-2e3)}`);
             }
             await write("HASH", fingerprint);
             return {
@@ -9254,7 +9321,7 @@ var PASSWORD_AUTH_CHECK = (password) => `
 authMethods.push('Password realm="Protected"');
 
 if(!isAuthorized) {
-	if(authHeader && authHeader.startsWith('Password ') && authHeader.slice(9) === '${password}') {
+	if(authHeader && authHeader.startsWith('Password ') && authHeader.slice(9) === ${JSON.stringify(password)}) {
 		isAuthorized = true;
 	}
 }
@@ -9280,7 +9347,7 @@ try {
 		: { statusCode: 503, statusDescription: 'Service Unavailable' };
 }
 
-if (request.querystring['awsless-deployment']) {
+if (deployment && request.querystring['awsless-deployment']) {
 	delete request.querystring['awsless-deployment'];
 
 	const query = [];
@@ -9289,8 +9356,9 @@ if (request.querystring['awsless-deployment']) {
 		const entry = request.querystring[key];
 
 		if (entry.multiValue) {
-			for (const item of entry.multiValue) {
-				query.push(key + '=' + item.value);
+			// The CloudFront js runtime doesn't support for...of.
+			for (const i in entry.multiValue) {
+				query.push(key + '=' + entry.multiValue[i].value);
 			}
 		} else {
 			query.push(key + '=' + entry.value);
@@ -9584,7 +9652,6 @@ var routerFeature = defineFeature({
     const distributionIds = [];
     let hasLambdaRoutes = false;
     let routeStore;
-    let previewDistribution;
     for (const [id, props] of routers) {
       const group = new Group29(ctx.base, "router", id);
       const name = formatGlobalResourceName({
@@ -9921,7 +9988,7 @@ var routerFeature = defineFeature({
         ],
         webAclId: waf?.arn
       });
-      if (id === defaultRouter) {
+      {
         const previewFunction = new aws30.cloudfront.Function(group, "preview-function", {
           name: `${name.slice(0, 55)}--preview`,
           runtime: "cloudfront-js-2.0",
@@ -9934,7 +10001,7 @@ var routerFeature = defineFeature({
           publish: true,
           keyValueStoreAssociations: [routeStore.arn]
         });
-        previewDistribution = new aws30.cloudfront.Distribution(group, "preview", {
+        const previewDistribution = new aws30.cloudfront.Distribution(group, "preview", {
           tags: {
             name: `${name}-preview`
           },
@@ -9998,6 +10065,9 @@ var routerFeature = defineFeature({
           webAclId: waf?.arn
         });
         distributionIds.push(previewDistribution.id);
+        ctx.shared.add("router", "preview-id", id, previewDistribution.id);
+      }
+      if (id === defaultRouter) {
         ctx.onReadyLast(() => {
           const bundle = ctx.shared.get("bundle", "main");
           let lambdaUrlHost;
@@ -10039,7 +10109,6 @@ var routerFeature = defineFeature({
         });
       }
       ctx.shared.add("router", "id", id, distribution.id);
-      ctx.shared.add("router", "preview-id", id, previewDistribution.id);
       distributionIds.push(distribution.id);
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
@@ -11602,9 +11671,10 @@ var deploy = (program2) => {
         }
       });
       playSuccessSound();
-      const details = deployments2.length > 0 ? `
-${deployments2.join("\n")}` : "";
-      return `Deployment #${deployment.id} is live.${details}`;
+      for (const summary of deployments2) {
+        log20.message(summary);
+      }
+      return `Deployment #${deployment.id} is live.`;
     });
   });
 };
@@ -12095,7 +12165,7 @@ var bind = (program2) => {
         stderr: "inherit"
       });
       await instance.exited;
-      process.exit(0);
+      process.exit(instance.exitCode ?? 1);
     });
   });
 };
@@ -12215,7 +12285,7 @@ var resources = (program2) => {
           return `${color.dim("{")}${color.warning(v)}${color.dim("}")}`;
         }).replaceAll(":", color.dim(":"));
       };
-      const formatStatus = (status) => {
+      const formatStatus2 = (status) => {
         if (status === "created") {
           return color.success(status);
         }
@@ -12240,7 +12310,7 @@ var resources = (program2) => {
             stack.resources.map((r) => {
               return [
                 //
-                formatStatus(r.status),
+                formatStatus2(r.status),
                 color.dim(icon.arrow.right),
                 formatResource(stack.urn, r.urn)
               ].join(" ");
@@ -13166,7 +13236,7 @@ var activity = (program2) => {
 // src/cli/command/deployment.ts
 import { CloudFrontClient as CloudFrontClient6 } from "@aws-sdk/client-cloudfront";
 import { CloudFrontKeyValueStoreClient as CloudFrontKeyValueStoreClient3 } from "@aws-sdk/client-cloudfront-keyvaluestore";
-import { DeleteFunctionCommand, LambdaClient as LambdaClient7 } from "@aws-sdk/client-lambda";
+import { LambdaClient as LambdaClient7 } from "@aws-sdk/client-lambda";
 import { log as log35, prompt as prompt19 } from "@awsless/clui";
 import { DynamoDBClient as DynamoDBClient6 } from "@awsless/dynamodb";
 var createClients = async (appConfig) => {
@@ -13189,6 +13259,12 @@ var formatAge = (iso) => {
   if (minutes8 < 60 * 24) return `${Math.floor(minutes8 / 60)}h ago`;
   return `${Math.floor(minutes8 / (60 * 24))}d ago`;
 };
+var formatStatus = (item, liveId) => {
+  if (item.id === liveId) return color.success("live    ");
+  if (item.promotedAt) return "promoted";
+  if (item.functionVersion) return color.info("staged  ");
+  return color.dim("pending ");
+};
 var deployments = (program2) => {
   program2.command("deployments").description("List the deployment history of your app").action(async () => {
     await layout("deployments", async ({ appConfig }) => {
@@ -13202,17 +13278,16 @@ var deployments = (program2) => {
       }
       const idWidth = Math.max(...items.map((item) => item.id.length));
       log35.message(
-        items.map((item) => {
-          const status = item.id === liveId ? color.success("live    ") : item.promotedAt ? "promoted" : item.functionVersion ? color.info("staged  ") : color.dim("pending ");
-          return [
+        items.map(
+          (item) => [
             color.label(item.id.padEnd(idWidth)),
-            status,
+            formatStatus(item, liveId),
             formatAge(item.createdAt).padEnd(8),
             color.dim(item.commit?.slice(0, 7) ?? "-------"),
             (item.message ?? "").slice(0, 50).padEnd(50),
             color.dim(item.user ?? "")
-          ].join("  ");
-        }).join("\n")
+          ].join("  ")
+        ).join("\n")
       );
       return `Found ${items.length} deployments.`;
     });
@@ -13226,28 +13301,7 @@ var prune = (program2) => {
         listDeployments(dynamo, appId),
         readLiveDeploymentId(lambda, functionName)
       ]);
-      const rollbackTarget = items.filter((item) => item.promotedAt && item.id !== liveId).sort((a, b) => b.promotedAt.localeCompare(a.promotedAt))[0];
-      const keep = Math.max(1, Number(options.keep) || 10);
-      const mainSlug = slugifyBranch(options.main);
-      const keptMain = new Set(
-        items.filter((item) => item.branch === mainSlug && item.functionVersion).map((item) => item.seq).sort((a, b) => b - a).slice(0, keep)
-      );
-      const dayAgo = new Date(Date.now() - 24 * 60 * 60 * 1e3).toISOString();
-      const prunable = items.filter((item) => {
-        if (item.id === liveId || item.id === rollbackTarget?.id) {
-          return false;
-        }
-        if (options.branch) {
-          return item.branch === slugifyBranch(options.branch);
-        }
-        if (!item.functionVersion) {
-          return item.createdAt < dayAgo;
-        }
-        if (item.branch === mainSlug) {
-          return !keptMain.has(item.seq);
-        }
-        return item.commit ? isCommitMerged(item.commit, options.main) : false;
-      });
+      const prunable = selectPrunableDeployments(items, liveId, options);
       if (prunable.length === 0) {
         return `Nothing to prune.`;
       }
@@ -13267,28 +13321,9 @@ var prune = (program2) => {
           for (const item of prunable) {
             await deleteLambdaAlias(lambda, functionName, getDeploymentLambdaAliasName(item.id));
           }
-          const surviving = items.filter((item) => !prunable.includes(item));
-          const keepVersions = new Set(surviving.map((item) => item.functionVersion));
-          const live = await getLambdaAlias(lambda, functionName, LIVE_LAMBDA_ALIAS);
-          if (live?.FunctionVersion) {
-            keepVersions.add(live.FunctionVersion);
-          }
-          const versions = new Set(
-            prunable.map((item) => item.functionVersion).filter((version) => version && !keepVersions.has(version))
-          );
+          const versions = await selectPrunableVersions({ lambda, functionName, items, prunable });
           for (const version of versions) {
-            try {
-              await lambda.send(
-                new DeleteFunctionCommand({
-                  FunctionName: functionName,
-                  Qualifier: version
-                })
-              );
-            } catch (error) {
-              if (!isError(error, "ResourceNotFoundException") && !isError(error, "ResourceConflictException")) {
-                throw error;
-              }
-            }
+            await pruneFunctionVersion(lambda, functionName, version);
           }
           const storeArn = await getRouteStoreArn(
             cloudfront,
@@ -13374,8 +13409,8 @@ 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");
-program.exitOverride(() => {
-  process.exit(0);
+program.exitOverride((error) => {
+  process.exit(error.exitCode);
 });
 program.on("option:verbose", () => {
   process.env.VERBOSE = program.opts().verbose ? "1" : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.46-next.2",
+  "version": "0.0.46-next.3",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -85,21 +85,21 @@
     "@awsless/big-float": "^0.1.7",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
-    "@awsless/clui": "^0.0.8",
+    "@awsless/clui": "^0.0.9",
     "@awsless/dynamodb": "^0.3.21",
     "@awsless/iot": "^0.0.5",
     "@awsless/json": "^0.0.11",
     "@awsless/s3": "^0.0.21",
-    "@awsless/lambda": "^0.0.45",
     "@awsless/redis": "^0.1.13",
+    "@awsless/size": "^0.0.2",
     "@awsless/scheduler": "^0.0.4",
-    "@awsless/sns": "^0.0.10",
+    "@awsless/lambda": "^0.0.45",
     "@awsless/sqs": "^0.0.24",
-    "@awsless/ts-file-cache": "^0.0.16",
+    "@awsless/sns": "^0.0.10",
     "@awsless/validate": "^0.1.7",
-    "@awsless/weak-cache": "^0.0.1",
     "awsless": "^0.0.15-next.0",
-    "@awsless/size": "^0.0.2"
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/ts-file-cache": "^0.0.16"
   },
   "devDependencies": {
     "@hono/node-server": "1.19.9",