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>
312 lines
12 KiB
JavaScript
312 lines
12 KiB
JavaScript
/**
|
|
* @fileoverview Disallows or enforces spaces inside of object literals.
|
|
* @author Jamund Ferguson
|
|
* @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 spacing inside braces",
|
|
recommended: false,
|
|
url: "https://eslint.org/docs/latest/rules/object-curly-spacing"
|
|
},
|
|
|
|
fixable: "whitespace",
|
|
|
|
schema: [
|
|
{
|
|
enum: ["always", "never"]
|
|
},
|
|
{
|
|
type: "object",
|
|
properties: {
|
|
arraysInObjects: {
|
|
type: "boolean"
|
|
},
|
|
objectsInObjects: {
|
|
type: "boolean"
|
|
}
|
|
},
|
|
additionalProperties: false
|
|
}
|
|
],
|
|
|
|
messages: {
|
|
requireSpaceBefore: "A space is required before '{{token}}'.",
|
|
requireSpaceAfter: "A space is required after '{{token}}'.",
|
|
unexpectedSpaceBefore: "There should be no space before '{{token}}'.",
|
|
unexpectedSpaceAfter: "There should be no space after '{{token}}'."
|
|
}
|
|
},
|
|
|
|
create(context) {
|
|
const spaced = context.options[0] === "always",
|
|
sourceCode = context.sourceCode;
|
|
|
|
/**
|
|
* Determines whether an option is set, relative to the spacing option.
|
|
* If spaced is "always", then check whether option is set to false.
|
|
* If spaced is "never", then check whether option is set to true.
|
|
* @param {Object} option The option to exclude.
|
|
* @returns {boolean} Whether or not the property is excluded.
|
|
*/
|
|
function isOptionSet(option) {
|
|
return context.options[1] ? context.options[1][option] === !spaced : false;
|
|
}
|
|
|
|
const options = {
|
|
spaced,
|
|
arraysInObjectsException: isOptionSet("arraysInObjects"),
|
|
objectsInObjectsException: isOptionSet("objectsInObjects")
|
|
};
|
|
|
|
//--------------------------------------------------------------------------
|
|
// Helpers
|
|
//--------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Reports that there shouldn't be a space after the first token
|
|
* @param {ASTNode} node The node to report in the event of an error.
|
|
* @param {Token} token The token to use for the report.
|
|
* @returns {void}
|
|
*/
|
|
function reportNoBeginningSpace(node, token) {
|
|
const nextToken = context.sourceCode.getTokenAfter(token, { includeComments: true });
|
|
|
|
context.report({
|
|
node,
|
|
loc: { start: token.loc.end, end: nextToken.loc.start },
|
|
messageId: "unexpectedSpaceAfter",
|
|
data: {
|
|
token: token.value
|
|
},
|
|
fix(fixer) {
|
|
return fixer.removeRange([token.range[1], nextToken.range[0]]);
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Reports that there shouldn't be a space before the last token
|
|
* @param {ASTNode} node The node to report in the event of an error.
|
|
* @param {Token} token The token to use for the report.
|
|
* @returns {void}
|
|
*/
|
|
function reportNoEndingSpace(node, token) {
|
|
const previousToken = context.sourceCode.getTokenBefore(token, { includeComments: true });
|
|
|
|
context.report({
|
|
node,
|
|
loc: { start: previousToken.loc.end, end: token.loc.start },
|
|
messageId: "unexpectedSpaceBefore",
|
|
data: {
|
|
token: token.value
|
|
},
|
|
fix(fixer) {
|
|
return fixer.removeRange([previousToken.range[1], token.range[0]]);
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Reports that there should be a space after the first token
|
|
* @param {ASTNode} node The node to report in the event of an error.
|
|
* @param {Token} token The token to use for the report.
|
|
* @returns {void}
|
|
*/
|
|
function reportRequiredBeginningSpace(node, token) {
|
|
context.report({
|
|
node,
|
|
loc: token.loc,
|
|
messageId: "requireSpaceAfter",
|
|
data: {
|
|
token: token.value
|
|
},
|
|
fix(fixer) {
|
|
return fixer.insertTextAfter(token, " ");
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Reports that there should be a space before the last token
|
|
* @param {ASTNode} node The node to report in the event of an error.
|
|
* @param {Token} token The token to use for the report.
|
|
* @returns {void}
|
|
*/
|
|
function reportRequiredEndingSpace(node, token) {
|
|
context.report({
|
|
node,
|
|
loc: token.loc,
|
|
messageId: "requireSpaceBefore",
|
|
data: {
|
|
token: token.value
|
|
},
|
|
fix(fixer) {
|
|
return fixer.insertTextBefore(token, " ");
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Determines if spacing in curly braces is valid.
|
|
* @param {ASTNode} node The AST node to check.
|
|
* @param {Token} first The first token to check (should be the opening brace)
|
|
* @param {Token} second The second token to check (should be first after the opening brace)
|
|
* @param {Token} penultimate The penultimate token to check (should be last before closing brace)
|
|
* @param {Token} last The last token to check (should be closing brace)
|
|
* @returns {void}
|
|
*/
|
|
function validateBraceSpacing(node, first, second, penultimate, last) {
|
|
if (astUtils.isTokenOnSameLine(first, second)) {
|
|
const firstSpaced = sourceCode.isSpaceBetweenTokens(first, second);
|
|
|
|
if (options.spaced && !firstSpaced) {
|
|
reportRequiredBeginningSpace(node, first);
|
|
}
|
|
if (!options.spaced && firstSpaced && second.type !== "Line") {
|
|
reportNoBeginningSpace(node, first);
|
|
}
|
|
}
|
|
|
|
if (astUtils.isTokenOnSameLine(penultimate, last)) {
|
|
const shouldCheckPenultimate = (
|
|
options.arraysInObjectsException && astUtils.isClosingBracketToken(penultimate) ||
|
|
options.objectsInObjectsException && astUtils.isClosingBraceToken(penultimate)
|
|
);
|
|
const penultimateType = shouldCheckPenultimate && sourceCode.getNodeByRangeIndex(penultimate.range[0]).type;
|
|
|
|
const closingCurlyBraceMustBeSpaced = (
|
|
options.arraysInObjectsException && penultimateType === "ArrayExpression" ||
|
|
options.objectsInObjectsException && (penultimateType === "ObjectExpression" || penultimateType === "ObjectPattern")
|
|
) ? !options.spaced : options.spaced;
|
|
|
|
const lastSpaced = sourceCode.isSpaceBetweenTokens(penultimate, last);
|
|
|
|
if (closingCurlyBraceMustBeSpaced && !lastSpaced) {
|
|
reportRequiredEndingSpace(node, last);
|
|
}
|
|
if (!closingCurlyBraceMustBeSpaced && lastSpaced) {
|
|
reportNoEndingSpace(node, last);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Gets '}' token of an object node.
|
|
*
|
|
* Because the last token of object patterns might be a type annotation,
|
|
* this traverses tokens preceded by the last property, then returns the
|
|
* first '}' token.
|
|
* @param {ASTNode} node The node to get. This node is an
|
|
* ObjectExpression or an ObjectPattern. And this node has one or
|
|
* more properties.
|
|
* @returns {Token} '}' token.
|
|
*/
|
|
function getClosingBraceOfObject(node) {
|
|
const lastProperty = node.properties[node.properties.length - 1];
|
|
|
|
return sourceCode.getTokenAfter(lastProperty, astUtils.isClosingBraceToken);
|
|
}
|
|
|
|
/**
|
|
* Reports a given object node if spacing in curly braces is invalid.
|
|
* @param {ASTNode} node An ObjectExpression or ObjectPattern node to check.
|
|
* @returns {void}
|
|
*/
|
|
function checkForObject(node) {
|
|
if (node.properties.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const first = sourceCode.getFirstToken(node),
|
|
last = getClosingBraceOfObject(node),
|
|
second = sourceCode.getTokenAfter(first, { includeComments: true }),
|
|
penultimate = sourceCode.getTokenBefore(last, { includeComments: true });
|
|
|
|
validateBraceSpacing(node, first, second, penultimate, last);
|
|
}
|
|
|
|
/**
|
|
* Reports a given import node if spacing in curly braces is invalid.
|
|
* @param {ASTNode} node An ImportDeclaration node to check.
|
|
* @returns {void}
|
|
*/
|
|
function checkForImport(node) {
|
|
if (node.specifiers.length === 0) {
|
|
return;
|
|
}
|
|
|
|
let firstSpecifier = node.specifiers[0];
|
|
const lastSpecifier = node.specifiers[node.specifiers.length - 1];
|
|
|
|
if (lastSpecifier.type !== "ImportSpecifier") {
|
|
return;
|
|
}
|
|
if (firstSpecifier.type !== "ImportSpecifier") {
|
|
firstSpecifier = node.specifiers[1];
|
|
}
|
|
|
|
const first = sourceCode.getTokenBefore(firstSpecifier),
|
|
last = sourceCode.getTokenAfter(lastSpecifier, astUtils.isNotCommaToken),
|
|
second = sourceCode.getTokenAfter(first, { includeComments: true }),
|
|
penultimate = sourceCode.getTokenBefore(last, { includeComments: true });
|
|
|
|
validateBraceSpacing(node, first, second, penultimate, last);
|
|
}
|
|
|
|
/**
|
|
* Reports a given export node if spacing in curly braces is invalid.
|
|
* @param {ASTNode} node An ExportNamedDeclaration node to check.
|
|
* @returns {void}
|
|
*/
|
|
function checkForExport(node) {
|
|
if (node.specifiers.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const firstSpecifier = node.specifiers[0],
|
|
lastSpecifier = node.specifiers[node.specifiers.length - 1],
|
|
first = sourceCode.getTokenBefore(firstSpecifier),
|
|
last = sourceCode.getTokenAfter(lastSpecifier, astUtils.isNotCommaToken),
|
|
second = sourceCode.getTokenAfter(first, { includeComments: true }),
|
|
penultimate = sourceCode.getTokenBefore(last, { includeComments: true });
|
|
|
|
validateBraceSpacing(node, first, second, penultimate, last);
|
|
}
|
|
|
|
//--------------------------------------------------------------------------
|
|
// Public
|
|
//--------------------------------------------------------------------------
|
|
|
|
return {
|
|
|
|
// var {x} = y;
|
|
ObjectPattern: checkForObject,
|
|
|
|
// var y = {x: 'y'}
|
|
ObjectExpression: checkForObject,
|
|
|
|
// import {y} from 'x';
|
|
ImportDeclaration: checkForImport,
|
|
|
|
// export {name} from 'yo';
|
|
ExportNamedDeclaration: checkForExport
|
|
};
|
|
|
|
}
|
|
};
|