Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ module.exports = tseslint.config(
},
rules: {
"@typescript-eslint/no-require-imports": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-argument": "off",
},
},
);
Expand Down
16 changes: 8 additions & 8 deletions src/rules/no-implicit-propagation.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
const { ESLintUtils, AST_NODE_TYPES } = require('@typescript-eslint/utils');
const utils = require('@typescript-eslint/type-utils');
const ts = require('typescript');
const { hasThrowsTag } = require('../utils');
const { findParent } = require('../utils');

const createRule = ESLintUtils.RuleCreator(
name => `https://github.com/Xvezda/eslint-plugin-explicit-exceptions/blob/master/docs/rules/${name}.md`,
);
const {
createRule,
hasThrowsTag,
findParent,
getOptionsFromContext
} = require('../utils');

module.exports = createRule({
name: 'no-implicit-propagation',
Expand Down Expand Up @@ -41,7 +41,7 @@ module.exports = createRule({
],
},
create(context) {
const [{ tabLength }] = context.options;
const options = getOptionsFromContext(context);

const sourceCode = context.sourceCode;
const services = ESLintUtils.getParserServices(context);
Expand Down Expand Up @@ -151,7 +151,7 @@ module.exports = createRule({
const currentLine = lines[node.loc.start.line - 1];
const prevLine = lines[node.loc.start.line - 2];
const indent = currentLine.match(/^\s*/)?.[0] ?? '';
const newIndent = indent + ' '.repeat(tabLength);
const newIndent = indent + ' '.repeat(options.tabLength);

// TODO: Better way to handle this?
if (/^\s*try\s*\{/.test(prevLine)) return;
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-implicit-propagation.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// @ts-check
const { RuleTester } = require('@typescript-eslint/rule-tester');
const rule = require('./no-implicit-propagation');

// https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/packages/Rule_Tester.mdx#type-aware-testing
/** @type {import('@typescript-eslint/rule-tester').RuleTester} */
const ruleTester = new RuleTester({
languageOptions: {
parserOptions: {
Expand Down
17 changes: 7 additions & 10 deletions src/rules/no-undocumented-throws.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// @ts-check
const { ESLintUtils, AST_NODE_TYPES } = require('@typescript-eslint/utils');
/** @type {import('@typescript-eslint/type-utils')} */
const utils = require('@typescript-eslint/type-utils');
const { hasThrowsTag, findParent } = require('../utils');
const ts = require('typescript');

const createRule = ESLintUtils.RuleCreator(
name => `https://github.com/Xvezda/eslint-plugin-explicit-exceptions/blob/master/docs/rules/${name}.md`,
);
const {
createRule,
hasThrowsTag,
findParent,
getOptionsFromContext
} = require('../utils');

module.exports = createRule({
name: 'no-undocumented-throws',
Expand Down Expand Up @@ -44,10 +44,7 @@ module.exports = createRule({
const services = ESLintUtils.getParserServices(context);
const checker = services.program.getTypeChecker();

// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const options =
/** @type {Record<string, unknown>} */
(Object.assign(Object.create(null), ...context.options));
const options = getOptionsFromContext(context);

/** @type {Map<number, import('@typescript-eslint/utils').TSESTree.ThrowStatement[]>} */
const throwStatements = new Map();
Expand Down
1 change: 1 addition & 0 deletions src/rules/no-undocumented-throws.test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @ts-check
const { RuleTester } = require('@typescript-eslint/rule-tester');
const rule = require('./no-undocumented-throws');

Expand Down
22 changes: 22 additions & 0 deletions src/utils.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
const { ESLintUtils } = require('@typescript-eslint/utils');

const createRule = ESLintUtils.RuleCreator(
name => `https://github.com/Xvezda/eslint-plugin-explicit-exceptions/blob/master/docs/rules/${name}.md`,
);

/** @param {string} comment */
const hasThrowsTag = comment =>
comment.includes('@throws') ||
Expand All @@ -22,7 +28,23 @@ const findParent = (node, callback) => {
return null;
};

/**
* @template {string} T
* @template {readonly unknown[]} U
* @param {import('@typescript-eslint/utils').TSESLint.RuleContext<T, U>} context
* @returns {{ [K in keyof U[number]]: U[number][K] }}
*/
const getOptionsFromContext = (context) => {
const options =
/** @type {{ [K in keyof U[number]]: U[number][K] }} */
(Object.assign(Object.create(null), ...context.options));

return options;
};

module.exports = {
createRule,
hasThrowsTag,
findParent,
getOptionsFromContext,
};