eslint-linter-browserify 10.0.1 → 10.0.3

package/linter.cjs

@@ -4003,7 +4003,7 @@ function requireEslintScope () {
 	}
 
 	/** @name module:escope.version */
-	const version = "9.1.1"; // x-release-please-version
+	const version = "9.1.2"; // x-release-please-version
 
 	/* vim: set sw=4 ts=4 et tw=80 : */
 
@@ -4216,7 +4216,7 @@ function requireEslintVisitorKeys$2 () {
 	return eslintVisitorKeys$2;
 }
 
-var version = "10.0.1";
+var version = "10.0.3";
 var require$$3$1 = {
 	version: version};
 
@@ -22788,7 +22788,7 @@ function requireCommonjs$1 () {
 		const openPattern = /\\{/g;
 		const closePattern = /\\}/g;
 		const commaPattern = /\\,/g;
-		const periodPattern = /\\./g;
+		const periodPattern = /\\\./g;
 		exports$1.EXPANSION_MAX = 100_000;
 		function numeric(str) {
 		    return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
@@ -23208,12 +23208,114 @@ function requireAst$1 () {
 	if (hasRequiredAst$1) return ast$1;
 	hasRequiredAst$1 = 1;
 	// parse a single path portion
+	var _a;
 	Object.defineProperty(ast$1, "__esModule", { value: true });
 	ast$1.AST = void 0;
 	const brace_expressions_js_1 = requireBraceExpressions();
 	const unescape_js_1 = require_unescape();
 	const types = new Set(['!', '?', '+', '*', '@']);
 	const isExtglobType = (c) => types.has(c);
+	const isExtglobAST = (c) => isExtglobType(c.type);
+	// Map of which extglob types can adopt the children of a nested extglob
+	//
+	// anything but ! can adopt a matching type:
+	// +(a|+(b|c)|d) => +(a|b|c|d)
+	// *(a|*(b|c)|d) => *(a|b|c|d)
+	// @(a|@(b|c)|d) => @(a|b|c|d)
+	// ?(a|?(b|c)|d) => ?(a|b|c|d)
+	//
+	// * can adopt anything, because 0 or repetition is allowed
+	// *(a|?(b|c)|d) => *(a|b|c|d)
+	// *(a|+(b|c)|d) => *(a|b|c|d)
+	// *(a|@(b|c)|d) => *(a|b|c|d)
+	//
+	// + can adopt @, because 1 or repetition is allowed
+	// +(a|@(b|c)|d) => +(a|b|c|d)
+	//
+	// + and @ CANNOT adopt *, because 0 would be allowed
+	// +(a|*(b|c)|d) => would match "", on *(b|c)
+	// @(a|*(b|c)|d) => would match "", on *(b|c)
+	//
+	// + and @ CANNOT adopt ?, because 0 would be allowed
+	// +(a|?(b|c)|d) => would match "", on ?(b|c)
+	// @(a|?(b|c)|d) => would match "", on ?(b|c)
+	//
+	// ? can adopt @, because 0 or 1 is allowed
+	// ?(a|@(b|c)|d) => ?(a|b|c|d)
+	//
+	// ? and @ CANNOT adopt * or +, because >1 would be allowed
+	// ?(a|*(b|c)|d) => would match bbb on *(b|c)
+	// @(a|*(b|c)|d) => would match bbb on *(b|c)
+	// ?(a|+(b|c)|d) => would match bbb on +(b|c)
+	// @(a|+(b|c)|d) => would match bbb on +(b|c)
+	//
+	// ! CANNOT adopt ! (nothing else can either)
+	// !(a|!(b|c)|d) => !(a|b|c|d) would fail to match on b (not not b|c)
+	//
+	// ! can adopt @
+	// !(a|@(b|c)|d) => !(a|b|c|d)
+	//
+	// ! CANNOT adopt *
+	// !(a|*(b|c)|d) => !(a|b|c|d) would match on bbb, not allowed
+	//
+	// ! CANNOT adopt +
+	// !(a|+(b|c)|d) => !(a|b|c|d) would match on bbb, not allowed
+	//
+	// ! CANNOT adopt ?
+	// x!(a|?(b|c)|d) => x!(a|b|c|d) would fail to match "x"
+	const adoptionMap = new Map([
+	    ['!', ['@']],
+	    ['?', ['?', '@']],
+	    ['@', ['@']],
+	    ['*', ['*', '+', '?', '@']],
+	    ['+', ['+', '@']],
+	]);
+	// nested extglobs that can be adopted in, but with the addition of
+	// a blank '' element.
+	const adoptionWithSpaceMap = new Map([
+	    ['!', ['?']],
+	    ['@', ['?']],
+	    ['+', ['?', '*']],
+	]);
+	// union of the previous two maps
+	const adoptionAnyMap = new Map([
+	    ['!', ['?', '@']],
+	    ['?', ['?', '@']],
+	    ['@', ['?', '@']],
+	    ['*', ['*', '+', '?', '@']],
+	    ['+', ['+', '@', '?', '*']],
+	]);
+	// Extglobs that can take over their parent if they are the only child
+	// the key is parent, value maps child to resulting extglob parent type
+	// '@' is omitted because it's a special case. An `@` extglob with a single
+	// member can always be usurped by that subpattern.
+	const usurpMap = new Map([
+	    ['!', new Map([['!', '@']])],
+	    [
+	        '?',
+	        new Map([
+	            ['*', '*'],
+	            ['+', '*'],
+	        ]),
+	    ],
+	    [
+	        '@',
+	        new Map([
+	            ['!', '!'],
+	            ['?', '?'],
+	            ['@', '@'],
+	            ['*', '*'],
+	            ['+', '+'],
+	        ]),
+	    ],
+	    [
+	        '+',
+	        new Map([
+	            ['?', '*'],
+	            ['*', '*'],
+	        ]),
+	    ],
+	]);
 	// Patterns that get prepended to bind to the start of either the
 	// entire string, or just a single path portion, to prevent dots
 	// and/or traversal patterns, when needed.
@@ -23237,6 +23339,7 @@ function requireAst$1 () {
 	const starNoEmpty = qmark + '+?';
 	// remove the \ chars that we added if we end up doing a nonmagic compare
 	// const deslash = (s: string) => s.replace(/\\(.)/g, '$1')
+	let ID = 0;
 	class AST {
 	    type;
 	    #root;
@@ -23252,6 +23355,22 @@ function requireAst$1 () {
 	    // set to true if it's an extglob with no children
 	    // (which really means one child of '')
 	    #emptyExt = false;
+	    id = ++ID;
+	    get depth() {
+	        return (this.#parent?.depth ?? -1) + 1;
+	    }
+	    [Symbol.for('nodejs.util.inspect.custom')]() {
+	        return {
+	            '@@type': 'AST',
+	            id: this.id,
+	            type: this.type,
+	            root: this.#root.id,
+	            parent: this.#parent?.id,
+	            depth: this.depth,
+	            partsLength: this.#parts.length,
+	            parts: this.#parts,
+	        };
+	    }
 	    constructor(type, parent, options = {}) {
 	        this.type = type;
 	        // extglobs are inherently magical
@@ -23331,7 +23450,7 @@ function requireAst$1 () {
 	                continue;
 	            /* c8 ignore start */
 	            if (typeof p !== 'string' &&
-	                !(p instanceof AST && p.#parent === this)) {
+	                !(p instanceof _a && p.#parent === this)) {
 	                throw new Error('invalid part: ' + p);
 	            }
 	            /* c8 ignore stop */
@@ -23365,7 +23484,7 @@ function requireAst$1 () {
 	        const p = this.#parent;
 	        for (let i = 0; i < this.#parentIndex; i++) {
 	            const pp = p.#parts[i];
-	            if (!(pp instanceof AST && pp.type === '!')) {
+	            if (!(pp instanceof _a && pp.type === '!')) {
 	                return false;
 	            }
 	        }
@@ -23393,13 +23512,14 @@ function requireAst$1 () {
 	            this.push(part.clone(this));
 	    }
 	    clone(parent) {
-	        const c = new AST(this.type, parent);
+	        const c = new _a(this.type, parent);
 	        for (const p of this.#parts) {
 	            c.copyIn(p);
 	        }
 	        return c;
 	    }
-	    static #parseAST(str, ast, pos, opt) {
+	    static #parseAST(str, ast, pos, opt, extDepth) {
+	        const maxDepth = opt.maxExtglobRecursion ?? 2;
 	        let escaping = false;
 	        let inBrace = false;
 	        let braceStart = -1;
@@ -23436,11 +23556,17 @@ function requireAst$1 () {
 	                    acc += c;
 	                    continue;
 	                }
-	                if (!opt.noext && isExtglobType(c) && str.charAt(i) === '(') {
+	                // we don't have to check for adoption here, because that's
+	                // done at the other recursion point.
+	                const doRecurse = !opt.noext &&
+	                    isExtglobType(c) &&
+	                    str.charAt(i) === '(' &&
+	                    extDepth <= maxDepth;
+	                if (doRecurse) {
 	                    ast.push(acc);
 	                    acc = '';
-	                    const ext = new AST(c, ast);
-	                    i = AST.#parseAST(str, ext, i, opt);
+	                    const ext = new _a(c, ast);
+	                    i = _a.#parseAST(str, ext, i, opt, extDepth + 1);
 	                    ast.push(ext);
 	                    continue;
 	                }
@@ -23452,7 +23578,7 @@ function requireAst$1 () {
 	        // some kind of extglob, pos is at the (
 	        // find the next | or )
 	        let i = pos + 1;
-	        let part = new AST(null, ast);
+	        let part = new _a(null, ast);
 	        const parts = [];
 	        let acc = '';
 	        while (i < str.length) {
@@ -23483,19 +23609,26 @@ function requireAst$1 () {
 	                acc += c;
 	                continue;
 	            }
-	            if (isExtglobType(c) && str.charAt(i) === '(') {
+	            const doRecurse = !opt.noext &&
+	                isExtglobType(c) &&
+	                str.charAt(i) === '(' &&
+	                /* c8 ignore start - the maxDepth is sufficient here */
+	                (extDepth <= maxDepth || (ast && ast.#canAdoptType(c)));
+	            /* c8 ignore stop */
+	            if (doRecurse) {
+	                const depthAdd = ast && ast.#canAdoptType(c) ? 0 : 1;
 	                part.push(acc);
 	                acc = '';
-	                const ext = new AST(c, part);
+	                const ext = new _a(c, part);
 	                part.push(ext);
-	                i = AST.#parseAST(str, ext, i, opt);
+	                i = _a.#parseAST(str, ext, i, opt, extDepth + depthAdd);
 	                continue;
 	            }
 	            if (c === '|') {
 	                part.push(acc);
 	                acc = '';
 	                parts.push(part);
-	                part = new AST(null, ast);
+	                part = new _a(null, ast);
 	                continue;
 	            }
 	            if (c === ')') {
@@ -23517,9 +23650,82 @@ function requireAst$1 () {
 	        ast.#parts = [str.substring(pos - 1)];
 	        return i;
 	    }
+	    #canAdoptWithSpace(child) {
+	        return this.#canAdopt(child, adoptionWithSpaceMap);
+	    }
+	    #canAdopt(child, map = adoptionMap) {
+	        if (!child ||
+	            typeof child !== 'object' ||
+	            child.type !== null ||
+	            child.#parts.length !== 1 ||
+	            this.type === null) {
+	            return false;
+	        }
+	        const gc = child.#parts[0];
+	        if (!gc || typeof gc !== 'object' || gc.type === null) {
+	            return false;
+	        }
+	        return this.#canAdoptType(gc.type, map);
+	    }
+	    #canAdoptType(c, map = adoptionAnyMap) {
+	        return !!map.get(this.type)?.includes(c);
+	    }
+	    #adoptWithSpace(child, index) {
+	        const gc = child.#parts[0];
+	        const blank = new _a(null, gc, this.options);
+	        blank.#parts.push('');
+	        gc.push(blank);
+	        this.#adopt(child, index);
+	    }
+	    #adopt(child, index) {
+	        const gc = child.#parts[0];
+	        this.#parts.splice(index, 1, ...gc.#parts);
+	        for (const p of gc.#parts) {
+	            if (typeof p === 'object')
+	                p.#parent = this;
+	        }
+	        this.#toString = undefined;
+	    }
+	    #canUsurpType(c) {
+	        const m = usurpMap.get(this.type);
+	        return !!(m?.has(c));
+	    }
+	    #canUsurp(child) {
+	        if (!child ||
+	            typeof child !== 'object' ||
+	            child.type !== null ||
+	            child.#parts.length !== 1 ||
+	            this.type === null ||
+	            this.#parts.length !== 1) {
+	            return false;
+	        }
+	        const gc = child.#parts[0];
+	        if (!gc || typeof gc !== 'object' || gc.type === null) {
+	            return false;
+	        }
+	        return this.#canUsurpType(gc.type);
+	    }
+	    #usurp(child) {
+	        const m = usurpMap.get(this.type);
+	        const gc = child.#parts[0];
+	        const nt = m?.get(gc.type);
+	        /* c8 ignore start - impossible */
+	        if (!nt)
+	            return false;
+	        /* c8 ignore stop */
+	        this.#parts = gc.#parts;
+	        for (const p of this.#parts) {
+	            if (typeof p === 'object') {
+	                p.#parent = this;
+	            }
+	        }
+	        this.type = nt;
+	        this.#toString = undefined;
+	        this.#emptyExt = false;
+	    }
 	    static fromGlob(pattern, options = {}) {
-	        const ast = new AST(null, undefined, options);
-	        AST.#parseAST(pattern, ast, 0, options);
+	        const ast = new _a(null, undefined, options);
+	        _a.#parseAST(pattern, ast, 0, options, 0);
 	        return ast;
 	    }
 	    // returns the regular expression if there's magic, or the unescaped
@@ -23623,16 +23829,18 @@ function requireAst$1 () {
 	    // or start or whatever) and prepend ^ or / at the Regexp construction.
 	    toRegExpSource(allowDot) {
 	        const dot = allowDot ?? !!this.#options.dot;
-	        if (this.#root === this)
+	        if (this.#root === this) {
+	            this.#flatten();
 	            this.#fillNegs();
-	        if (!this.type) {
+	        }
+	        if (!isExtglobAST(this)) {
 	            const noEmpty = this.isStart() &&
 	                this.isEnd() &&
 	                !this.#parts.some(s => typeof s !== 'string');
 	            const src = this.#parts
 	                .map(p => {
 	                const [re, _, hasMagic, uflag] = typeof p === 'string' ?
-	                    AST.#parseGlob(p, this.#hasMagic, noEmpty)
+	                    _a.#parseGlob(p, this.#hasMagic, noEmpty)
 	                    : p.toRegExpSource(allowDot);
 	                this.#hasMagic = this.#hasMagic || hasMagic;
 	                this.#uflag = this.#uflag || uflag;
@@ -23694,12 +23902,12 @@ function requireAst$1 () {
 	            // invalid extglob, has to at least be *something* present, if it's
 	            // the entire path portion.
 	            const s = this.toString();
-	            this.#parts = [s];
-	            this.type = null;
-	            this.#hasMagic = undefined;
+	            const me = this;
+	            me.#parts = [s];
+	            me.type = null;
+	            me.#hasMagic = undefined;
 	            return [s, (0, unescape_js_1.unescape)(this.toString()), false, false];
 	        }
-	        // XXX abstract out this map method
 	        let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot ?
 	            ''
 	            : this.#partsToRegExp(true);
@@ -23735,6 +23943,42 @@ function requireAst$1 () {
 	            this.#uflag,
 	        ];
 	    }
+	    #flatten() {
+	        if (!isExtglobAST(this)) {
+	            for (const p of this.#parts) {
+	                if (typeof p === 'object') {
+	                    p.#flatten();
+	                }
+	            }
+	        }
+	        else {
+	            // do up to 10 passes to flatten as much as possible
+	            let iterations = 0;
+	            let done = false;
+	            do {
+	                done = true;
+	                for (let i = 0; i < this.#parts.length; i++) {
+	                    const c = this.#parts[i];
+	                    if (typeof c === 'object') {
+	                        c.#flatten();
+	                        if (this.#canAdopt(c)) {
+	                            done = false;
+	                            this.#adopt(c, i);
+	                        }
+	                        else if (this.#canAdoptWithSpace(c)) {
+	                            done = false;
+	                            this.#adoptWithSpace(c, i);
+	                        }
+	                        else if (this.#canUsurp(c)) {
+	                            done = false;
+	                            this.#usurp(c);
+	                        }
+	                    }
+	                }
+	            } while (!done && ++iterations < 10);
+	        }
+	        this.#toString = undefined;
+	    }
 	    #partsToRegExp(dot) {
 	        return this.#parts
 	            .map(p => {
@@ -23806,6 +24050,7 @@ function requireAst$1 () {
 	    }
 	}
 	ast$1.AST = AST;
+	_a = AST;
 	
 	return ast$1;
 }
@@ -24058,11 +24303,13 @@ function requireCommonjs () {
 		    isWindows;
 		    platform;
 		    windowsNoMagicRoot;
+		    maxGlobstarRecursion;
 		    regexp;
 		    constructor(pattern, options = {}) {
 		        (0, assert_valid_pattern_js_1.assertValidPattern)(pattern);
 		        options = options || {};
 		        this.options = options;
+		        this.maxGlobstarRecursion = options.maxGlobstarRecursion ?? 200;
 		        this.pattern = pattern;
 		        this.platform = options.platform || defaultPlatform;
 		        this.isWindows = this.platform === 'win32';
@@ -24467,7 +24714,8 @@ function requireCommonjs () {
 		    // out of pattern, then that's fine, as long as all
 		    // the parts match.
 		    matchOne(file, pattern, partial = false) {
-		        const options = this.options;
+		        let fileStartIndex = 0;
+		        let patternStartIndex = 0;
 		        // UNC paths like //?/X:/... can match X:/... and vice versa
 		        // Drive letters in absolute drive or unc paths are always compared
 		        // case-insensitively.
@@ -24496,14 +24744,11 @@ function requireCommonjs () {
 		                    file[fdi],
 		                    pattern[pdi],
 		                ];
+		                // start matching at the drive letter index of each
 		                if (fd.toLowerCase() === pd.toLowerCase()) {
 		                    pattern[pdi] = fd;
-		                    if (pdi > fdi) {
-		                        pattern = pattern.slice(pdi);
-		                    }
-		                    else if (fdi > pdi) {
-		                        file = file.slice(fdi);
-		                    }
+		                    patternStartIndex = pdi;
+		                    fileStartIndex = fdi;
 		                }
 		            }
 		        }
@@ -24513,99 +24758,185 @@ function requireCommonjs () {
 		        if (optimizationLevel >= 2) {
 		            file = this.levelTwoFileOptimize(file);
 		        }
-		        this.debug('matchOne', this, { file, pattern });
-		        this.debug('matchOne', file.length, pattern.length);
-		        for (var fi = 0, pi = 0, fl = file.length, pl = pattern.length; fi < fl && pi < pl; fi++, pi++) {
+		        if (pattern.includes(exports$1.GLOBSTAR)) {
+		            return this.#matchGlobstar(file, pattern, partial, fileStartIndex, patternStartIndex);
+		        }
+		        return this.#matchOne(file, pattern, partial, fileStartIndex, patternStartIndex);
+		    }
+		    #matchGlobstar(file, pattern, partial, fileIndex, patternIndex) {
+		        // split the pattern into head, tail, and middle of ** delimited parts
+		        const firstgs = pattern.indexOf(exports$1.GLOBSTAR, patternIndex);
+		        const lastgs = pattern.lastIndexOf(exports$1.GLOBSTAR);
+		        // split the pattern up into globstar-delimited sections
+		        // the tail has to be at the end, and the others just have
+		        // to be found in order from the head.
+		        const [head, body, tail] = partial ? [
+		            pattern.slice(patternIndex, firstgs),
+		            pattern.slice(firstgs + 1),
+		            [],
+		        ] : [
+		            pattern.slice(patternIndex, firstgs),
+		            pattern.slice(firstgs + 1, lastgs),
+		            pattern.slice(lastgs + 1),
+		        ];
+		        // check the head, from the current file/pattern index.
+		        if (head.length) {
+		            const fileHead = file.slice(fileIndex, fileIndex + head.length);
+		            if (!this.#matchOne(fileHead, head, partial, 0, 0)) {
+		                return false;
+		            }
+		            fileIndex += head.length;
+		            patternIndex += head.length;
+		        }
+		        // now we know the head matches!
+		        // if the last portion is not empty, it MUST match the end
+		        // check the tail
+		        let fileTailMatch = 0;
+		        if (tail.length) {
+		            // if head + tail > file, then we cannot possibly match
+		            if (tail.length + fileIndex > file.length)
+		                return false;
+		            // try to match the tail
+		            let tailStart = file.length - tail.length;
+		            if (this.#matchOne(file, tail, partial, tailStart, 0)) {
+		                fileTailMatch = tail.length;
+		            }
+		            else {
+		                // affordance for stuff like a/**/* matching a/b/
+		                // if the last file portion is '', and there's more to the pattern
+		                // then try without the '' bit.
+		                if (file[file.length - 1] !== '' ||
+		                    fileIndex + tail.length === file.length) {
+		                    return false;
+		                }
+		                tailStart--;
+		                if (!this.#matchOne(file, tail, partial, tailStart, 0)) {
+		                    return false;
+		                }
+		                fileTailMatch = tail.length + 1;
+		            }
+		        }
+		        // now we know the tail matches!
+		        // the middle is zero or more portions wrapped in **, possibly
+		        // containing more ** sections.
+		        // so a/**/b/**/c/**/d has become **/b/**/c/**
+		        // if it's empty, it means a/**/b, just verify we have no bad dots
+		        // if there's no tail, so it ends on /**, then we must have *something*
+		        // after the head, or it's not a matc
+		        if (!body.length) {
+		            let sawSome = !!fileTailMatch;
+		            for (let i = fileIndex; i < file.length - fileTailMatch; i++) {
+		                const f = String(file[i]);
+		                sawSome = true;
+		                if (f === '.' ||
+		                    f === '..' ||
+		                    (!this.options.dot && f.startsWith('.'))) {
+		                    return false;
+		                }
+		            }
+		            // in partial mode, we just need to get past all file parts
+		            return partial || sawSome;
+		        }
+		        // now we know that there's one or more body sections, which can
+		        // be matched anywhere from the 0 index (because the head was pruned)
+		        // through to the length-fileTailMatch index.
+		        // split the body up into sections, and note the minimum index it can
+		        // be found at (start with the length of all previous segments)
+		        // [section, before, after]
+		        const bodySegments = [[[], 0]];
+		        let currentBody = bodySegments[0];
+		        let nonGsParts = 0;
+		        const nonGsPartsSums = [0];
+		        for (const b of body) {
+		            if (b === exports$1.GLOBSTAR) {
+		                nonGsPartsSums.push(nonGsParts);
+		                currentBody = [[], 0];
+		                bodySegments.push(currentBody);
+		            }
+		            else {
+		                currentBody[0].push(b);
+		                nonGsParts++;
+		            }
+		        }
+		        let i = bodySegments.length - 1;
+		        const fileLength = file.length - fileTailMatch;
+		        for (const b of bodySegments) {
+		            b[1] = fileLength - (nonGsPartsSums[i--] + b[0].length);
+		        }
+		        return !!this.#matchGlobStarBodySections(file, bodySegments, fileIndex, 0, partial, 0, !!fileTailMatch);
+		    }
+		    // return false for "nope, not matching"
+		    // return null for "not matching, cannot keep trying"
+		    #matchGlobStarBodySections(file, 
+		    // pattern section, last possible position for it
+		    bodySegments, fileIndex, bodyIndex, partial, globStarDepth, sawTail) {
+		        // take the first body segment, and walk from fileIndex to its "after"
+		        // value at the end
+		        // If it doesn't match at that position, we increment, until we hit
+		        // that final possible position, and give up.
+		        // If it does match, then advance and try to rest.
+		        // If any of them fail we keep walking forward.
+		        // this is still a bit recursively painful, but it's more constrained
+		        // than previous implementations, because we never test something that
+		        // can't possibly be a valid matching condition.
+		        const bs = bodySegments[bodyIndex];
+		        if (!bs) {
+		            // just make sure that there's no bad dots
+		            for (let i = fileIndex; i < file.length; i++) {
+		                sawTail = true;
+		                const f = file[i];
+		                if (f === '.' ||
+		                    f === '..' ||
+		                    (!this.options.dot && f.startsWith('.'))) {
+		                    return false;
+		                }
+		            }
+		            return sawTail;
+		        }
+		        // have a non-globstar body section to test
+		        const [body, after] = bs;
+		        while (fileIndex <= after) {
+		            const m = this.#matchOne(file.slice(0, fileIndex + body.length), body, partial, fileIndex, 0);
+		            // if limit exceeded, no match. intentional false negative,
+		            // acceptable break in correctness for security.
+		            if (m && globStarDepth < this.maxGlobstarRecursion) {
+		                // match! see if the rest match. if so, we're done!
+		                const sub = this.#matchGlobStarBodySections(file, bodySegments, fileIndex + body.length, bodyIndex + 1, partial, globStarDepth + 1, sawTail);
+		                if (sub !== false) {
+		                    return sub;
+		                }
+		            }
+		            const f = file[fileIndex];
+		            if (f === '.' ||
+		                f === '..' ||
+		                (!this.options.dot && f.startsWith('.'))) {
+		                return false;
+		            }
+		            fileIndex++;
+		        }
+		        // walked off. no point continuing
+		        return partial || null;
+		    }
+		    #matchOne(file, pattern, partial, fileIndex, patternIndex) {
+		        let fi;
+		        let pi;
+		        let pl;
+		        let fl;
+		        for (fi = fileIndex,
+		            pi = patternIndex,
+		            fl = file.length,
+		            pl = pattern.length; fi < fl && pi < pl; fi++, pi++) {
 		            this.debug('matchOne loop');
-		            var p = pattern[pi];
-		            var f = file[fi];
+		            let p = pattern[pi];
+		            let f = file[fi];
 		            this.debug(pattern, p, f);
 		            // should be impossible.
 		            // some invalid regexp stuff in the set.
 		            /* c8 ignore start */
-		            if (p === false) {
+		            if (p === false || p === exports$1.GLOBSTAR) {
 		                return false;
 		            }
 		            /* c8 ignore stop */
-		            if (p === exports$1.GLOBSTAR) {
-		                this.debug('GLOBSTAR', [pattern, p, f]);
-		                // "**"
-		                // a/**/b/**/c would match the following:
-		                // a/b/x/y/z/c
-		                // a/x/y/z/b/c
-		                // a/b/x/b/x/c
-		                // a/b/c
-		                // To do this, take the rest of the pattern after
-		                // the **, and see if it would match the file remainder.
-		                // If so, return success.
-		                // If not, the ** "swallows" a segment, and try again.
-		                // This is recursively awful.
-		                //
-		                // a/**/b/**/c matching a/b/x/y/z/c
-		                // - a matches a
-		                // - doublestar
-		                //   - matchOne(b/x/y/z/c, b/**/c)
-		                //     - b matches b
-		                //     - doublestar
-		                //       - matchOne(x/y/z/c, c) -> no
-		                //       - matchOne(y/z/c, c) -> no
-		                //       - matchOne(z/c, c) -> no
-		                //       - matchOne(c, c) yes, hit
-		                var fr = fi;
-		                var pr = pi + 1;
-		                if (pr === pl) {
-		                    this.debug('** at the end');
-		                    // a ** at the end will just swallow the rest.
-		                    // We have found a match.
-		                    // however, it will not swallow /.x, unless
-		                    // options.dot is set.
-		                    // . and .. are *never* matched by **, for explosively
-		                    // exponential reasons.
-		                    for (; fi < fl; fi++) {
-		                        if (file[fi] === '.' ||
-		                            file[fi] === '..' ||
-		                            (!options.dot && file[fi].charAt(0) === '.'))
-		                            return false;
-		                    }
-		                    return true;
-		                }
-		                // ok, let's see if we can swallow whatever we can.
-		                while (fr < fl) {
-		                    var swallowee = file[fr];
-		                    this.debug('\nglobstar while', file, fr, pattern, pr, swallowee);
-		                    // XXX remove this slice.  Just pass the start index.
-		                    if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
-		                        this.debug('globstar found match!', fr, fl, swallowee);
-		                        // found a match.
-		                        return true;
-		                    }
-		                    else {
-		                        // can't swallow "." or ".." ever.
-		                        // can only swallow ".foo" when explicitly asked.
-		                        if (swallowee === '.' ||
-		                            swallowee === '..' ||
-		                            (!options.dot && swallowee.charAt(0) === '.')) {
-		                            this.debug('dot detected!', file, fr, pattern, pr);
-		                            break;
-		                        }
-		                        // ** swallows a segment, and continue.
-		                        this.debug('globstar swallow a segment, and continue');
-		                        fr++;
-		                    }
-		                }
-		                // no match was found.
-		                // However, in partial mode, we can't say this is necessarily over.
-		                /* c8 ignore start */
-		                if (partial) {
-		                    // ran out of file
-		                    this.debug('\n>>> no match, partial?', file, fr, pattern, pr);
-		                    if (fr === fl) {
-		                        return true;
-		                    }
-		                }
-		                /* c8 ignore stop */
-		                return false;
-		            }
 		            // something other than **
 		            // non-magic patterns just have to match exactly
 		            // patterns with magic have been turned into regexps.
@@ -25065,8 +25396,12 @@ function requireCjs$1 () {
 	/** @import * as $typests from "./types.ts"; */
 	/** @typedef {$typests.BuiltInMergeStrategy} BuiltInMergeStrategy */
 	/** @typedef {$typests.BuiltInValidationStrategy} BuiltInValidationStrategy */
+	/** @typedef {$typests.CustomMergeStrategy} CustomMergeStrategy */
+	/** @typedef {$typests.CustomValidationStrategy} CustomValidationStrategy */
 	/** @typedef {$typests.ObjectDefinition} ObjectDefinition */
 	/** @typedef {$typests.PropertyDefinition} PropertyDefinition */
+	/** @typedef {$typests.PropertyDefinitionWithSchema} PropertyDefinitionWithSchema */
+	/** @typedef {$typests.PropertyDefinitionWithStrategies} PropertyDefinitionWithStrategies */
 
 	//-----------------------------------------------------------------------------
 	// Private
@@ -25579,6 +25914,9 @@ function requireCjs () {
 
 		/** @import * as $typests from "./types.ts"; */
 		/** @typedef {$typests.ConfigObject} ConfigObject */
+		/** @typedef {$typests.FileMatcher} FileMatcher */
+		/** @typedef {$typests.FilesMatcher} FilesMatcher */
+		/** @typedef {$typests.ExtraConfigType} ExtraConfigType */
 		/** @import * as $minimatch from "minimatch"; */
 		/** @typedef {$minimatch.MinimatchOptions} MinimatchOptions */
 		/** @import * as PathImpl from "@jsr/std__path" */
@@ -25621,7 +25959,7 @@ function requireCjs () {
 
 		/**
 		 * The types of config objects that are supported.
-		 * @type {Set<string>}
+		 * @type {Set<ExtraConfigType>}
 		 */
 		const CONFIG_TYPES = new Set(["array", "function"]);
 
@@ -25706,7 +26044,7 @@ function requireCjs () {
 
 		/**
 		 * Rethrows a config error with additional information about the config object.
-		 * @param {object} config The config object to get the name of.
+		 * @param {ConfigObject} config The config object to get the name of.
 		 * @param {number} index The index of the config object in the array.
 		 * @param {Error} error The error to rethrow.
 		 * @throws {ConfigError} When the error is rethrown for a config.
@@ -25719,7 +26057,7 @@ function requireCjs () {
 		/**
 		 * Shorthand for checking if a value is a string.
 		 * @param {any} value The value to check.
-		 * @returns {boolean} True if a string, false if not.
+		 * @returns {value is string} True if a string, false if not.
 		 */
 		function isString(value) {
 			return typeof value === "string";
@@ -25779,8 +26117,8 @@ function requireCjs () {
 		 * faster matching speed over multiple file path evaluations.
 		 * @param {string} filepath The file path to match.
 		 * @param {string} pattern The glob pattern to match against.
-		 * @param {object} options The minimatch options to use.
-		 * @returns
+		 * @param {MinimatchOptions} options The minimatch options to use.
+		 * @returns {boolean} True if the file path matches, false if not.
 		 */
 		function doMatch(filepath, pattern, options = {}) {
 			let cache = minimatchCache;
@@ -25804,8 +26142,8 @@ function requireCjs () {
 
 		/**
 		 * Normalizes a pattern by removing the leading "./" if present.
-		 * @param {string} pattern The pattern to normalize.
-		 * @returns {string} The normalized pattern.
+		 * @param {FileMatcher} pattern The pattern to normalize.
+		 * @returns {FileMatcher} The normalized pattern.
 		 */
 		function normalizePattern(pattern) {
 			if (isString(pattern)) {
@@ -25906,7 +26244,7 @@ function requireCjs () {
 		 * @param {Array} items The items in a `ConfigArray`.
 		 * @param {Object} context The context object to pass into any function
 		 *      found.
-		 * @param {Array<string>} extraConfigTypes The config types to check.
+		 * @param {ReadonlyArray<ExtraConfigType>} extraConfigTypes The config types to check.
 		 * @param {string} namespacedBasePath The namespaced base path of the directory to which config base paths are relative.
 		 * @param {PathImpl} path Path-handling implementation.
 		 * @returns {Promise<Array>} A flattened array containing only config objects.
@@ -25954,7 +26292,7 @@ function requireCjs () {
 			 * Async iterables cannot be used with the spread operator, so we need to manually
 			 * create the array to return.
 			 */
-			const asyncIterable = await flatTraverse(items);
+			const asyncIterable = flatTraverse(items);
 			const configs = [];
 
 			for await (const config of asyncIterable) {
@@ -25970,7 +26308,7 @@ function requireCjs () {
 		 * @param {Array} items The items in a `ConfigArray`.
 		 * @param {Object} context The context object to pass into any function
 		 *      found.
-		 * @param {Array<string>} extraConfigTypes The config types to check.
+		 * @param {ReadonlyArray<ExtraConfigType>} extraConfigTypes The config types to check.
 		 * @param {string} namespacedBasePath The namespaced base path of the directory to which config base paths are relative.
 		 * @param {PathImpl} path Path-handling implementation
 		 * @returns {Array} A flattened array containing only config objects.
@@ -26043,13 +26381,13 @@ function requireCjs () {
 		/**
 		 * Determines if a given file path should be ignored based on the given
 		 * matcher.
-		 * @param {Array<{ basePath?: string, ignores: Array<string|((string) => boolean)>}>} configs Configuration objects containing `ignores`.
+		 * @param {Array<{ basePath?: string, ignores: FileMatcher[] }>} configs Configuration objects containing `ignores`.
 		 * @param {string} filePath The unprocessed file path to check.
 		 * @param {string} relativeFilePath The path of the file to check relative to the base path,
 		 * 		using forward slash (`"/"`) as a separator.
 		 * @param {Object} [basePathData] Additional data needed to recalculate paths for configuration objects
 		 *  	that have `basePath` property.
-		 * @param {string} [basePathData.basePath] Namespaced path to witch `relativeFilePath` is relative.
+		 * @param {string} [basePathData.basePath] Namespaced path to which `relativeFilePath` is relative.
 		 * @param {PathImpl} [basePathData.path] Path-handling implementation.
 		 * @returns {boolean} True if the path should be ignored and false if not.
 		 */
@@ -26118,7 +26456,7 @@ function requireCjs () {
 		 * @param {string} filePath The unprocessed file path to check.
 		 * @param {string} relativeFilePath The path of the file to check relative to the base path,
 		 * 		using forward slash (`"/"`) as a separator.
-		 * @param {Object} config The config object to check.
+		 * @param {ConfigObject & { files: FilesMatcher[] }} config The config object to check.
 		 * @returns {boolean} True if the file path is matched by the config,
 		 *      false if not.
 		 */
@@ -26181,21 +26519,23 @@ function requireCjs () {
 
 		/**
 		 * Ensures that config types are valid.
-		 * @param {Array<string>} extraConfigTypes The config types to check.
+		 * @param {ReadonlyArray<ExtraConfigType>} extraConfigTypes The config types to check.
 		 * @returns {void}
 		 * @throws {TypeError} When the config types array is invalid.
 		 */
 		function assertExtraConfigTypes(extraConfigTypes) {
+			if (!Array.isArray(extraConfigTypes)) {
+				throw new TypeError("extraConfigTypes must be an array.");
+			}
+
 			if (extraConfigTypes.length > 2) {
-				throw new TypeError(
-					"configTypes must be an array with at most two items.",
-				);
+				throw new TypeError("extraConfigTypes must contain at most two items.");
 			}
 
 			for (const configType of extraConfigTypes) {
 				if (!CONFIG_TYPES.has(configType)) {
 					throw new TypeError(
-						`Unexpected config type "${configType}" found. Expected one of: "object", "array", "function".`,
+						`Unexpected config type "${configType}" in extraConfigTypes. Expected one of: "array", "function".`,
 					);
 				}
 			}
@@ -26266,9 +26606,9 @@ function requireCjs () {
 			 * 		Defaults to `"/"`.
 			 * @param {boolean} [options.normalized=false] Flag indicating if the
 			 *      configs have already been normalized.
-			 * @param {Object} [options.schema] The additional schema
+			 * @param {ObjectDefinition} [options.schema] The additional schema
 			 *      definitions to use for the ConfigArray schema.
-			 * @param {Array<string>} [options.extraConfigTypes] List of config types supported.
+			 * @param {ReadonlyArray<ExtraConfigType>} [options.extraConfigTypes] List of config types supported.
 			 * @throws {TypeError} When the `basePath` is not a non-empty string,
 			 */
 			constructor(
@@ -26316,7 +26656,7 @@ function requireCjs () {
 
 				/**
 				 * The supported config types.
-				 * @type {Array<string>}
+				 * @type {ReadonlyArray<ExtraConfigType>}
 				 */
 				this.extraConfigTypes = [...extraConfigTypes];
 				Object.freeze(this.extraConfigTypes);
@@ -26369,7 +26709,7 @@ function requireCjs () {
 			 * This can be used to determine which files will be matched by a
 			 * config array or to use as a glob pattern when no patterns are provided
 			 * for a command line interface.
-			 * @returns {Array<string|Function>} An array of matchers.
+			 * @returns {Array<FilesMatcher>} An array of matchers.
 			 */
 			get files() {
 				assertNormalized(this);
@@ -26405,7 +26745,7 @@ function requireCjs () {
 			 * the matching `files` fields in any configs. This is necessary to mimic
 			 * the behavior of things like .gitignore and .eslintignore, allowing a
 			 * globbing operation to be faster.
-			 * @returns {Object[]} An array of config objects representing global ignores.
+			 * @returns {Array<{ basePath?: string, name?: string, ignores: FileMatcher[] }>} An array of config objects representing global ignores.
 			 */
 			get ignores() {
 				assertNormalized(this);
@@ -26424,7 +26764,7 @@ function requireCjs () {
 				for (const config of this) {
 					/*
 					 * We only count ignores if there are no other keys in the object.
-					 * In this case, it acts list a globally ignored pattern. If there
+					 * In this case, it acts like a globally ignored pattern. If there
 					 * are additional keys, then ignores act like exclusions.
 					 */
 					if (
@@ -45691,6 +46031,13 @@ function requireAstUtils () {
 		const globals = requireGlobals();
 		const { LATEST_ECMA_VERSION } = requireEcmaVersion();
 
+		//------------------------------------------------------------------------------
+		// Types
+		//------------------------------------------------------------------------------
+
+		/** @typedef {import("eslint-scope").Scope} Scope */
+		/** @typedef {import("eslint-scope").Variable} Variable */
+
 		//------------------------------------------------------------------------------
 		// Helpers
 		//------------------------------------------------------------------------------
@@ -47250,9 +47597,9 @@ function requireAstUtils () {
 
 			/**
 			 * Finds the variable by a given name in a given scope and its upper scopes.
-			 * @param {eslint-scope.Scope} initScope A scope to start find.
+			 * @param {Scope} initScope A scope to start find.
 			 * @param {string} name A variable name to find.
-			 * @returns {eslint-scope.Variable|null} A found variable or `null`.
+			 * @returns {Variable|null} A found variable or `null`.
 			 */
 			getVariableByName(initScope, name) {
 				let scope = initScope;
@@ -47279,7 +47626,7 @@ function requireAstUtils () {
 			 * - The given node is not `StaticBlock`.
 			 * - The function name does not start with uppercase. It's a convention to capitalize the names
 			 *   of constructor functions. This check is not performed if `capIsConstructor` is set to `false`.
-			 * - The function does not have a JSDoc comment that has a @this tag.
+			 * - The function does not have a JSDoc comment that has a `@this` tag.
 			 *
 			 * Next, this checks the location of the node.
 			 * If the location is below, this judges `this` is valid.
@@ -51331,6 +51678,13 @@ function requireBlockScopedVar () {
 	if (hasRequiredBlockScopedVar) return blockScopedVar;
 	hasRequiredBlockScopedVar = 1;
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Definition} Definition */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Rule Definition
 	//------------------------------------------------------------------------------
@@ -51378,8 +51732,8 @@ function requireBlockScopedVar () {
 
 			/**
 			 * Reports a given reference.
-			 * @param {eslint-scope.Reference} reference A reference to report.
-			 * @param {eslint-scope.Definition} definition A definition for which to report reference.
+			 * @param {Reference} reference A reference to report.
+			 * @param {Definition} definition A definition for which to report reference.
 			 * @returns {void}
 			 */
 			function report(reference, definition) {
@@ -57994,9 +58348,19 @@ function requireFuncNames () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Variable} Variable */
+
+	//------------------------------------------------------------------------------
+	// Helpers
+	//------------------------------------------------------------------------------
+
 	/**
 	 * Checks whether or not a given variable is a function name.
-	 * @param {eslint-scope.Variable} variable A variable to check.
+	 * @param {Variable} variable A variable to check.
 	 * @returns {boolean} `true` if the variable is a function name.
 	 */
 	function isFunctionName(variable) {
@@ -74598,6 +74962,12 @@ function requireNoConsole () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Rule Definition
 	//------------------------------------------------------------------------------
@@ -74649,7 +75019,7 @@ function requireNoConsole () {
 
 			/**
 			 * Checks whether the given reference is 'console' or not.
-			 * @param {eslint-scope.Reference} reference The reference to check.
+			 * @param {Reference} reference The reference to check.
 			 * @returns {boolean} `true` if the reference is 'console'.
 			 */
 			function isConsole(reference) {
@@ -74673,7 +75043,7 @@ function requireNoConsole () {
 			/**
 			 * Checks whether the given reference is a member access which is not
 			 * allowed by options or not.
-			 * @param {eslint-scope.Reference} reference The reference to check.
+			 * @param {Reference} reference The reference to check.
 			 * @returns {boolean} `true` if the reference is a member access which
 			 *      is not allowed by options.
 			 */
@@ -74750,7 +75120,7 @@ function requireNoConsole () {
 
 			/**
 			 * Reports the given reference as a violation.
-			 * @param {eslint-scope.Reference} reference The reference to report.
+			 * @param {Reference} reference The reference to report.
 			 * @returns {void}
 			 */
 			function report(reference) {
@@ -79188,6 +79558,12 @@ function requireNoDupeArgs () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Definition} Definition */
+
 	//------------------------------------------------------------------------------
 	// Rule Definition
 	//------------------------------------------------------------------------------
@@ -79220,7 +79596,7 @@ function requireNoDupeArgs () {
 
 			/**
 			 * Checks whether or not a given definition is a parameter's.
-			 * @param {eslint-scope.DefEntry} def A definition to check.
+			 * @param {Definition} def A definition to check.
 			 * @returns {boolean} `true` if the definition is a parameter's.
 			 */
 			function isParameter(def) {
@@ -80337,6 +80713,12 @@ function requireNoElseReturn () {
 	const astUtils = requireAstUtils();
 	const FixTracker = requireFixTracker();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+
 	//------------------------------------------------------------------------------
 	// Rule Definition
 	//------------------------------------------------------------------------------
@@ -80391,7 +80773,7 @@ function requireNoElseReturn () {
 			 * This is not a generic function. In particular, it is assumed that the scope is a function scope or
 			 * a function's inner scope, and that the names can be valid identifiers in the given scope.
 			 * @param {string[]} names Array of variable names.
-			 * @param {eslint-scope.Scope} scope Function scope or a function's inner scope.
+			 * @param {Scope} scope Function scope or a function's inner scope.
 			 * @returns {boolean} True if all names can be safely declared, false otherwise.
 			 */
 			function isSafeToDeclare(names, scope) {
@@ -80483,7 +80865,7 @@ function requireNoElseReturn () {
 			/**
 			 * Checks whether the removal of `else` and its braces is safe from variable name collisions.
 			 * @param {Node} node The 'else' node.
-			 * @param {eslint-scope.Scope} scope The scope in which the node and the whole 'if' statement is.
+			 * @param {Scope} scope The scope in which the node and the whole 'if' statement is.
 			 * @returns {boolean} True if it is safe, false otherwise.
 			 */
 			function isSafeFromNameCollisions(node, scope) {
@@ -81526,6 +81908,12 @@ function requireNoEval () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -81653,7 +82041,7 @@ function requireNoEval () {
 
 			/**
 			 * Reports accesses of `eval` via the global object.
-			 * @param {eslint-scope.Scope} globalScope The global scope.
+			 * @param {Scope} globalScope The global scope.
 			 * @returns {void}
 			 */
 			function reportAccessingEvalViaGlobalObject(globalScope) {
@@ -81686,7 +82074,7 @@ function requireNoEval () {
 
 			/**
 			 * Reports all accesses of `eval` (excludes direct calls to eval).
-			 * @param {eslint-scope.Scope} globalScope The global scope.
+			 * @param {Scope} globalScope The global scope.
 			 * @returns {void}
 			 */
 			function reportAccessingEval(globalScope) {
@@ -88026,6 +88414,12 @@ function requireNoLoopFunc () {
 	if (hasRequiredNoLoopFunc) return noLoopFunc;
 	hasRequiredNoLoopFunc = 1;
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -88157,7 +88551,7 @@ function requireNoLoopFunc () {
 			 * Checks whether a given reference which refers to an upper scope's variable is
 			 * safe or not.
 			 * @param {ASTNode} loopNode A containing loop node.
-			 * @param {eslint-scope.Reference} reference A reference to check.
+			 * @param {Reference} reference A reference to check.
 			 * @returns {boolean} `true` if the reference is safe or not.
 			 */
 			function isSafe(loopNode, reference) {
@@ -88203,7 +88597,7 @@ function requireNoLoopFunc () {
 				 * It's safe if the reference matches one of the following condition.
 				 * - is readonly.
 				 * - doesn't exist inside a local function and after the border.
-				 * @param {eslint-scope.Reference} upperRef A reference to check.
+				 * @param {Reference} upperRef A reference to check.
 				 * @returns {boolean} `true` if the reference is safe.
 				 */
 				function isSafeReference(upperRef) {
@@ -88931,10 +89325,10 @@ function requireIsCombiningCharacter () {
 	/**
 	 * Check whether a given character is a combining mark or not.
 	 * @param {number} codePoint The character code to check.
-	 * @returns {boolean} `true` if the character belongs to the category, any of `Mc`, `Me`, and `Mn`.
+	 * @returns {boolean} `true` if the character has the General Category of Combining Mark (M), consisting of `Mc`, `Me`, and `Mn`.
 	 */
 	isCombiningCharacter = function isCombiningCharacter(codePoint) {
-		return /^[\p{Mc}\p{Me}\p{Mn}]$/u.test(String.fromCodePoint(codePoint));
+		return /^\p{M}$/u.test(String.fromCodePoint(codePoint));
 	};
 	return isCombiningCharacter;
 }
@@ -97837,6 +98231,12 @@ function requireNoShadow () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Variable} Variable */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -98278,7 +98678,7 @@ function requireNoShadow () {
 
 			/**
 			 * Get declared line and column of a variable.
-			 * @param {eslint-scope.Variable} variable The variable to get.
+			 * @param {Variable} variable The variable to get.
 			 * @returns {Object} The declared line and column of the variable.
 			 */
 			function getDeclaredLocation(variable) {
@@ -100101,6 +100501,12 @@ function requireNoUndefined () {
 	if (hasRequiredNoUndefined) return noUndefined;
 	hasRequiredNoUndefined = 1;
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+
 	//------------------------------------------------------------------------------
 	// Rule Definition
 	//------------------------------------------------------------------------------
@@ -100142,7 +100548,7 @@ function requireNoUndefined () {
 			/**
 			 * Checks the given scope for references to `undefined` and reports
 			 * all references found.
-			 * @param {eslint-scope.Scope} scope The scope to check.
+			 * @param {Scope} scope The scope to check.
 			 * @returns {void}
 			 */
 			function checkScope(scope) {
@@ -100732,6 +101138,13 @@ function requireNoUnmodifiedLoopCondition () {
 	const Traverser = requireTraverser(),
 		astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Variable} Variable */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -100745,7 +101158,7 @@ function requireNoUnmodifiedLoopCondition () {
 
 	/**
 	 * @typedef {Object} LoopConditionInfo
-	 * @property {eslint-scope.Reference} reference - The reference.
+	 * @property {Reference} reference - The reference.
 	 * @property {ASTNode} group - BinaryExpression or ConditionalExpression nodes
 	 *      that the reference is belonging to.
 	 * @property {Function} isInLoop - The predicate which checks a given reference
@@ -100756,7 +101169,7 @@ function requireNoUnmodifiedLoopCondition () {
 
 	/**
 	 * Checks whether or not a given reference is a write reference.
-	 * @param {eslint-scope.Reference} reference A reference to check.
+	 * @param {Reference} reference A reference to check.
 	 * @returns {boolean} `true` if the reference is a write reference.
 	 */
 	function isWriteReference(reference) {
@@ -100793,7 +101206,7 @@ function requireNoUnmodifiedLoopCondition () {
 	/**
 	 * Checks whether or not a given reference is inside of a given node.
 	 * @param {ASTNode} node A node to check.
-	 * @param {eslint-scope.Reference} reference A reference to check.
+	 * @param {Reference} reference A reference to check.
 	 * @returns {boolean} `true` if the reference is inside of the node.
 	 */
 	function isInRange(node, reference) {
@@ -100806,7 +101219,7 @@ function requireNoUnmodifiedLoopCondition () {
 	/**
 	 * Checks whether or not a given reference is inside of a loop node's condition.
 	 * @param {ASTNode} node A node to check.
-	 * @param {eslint-scope.Reference} reference A reference to check.
+	 * @param {Reference} reference A reference to check.
 	 * @returns {boolean} `true` if the reference is inside of the loop node's
 	 *      condition.
 	 */
@@ -100824,7 +101237,7 @@ function requireNoUnmodifiedLoopCondition () {
 	/**
 	 * Gets the function which encloses a given reference.
 	 * This supports only FunctionDeclaration.
-	 * @param {eslint-scope.Reference} reference A reference to get.
+	 * @param {Reference} reference A reference to get.
 	 * @returns {ASTNode|null} The function node or null.
 	 */
 	function getEncloseFunctionDeclaration(reference) {
@@ -100844,7 +101257,7 @@ function requireNoUnmodifiedLoopCondition () {
 	/**
 	 * Updates the "modified" flags of given loop conditions with given modifiers.
 	 * @param {LoopConditionInfo[]} conditions The loop conditions to be updated.
-	 * @param {eslint-scope.Reference[]} modifiers The references to update.
+	 * @param {Reference[]} modifiers The references to update.
 	 * @returns {void}
 	 */
 	function updateModifiedFlag(conditions, modifiers) {
@@ -100978,7 +101391,7 @@ function requireNoUnmodifiedLoopCondition () {
 
 			/**
 			 * Creates the loop condition information from a given reference.
-			 * @param {eslint-scope.Reference} reference A reference to create.
+			 * @param {Reference} reference A reference to create.
 			 * @returns {LoopConditionInfo|null} Created loop condition info, or null.
 			 */
 			function toLoopCondition(reference) {
@@ -101029,7 +101442,7 @@ function requireNoUnmodifiedLoopCondition () {
 			/**
 			 * Finds unmodified references which are inside of a loop condition.
 			 * Then reports the references which are outside of groups.
-			 * @param {eslint-scope.Variable} variable A variable to report.
+			 * @param {Variable} variable A variable to report.
 			 * @returns {void}
 			 */
 			function checkReferences(variable) {
@@ -102989,6 +103402,13 @@ function requireNoUnusedVars () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Variable} Variable */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Typedefs
 	//------------------------------------------------------------------------------
@@ -103502,7 +103922,7 @@ function requireNoUnusedVars () {
 			 * - The reference is inside of a loop.
 			 * - The reference is inside of a function scope which is different from
 			 *   the declaration.
-			 * @param {eslint-scope.Reference} ref A reference to check.
+			 * @param {Reference} ref A reference to check.
 			 * @param {ASTNode} prevRhsNode The previous RHS node.
 			 * @returns {ASTNode|null} The RHS node or null.
 			 * @private
@@ -103609,7 +104029,7 @@ function requireNoUnusedVars () {
 
 			/**
 			 * Checks whether a given reference is a read to update itself or not.
-			 * @param {eslint-scope.Reference} ref A reference to check.
+			 * @param {Reference} ref A reference to check.
 			 * @param {ASTNode} rhsNode The RHS node of the previous assignment.
 			 * @returns {boolean} The reference is a read to update itself.
 			 * @private
@@ -103710,7 +104130,7 @@ function requireNoUnusedVars () {
 
 			/**
 			 * Checks whether the given variable is after the last used parameter.
-			 * @param {eslint-scope.Variable} variable The variable to check.
+			 * @param {Variable} variable The variable to check.
 			 * @returns {boolean} `true` if the variable is defined after the last
 			 * used parameter.
 			 */
@@ -104730,6 +105150,13 @@ function requireNoUseBeforeDefine () {
 	if (hasRequiredNoUseBeforeDefine) return noUseBeforeDefine;
 	hasRequiredNoUseBeforeDefine = 1;
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -104793,7 +105220,7 @@ function requireNoUseBeforeDefine () {
 	/**
 	 * Checks whether a given scope is the scope of a class static initializer.
 	 * Static initializers are static blocks and initializers of static fields.
-	 * @param {eslint-scope.Scope} scope A scope to check.
+	 * @param {Scope} scope A scope to check.
 	 * @returns {boolean} `true` if the scope is a class static initializer scope.
 	 */
 	function isClassStaticInitializerScope(scope) {
@@ -104844,7 +105271,7 @@ function requireNoUseBeforeDefine () {
 	 *           x; // returns `false`
 	 *       }
 	 *   }
-	 * @param {eslint-scope.Reference} reference A reference to check.
+	 * @param {Reference} reference A reference to check.
 	 * @returns {boolean} `true` if the reference is from a separate execution context.
 	 */
 	function isFromSeparateExecutionContext(reference) {
@@ -105058,7 +105485,7 @@ function requireNoUseBeforeDefine () {
 			 * - referring to a variable that is defined, but not in the given source code
 			 *   (e.g., global environment variable or `arguments` in functions).
 			 * - allowed by options.
-			 * @param {eslint-scope.Reference} reference The reference
+			 * @param {Reference} reference The reference
 			 * @returns {boolean} `true` if the reference should be checked
 			 */
 			function shouldCheck(reference) {
@@ -105137,7 +105564,7 @@ function requireNoUseBeforeDefine () {
 
 			/**
 			 * Finds and validates all references in a given scope and its child scopes.
-			 * @param {eslint-scope.Scope} scope The scope object.
+			 * @param {Scope} scope The scope object.
 			 * @returns {void}
 			 */
 			function checkReferencesInScope(scope) {
@@ -105317,7 +105744,7 @@ function requireNoUselessAssignment () {
 
 			messages: {
 				unnecessaryAssignment:
-					"This assigned value is not used in subsequent statements.",
+					"The value assigned to '{{name}}' is not used in subsequent statements.",
 			},
 		},
 
@@ -105665,6 +106092,7 @@ function requireNoUselessAssignment () {
 					context.report({
 						node: targetAssignment.identifier,
 						messageId: "unnecessaryAssignment",
+						data: { name: targetAssignment.identifier.name },
 					});
 				}
 
@@ -107942,13 +108370,21 @@ function requireNoVar () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+	/** @typedef {import("eslint-scope").Variable} Variable */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
 
 	/**
 	 * Check whether a given variable is a global variable or not.
-	 * @param {eslint-scope.Variable} variable The variable to check.
+	 * @param {Variable} variable The variable to check.
 	 * @returns {boolean} `true` if the variable is a global variable.
 	 */
 	function isGlobal(variable) {
@@ -107958,8 +108394,8 @@ function requireNoVar () {
 	/**
 	 * Finds the nearest function scope or global scope walking up the scope
 	 * hierarchy.
-	 * @param {eslint-scope.Scope} scope The scope to traverse.
-	 * @returns {eslint-scope.Scope} a function scope or global scope containing the given
+	 * @param {Scope} scope The scope to traverse.
+	 * @returns {Scope} a function scope or global scope containing the given
 	 *      scope.
 	 */
 	function getEnclosingFunctionScope(scope) {
@@ -107974,7 +108410,7 @@ function requireNoVar () {
 	/**
 	 * Checks whether the given variable has any references from a more specific
 	 * function expression (i.e. a closure).
-	 * @param {eslint-scope.Variable} variable A variable to check.
+	 * @param {Variable} variable A variable to check.
 	 * @returns {boolean} `true` if the variable is used from a closure.
 	 */
 	function isReferencedInClosure(variable) {
@@ -108038,7 +108474,7 @@ function requireNoVar () {
 
 	/**
 	 * Checks whether a given variable is redeclared or not.
-	 * @param {eslint-scope.Variable} variable A variable to check.
+	 * @param {Variable} variable A variable to check.
 	 * @returns {boolean} `true` if the variable is redeclared.
 	 */
 	function isRedeclared(variable) {
@@ -108054,7 +108490,7 @@ function requireNoVar () {
 	function isUsedFromOutsideOf(scopeNode) {
 		/**
 		 * Checks whether a given reference is inside of the specified scope or not.
-		 * @param {eslint-scope.Reference} reference A reference to check.
+		 * @param {Reference} reference A reference to check.
 		 * @returns {boolean} `true` if the reference is inside of the specified
 		 *      scope.
 		 */
@@ -108115,7 +108551,7 @@ function requireNoVar () {
 	/**
 	 * Checks whether a given variable has name that is allowed for 'var' declarations,
 	 * but disallowed for `let` declarations.
-	 * @param {eslint-scope.Variable} variable The variable to check.
+	 * @param {Variable} variable The variable to check.
 	 * @returns {boolean} `true` if the variable has a disallowed name.
 	 */
 	function hasNameDisallowedForLetDeclarations(variable) {
@@ -113018,13 +113454,20 @@ function requirePreferArrowCallback () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+	/** @typedef {import("eslint-scope").Variable} Variable */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
 
 	/**
 	 * Checks whether or not a given variable is a function name.
-	 * @param {eslint-scope.Variable} variable A variable to check.
+	 * @param {Variable} variable A variable to check.
 	 * @returns {boolean} `true` if the variable is a function name.
 	 */
 	function isFunctionName(variable) {
@@ -113044,8 +113487,8 @@ function requirePreferArrowCallback () {
 
 	/**
 	 * Gets the variable object of `arguments` which is defined implicitly.
-	 * @param {eslint-scope.Scope} scope A scope to get.
-	 * @returns {eslint-scope.Variable} The found variable object.
+	 * @param {Scope} scope A scope to get.
+	 * @returns {Variable} The found variable object.
 	 */
 	function getVariableOfArguments(scope) {
 		const variables = scope.variables;
@@ -113468,6 +113911,14 @@ function requirePreferConst () {
 	const FixTracker = requireFixTracker();
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+	/** @typedef {import("eslint-scope").Variable} Variable */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -113512,7 +113963,7 @@ function requirePreferConst () {
 	 * Checks if an property or element is from outer scope or function parameters
 	 * in destructing pattern.
 	 * @param {string} name A variable name to be checked.
-	 * @param {eslint-scope.Scope} initScope A scope to start find.
+	 * @param {Scope} initScope A scope to start find.
 	 * @returns {boolean} Indicates if the variable is from outer scope or function parameters.
 	 */
 	function isOuterVariableInDestructing(name, initScope) {
@@ -113538,7 +113989,7 @@ function requirePreferConst () {
 	 * belongs to.
 	 * This is used to detect a mix of reassigned and never reassigned in a
 	 * destructuring.
-	 * @param {eslint-scope.Reference} reference A reference to get.
+	 * @param {Reference} reference A reference to get.
 	 * @returns {ASTNode|null} A VariableDeclarator/AssignmentExpression node or
 	 *      null.
 	 */
@@ -113624,7 +114075,7 @@ function requirePreferConst () {
 	 *   `/*exported foo` directive comment makes such variables. This rule does not
 	 *   warn such variables because this rule cannot distinguish whether the
 	 *   exported variables are reassigned or not.
-	 * @param {eslint-scope.Variable} variable A variable to get.
+	 * @param {Variable} variable A variable to get.
 	 * @param {boolean} ignoreReadBeforeAssign
 	 *      The value of `ignoreReadBeforeAssign` option.
 	 * @returns {ASTNode|null}
@@ -113724,7 +114175,7 @@ function requirePreferConst () {
 	 * reference of given variables belongs to.
 	 * This is used to detect a mix of reassigned and never reassigned in a
 	 * destructuring.
-	 * @param {eslint-scope.Variable[]} variables Variables to group by destructuring.
+	 * @param {Variable[]} variables Variables to group by destructuring.
 	 * @param {boolean} ignoreReadBeforeAssign
 	 *      The value of `ignoreReadBeforeAssign` option.
 	 * @returns {Map<ASTNode, ASTNode[]>} Grouped identifier nodes.
@@ -113845,7 +114296,7 @@ function requirePreferConst () {
 			 * nullable. In simple declaration or assignment cases, the length of
 			 * the array is 1. In destructuring cases, the length of the array can
 			 * be 2 or more.
-			 * @param {(eslint-scope.Reference|null)[]} nodes
+			 * @param {(Reference|null)[]} nodes
 			 *      References which are grouped by destructuring to report.
 			 * @returns {void}
 			 */
@@ -116387,14 +116838,22 @@ function requirePreferRestParams () {
 	if (hasRequiredPreferRestParams) return preferRestParams;
 	hasRequiredPreferRestParams = 1;
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Scope} Scope */
+	/** @typedef {import("eslint-scope").Variable} Variable */
+	/** @typedef {import("eslint-scope").Reference} Reference */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
 
 	/**
 	 * Gets the variable object of `arguments` which is defined implicitly.
-	 * @param {eslint-scope.Scope} scope A scope to get.
-	 * @returns {eslint-scope.Variable} The found variable object.
+	 * @param {Scope} scope A scope to get.
+	 * @returns {Variable} The found variable object.
 	 */
 	function getVariableOfArguments(scope) {
 		const variables = scope.variables;
@@ -116422,7 +116881,7 @@ function requirePreferRestParams () {
 	 * - arguments[i]      .... true    // computed member access
 	 * - arguments[0]      .... true    // computed member access
 	 * - arguments.length  .... false   // normal member access
-	 * @param {eslint-scope.Reference} reference The reference to check.
+	 * @param {Reference} reference The reference to check.
 	 * @returns {boolean} `true` if the reference is not normal member access.
 	 */
 	function isNotNormalMemberAccess(reference) {
@@ -116463,7 +116922,7 @@ function requirePreferRestParams () {
 
 			/**
 			 * Reports a given reference.
-			 * @param {eslint-scope.Reference} reference A reference to report.
+			 * @param {Reference} reference A reference to report.
 			 * @returns {void}
 			 */
 			function report(reference) {
@@ -118343,6 +118802,12 @@ function requireRadix () {
 
 	const astUtils = requireAstUtils();
 
+	//------------------------------------------------------------------------------
+	// Types
+	//------------------------------------------------------------------------------
+
+	/** @typedef {import("eslint-scope").Variable} Variable */
+
 	//------------------------------------------------------------------------------
 	// Helpers
 	//------------------------------------------------------------------------------
@@ -118353,7 +118818,7 @@ function requireRadix () {
 
 	/**
 	 * Checks whether a given variable is shadowed or not.
-	 * @param {eslint-scope.Variable} variable A variable to check.
+	 * @param {Variable} variable A variable to check.
 	 * @returns {boolean} `true` if the variable is shadowed.
 	 */
 	function isShadowed(variable) {