@awsless/cli 0.1.13 → 0.1.15

package/dist/bin.js

@@ -6,39 +6,60 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
-var __moduleCache = /* @__PURE__ */ new WeakMap;
 var __toCommonJS = (from) => {
-  var entry = __moduleCache.get(from), desc;
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function")
-    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    }));
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
   __moduleCache.set(from, entry);
   return entry;
 };
+var __moduleCache;
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -832,7 +853,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -3069,7 +3090,7 @@ var require_cell = __commonJS((exports, module) => {
       let content = utils.truncate(this.content, 10, this.truncate);
       if (!lineNum) {
         info(`${this.y}-${this.x}: ${this.rowSpan - lineNum}x${this.colSpan} Cell ${content}`);
-      } else {}
+      }
       let padLen = Math.max(this.height - this.lines.length, 0);
       let padTop;
       switch (this.vAlign) {
@@ -26838,7 +26859,7 @@ var require_node_gyp_build_optional_packages = __commonJS((exports, module) => {
 
 // ../../node_modules/.pnpm/msgpackr-extract@3.0.4/node_modules/msgpackr-extract/index.js
 var require_msgpackr_extract = __commonJS((exports, module) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/msgpackr-extract@3.0.4/node_modules/msgpackr-extract";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/msgpackr-extract@3.0.4/node_modules/msgpackr-extract";
   module.exports = require_node_gyp_build_optional_packages()(__dirname);
 });
 
@@ -39706,7 +39727,7 @@ var require_src3 = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/@grpc+grpc-js@1.12.6/node_modules/@grpc/grpc-js/build/src/channelz.js
 var require_channelz = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/@grpc+grpc-js@1.12.6/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/@grpc+grpc-js@1.12.6/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.registerChannelzSocket = exports.registerChannelzServer = exports.registerChannelzSubchannel = exports.registerChannelzChannel = exports.ChannelzCallTrackerStub = exports.ChannelzCallTracker = exports.ChannelzChildrenTrackerStub = exports.ChannelzChildrenTracker = exports.ChannelzTrace = exports.ChannelzTraceStub = undefined;
   exports.unregisterChannelzRef = unregisterChannelzRef;
@@ -57210,7 +57231,7 @@ var require_zipEntries = __commonJS((exports, module) => {
       if (this.centralDirRecords !== this.files.length) {
         if (this.centralDirRecords !== 0 && this.files.length === 0) {
           throw new Error("Corrupted zip or bug: expected " + this.centralDirRecords + " records in central dir, got " + this.files.length);
-        } else {}
+        }
       }
     },
     readEndOfCentral: function() {
@@ -74431,7 +74452,7 @@ WD9f
 
 // ../../node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils/index.js
 var require_utils5 = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.noop = exports.defaults = exports.Debug = exports.getPackageMeta = exports.zipMap = exports.CONNECTION_CLOSED_ERROR_MSG = exports.shuffle = exports.sample = exports.resolveTLSProfile = exports.parseURL = exports.optimizeErrorStack = exports.toArg = exports.convertMapToArray = exports.convertObjectToArray = exports.timeout = exports.packObject = exports.isInt = exports.wrapMultiResult = exports.convertBufferToString = undefined;
   var fs_1 = __require("fs");
@@ -74717,7 +74738,7 @@ var require_argumentParsers = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/Command.js
 var require_Command = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built";
   Object.defineProperty(exports, "__esModule", { value: true });
   var commands_1 = require_built();
   var calculateSlot = require_lib4();
@@ -95364,7 +95385,7 @@ var require_db_util = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/redis-memory-server@0.16.1_supports-color@8.1.1/node_modules/redis-memory-server/lib/util/RedisInstance.js
 var require_RedisInstance = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/redis-memory-server@0.16.1_supports-color@8.1.1/node_modules/redis-memory-server/lib/util";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/redis-memory-server@0.16.1_supports-color@8.1.1/node_modules/redis-memory-server/lib/util";
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
     function adopt(value) {
       return value instanceof P3 ? value : new P3(function(resolve3) {
@@ -101278,7 +101299,7 @@ var require_unbzip2_stream = __commonJS((exports, module) => {
           stream2.queue(d5);
           if (d5 !== null) {
             outlength += d5.length;
-          } else {}
+          }
         });
       } catch (e4) {
         stream2.emit("error", e4);
@@ -114494,7 +114515,7 @@ var getSanitizedDevTypeScriptVersion = (version2 = "") => {
 };
 
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getTypeScriptUserAgentPair.js
-var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es";
+var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es";
 var tscVersion;
 var TS_PACKAGE_JSON = join7("node_modules", "typescript", "package.json");
 var getTypeScriptUserAgentPair = async () => {
@@ -131571,6 +131592,17 @@ var $forEachNodeInTopologicalOrder = sort.forEachNodeInTopologicalOrder;
 var $topologicalSort = sort.topologicalSort;
 var $topologicalGenerations = sort.topologicalGenerations;
 var $forEachTopologicalGeneration = sort.forEachTopologicalGeneration;
+// ../../node_modules/.pnpm/uuid@11.1.0/node_modules/uuid/dist/esm/sha1.js
+import { createHash as createHash3 } from "crypto";
+function sha1(bytes) {
+  if (Array.isArray(bytes)) {
+    bytes = Buffer.from(bytes);
+  } else if (typeof bytes === "string") {
+    bytes = Buffer.from(bytes, "utf8");
+  }
+  return createHash3("sha1").update(bytes).digest();
+}
+var sha1_default = sha1;
 
 // ../../node_modules/.pnpm/uuid@11.1.0/node_modules/uuid/dist/esm/regex.js
 var regex_default = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000|ffffffff-ffff-ffff-ffff-ffffffffffff)$/i;
@@ -131636,18 +131668,6 @@ function v35(version2, hash, value, namespace, buf, offset) {
   return unsafeStringify(bytes);
 }
 
-// ../../node_modules/.pnpm/uuid@11.1.0/node_modules/uuid/dist/esm/sha1.js
-import { createHash as createHash3 } from "crypto";
-function sha1(bytes) {
-  if (Array.isArray(bytes)) {
-    bytes = Buffer.from(bytes);
-  } else if (typeof bytes === "string") {
-    bytes = Buffer.from(bytes, "utf8");
-  }
-  return createHash3("sha1").update(bytes).digest();
-}
-var sha1_default = sha1;
-
 // ../../node_modules/.pnpm/uuid@11.1.0/node_modules/uuid/dist/esm/v5.js
 function v5(value, namespace, buf, offset) {
   return v35(80, sha1_default, value, namespace, buf, offset);
@@ -141113,8 +141133,6 @@ if (!nativeAccelerationDisabled) {
   try {
     if (true)
       extractor = require_msgpackr_extract();
-    else
-      ;
     if (extractor)
       setExtractor(extractor.extractStrings);
   } catch (error3) {}
@@ -149964,6 +149982,7 @@ var preflightDeployment = async (props) => {
   }
 };
 var promoteDeployment = async (props) => {
+  const stores = props.stores ?? [];
   const deployment = await getDeployment(props.dynamo, props.appId, props.id);
   const functionVersion = deployment?.functionVersion;
   if (!deployment) {
@@ -149972,13 +149991,19 @@ var promoteDeployment = async (props) => {
   if (!functionVersion) {
     throw new ExpectedError(`Deployment "${props.id}" hasn't finished deploying.`);
   }
-  if (props.store && props.store.deployment.functionVersion !== functionVersion) {
-    throw new ExpectedError(`The routes don't share the deployed function version.`);
+  for (const store of stores) {
+    if (store.deployment.functionVersion !== functionVersion) {
+      throw new ExpectedError(`The routes don't share the deployed function version.`);
+    }
   }
   const alias = await getLambdaAlias(props.lambda, props.functionName, LIVE_LAMBDA_ALIAS);
   const liveId = alias?.Description || undefined;
-  const activeId = props.store ? await readActiveDeploymentId(props.kvs, props.store.arn) : undefined;
-  const active = props.store && activeId !== undefined ? await readRouteDeployment(props.kvs, props.store.arn, activeId) : undefined;
+  const activeRoutes = new Map;
+  for (const store of stores) {
+    const activeId = await readActiveDeploymentId(props.kvs, store.arn);
+    const active = activeId !== undefined ? await readRouteDeployment(props.kvs, store.arn, activeId) : undefined;
+    activeRoutes.set(store.arn, active);
+  }
   if (props.rejectStale && liveId && liveId !== props.id) {
     const live = await getDeployment(props.dynamo, props.appId, liveId);
     if (live?.promotedAt && live.promotedAt > deployment.createdAt) {
@@ -149996,8 +150021,8 @@ var promoteDeployment = async (props) => {
     }
     throw error3;
   }
-  let routesUpdateStarted = false;
   let aliasUpdateStarted = false;
+  const flippedStores = [];
   const flipped = [];
   try {
     for (const name of await listLambdaFunctions(props.lambda, getAppNamePrefix(props.appName))) {
@@ -150024,9 +150049,11 @@ var promoteDeployment = async (props) => {
         description: props.id
       });
     }
-    if (props.store && active?.id !== props.store.deployment.id) {
-      routesUpdateStarted = true;
-      await setActiveRouteDeployment(props.kvs, props.store.arn, props.store.deployment);
+    for (const store of stores) {
+      if (activeRoutes.get(store.arn)?.id !== store.deployment.id) {
+        flippedStores.push(store);
+        await setActiveRouteDeployment(props.kvs, store.arn, store.deployment);
+      }
     }
     if (alias?.FunctionVersion !== functionVersion || alias?.Description !== props.id) {
       aliasUpdateStarted = true;
@@ -150040,7 +150067,7 @@ var promoteDeployment = async (props) => {
     await markPromoted(props.dynamo, props.appId, props.id);
   } catch (error3) {
     const rollback = [
-      ...routesUpdateStarted && props.store ? [setActiveRouteDeployment(props.kvs, props.store.arn, active)] : [],
+      ...flippedStores.map((store) => setActiveRouteDeployment(props.kvs, store.arn, activeRoutes.get(store.arn))),
       ...aliasUpdateStarted && alias?.FunctionVersion ? [
         upsertLambdaAlias(props.lambda, {
           functionName: props.functionName,
@@ -150074,21 +150101,21 @@ var activateDeployment = async (props) => {
   const dynamo = new DynamoDBClient({ credentials: credentials2, region });
   const functionName = getBundleFunctionName(props.appConfig.name);
   const id = props.id ?? await previousDeploymentId({ lambda, dynamo, appId, functionName });
-  let store;
-  if (Object.keys(props.appConfig.router ?? {}).length > 0) {
+  const stores = [];
+  for (const routerId of Object.keys(props.appConfig.router ?? {})) {
     const storeArn = await getRouteStoreArn(cloudfront, formatGlobalResourceName({
       appName: props.appConfig.name,
       resourceType: "router",
-      resourceName: "store"
+      resourceName: routerId
     }));
     if (!storeArn) {
-      throw new ExpectedError(`The router hasn't been deployed yet. Run "awsless deploy" first.`);
+      throw new ExpectedError(`The "${routerId}" router hasn't been deployed yet. Run "awsless deploy" first.`);
     }
     const routes = await readRouteDeployment(kvs, storeArn, id);
     if (!routes) {
-      throw new ExpectedError(`Deployment "${id}" doesn't exist.`);
+      throw new ExpectedError(`Deployment "${id}" doesn't exist for the "${routerId}" router.`);
     }
-    store = { arn: storeArn, deployment: routes };
+    stores.push({ arn: storeArn, deployment: routes });
   }
   await promoteDeployment({
     kvs,
@@ -150098,7 +150125,7 @@ var activateDeployment = async (props) => {
     appName: props.appConfig.name,
     functionName,
     id,
-    store,
+    stores,
     rejectStale: props.rejectStale
   });
   return id;
@@ -158931,14 +158958,10 @@ var searchFeature = defineFeature({
     await ctx.write("search.d.ts", gen, true);
   },
   onApp(ctx) {
-    const indexes = ctx.stackConfigs.flatMap((stack) => {
-      return Object.entries(stack.searchs ?? {}).map(([id, props2]) => ({
-        stackName: stack.name,
-        id,
-        props: props2
-      }));
+    const hasIndexes = ctx.stackConfigs.some((stack) => {
+      return Object.keys(stack.searchs ?? {}).length > 0;
     });
-    if (indexes.length === 0) {
+    if (!hasIndexes) {
       return;
     }
     const group4 = new Group(ctx.base, "search", "main");
@@ -158995,12 +159018,21 @@ var searchFeature = defineFeature({
       actions: ["es:ESHttp*"],
       resources: [openSearch.arn.pipe((arn) => `${arn}/*`)]
     });
-    for (const { stackName, id, props: indexProps } of indexes) {
-      new SearchIndex(group4, `index-${stackName}--${id}`, {
-        endpoint: openSearch.endpointV2,
-        index: formatSearchIndexName(stackName, id),
-        mappings: JSON.stringify(resolveSearchMappings(indexProps) ?? {}),
-        settings: JSON.stringify(indexProps.settings ?? {})
+    ctx.shared.set("search", "endpoint", openSearch.endpointV2);
+  },
+  onStack(ctx) {
+    const indexes = Object.entries(ctx.stackConfig.searchs ?? {});
+    if (indexes.length === 0) {
+      return;
+    }
+    const endpoint = ctx.shared.get("search", "endpoint");
+    for (const [id, props] of indexes) {
+      const group4 = new Group(ctx.stack, "search", id);
+      new SearchIndex(group4, "index", {
+        endpoint,
+        index: formatSearchIndexName(ctx.stackConfig.name, id),
+        mappings: JSON.stringify(resolveSearchMappings(props) ?? {}),
+        settings: JSON.stringify(props.settings ?? {})
       }, {
         retainOnDelete: ctx.appConfig.removal === "retain",
         replaceOnChanges: ["endpoint", "index"]
@@ -162660,39 +162692,30 @@ var routerFeature = defineFeature({
   name: "router",
   onApp(ctx) {
     const routers = Object.entries(ctx.appConfig.router ?? {});
-    const defaultRouter = routers[0]?.[0];
     const routes = {};
-    const routeDependencies = new Set;
+    const routeDependencies = {};
+    const routeStores = {};
+    const routerGroups = {};
     const distributionIds = [];
     let hasLambdaRoutes = false;
-    let routeStore;
-    let sharedGroup;
-    if (routers.length > 0) {
-      const storeName = formatGlobalResourceName({
-        appName: ctx.app.name,
-        resourceType: "router",
-        resourceName: "store"
-      });
-      sharedGroup = new Group(ctx.base, "router", "shared");
-      routeStore = new aws2.cloudfront.KeyValueStore(sharedGroup, "routes", {
-        name: storeName,
-        comment: "Store for routes"
-      }, {
-        replaceOnChanges: ["name"],
-        createBeforeReplace: true,
-        import: ctx.import ? storeName : undefined
-      });
-    }
     for (const [id, props] of routers) {
       const group4 = new Group(ctx.base, "router", id);
+      routerGroups[id] = group4;
+      routes[id] = {};
+      routeDependencies[id] = new Set;
       const name = formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "router",
         resourceName: id
       });
-      const productionFunctionName = `${name.slice(0, 52)}--production`;
-      const productionFunction = new aws2.cloudfront.Function(group4, "production-function", {
-        name: productionFunctionName,
+      const routeStore = new aws2.cloudfront.KeyValueStore(group4, "routes", { name }, {
+        replaceOnChanges: ["name"],
+        createBeforeReplace: true,
+        import: ctx.import ? name : undefined
+      });
+      routeStores[id] = routeStore;
+      const cfFunction = new aws2.cloudfront.Function(group4, "function", {
+        name,
         runtime: "cloudfront-js-2.0",
         code: getViewerRequestFunctionCode({
           router: id,
@@ -162704,18 +162727,19 @@ var routerFeature = defineFeature({
         publish: true,
         keyValueStoreAssociations: [routeStore.arn]
       }, {
-        import: ctx.import ? productionFunctionName : undefined
+        import: ctx.import ? name : undefined
       });
       ctx.shared.add("router", "addRoutes", id, (newRoutes, options) => {
+        const routerRoutes = routes[id];
         for (const [key, route] of Object.entries(newRoutes)) {
-          if (Object.hasOwn(routes, `${id}:${key}`)) {
+          if (Object.hasOwn(routerRoutes, `${id}:${key}`)) {
             throw new ExpectedError(`Duplicate route key: ${key} in the "${id}" router`);
           }
           assertRouteValueSize(`${id}:${key}`, route);
-          routes[`${id}:${key}`] = route;
+          routerRoutes[`${id}:${key}`] = route;
         }
         for (const dependency of options?.dependsOn ?? []) {
-          routeDependencies.add(dependency);
+          routeDependencies[id].add(dependency);
         }
         if (Object.values(newRoutes).flat().some((route) => route.type === "lambda" && !route.domainName)) {
           hasLambdaRoutes = true;
@@ -162978,7 +163002,7 @@ var routerFeature = defineFeature({
             functionAssociation: [
               {
                 eventType: "viewer-request",
-                functionArn: productionFunction.arn
+                functionArn: cfFunction.arn
               }
             ],
             originRequestPolicyId: originRequest.id,
@@ -162995,38 +163019,6 @@ var routerFeature = defineFeature({
         ],
         webAclId: waf?.arn
       });
-      if (id === defaultRouter) {
-        ctx.onReadyLast(() => {
-          const bundle = ctx.shared.get("bundle", "main");
-          let lambdaUrlHost;
-          if (hasLambdaRoutes) {
-            const deployment = new FunctionDeployment(sharedGroup, "function-deployment", {
-              functionName: bundle.lambda.functionName,
-              id: ctx.deploymentId ?? "local-0",
-              sourceArns: distributionIds.map((distributionId) => distributionId.pipe((id2) => `arn:aws:cloudfront::${ctx.accountId}:distribution/${id2}`))
-            }, {
-              dependsOn: [bundle.deployment]
-            });
-            lambdaUrlHost = deployment.url.pipe((url) => url.split("/")[2]);
-            routeDependencies.add(bundle.policy);
-            routeDependencies.add(bundle.alias);
-            routeDependencies.add(deployment);
-          }
-          new RouteDeployment(sharedGroup, "deployment", {
-            deploymentId: ctx.deploymentId ?? "local-0",
-            storeArn: routeStore.arn,
-            functionVersion: bundle.lambda.version,
-            routes: $resolve([routes, lambdaUrlHost], (routes2, lambdaUrlHost2) => {
-              const withOrigin = (route) => {
-                return route.type === "lambda" && !route.domainName ? { ...route, domainName: lambdaUrlHost2 } : route;
-              };
-              return Object.entries(routes2).flatMap(([key, route]) => createRouteStoreEntries(key, Array.isArray(route) ? route.map(withOrigin) : withOrigin(route)));
-            })
-          }, {
-            dependsOn: Array.from(routeDependencies)
-          });
-        });
-      }
       ctx.shared.add("router", "id", id, distribution.id);
       distributionIds.push(distribution.id);
       if (props.domain) {
@@ -163082,6 +163074,44 @@ var routerFeature = defineFeature({
         ctx.shared.add("router", "endpoint", id, domainName);
       }
     }
+    if (routers.length > 0) {
+      ctx.onReadyLast(() => {
+        const bundle = ctx.shared.get("bundle", "main");
+        const sharedDependencies = [];
+        let lambdaUrlHost;
+        if (hasLambdaRoutes) {
+          const sharedGroup = new Group(ctx.base, "router", "shared");
+          const deployment = new FunctionDeployment(sharedGroup, "function-deployment", {
+            functionName: bundle.lambda.functionName,
+            id: ctx.deploymentId ?? "local-0",
+            sourceArns: distributionIds.map((distributionId) => distributionId.pipe((id) => `arn:aws:cloudfront::${ctx.accountId}:distribution/${id}`))
+          }, {
+            dependsOn: [bundle.deployment]
+          });
+          lambdaUrlHost = deployment.url.pipe((url) => url.split("/")[2]);
+          sharedDependencies.push(bundle.policy, bundle.alias, deployment);
+        }
+        for (const [id] of routers) {
+          const dependencies = routeDependencies[id];
+          for (const dependency of sharedDependencies) {
+            dependencies.add(dependency);
+          }
+          new RouteDeployment(routerGroups[id], "deployment", {
+            deploymentId: ctx.deploymentId ?? "local-0",
+            storeArn: routeStores[id].arn,
+            functionVersion: bundle.lambda.version,
+            routes: $resolve([routes[id], lambdaUrlHost], (routes2, lambdaUrlHost2) => {
+              const withOrigin = (route) => {
+                return route.type === "lambda" && !route.domainName ? { ...route, domainName: lambdaUrlHost2 } : route;
+              };
+              return Object.entries(routes2).flatMap(([key, route]) => createRouteStoreEntries(key, Array.isArray(route) ? route.map(withOrigin) : withOrigin(route)));
+            })
+          }, {
+            dependsOn: Array.from(dependencies)
+          });
+        }
+      });
+    }
   },
   onStack(ctx) {
     for (const [id, patterns] of Object.entries(ctx.stackConfig.routes ?? {})) {
@@ -178108,7 +178138,7 @@ ${job.error.stack.split(`
             stream2.shift();
           } else if (stream2.length > 0) {
             this._BOMseen = true;
-          } else {}
+          }
         }
         return codePointsToString(stream2);
       }
@@ -187330,13 +187360,21 @@ var prune = (program3) => {
               await pruneFunctionVersion(lambda, name, version2);
             }
           }
-          const storeArn = await getRouteStoreArn(cloudfront, formatGlobalResourceName({
-            appName: appConfig.name,
-            resourceType: "router",
-            resourceName: "store"
-          }));
-          if (storeArn) {
-            const survivingRoutes = await pruneStoreDeployments(kvs, storeArn, prune2.map((item) => item.id));
+          const survivingRoutes = [];
+          let sweptStores = false;
+          for (const routerId of Object.keys(appConfig.router ?? {})) {
+            const storeArn = await getRouteStoreArn(cloudfront, formatGlobalResourceName({
+              appName: appConfig.name,
+              resourceType: "router",
+              resourceName: routerId
+            }));
+            if (!storeArn) {
+              continue;
+            }
+            sweptStores = true;
+            survivingRoutes.push(...await pruneStoreDeployments(kvs, storeArn, prune2.map((item) => item.id)));
+          }
+          if (sweptStores) {
             await pruneSiteVersions({
               s3,
               bucket: formatGlobalResourceName({

package/dist/handlers/icon.js

@@ -3,15 +3,29 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);

package/dist/handlers/pubsub-publisher.js

@@ -4,15 +4,29 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
@@ -4527,7 +4541,7 @@ WD9f
 
 // ../../node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils/index.js
 var require_utils2 = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.noop = exports.defaults = exports.Debug = exports.getPackageMeta = exports.zipMap = exports.CONNECTION_CLOSED_ERROR_MSG = exports.shuffle = exports.sample = exports.resolveTLSProfile = exports.parseURL = exports.optimizeErrorStack = exports.toArg = exports.convertMapToArray = exports.convertObjectToArray = exports.timeout = exports.packObject = exports.isInt = exports.wrapMultiResult = exports.convertBufferToString = undefined;
   var fs_1 = __require("fs");
@@ -4813,7 +4827,7 @@ var require_argumentParsers = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/Command.js
 var require_Command = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built";
   Object.defineProperty(exports, "__esModule", { value: true });
   var commands_1 = require_built();
   var calculateSlot = require_lib();

package/dist/handlers/pubsub-server.js

@@ -5,56 +5,78 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
 var __reExport = (target, mod, secondTarget) => {
-  for (let key of __getOwnPropNames(mod))
+  var keys = __getOwnPropNames(mod);
+  for (let key of keys)
     if (!__hasOwnProp.call(target, key) && key !== "default")
       __defProp(target, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
   if (secondTarget) {
-    for (let key of __getOwnPropNames(mod))
+    for (let key of keys)
       if (!__hasOwnProp.call(secondTarget, key) && key !== "default")
         __defProp(secondTarget, key, {
-          get: () => mod[key],
+          get: __accessProp.bind(mod, key),
           enumerable: true
         });
     return secondTarget;
   }
 };
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
-var __moduleCache = /* @__PURE__ */ new WeakMap;
 var __toCommonJS = (from) => {
-  var entry = __moduleCache.get(from), desc;
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function")
-    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    }));
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
   __moduleCache.set(from, entry);
   return entry;
 };
+var __moduleCache;
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -26611,9 +26633,9 @@ var init_getSanitizedDevTypeScriptVersion = __esm(() => {
 });
 
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getTypeScriptUserAgentPair.js
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 import { join as join5 } from "path";
-var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es", tscVersion, TS_PACKAGE_JSON, getTypeScriptUserAgentPair = async () => {
+var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es", tscVersion, TS_PACKAGE_JSON, getTypeScriptUserAgentPair = async () => {
   if (tscVersion === null) {
     return;
   } else if (typeof tscVersion === "string") {
@@ -26633,7 +26655,7 @@ var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/@aws-sd
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
       const appPackageJsonPath = join5(nodeModulesParentDir, "package.json");
-      const packageJson = await readFile3(appPackageJsonPath, "utf-8");
+      const packageJson = await readFile4(appPackageJsonPath, "utf-8");
       const { dependencies, devDependencies } = JSON.parse(packageJson);
       const version2 = devDependencies?.typescript ?? dependencies?.typescript;
       if (typeof version2 !== "string") {
@@ -26651,7 +26673,7 @@ var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/@aws-sd
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
       const tsPackageJsonPath = join5(nodeModulesParentDir, TS_PACKAGE_JSON);
-      const packageJson = await readFile3(tsPackageJsonPath, "utf-8");
+      const packageJson = await readFile4(tsPackageJsonPath, "utf-8");
       const { version: version2 } = JSON.parse(packageJson);
       const sanitizedVersion2 = getSanitizedTypeScriptVersion(version2);
       if (typeof sanitizedVersion2 !== "string") {
@@ -37023,7 +37045,7 @@ ${job.error.stack.split(`
               stream2.shift();
             } else if (stream2.length > 0) {
               this._BOMseen = true;
-            } else {}
+            }
           }
           return codePointsToString(stream2);
         }
@@ -937715,8 +937737,8 @@ GFS4: `);
     fs4.createReadStream = createReadStream;
     fs4.createWriteStream = createWriteStream;
     var fs$readFile = fs4.readFile;
-    fs4.readFile = readFile4;
-    function readFile4(path, options, cb) {
+    fs4.readFile = readFile5;
+    function readFile5(path, options, cb) {
       if (typeof options === "function")
         cb = options, options = null;
       return go$readFile(path, options, cb);
@@ -945836,7 +945858,7 @@ var require_unbzip2_stream = __commonJS((exports, module) => {
           stream2.queue(d4);
           if (d4 !== null) {
             outlength += d4.length;
-          } else {}
+          }
         });
       } catch (e5) {
         stream2.emit("error", e5);
@@ -955604,7 +955626,7 @@ var require_spawn = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/dynamo-db-local@10.3.0/node_modules/dynamo-db-local/build/node/module.js
 var require_module = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/dynamo-db-local@10.3.0/node_modules/dynamo-db-local/build/node";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/dynamo-db-local@10.3.0/node_modules/dynamo-db-local/build/node";
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
@@ -981532,7 +981554,7 @@ WD9f
 
 // ../../node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils/index.js
 var require_utils4 = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/utils";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.noop = exports.defaults = exports.Debug = exports.getPackageMeta = exports.zipMap = exports.CONNECTION_CLOSED_ERROR_MSG = exports.shuffle = exports.sample = exports.resolveTLSProfile = exports.parseURL = exports.optimizeErrorStack = exports.toArg = exports.convertMapToArray = exports.convertObjectToArray = exports.timeout = exports.packObject = exports.isInt = exports.wrapMultiResult = exports.convertBufferToString = undefined;
   var fs_1 = __require("fs");
@@ -981818,7 +981840,7 @@ var require_argumentParsers = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built/Command.js
 var require_Command = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/ioredis@5.10.1_supports-color@8.1.1/node_modules/ioredis/built";
   Object.defineProperty(exports, "__esModule", { value: true });
   var commands_1 = require_built();
   var calculateSlot = require_lib3();
@@ -1001183,7 +1001205,7 @@ var require_db_util = __commonJS((exports) => {
 
 // ../../node_modules/.pnpm/redis-memory-server@0.16.1_supports-color@8.1.1/node_modules/redis-memory-server/lib/util/RedisInstance.js
 var require_RedisInstance = __commonJS((exports) => {
-  var __dirname = "/Users/ivandasilveira/Sites/@awsless/node_modules/.pnpm/redis-memory-server@0.16.1_supports-color@8.1.1/node_modules/redis-memory-server/lib/util";
+  var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/redis-memory-server@0.16.1_supports-color@8.1.1/node_modules/redis-memory-server/lib/util";
   var __awaiter2 = exports && exports.__awaiter || function(thisArg, _arguments, P4, generator) {
     function adopt(value) {
       return value instanceof P4 ? value : new P4(function(resolve) {
@@ -1015614,7 +1015636,7 @@ ${job.error.stack.split(`
               stream3.shift();
             } else if (stream3.length > 0) {
               this._BOMseen = true;
-            } else {}
+            }
           }
           return codePointsToString(stream3);
         }

package/dist/test-global-setup.js

@@ -1,12 +1,16 @@
 import { createRequire } from "node:module";
 var __defProp = Object.defineProperty;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -38,19 +38,19 @@
     "@opensearch-project/opensearch": "^2.13.0",
     "rolldown": "1.2.1",
     "vitest": "4.1.10",
-    "@awsless/ts-file-cache": "^0.0.16",
-    "@awsless/dynamodb-server": "^0.1.10"
+    "@awsless/dynamodb-server": "^0.1.10",
+    "@awsless/ts-file-cache": "^0.0.16"
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.7",
-    "@awsless/dynamodb": "^0.3.25",
-    "@awsless/duration": "^0.0.4",
     "@awsless/json": "^0.0.11",
+    "@awsless/duration": "^0.0.4",
+    "@awsless/dynamodb": "^0.3.25",
+    "@awsless/lambda": "^0.0.48",
+    "@awsless/s3": "^0.0.22",
     "@awsless/weak-cache": "^0.0.1",
     "@awsless/validate": "^0.2.0",
-    "@awsless/lambda": "^0.0.48",
-    "awsless": "^0.1.4",
-    "@awsless/s3": "^0.0.22"
+    "awsless": "^0.1.4"
   },
   "devDependencies": {
     "@aws-sdk/client-cloudformation": "^3.369.0",
@@ -108,25 +108,25 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
-    "@awsless/big-float": "^0.1.7",
     "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/clui": "^0.0.9",
-    "@awsless/duration": "^0.0.4",
+    "@awsless/big-float": "^0.1.7",
     "@awsless/dynamodb": "^0.3.25",
-    "@awsless/iot": "^0.0.5",
     "@awsless/json": "^0.0.11",
-    "@awsless/open-search": "^0.0.28",
     "@awsless/lambda": "^0.0.48",
+    "@awsless/iot": "^0.0.5",
+    "@awsless/duration": "^0.0.4",
+    "@awsless/redis": "^0.1.13",
+    "@awsless/clui": "^0.0.9",
     "@awsless/s3": "^0.0.22",
-    "@awsless/size": "^0.0.2",
     "@awsless/scheduler": "^0.0.5",
-    "@awsless/sns": "^0.0.11",
+    "@awsless/size": "^0.0.2",
     "@awsless/sqs": "^0.0.24",
-    "@awsless/redis": "^0.1.13",
+    "@awsless/open-search": "^0.0.28",
+    "@awsless/validate": "^0.2.0",
     "@awsless/ssm": "^0.0.8",
+    "@awsless/sns": "^0.0.11",
     "awsless": "^0.1.4",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/validate": "^0.2.0"
+    "@awsless/weak-cache": "^0.0.1"
   },
   "scripts": {
     "test": "bun cli/build-handlers.ts && pnpm vitest",