chore: apply more eslint rules (#2116)

Author: SethFalco

eslint.config.mjs

@@ -34,6 +34,8 @@ export default [
   {
     files: ['**/*.js', '**/*.mjs'],
     rules: {
+      'one-var': ['error', 'never'],
+      curly: 'error',
       strict: 'error',
     },
   },

lib/parser.js

@@ -158,7 +158,7 @@ export const parseSvg = (data, from) => {
 
   sax.onopentag = (data) => {
     /** @type {XastElement} */
-    let element = {
+    const element = {
       type: 'element',
       name: data.name,
       attributes: {},

lib/style.js

@@ -1,7 +1,7 @@
 import * as csstree from 'css-tree';
 import * as csswhat from 'css-what';
 import { syntax } from 'csso';
-import { visit, matches } from './xast.js';
+import { matches, visit } from './xast.js';
 import {
   attrsGroups,
   inheritableAttrs,

lib/svgo-node.js

@@ -3,12 +3,12 @@ import fs from 'fs/promises';
 import path from 'path';
 import {
   VERSION,
-  optimize as optimizeAgnostic,
+  _collections,
   builtinPlugins,
   mapNodesToParents,
+  optimize as optimizeAgnostic,
   querySelector,
   querySelectorAll,
-  _collections,
 } from './svgo.js';
 
 /**

lib/svgo-node.test.js

@@ -1,6 +1,6 @@
 import os from 'os';
 import path from 'path';
-import { optimize, loadConfig } from './svgo-node.js';
+import { loadConfig, optimize } from './svgo-node.js';
 
 const describeLF = os.EOL === '\r\n' ? describe.skip : describe;
 const describeCRLF = os.EOL === '\r\n' ? describe : describe.skip;

lib/svgo/coa.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import colors from 'picocolors';
 import { fileURLToPath } from 'url';
-import { encodeSVGDatauri, decodeSVGDatauri } from './tools.js';
+import { decodeSVGDatauri, encodeSVGDatauri } from './tools.js';
 import { loadConfig, optimize } from '../svgo-node.js';
 import { builtin } from '../builtin.js';
 import { SvgoParserError } from '../parser.js';
@@ -151,7 +151,7 @@ async function action(args, opts, command) {
 
   if (process?.versions?.node && PKG.engines.node) {
     // @ts-expect-error We control this and ensure it is never null.
-    var nodeVersion = String(PKG.engines.node).match(/\d*(\.\d+)*/)[0];
+    const nodeVersion = String(PKG.engines.node).match(/\d*(\.\d+)*/)[0];
     if (parseFloat(process.versions.node) < parseFloat(nodeVersion)) {
       throw Error(
         `${PKG.name} requires Node.js version ${nodeVersion} or higher.`,
@@ -224,7 +224,7 @@ async function action(args, opts, command) {
     if (input.length && input[0] != '-') {
       if (output.length == 1 && checkIsDir(output[0])) {
         const dir = output[0];
-        for (var i = 0; i < input.length; i++) {
+        for (let i = 0; i < input.length; i++) {
           output[i] = checkIsDir(input[i])
             ? input[i]
             : path.resolve(dir, path.basename(input[i]));
@@ -245,7 +245,7 @@ async function action(args, opts, command) {
 
   // --folder
   if (opts.folder) {
-    var outputFolder = (output && output[0]) || opts.folder;
+    const outputFolder = (output && output[0]) || opts.folder;
     await optimizeFolder(config, opts.folder, outputFolder);
   }
 
@@ -254,8 +254,8 @@ async function action(args, opts, command) {
     // STDIN
     if (input[0] === '-') {
       return new Promise((resolve, reject) => {
-        var data = '',
-          file = output[0];
+        let data = '';
+        const file = output[0];
 
         process.stdin
           .on('data', (chunk) => (data += chunk))
@@ -274,7 +274,7 @@ async function action(args, opts, command) {
 
     // --string
   } else if (opts.string) {
-    var data = decodeSVGDatauri(opts.string);
+    const data = decodeSVGDatauri(opts.string);
 
     return processSVGData(config, null, data, output[0]);
   }
@@ -308,7 +308,7 @@ function optimizeFolder(config, dir, output) {
  */
 function processDirectory(config, dir, files, output) {
   // take only *.svg files, recursively if necessary
-  var svgFilesDescriptions = getFilesDescriptions(config, dir, files, output);
+  const svgFilesDescriptions = getFilesDescriptions(config, dir, files, output);
 
   return svgFilesDescriptions.length
     ? Promise.all(
@@ -396,8 +396,8 @@ function optimizeFile(config, file, output) {
  * @return {Promise<any>}
  */
 function processSVGData(config, info, data, output, input = undefined) {
-  var startTime = Date.now(),
-    prevFileSize = Buffer.byteLength(data, 'utf8');
+  const startTime = Date.now();
+  const prevFileSize = Buffer.byteLength(data, 'utf8');
 
   let result;
   try {
@@ -413,8 +413,8 @@ function processSVGData(config, info, data, output, input = undefined) {
   if (config.datauri) {
     result.data = encodeSVGDatauri(result.data, config.datauri);
   }
-  var resultFileSize = Buffer.byteLength(result.data, 'utf8'),
-    processingTime = Date.now() - startTime;
+  const resultFileSize = Buffer.byteLength(result.data, 'utf8');
+  const processingTime = Date.now() - startTime;
 
   return writeOutput(input, output, result.data).then(
     function () {

lib/svgo/tools.js

@@ -23,7 +23,7 @@ const regReferencesBegin = /(\w+)\.[a-zA-Z]/;
  * @returns {string}
  */
 export const encodeSVGDatauri = (str, type) => {
-  var prefix = 'data:image/svg+xml';
+  let prefix = 'data:image/svg+xml';
   if (!type || type === 'base64') {
     // base64
     prefix += ';base64,';
@@ -45,13 +45,15 @@ export const encodeSVGDatauri = (str, type) => {
  * @returns {string}
  */
 export const decodeSVGDatauri = (str) => {
-  var regexp = /data:image\/svg\+xml(;charset=[^;,]*)?(;base64)?,(.*)/;
-  var match = regexp.exec(str);
+  const regexp = /data:image\/svg\+xml(;charset=[^;,]*)?(;base64)?,(.*)/;
+  const match = regexp.exec(str);
 
   // plain string
-  if (!match) return str;
+  if (!match) {
+    return str;
+  }
 
-  var data = match[3];
+  const data = match[3];
 
   if (match[2]) {
     // base64
@@ -88,13 +90,17 @@ export const cleanupOutData = (data, params, command) => {
     delimiter = ' ';
 
     // no extra space in front of first number
-    if (i == 0) delimiter = '';
+    if (i == 0) {
+      delimiter = '';
+    }
 
     // no extra space after arc command flags (large-arc and sweep flags)
     // a20 60 45 0 1 30 20 → a20 60 45 0130 20
     if (params.noSpaceAfterFlags && (command == 'A' || command == 'a')) {
-      var pos = i % 7;
-      if (pos == 4 || pos == 5) delimiter = '';
+      const pos = i % 7;
+      if (pos == 4 || pos == 5) {
+        delimiter = '';
+      }
     }
 
     // remove floating-point numbers leading zeros

lib/xast.js

@@ -1,13 +1,13 @@
-import { selectAll, selectOne, is } from 'css-select';
+import { is, selectAll, selectOne } from 'css-select';
 import { createAdapter } from './svgo/css-select-adapter.js';
 
 /**
  * @typedef {import('css-select').Options<XastNode & { children?: any }, XastElement>} Options
+ * @typedef {import('./types.js').Visitor} Visitor
+ * @typedef {import('./types.js').XastChild} XastChild
  * @typedef {import('./types.js').XastElement} XastElement
  * @typedef {import('./types.js').XastNode} XastNode
- * @typedef {import('./types.js').XastChild} XastChild
  * @typedef {import('./types.js').XastParent} XastParent
- * @typedef {import('./types.js').Visitor} Visitor
  */
 
 /**

lib/xast.test.js

@@ -1,10 +1,10 @@
+import { detachNodeFromParent, visit, visitSkip } from './xast.js';
+
 /**
  * @typedef {import('./types.js').XastElement} XastElement
  * @typedef {import('./types.js').XastRoot} XastRoot
  */
 
-import { visit, visitSkip, detachNodeFromParent } from './xast.js';
-
 /**
  * @param {XastElement[]} children
  * @returns {XastRoot}

package.json

@@ -133,7 +133,7 @@
     "pixelmatch": "^7.1.0",
     "playwright": "^1.51.1",
     "pngjs": "^7.0.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.5.3",
     "rimraf": "^5.0.7",
     "rollup": "^4.22.4",
     "tar-stream": "^3.1.7",