eslint 9.22.0 → 9.24.0

package/lib/rules/utils/char-source.js

@@ -10,53 +10,60 @@
  * literal or template token.
  */
 class CodeUnit {
-    constructor(start, source) {
-        this.start = start;
-        this.source = source;
-    }
-
-    get end() {
-        return this.start + this.length;
-    }
-
-    get length() {
-        return this.source.length;
-    }
+	constructor(start, source) {
+		this.start = start;
+		this.source = source;
+	}
+
+	get end() {
+		return this.start + this.length;
+	}
+
+	get length() {
+		return this.source.length;
+	}
 }
 
 /**
  * An object used to keep track of the position in a source text where the next characters will be read.
  */
 class TextReader {
-    constructor(source) {
-        this.source = source;
-        this.pos = 0;
-    }
-
-    /**
-     * Advances the reading position of the specified number of characters.
-     * @param {number} length Number of characters to advance.
-     * @returns {void}
-     */
-    advance(length) {
-        this.pos += length;
-    }
-
-    /**
-     * Reads characters from the source.
-     * @param {number} [offset=0] The offset where reading starts, relative to the current position.
-     * @param {number} [length=1] Number of characters to read.
-     * @returns {string} A substring of source characters.
-     */
-    read(offset = 0, length = 1) {
-        const start = offset + this.pos;
-
-        return this.source.slice(start, start + length);
-    }
+	constructor(source) {
+		this.source = source;
+		this.pos = 0;
+	}
+
+	/**
+	 * Advances the reading position of the specified number of characters.
+	 * @param {number} length Number of characters to advance.
+	 * @returns {void}
+	 */
+	advance(length) {
+		this.pos += length;
+	}
+
+	/**
+	 * Reads characters from the source.
+	 * @param {number} [offset=0] The offset where reading starts, relative to the current position.
+	 * @param {number} [length=1] Number of characters to read.
+	 * @returns {string} A substring of source characters.
+	 */
+	read(offset = 0, length = 1) {
+		const start = offset + this.pos;
+
+		return this.source.slice(start, start + length);
+	}
 }
 
-const SIMPLE_ESCAPE_SEQUENCES =
-{ __proto__: null, b: "\b", f: "\f", n: "\n", r: "\r", t: "\t", v: "\v" };
+const SIMPLE_ESCAPE_SEQUENCES = {
+	__proto__: null,
+	b: "\b",
+	f: "\f",
+	n: "\n",
+	r: "\r",
+	t: "\t",
+	v: "\v",
+};
 
 /**
  * Reads a hex escape sequence.
@@ -65,11 +72,11 @@ const SIMPLE_ESCAPE_SEQUENCES =
  * @returns {string} A code unit.
  */
 function readHexSequence(reader, length) {
-    const str = reader.read(0, length);
-    const charCode = parseInt(str, 16);
+	const str = reader.read(0, length);
+	const charCode = parseInt(str, 16);
 
-    reader.advance(length);
-    return String.fromCharCode(charCode);
+	reader.advance(length);
+	return String.fromCharCode(charCode);
 }
 
 /**
@@ -78,18 +85,18 @@ function readHexSequence(reader, length) {
  * @returns {string} A code unit.
  */
 function readUnicodeSequence(reader) {
-    const regExp = /\{(?<hexDigits>[\dA-Fa-f]+)\}/uy;
+	const regExp = /\{(?<hexDigits>[\dA-Fa-f]+)\}/uy;
 
-    regExp.lastIndex = reader.pos;
-    const match = regExp.exec(reader.source);
+	regExp.lastIndex = reader.pos;
+	const match = regExp.exec(reader.source);
 
-    if (match) {
-        const codePoint = parseInt(match.groups.hexDigits, 16);
+	if (match) {
+		const codePoint = parseInt(match.groups.hexDigits, 16);
 
-        reader.pos = regExp.lastIndex;
-        return String.fromCodePoint(codePoint);
-    }
-    return readHexSequence(reader, 4);
+		reader.pos = regExp.lastIndex;
+		return String.fromCodePoint(codePoint);
+	}
+	return readHexSequence(reader, 4);
 }
 
 /**
@@ -99,12 +106,12 @@ function readUnicodeSequence(reader) {
  * @returns {string} A code unit.
  */
 function readOctalSequence(reader, maxLength) {
-    const [octalStr] = reader.read(-1, maxLength).match(/^[0-7]+/u);
+	const [octalStr] = reader.read(-1, maxLength).match(/^[0-7]+/u);
 
-    reader.advance(octalStr.length - 1);
-    const octal = parseInt(octalStr, 8);
+	reader.advance(octalStr.length - 1);
+	const octal = parseInt(octalStr, 8);
 
-    return String.fromCharCode(octal);
+	return String.fromCharCode(octal);
 }
 
 /**
@@ -113,42 +120,42 @@ function readOctalSequence(reader, maxLength) {
  * @returns {string} A string of zero, one or two code units.
  */
 function readEscapeSequenceOrLineContinuation(reader) {
-    const char = reader.read(1);
-
-    reader.advance(2);
-    const unitChar = SIMPLE_ESCAPE_SEQUENCES[char];
-
-    if (unitChar) {
-        return unitChar;
-    }
-    switch (char) {
-        case "x":
-            return readHexSequence(reader, 2);
-        case "u":
-            return readUnicodeSequence(reader);
-        case "\r":
-            if (reader.read() === "\n") {
-                reader.advance(1);
-            }
-
-            // fallthrough
-        case "\n":
-        case "\u2028":
-        case "\u2029":
-            return "";
-        case "0":
-        case "1":
-        case "2":
-        case "3":
-            return readOctalSequence(reader, 3);
-        case "4":
-        case "5":
-        case "6":
-        case "7":
-            return readOctalSequence(reader, 2);
-        default:
-            return char;
-    }
+	const char = reader.read(1);
+
+	reader.advance(2);
+	const unitChar = SIMPLE_ESCAPE_SEQUENCES[char];
+
+	if (unitChar) {
+		return unitChar;
+	}
+	switch (char) {
+		case "x":
+			return readHexSequence(reader, 2);
+		case "u":
+			return readUnicodeSequence(reader);
+		case "\r":
+			if (reader.read() === "\n") {
+				reader.advance(1);
+			}
+
+		// fallthrough
+		case "\n":
+		case "\u2028":
+		case "\u2029":
+			return "";
+		case "0":
+		case "1":
+		case "2":
+		case "3":
+			return readOctalSequence(reader, 3);
+		case "4":
+		case "5":
+		case "6":
+		case "7":
+			return readOctalSequence(reader, 2);
+		default:
+			return char;
+	}
 }
 
 /**
@@ -156,23 +163,23 @@ function readEscapeSequenceOrLineContinuation(reader) {
  * @param {TextReader} reader The reader should be positioned on the backslash.
  * @returns {Generator<CodeUnit>} Zero, one or two `CodeUnit` elements.
  */
-function *mapEscapeSequenceOrLineContinuation(reader) {
-    const start = reader.pos;
-    const str = readEscapeSequenceOrLineContinuation(reader);
-    const end = reader.pos;
-    const source = reader.source.slice(start, end);
-
-    switch (str.length) {
-        case 0:
-            break;
-        case 1:
-            yield new CodeUnit(start, source);
-            break;
-        default:
-            yield new CodeUnit(start, source);
-            yield new CodeUnit(start, source);
-            break;
-    }
+function* mapEscapeSequenceOrLineContinuation(reader) {
+	const start = reader.pos;
+	const str = readEscapeSequenceOrLineContinuation(reader);
+	const end = reader.pos;
+	const source = reader.source.slice(start, end);
+
+	switch (str.length) {
+		case 0:
+			break;
+		case 1:
+			yield new CodeUnit(start, source);
+			break;
+		default:
+			yield new CodeUnit(start, source);
+			yield new CodeUnit(start, source);
+			break;
+	}
 }
 
 /**
@@ -181,26 +188,26 @@ function *mapEscapeSequenceOrLineContinuation(reader) {
  * @returns {CodeUnit[]} A list of code units produced by the string literal.
  */
 function parseStringLiteral(source) {
-    const reader = new TextReader(source);
-    const quote = reader.read();
-
-    reader.advance(1);
-    const codeUnits = [];
-
-    for (;;) {
-        const char = reader.read();
-
-        if (char === quote) {
-            break;
-        }
-        if (char === "\\") {
-            codeUnits.push(...mapEscapeSequenceOrLineContinuation(reader));
-        } else {
-            codeUnits.push(new CodeUnit(reader.pos, char));
-            reader.advance(1);
-        }
-    }
-    return codeUnits;
+	const reader = new TextReader(source);
+	const quote = reader.read();
+
+	reader.advance(1);
+	const codeUnits = [];
+
+	for (;;) {
+		const char = reader.read();
+
+		if (char === quote) {
+			break;
+		}
+		if (char === "\\") {
+			codeUnits.push(...mapEscapeSequenceOrLineContinuation(reader));
+		} else {
+			codeUnits.push(new CodeUnit(reader.pos, char));
+			reader.advance(1);
+		}
+	}
+	return codeUnits;
 }
 
 /**
@@ -209,32 +216,32 @@ function parseStringLiteral(source) {
  * @returns {CodeUnit[]} A list of code units produced by the template token.
  */
 function parseTemplateToken(source) {
-    const reader = new TextReader(source);
-
-    reader.advance(1);
-    const codeUnits = [];
-
-    for (;;) {
-        const char = reader.read();
-
-        if (char === "`" || char === "$" && reader.read(1) === "{") {
-            break;
-        }
-        if (char === "\\") {
-            codeUnits.push(...mapEscapeSequenceOrLineContinuation(reader));
-        } else {
-            let unitSource;
-
-            if (char === "\r" && reader.read(1) === "\n") {
-                unitSource = "\r\n";
-            } else {
-                unitSource = char;
-            }
-            codeUnits.push(new CodeUnit(reader.pos, unitSource));
-            reader.advance(unitSource.length);
-        }
-    }
-    return codeUnits;
+	const reader = new TextReader(source);
+
+	reader.advance(1);
+	const codeUnits = [];
+
+	for (;;) {
+		const char = reader.read();
+
+		if (char === "`" || (char === "$" && reader.read(1) === "{")) {
+			break;
+		}
+		if (char === "\\") {
+			codeUnits.push(...mapEscapeSequenceOrLineContinuation(reader));
+		} else {
+			let unitSource;
+
+			if (char === "\r" && reader.read(1) === "\n") {
+				unitSource = "\r\n";
+			} else {
+				unitSource = char;
+			}
+			codeUnits.push(new CodeUnit(reader.pos, unitSource));
+			reader.advance(unitSource.length);
+		}
+	}
+	return codeUnits;
 }
 
 module.exports = { parseStringLiteral, parseTemplateToken };

package/lib/rules/utils/fix-tracker.js

@@ -20,95 +20,98 @@ const astUtils = require("./ast-utils");
  * replaced so that other fixes won't touch that region in the same pass.
  */
 class FixTracker {
+	/**
+	 * Create a new FixTracker.
+	 * @param {ruleFixer} fixer A ruleFixer instance.
+	 * @param {SourceCode} sourceCode A SourceCode object for the current code.
+	 */
+	constructor(fixer, sourceCode) {
+		this.fixer = fixer;
+		this.sourceCode = sourceCode;
+		this.retainedRange = null;
+	}
 
-    /**
-     * Create a new FixTracker.
-     * @param {ruleFixer} fixer A ruleFixer instance.
-     * @param {SourceCode} sourceCode A SourceCode object for the current code.
-     */
-    constructor(fixer, sourceCode) {
-        this.fixer = fixer;
-        this.sourceCode = sourceCode;
-        this.retainedRange = null;
-    }
+	/**
+	 * Mark the given range as "retained", meaning that other fixes may not
+	 * may not modify this region in the same pass.
+	 * @param {int[]} range The range to retain.
+	 * @returns {FixTracker} The same RuleFixer, for chained calls.
+	 */
+	retainRange(range) {
+		this.retainedRange = range;
+		return this;
+	}
 
-    /**
-     * Mark the given range as "retained", meaning that other fixes may not
-     * may not modify this region in the same pass.
-     * @param {int[]} range The range to retain.
-     * @returns {FixTracker} The same RuleFixer, for chained calls.
-     */
-    retainRange(range) {
-        this.retainedRange = range;
-        return this;
-    }
+	/**
+	 * Given a node, find the function containing it (or the entire program) and
+	 * mark it as retained, meaning that other fixes may not modify it in this
+	 * pass. This is useful for avoiding conflicts in fixes that modify control
+	 * flow.
+	 * @param {ASTNode} node The node to use as a starting point.
+	 * @returns {FixTracker} The same RuleFixer, for chained calls.
+	 */
+	retainEnclosingFunction(node) {
+		const functionNode = astUtils.getUpperFunction(node);
 
-    /**
-     * Given a node, find the function containing it (or the entire program) and
-     * mark it as retained, meaning that other fixes may not modify it in this
-     * pass. This is useful for avoiding conflicts in fixes that modify control
-     * flow.
-     * @param {ASTNode} node The node to use as a starting point.
-     * @returns {FixTracker} The same RuleFixer, for chained calls.
-     */
-    retainEnclosingFunction(node) {
-        const functionNode = astUtils.getUpperFunction(node);
+		return this.retainRange(
+			functionNode ? functionNode.range : this.sourceCode.ast.range,
+		);
+	}
 
-        return this.retainRange(functionNode ? functionNode.range : this.sourceCode.ast.range);
-    }
+	/**
+	 * Given a node or token, find the token before and afterward, and mark that
+	 * range as retained, meaning that other fixes may not modify it in this
+	 * pass. This is useful for avoiding conflicts in fixes that make a small
+	 * change to the code where the AST should not be changed.
+	 * @param {ASTNode|Token} nodeOrToken The node or token to use as a starting
+	 *      point. The token to the left and right are use in the range.
+	 * @returns {FixTracker} The same RuleFixer, for chained calls.
+	 */
+	retainSurroundingTokens(nodeOrToken) {
+		const tokenBefore =
+			this.sourceCode.getTokenBefore(nodeOrToken) || nodeOrToken;
+		const tokenAfter =
+			this.sourceCode.getTokenAfter(nodeOrToken) || nodeOrToken;
 
-    /**
-     * Given a node or token, find the token before and afterward, and mark that
-     * range as retained, meaning that other fixes may not modify it in this
-     * pass. This is useful for avoiding conflicts in fixes that make a small
-     * change to the code where the AST should not be changed.
-     * @param {ASTNode|Token} nodeOrToken The node or token to use as a starting
-     *      point. The token to the left and right are use in the range.
-     * @returns {FixTracker} The same RuleFixer, for chained calls.
-     */
-    retainSurroundingTokens(nodeOrToken) {
-        const tokenBefore = this.sourceCode.getTokenBefore(nodeOrToken) || nodeOrToken;
-        const tokenAfter = this.sourceCode.getTokenAfter(nodeOrToken) || nodeOrToken;
+		return this.retainRange([tokenBefore.range[0], tokenAfter.range[1]]);
+	}
 
-        return this.retainRange([tokenBefore.range[0], tokenAfter.range[1]]);
-    }
+	/**
+	 * Create a fix command that replaces the given range with the given text,
+	 * accounting for any retained ranges.
+	 * @param {int[]} range The range to remove in the fix.
+	 * @param {string} text The text to insert in place of the range.
+	 * @returns {Object} The fix command.
+	 */
+	replaceTextRange(range, text) {
+		let actualRange;
 
-    /**
-     * Create a fix command that replaces the given range with the given text,
-     * accounting for any retained ranges.
-     * @param {int[]} range The range to remove in the fix.
-     * @param {string} text The text to insert in place of the range.
-     * @returns {Object} The fix command.
-     */
-    replaceTextRange(range, text) {
-        let actualRange;
+		if (this.retainedRange) {
+			actualRange = [
+				Math.min(this.retainedRange[0], range[0]),
+				Math.max(this.retainedRange[1], range[1]),
+			];
+		} else {
+			actualRange = range;
+		}
 
-        if (this.retainedRange) {
-            actualRange = [
-                Math.min(this.retainedRange[0], range[0]),
-                Math.max(this.retainedRange[1], range[1])
-            ];
-        } else {
-            actualRange = range;
-        }
+		return this.fixer.replaceTextRange(
+			actualRange,
+			this.sourceCode.text.slice(actualRange[0], range[0]) +
+				text +
+				this.sourceCode.text.slice(range[1], actualRange[1]),
+		);
+	}
 
-        return this.fixer.replaceTextRange(
-            actualRange,
-            this.sourceCode.text.slice(actualRange[0], range[0]) +
-                text +
-                this.sourceCode.text.slice(range[1], actualRange[1])
-        );
-    }
-
-    /**
-     * Create a fix command that removes the given node or token, accounting for
-     * any retained ranges.
-     * @param {ASTNode|Token} nodeOrToken The node or token to remove.
-     * @returns {Object} The fix command.
-     */
-    remove(nodeOrToken) {
-        return this.replaceTextRange(nodeOrToken.range, "");
-    }
+	/**
+	 * Create a fix command that removes the given node or token, accounting for
+	 * any retained ranges.
+	 * @param {ASTNode|Token} nodeOrToken The node or token to remove.
+	 * @returns {Object} The fix command.
+	 */
+	remove(nodeOrToken) {
+		return this.replaceTextRange(nodeOrToken.range, "");
+	}
 }
 
 module.exports = FixTracker;