skuba 12.1.0-hoist-less-20250722131939 → 12.1.0-no-sync-in-promise-iterable-20250801105434

package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/index.d.ts

@@ -0,0 +1,2 @@
+import type { Patches } from '../../index.js';
+export declare const patches: Patches;

package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/index.js

@@ -0,0 +1,35 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __exports = {};
+__export(__exports, {
+  patches: () => patches
+});
+module.exports = __toCommonJS(__exports);
+var import_unhandledRejections = require("./unhandledRejections.js");
+const patches = [
+  {
+    apply: import_unhandledRejections.tryPatchUnhandledRejections,
+    description: "Add event handler to log unhandled promise rejections instead of crashing the process"
+  }
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patches
+});
+//# sourceMappingURL=index.js.map

package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.0.2/index.ts"],
+  "sourcesContent": ["import type { Patches } from '../../index.js';\n\nimport { tryPatchUnhandledRejections } from './unhandledRejections.js';\n\nexport const patches: Patches = [\n  {\n    apply: tryPatchUnhandledRejections,\n    description:\n      'Add event handler to log unhandled promise rejections instead of crashing the process',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,iCAA4C;AAErC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AACF;",
+  "names": []
+}

package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.d.ts

@@ -0,0 +1,4 @@
+import type { PatchFunction } from '../../index.js';
+export declare const IMPORT_REGEX: RegExp;
+export declare const NAMED_EXPORT_REGEX: RegExp;
+export declare const tryPatchUnhandledRejections: PatchFunction;

package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.js

@@ -0,0 +1,162 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var unhandledRejections_exports = {};
+__export(unhandledRejections_exports, {
+  IMPORT_REGEX: () => IMPORT_REGEX,
+  NAMED_EXPORT_REGEX: () => NAMED_EXPORT_REGEX,
+  tryPatchUnhandledRejections: () => tryPatchUnhandledRejections
+});
+module.exports = __toCommonJS(unhandledRejections_exports);
+var import_path = __toESM(require("path"));
+var import_util = require("util");
+var import_fast_glob = require("fast-glob");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_error = require("../../../../../../utils/error.js");
+var import_logging = require("../../../../../../utils/logging.js");
+var import_prettier = require("../../../../../configure/processing/prettier.js");
+const addListener = (identifier) => `
+// Report unhandled rejections instead of crashing the process
+// Make sure to monitor these reports and alert as appropriate
+process.on('unhandledRejection', (err) =>
+  ${identifier}.error(err, 'Unhandled promise rejection'),
+);
+`.trim();
+const tryReadFilesSequentially = async (filepaths) => {
+  for (const filepath of filepaths) {
+    try {
+      const contents = await import_fs_extra.default.promises.readFile(filepath, "utf8");
+      return { contents, filepath };
+    } catch (err) {
+      if ((0, import_error.isErrorWithCode)(err, "ENOENT")) {
+        continue;
+      }
+      throw err;
+    }
+  }
+  return;
+};
+const IMPORT_REGEX = /import\s+(?:\{\s*(\w*[Ll]ogger)(?:\s+as\s+(\w*[Ll]ogger))?\s*\}|(\w*[Ll]ogger))\s+from\s+['"][^'"]+\/(?:logger|logging)(?:\.js)?['"]/u;
+const NAMED_EXPORT_REGEX = /export\s+(?:const\s+|\{[^{}]*)\b(\w*[Ll]ogger)\b/u;
+const findLogger = async ({
+  contents,
+  root
+}) => {
+  const importResult = IMPORT_REGEX.exec(contents);
+  {
+    const identifier = importResult?.[3] ?? importResult?.[2] ?? importResult?.[1];
+    if (identifier) {
+      return { identifier };
+    }
+  }
+  const loggerPaths = await (0, import_fast_glob.glob)("**/{logger,logging}.ts", {
+    cwd: root,
+    ignore: ["**/.git", "**/node_modules"]
+  });
+  const loggingModule = await tryReadFilesSequentially(loggerPaths);
+  if (!loggingModule) {
+    return { identifier: "console" };
+  }
+  const parsedPath = import_path.default.parse(import_path.default.relative(root, loggingModule.filepath));
+  const importPath = import_path.default.join(parsedPath.dir, parsedPath.name);
+  const namedExportResult = NAMED_EXPORT_REGEX.exec(loggingModule.contents);
+  if (namedExportResult?.[1]) {
+    const identifier = namedExportResult[1];
+    return {
+      identifier: namedExportResult[1],
+      import: `import { ${identifier} } from '${importPath}';`
+    };
+  }
+  if (loggingModule.contents.includes("export default")) {
+    return {
+      identifier: "logger",
+      import: `import logger from '${importPath}';`
+    };
+  }
+  return { identifier: "console" };
+};
+const patchUnhandledRejections = async (mode) => {
+  const filepaths = await (0, import_fast_glob.glob)("**/src/listen.ts", {
+    ignore: ["**/.git", "**/node_modules"]
+  });
+  let hasPatched = false;
+  for (const filepath of filepaths) {
+    const contents = await import_fs_extra.default.promises.readFile(filepath, "utf8");
+    if (contents.includes("unhandledRejection")) {
+      import_logging.log.subtle(
+        "Skipping entry point that appears to have an unhandled rejection listener:",
+        filepath
+      );
+      continue;
+    }
+    const root = import_path.default.dirname(import_path.default.dirname(filepath));
+    const logger = await findLogger({ contents, root });
+    import_logging.log.subtle(
+      "Logging unhandled rejections to",
+      logger.identifier,
+      "in file:",
+      filepath
+    );
+    const patched = [
+      contents,
+      ...[logger.import ? [logger.import] : []],
+      addListener(logger.identifier)
+    ].join("\n\n");
+    const newContents = await (0, import_prettier.formatPrettier)(patched, { parser: "typescript" });
+    if (mode === "lint") {
+      return { result: "apply" };
+    }
+    await import_fs_extra.default.promises.writeFile(filepath, newContents);
+    hasPatched = true;
+  }
+  if (hasPatched) {
+    return { result: "apply" };
+  }
+  return {
+    result: "skip",
+    reason: "no applicable src/listen.ts entry points found"
+  };
+};
+const tryPatchUnhandledRejections = async ({
+  mode
+}) => {
+  try {
+    return await patchUnhandledRejections(mode);
+  } catch (err) {
+    import_logging.log.warn("Failed to patch listeners for unhandled promise rejections");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  IMPORT_REGEX,
+  NAMED_EXPORT_REGEX,
+  tryPatchUnhandledRejections
+});
+//# sourceMappingURL=unhandledRejections.js.map

package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.ts"],
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from '../../../../../../utils/error.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport { formatPrettier } from '../../../../../configure/processing/prettier.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst addListener = (identifier: string) =>\n  `\n// Report unhandled rejections instead of crashing the process\n// Make sure to monitor these reports and alert as appropriate\nprocess.on('unhandledRejection', (err) =>\n  ${identifier}.error(err, 'Unhandled promise rejection'),\n);\n`.trim();\n\nconst tryReadFilesSequentially = async (\n  filepaths: string[],\n): Promise<{ contents: string; filepath: string } | undefined> => {\n  for (const filepath of filepaths) {\n    try {\n      const contents = await fs.promises.readFile(filepath, 'utf8');\n\n      return { contents, filepath };\n    } catch (err) {\n      if (isErrorWithCode(err, 'ENOENT')) {\n        continue;\n      }\n\n      throw err;\n    }\n  }\n\n  return;\n};\n\nexport const IMPORT_REGEX =\n  /import\\s+(?:\\{\\s*(\\w*[Ll]ogger)(?:\\s+as\\s+(\\w*[Ll]ogger))?\\s*\\}|(\\w*[Ll]ogger))\\s+from\\s+['\"][^'\"]+\\/(?:logger|logging)(?:\\.js)?['\"]/u;\n\nexport const NAMED_EXPORT_REGEX =\n  /export\\s+(?:const\\s+|\\{[^{}]*)\\b(\\w*[Ll]ogger)\\b/u;\n\nconst findLogger = async ({\n  contents,\n  root,\n}: {\n  contents: string;\n  root: string;\n}): Promise<{ identifier: string; import?: string }> => {\n  const importResult = IMPORT_REGEX.exec(contents);\n\n  {\n    const identifier =\n      importResult?.[3] ?? importResult?.[2] ?? importResult?.[1];\n\n    if (identifier) {\n      return { identifier };\n    }\n  }\n\n  const loggerPaths = await glob('**/{logger,logging}.ts', {\n    cwd: root,\n    ignore: ['**/.git', '**/node_modules'],\n  });\n\n  const loggingModule = await tryReadFilesSequentially(loggerPaths);\n\n  if (!loggingModule) {\n    return { identifier: 'console' };\n  }\n\n  const parsedPath = path.parse(path.relative(root, loggingModule.filepath));\n\n  const importPath = path.join(parsedPath.dir, parsedPath.name);\n\n  const namedExportResult = NAMED_EXPORT_REGEX.exec(loggingModule.contents);\n\n  if (namedExportResult?.[1]) {\n    const identifier = namedExportResult[1];\n\n    return {\n      identifier: namedExportResult[1],\n      import: `import { ${identifier} } from '${importPath}';`,\n    };\n  }\n\n  if (loggingModule.contents.includes('export default')) {\n    return {\n      identifier: 'logger',\n      import: `import logger from '${importPath}';`,\n    };\n  }\n\n  return { identifier: 'console' };\n};\n\nconst patchUnhandledRejections = async (\n  mode: 'format' | 'lint',\n): Promise<PatchReturnType> => {\n  const filepaths = await glob('**/src/listen.ts', {\n    ignore: ['**/.git', '**/node_modules'],\n  });\n\n  let hasPatched = false;\n\n  for (const filepath of filepaths) {\n    const contents = await fs.promises.readFile(filepath, 'utf8');\n\n    if (contents.includes('unhandledRejection')) {\n      log.subtle(\n        'Skipping entry point that appears to have an unhandled rejection listener:',\n        filepath,\n      );\n      continue;\n    }\n\n    const root = path.dirname(path.dirname(filepath));\n\n    const logger = await findLogger({ contents, root });\n\n    log.subtle(\n      'Logging unhandled rejections to',\n      logger.identifier,\n      'in file:',\n      filepath,\n    );\n\n    const patched = [\n      contents,\n\n      ...[logger.import ? [logger.import] : []],\n\n      addListener(logger.identifier),\n    ].join('\\n\\n');\n\n    const newContents = await formatPrettier(patched, { parser: 'typescript' });\n\n    if (mode === 'lint') {\n      return { result: 'apply' };\n    }\n\n    await fs.promises.writeFile(filepath, newContents);\n\n    hasPatched = true;\n  }\n\n  if (hasPatched) {\n    return { result: 'apply' };\n  }\n\n  return {\n    result: 'skip',\n    reason: 'no applicable src/listen.ts entry points found',\n  };\n};\n\nexport const tryPatchUnhandledRejections: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  try {\n    return await patchUnhandledRejections(mode);\n  } catch (err) {\n    log.warn('Failed to patch listeners for unhandled promise rejections');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["fs", "path"]
+}

package/lib/cli/node/index.js

@@ -44,8 +44,8 @@ const node = async () => {
   const availablePort = await (0, import_get_port.default)();
   const commonArgs = [
     ...args.node,
-    "--require",
-    require.resolve("dotenv/config"),
+    "--env-file-if-exists",
+    ".env",
     "--require",
     require.resolve("tsconfig-paths/register")
   ];

package/lib/cli/node/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/node/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n  const args = parseRunArgs(process.argv.slice(2));\n\n  const availablePort = await getPort();\n\n  const commonArgs = [\n    ...args.node,\n    '--require',\n    require.resolve('dotenv/config'),\n    '--require',\n    require.resolve('tsconfig-paths/register'),\n  ];\n\n  if (args.entryPoint) {\n    const exec = createExec({\n      env: {\n        __SKUBA_ENTRY_POINT: args.entryPoint,\n        __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n      },\n    });\n\n    return exec(\n      'tsx',\n      ...commonArgs,\n      path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n      ...args.script,\n    );\n  }\n\n  return execa(\n    require.resolve('tsx/cli'),\n    [\n      ...commonArgs,\n      '--require',\n      // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n      // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n      require.resolve('tsx/patch-repl'),\n    ],\n    {\n      stdio: 'inherit',\n    },\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AAElB,MAAM,cAAc;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAE/C,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,QAAM,aAAa;AAAA,IACjB,GAAG,KAAK;AAAA,IACR;AAAA,IACA,gBAAgB,eAAe;AAAA,IAC/B;AAAA,IACA,gBAAgB,yBAAyB;AAAA,EAC3C;AAEA,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAED,WAAO;AAAA,MACL;AAAA,MACA,GAAG;AAAA,MACH,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,MACtD,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAEA,aAAO,aAAAC;AAAA,IACL,gBAAgB,SAAS;AAAA,IACzB;AAAA,MACE,GAAG;AAAA,MACH;AAAA;AAAA;AAAA,MAGA,gBAAgB,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IACT;AAAA,EACF;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n  const args = parseRunArgs(process.argv.slice(2));\n\n  const availablePort = await getPort();\n\n  const commonArgs = [\n    ...args.node,\n    '--env-file-if-exists',\n    '.env',\n    '--require',\n    require.resolve('tsconfig-paths/register'),\n  ];\n\n  if (args.entryPoint) {\n    const exec = createExec({\n      env: {\n        __SKUBA_ENTRY_POINT: args.entryPoint,\n        __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n      },\n    });\n\n    return exec(\n      'tsx',\n      ...commonArgs,\n      path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n      ...args.script,\n    );\n  }\n\n  return execa(\n    require.resolve('tsx/cli'),\n    [\n      ...commonArgs,\n      '--require',\n      // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n      // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n      require.resolve('tsx/patch-repl'),\n    ],\n    {\n      stdio: 'inherit',\n    },\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AAElB,MAAM,cAAc;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAE/C,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,QAAM,aAAa;AAAA,IACjB,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB,yBAAyB;AAAA,EAC3C;AAEA,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAED,WAAO;AAAA,MACL;AAAA,MACA,GAAG;AAAA,MACH,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,MACtD,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAEA,aAAO,aAAAC;AAAA,IACL,gBAAgB,SAAS;AAAA,IACzB;AAAA,MACE,GAAG;AAAA,MACH;AAAA;AAAA;AAAA,MAGA,gBAAgB,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": ["getPort", "path", "execa"]
 }

package/lib/cli/start/index.js

@@ -54,8 +54,8 @@ const start = async () => {
     "watch",
     "--clear-screen=false",
     ...args.node,
-    "--require",
-    "dotenv/config",
+    "--env-file-if-exists",
+    ".env",
     "--require",
     "tsconfig-paths/register",
     import_path.default.join(__dirname, "..", "..", "wrapper", "index.js"),

package/lib/cli/start/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/start/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { getEntryPointFromManifest } from '../../utils/manifest.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n    ...args.script,\n  );\n};\n"],
+  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { getEntryPointFromManifest } from '../../utils/manifest.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    '--env-file-if-exists',\n    '.env',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n    ...args.script,\n  );\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,IACtD,GAAG,KAAK;AAAA,EACV;AACF;",
   "names": ["getPort", "path"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "12.1.0-hoist-less-20250722131939",
+  "version": "12.1.0-no-sync-in-promise-iterable-20250801105434",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -61,7 +61,6 @@
     "@types/node": "^22.0.0",
     "chalk": "^4.1.0",
     "concurrently": "^9.0.0",
-    "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "esbuild": "~0.25.0",
@@ -97,8 +96,8 @@
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
     "typescript": "~5.8.0",
-    "zod": "^3.25.67",
-    "eslint-config-skuba": "7.0.2"
+    "zod": "^4.0.0",
+    "eslint-config-skuba": "7.1.0-no-sync-in-promise-iterable-20250801105434"
   },
   "devDependencies": {
     "@changesets/cli": "2.29.5",
@@ -108,7 +107,7 @@
     "@types/ejs": "3.1.5",
     "@types/express": "5.0.3",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "2.15.0",
+    "@types/koa": "3.0.0",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
@@ -122,7 +121,7 @@
     "fastify": "5.4.0",
     "jest-diff": "30.0.4",
     "jsonfile": "6.1.0",
-    "koa": "3.0.0",
+    "koa": "3.0.1",
     "memfs": "4.17.2",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
@@ -149,7 +148,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "11.1.0"
+    "version": "12.0.2"
   },
   "scripts": {
     "build": "scripts/build.sh",

package/template/express-rest-api/package.json

@@ -28,7 +28,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.13.1",
   "engines": {
     "node": ">=22"
   }

package/template/express-rest-api/src/listen.ts

@@ -21,3 +21,9 @@ const listener = app.listen(config.port, () => {
 // https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout
 // AWS recommends setting an application timeout larger than the load balancer
 listener.keepAliveTimeout = 31000;
+
+// Report unhandled rejections instead of crashing the process
+// Make sure to monitor these reports and alert as appropriate
+process.on('unhandledRejection', (err) =>
+  logger.error(err, 'Unhandled promise rejection'),
+);

package/template/greeter/package.json

@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "12.1.0-hoist-less-20250722131939"
+    "skuba": "12.1.0-no-sync-in-promise-iterable-20250801105434"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.13.1",
   "engines": {
     "node": ">=22"
   }

package/template/koa-rest-api/package.json

@@ -24,17 +24,17 @@
     "@opentelemetry/sdk-node": "^0.203.0",
     "@seek/logger": "^10.0.0",
     "hot-shots": "^10.0.0",
-    "koa": "^2.16.1",
+    "koa": "^3.0.1",
     "koa-compose": "^4.1.0",
     "seek-datadog-custom-metrics": "^4.6.3",
-    "seek-koala": "^7.0.0",
+    "seek-koala": "^7.1.0",
     "skuba-dive": "^2.0.0",
-    "zod": "^3.25.67"
+    "zod": "^4.0.0"
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
     "@types/co-body": "^6.1.3",
-    "@types/koa": "^2.13.4",
+    "@types/koa": "^3.0.0",
     "@types/koa__router": "^12.0.0",
     "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.13.1",
   "engines": {
     "node": ">=22"
   }

package/template/koa-rest-api/src/listen.ts

@@ -22,3 +22,9 @@ const listener = app.listen(config.port, () => {
 // https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout
 // AWS recommends setting an application timeout larger than the load balancer
 listener.keepAliveTimeout = 31000;
+
+// Report unhandled rejections instead of crashing the process
+// Make sure to monitor these reports and alert as appropriate
+process.on('unhandledRejection', (err) =>
+  logger.error(err, 'Unhandled promise rejection'),
+);

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`returns expected CloudFormation stack for dev 1`] = `
 {
@@ -332,6 +332,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
     },
     "workerAliasLiveSqsEventSourceappStackworkerqueue8281B9F443B0CF93": {
       "Properties": {
+        "BatchSize": 10,
         "EventSourceArn": {
           "Fn::GetAtt": [
             "workerqueueA05CE5C6",
@@ -359,6 +360,12 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             ],
           ],
         },
+        "FunctionResponseTypes": [
+          "ReportBatchItemFailures",
+        ],
+        "ScalingConfig": {
+          "MaximumConcurrency": 2,
+        },
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -1065,6 +1072,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
     },
     "workerAliasLiveSqsEventSourceappStackworkerqueue8281B9F443B0CF93": {
       "Properties": {
+        "BatchSize": 10,
         "EventSourceArn": {
           "Fn::GetAtt": [
             "workerqueueA05CE5C6",
@@ -1092,6 +1100,12 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             ],
           ],
         },
+        "FunctionResponseTypes": [
+          "ReportBatchItemFailures",
+        ],
+        "ScalingConfig": {
+          "MaximumConcurrency": 20,
+        },
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -141,7 +141,11 @@ export class AppStack extends Stack {
     });
 
     workerDeployment.alias.addEventSource(
-      new aws_lambda_event_sources.SqsEventSource(queue),
+      new aws_lambda_event_sources.SqsEventSource(queue, {
+        maxConcurrency: config.workerLambda.reservedConcurrency,
+        batchSize: config.workerLambda.batchSize,
+        reportBatchItemFailures: true,
+      }),
     );
   }
 }

package/template/lambda-sqs-worker-cdk/infra/config.ts

@@ -9,6 +9,7 @@ const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
 interface Config {
   appName: string;
   workerLambda: {
+    batchSize: number;
     reservedConcurrency: number;
     environment: {
       ENVIRONMENT: Environment;
@@ -24,6 +25,7 @@ const configs: Record<Environment, Config> = {
   dev: {
     appName: '<%- serviceName %>',
     workerLambda: {
+      batchSize: 10,
       reservedConcurrency: 2,
       environment: {
         ENVIRONMENT: 'dev',
@@ -37,6 +39,7 @@ const configs: Record<Environment, Config> = {
   prod: {
     appName: '<%- serviceName %>',
     workerLambda: {
+      batchSize: 10,
       reservedConcurrency: 20,
       environment: {
         ENVIRONMENT: 'prod',

package/template/lambda-sqs-worker-cdk/package.json

@@ -22,7 +22,7 @@
     "datadog-lambda-js": "^10.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
-    "zod": "^3.25.67"
+    "zod": "^4.0.0"
   },
   "devDependencies": {
     "@seek/aws-codedeploy-infra": "^3.0.0",
@@ -37,9 +37,9 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "12.1.0-hoist-less-20250722131939"
+    "skuba": "12.1.0-no-sync-in-promise-iterable-20250801105434"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.13.1",
   "engines": {
     "node": ">=22"
   }

package/template/lambda-sqs-worker-cdk/src/app.test.ts

@@ -1,4 +1,5 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
+import type { SQSBatchResponse } from 'aws-lambda';
 
 import { metricsClient } from 'src/framework/metrics.js';
 import { createCtx, createSqsEvent } from 'src/testing/handler.js';
@@ -40,42 +41,100 @@ describe('handler', () => {
   it('handles one record', async () => {
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toBeUndefined();
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+      batchItemFailures: [],
+    });
 
     expect(scoringService.request).toHaveBeenCalledTimes(1);
 
     expect(stdoutMock.calls).toMatchObject([
+      { count: 1, level: 20, msg: 'Received jobs' },
       {
-        awsRequestId: '-',
-        count: 1,
         level: 20,
-        msg: 'Received jobs',
+        msg: 'Scored job',
+        snsMessageId: expect.any(String),
+        sqsMessageId: event.Records[0]!.messageId,
       },
+      { level: 20, msg: 'Function completed' },
+    ]);
+
+    expect(distribution.mock.calls).toEqual([
+      ['job.received', 1],
+      ['job.scored', 1],
+    ]);
+
+    expect(sns.client).toReceiveCommandTimes(PublishCommand, 1);
+  });
+
+  it('handles multiple records', async () => {
+    const event = createSqsEvent([
+      JSON.stringify(jobPublished),
+      JSON.stringify(jobPublished),
+    ]);
+
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+      batchItemFailures: [],
+    });
+
+    expect(stdoutMock.calls).toMatchObject([
+      { count: 2, level: 20, msg: 'Received jobs' },
       {
-        awsRequestId: '-',
         level: 20,
         msg: 'Scored job',
         snsMessageId: expect.any(String),
+        sqsMessageId: event.Records[0]!.messageId,
       },
       {
-        awsRequestId: '-',
         level: 20,
-        msg: 'Function succeeded',
+        msg: 'Scored job',
+        snsMessageId: expect.any(String),
+        sqsMessageId: event.Records[1]!.messageId,
       },
+      { level: 20, msg: 'Function completed' },
     ]);
+  });
 
-    expect(distribution.mock.calls).toEqual([
-      ['job.received', 1],
-      ['job.scored', 1],
+  it('handles partial batch failure', async () => {
+    const event = createSqsEvent([
+      JSON.stringify('}'),
+      JSON.stringify(jobPublished),
     ]);
 
-    expect(sns.client).toReceiveCommandTimes(PublishCommand, 1);
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+      batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
+    });
+
+    expect(stdoutMock.calls).toMatchObject([
+      { count: 2, level: 20, msg: 'Received jobs' },
+      {
+        err: {
+          name: 'ZodError',
+          type: 'ZodError',
+        },
+        level: 50,
+        msg: 'Processing record failed',
+        sqsMessageId: event.Records[0]!.messageId,
+      },
+      {
+        level: 20,
+        msg: 'Scored job',
+        snsMessageId: expect.any(String),
+        sqsMessageId: event.Records[1]!.messageId,
+      },
+      { level: 20, msg: 'Function completed' },
+    ]);
   });
 
-  it('throws on invalid input', () => {
+  it('returns a batchItemFailure on invalid input', () => {
     const event = createSqsEvent(['}']);
 
-    return expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
+    return expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+      batchItemFailures: [
+        {
+          itemIdentifier: event.Records[0]!.messageId,
+        },
+      ],
+    });
   });
 
   it('bubbles up scoring service error', async () => {
@@ -85,24 +144,22 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+      batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
+    });
 
     expect(stdoutMock.calls).toMatchObject([
+      { count: 1, level: 20, msg: 'Received jobs' },
       {
-        awsRequestId: '-',
-        count: 1,
-        level: 20,
-        msg: 'Received jobs',
-      },
-      {
-        awsRequestId: '-',
         err: {
           message: err.message,
           type: 'Error',
         },
         level: 50,
-        msg: 'Function failed',
+        msg: 'Processing record failed',
+        sqsMessageId: event.Records[0]!.messageId,
       },
+      { level: 20, msg: 'Function completed' },
     ]);
   });
 
@@ -113,23 +170,28 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+      batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
+    });
 
     expect(stdoutMock.calls).toMatchObject([
       {
-        awsRequestId: '-',
         count: 1,
         level: 20,
         msg: 'Received jobs',
       },
       {
-        awsRequestId: '-',
         err: {
           message: err.message,
           type: 'Error',
         },
         level: 50,
-        msg: 'Function failed',
+        msg: 'Processing record failed',
+        sqsMessageId: event.Records[0]!.messageId,
+      },
+      {
+        level: 20,
+        msg: 'Function completed',
       },
     ]);
   });
@@ -141,7 +203,6 @@ describe('handler', () => {
 
     expect(stdoutMock.calls).toMatchObject([
       {
-        awsRequestId: '-',
         err: {
           message: 'Received 0 records',
           type: 'Error',
@@ -151,25 +212,4 @@ describe('handler', () => {
       },
     ]);
   });
-
-  it('throws on multiple records', async () => {
-    const event = createSqsEvent([
-      JSON.stringify(jobPublished),
-      JSON.stringify(jobPublished),
-    ]);
-
-    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
-
-    expect(stdoutMock.calls).toMatchObject([
-      {
-        awsRequestId: '-',
-        err: {
-          message: 'Received 2 records',
-          type: 'Error',
-        },
-        level: 50,
-        msg: 'Function failed',
-      },
-    ]);
-  });
 });

package/template/lambda-sqs-worker-cdk/src/app.ts

@@ -3,7 +3,7 @@ import 'skuba-dive/register';
 import { isLambdaHook } from '@seek/aws-codedeploy-hooks';
 import type { SQSEvent } from 'aws-lambda';
 
-import { createHandler } from 'src/framework/handler.js';
+import { createBatchSQSHandler, createHandler } from 'src/framework/handler.js';
 import { logger } from 'src/framework/logging.js';
 import { metricsClient } from 'src/framework/metrics.js';
 import { validateJson } from 'src/framework/validation.js';
@@ -36,19 +36,17 @@ export const handler = createHandler<SQSEvent>(async (event, ctx) => {
 
   const count = event.Records.length;
 
-  if (count !== 1) {
-    throw Error(`Received ${count} records`);
+  if (!count) {
+    throw Error('Received 0 records');
   }
-
   logger.debug({ count }, 'Received jobs');
 
-  metricsClient.distribution('job.received', event.Records.length);
+  metricsClient.distribution('job.received', count);
 
-  const record = event.Records[0];
-  if (!record) {
-    throw new Error('Malformed SQS event with no records');
-  }
+  return recordHandler(event, ctx);
+});
 
+const recordHandler = createBatchSQSHandler(async (record, _ctx) => {
   const { body } = record;
 
   // TODO: this throws an error, which will cause the Lambda function to retry

package/template/lambda-sqs-worker-cdk/src/framework/handler.test.ts

@@ -1,3 +1,5 @@
+import type { SQSEvent } from 'aws-lambda';
+
 import { createCtx } from 'src/testing/handler.js';
 import { chance } from 'src/testing/types.js';
 
@@ -6,12 +8,14 @@ import { logger, stdoutMock } from './logging.js';
 
 describe('createHandler', () => {
   const ctx = createCtx();
-  const input = chance.paragraph();
+  const input: SQSEvent = {
+    Records: [],
+  };
 
   afterEach(stdoutMock.clear);
 
   it('handles happy path', async () => {
-    const output = chance.paragraph();
+    const output = chance.sentence();
 
     const handler = createHandler((event) => {
       expect(event).toBe(input);
@@ -32,7 +36,8 @@ describe('createHandler', () => {
       {
         awsRequestId: '-',
         level: 20,
-        msg: 'Function succeeded',
+        output,
+        msg: 'Function completed',
       },
     ]);
   });

package/template/lambda-sqs-worker-cdk/src/framework/handler.ts

@@ -1,8 +1,14 @@
-import type { Context as LambdaContext } from 'aws-lambda';
+import type {
+  Context as LambdaContext,
+  SQSBatchItemFailure,
+  SQSBatchResponse,
+  SQSEvent,
+  SQSRecord,
+} from 'aws-lambda';
 import { datadog } from 'datadog-lambda-js';
 
 import { config } from 'src/config.js';
-import { logger, loggerContext } from 'src/framework/logging.js';
+import { lambdaContext, logger, recordContext } from 'src/framework/logging.js';
 
 type Handler<Event, Output> = (
   event: Event,
@@ -20,15 +26,15 @@ const withDatadog = <Event, Output = unknown>(
   // istanbul ignore next
   config.metrics ? (datadog(fn) as Handler<Event, Output>) : fn;
 
-export const createHandler = <Event, Output = unknown>(
+export const createHandler = <Event extends SQSEvent, Output = unknown>(
   fn: (event: Event, ctx: LambdaContext) => Promise<Output>,
 ) =>
   withDatadog<Event>((event, ctx) =>
-    loggerContext.run({ awsRequestId: ctx.awsRequestId }, async () => {
+    lambdaContext.run({ awsRequestId: ctx.awsRequestId }, async () => {
       try {
         const output = await fn(event, ctx);
 
-        logger.debug('Function succeeded');
+        logger.debug({ output }, 'Function completed');
 
         return output;
       } catch (err) {
@@ -38,3 +44,30 @@ export const createHandler = <Event, Output = unknown>(
       }
     }),
   );
+
+export const createBatchSQSHandler =
+  (
+    fn: (record: SQSRecord, ctx: LambdaContext) => Promise<unknown>,
+  ): Handler<SQSEvent, SQSBatchResponse> =>
+  async (event, ctx) => {
+    const processRecord = (
+      record: SQSRecord,
+    ): Promise<SQSBatchItemFailure | undefined> =>
+      recordContext.run({ sqsMessageId: record.messageId }, async () => {
+        try {
+          await fn(record, ctx);
+          return;
+        } catch (err) {
+          logger.error({ err }, 'Processing record failed');
+          return {
+            itemIdentifier: record.messageId,
+          };
+        }
+      });
+
+    const results = await Promise.all(event.Records.map(processRecord));
+
+    return {
+      batchItemFailures: results.filter((item) => item !== undefined),
+    };
+  };

package/template/lambda-sqs-worker-cdk/src/framework/logging.ts

@@ -4,11 +4,16 @@ import createLogger, { createDestination } from '@seek/logger';
 
 import { config } from 'src/config.js';
 
-interface LoggerContext {
+interface LambdaContext {
   awsRequestId: string;
 }
 
-export const loggerContext = new AsyncLocalStorage<LoggerContext>();
+interface RecordContext {
+  sqsMessageId: string;
+}
+
+export const lambdaContext = new AsyncLocalStorage<LambdaContext>();
+export const recordContext = new AsyncLocalStorage<RecordContext>();
 
 const { destination, stdoutMock } = createDestination({
   mock: config.environment === 'test' && {
@@ -27,7 +32,10 @@ export const logger = createLogger(
 
     level: config.logLevel,
 
-    mixin: () => ({ ...loggerContext.getStore() }),
+    mixin: () => ({
+      ...lambdaContext.getStore(),
+      ...recordContext.getStore(),
+    }),
 
     name: config.name,
 

package/template/lambda-sqs-worker-cdk/src/testing/handler.ts

@@ -9,5 +9,8 @@ export const createCtx = () =>
 
 export const createSqsEvent = (bodies: string[]) =>
   ({
-    Records: bodies.map((body) => ({ body })),
+    Records: bodies.map((body) => ({
+      body,
+      messageId: chance.guid({ version: 4 }),
+    })),
   }) as SQSEvent;