effortless-aws 0.10.1 → 0.11.0

package/dist/cli/index.js

@@ -72516,7 +72516,7 @@ var parseSource = (source) => {
   const project2 = new Project({ useInMemoryFileSystem: true });
   return project2.createSourceFile("input.ts", source);
 };
-var RUNTIME_PROPS = ["onRequest", "onRecord", "onBatchComplete", "onBatch", "onMessage", "setup", "schema", "onError", "deps", "config", "static", "middleware"];
+var RUNTIME_PROPS = ["name", "onRequest", "onRecord", "onBatchComplete", "onBatch", "onMessage", "setup", "schema", "onError", "deps", "config", "static", "middleware"];
 var buildConfigWithoutRuntime = (obj) => {
   const props = obj.getProperties().filter((p3) => {
     if (p3.getKind() === SyntaxKind.PropertyAssignment) {
@@ -72656,12 +72656,12 @@ var extractHandlerConfigs = (source, type2) => {
         if (firstArg && firstArg.getKind() === SyntaxKind.ObjectLiteralExpression) {
           const objLiteral = firstArg;
           const configText = buildConfigWithoutRuntime(objLiteral);
-          const configObj = new Function(`return ${configText}`)();
+          const config2 = new Function(`return ${configText}`)();
           const hasHandler = handlerProps.some((p3) => extractPropertyFromObject(objLiteral, p3) !== void 0);
           const depsKeys = extractDepsKeys(objLiteral);
           const paramEntries = extractParamEntries(objLiteral);
           const staticGlobs = extractStaticGlobs(objLiteral);
-          results.push({ exportName: "default", config: configObj, hasHandler, depsKeys, paramEntries, staticGlobs });
+          results.push({ exportName: "default", name: "default", config: config2, hasHandler, depsKeys, paramEntries, staticGlobs });
         }
       }
     }
@@ -72678,12 +72678,13 @@ var extractHandlerConfigs = (source, type2) => {
       if (firstArg && firstArg.getKind() === SyntaxKind.ObjectLiteralExpression) {
         const objLiteral = firstArg;
         const configText = buildConfigWithoutRuntime(objLiteral);
-        const configObj = new Function(`return ${configText}`)();
+        const exportName = decl.getName();
+        const config2 = new Function(`return ${configText}`)();
         const hasHandler = handlerProps.some((p3) => extractPropertyFromObject(objLiteral, p3) !== void 0);
         const depsKeys = extractDepsKeys(objLiteral);
         const paramEntries = extractParamEntries(objLiteral);
         const staticGlobs = extractStaticGlobs(objLiteral);
-        results.push({ exportName: decl.getName(), config: configObj, hasHandler, depsKeys, paramEntries, staticGlobs });
+        results.push({ exportName, name: exportName, config: config2, hasHandler, depsKeys, paramEntries, staticGlobs });
       }
     });
   });
@@ -72812,7 +72813,7 @@ var collectRequiredParams = (handlers, project2, stage) => {
               ssmPath,
               propName,
               ssmKey,
-              handlerName: fn2.config.name ?? fn2.exportName
+              handlerName: fn2.name
             });
           }
         }
@@ -72944,8 +72945,7 @@ var deployCoreLambda = ({
 
 // src/deploy/deploy-http.ts
 var deployLambda = ({ input, fn: fn2, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect_exports.gen(function* () {
-  const { exportName, config: config2 } = fn2;
-  const handlerName = config2.name ?? exportName;
+  const { exportName, name: handlerName, config: config2 } = fn2;
   const { functionArn, status: status2 } = yield* deployCoreLambda({
     input,
     exportName,
@@ -72971,7 +72971,7 @@ var deploy = (input) => Effect_exports.gen(function* () {
   const targetExport = input.exportName ?? "default";
   const fn2 = configs.find((c2) => c2.exportName === targetExport) ?? configs[0];
   const config2 = fn2.config;
-  const handlerName = config2.name ?? fn2.exportName;
+  const handlerName = fn2.name;
   const tagCtx = {
     project: input.project,
     stage: resolveStage(input.stage),
@@ -73048,7 +73048,7 @@ var deployAll = (input) => Effect_exports.gen(function* () {
   const results = [];
   const activeRouteKeys = /* @__PURE__ */ new Set();
   for (const fn2 of functions) {
-    const { exportName, functionArn, config: config2 } = yield* deployLambda({
+    const { exportName, functionArn, config: config2, handlerName: fnName } = yield* deployLambda({
       input,
       fn: fn2,
       ...layerArn ? { layerArn } : {},
@@ -73064,7 +73064,7 @@ var deployAll = (input) => Effect_exports.gen(function* () {
       path: config2.path
     });
     results.push({ exportName, url: handlerUrl, functionArn });
-    yield* Effect_exports.logDebug(`  ${config2.method} ${config2.path} \u2192 ${config2.name}`);
+    yield* Effect_exports.logDebug(`  ${config2.method} ${config2.path} \u2192 ${fnName}`);
   }
   yield* removeStaleRoutes(apiId, activeRouteKeys);
   yield* Effect_exports.logDebug(`Deployment complete! API: ${apiUrl}`);
@@ -73086,8 +73086,7 @@ var deployAll = (input) => Effect_exports.gen(function* () {
 // src/deploy/deploy-table.ts
 var TABLE_DEFAULT_PERMISSIONS = ["dynamodb:*", "logs:*"];
 var deployTableFunction = ({ input, fn: fn2, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect_exports.gen(function* () {
-  const { exportName, config: config2 } = fn2;
-  const handlerName = config2.name ?? exportName;
+  const { exportName, name: handlerName, config: config2 } = fn2;
   const tagCtx = {
     project: input.project,
     stage: resolveStage(input.stage),
@@ -73201,8 +73200,7 @@ var deployAllTables = (input) => Effect_exports.gen(function* () {
 // src/deploy/deploy-app.ts
 import { execSync } from "child_process";
 var deployAppLambda = ({ input, fn: fn2, layerArn, external, depsEnv, depsPermissions }) => Effect_exports.gen(function* () {
-  const { exportName, config: config2 } = fn2;
-  const handlerName = config2.name ?? exportName;
+  const { exportName, name: handlerName, config: config2 } = fn2;
   if (config2.build) {
     yield* Effect_exports.logDebug(`Building site: ${config2.build}`);
     yield* Effect_exports.try({
@@ -73272,9 +73270,8 @@ var deployMiddlewareLambda = (input) => Effect_exports.gen(function* () {
 });
 var deployStaticSite = (input) => Effect_exports.gen(function* () {
   const { projectDir, project: project2, region, fn: fn2 } = input;
-  const { exportName, config: config2 } = fn2;
+  const { exportName, name: handlerName, config: config2 } = fn2;
   const stage = resolveStage(input.stage);
-  const handlerName = config2.name ?? exportName;
   const hasMiddleware = fn2.hasHandler;
   const tagCtx = { project: project2, stage, handler: handlerName };
   if (config2.build) {
@@ -73374,8 +73371,7 @@ var deployStaticSite = (input) => Effect_exports.gen(function* () {
 // src/deploy/deploy-fifo-queue.ts
 var FIFO_QUEUE_DEFAULT_PERMISSIONS = ["sqs:*", "logs:*"];
 var deployFifoQueueFunction = ({ input, fn: fn2, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect_exports.gen(function* () {
-  const { exportName, config: config2 } = fn2;
-  const handlerName = config2.name ?? exportName;
+  const { exportName, name: handlerName, config: config2 } = fn2;
   const tagCtx = {
     project: input.project,
     stage: resolveStage(input.stage),
@@ -73530,8 +73526,7 @@ var buildTableNameMap = (tableHandlers, project2, stage) => {
   const map37 = /* @__PURE__ */ new Map();
   for (const { exports } of tableHandlers) {
     for (const fn2 of exports) {
-      const handlerName = fn2.config.name ?? fn2.exportName;
-      map37.set(fn2.exportName, `${project2}-${stage}-${handlerName}`);
+      map37.set(fn2.exportName, `${project2}-${stage}-${fn2.name}`);
     }
   }
   return map37;
@@ -73592,7 +73587,7 @@ var buildHttpTasks = (ctx, handlers, apiId, results) => {
       tasks.push(
         Effect_exports.gen(function* () {
           const env2 = resolveHandlerEnv(fn2.depsKeys, fn2.paramEntries, ctx);
-          const { exportName, functionArn, status: status2, config: config2 } = yield* deployLambda({
+          const { exportName, functionArn, status: status2, config: config2, handlerName } = yield* deployLambda({
             input: makeDeployInput(ctx, file7),
             fn: fn2,
             ...ctx.layerArn ? { layerArn: ctx.layerArn } : {},
@@ -73609,7 +73604,7 @@ var buildHttpTasks = (ctx, handlers, apiId, results) => {
             path: config2.path
           }).pipe(Effect_exports.provide(clients_exports.makeClients({ lambda: { region }, apigatewayv2: { region } })));
           results.push({ exportName, url: handlerUrl, functionArn });
-          yield* ctx.logComplete(config2.name ?? exportName, "http", status2);
+          yield* ctx.logComplete(handlerName, "http", status2);
         })
       );
     }
@@ -73634,7 +73629,7 @@ var buildTableTasks = (ctx, handlers, results) => {
             ...fn2.staticGlobs.length > 0 ? { staticGlobs: fn2.staticGlobs } : {}
           }).pipe(Effect_exports.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, dynamodb: { region } })));
           results.push(result);
-          yield* ctx.logComplete(fn2.config.name ?? fn2.exportName, "table", result.status);
+          yield* ctx.logComplete(fn2.name, "table", result.status);
         })
       );
     }
@@ -73702,7 +73697,7 @@ var buildStaticSiteTasks = (ctx, handlers, results) => {
             acm: { region: "us-east-1" }
           })));
           results.push(result);
-          yield* ctx.logComplete(fn2.config.name ?? fn2.exportName, "site", "updated");
+          yield* ctx.logComplete(fn2.name, "site", "updated");
         })
       );
     }
@@ -73727,7 +73722,7 @@ var buildFifoQueueTasks = (ctx, handlers, results) => {
             ...fn2.staticGlobs.length > 0 ? { staticGlobs: fn2.staticGlobs } : {}
           }).pipe(Effect_exports.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, sqs: { region } })));
           results.push(result);
-          yield* ctx.logComplete(fn2.config.name ?? fn2.exportName, "queue", result.status);
+          yield* ctx.logComplete(fn2.name, "queue", result.status);
         })
       );
     }
@@ -73815,15 +73810,15 @@ var deployProject = (input) => Effect_exports.gen(function* () {
   yield* Console_exports.log("");
   const manifest = [];
   for (const { exports } of httpHandlers)
-    for (const fn2 of exports) manifest.push({ name: fn2.config.name ?? fn2.exportName, type: "http" });
+    for (const fn2 of exports) manifest.push({ name: fn2.name, type: "http" });
   for (const { exports } of tableHandlers)
-    for (const fn2 of exports) manifest.push({ name: fn2.config.name ?? fn2.exportName, type: "table" });
+    for (const fn2 of exports) manifest.push({ name: fn2.name, type: "table" });
   for (const { exports } of appHandlers)
-    for (const fn2 of exports) manifest.push({ name: fn2.config.name ?? fn2.exportName, type: "app" });
+    for (const fn2 of exports) manifest.push({ name: fn2.name, type: "app" });
   for (const { exports } of staticSiteHandlers)
-    for (const fn2 of exports) manifest.push({ name: fn2.config.name ?? fn2.exportName, type: "site" });
+    for (const fn2 of exports) manifest.push({ name: fn2.name, type: "site" });
   for (const { exports } of fifoQueueHandlers)
-    for (const fn2 of exports) manifest.push({ name: fn2.config.name ?? fn2.exportName, type: "queue" });
+    for (const fn2 of exports) manifest.push({ name: fn2.name, type: "queue" });
   manifest.sort((a, b) => a.name.localeCompare(b.name));
   const logComplete = createLiveProgress(manifest);
   const ctx = {
@@ -74086,8 +74081,8 @@ Deployed ${tableResults.length} table handler(s):`));
           let foundExport = null;
           let handlerType = "http";
           for (const { file: file7, exports } of discovered.httpHandlers) {
-            for (const { exportName, config: handlerConfig } of exports) {
-              if (handlerConfig.name === targetValue) {
+            for (const { exportName, name } of exports) {
+              if (name === targetValue) {
                 foundFile = file7;
                 foundExport = exportName;
                 break;
@@ -74097,8 +74092,8 @@ Deployed ${tableResults.length} table handler(s):`));
           }
           if (!foundFile) {
             for (const { file: file7, exports } of discovered.tableHandlers) {
-              for (const { exportName, config: handlerConfig } of exports) {
-                if (handlerConfig.name === targetValue) {
+              for (const { exportName, name } of exports) {
+                if (name === targetValue) {
                   foundFile = file7;
                   foundExport = exportName;
                   handlerType = "table";
@@ -74110,8 +74105,8 @@ Deployed ${tableResults.length} table handler(s):`));
           }
           if (!foundFile) {
             for (const { file: file7, exports } of discovered.appHandlers) {
-              for (const { exportName, config: handlerConfig } of exports) {
-                if (handlerConfig.name === targetValue) {
+              for (const { exportName, name } of exports) {
+                if (name === targetValue) {
                   foundFile = file7;
                   foundExport = exportName;
                   handlerType = "app";
@@ -74125,18 +74120,18 @@ Deployed ${tableResults.length} table handler(s):`));
             yield* Console_exports.error(`Error: Handler "${targetValue}" not found`);
             yield* Console_exports.log("\nAvailable handlers:");
             for (const { exports } of discovered.httpHandlers) {
-              for (const { config: cfg } of exports) {
-                yield* Console_exports.log(`  ${c.cyan("[http]")}  ${cfg.name}`);
+              for (const { name } of exports) {
+                yield* Console_exports.log(`  ${c.cyan("[http]")}  ${name}`);
               }
             }
             for (const { exports } of discovered.tableHandlers) {
-              for (const { config: cfg } of exports) {
-                yield* Console_exports.log(`  ${c.cyan("[table]")} ${cfg.name}`);
+              for (const { name } of exports) {
+                yield* Console_exports.log(`  ${c.cyan("[table]")} ${name}`);
               }
             }
             for (const { exports } of discovered.appHandlers) {
-              for (const { config: cfg } of exports) {
-                yield* Console_exports.log(`  ${c.cyan("[app]")}   ${cfg.name}`);
+              for (const { name } of exports) {
+                yield* Console_exports.log(`  ${c.cyan("[app]")}   ${name}`);
               }
             }
             return;
@@ -74218,7 +74213,7 @@ var discoverCodeHandlers = (projectDir, patterns) => {
   for (const { exports } of discovered.httpHandlers) {
     for (const fn2 of exports) {
       handlers.push({
-        name: fn2.config.name ?? fn2.exportName,
+        name: fn2.name,
         type: "http",
         method: fn2.config.method,
         path: fn2.config.path
@@ -74228,7 +74223,7 @@ var discoverCodeHandlers = (projectDir, patterns) => {
   for (const { exports } of discovered.tableHandlers) {
     for (const fn2 of exports) {
       handlers.push({
-        name: fn2.config.name ?? fn2.exportName,
+        name: fn2.name,
         type: "table"
       });
     }
@@ -74236,7 +74231,7 @@ var discoverCodeHandlers = (projectDir, patterns) => {
   for (const { exports } of discovered.appHandlers) {
     for (const fn2 of exports) {
       handlers.push({
-        name: fn2.config.name ?? fn2.exportName,
+        name: fn2.name,
         type: "app",
         path: fn2.config.path
       });
@@ -74245,7 +74240,7 @@ var discoverCodeHandlers = (projectDir, patterns) => {
   for (const { exports } of discovered.staticSiteHandlers) {
     for (const fn2 of exports) {
       handlers.push({
-        name: fn2.config.name ?? fn2.exportName,
+        name: fn2.name,
         type: "site"
       });
     }
@@ -74253,7 +74248,7 @@ var discoverCodeHandlers = (projectDir, patterns) => {
   for (const { exports } of discovered.fifoQueueHandlers) {
     for (const fn2 of exports) {
       handlers.push({
-        name: fn2.config.name ?? fn2.exportName,
+        name: fn2.name,
         type: "queue"
       });
     }
@@ -74843,10 +74838,10 @@ var logsCommand = Command_exports.make(
       const files = findHandlerFiles(patterns, projectDir);
       const discovered = discoverHandlers(files);
       const allHandlerNames = [
-        ...discovered.httpHandlers.flatMap((h) => h.exports.map((e) => e.config.name ?? e.exportName)),
-        ...discovered.tableHandlers.flatMap((h) => h.exports.map((e) => e.config.name ?? e.exportName)),
-        ...discovered.appHandlers.flatMap((h) => h.exports.map((e) => e.config.name ?? e.exportName)),
-        ...discovered.fifoQueueHandlers.flatMap((h) => h.exports.map((e) => e.config.name ?? e.exportName))
+        ...discovered.httpHandlers.flatMap((h) => h.exports.map((e) => e.name)),
+        ...discovered.tableHandlers.flatMap((h) => h.exports.map((e) => e.name)),
+        ...discovered.appHandlers.flatMap((h) => h.exports.map((e) => e.name)),
+        ...discovered.fifoQueueHandlers.flatMap((h) => h.exports.map((e) => e.name))
       ];
       if (!allHandlerNames.includes(handlerName)) {
         yield* Console_exports.error(`Handler "${handlerName}" not found in code.`);