@effortless-aws/cli 0.5.0 → 0.7.0

package/dist/cli/index.js

@@ -3832,6 +3832,7 @@ var ensureFifoQueue = (input) => Effect22.gen(function* () {
     name,
     visibilityTimeout = 30,
     retentionPeriod = 345600,
+    delay = 0,
     contentBasedDeduplication = true,
     tags
   } = input;
@@ -3854,7 +3855,8 @@ var ensureFifoQueue = (input) => Effect22.gen(function* () {
         FifoQueue: "true",
         ContentBasedDeduplication: String(contentBasedDeduplication),
         VisibilityTimeout: String(visibilityTimeout),
-        MessageRetentionPeriod: String(retentionPeriod)
+        MessageRetentionPeriod: String(retentionPeriod),
+        DelaySeconds: String(delay)
       },
       ...tags ? { tags } : {}
     });
@@ -3867,7 +3869,8 @@ var ensureFifoQueue = (input) => Effect22.gen(function* () {
       Attributes: {
         ContentBasedDeduplication: String(contentBasedDeduplication),
         VisibilityTimeout: String(visibilityTimeout),
-        MessageRetentionPeriod: String(retentionPeriod)
+        MessageRetentionPeriod: String(retentionPeriod),
+        DelaySeconds: String(delay)
       }
     });
     if (tags) {
@@ -4052,7 +4055,14 @@ var extractDepsKeys = (obj) => {
     return false;
   });
   if (!depsProp || depsProp.getKind() !== SyntaxKind.PropertyAssignment) return [];
-  const init = depsProp.getInitializer();
+  let init = depsProp.getInitializer();
+  if (!init) return [];
+  if (init.getKind() === SyntaxKind.ArrowFunction) {
+    const body = init.getBody();
+    if (body.getKind() === SyntaxKind.ParenthesizedExpression) {
+      init = body.getExpression();
+    }
+  }
   if (!init || init.getKind() !== SyntaxKind.ObjectLiteralExpression) return [];
   const depsObj = init;
   return depsObj.getProperties().map((p) => {
@@ -4434,6 +4444,7 @@ var checkMissingParams = (params) => Effect25.gen(function* () {
 
 // src/deploy/deploy-table.ts
 import { Effect as Effect27 } from "effect";
+import { toSeconds } from "effortless-aws";
 
 // src/deploy/shared.ts
 import { Effect as Effect26 } from "effect";
@@ -4554,9 +4565,9 @@ var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsP
     handlerName,
     defaultPermissions: TABLE_DEFAULT_PERMISSIONS,
     bundleType: "table",
-    ...config.permissions ? { permissions: config.permissions } : {},
-    ...config.memory ? { memory: config.memory } : {},
-    ...config.timeout ? { timeout: config.timeout } : {},
+    ...config.lambda?.permissions ? { permissions: config.lambda.permissions } : {},
+    ...config.lambda?.memory ? { memory: config.lambda.memory } : {},
+    ...config.lambda?.timeout ? { timeout: toSeconds(config.lambda.timeout) } : {},
     ...layerArn ? { layerArn } : {},
     ...external ? { external } : {},
     depsEnv: selfEnv,
@@ -4568,7 +4579,7 @@ var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsP
     functionArn,
     streamArn,
     batchSize: config.batchSize ?? 100,
-    batchWindow: config.batchWindow ?? 2,
+    batchWindow: toSeconds(config.batchWindow ?? 2),
     startingPosition: config.startingPosition ?? "LATEST"
   });
   yield* Effect27.logDebug(`Table deployment complete! Table: ${tableArn}`);
@@ -4646,6 +4657,7 @@ var deployAllTables = (input) => Effect27.gen(function* () {
 
 // src/deploy/deploy-api.ts
 import { Effect as Effect28 } from "effect";
+import { toSeconds as toSeconds2 } from "effortless-aws";
 var deployApiFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect28.gen(function* () {
   const { exportName, config } = fn13;
   const handlerName = exportName;
@@ -4654,9 +4666,9 @@ var deployApiFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPer
     exportName,
     handlerName,
     bundleType: "api",
-    ...config.permissions ? { permissions: config.permissions } : {},
-    ...config.memory ? { memory: config.memory } : {},
-    ...config.timeout ? { timeout: config.timeout } : {},
+    ...config.lambda?.permissions ? { permissions: config.lambda.permissions } : {},
+    ...config.lambda?.memory ? { memory: config.lambda.memory } : {},
+    ...config.lambda?.timeout ? { timeout: toSeconds2(config.lambda.timeout) } : {},
     ...layerArn ? { layerArn } : {},
     ...external ? { external } : {},
     ...depsEnv ? { depsEnv } : {},
@@ -4712,6 +4724,7 @@ var deploy = (input) => Effect28.gen(function* () {
 
 // src/deploy/deploy-app.ts
 import { Effect as Effect29 } from "effect";
+import { toSeconds as toSeconds3 } from "effortless-aws";
 import { execSync } from "child_process";
 import * as path5 from "path";
 var deployApp = (input) => Effect29.gen(function* () {
@@ -4749,7 +4762,7 @@ var deployApp = (input) => Effect29.gen(function* () {
   const serverDir = path5.resolve(projectDir, config.server);
   yield* Effect29.logDebug(`Zipping server directory: ${serverDir}`);
   const code = yield* zipDirectory(serverDir);
-  const permissions = config.permissions ?? [];
+  const permissions = config.lambda?.permissions ?? [];
   const roleArn = yield* ensureRole(
     project,
     stage,
@@ -4765,8 +4778,8 @@ var deployApp = (input) => Effect29.gen(function* () {
     roleArn,
     code,
     handler: "index.handler",
-    memory: config.memory ?? 1024,
-    timeout: config.timeout ?? 30,
+    memory: config.lambda?.memory ?? 1024,
+    timeout: toSeconds3(config.lambda?.timeout ?? 30),
     tags: makeTags(tagCtx, "lambda"),
     environment: {
       EFF_PROJECT: project,
@@ -5282,6 +5295,7 @@ var deployStaticSite = (input) => Effect31.gen(function* () {
 
 // src/deploy/deploy-fifo-queue.ts
 import { Effect as Effect32 } from "effect";
+import { toSeconds as toSeconds4 } from "effortless-aws";
 var FIFO_QUEUE_DEFAULT_PERMISSIONS = ["sqs:*", "logs:*"];
 var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect32.gen(function* () {
   const { exportName, config } = fn13;
@@ -5293,11 +5307,12 @@ var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, d
   };
   yield* Effect32.logDebug("Creating SQS FIFO queue...");
   const queueName = `${input.project}-${tagCtx.stage}-${handlerName}`;
-  const timeout = config.timeout ?? 30;
+  const timeout = toSeconds4(config.lambda?.timeout ?? 30);
   const { queueUrl, queueArn } = yield* ensureFifoQueue({
     name: queueName,
-    visibilityTimeout: Math.max(config.visibilityTimeout ?? timeout, timeout),
-    retentionPeriod: config.retentionPeriod,
+    visibilityTimeout: Math.max(config.visibilityTimeout ? toSeconds4(config.visibilityTimeout) : timeout, timeout),
+    retentionPeriod: config.retentionPeriod ? toSeconds4(config.retentionPeriod) : void 0,
+    delay: config.delay ? toSeconds4(config.delay) : void 0,
     contentBasedDeduplication: config.contentBasedDeduplication ?? true,
     tags: makeTags(tagCtx, "sqs")
   });
@@ -5312,9 +5327,9 @@ var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, d
     handlerName,
     defaultPermissions: FIFO_QUEUE_DEFAULT_PERMISSIONS,
     bundleType: "fifoQueue",
-    ...config.permissions ? { permissions: config.permissions } : {},
-    ...config.memory ? { memory: config.memory } : {},
-    ...config.timeout ? { timeout: config.timeout } : {},
+    ...config.lambda?.permissions ? { permissions: config.lambda.permissions } : {},
+    ...config.lambda?.memory ? { memory: config.lambda.memory } : {},
+    ...config.lambda?.timeout ? { timeout: toSeconds4(config.lambda.timeout) } : {},
     ...layerArn ? { layerArn } : {},
     ...external ? { external } : {},
     depsEnv: queueEnv,
@@ -5326,7 +5341,7 @@ var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, d
     functionArn,
     queueArn,
     batchSize: config.batchSize ?? 10,
-    batchWindow: config.batchWindow
+    batchWindow: config.batchWindow ? toSeconds4(config.batchWindow) : void 0
   });
   yield* Effect32.logDebug(`FIFO queue deployment complete! Queue: ${queueUrl}`);
   return {
@@ -5340,6 +5355,7 @@ var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, d
 
 // src/deploy/deploy-bucket.ts
 import { Effect as Effect33 } from "effect";
+import { toSeconds as toSeconds5 } from "effortless-aws";
 var BUCKET_DEFAULT_PERMISSIONS = ["s3:*", "logs:*"];
 var deployBucketFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect33.gen(function* () {
   const { exportName, config, hasHandler } = fn13;
@@ -5372,9 +5388,9 @@ var deployBucketFunction = ({ input, fn: fn13, layerArn, external, depsEnv, deps
     handlerName,
     defaultPermissions: BUCKET_DEFAULT_PERMISSIONS,
     bundleType: "bucket",
-    ...config.permissions ? { permissions: config.permissions } : {},
-    ...config.memory ? { memory: config.memory } : {},
-    ...config.timeout ? { timeout: config.timeout } : {},
+    ...config.lambda?.permissions ? { permissions: config.lambda.permissions } : {},
+    ...config.lambda?.memory ? { memory: config.lambda.memory } : {},
+    ...config.lambda?.timeout ? { timeout: toSeconds5(config.lambda.timeout) } : {},
     ...layerArn ? { layerArn } : {},
     ...external ? { external } : {},
     depsEnv: selfEnv,
@@ -5541,6 +5557,11 @@ var SES_PERMISSIONS = [
   "ses:SendEmail",
   "ses:SendRawEmail"
 ];
+var QUEUE_CLIENT_PERMISSIONS = [
+  "sqs:SendMessage",
+  "sqs:SendMessageBatch",
+  "sqs:GetQueueUrl"
+];
 var buildMailerDomainMap = (mailerHandlers) => {
   const map = /* @__PURE__ */ new Map();
   for (const { exports } of mailerHandlers) {
@@ -5570,7 +5591,16 @@ var buildBucketNameMap = (bucketHandlers, project, stage) => {
   }
   return map;
 };
-var validateDeps = (discovered, tableNameMap, bucketNameMap, mailerDomainMap) => {
+var buildQueueNameMap = (fifoQueueHandlers, project, stage) => {
+  const map = /* @__PURE__ */ new Map();
+  for (const { exports } of fifoQueueHandlers) {
+    for (const fn13 of exports) {
+      map.set(fn13.exportName, `${project}-${stage}-${fn13.exportName}`);
+    }
+  }
+  return map;
+};
+var validateDeps = (discovered, tableNameMap, bucketNameMap, mailerDomainMap, queueNameMap) => {
   const errors = [];
   const allGroups = [
     ...discovered.apiHandlers,
@@ -5584,9 +5614,9 @@ var validateDeps = (discovered, tableNameMap, bucketNameMap, mailerDomainMap) =>
   for (const { exports } of allGroups) {
     for (const fn13 of exports) {
       for (const key of fn13.depsKeys) {
-        if (!tableNameMap.has(key) && !bucketNameMap.has(key) && !mailerDomainMap.has(key)) {
+        if (!tableNameMap.has(key) && !bucketNameMap.has(key) && !mailerDomainMap.has(key) && !queueNameMap.has(key)) {
           errors.push(
-            `Handler "${fn13.exportName}" depends on "${key}", but no matching table, bucket, or mailer handler was found. Make sure it is exported.`
+            `Handler "${fn13.exportName}" depends on "${key}", but no matching table, bucket, mailer, or queue handler was found. Make sure it is exported.`
           );
         }
       }
@@ -5594,12 +5624,13 @@ var validateDeps = (discovered, tableNameMap, bucketNameMap, mailerDomainMap) =>
   }
   return errors;
 };
-var resolveDeps = (depsKeys, tableNameMap, bucketNameMap, mailerDomainMap) => {
+var resolveDeps = (depsKeys, tableNameMap, bucketNameMap, mailerDomainMap, queueNameMap) => {
   if (depsKeys.length === 0) return void 0;
   const depsEnv = {};
   let hasTable = false;
   let hasBucket = false;
   let hasMailer = false;
+  let hasQueue = false;
   for (const key of depsKeys) {
     const tableName = tableNameMap.get(key);
     if (tableName) {
@@ -5617,6 +5648,12 @@ var resolveDeps = (depsKeys, tableNameMap, bucketNameMap, mailerDomainMap) => {
     if (mailerDomain) {
       depsEnv[`EFF_DEP_${key}`] = `mailer:${mailerDomain}`;
       hasMailer = true;
+      continue;
+    }
+    const queueName = queueNameMap.get(key);
+    if (queueName) {
+      depsEnv[`EFF_DEP_${key}`] = `queue:${queueName}`;
+      hasQueue = true;
     }
   }
   if (Object.keys(depsEnv).length === 0) return void 0;
@@ -5624,6 +5661,7 @@ var resolveDeps = (depsKeys, tableNameMap, bucketNameMap, mailerDomainMap) => {
   if (hasTable) permissions.push(...TABLE_CLIENT_PERMISSIONS);
   if (hasBucket) permissions.push(...BUCKET_CLIENT_PERMISSIONS);
   if (hasMailer) permissions.push(...SES_PERMISSIONS);
+  if (hasQueue) permissions.push(...QUEUE_CLIENT_PERMISSIONS);
   return { depsEnv, depsPermissions: permissions };
 };
 var SSM_PERMISSIONS = [
@@ -5654,7 +5692,7 @@ var makeDeployInput = (ctx, file) => ({
 });
 var resolveHandlerEnv = (depsKeys, paramEntries, ctx) => {
   const resolved = mergeResolved(
-    resolveDeps(depsKeys, ctx.tableNameMap, ctx.bucketNameMap, ctx.mailerDomainMap),
+    resolveDeps(depsKeys, ctx.tableNameMap, ctx.bucketNameMap, ctx.mailerDomainMap, ctx.queueNameMap),
     resolveParams(paramEntries, ctx.input.project, ctx.stage)
   );
   return {
@@ -5901,7 +5939,8 @@ var deployProject = (input) => Effect35.gen(function* () {
   const tableNameMap = buildTableNameMap(tableHandlers, input.project, stage);
   const bucketNameMap = buildBucketNameMap(bucketHandlers, input.project, stage);
   const mailerDomainMap = buildMailerDomainMap(mailerHandlers);
-  const depsErrors = validateDeps(discovered, tableNameMap, bucketNameMap, mailerDomainMap);
+  const queueNameMap = buildQueueNameMap(fifoQueueHandlers, input.project, stage);
+  const depsErrors = validateDeps(discovered, tableNameMap, bucketNameMap, mailerDomainMap, queueNameMap);
   if (depsErrors.length > 0) {
     yield* Console2.log("");
     for (const err of depsErrors) {
@@ -5948,6 +5987,7 @@ var deployProject = (input) => Effect35.gen(function* () {
     tableNameMap,
     bucketNameMap,
     mailerDomainMap,
+    queueNameMap,
     logComplete
   };
   const tableResults = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effortless-aws/cli",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "license": "MIT",
   "type": "module",
   "description": "CLI and deploy tooling for effortless-aws",
@@ -28,7 +28,7 @@
     "@aws-sdk/client-resource-groups-tagging-api": "^3.975.0",
     "@aws-sdk/client-s3": "^3.989.0",
     "@aws-sdk/client-sesv2": "^3.994.0",
-    "@aws-sdk/client-sqs": "^3.989.0",
+    "@aws-sdk/client-sqs": "3.989.0",
     "@aws-sdk/client-ssm": "^3.985.0",
     "@aws-sdk/util-dynamodb": "^3.975.0",
     "@effect/cli": "^0.73.1",
@@ -39,7 +39,7 @@
     "esbuild": "^0.25.0",
     "glob": "^13.0.0",
     "ts-morph": "^27.0.2",
-    "effortless-aws": "0.21.0"
+    "effortless-aws": "0.23.0"
   },
   "devDependencies": {
     "@effect-ak/aws-sdk": "1.0.0-rc.3",