skuba 6.2.0 → 7.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (133) hide show
  1. package/README.md +1 -1
  2. package/config/tsconfig.json +3 -1
  3. package/jest-preset.js +7 -1
  4. package/lib/api/buildkite/md.js.map +1 -1
  5. package/lib/api/git/currentBranch.js +2 -1
  6. package/lib/api/git/currentBranch.js.map +2 -2
  7. package/lib/api/git/findRoot.d.ts +9 -0
  8. package/lib/api/git/findRoot.js +52 -0
  9. package/lib/api/git/findRoot.js.map +7 -0
  10. package/lib/api/git/index.d.ts +1 -0
  11. package/lib/api/git/index.js +3 -0
  12. package/lib/api/git/index.js.map +2 -2
  13. package/lib/api/git/pull.js.map +1 -1
  14. package/lib/api/git/push.js.map +1 -1
  15. package/lib/api/git/remote.js +2 -1
  16. package/lib/api/git/remote.js.map +2 -2
  17. package/lib/api/git/reset.js.map +1 -1
  18. package/lib/api/github/checkRun.js.map +1 -1
  19. package/lib/api/github/environment.js.map +1 -1
  20. package/lib/api/github/issueComment.js.map +1 -1
  21. package/lib/api/github/pullRequest.js +3 -2
  22. package/lib/api/github/pullRequest.js.map +2 -2
  23. package/lib/api/github/push.js.map +1 -1
  24. package/lib/api/jest/index.d.ts +21 -21
  25. package/lib/api/net/compose.js.map +1 -1
  26. package/lib/api/net/socket.js.map +1 -1
  27. package/lib/cli/adapter/eslint.js.map +1 -1
  28. package/lib/cli/adapter/prettier.d.ts +8 -1
  29. package/lib/cli/adapter/prettier.js +20 -15
  30. package/lib/cli/adapter/prettier.js.map +2 -2
  31. package/lib/cli/build/assets.js +1 -1
  32. package/lib/cli/build/assets.js.map +2 -2
  33. package/lib/cli/build/esbuild.js +4 -0
  34. package/lib/cli/build/esbuild.js.map +2 -2
  35. package/lib/cli/build/tsc.js.map +1 -1
  36. package/lib/cli/configure/addEmptyExports.js +1 -1
  37. package/lib/cli/configure/addEmptyExports.js.map +2 -2
  38. package/lib/cli/configure/analyseDependencies.js +1 -1
  39. package/lib/cli/configure/analyseDependencies.js.map +2 -2
  40. package/lib/cli/configure/analysis/files.js.map +1 -1
  41. package/lib/cli/configure/analysis/package.js.map +1 -1
  42. package/lib/cli/configure/analysis/project.js +7 -3
  43. package/lib/cli/configure/analysis/project.js.map +2 -2
  44. package/lib/cli/configure/ensureTemplateCompletion.js +1 -1
  45. package/lib/cli/configure/ensureTemplateCompletion.js.map +2 -2
  46. package/lib/cli/configure/getEntryPoint.js +3 -0
  47. package/lib/cli/configure/getEntryPoint.js.map +3 -3
  48. package/lib/cli/configure/index.js.map +1 -1
  49. package/lib/cli/configure/modules/jest.js +2 -2
  50. package/lib/cli/configure/modules/jest.js.map +2 -2
  51. package/lib/cli/configure/modules/skubaDive.js.map +1 -1
  52. package/lib/cli/configure/modules/tsconfig.js.map +1 -1
  53. package/lib/cli/configure/patchRenovateConfig.js +6 -3
  54. package/lib/cli/configure/patchRenovateConfig.js.map +2 -2
  55. package/lib/cli/configure/patchServerListener.js +1 -1
  56. package/lib/cli/configure/patchServerListener.js.map +2 -2
  57. package/lib/cli/configure/processing/ignoreFile.js.map +1 -1
  58. package/lib/cli/configure/processing/javascript.js.map +1 -1
  59. package/lib/cli/configure/processing/json.d.ts +1 -1
  60. package/lib/cli/configure/processing/json.js.map +1 -1
  61. package/lib/cli/configure/processing/module.js.map +1 -1
  62. package/lib/cli/configure/processing/package.d.ts +2 -2
  63. package/lib/cli/configure/processing/prettier.d.ts +1 -1
  64. package/lib/cli/configure/processing/typescript.d.ts +2 -2
  65. package/lib/cli/configure/processing/typescript.js +14 -6
  66. package/lib/cli/configure/processing/typescript.js.map +2 -2
  67. package/lib/cli/configure/refreshIgnoreFiles.js.map +1 -1
  68. package/lib/cli/configure/types.d.ts +1 -1
  69. package/lib/cli/configure/types.js.map +1 -1
  70. package/lib/cli/init/getConfig.js +4 -1
  71. package/lib/cli/init/getConfig.js.map +2 -2
  72. package/lib/cli/init/git.js.map +1 -1
  73. package/lib/cli/init/index.js.map +1 -1
  74. package/lib/cli/init/prompts.js +1 -1
  75. package/lib/cli/init/prompts.js.map +2 -2
  76. package/lib/cli/init/writePackageJson.js +1 -1
  77. package/lib/cli/init/writePackageJson.js.map +2 -2
  78. package/lib/cli/lint/annotate/buildkite/prettier.js.map +2 -2
  79. package/lib/cli/lint/annotate/github/eslint.js.map +1 -1
  80. package/lib/cli/lint/annotate/github/index.js.map +1 -1
  81. package/lib/cli/lint/annotate/github/tsc.js +1 -1
  82. package/lib/cli/lint/annotate/github/tsc.js.map +2 -2
  83. package/lib/cli/lint/autofix.js.map +1 -1
  84. package/lib/cli/lint/external.js.map +1 -1
  85. package/lib/cli/lint/internal.js.map +1 -1
  86. package/lib/cli/lint/tsc.js.map +1 -1
  87. package/lib/cli/test/reporters/github/annotations.js +1 -1
  88. package/lib/cli/test/reporters/github/annotations.js.map +2 -2
  89. package/lib/cli/test/reporters/github/index.js.map +1 -1
  90. package/lib/cli/test/reporters/prettier/index.d.ts +4 -0
  91. package/lib/cli/test/reporters/prettier/index.js +67 -0
  92. package/lib/cli/test/reporters/prettier/index.js.map +7 -0
  93. package/lib/skuba.js +1 -0
  94. package/lib/skuba.js.map +2 -2
  95. package/lib/utils/args.d.ts +1 -1
  96. package/lib/utils/args.js.map +2 -2
  97. package/lib/utils/command.js +1 -1
  98. package/lib/utils/command.js.map +2 -2
  99. package/lib/utils/copy.js.map +1 -1
  100. package/lib/utils/dir.d.ts +1 -1
  101. package/lib/utils/dir.js +4 -4
  102. package/lib/utils/dir.js.map +2 -2
  103. package/lib/utils/exec.js.map +1 -1
  104. package/lib/utils/logging.js.map +1 -1
  105. package/lib/utils/logo.js.map +1 -1
  106. package/lib/utils/version.js.map +1 -1
  107. package/lib/utils/wait.js.map +1 -1
  108. package/lib/utils/worker.js.map +1 -1
  109. package/lib/wrapper/functionHandler.js.map +1 -1
  110. package/lib/wrapper/http.js.map +1 -1
  111. package/lib/wrapper/index.js.map +1 -1
  112. package/lib/wrapper/main.js.map +2 -2
  113. package/package.json +23 -20
  114. package/template/base/_.prettierignore +0 -13
  115. package/template/express-rest-api/.buildkite/pipeline.yml +1 -1
  116. package/template/express-rest-api/package.json +1 -1
  117. package/template/greeter/.buildkite/pipeline.yml +1 -1
  118. package/template/greeter/package.json +1 -1
  119. package/template/koa-rest-api/.buildkite/pipeline.yml +1 -1
  120. package/template/koa-rest-api/package.json +5 -5
  121. package/template/lambda-sqs-worker/.buildkite/pipeline.yml +2 -2
  122. package/template/lambda-sqs-worker/package.json +6 -6
  123. package/template/lambda-sqs-worker/src/app.test.ts +1 -1
  124. package/template/lambda-sqs-worker/src/app.ts +9 -4
  125. package/template/lambda-sqs-worker/src/framework/handler.test.ts +4 -4
  126. package/template/lambda-sqs-worker/src/framework/handler.ts +1 -1
  127. package/template/lambda-sqs-worker/src/testing/handler.ts +2 -2
  128. package/template/lambda-sqs-worker/src/testing/logging.ts +3 -0
  129. package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +2 -2
  130. package/template/lambda-sqs-worker-cdk/package.json +1 -1
  131. package/template/oss-npm-package/.github/workflows/release.yml +1 -0
  132. package/template/oss-npm-package/_package.json +4 -1
  133. package/template/private-npm-package/_package.json +1 -1
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/utils/version.ts"],
4
4
  "sourcesContent": ["import searchNpm from 'libnpmsearch';\nimport validatePackageName from 'validate-npm-package-name';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nexport const latestNpmVersion = async (\n packageName: string,\n): Promise<string> => {\n const { validForNewPackages } = validatePackageName(packageName);\n\n if (!validForNewPackages) {\n throw new Error(`Package \"${packageName}\" does not have a valid name`);\n }\n\n const [result] = await searchNpm(packageName, { limit: 1, timeout: 5_000 });\n\n if (result?.name !== packageName) {\n throw new Error(\n `Package \"${packageName}\" does not exist on the npm registry`,\n );\n }\n\n return result.version;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n try {\n const result = await withTimeout(latestNpmVersion('skuba'), { s: 2 });\n\n return result.ok ? result.value : null;\n } catch {\n return null;\n }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n const { version } = await getSkubaManifest();\n\n return version;\n};\n\ntype SkubaVersionInfo =\n | {\n isStale: true;\n\n local: string;\n latest: string;\n }\n | {\n isStale: false;\n\n local: string;\n latest: string | null;\n };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n const [local, latest] = await Promise.all([\n getSkubaVersion(),\n latestSkubaVersion(),\n ]);\n\n if (latest === null) {\n // Assume we're up to date if we can't reach the npm registry\n return {\n isStale: false,\n local,\n latest,\n };\n }\n\n return {\n isStale: latest !== local,\n local,\n latest,\n };\n};\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAsB;AACtB,uCAAgC;AAEhC,sBAAiC;AACjC,kBAA4B;AAErB,MAAM,mBAAmB,OAC9B,gBACoB;AACpB,QAAM,EAAE,oBAAoB,QAAI,iCAAAA,SAAoB,WAAW;AAE/D,MAAI,CAAC,qBAAqB;AACxB,UAAM,IAAI,MAAM,YAAY,yCAAyC;AAAA,EACvE;AAEA,QAAM,CAAC,MAAM,IAAI,UAAM,oBAAAC,SAAU,aAAa,EAAE,OAAO,GAAG,SAAS,IAAM,CAAC;AAE1E,MAAI,QAAQ,SAAS,aAAa;AAChC,UAAM,IAAI;AAAA,MACR,YAAY;AAAA,IACd;AAAA,EACF;AAEA,SAAO,OAAO;AAChB;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,iBAAiB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAE;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAsB;AACtB,uCAAgC;AAEhC,sBAAiC;AACjC,kBAA4B;AAErB,MAAM,mBAAmB,OAC9B,gBACoB;AACpB,QAAM,EAAE,oBAAoB,QAAI,iCAAAA,SAAoB,WAAW;AAE/D,MAAI,CAAC,qBAAqB;AACxB,UAAM,IAAI,MAAM,YAAY,WAAW,8BAA8B;AAAA,EACvE;AAEA,QAAM,CAAC,MAAM,IAAI,UAAM,oBAAAC,SAAU,aAAa,EAAE,OAAO,GAAG,SAAS,IAAM,CAAC;AAE1E,MAAI,QAAQ,SAAS,aAAa;AAChC,UAAM,IAAI;AAAA,MACR,YAAY,WAAW;AAAA,IACzB;AAAA,EACF;AAEA,SAAO,OAAO;AAChB;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,iBAAiB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
6
6
  "names": ["validatePackageName", "searchNpm"]
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/utils/wait.ts"],
4
4
  "sourcesContent": ["import { createTerseError } from './error';\nimport { pluralise } from './logging';\n\ninterface Timeout extends PromiseLike<void> {\n clear?: () => void;\n}\n\nexport const sleep = (ms: number): Timeout => {\n let timeout: NodeJS.Timeout;\n\n return Object.assign(\n new Promise<void>((resolve) => (timeout = setTimeout(resolve, ms))),\n { clear: () => clearTimeout(timeout) },\n );\n};\n\nexport const throwOnTimeout = async <T>(\n promise: PromiseLike<T>,\n { s }: { s: number },\n): Promise<T> => {\n const result = await withTimeout(promise, { s });\n\n if (!result.ok) {\n throw createTerseError(`Timed out after ${pluralise(s, 'second')}`);\n }\n\n return result.value;\n};\n\ntype TimeoutResult<T> = { ok: true; value: T } | { ok: false };\n\nexport const withTimeout = async <T>(\n promise: T | PromiseLike<T>,\n { s }: { s: number },\n): Promise<TimeoutResult<T>> => {\n const timeout = sleep(s * 1_000);\n\n try {\n return await Promise.race<TimeoutResult<T>>([\n Promise.resolve(promise).then((value) => ({ ok: true, value })),\n timeout.then(() => ({ ok: false })),\n ]);\n } finally {\n timeout.clear?.();\n }\n};\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,qBAA0B;AAMnB,MAAM,QAAQ,CAAC,OAAwB;AAC5C,MAAI;AAEJ,SAAO,OAAO;AAAA,IACZ,IAAI,QAAc,CAAC,YAAa,UAAU,WAAW,SAAS,EAAE,CAAE;AAAA,IAClE,EAAE,OAAO,MAAM,aAAa,OAAO,EAAE;AAAA,EACvC;AACF;AAEO,MAAM,iBAAiB,OAC5B,SACA,EAAE,EAAE,MACW;AACf,QAAM,SAAS,MAAM,YAAY,SAAS,EAAE,EAAE,CAAC;AAE/C,MAAI,CAAC,OAAO,IAAI;AACd,cAAM,+BAAiB,uBAAmB,0BAAU,GAAG,QAAQ,GAAG;AAAA,EACpE;AAEA,SAAO,OAAO;AAChB;AAIO,MAAM,cAAc,OACzB,SACA,EAAE,EAAE,MAC0B;AAC9B,QAAM,UAAU,MAAM,IAAI,GAAK;AAE/B,MAAI;AACF,WAAO,MAAM,QAAQ,KAAuB;AAAA,MAC1C,QAAQ,QAAQ,OAAO,EAAE,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,MAAM,EAAE;AAAA,MAC9D,QAAQ,KAAK,OAAO,EAAE,IAAI,MAAM,EAAE;AAAA,IACpC,CAAC;AAAA,EACH,UAAE;AACA,YAAQ,QAAQ;AAAA,EAClB;AACF;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,qBAA0B;AAMnB,MAAM,QAAQ,CAAC,OAAwB;AAC5C,MAAI;AAEJ,SAAO,OAAO;AAAA,IACZ,IAAI,QAAc,CAAC,YAAa,UAAU,WAAW,SAAS,EAAE,CAAE;AAAA,IAClE,EAAE,OAAO,MAAM,aAAa,OAAO,EAAE;AAAA,EACvC;AACF;AAEO,MAAM,iBAAiB,OAC5B,SACA,EAAE,EAAE,MACW;AACf,QAAM,SAAS,MAAM,YAAY,SAAS,EAAE,EAAE,CAAC;AAE/C,MAAI,CAAC,OAAO,IAAI;AACd,cAAM,+BAAiB,uBAAmB,0BAAU,GAAG,QAAQ,CAAC,EAAE;AAAA,EACpE;AAEA,SAAO,OAAO;AAChB;AAIO,MAAM,cAAc,OACzB,SACA,EAAE,EAAE,MAC0B;AAC9B,QAAM,UAAU,MAAM,IAAI,GAAK;AAE/B,MAAI;AACF,WAAO,MAAM,QAAQ,KAAuB;AAAA,MAC1C,QAAQ,QAAQ,OAAO,EAAE,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,MAAM,EAAE;AAAA,MAC9D,QAAQ,KAAK,OAAO,EAAE,IAAI,MAAM,EAAE;AAAA,IACpC,CAAC;AAAA,EACH,UAAE;AACA,YAAQ,QAAQ;AAAA,EAClB;AACF;",
6
6
  "names": []
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/utils/worker.ts"],
4
4
  "sourcesContent": ["import { inspect } from 'util';\nimport { Worker, parentPort, workerData } from 'worker_threads';\n\nimport { log } from './logging';\n\n/**\n * Executes a script at `filepath` in a Node.js worker thread.\n */\nexport const execWorkerThread = async <Input, Output>(\n filepath: string,\n input: Input,\n) => {\n let output: Output;\n let messageReceived = false;\n\n return new Promise<Output>((resolve, reject) =>\n new Worker(filepath, {\n workerData: input,\n })\n .on('error', reject)\n .on('exit', (code) =>\n messageReceived\n ? resolve(output)\n : reject(\n new Error(\n code\n ? `Worker thread failed with exit code ${code}`\n : 'Worker thread exited without posting a message',\n ),\n ),\n )\n .on('message', (message: Output) => {\n // Defer promise resolution to `exit` so stdio can settle.\n output = message;\n messageReceived = true;\n })\n .on('messageerror', (err) => reject(err)),\n );\n};\n\n/**\n * Runs a function in a Node.js worker thread context, forwarding the result\n * to the parent thread.\n */\nexport const postWorkerOutput = <Input, Output>(\n fn: (input: Input) => Promise<Output>,\n logger = log,\n) => {\n const port = parentPort;\n\n if (!port) {\n logger.err('`postWorkerOutput` called outside of a worker thread context');\n\n process.exit(1);\n }\n\n fn(workerData as Input)\n .then((output) => port.postMessage(output))\n .catch((err) => {\n logger.err(inspect(err));\n\n process.exit(1);\n });\n};\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AACxB,4BAA+C;AAE/C,qBAAoB;AAKb,MAAM,mBAAmB,OAC9B,UACA,UACG;AACH,MAAI;AACJ,MAAI,kBAAkB;AAEtB,SAAO,IAAI;AAAA,IAAgB,CAAC,SAAS,WACnC,IAAI,6BAAO,UAAU;AAAA,MACnB,YAAY;AAAA,IACd,CAAC,EACE,GAAG,SAAS,MAAM,EAClB;AAAA,MAAG;AAAA,MAAQ,CAAC,SACX,kBACI,QAAQ,MAAM,IACd;AAAA,QACE,IAAI;AAAA,UACF,OACI,uCAAuC,SACvC;AAAA,QACN;AAAA,MACF;AAAA,IACN,EACC,GAAG,WAAW,CAAC,YAAoB;AAElC,eAAS;AACT,wBAAkB;AAAA,IACpB,CAAC,EACA,GAAG,gBAAgB,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,EAC5C;AACF;AAMO,MAAM,mBAAmB,CAC9B,IACA,SAAS,uBACN;AACH,QAAM,OAAO;AAEb,MAAI,CAAC,MAAM;AACT,WAAO,IAAI,8DAA8D;AAEzE,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,KAAG,gCAAmB,EACnB,KAAK,CAAC,WAAW,KAAK,YAAY,MAAM,CAAC,EACzC,MAAM,CAAC,QAAQ;AACd,WAAO,QAAI,qBAAQ,GAAG,CAAC;AAEvB,YAAQ,KAAK,CAAC;AAAA,EAChB,CAAC;AACL;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AACxB,4BAA+C;AAE/C,qBAAoB;AAKb,MAAM,mBAAmB,OAC9B,UACA,UACG;AACH,MAAI;AACJ,MAAI,kBAAkB;AAEtB,SAAO,IAAI;AAAA,IAAgB,CAAC,SAAS,WACnC,IAAI,6BAAO,UAAU;AAAA,MACnB,YAAY;AAAA,IACd,CAAC,EACE,GAAG,SAAS,MAAM,EAClB;AAAA,MAAG;AAAA,MAAQ,CAAC,SACX,kBACI,QAAQ,MAAM,IACd;AAAA,QACE,IAAI;AAAA,UACF,OACI,uCAAuC,IAAI,KAC3C;AAAA,QACN;AAAA,MACF;AAAA,IACN,EACC,GAAG,WAAW,CAAC,YAAoB;AAElC,eAAS;AACT,wBAAkB;AAAA,IACpB,CAAC,EACA,GAAG,gBAAgB,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,EAC5C;AACF;AAMO,MAAM,mBAAmB,CAC9B,IACA,SAAS,uBACN;AACH,QAAM,OAAO;AAEb,MAAI,CAAC,MAAM;AACT,WAAO,IAAI,8DAA8D;AAEzE,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,KAAG,gCAAmB,EACnB,KAAK,CAAC,WAAW,KAAK,YAAY,MAAM,CAAC,EACzC,MAAM,CAAC,QAAQ;AACd,WAAO,QAAI,qBAAQ,GAAG,CAAC;AAEvB,YAAQ,KAAK,CAAC;AAAA,EAChB,CAAC;AACL;",
6
6
  "names": []
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/wrapper/functionHandler.ts"],
4
4
  "sourcesContent": ["import fnArgs from 'function-arguments';\n\nimport { log } from '../utils/logging';\nimport { isFunction, isObject } from '../utils/validation';\n\nimport {\n createRequestListenerFromFunction,\n serveRequestListener,\n} from './http';\n\ninterface Args {\n availablePort?: number;\n entryPoint: unknown;\n functionName: string;\n}\n\n/**\n * Create an HTTP server that calls into an exported function.\n */\nexport const runFunctionHandler = async ({\n availablePort,\n entryPoint,\n functionName,\n}: Args): Promise<void> => {\n if (!isObject(entryPoint)) {\n log.subtle(log.bold(functionName), 'is not exported');\n return;\n }\n\n const fn = entryPoint[functionName];\n\n if (!isFunction(fn)) {\n log.subtle(log.bold(functionName), 'is not a function');\n return;\n }\n\n log.warn(\n log.bold(functionName),\n `(${fnArgs(fn)\n // Add a `?` placeholder for unnamed arguments.\n .map((arg) => arg || '?')\n .join(', ')})`,\n );\n\n const requestListener = createRequestListenerFromFunction(fn);\n\n return serveRequestListener(requestListener, availablePort);\n};\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAmB;AAEnB,qBAAoB;AACpB,wBAAqC;AAErC,kBAGO;AAWA,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,KAAC,4BAAS,UAAU,GAAG;AACzB,uBAAI,OAAO,mBAAI,KAAK,YAAY,GAAG,iBAAiB;AACpD;AAAA,EACF;AAEA,QAAM,KAAK,WAAW,YAAY;AAElC,MAAI,KAAC,8BAAW,EAAE,GAAG;AACnB,uBAAI,OAAO,mBAAI,KAAK,YAAY,GAAG,mBAAmB;AACtD;AAAA,EACF;AAEA,qBAAI;AAAA,IACF,mBAAI,KAAK,YAAY;AAAA,IACrB,QAAI,0BAAAA,SAAO,EAAE,EAEV,IAAI,CAAC,QAAQ,OAAO,GAAG,EACvB,KAAK,IAAI;AAAA,EACd;AAEA,QAAM,sBAAkB,+CAAkC,EAAE;AAE5D,aAAO,kCAAqB,iBAAiB,aAAa;AAC5D;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAmB;AAEnB,qBAAoB;AACpB,wBAAqC;AAErC,kBAGO;AAWA,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,KAAC,4BAAS,UAAU,GAAG;AACzB,uBAAI,OAAO,mBAAI,KAAK,YAAY,GAAG,iBAAiB;AACpD;AAAA,EACF;AAEA,QAAM,KAAK,WAAW,YAAY;AAElC,MAAI,KAAC,8BAAW,EAAE,GAAG;AACnB,uBAAI,OAAO,mBAAI,KAAK,YAAY,GAAG,mBAAmB;AACtD;AAAA,EACF;AAEA,qBAAI;AAAA,IACF,mBAAI,KAAK,YAAY;AAAA,IACrB,QAAI,0BAAAA,SAAO,EAAE,EAEV,IAAI,CAAC,QAAQ,OAAO,GAAG,EACvB,KAAK,IAAI,CAAC;AAAA,EACf;AAEA,QAAM,sBAAkB,+CAAkC,EAAE;AAE5D,aAAO,kCAAqB,iBAAiB,aAAa;AAC5D;",
6
6
  "names": ["fnArgs"]
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/wrapper/http.ts"],
4
4
  "sourcesContent": ["import http from 'http';\nimport type { AddressInfo } from 'net';\n\nimport { serializeError } from 'serialize-error';\n\nimport { log } from '../utils/logging';\n\n/**\n * Create an HTTP request listener based on the supplied function.\n *\n * - The request body is JSON parsed and passed into the function as parameters.\n * - The function's return value is JSON stringified into the response body.\n */\nexport const createRequestListenerFromFunction =\n (\n fn: (...args: unknown[]) => unknown | Promise<unknown>,\n ): http.RequestListener =>\n async (req, res) => {\n const writeJsonResponse = (statusCode: number, jsonResponse: unknown) => {\n res.writeHead(statusCode, { 'Content-Type': 'application/json' });\n\n return new Promise<void>((resolve, reject) =>\n jsonResponse === undefined\n ? res.end(resolve)\n : res.write(JSON.stringify(jsonResponse, null, 2), 'utf8', (err) =>\n err ? reject(err) : res.end(resolve),\n ),\n );\n };\n\n try {\n const requestBody = await new Promise<string>((resolve, reject) => {\n const data: Buffer[] = [];\n\n req\n .on('data', (chunk: Buffer) => data.push(chunk))\n .on('end', () => resolve(Buffer.concat(data).toString()))\n .on('error', (err) => reject(err));\n });\n\n // Treat an empty body as no arguments\n const jsonRequest: unknown = requestBody ? JSON.parse(requestBody) : [];\n\n // Pass a non-array request body as the first parameter\n const args: unknown[] = Array.isArray(jsonRequest)\n ? jsonRequest\n : [jsonRequest];\n\n const response: unknown = await fn(...args);\n\n await writeJsonResponse(200, response);\n } catch (err) {\n await writeJsonResponse(500, serializeError(err));\n }\n };\n\n/**\n * Create a HTTP server based on the supplied `http.RequestListener`.\n *\n * This function resolves when the server is closed.\n */\nexport const serveRequestListener = (\n requestListener: http.RequestListener,\n port?: number,\n) => {\n const server = http.createServer(requestListener);\n return startServer(server, port);\n};\n\n/**\n * Returns a HTTP server wrapped in a promise\n *\n * This function resolves when the server is closed.\n */\nexport const startServer = (server: http.Server, port?: number) =>\n new Promise<void>((resolve, reject) =>\n server\n .listen(port)\n .on('close', resolve)\n .on('error', reject)\n .on('listening', () => {\n const address = server.address() as AddressInfo;\n\n log.ok('listening on port', log.bold(address.port));\n }),\n );\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAGjB,6BAA+B;AAE/B,qBAAoB;AAQb,MAAM,oCACX,CACE,OAEF,OAAO,KAAK,QAAQ;AAClB,QAAM,oBAAoB,CAAC,YAAoB,iBAA0B;AACvE,QAAI,UAAU,YAAY,EAAE,gBAAgB,mBAAmB,CAAC;AAEhE,WAAO,IAAI;AAAA,MAAc,CAAC,SAAS,WACjC,iBAAiB,SACb,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,QAAM,KAAK,UAAU,cAAc,MAAM,CAAC;AAAA,QAAG;AAAA,QAAQ,CAAC,QACxD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,MACrC;AAAA,IACN;AAAA,EACF;AAEA,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,UAAM,kBAAkB,KAAK,QAAQ;AAAA,EACvC,SAAS,KAAP;AACA,UAAM,kBAAkB,SAAK,uCAAe,GAAG,CAAC;AAAA,EAClD;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAA,QAAK,aAAa,eAAe;AAChD,SAAO,YAAY,QAAQ,IAAI;AACjC;AAOO,MAAM,cAAc,CAAC,QAAqB,SAC/C,IAAI;AAAA,EAAc,CAAC,SAAS,WAC1B,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,UAAM,UAAU,OAAO,QAAQ;AAE/B,uBAAI,GAAG,qBAAqB,mBAAI,KAAK,QAAQ,IAAI,CAAC;AAAA,EACpD,CAAC;AACL;",
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAGjB,6BAA+B;AAE/B,qBAAoB;AAQb,MAAM,oCACX,CACE,OAEF,OAAO,KAAK,QAAQ;AAClB,QAAM,oBAAoB,CAAC,YAAoB,iBAA0B;AACvE,QAAI,UAAU,YAAY,EAAE,gBAAgB,mBAAmB,CAAC;AAEhE,WAAO,IAAI;AAAA,MAAc,CAAC,SAAS,WACjC,iBAAiB,SACb,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,QAAM,KAAK,UAAU,cAAc,MAAM,CAAC;AAAA,QAAG;AAAA,QAAQ,CAAC,QACxD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,MACrC;AAAA,IACN;AAAA,EACF;AAEA,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,UAAM,kBAAkB,KAAK,QAAQ;AAAA,EACvC,SAAS,KAAK;AACZ,UAAM,kBAAkB,SAAK,uCAAe,GAAG,CAAC;AAAA,EAClD;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAA,QAAK,aAAa,eAAe;AAChD,SAAO,YAAY,QAAQ,IAAI;AACjC;AAOO,MAAM,cAAc,CAAC,QAAqB,SAC/C,IAAI;AAAA,EAAc,CAAC,SAAS,WAC1B,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,UAAM,UAAU,OAAO,QAAQ;AAE/B,uBAAI,GAAG,qBAAqB,mBAAI,KAAK,QAAQ,IAAI,CAAC;AAAA,EACpD,CAAC;AACL;",
6
6
  "names": ["http"]
7
7
  }
@@ -2,6 +2,6 @@
2
2
  "version": 3,
3
3
  "sources": ["../../src/wrapper/index.ts"],
4
4
  "sourcesContent": ["/**\n * Wrapper around an entry point provided to `skuba node` or `skuba start`.\n *\n * Beyond simply loading the entry point, it supports the following features:\n *\n * - If you set the entry point to an exported function like `src/app#handler`,\n * it will spin up a local HTTP server that calls into the function.\n *\n * - If you `export =` or `export default` an Express or Koa application,\n * it will spin up a local HTTP server based on the request listener.\n */\n\nimport { handleCliError } from '../utils/error';\nimport { log } from '../utils/logging';\n\nimport { main } from './main';\n\nconst ENTRY_POINT_VAR = '__SKUBA_ENTRY_POINT';\nconst PORT_VAR = '__SKUBA_PORT';\n\nconst rawEntryPoint = process.env[ENTRY_POINT_VAR];\nif (!rawEntryPoint) {\n throw new Error(`Missing environment variable: ${log.bold(ENTRY_POINT_VAR)}`);\n}\n\nconst rawPort = process.env[PORT_VAR];\nif (!rawPort) {\n throw new Error(`Missing environment variable: ${log.bold(PORT_VAR)}`);\n}\n\nmain(rawEntryPoint, rawPort).catch(handleCliError);\n"],
5
- "mappings": ";AAYA,mBAA+B;AAC/B,qBAAoB;AAEpB,kBAAqB;AAErB,MAAM,kBAAkB;AACxB,MAAM,WAAW;AAEjB,MAAM,gBAAgB,QAAQ,IAAI,eAAe;AACjD,IAAI,CAAC,eAAe;AAClB,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,eAAe,GAAG;AAC9E;AAEA,MAAM,UAAU,QAAQ,IAAI,QAAQ;AACpC,IAAI,CAAC,SAAS;AACZ,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,QAAQ,GAAG;AACvE;AAAA,IAEA,kBAAK,eAAe,OAAO,EAAE,MAAM,2BAAc;",
5
+ "mappings": ";AAYA,mBAA+B;AAC/B,qBAAoB;AAEpB,kBAAqB;AAErB,MAAM,kBAAkB;AACxB,MAAM,WAAW;AAEjB,MAAM,gBAAgB,QAAQ,IAAI,eAAe;AACjD,IAAI,CAAC,eAAe;AAClB,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,eAAe,CAAC,EAAE;AAC9E;AAEA,MAAM,UAAU,QAAQ,IAAI,QAAQ;AACpC,IAAI,CAAC,SAAS;AACZ,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,QAAQ,CAAC,EAAE;AACvE;AAAA,IAEA,kBAAK,eAAe,OAAO,EAAE,MAAM,2BAAc;",
6
6
  "names": []
7
7
  }
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/wrapper/main.ts"],
4
- "sourcesContent": ["import path from 'path';\n\nimport { runFunctionHandler } from './functionHandler';\nimport { runRequestListener } from './requestListener';\n\nexport const main = async (rawEntryPoint: string, rawPort: string) => {\n const availablePort = Number(rawPort) || undefined;\n\n // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n const [modulePath, functionName] = path\n .join(process.cwd(), rawEntryPoint)\n .split('#', 2);\n\n // Load entry point as module\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n const entryPoint = require(modulePath) as unknown;\n\n return functionName\n ? runFunctionHandler({ availablePort, entryPoint, functionName })\n : runRequestListener({ availablePort, entryPoint });\n};\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ,UAAU;AAErC,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
4
+ "sourcesContent": ["import path from 'path';\n\nimport { runFunctionHandler } from './functionHandler';\nimport { runRequestListener } from './requestListener';\n\nexport const main = async (rawEntryPoint: string, rawPort: string) => {\n const availablePort = Number(rawPort) || undefined;\n\n // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n const [modulePath, functionName] = path\n .join(process.cwd(), rawEntryPoint)\n .split('#', 2);\n\n // Load entry point as module\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n const entryPoint = require(modulePath as string) as unknown;\n\n return functionName\n ? runFunctionHandler({ availablePort, entryPoint, functionName })\n : runRequestListener({ availablePort, entryPoint });\n};\n"],
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ,UAAoB;AAE/C,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
6
6
  "names": ["path"]
7
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "skuba",
3
- "version": "6.2.0",
3
+ "version": "7.0.1",
4
4
  "private": false,
5
5
  "description": "SEEK development toolkit for backend applications and packages",
6
6
  "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -65,25 +65,25 @@
65
65
  ]
66
66
  },
67
67
  "resolutions": {
68
- "**/@types/node": ">=16.11"
68
+ "**/@types/node": ">=18.12"
69
69
  },
70
70
  "dependencies": {
71
71
  "@esbuild-plugins/tsconfig-paths": "^0.1.0",
72
72
  "@jest/types": "^29.0.0",
73
- "@octokit/graphql": "^5.0.0",
73
+ "@octokit/graphql": "^7.0.0",
74
74
  "@octokit/graphql-schema": "^14.5.0",
75
- "@octokit/rest": "^19.0.8",
76
- "@octokit/types": "^9.0.0",
75
+ "@octokit/rest": "^20.0.0",
76
+ "@octokit/types": "^11.0.0",
77
77
  "@types/jest": "^29.0.0",
78
- "@types/node": ">=16.11",
78
+ "@types/node": ">=18.12",
79
79
  "chalk": "^4.1.0",
80
80
  "concurrently": "^8.0.0",
81
81
  "dotenv": "^16.0.0",
82
82
  "ejs": "^3.1.6",
83
83
  "enquirer": "^2.3.6",
84
- "esbuild": "~0.17.0",
84
+ "esbuild": "~0.18.0",
85
85
  "eslint": "^8.11.0",
86
- "eslint-config-skuba": "2.0.2",
86
+ "eslint-config-skuba": "2.0.4",
87
87
  "execa": "^5.0.0",
88
88
  "fdir": "^6.0.0",
89
89
  "fs-extra": "^11.0.0",
@@ -102,10 +102,10 @@
102
102
  "npm-run-path": "^4.0.1",
103
103
  "npm-which": "^3.0.1",
104
104
  "picomatch": "^2.2.2",
105
- "prettier": "~2.8.5",
105
+ "prettier": "~3.0.0",
106
106
  "read-pkg-up": "^7.0.1",
107
107
  "runtypes": "^6.0.0",
108
- "semantic-release": "^19.0.0",
108
+ "semantic-release": "^21.0.0",
109
109
  "serialize-error": "^8.0.1",
110
110
  "simple-git": "^3.5.0",
111
111
  "sort-package-json": "^1.57.0",
@@ -115,14 +115,14 @@
115
115
  "ts-node": "^10.7.0",
116
116
  "ts-node-dev": "^2.0.0",
117
117
  "tsconfig-paths": "^4.0.0",
118
- "tsconfig-seek": "1.0.2",
119
- "typescript": "~5.0.0",
118
+ "tsconfig-seek": "2.0.0",
119
+ "typescript": "~5.1.5",
120
120
  "validate-npm-package-name": "^5.0.0"
121
121
  },
122
122
  "devDependencies": {
123
- "@changesets/cli": "2.26.1",
123
+ "@changesets/cli": "2.26.2",
124
124
  "@changesets/get-github-info": "0.5.2",
125
- "@jest/reporters": "29.5.0",
125
+ "@jest/reporters": "29.6.1",
126
126
  "@types/ejs": "3.1.2",
127
127
  "@types/express": "4.17.17",
128
128
  "@types/fs-extra": "11.0.1",
@@ -134,15 +134,15 @@
134
134
  "@types/picomatch": "2.3.0",
135
135
  "@types/supertest": "2.0.12",
136
136
  "@types/validate-npm-package-name": "4.0.0",
137
- "enhanced-resolve": "5.13.0",
137
+ "enhanced-resolve": "5.15.0",
138
138
  "express": "4.18.2",
139
- "fastify": "4.17.0",
139
+ "fastify": "4.19.2",
140
140
  "jsonfile": "6.1.0",
141
141
  "koa": "2.14.2",
142
- "memfs": "3.5.1",
142
+ "memfs": "4.2.0",
143
143
  "remark-cli": "11.0.0",
144
- "remark-preset-lint-recommended": "6.1.2",
145
- "semver": "7.5.0",
144
+ "remark-preset-lint-recommended": "6.1.3",
145
+ "semver": "7.5.4",
146
146
  "supertest": "6.3.3",
147
147
  "type-fest": "2.19.0"
148
148
  },
@@ -155,7 +155,10 @@
155
155
  }
156
156
  },
157
157
  "engines": {
158
- "node": ">=16.11"
158
+ "node": ">=18.12"
159
+ },
160
+ "publishConfig": {
161
+ "provenance": true
159
162
  },
160
163
  "skuba": {
161
164
  "build": "esbuild",
@@ -1,17 +1,4 @@
1
1
  # managed by skuba
2
- .idea/*
3
- .vscode/*
4
-
5
- .cdk.staging/
6
- .serverless/
7
- cdk.out/
8
- node_modules*/
9
-
10
- /coverage*/
11
- /dist*/
12
- /lib*/
13
- /tmp*/
14
-
15
2
  # Gantry resource files support non-standard template syntax
16
3
  /.gantry/**/*.yaml
17
4
  /.gantry/**/*.yml
@@ -51,7 +51,7 @@ steps:
51
51
  - *aws-sm
52
52
  - *private-npm
53
53
  - *docker-ecr-cache
54
- - docker-compose#v4.12.0:
54
+ - docker-compose#v4.14.0:
55
55
  run: app
56
56
  timeout_in_minutes: 10
57
57
 
@@ -25,6 +25,6 @@
25
25
  "supertest": "^6.1.6"
26
26
  },
27
27
  "engines": {
28
- "node": ">=18"
28
+ "node": ">=18.12"
29
29
  }
30
30
  }
@@ -32,6 +32,6 @@ steps:
32
32
  - *aws-sm
33
33
  - *private-npm
34
34
  - *docker-ecr-cache
35
- - docker-compose#v4.12.0:
35
+ - docker-compose#v4.14.0:
36
36
  run: app
37
37
  timeout_in_minutes: 10
@@ -19,6 +19,6 @@
19
19
  "skuba": "*"
20
20
  },
21
21
  "engines": {
22
- "node": ">=18"
22
+ "node": ">=18.12"
23
23
  }
24
24
  }
@@ -51,7 +51,7 @@ steps:
51
51
  - *aws-sm
52
52
  - *private-npm
53
53
  - *docker-ecr-cache
54
- - docker-compose#v4.12.0:
54
+ - docker-compose#v4.14.0:
55
55
  run: app
56
56
  timeout_in_minutes: 10
57
57
 
@@ -14,10 +14,10 @@
14
14
  "dependencies": {
15
15
  "@koa/router": "^12.0.0",
16
16
  "@opentelemetry/api": "^1.1.0",
17
- "@opentelemetry/exporter-trace-otlp-grpc": "^0.39.0",
18
- "@opentelemetry/instrumentation-aws-sdk": "^0.34.0",
19
- "@opentelemetry/instrumentation-http": "^0.39.0",
20
- "@opentelemetry/sdk-node": "^0.39.0",
17
+ "@opentelemetry/exporter-trace-otlp-grpc": "^0.41.0",
18
+ "@opentelemetry/instrumentation-aws-sdk": "^0.35.0",
19
+ "@opentelemetry/instrumentation-http": "^0.41.0",
20
+ "@opentelemetry/sdk-node": "^0.41.0",
21
21
  "@seek/logger": "^6.0.0",
22
22
  "aws-sdk": "^2.1039.0",
23
23
  "hot-shots": "^10.0.0",
@@ -42,6 +42,6 @@
42
42
  "supertest": "^6.1.6"
43
43
  },
44
44
  "engines": {
45
- "node": ">=18"
45
+ "node": ">=18.12"
46
46
  }
47
47
  }
@@ -32,7 +32,7 @@ configs:
32
32
  - *aws-sm
33
33
  - *private-npm
34
34
  - *docker-ecr-cache
35
- - docker-compose#v4.12.0:
35
+ - docker-compose#v4.14.0:
36
36
  dependencies: false
37
37
  run: app
38
38
  retry:
@@ -60,7 +60,7 @@ steps:
60
60
  - *aws-sm
61
61
  - *private-npm
62
62
  - *docker-ecr-cache
63
- - docker-compose#v4.12.0:
63
+ - docker-compose#v4.14.0:
64
64
  run: app
65
65
  timeout_in_minutes: 10
66
66
 
@@ -14,9 +14,9 @@
14
14
  "test:watch": "skuba test --watch"
15
15
  },
16
16
  "dependencies": {
17
- "@aws-sdk/client-codedeploy": "^3.259.0",
18
- "@aws-sdk/client-lambda": "^3.259.0",
19
- "@aws-sdk/client-sns": "^3.259.0",
17
+ "@aws-sdk/client-codedeploy": "^3.363.0",
18
+ "@aws-sdk/client-lambda": "^3.363.0",
19
+ "@aws-sdk/client-sns": "^3.363.0",
20
20
  "@aws-sdk/util-utf8-node": "^3.259.0",
21
21
  "@seek/logger": "^6.0.0",
22
22
  "datadog-lambda-js": "^7.0.0",
@@ -28,8 +28,8 @@
28
28
  "@types/aws-lambda": "^8.10.84",
29
29
  "@types/chance": "^1.1.3",
30
30
  "@types/node": "^18.11.9",
31
- "aws-sdk-client-mock": "^2.0.1",
32
- "aws-sdk-client-mock-jest": "^2.0.1",
31
+ "aws-sdk-client-mock": "^3.0.0",
32
+ "aws-sdk-client-mock-jest": "^3.0.0",
33
33
  "chance": "^1.1.8",
34
34
  "pino-pretty": "^10.0.0",
35
35
  "serverless": "^3.25.0",
@@ -39,6 +39,6 @@
39
39
  "skuba": "*"
40
40
  },
41
41
  "engines": {
42
- "node": ">=18"
42
+ "node": ">=18.12"
43
43
  }
44
44
  }
@@ -47,7 +47,7 @@ describe('handler', () => {
47
47
 
48
48
  expect(logger.error).not.toHaveBeenCalled();
49
49
 
50
- expect(logger.info.mock.calls).toEqual([
50
+ expect(logger.debug.mock.calls).toEqual([
51
51
  [{ count: 1 }, 'Received jobs'],
52
52
  [{ snsMessageId: expect.any(String) }, 'Scored job'],
53
53
  ['Function succeeded'],
@@ -20,7 +20,7 @@ const smokeTest = async () => {
20
20
  export const handler = createHandler<SQSEvent>(async (event) => {
21
21
  // Treat an empty object as our smoke test event.
22
22
  if (!Object.keys(event).length) {
23
- logger.info('Received smoke test request');
23
+ logger.debug('Received smoke test request');
24
24
  return smokeTest();
25
25
  }
26
26
 
@@ -30,23 +30,28 @@ export const handler = createHandler<SQSEvent>(async (event) => {
30
30
  throw Error(`Received ${count} records`);
31
31
  }
32
32
 
33
- logger.info({ count }, 'Received jobs');
33
+ logger.debug({ count }, 'Received jobs');
34
34
 
35
35
  metricsClient.distribution('job.received', event.Records.length);
36
36
 
37
37
  const record = event.Records[0];
38
+ if (!record) {
39
+ throw new Error('Malformed SQS event with no records');
40
+ }
41
+
42
+ const { body } = record;
38
43
 
39
44
  // TODO: this throws an error, which will cause the Lambda function to retry
40
45
  // the event and eventually send it to your dead-letter queue. If you don't
41
46
  // trust your source to provide consistently well-formed input, consider
42
47
  // catching and handling this error in code.
43
- const publishedJob = validateJson(record.body, JobPublishedEventSchema);
48
+ const publishedJob = validateJson(body, JobPublishedEventSchema);
44
49
 
45
50
  const scoredJob = await scoreJobPublishedEvent(publishedJob);
46
51
 
47
52
  const snsMessageId = await sendPipelineEvent(scoredJob);
48
53
 
49
- logger.info({ snsMessageId }, 'Scored job');
54
+ logger.debug({ snsMessageId }, 'Scored job');
50
55
 
51
56
  metricsClient.distribution('job.scored', 1);
52
57
  });
@@ -18,7 +18,7 @@ describe('createHandler', () => {
18
18
  const handler = createHandler((event) => {
19
19
  expect(event).toBe(input);
20
20
 
21
- logger.info('Handler invoked');
21
+ logger.debug('Handler invoked');
22
22
 
23
23
  return Promise.resolve(output);
24
24
  });
@@ -27,7 +27,7 @@ describe('createHandler', () => {
27
27
 
28
28
  expect(logger.error).not.toHaveBeenCalled();
29
29
 
30
- expect(logger.info.mock.calls).toEqual([
30
+ expect(logger.debug.mock.calls).toEqual([
31
31
  ['Handler invoked'],
32
32
  ['Function succeeded'],
33
33
  ]);
@@ -42,7 +42,7 @@ describe('createHandler', () => {
42
42
 
43
43
  expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
44
44
 
45
- expect(logger.info).not.toHaveBeenCalled();
45
+ expect(logger.debug).not.toHaveBeenCalled();
46
46
  });
47
47
 
48
48
  it('handles sync error', async () => {
@@ -56,6 +56,6 @@ describe('createHandler', () => {
56
56
 
57
57
  expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
58
58
 
59
- expect(logger.info).not.toHaveBeenCalled();
59
+ expect(logger.debug).not.toHaveBeenCalled();
60
60
  });
61
61
  });
@@ -31,7 +31,7 @@ export const createHandler = <Event, Output = unknown>(
31
31
  try {
32
32
  const output = await fn(event);
33
33
 
34
- logger.info('Function succeeded');
34
+ logger.debug('Function succeeded');
35
35
 
36
36
  return output;
37
37
  } catch (err) {
@@ -5,9 +5,9 @@ import { chance } from './types';
5
5
  export const createCtx = () =>
6
6
  ({
7
7
  awsRequestId: chance.guid({ version: 4 }),
8
- } as Context);
8
+ }) as Context;
9
9
 
10
10
  export const createSqsEvent = (bodies: string[]) =>
11
11
  ({
12
12
  Records: bodies.map((body) => ({ body })),
13
- } as SQSEvent);
13
+ }) as SQSEvent;
@@ -3,14 +3,17 @@ import * as logging from 'src/framework/logging';
3
3
  export const logger = {
4
4
  error: jest.fn(),
5
5
  info: jest.fn(),
6
+ debug: jest.fn(),
6
7
 
7
8
  clear: () => {
8
9
  logger.error.mockClear();
9
10
  logger.info.mockClear();
11
+ logger.debug.mockClear();
10
12
  },
11
13
 
12
14
  spy: () => {
13
15
  jest.spyOn(logging.logger, 'error').mockImplementation(logger.error);
14
16
  jest.spyOn(logging.logger, 'info').mockImplementation(logger.info);
17
+ jest.spyOn(logging.logger, 'debug').mockImplementation(logger.debug);
15
18
  },
16
19
  };
@@ -32,7 +32,7 @@ configs:
32
32
  - *aws-sm
33
33
  - *private-npm
34
34
  - *docker-ecr-cache
35
- - docker-compose#v4.12.0:
35
+ - docker-compose#v4.14.0:
36
36
  dependencies: false
37
37
  run: app
38
38
  retry:
@@ -57,7 +57,7 @@ steps:
57
57
  - *aws-sm
58
58
  - *private-npm
59
59
  - *docker-ecr-cache
60
- - docker-compose#v4.12.0:
60
+ - docker-compose#v4.14.0:
61
61
  run: app
62
62
  timeout_in_minutes: 10
63
63
 
@@ -25,6 +25,6 @@
25
25
  "skuba": "*"
26
26
  },
27
27
  "engines": {
28
- "node": ">=18"
28
+ "node": ">=18.12"
29
29
  }
30
30
  }
@@ -13,6 +13,7 @@ jobs:
13
13
  name: Publish & Deploy
14
14
  permissions:
15
15
  contents: write
16
+ id-token: write
16
17
  runs-on: ubuntu-latest
17
18
  steps:
18
19
  - name: Check out repo
@@ -39,6 +39,9 @@
39
39
  "skuba": "*"
40
40
  },
41
41
  "engines": {
42
- "node": ">=16.11"
42
+ "node": ">=18.12"
43
+ },
44
+ "publishConfig": {
45
+ "provenance": true
43
46
  }
44
47
  }
@@ -39,6 +39,6 @@
39
39
  "skuba": "*"
40
40
  },
41
41
  "engines": {
42
- "node": ">=16.11"
42
+ "node": ">=18.12"
43
43
  }
44
44
  }