mirror of
https://github.com/github/codeql-action.git
synced 2025-12-30 19:20:08 +08:00
* Bump the npm group with 12 updates Bumps the npm group with 12 updates: | Package | From | To | | --- | --- | --- | | [@octokit/types](https://github.com/octokit/types.ts) | `12.1.1` | `12.3.0` | | [@types/uuid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/uuid) | `9.0.6` | `9.0.7` | | [@types/adm-zip](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/adm-zip) | `0.5.3` | `0.5.4` | | [@types/js-yaml](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/js-yaml) | `4.0.8` | `4.0.9` | | [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver) | `7.5.4` | `7.5.5` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `6.9.1` | `6.12.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `6.9.1` | `6.12.0` | | [eslint](https://github.com/eslint/eslint) | `8.52.0` | `8.54.0` | | [nock](https://github.com/nock/nock) | `13.3.7` | `13.3.8` | | [sinon](https://github.com/sinonjs/sinon) | `17.0.0` | `17.0.1` | | [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon) | `10.0.20` | `17.0.1` | | [typescript](https://github.com/Microsoft/TypeScript) | `5.2.2` | `5.3.2` | Updates `@octokit/types` from 12.1.1 to 12.3.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](https://github.com/octokit/types.ts/compare/v12.1.1...v12.3.0) Updates `@types/uuid` from 9.0.6 to 9.0.7 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/uuid) Updates `@types/adm-zip` from 0.5.3 to 0.5.4 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/adm-zip) Updates `@types/js-yaml` from 4.0.8 to 4.0.9 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/js-yaml) Updates `@types/semver` from 7.5.4 to 7.5.5 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver) Updates `@typescript-eslint/eslint-plugin` from 6.9.1 to 6.12.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.12.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.9.1 to 6.12.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.12.0/packages/parser) Updates `eslint` from 8.52.0 to 8.54.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.52.0...v8.54.0) Updates `nock` from 13.3.7 to 13.3.8 - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](https://github.com/nock/nock/compare/v13.3.7...v13.3.8) Updates `sinon` from 17.0.0 to 17.0.1 - [Release notes](https://github.com/sinonjs/sinon/releases) - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md) - [Commits](https://github.com/sinonjs/sinon/compare/v17.0.0...v17.0.1) Updates `@types/sinon` from 10.0.20 to 17.0.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon) Updates `typescript` from 5.2.2 to 5.3.2 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/commits) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@types/uuid" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/adm-zip" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@types/js-yaml" 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: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: nock dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: sinon 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-major dependency-group: npm - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies * Rebuild --------- 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>
270 lines
11 KiB
JavaScript
270 lines
11 KiB
JavaScript
/**
|
|
* @fileoverview Rule to check empty newline between class members
|
|
* @author 薛定谔的猫<hh_2013@foxmail.com>
|
|
* @deprecated in ESLint v8.53.0
|
|
*/
|
|
"use strict";
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Requirements
|
|
//------------------------------------------------------------------------------
|
|
|
|
const astUtils = require("./utils/ast-utils");
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Helpers
|
|
//------------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Types of class members.
|
|
* Those have `test` method to check it matches to the given class member.
|
|
* @private
|
|
*/
|
|
const ClassMemberTypes = {
|
|
"*": { test: () => true },
|
|
field: { test: node => node.type === "PropertyDefinition" },
|
|
method: { test: node => node.type === "MethodDefinition" }
|
|
};
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Rule Definition
|
|
//------------------------------------------------------------------------------
|
|
|
|
/** @type {import('../shared/types').Rule} */
|
|
module.exports = {
|
|
meta: {
|
|
deprecated: true,
|
|
replacedBy: [],
|
|
type: "layout",
|
|
|
|
docs: {
|
|
description: "Require or disallow an empty line between class members",
|
|
recommended: false,
|
|
url: "https://eslint.org/docs/latest/rules/lines-between-class-members"
|
|
},
|
|
|
|
fixable: "whitespace",
|
|
|
|
schema: [
|
|
{
|
|
anyOf: [
|
|
{
|
|
type: "object",
|
|
properties: {
|
|
enforce: {
|
|
type: "array",
|
|
items: {
|
|
type: "object",
|
|
properties: {
|
|
blankLine: { enum: ["always", "never"] },
|
|
prev: { enum: ["method", "field", "*"] },
|
|
next: { enum: ["method", "field", "*"] }
|
|
},
|
|
additionalProperties: false,
|
|
required: ["blankLine", "prev", "next"]
|
|
},
|
|
minItems: 1
|
|
}
|
|
},
|
|
additionalProperties: false,
|
|
required: ["enforce"]
|
|
},
|
|
{
|
|
enum: ["always", "never"]
|
|
}
|
|
]
|
|
},
|
|
{
|
|
type: "object",
|
|
properties: {
|
|
exceptAfterSingleLine: {
|
|
type: "boolean",
|
|
default: false
|
|
}
|
|
},
|
|
additionalProperties: false
|
|
}
|
|
],
|
|
messages: {
|
|
never: "Unexpected blank line between class members.",
|
|
always: "Expected blank line between class members."
|
|
}
|
|
},
|
|
|
|
create(context) {
|
|
|
|
const options = [];
|
|
|
|
options[0] = context.options[0] || "always";
|
|
options[1] = context.options[1] || { exceptAfterSingleLine: false };
|
|
|
|
const configureList = typeof options[0] === "object" ? options[0].enforce : [{ blankLine: options[0], prev: "*", next: "*" }];
|
|
const sourceCode = context.sourceCode;
|
|
|
|
/**
|
|
* Gets a pair of tokens that should be used to check lines between two class member nodes.
|
|
*
|
|
* In most cases, this returns the very last token of the current node and
|
|
* the very first token of the next node.
|
|
* For example:
|
|
*
|
|
* class C {
|
|
* x = 1; // curLast: `;` nextFirst: `in`
|
|
* in = 2
|
|
* }
|
|
*
|
|
* There is only one exception. If the given node ends with a semicolon, and it looks like
|
|
* a semicolon-less style's semicolon - one that is not on the same line as the preceding
|
|
* token, but is on the line where the next class member starts - this returns the preceding
|
|
* token and the semicolon as boundary tokens.
|
|
* For example:
|
|
*
|
|
* class C {
|
|
* x = 1 // curLast: `1` nextFirst: `;`
|
|
* ;in = 2
|
|
* }
|
|
* When determining the desired layout of the code, we should treat this semicolon as
|
|
* a part of the next class member node instead of the one it technically belongs to.
|
|
* @param {ASTNode} curNode Current class member node.
|
|
* @param {ASTNode} nextNode Next class member node.
|
|
* @returns {Token} The actual last token of `node`.
|
|
* @private
|
|
*/
|
|
function getBoundaryTokens(curNode, nextNode) {
|
|
const lastToken = sourceCode.getLastToken(curNode);
|
|
const prevToken = sourceCode.getTokenBefore(lastToken);
|
|
const nextToken = sourceCode.getFirstToken(nextNode); // skip possible lone `;` between nodes
|
|
|
|
const isSemicolonLessStyle = (
|
|
astUtils.isSemicolonToken(lastToken) &&
|
|
!astUtils.isTokenOnSameLine(prevToken, lastToken) &&
|
|
astUtils.isTokenOnSameLine(lastToken, nextToken)
|
|
);
|
|
|
|
return isSemicolonLessStyle
|
|
? { curLast: prevToken, nextFirst: lastToken }
|
|
: { curLast: lastToken, nextFirst: nextToken };
|
|
}
|
|
|
|
/**
|
|
* Return the last token among the consecutive tokens that have no exceed max line difference in between, before the first token in the next member.
|
|
* @param {Token} prevLastToken The last token in the previous member node.
|
|
* @param {Token} nextFirstToken The first token in the next member node.
|
|
* @param {number} maxLine The maximum number of allowed line difference between consecutive tokens.
|
|
* @returns {Token} The last token among the consecutive tokens.
|
|
*/
|
|
function findLastConsecutiveTokenAfter(prevLastToken, nextFirstToken, maxLine) {
|
|
const after = sourceCode.getTokenAfter(prevLastToken, { includeComments: true });
|
|
|
|
if (after !== nextFirstToken && after.loc.start.line - prevLastToken.loc.end.line <= maxLine) {
|
|
return findLastConsecutiveTokenAfter(after, nextFirstToken, maxLine);
|
|
}
|
|
return prevLastToken;
|
|
}
|
|
|
|
/**
|
|
* Return the first token among the consecutive tokens that have no exceed max line difference in between, after the last token in the previous member.
|
|
* @param {Token} nextFirstToken The first token in the next member node.
|
|
* @param {Token} prevLastToken The last token in the previous member node.
|
|
* @param {number} maxLine The maximum number of allowed line difference between consecutive tokens.
|
|
* @returns {Token} The first token among the consecutive tokens.
|
|
*/
|
|
function findFirstConsecutiveTokenBefore(nextFirstToken, prevLastToken, maxLine) {
|
|
const before = sourceCode.getTokenBefore(nextFirstToken, { includeComments: true });
|
|
|
|
if (before !== prevLastToken && nextFirstToken.loc.start.line - before.loc.end.line <= maxLine) {
|
|
return findFirstConsecutiveTokenBefore(before, prevLastToken, maxLine);
|
|
}
|
|
return nextFirstToken;
|
|
}
|
|
|
|
/**
|
|
* Checks if there is a token or comment between two tokens.
|
|
* @param {Token} before The token before.
|
|
* @param {Token} after The token after.
|
|
* @returns {boolean} True if there is a token or comment between two tokens.
|
|
*/
|
|
function hasTokenOrCommentBetween(before, after) {
|
|
return sourceCode.getTokensBetween(before, after, { includeComments: true }).length !== 0;
|
|
}
|
|
|
|
/**
|
|
* Checks whether the given node matches the given type.
|
|
* @param {ASTNode} node The class member node to check.
|
|
* @param {string} type The class member type to check.
|
|
* @returns {boolean} `true` if the class member node matched the type.
|
|
* @private
|
|
*/
|
|
function match(node, type) {
|
|
return ClassMemberTypes[type].test(node);
|
|
}
|
|
|
|
/**
|
|
* Finds the last matched configuration from the configureList.
|
|
* @param {ASTNode} prevNode The previous node to match.
|
|
* @param {ASTNode} nextNode The current node to match.
|
|
* @returns {string|null} Padding type or `null` if no matches were found.
|
|
* @private
|
|
*/
|
|
function getPaddingType(prevNode, nextNode) {
|
|
for (let i = configureList.length - 1; i >= 0; --i) {
|
|
const configure = configureList[i];
|
|
const matched =
|
|
match(prevNode, configure.prev) &&
|
|
match(nextNode, configure.next);
|
|
|
|
if (matched) {
|
|
return configure.blankLine;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
return {
|
|
ClassBody(node) {
|
|
const body = node.body;
|
|
|
|
for (let i = 0; i < body.length - 1; i++) {
|
|
const curFirst = sourceCode.getFirstToken(body[i]);
|
|
const { curLast, nextFirst } = getBoundaryTokens(body[i], body[i + 1]);
|
|
const isMulti = !astUtils.isTokenOnSameLine(curFirst, curLast);
|
|
const skip = !isMulti && options[1].exceptAfterSingleLine;
|
|
const beforePadding = findLastConsecutiveTokenAfter(curLast, nextFirst, 1);
|
|
const afterPadding = findFirstConsecutiveTokenBefore(nextFirst, curLast, 1);
|
|
const isPadded = afterPadding.loc.start.line - beforePadding.loc.end.line > 1;
|
|
const hasTokenInPadding = hasTokenOrCommentBetween(beforePadding, afterPadding);
|
|
const curLineLastToken = findLastConsecutiveTokenAfter(curLast, nextFirst, 0);
|
|
const paddingType = getPaddingType(body[i], body[i + 1]);
|
|
|
|
if (paddingType === "never" && isPadded) {
|
|
context.report({
|
|
node: body[i + 1],
|
|
messageId: "never",
|
|
|
|
fix(fixer) {
|
|
if (hasTokenInPadding) {
|
|
return null;
|
|
}
|
|
return fixer.replaceTextRange([beforePadding.range[1], afterPadding.range[0]], "\n");
|
|
}
|
|
});
|
|
} else if (paddingType === "always" && !skip && !isPadded) {
|
|
context.report({
|
|
node: body[i + 1],
|
|
messageId: "always",
|
|
|
|
fix(fixer) {
|
|
if (hasTokenInPadding) {
|
|
return null;
|
|
}
|
|
return fixer.insertTextAfter(curLineLastToken, "\n");
|
|
}
|
|
});
|
|
}
|
|
|
|
}
|
|
}
|
|
};
|
|
}
|
|
};
|