mirror of
https://github.com/github/codeql-action.git
synced 2025-12-30 03:00:13 +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>
315 lines
12 KiB
JavaScript
315 lines
12 KiB
JavaScript
/**
|
|
* @fileoverview Comma style - enforces comma styles of two types: last and first
|
|
* @author Vignesh Anand aka vegetableman
|
|
* @deprecated in ESLint v8.53.0
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
const astUtils = require("./utils/ast-utils");
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Rule Definition
|
|
//------------------------------------------------------------------------------
|
|
|
|
/** @type {import('../shared/types').Rule} */
|
|
module.exports = {
|
|
meta: {
|
|
deprecated: true,
|
|
replacedBy: [],
|
|
type: "layout",
|
|
|
|
docs: {
|
|
description: "Enforce consistent comma style",
|
|
recommended: false,
|
|
url: "https://eslint.org/docs/latest/rules/comma-style"
|
|
},
|
|
|
|
fixable: "code",
|
|
|
|
schema: [
|
|
{
|
|
enum: ["first", "last"]
|
|
},
|
|
{
|
|
type: "object",
|
|
properties: {
|
|
exceptions: {
|
|
type: "object",
|
|
additionalProperties: {
|
|
type: "boolean"
|
|
}
|
|
}
|
|
},
|
|
additionalProperties: false
|
|
}
|
|
],
|
|
|
|
messages: {
|
|
unexpectedLineBeforeAndAfterComma: "Bad line breaking before and after ','.",
|
|
expectedCommaFirst: "',' should be placed first.",
|
|
expectedCommaLast: "',' should be placed last."
|
|
}
|
|
},
|
|
|
|
create(context) {
|
|
const style = context.options[0] || "last",
|
|
sourceCode = context.sourceCode;
|
|
const exceptions = {
|
|
ArrayPattern: true,
|
|
ArrowFunctionExpression: true,
|
|
CallExpression: true,
|
|
FunctionDeclaration: true,
|
|
FunctionExpression: true,
|
|
ImportDeclaration: true,
|
|
ObjectPattern: true,
|
|
NewExpression: true
|
|
};
|
|
|
|
if (context.options.length === 2 && Object.prototype.hasOwnProperty.call(context.options[1], "exceptions")) {
|
|
const keys = Object.keys(context.options[1].exceptions);
|
|
|
|
for (let i = 0; i < keys.length; i++) {
|
|
exceptions[keys[i]] = context.options[1].exceptions[keys[i]];
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------
|
|
// Helpers
|
|
//--------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Modified text based on the style
|
|
* @param {string} styleType Style type
|
|
* @param {string} text Source code text
|
|
* @returns {string} modified text
|
|
* @private
|
|
*/
|
|
function getReplacedText(styleType, text) {
|
|
switch (styleType) {
|
|
case "between":
|
|
return `,${text.replace(astUtils.LINEBREAK_MATCHER, "")}`;
|
|
|
|
case "first":
|
|
return `${text},`;
|
|
|
|
case "last":
|
|
return `,${text}`;
|
|
|
|
default:
|
|
return "";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Determines the fixer function for a given style.
|
|
* @param {string} styleType comma style
|
|
* @param {ASTNode} previousItemToken The token to check.
|
|
* @param {ASTNode} commaToken The token to check.
|
|
* @param {ASTNode} currentItemToken The token to check.
|
|
* @returns {Function} Fixer function
|
|
* @private
|
|
*/
|
|
function getFixerFunction(styleType, previousItemToken, commaToken, currentItemToken) {
|
|
const text =
|
|
sourceCode.text.slice(previousItemToken.range[1], commaToken.range[0]) +
|
|
sourceCode.text.slice(commaToken.range[1], currentItemToken.range[0]);
|
|
const range = [previousItemToken.range[1], currentItemToken.range[0]];
|
|
|
|
return function(fixer) {
|
|
return fixer.replaceTextRange(range, getReplacedText(styleType, text));
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Validates the spacing around single items in lists.
|
|
* @param {Token} previousItemToken The last token from the previous item.
|
|
* @param {Token} commaToken The token representing the comma.
|
|
* @param {Token} currentItemToken The first token of the current item.
|
|
* @param {Token} reportItem The item to use when reporting an error.
|
|
* @returns {void}
|
|
* @private
|
|
*/
|
|
function validateCommaItemSpacing(previousItemToken, commaToken, currentItemToken, reportItem) {
|
|
|
|
// if single line
|
|
if (astUtils.isTokenOnSameLine(commaToken, currentItemToken) &&
|
|
astUtils.isTokenOnSameLine(previousItemToken, commaToken)) {
|
|
|
|
// do nothing.
|
|
|
|
} else if (!astUtils.isTokenOnSameLine(commaToken, currentItemToken) &&
|
|
!astUtils.isTokenOnSameLine(previousItemToken, commaToken)) {
|
|
|
|
const comment = sourceCode.getCommentsAfter(commaToken)[0];
|
|
const styleType = comment && comment.type === "Block" && astUtils.isTokenOnSameLine(commaToken, comment)
|
|
? style
|
|
: "between";
|
|
|
|
// lone comma
|
|
context.report({
|
|
node: reportItem,
|
|
loc: commaToken.loc,
|
|
messageId: "unexpectedLineBeforeAndAfterComma",
|
|
fix: getFixerFunction(styleType, previousItemToken, commaToken, currentItemToken)
|
|
});
|
|
|
|
} else if (style === "first" && !astUtils.isTokenOnSameLine(commaToken, currentItemToken)) {
|
|
|
|
context.report({
|
|
node: reportItem,
|
|
loc: commaToken.loc,
|
|
messageId: "expectedCommaFirst",
|
|
fix: getFixerFunction(style, previousItemToken, commaToken, currentItemToken)
|
|
});
|
|
|
|
} else if (style === "last" && astUtils.isTokenOnSameLine(commaToken, currentItemToken)) {
|
|
|
|
context.report({
|
|
node: reportItem,
|
|
loc: commaToken.loc,
|
|
messageId: "expectedCommaLast",
|
|
fix: getFixerFunction(style, previousItemToken, commaToken, currentItemToken)
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Checks the comma placement with regards to a declaration/property/element
|
|
* @param {ASTNode} node The binary expression node to check
|
|
* @param {string} property The property of the node containing child nodes.
|
|
* @private
|
|
* @returns {void}
|
|
*/
|
|
function validateComma(node, property) {
|
|
const items = node[property],
|
|
arrayLiteral = (node.type === "ArrayExpression" || node.type === "ArrayPattern");
|
|
|
|
if (items.length > 1 || arrayLiteral) {
|
|
|
|
// seed as opening [
|
|
let previousItemToken = sourceCode.getFirstToken(node);
|
|
|
|
items.forEach(item => {
|
|
const commaToken = item ? sourceCode.getTokenBefore(item) : previousItemToken,
|
|
currentItemToken = item ? sourceCode.getFirstToken(item) : sourceCode.getTokenAfter(commaToken),
|
|
reportItem = item || currentItemToken;
|
|
|
|
/*
|
|
* This works by comparing three token locations:
|
|
* - previousItemToken is the last token of the previous item
|
|
* - commaToken is the location of the comma before the current item
|
|
* - currentItemToken is the first token of the current item
|
|
*
|
|
* These values get switched around if item is undefined.
|
|
* previousItemToken will refer to the last token not belonging
|
|
* to the current item, which could be a comma or an opening
|
|
* square bracket. currentItemToken could be a comma.
|
|
*
|
|
* All comparisons are done based on these tokens directly, so
|
|
* they are always valid regardless of an undefined item.
|
|
*/
|
|
if (astUtils.isCommaToken(commaToken)) {
|
|
validateCommaItemSpacing(previousItemToken, commaToken, currentItemToken, reportItem);
|
|
}
|
|
|
|
if (item) {
|
|
const tokenAfterItem = sourceCode.getTokenAfter(item, astUtils.isNotClosingParenToken);
|
|
|
|
previousItemToken = tokenAfterItem
|
|
? sourceCode.getTokenBefore(tokenAfterItem)
|
|
: sourceCode.ast.tokens[sourceCode.ast.tokens.length - 1];
|
|
} else {
|
|
previousItemToken = currentItemToken;
|
|
}
|
|
});
|
|
|
|
/*
|
|
* Special case for array literals that have empty last items, such
|
|
* as [ 1, 2, ]. These arrays only have two items show up in the
|
|
* AST, so we need to look at the token to verify that there's no
|
|
* dangling comma.
|
|
*/
|
|
if (arrayLiteral) {
|
|
|
|
const lastToken = sourceCode.getLastToken(node),
|
|
nextToLastToken = sourceCode.getTokenBefore(lastToken);
|
|
|
|
if (astUtils.isCommaToken(nextToLastToken)) {
|
|
validateCommaItemSpacing(
|
|
sourceCode.getTokenBefore(nextToLastToken),
|
|
nextToLastToken,
|
|
lastToken,
|
|
lastToken
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------
|
|
// Public
|
|
//--------------------------------------------------------------------------
|
|
|
|
const nodes = {};
|
|
|
|
if (!exceptions.VariableDeclaration) {
|
|
nodes.VariableDeclaration = function(node) {
|
|
validateComma(node, "declarations");
|
|
};
|
|
}
|
|
if (!exceptions.ObjectExpression) {
|
|
nodes.ObjectExpression = function(node) {
|
|
validateComma(node, "properties");
|
|
};
|
|
}
|
|
if (!exceptions.ObjectPattern) {
|
|
nodes.ObjectPattern = function(node) {
|
|
validateComma(node, "properties");
|
|
};
|
|
}
|
|
if (!exceptions.ArrayExpression) {
|
|
nodes.ArrayExpression = function(node) {
|
|
validateComma(node, "elements");
|
|
};
|
|
}
|
|
if (!exceptions.ArrayPattern) {
|
|
nodes.ArrayPattern = function(node) {
|
|
validateComma(node, "elements");
|
|
};
|
|
}
|
|
if (!exceptions.FunctionDeclaration) {
|
|
nodes.FunctionDeclaration = function(node) {
|
|
validateComma(node, "params");
|
|
};
|
|
}
|
|
if (!exceptions.FunctionExpression) {
|
|
nodes.FunctionExpression = function(node) {
|
|
validateComma(node, "params");
|
|
};
|
|
}
|
|
if (!exceptions.ArrowFunctionExpression) {
|
|
nodes.ArrowFunctionExpression = function(node) {
|
|
validateComma(node, "params");
|
|
};
|
|
}
|
|
if (!exceptions.CallExpression) {
|
|
nodes.CallExpression = function(node) {
|
|
validateComma(node, "arguments");
|
|
};
|
|
}
|
|
if (!exceptions.ImportDeclaration) {
|
|
nodes.ImportDeclaration = function(node) {
|
|
validateComma(node, "specifiers");
|
|
};
|
|
}
|
|
if (!exceptions.NewExpression) {
|
|
nodes.NewExpression = function(node) {
|
|
validateComma(node, "arguments");
|
|
};
|
|
}
|
|
|
|
return nodes;
|
|
}
|
|
};
|