skuba 9.0.0-main-20240928020811 → 9.0.0-main-20240929024119

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.js

@@ -57,10 +57,14 @@ const collapseDuplicateMergeKeys = async ({
 };
 const collapseDuplicateMergeKeysInFile = (input) => replaceAllUntilStable(
   input,
-  /^([ \-]*)<<: \[?(\*[^\n\]]+)\]?$\n^( *)<<: \[?(\*[^\n\]]+)\]?$/gm,
-  (match, a, b, c, d) => {
-    if (a.length === c.length) {
-      return `${a}<<: [${b}, ${d}]`;
+  /^([ \-]*)<<: \[?(\*[^\n#\]]+)\]?(\s*#.*)?$\n^( *)<<: \[?(\*[^\n#\]]+)\]?(\s*#.*)?$/gm,
+  (match, prefixA, keyA, commentA, prefixB, keyB, commentB) => {
+    if (prefixA.length === prefixB.length) {
+      return [
+        ...commentA ? [`${" ".repeat(prefixA.length)}${commentA.trim()}`] : [],
+        ...commentB ? [`${" ".repeat(prefixA.length)}${commentB.trim()}`] : [],
+        `${prefixA}<<: [${keyA.trim()}, ${keyB.trim()}]`
+      ].join("\n");
     }
     return match;
   }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport { promises as fs } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst collapseDuplicateMergeKeys: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const buildkiteFiles = await glob(\n    ['.buildkite/**/*.yml', '.buildkite/**/*.yaml'],\n    { onlyFiles: true },\n  );\n\n  if (buildkiteFiles.length === 0) {\n    return { result: 'skip', reason: 'no Buildkite files found' };\n  }\n\n  const input = await Promise.all(\n    buildkiteFiles.map((name) => fs.readFile(name, 'utf-8')),\n  );\n\n  const replaced = input.map(collapseDuplicateMergeKeysInFile);\n\n  if (replaced.every((r, i) => r === input[i])) {\n    return { result: 'skip', reason: 'no duplicate merge keys found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await Promise.all(\n    buildkiteFiles.flatMap((name, i) =>\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      replaced[i] !== input[i] ? [fs.writeFile(name, replaced[i]!)] : [],\n    ),\n  );\n\n  return { result: 'apply' };\n};\n\nconst collapseDuplicateMergeKeysInFile = (input: string) =>\n  replaceAllUntilStable(\n    input,\n    /^([ \\-]*)<<: \\[?(\\*[^\\n\\]]+)\\]?$\\n^( *)<<: \\[?(\\*[^\\n\\]]+)\\]?$/gm,\n    (match, a, b, c, d) => {\n      if (a.length === c.length) {\n        return `${a}<<: [${b}, ${d}]`;\n      }\n      return match;\n    },\n  );\n\nconst replaceAllUntilStable = (\n  input: string,\n  searchValue: RegExp,\n  replacer: (substring: string, ...args: string[]) => string,\n): string => {\n  let output = input;\n  let previousOutput;\n\n  do {\n    previousOutput = output;\n    output = output.replace(searchValue, replacer);\n  } while (output !== previousOutput);\n\n  return output;\n};\n\nexport const tryCollapseDuplicateMergeKeys: PatchFunction = async (config) => {\n  try {\n    return await collapseDuplicateMergeKeys(config);\n  } catch (err) {\n    log.warn('Failed to collapse duplicate merge keys.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAA+B;AAG/B,qBAAoB;AAEpB,MAAM,6BAA4C,OAAO;AAAA,EACvD;AACF,MAAgC;AAC9B,QAAM,iBAAiB,UAAM;AAAA,IAC3B,CAAC,uBAAuB,sBAAsB;AAAA,IAC9C,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,MAAI,eAAe,WAAW,GAAG;AAC/B,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,QAAM,QAAQ,MAAM,QAAQ;AAAA,IAC1B,eAAe,IAAI,CAAC,SAAS,gBAAAA,SAAG,SAAS,MAAM,OAAO,CAAC;AAAA,EACzD;AAEA,QAAM,WAAW,MAAM,IAAI,gCAAgC;AAE3D,MAAI,SAAS,MAAM,CAAC,GAAG,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG;AAC5C,WAAO,EAAE,QAAQ,QAAQ,QAAQ,gCAAgC;AAAA,EACnE;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,QAAQ;AAAA,IACZ,eAAe;AAAA,MAAQ,CAAC,MAAM;AAAA;AAAA,QAE5B,SAAS,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAAA,SAAG,UAAU,MAAM,SAAS,CAAC,CAAE,CAAC,IAAI,CAAC;AAAA;AAAA,IACnE;AAAA,EACF;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,mCAAmC,CAAC,UACxC;AAAA,EACE;AAAA,EACA;AAAA,EACA,CAAC,OAAO,GAAG,GAAG,GAAG,MAAM;AACrB,QAAI,EAAE,WAAW,EAAE,QAAQ;AACzB,aAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;AAAA,IAC5B;AACA,WAAO;AAAA,EACT;AACF;AAEF,MAAM,wBAAwB,CAC5B,OACA,aACA,aACW;AACX,MAAI,SAAS;AACb,MAAI;AAEJ,KAAG;AACD,qBAAiB;AACjB,aAAS,OAAO,QAAQ,aAAa,QAAQ;AAAA,EAC/C,SAAS,WAAW;AAEpB,SAAO;AACT;AAEO,MAAM,gCAA+C,OAAO,WAAW;AAC5E,MAAI;AACF,WAAO,MAAM,2BAA2B,MAAM;AAAA,EAChD,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport { promises as fs } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst collapseDuplicateMergeKeys: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const buildkiteFiles = await glob(\n    ['.buildkite/**/*.yml', '.buildkite/**/*.yaml'],\n    { onlyFiles: true },\n  );\n\n  if (buildkiteFiles.length === 0) {\n    return { result: 'skip', reason: 'no Buildkite files found' };\n  }\n\n  const input = await Promise.all(\n    buildkiteFiles.map((name) => fs.readFile(name, 'utf-8')),\n  );\n\n  const replaced = input.map(collapseDuplicateMergeKeysInFile);\n\n  if (replaced.every((r, i) => r === input[i])) {\n    return { result: 'skip', reason: 'no duplicate merge keys found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await Promise.all(\n    buildkiteFiles.flatMap((name, i) =>\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      replaced[i] !== input[i] ? [fs.writeFile(name, replaced[i]!)] : [],\n    ),\n  );\n\n  return { result: 'apply' };\n};\n\nconst collapseDuplicateMergeKeysInFile = (input: string) =>\n  replaceAllUntilStable(\n    input,\n    /^([ \\-]*)<<: \\[?(\\*[^\\n#\\]]+)\\]?(\\s*#.*)?$\\n^( *)<<: \\[?(\\*[^\\n#\\]]+)\\]?(\\s*#.*)?$/gm,\n    (match, prefixA, keyA, commentA, prefixB, keyB, commentB) => {\n      if (prefixA.length === prefixB.length) {\n        return [\n          ...(commentA\n            ? [`${' '.repeat(prefixA.length)}${commentA.trim()}`]\n            : []),\n          ...(commentB\n            ? [`${' '.repeat(prefixA.length)}${commentB.trim()}`]\n            : []),\n          `${prefixA}<<: [${keyA.trim()}, ${keyB.trim()}]`,\n        ].join('\\n');\n      }\n      return match;\n    },\n  );\n\nconst replaceAllUntilStable = (\n  input: string,\n  searchValue: RegExp,\n  replacer: (substring: string, ...args: string[]) => string,\n): string => {\n  let output = input;\n  let previousOutput;\n\n  do {\n    previousOutput = output;\n    output = output.replace(searchValue, replacer);\n  } while (output !== previousOutput);\n\n  return output;\n};\n\nexport const tryCollapseDuplicateMergeKeys: PatchFunction = async (config) => {\n  try {\n    return await collapseDuplicateMergeKeys(config);\n  } catch (err) {\n    log.warn('Failed to collapse duplicate merge keys.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAA+B;AAG/B,qBAAoB;AAEpB,MAAM,6BAA4C,OAAO;AAAA,EACvD;AACF,MAAgC;AAC9B,QAAM,iBAAiB,UAAM;AAAA,IAC3B,CAAC,uBAAuB,sBAAsB;AAAA,IAC9C,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,MAAI,eAAe,WAAW,GAAG;AAC/B,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,QAAM,QAAQ,MAAM,QAAQ;AAAA,IAC1B,eAAe,IAAI,CAAC,SAAS,gBAAAA,SAAG,SAAS,MAAM,OAAO,CAAC;AAAA,EACzD;AAEA,QAAM,WAAW,MAAM,IAAI,gCAAgC;AAE3D,MAAI,SAAS,MAAM,CAAC,GAAG,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG;AAC5C,WAAO,EAAE,QAAQ,QAAQ,QAAQ,gCAAgC;AAAA,EACnE;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,QAAQ;AAAA,IACZ,eAAe;AAAA,MAAQ,CAAC,MAAM;AAAA;AAAA,QAE5B,SAAS,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAAA,SAAG,UAAU,MAAM,SAAS,CAAC,CAAE,CAAC,IAAI,CAAC;AAAA;AAAA,IACnE;AAAA,EACF;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,mCAAmC,CAAC,UACxC;AAAA,EACE;AAAA,EACA;AAAA,EACA,CAAC,OAAO,SAAS,MAAM,UAAU,SAAS,MAAM,aAAa;AAC3D,QAAI,QAAQ,WAAW,QAAQ,QAAQ;AACrC,aAAO;AAAA,QACL,GAAI,WACA,CAAC,GAAG,IAAI,OAAO,QAAQ,MAAM,CAAC,GAAG,SAAS,KAAK,CAAC,EAAE,IAClD,CAAC;AAAA,QACL,GAAI,WACA,CAAC,GAAG,IAAI,OAAO,QAAQ,MAAM,CAAC,GAAG,SAAS,KAAK,CAAC,EAAE,IAClD,CAAC;AAAA,QACL,GAAG,OAAO,QAAQ,KAAK,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC;AAAA,MAC/C,EAAE,KAAK,IAAI;AAAA,IACb;AACA,WAAO;AAAA,EACT;AACF;AAEF,MAAM,wBAAwB,CAC5B,OACA,aACA,aACW;AACX,MAAI,SAAS;AACb,MAAI;AAEJ,KAAG;AACD,qBAAiB;AACjB,aAAS,OAAO,QAAQ,aAAa,QAAQ;AAAA,EAC/C,SAAS,WAAW;AAEpB,SAAO;AACT;AAEO,MAAM,gCAA+C,OAAO,WAAW;AAC5E,MAAI;AACF,WAAO,MAAM,2BAA2B,MAAM;AAAA,EAChD,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.0.0-main-20240928020811",
+  "version": "9.0.0-main-20240929024119",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -101,7 +101,7 @@
     "typescript": "~5.6.0",
     "validate-npm-package-name": "^6.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.0.0-main-20240928020811"
+    "eslint-config-skuba": "5.0.0-main-20240929024119"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.8",

package/template/greeter/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "9.0.0-main-20240928020811"
+    "skuba": "9.0.0-main-20240929024119"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {

package/template/koa-rest-api/src/framework/server.test.ts

@@ -203,7 +203,6 @@ describe('createApp', () => {
 
   it('handles null error', async () => {
     middleware.mockImplementation(() => {
-      /* eslint-disable-next-line @typescript-eslint/only-throw-error */
       throw null;
     });
 

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

@@ -28,7 +28,7 @@
     "aws-cdk-lib": "^2.109.0",
     "constructs": "^10.0.17",
     "pino-pretty": "^11.0.0",
-    "skuba": "9.0.0-main-20240928020811"
+    "skuba": "9.0.0-main-20240929024119"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {