chore: migrate to biome v2

biome.json

@@ -1,23 +1,25 @@
 {
+  "$schema": "https://biomejs.dev/schemas/2.4.13/schema.json",
   "files": {
-    "ignore": ["renovate.json"]
+    "includes": ["**", "!**/renovate.json"]
   },
   "linter": {
     "rules": {
-      "all": true,
+      "recommended": true,
       "correctness": {
         "noUndeclaredVariables": "error",
         "noNodejsModules": "off"
       },
       "suspicious": {
         "noConsole": "off",
-        "noConsoleLog": "off"
+        "noTemplateCurlyInString": "off"
       },
       "performance": {
         "useTopLevelRegex": "off"
       },
       "complexity": {
         "noExcessiveCognitiveComplexity": {
+          "level": "error",
           "options": {
             "maxAllowedComplexity": 20
           }
@@ -26,7 +28,7 @@
     }
   },
   "formatter": {
-    "ignore": ["package.json", "license-checker-config.json"],
+    "includes": ["**", "!**/package.json", "!**/license-checker-config.json"],
     "indentStyle": "space",
     "lineWidth": 120
   },
@@ -38,7 +40,7 @@
   },
   "overrides": [
     {
-      "include": ["test/**/*.js"],
+      "includes": ["**/test/**/*.js"],
       "javascript": {
         "globals": ["afterEach", "afterAll", "beforeEach", "beforeAll", "describe", "it"]
       },
@@ -51,7 +53,7 @@
       }
     },
     {
-      "include": ["src/commands/*.js"],
+      "includes": ["**/src/commands/**/*.js"],
       "linter": {
         "rules": {
           "style": {
@@ -61,7 +63,7 @@
       }
     },
     {
-      "include": ["src/fastly/service.js"],
+      "includes": ["**/src/fastly/service.js"],
       "linter": {
         "rules": {
           "style": {

package.json

@@ -27,7 +27,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.4",
+    "@biomejs/biome": "2.4.13",
     "@commitlint/cli": "19.8.1",
     "@commitlint/config-conventional": "19.8.1",
     "@semantic-release/changelog": "6.0.3",

src/commands/service/create.js

@@ -13,7 +13,7 @@
 import chalk from 'chalk';
 import { FastlyServiceManager } from '../../fastly/service-mgr.js';
 import { readService } from '../../fastly/store.js';
-import { SHARED_OPTS, override } from '../../opts.js';
+import { override, SHARED_OPTS } from '../../opts.js';
 
 export default {
   command: 'create',

src/commands/service/get.js

@@ -13,7 +13,7 @@
 import chalk from 'chalk';
 import { FastlyServiceManager } from '../../fastly/service-mgr.js';
 import { writeService } from '../../fastly/store.js';
-import { SHARED_OPTS, override } from '../../opts.js';
+import { override, SHARED_OPTS } from '../../opts.js';
 import { detectSecrets } from '../../secrets/secrets.js';
 
 export default {

src/commands/service/update.js

@@ -14,7 +14,7 @@ import { execSync } from 'node:child_process';
 import chalk from 'chalk';
 import { FastlyServiceManager } from '../../fastly/service-mgr.js';
 import { readService } from '../../fastly/store.js';
-import { SHARED_OPTS, override } from '../../opts.js';
+import { override, SHARED_OPTS } from '../../opts.js';
 
 function getLastGitCommit() {
   try {

src/fastly/api/fastly-api.js

@@ -279,7 +279,6 @@ export class FastlyApi {
       // create dict
       const body = toFormData({
         name: dictName,
-        // biome-ignore lint/style/useNamingConvention: fastly json naming
         write_only: String(writeOnly),
       });
       resp = await this.fetch(`POST /service/${serviceId}/version/${versionId}/dictionary`, { body });
@@ -289,7 +288,6 @@ export class FastlyApi {
     }
     const { id } = await resp.json();
 
-    // biome-ignore lint/style/useNamingConvention: fastly json naming
     const items = Object.entries(entries).map(([key, value]) => ({ op: 'upsert', item_key: key, item_value: value }));
 
     while (items.length > 0) {

src/fastly/fiddle-mgr.js

@@ -106,14 +106,13 @@ function tablesToDictionaries(init, service, opts) {
 
   const dicts = [];
 
-  const tablesRegex = /table (\w+) \{[^\}]*\}/gm;
+  const tablesRegex = /table (\w+) \{[^}]*\}/gm;
   const entriesRegex = /^\s*"([^"]*)"\s*:\s*"([^"]*)"\s*,.*$/gm;
 
   for (const table of init.matchAll(tablesRegex)) {
     const name = table[1];
     const dict = {
       name,
-      // biome-ignore lint/style/useNamingConvention: fastly json schema
       write_only: currentDicts[name]?.write_only,
       items: [],
       info: {},
@@ -128,9 +127,7 @@ function tablesToDictionaries(init, service, opts) {
     const entries = table[0].matchAll(entriesRegex);
     for (const entry of entries) {
       dict.items.push({
-        // biome-ignore lint/style/useNamingConvention: fastly json schema
         item_key: entry[1],
-        // biome-ignore lint/style/useNamingConvention: fastly json schema
         item_value: entry[2],
       });
     }
@@ -188,12 +185,9 @@ function fiddleOriginsToBackends(fiddle, service) {
         name,
         address: origin.hostname,
         hostname: origin.hostname,
-        port: origin.port === '' ? (origin.protocol === 'https:' ? 443 : 80) : Number.parseInt(origin.port),
-        // biome-ignore lint/style/useNamingConvention: fastly json schema
+        port: origin.port === '' ? (origin.protocol === 'https:' ? 443 : 80) : Number.parseInt(origin.port, 10),
         use_ssl: origin.protocol === 'https:',
-        // biome-ignore lint/style/useNamingConvention: fastly json schema
         ssl_cert_hostname: origin.protocol === 'https:' ? origin.hostname : null,
-        // biome-ignore lint/style/useNamingConvention: fastly json schema
         ssl_sni_hostname: origin.protocol === 'https:' ? origin.hostname : null,
       });
     }

src/fastly/store.js

@@ -331,7 +331,6 @@ function writeDictionaries(dictionaries) {
 }
 
 function readDictionary(dictPath) {
-  // biome-ignore lint/style/useNamingConvention: fastly json naming
   let write_only = false;
   let filename = path.basename(dictPath, '.ini');
   if (filename.startsWith(PRIVATE_DICT_PREFIX)) {
@@ -355,9 +354,7 @@ function readDictionary(dictPath) {
       const keyValueMatch = line.match(/([^=]+)="(.*)"/);
       if (keyValueMatch) {
         dict.items.push({
-          // biome-ignore lint/style/useNamingConvention: fastly json naming
           item_key: keyValueMatch[1],
-          // biome-ignore lint/style/useNamingConvention: fastly json naming
           item_value: keyValueMatch[2],
         });
       }

src/secrets/secrets.js

@@ -133,7 +133,7 @@ function findSecretsInString(input) {
   matches.push(...findKnownSecretPatterns(input));
 
   // 2. find high entropy strings. need to split into "words" first
-  for (const word of input.split(/[\s:\/\.,&#'"=;]+/)) {
+  for (const word of input.split(/[\s:/.,&#'"=;]+/)) {
     // if (matches.length === 0) {
     const match = findHighEntropy(word, cfg?.entropy_threshold);
     if (match) {

src/test/runner.js

@@ -244,7 +244,6 @@ export async function runTests(globs, tepiArgs = []) {
   }
 
   // if absolute path is used (eg. by tepi VS Code extension), make it relative
-  // biome-ignore lint/style/noParameterAssign: it's easier this way :)
   globs = globs.map((g) => removePrefix(g, `${process.cwd()}/`));
 
   try {

src/yargs-ahoy.js

@@ -25,7 +25,6 @@ function isFile(path) {
   } catch (err) {
     if (err.code === 'ENOENT') {
       return false; // File doesn't exist
-      // biome-ignore lint/style/noUselessElse: mistakenly flagged
     } else {
       throw err; // Other errors
     }
@@ -38,7 +37,6 @@ function isDirectory(path) {
   } catch (err) {
     if (err.code === 'ENOENT') {
       return false; // Directory doesn't exist
-      // biome-ignore lint/style/noUselessElse: mistakenly flagged
     } else {
       throw err; // Other errors
     }
@@ -97,7 +95,6 @@ function onFail(msg, err, yargs) {
   } else {
     // yargs validation errors (only message, no err)
     for (const [newMsg, oldMsg] of Object.entries(BETTER_FAIL_MESSAGES)) {
-      // biome-ignore lint/style/noParameterAssign: it's easier this way :)
       msg = msg.replace(oldMsg, newMsg);
     }
 
@@ -155,7 +152,6 @@ function handleAdditionalTypes(_yargs, opt) {
  *   - exit with code 2 on application errors
  * - TODO: document other stuff
  */
-// biome-ignore lint/style/noDefaultExport: we mimic yargs here
 export default function yargsAhoy(processArgs, cwd, parentRequire) {
   const yargs = _yargs(processArgs, cwd, parentRequire);
 

test/secrets.test.js

@@ -14,7 +14,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { LOG_SECRET_FIELDS, detectSecrets } from '../src/secrets/secrets.js';
+import { detectSecrets, LOG_SECRET_FIELDS } from '../src/secrets/secrets.js';
 
 // silence debug/warn output for these tests
 console.debug = () => ({});

test/test.test.js

@@ -19,7 +19,7 @@ class StreamCatcher {
     this.streamWrite = stream._write;
 
     this.buffer = Buffer.alloc(0);
-    // biome-ignore lint/complexity/noUselessThisAlias: <explanation>
+    // biome-ignore lint/complexity/noUselessThisAlias: needed for arrow function closure below
     const self = this;
 
     stream._write = (chunk, encoding, callback) => {
@@ -50,7 +50,7 @@ class StreamCatcher {
 class ExitCatcher {
   constructor() {
     this.processExit = process.exit;
-    // biome-ignore lint/complexity/noUselessThisAlias: <explanation>
+    // biome-ignore lint/complexity/noUselessThisAlias: needed for arrow function closure below
     const self = this;
     process.exit = (code) => {
       self.code = code;