@darksheep/eslint 5.3.0 → 5.3.2

package/src/utilities/editorconfig.js

@@ -23,80 +23,80 @@ import { findUp } from './filesystem.js';
  * @returns {import('eslint').Linter.RulesRecord}
  */
 function convert(input, RULES) {
-    /** @type {import('eslint').Linter.RulesRecord} */
-    const output = {};
-
-    if (input?.end_of_line === 'lf') {
-        output[RULES.LF] = [ 'error', 'unix' ];
-    }
-
-    if (input?.end_of_line === 'crlf') {
-        output[RULES.LF] = [ 'error', 'windows' ];
-    }
-
-    if (input?.trim_trailing_whitespace === 'true') {
-        output[RULES.TRAIL] = 'error';
-    }
-
-    if (input?.trim_trailing_whitespace === 'false') {
-        output[RULES.TRAIL] = 'off';
+  /** @type {import('eslint').Linter.RulesRecord} */
+  const output = {};
+
+  if (input?.end_of_line === 'lf') {
+    output[RULES.LF] = [ 'error', 'unix' ];
+  }
+
+  if (input?.end_of_line === 'crlf') {
+    output[RULES.LF] = [ 'error', 'windows' ];
+  }
+
+  if (input?.trim_trailing_whitespace === 'true') {
+    output[RULES.TRAIL] = 'error';
+  }
+
+  if (input?.trim_trailing_whitespace === 'false') {
+    output[RULES.TRAIL] = 'off';
+  }
+
+  if (input?.insert_final_newline === 'true') {
+    output[RULES.EOL] = [ 'error', 'always' ];
+  }
+
+  if (input?.insert_final_newline === 'false') {
+    output[RULES.EOL] = [ 'error', 'never' ];
+  }
+
+  if (input?.indent_style === 'space') {
+    const size = Number.parseInt(input?.indent_size ?? 4, 10);
+    output[RULES.INDENT] = [ 'error', size, RULES.INDENT_OPTIONS ?? {} ];
+    if (RULES.INDENT_BINARY != null) {
+      output[RULES.INDENT_BINARY] = [ 'error', size ];
     }
+  }
 
-    if (input?.insert_final_newline === 'true') {
-        output[RULES.EOL] = [ 'error', 'always' ];
+  if (input?.indent_style === 'tab') {
+    output[RULES.INDENT] = [ 'error', 'tab', RULES.INDENT_OPTIONS ?? {} ];
+    if (RULES.INDENT_BINARY != null) {
+      output[RULES.INDENT_BINARY] = [ 'error', 'tab' ];
     }
+  }
 
-    if (input?.insert_final_newline === 'false') {
-        output[RULES.EOL] = [ 'error', 'never' ];
-    }
-
-    if (input?.indent_style === 'space') {
-        const size = Number.parseInt(input?.indent_size ?? 4, 10);
-        output[RULES.INDENT] = [ 'error', size, RULES.INDENT_OPTIONS ?? {} ];
-        if (RULES.INDENT_BINARY != null) {
-            output[RULES.INDENT_BINARY] = [ 'error', size ];
-        }
-    }
-
-    if (input?.indent_style === 'tab') {
-        output[RULES.INDENT] = [ 'error', 'tab', RULES.INDENT_OPTIONS ?? {} ];
-        if (RULES.INDENT_BINARY != null) {
-            output[RULES.INDENT_BINARY] = [ 'error', 'tab' ];
-        }
-    }
-
-    return output;
+  return output;
 }
 
 /** @type {[string[], RuleSet][]} */
 const extToRules = [
-    [
-        [ '.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.jsx', '.tsx' ],
-        {
-            EOL: 'style/eol-last',
-            LF: 'style/linebreak-style',
-            TRAIL: 'style/no-trailing-spaces',
-            INDENT: 'style/indent',
-            INDENT_BINARY: 'style/indent-binary-ops',
-            INDENT_OPTIONS: { SwitchCase: 1 },
-        },
-    ],
-    [
-        [ '.json', '.jsonc', '.json5' ], {
-            EOL: 'style/eol-last',
-            LF: 'style/linebreak-style',
-            TRAIL: 'style/no-trailing-spaces',
-            INDENT: 'jsonc/indent',
-        },
-    ],
-    [
-        [ '.yml', '.yaml' ], {
-            EOL: 'style/eol-last',
-            LF: 'style/linebreak-style',
-            TRAIL: 'style/no-trailing-spaces',
-            INDENT: 'yml/indent',
-        },
-    ],
+  [
+    [ '.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.jsx', '.tsx' ],
+    {
+      EOL: 'style/eol-last',
+      LF: 'style/linebreak-style',
+      TRAIL: 'style/no-trailing-spaces',
+      INDENT: 'style/indent',
+      INDENT_BINARY: 'style/indent-binary-ops',
+      INDENT_OPTIONS: { SwitchCase: 1 },
+    },
+  ],
+  [
+    [ '.json', '.jsonc', '.json5' ], {
+      EOL: 'style/eol-last',
+      LF: 'style/linebreak-style',
+      TRAIL: 'style/no-trailing-spaces',
+      INDENT: 'jsonc/indent',
+    },
+  ],
+  [
+    [ '.yml', '.yaml' ], {
+      EOL: 'style/eol-last',
+      LF: 'style/linebreak-style',
+      TRAIL: 'style/no-trailing-spaces',
+      INDENT: 'yml/indent',
+    },
+  ],
 ];
 
 /**
@@ -106,18 +106,18 @@ const extToRules = [
  * @returns {string[]}
  */
 function filterMatchingFiles(files, extensions) {
-    return files.filter((file) => {
-        if (file.endsWith('*')) {
-            return true;
-        }
-
-        for (const extension of extensions) {
-            if (file.endsWith(extension)) {
-                return true;
-            }
-        }
-        return false;
-    });
+  return files.filter((file) => {
+    if (file.endsWith('*')) {
+      return true;
+    }
+
+    for (const extension of extensions) {
+      if (file.endsWith(extension)) {
+        return true;
+      }
+    }
+    return false;
+  });
 }
 
 /**
@@ -127,28 +127,28 @@ function filterMatchingFiles(files, extensions) {
  * @returns {boolean}
  */
 function equal(one, two) {
-    if (one == null && two == null) {
-        return true;
-    }
-    if (one == null || two == null) {
-        return false;
-    }
-
-    if (
-        Array.isArray(one) === false ||
-        Array.isArray(two) === false ||
-        one.length !== two.length
-    ) {
-        return false;
-    }
-
-    for (const element of one) {
-        if (two.includes(element) === false) {
-            return false;
-        }
+  if (one == null && two == null) {
+    return true;
+  }
+  if (one == null || two == null) {
+    return false;
+  }
+
+  if (
+    Array.isArray(one) === false ||
+    Array.isArray(two) === false ||
+    one.length !== two.length
+  ) {
+    return false;
+  }
+
+  for (const element of one) {
+    if (two.includes(element) === false) {
+      return false;
     }
+  }
 
-    return true;
+  return true;
 }
 
 /**
@@ -156,20 +156,20 @@ function equal(one, two) {
  * @param {import('eslint').Linter.FlatConfig} config  [description]
  */
 function addOrMergeConfig(configs, config) {
-    for (const previous of configs) {
-        if (equal(
-            /** @type {string[]} */ (previous.files),
-            /** @type {string[]} */ (config.files),
-        )) {
-            previous.rules = {
-                ...previous.rules,
-                ...config.rules,
-            };
-
-            return;
-        }
+  for (const previous of configs) {
+    if (equal(
+      /** @type {string[]} */ (previous.files),
+      /** @type {string[]} */ (config.files),
+    )) {
+      previous.rules = {
+        ...previous.rules,
+        ...config.rules,
+      };
+
+      return;
     }
-    configs.push(config);
+  }
+  configs.push(config);
 }
 
 /**
@@ -177,47 +177,47 @@ function addOrMergeConfig(configs, config) {
  * @returns {Promise<import('eslint').Linter.FlatConfig[]>}
  */
 export async function createEditorOverrides(root) {
-    const eslintConfigPath = resolve(fileURLToPath(root), 'eslint.config.js');
-    const path = await findUp(eslintConfigPath, '.editorconfig');
-    if (path == null) {
-        return [];
+  const eslintConfigPath = resolve(fileURLToPath(root), 'eslint.config.js');
+  const path = await findUp(eslintConfigPath, '.editorconfig');
+  if (path == null) {
+    return [];
+  }
+
+  const editorconfig = parseBuffer(await readFile(path));
+
+  /** @type {import('eslint').Linter.FlatConfig[]} */
+  const configs = [];
+  for (const [ name, body ] of editorconfig) {
+    if (name === null) {
+      continue;
+    }
+
+    const allFiles = expandGlob(name);
+    if (allFiles == null) {
+      continue;
     }
 
-    const editorconfig = parseBuffer(await readFile(path));
-
-    /** @type {import('eslint').Linter.FlatConfig[]} */
-    const configs = [];
-    for (const [ name, body ] of editorconfig) {
-        if (name === null) {
-            continue;
-        }
-
-        const allFiles = expandGlob(name);
-        if (allFiles == null) {
-            continue;
-        }
-
-        for (const [ extensions, rules ] of extToRules) {
-            const files = filterMatchingFiles(allFiles, extensions);
-            if (files.length === 0) {
-                continue;
-            }
-
-            if (files.includes('*')) {
-                addOrMergeConfig(configs, {
-                    name: `editor-config/${extensions.join(', ')}`,
-                    files: extensions.map((extension) => `**/*${extension}`),
-                    rules: convert(body, rules),
-                });
-            } else {
-                addOrMergeConfig(configs, {
-                    name: `editor-config/${files.join(', ')}`,
-                    files: files.map((file) => `**/${file}`),
-                    rules: convert(body, rules),
-                });
-            }
-        }
+    for (const [ extensions, rules ] of extToRules) {
+      const files = filterMatchingFiles(allFiles, extensions);
+      if (files.length === 0) {
+        continue;
+      }
+
+      if (files.includes('*')) {
+        addOrMergeConfig(configs, {
+          name: `editor-config/${extensions.join(', ')}`,
+          files: extensions.map((extension) => `**/*${extension}`),
+          rules: convert(body, rules),
+        });
+      } else {
+        addOrMergeConfig(configs, {
+          name: `editor-config/${files.join(', ')}`,
+          files: files.map((file) => `**/${file}`),
+          rules: convert(body, rules),
+        });
+      }
     }
+  }
 
-    return configs;
+  return configs;
 }

package/src/utilities/eslint-files.js

@@ -8,11 +8,11 @@ import { getPackageJson } from './package.js';
  * @returns {string[]}
  */
 function getFiles(files, type, target) {
-    if (type === target) {
-        return [ '**/*.js', '**/*.jsx', ...files ];
-    }
+  if (type === target) {
+    return [ '**/*.js', '**/*.jsx', ...files ];
+  }
 
-    return files;
+  return files;
 }
 
 /**
@@ -21,9 +21,9 @@ function getFiles(files, type, target) {
  * @returns {Promise<string[]>}
  */
 export async function getCommonFiles(root) {
-    const { type = 'commonjs' } = await getPackageJson(root) ?? {};
+  const { type = 'commonjs' } = await getPackageJson(root) ?? {};
 
-    return getFiles([ '**/*.cjs' ], type, 'commonjs');
+  return getFiles([ '**/*.cjs' ], type, 'commonjs');
 }
 
 /**
@@ -32,8 +32,8 @@ export async function getCommonFiles(root) {
  * @returns {Promise<string[]>}
  */
 export async function getModuleFiles(root) {
-    const { type = 'commonjs' } = await getPackageJson(root) ?? {};
-    return getFiles([ '**/*.mjs' ], type, 'module');
+  const { type = 'commonjs' } = await getPackageJson(root) ?? {};
+  return getFiles([ '**/*.mjs' ], type, 'module');
 }
 
 /**
@@ -41,7 +41,7 @@ export async function getModuleFiles(root) {
  * @returns {string[]}
  */
 export function getTypescriptFiles() {
-    return [ '**/*.ts', '**/*.tsx' ];
+  return [ '**/*.ts', '**/*.tsx' ];
 }
 
 /**
@@ -49,12 +49,12 @@ export function getTypescriptFiles() {
  * @returns {string[]}
  */
 export function getTestFiles() {
-    return [
-        ...expandGlob('**/test.*'),
-        ...expandGlob('**/*.test.*'),
-        ...expandGlob('**/{test,tests}/*'),
-        ...expandGlob('**/{test,tests}/**/*'),
-    ];
+  return [
+    ...expandGlob('**/test.*'),
+    ...expandGlob('**/*.test.*'),
+    ...expandGlob('**/{test,tests}/*'),
+    ...expandGlob('**/{test,tests}/**/*'),
+  ];
 }
 
 /**
@@ -62,9 +62,9 @@ export function getTestFiles() {
  * @returns {string[]}
  */
 export function getExampleFiles() {
-    return [
-        ...expandGlob('**/example.{ts,js,tsx,jsx,mts,cts,mjs,cjs}'),
-        ...expandGlob('**/{example,examples}/*'),
-        ...expandGlob('**/{example,examples}/**/*'),
-    ];
+  return [
+    ...expandGlob('**/example.{ts,js,tsx,jsx,mts,cts,mjs,cjs}'),
+    ...expandGlob('**/{example,examples}/*'),
+    ...expandGlob('**/{example,examples}/**/*'),
+  ];
 }

package/src/utilities/expand-glob.js

@@ -6,44 +6,44 @@ const globEachRegex = /\{[\w.-]+(?:,[\w.-]+)*\}/;
  * @returns {string[]}
  */
 export function expandGlob(input) {
-    const globNumMatch = input.match(globNumRegex);
-    if (typeof globNumMatch?.index === 'number') {
-        const first = input.slice(0, globNumMatch.index);
-        const each = globNumMatch[0];
-        const last = input.slice(globNumMatch.index + each.length);
-
-        const [ a, b ] = each
-            .slice(1, -1)
-            .split('..')
-            .map((number) => Number.parseInt(number, 10));
-
-        const start = a > b ? b : a;
-        const end = a < b ? b : a;
-
-        const output = [];
-        for (let i = start; i <= end; i++) {
-            output.push(`${first}${i}${last}`);
-        }
-
-        return output.map(expandGlob).flat();
+  const globNumMatch = input.match(globNumRegex);
+  if (typeof globNumMatch?.index === 'number') {
+    const first = input.slice(0, globNumMatch.index);
+    const each = globNumMatch[0];
+    const last = input.slice(globNumMatch.index + each.length);
+
+    const [ a, b ] = each
+      .slice(1, -1)
+      .split('..')
+      .map((number) => Number.parseInt(number, 10));
+
+    const start = a > b ? b : a;
+    const end = a < b ? b : a;
+
+    const output = [];
+    for (let i = start; i <= end; i++) {
+      output.push(`${first}${i}${last}`);
     }
 
-    const globEachMatch = input.match(globEachRegex);
-    if (typeof globEachMatch?.index === 'number') {
-        const first = input.slice(0, globEachMatch.index);
-        const each = globEachMatch[0];
-        const last = input.slice(globEachMatch.index + each.length);
+    return output.map(expandGlob).flat();
+  }
 
-        const output = each
-            .slice(1, -1).split(',')
-            .map((part) => `${first}${part}${last}`);
+  const globEachMatch = input.match(globEachRegex);
+  if (typeof globEachMatch?.index === 'number') {
+    const first = input.slice(0, globEachMatch.index);
+    const each = globEachMatch[0];
+    const last = input.slice(globEachMatch.index + each.length);
 
-        if (output.length > 1) {
-            return output.map(expandGlob).flat();
-        }
+    const output = each
+      .slice(1, -1).split(',')
+      .map((part) => `${first}${part}${last}`);
 
-        return output;
+    if (output.length > 1) {
+      return output.map(expandGlob).flat();
     }
 
-    return [ input ];
+    return output;
+  }
+
+  return [ input ];
 }

package/src/utilities/filesystem.js

@@ -6,12 +6,12 @@ import * as Path from 'node:path';
  * @returns {Promise<boolean>}
  */
 export async function exists(path) {
-    try {
-        await stat(path);
-        return true;
-    } catch {
-        return false;
-    }
+  try {
+    await stat(path);
+    return true;
+  } catch {
+    return false;
+  }
 }
 
 /**
@@ -21,14 +21,14 @@ export async function exists(path) {
  * @returns {boolean}
  */
 export function descendsFrom(filePath, projectPath) {
-    if (
-        typeof filePath !== 'string' ||
-        typeof projectPath !== 'string'
-    ) {
-        return false;
-    }
+  if (
+    typeof filePath !== 'string' ||
+    typeof projectPath !== 'string'
+  ) {
+    return false;
+  }
 
-    return Path.relative(projectPath, filePath).startsWith('..') === false;
+  return Path.relative(projectPath, filePath).startsWith('..') === false;
 }
 
 /**
@@ -38,19 +38,19 @@ export function descendsFrom(filePath, projectPath) {
  * @returns {string[]}
  */
 export function listParents(filepath, stopDirectory = '/') {
-    // The file is not from within the stopDirectory
-    if (descendsFrom(filepath, stopDirectory) === false) {
-        return [];
-    }
+  // The file is not from within the stopDirectory
+  if (descendsFrom(filepath, stopDirectory) === false) {
+    return [];
+  }
 
-    const output = [];
-    const end = Path.resolve(stopDirectory);
-    do {
-        filepath = Path.dirname(filepath);
-        output.push(filepath);
-    } while (end !== filepath);
+  const output = [];
+  const end = Path.resolve(stopDirectory);
+  do {
+    filepath = Path.dirname(filepath);
+    output.push(filepath);
+  } while (end !== filepath);
 
-    return output;
+  return output;
 }
 
 /**
@@ -61,13 +61,13 @@ export function listParents(filepath, stopDirectory = '/') {
  * @returns {Promise<string|null>} Returns absolute path to the closest {filename} if found
  */
 export async function findUp(rootFilePath, filename, stopDirectory = Path.resolve('/')) {
-    for (const directory of listParents(rootFilePath, stopDirectory)) {
-        const target = Path.join(directory, filename);
+  for (const directory of listParents(rootFilePath, stopDirectory)) {
+    const target = Path.join(directory, filename);
 
-        if (await exists(target)) {
-            return target;
-        }
+    if (await exists(target)) {
+      return target;
     }
+  }
 
-    return null;
+  return null;
 }

package/src/utilities/make-compat.js

@@ -8,10 +8,10 @@ import { FlatCompat } from '@eslint/eslintrc';
  * @returns {import('@eslint/eslintrc').FlatCompat}
  */
 export function makeCompat(root) {
-    return new FlatCompat({
-        // The root of the importing project
-        baseDirectory: fileURLToPath(root),
-        // The root of our project
-        resolvePluginsRelativeTo: resolve(fileURLToPath(import.meta.url), '..', '..', '..'),
-    });
+  return new FlatCompat({
+    // The root of the importing project
+    baseDirectory: fileURLToPath(root),
+    // The root of our project
+    resolvePluginsRelativeTo: resolve(fileURLToPath(import.meta.url), '..', '..', '..'),
+  });
 }