* Bump the npm group with 6 updates Bumps the npm group with 6 updates: | Package | From | To | | --- | --- | --- | | [@octokit/types](https://github.com/octokit/types.ts) | `11.1.0` | `12.0.0` | | [@types/adm-zip](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/adm-zip) | `0.5.1` | `0.5.2` | | [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver) | `7.5.2` | `7.5.3` | | [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon) | `10.0.16` | `10.0.17` | | [eslint](https://github.com/eslint/eslint) | `8.49.0` | `8.50.0` | | [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript) | `3.6.0` | `3.6.1` | Updates `@octokit/types` from 11.1.0 to 12.0.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v11.1.0...v12.0.0) Updates `@types/adm-zip` from 0.5.1 to 0.5.2 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/adm-zip) Updates `@types/semver` from 7.5.2 to 7.5.3 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver) Updates `@types/sinon` from 10.0.16 to 10.0.17 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon) Updates `eslint` from 8.49.0 to 8.50.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.49.0...v8.50.0) Updates `eslint-import-resolver-typescript` from 3.6.0 to 3.6.1 - [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases) - [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-import-resolver-typescript/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-major dependency-group: npm - dependency-name: "@types/adm-zip" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/semver" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/sinon" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-import-resolver-typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
300 lines
9.9 KiB
JavaScript
300 lines
9.9 KiB
JavaScript
/**
|
|
* @author Toru Nagashima <https://github.com/mysticatea>
|
|
*/
|
|
"use strict";
|
|
|
|
const { CALL, CONSTRUCT, ReferenceTracker, getStringIfConstant } = require("@eslint-community/eslint-utils");
|
|
const { RegExpParser, visitRegExpAST } = require("@eslint-community/regexpp");
|
|
const { isCombiningCharacter, isEmojiModifier, isRegionalIndicatorSymbol, isSurrogatePair } = require("./utils/unicode");
|
|
const astUtils = require("./utils/ast-utils.js");
|
|
const { isValidWithUnicodeFlag } = require("./utils/regular-expressions");
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Helpers
|
|
//------------------------------------------------------------------------------
|
|
|
|
/**
|
|
* @typedef {import('@eslint-community/regexpp').AST.Character} Character
|
|
* @typedef {import('@eslint-community/regexpp').AST.CharacterClassElement} CharacterClassElement
|
|
*/
|
|
|
|
/**
|
|
* Iterate character sequences of a given nodes.
|
|
*
|
|
* CharacterClassRange syntax can steal a part of character sequence,
|
|
* so this function reverts CharacterClassRange syntax and restore the sequence.
|
|
* @param {CharacterClassElement[]} nodes The node list to iterate character sequences.
|
|
* @returns {IterableIterator<Character[]>} The list of character sequences.
|
|
*/
|
|
function *iterateCharacterSequence(nodes) {
|
|
|
|
/** @type {Character[]} */
|
|
let seq = [];
|
|
|
|
for (const node of nodes) {
|
|
switch (node.type) {
|
|
case "Character":
|
|
seq.push(node);
|
|
break;
|
|
|
|
case "CharacterClassRange":
|
|
seq.push(node.min);
|
|
yield seq;
|
|
seq = [node.max];
|
|
break;
|
|
|
|
case "CharacterSet":
|
|
case "CharacterClass": // [[]] nesting character class
|
|
case "ClassStringDisjunction": // \q{...}
|
|
case "ExpressionCharacterClass": // [A--B]
|
|
if (seq.length > 0) {
|
|
yield seq;
|
|
seq = [];
|
|
}
|
|
break;
|
|
|
|
// no default
|
|
}
|
|
}
|
|
|
|
if (seq.length > 0) {
|
|
yield seq;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Checks whether the given character node is a Unicode code point escape or not.
|
|
* @param {Character} char the character node to check.
|
|
* @returns {boolean} `true` if the character node is a Unicode code point escape.
|
|
*/
|
|
function isUnicodeCodePointEscape(char) {
|
|
return /^\\u\{[\da-f]+\}$/iu.test(char.raw);
|
|
}
|
|
|
|
/**
|
|
* Each function returns `true` if it detects that kind of problem.
|
|
* @type {Record<string, (chars: Character[]) => boolean>}
|
|
*/
|
|
const hasCharacterSequence = {
|
|
surrogatePairWithoutUFlag(chars) {
|
|
return chars.some((c, i) => {
|
|
if (i === 0) {
|
|
return false;
|
|
}
|
|
const c1 = chars[i - 1];
|
|
|
|
return (
|
|
isSurrogatePair(c1.value, c.value) &&
|
|
!isUnicodeCodePointEscape(c1) &&
|
|
!isUnicodeCodePointEscape(c)
|
|
);
|
|
});
|
|
},
|
|
|
|
surrogatePair(chars) {
|
|
return chars.some((c, i) => {
|
|
if (i === 0) {
|
|
return false;
|
|
}
|
|
const c1 = chars[i - 1];
|
|
|
|
return (
|
|
isSurrogatePair(c1.value, c.value) &&
|
|
(
|
|
isUnicodeCodePointEscape(c1) ||
|
|
isUnicodeCodePointEscape(c)
|
|
)
|
|
);
|
|
});
|
|
},
|
|
|
|
combiningClass(chars) {
|
|
return chars.some((c, i) => (
|
|
i !== 0 &&
|
|
isCombiningCharacter(c.value) &&
|
|
!isCombiningCharacter(chars[i - 1].value)
|
|
));
|
|
},
|
|
|
|
emojiModifier(chars) {
|
|
return chars.some((c, i) => (
|
|
i !== 0 &&
|
|
isEmojiModifier(c.value) &&
|
|
!isEmojiModifier(chars[i - 1].value)
|
|
));
|
|
},
|
|
|
|
regionalIndicatorSymbol(chars) {
|
|
return chars.some((c, i) => (
|
|
i !== 0 &&
|
|
isRegionalIndicatorSymbol(c.value) &&
|
|
isRegionalIndicatorSymbol(chars[i - 1].value)
|
|
));
|
|
},
|
|
|
|
zwj(chars) {
|
|
const lastIndex = chars.length - 1;
|
|
|
|
return chars.some((c, i) => (
|
|
i !== 0 &&
|
|
i !== lastIndex &&
|
|
c.value === 0x200d &&
|
|
chars[i - 1].value !== 0x200d &&
|
|
chars[i + 1].value !== 0x200d
|
|
));
|
|
}
|
|
};
|
|
|
|
const kinds = Object.keys(hasCharacterSequence);
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Rule Definition
|
|
//------------------------------------------------------------------------------
|
|
|
|
/** @type {import('../shared/types').Rule} */
|
|
module.exports = {
|
|
meta: {
|
|
type: "problem",
|
|
|
|
docs: {
|
|
description: "Disallow characters which are made with multiple code points in character class syntax",
|
|
recommended: true,
|
|
url: "https://eslint.org/docs/latest/rules/no-misleading-character-class"
|
|
},
|
|
|
|
hasSuggestions: true,
|
|
|
|
schema: [],
|
|
|
|
messages: {
|
|
surrogatePairWithoutUFlag: "Unexpected surrogate pair in character class. Use 'u' flag.",
|
|
surrogatePair: "Unexpected surrogate pair in character class.",
|
|
combiningClass: "Unexpected combined character in character class.",
|
|
emojiModifier: "Unexpected modified Emoji in character class.",
|
|
regionalIndicatorSymbol: "Unexpected national flag in character class.",
|
|
zwj: "Unexpected joined character sequence in character class.",
|
|
suggestUnicodeFlag: "Add unicode 'u' flag to regex."
|
|
}
|
|
},
|
|
create(context) {
|
|
const sourceCode = context.sourceCode;
|
|
const parser = new RegExpParser();
|
|
|
|
/**
|
|
* Verify a given regular expression.
|
|
* @param {Node} node The node to report.
|
|
* @param {string} pattern The regular expression pattern to verify.
|
|
* @param {string} flags The flags of the regular expression.
|
|
* @param {Function} unicodeFixer Fixer for missing "u" flag.
|
|
* @returns {void}
|
|
*/
|
|
function verify(node, pattern, flags, unicodeFixer) {
|
|
let patternNode;
|
|
|
|
try {
|
|
patternNode = parser.parsePattern(
|
|
pattern,
|
|
0,
|
|
pattern.length,
|
|
{
|
|
unicode: flags.includes("u"),
|
|
unicodeSets: flags.includes("v")
|
|
}
|
|
);
|
|
} catch {
|
|
|
|
// Ignore regular expressions with syntax errors
|
|
return;
|
|
}
|
|
|
|
const foundKinds = new Set();
|
|
|
|
visitRegExpAST(patternNode, {
|
|
onCharacterClassEnter(ccNode) {
|
|
for (const chars of iterateCharacterSequence(ccNode.elements)) {
|
|
for (const kind of kinds) {
|
|
if (hasCharacterSequence[kind](chars)) {
|
|
foundKinds.add(kind);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
for (const kind of foundKinds) {
|
|
let suggest;
|
|
|
|
if (kind === "surrogatePairWithoutUFlag") {
|
|
suggest = [{
|
|
messageId: "suggestUnicodeFlag",
|
|
fix: unicodeFixer
|
|
}];
|
|
}
|
|
|
|
context.report({
|
|
node,
|
|
messageId: kind,
|
|
suggest
|
|
});
|
|
}
|
|
}
|
|
|
|
return {
|
|
"Literal[regex]"(node) {
|
|
verify(node, node.regex.pattern, node.regex.flags, fixer => {
|
|
if (!isValidWithUnicodeFlag(context.languageOptions.ecmaVersion, node.regex.pattern)) {
|
|
return null;
|
|
}
|
|
|
|
return fixer.insertTextAfter(node, "u");
|
|
});
|
|
},
|
|
"Program"(node) {
|
|
const scope = sourceCode.getScope(node);
|
|
const tracker = new ReferenceTracker(scope);
|
|
|
|
/*
|
|
* Iterate calls of RegExp.
|
|
* E.g., `new RegExp()`, `RegExp()`, `new window.RegExp()`,
|
|
* `const {RegExp: a} = window; new a()`, etc...
|
|
*/
|
|
for (const { node: refNode } of tracker.iterateGlobalReferences({
|
|
RegExp: { [CALL]: true, [CONSTRUCT]: true }
|
|
})) {
|
|
const [patternNode, flagsNode] = refNode.arguments;
|
|
const pattern = getStringIfConstant(patternNode, scope);
|
|
const flags = getStringIfConstant(flagsNode, scope);
|
|
|
|
if (typeof pattern === "string") {
|
|
verify(refNode, pattern, flags || "", fixer => {
|
|
|
|
if (!isValidWithUnicodeFlag(context.languageOptions.ecmaVersion, pattern)) {
|
|
return null;
|
|
}
|
|
|
|
if (refNode.arguments.length === 1) {
|
|
const penultimateToken = sourceCode.getLastToken(refNode, { skip: 1 }); // skip closing parenthesis
|
|
|
|
return fixer.insertTextAfter(
|
|
penultimateToken,
|
|
astUtils.isCommaToken(penultimateToken)
|
|
? ' "u",'
|
|
: ', "u"'
|
|
);
|
|
}
|
|
|
|
if ((flagsNode.type === "Literal" && typeof flagsNode.value === "string") || flagsNode.type === "TemplateLiteral") {
|
|
const range = [flagsNode.range[0], flagsNode.range[1] - 1];
|
|
|
|
return fixer.insertTextAfterRange(range, "u");
|
|
}
|
|
|
|
return null;
|
|
});
|
|
}
|
|
}
|
|
}
|
|
};
|
|
}
|
|
};
|