Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

fix(utils): add defaultOptions to meta in rule#10339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
bradzacher merged 18 commits intotypescript-eslint:mainfromLuisUrrutia:main
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
18 commits
Select commitHold shift + click to select a range
a1cb096
fix(utils): add defaultOptions to meta
LuisUrrutiaNov 16, 2024
59a55f5
fix(utils): add defaultOptions to rule instead of RuleCreator
LuisUrrutiaNov 16, 2024
d5a9b16
fix(utils): add defaultOptions jsdocs
LuisUrrutiaNov 16, 2024
49bac3f
refactor: add defaultOptions to affected eslint rules
LuisUrrutiaNov 16, 2024
3eca8be
Update init-declarations.ts
bradzacherNov 17, 2024
76b40be
Update max-params.ts
bradzacherNov 17, 2024
da04432
Update no-dupe-class-members.ts
bradzacherNov 17, 2024
097e978
Update init-declarations.ts
bradzacherNov 17, 2024
8bda23c
Update max-params.ts
bradzacherNov 17, 2024
40acfda
Update no-loop-func.ts
bradzacherNov 17, 2024
d1eb53e
Update no-loss-of-precision.ts
bradzacherNov 17, 2024
6ec4f78
Update no-magic-numbers.ts
bradzacherNov 17, 2024
2da4fc4
Discard changes to packages/eslint-plugin/src/rules/no-restricted-imp…
bradzacherNov 17, 2024
54cd570
Update no-restricted-imports.ts
bradzacherNov 17, 2024
28cc05b
Discard changes to packages/eslint-plugin/src/rules/no-useless-constr…
bradzacherNov 17, 2024
c88a353
Update no-useless-constructor.ts
bradzacherNov 17, 2024
adc19f4
Discard changes to packages/eslint-plugin/src/rules/prefer-destructur…
bradzacherNov 17, 2024
0537ef6
Update prefer-destructuring.ts
bradzacherNov 17, 2024
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
4 changes: 3 additions & 1 deletionpackages/eslint-plugin/src/rules/consistent-return.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,12 @@ type FunctionNode =
| TSESTree.FunctionDeclaration
| TSESTree.FunctionExpression;

const defaultOptions: Options = [{ treatUndefinedAsUnspecified: false }];
export default createRule<Options, MessageIds>({
name: 'consistent-return',
meta: {
type: 'suggestion',
defaultOptions,
docs: {
description:
'Require `return` statements to either always or never specify values',
Expand All@@ -35,7 +37,7 @@ export default createRule<Options, MessageIds>({
messages: baseRule.meta.messages,
schema: baseRule.meta.schema,
},
defaultOptions: [{ treatUndefinedAsUnspecified: false }],
defaultOptions,
create(context, [options]) {
const services = getParserServices(context);
const checker = services.program.getTypeChecker();
Expand Down
21 changes: 12 additions & 9 deletionspackages/eslint-plugin/src/rules/dot-notation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,10 +17,21 @@ const baseRule = getESLintCoreRule('dot-notation');
export type Options = InferOptionsTypeFromRule<typeof baseRule>;
export type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;

const defaultOptions: Options = [
{
allowIndexSignaturePropertyAccess: false,
allowKeywords: true,
allowPattern: '',
allowPrivateClassPropertyAccess: false,
allowProtectedClassPropertyAccess: false,
},
];

export default createRule<Options, MessageIds>({
name: 'dot-notation',
meta: {
type: 'suggestion',
defaultOptions,
docs: {
description: 'Enforce dot notation whenever possible',
extendsBaseRule: true,
Expand DownExpand Up@@ -67,15 +78,7 @@ export default createRule<Options, MessageIds>({
},
],
},
defaultOptions: [
{
allowIndexSignaturePropertyAccess: false,
allowKeywords: true,
allowPattern: '',
allowPrivateClassPropertyAccess: false,
allowProtectedClassPropertyAccess: false,
},
],
defaultOptions,
create(context, [options]) {
const rules = baseRule.create(context);
const services = getParserServices(context);
Expand Down
1 change: 1 addition & 0 deletionspackages/eslint-plugin/src/rules/init-declarations.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ export default createRule<Options, MessageIds>({
name: 'init-declarations',
meta: {
type: 'suggestion',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description:
'Require or disallow initialization in variable declarations',
Expand Down
1 change: 1 addition & 0 deletionspackages/eslint-plugin/src/rules/max-params.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export default createRule<Options, MessageIds>({
name: 'max-params',
meta: {
type: 'suggestion',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description:
'Enforce a maximum number of parameters in function definitions',
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ export default createRule<Options, MessageIds>({
name: 'no-dupe-class-members',
meta: {
type: 'problem',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description: 'Disallow duplicate class members',
extendsBaseRule: true,
Expand Down
13 changes: 8 additions & 5 deletionspackages/eslint-plugin/src/rules/no-empty-function.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ const baseRule = getESLintCoreRule('no-empty-function');
type Options = InferOptionsTypeFromRule<typeof baseRule>;
type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;

const defaultOptions: Options = [
{
allow: [],
},
];

const schema = deepMerge(
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument -- https://github.com/microsoft/TypeScript/issues/17002
Array.isArray(baseRule.meta.schema)
Expand DownExpand Up@@ -54,6 +60,7 @@ export default createRule<Options, MessageIds>({
name: 'no-empty-function',
meta: {
type: 'suggestion',
defaultOptions,
docs: {
description: 'Disallow empty functions',
extendsBaseRule: true,
Expand All@@ -63,11 +70,7 @@ export default createRule<Options, MessageIds>({
messages: baseRule.meta.messages,
schema: [schema],
},
defaultOptions: [
{
allow: [],
},
],
defaultOptions,
create(context, [{ allow = [] }]) {
const rules = baseRule.create(context);

Expand Down
5 changes: 4 additions & 1 deletionpackages/eslint-plugin/src/rules/no-invalid-this.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,10 +15,13 @@ const baseRule = getESLintCoreRule('no-invalid-this');
export type Options = InferOptionsTypeFromRule<typeof baseRule>;
export type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;

const defaultOptions: Options = [{ capIsConstructor: true }];

export default createRule<Options, MessageIds>({
name: 'no-invalid-this',
meta: {
type: 'suggestion',
defaultOptions,
docs: {
description:
'Disallow `this` keywords outside of classes or class-like objects',
Expand All@@ -28,7 +31,7 @@ export default createRule<Options, MessageIds>({
messages: baseRule.meta.messages,
schema: baseRule.meta.schema,
},
defaultOptions: [{ capIsConstructor: true }],
defaultOptions,
create(context) {
const rules = baseRule.create(context);

Expand Down
1 change: 1 addition & 0 deletionspackages/eslint-plugin/src/rules/no-loop-func.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ export default createRule<Options, MessageIds>({
name: 'no-loop-func',
meta: {
type: 'suggestion',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description:
'Disallow function declarations that contain unsafe references inside loop statements',
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export default createRule<Options, MessageIds>({
name: 'no-loss-of-precision',
meta: {
type: 'problem',
// defaultOptions, -- base rule does not use defaultOptions
deprecated: true,
docs: {
description: 'Disallow literal numbers that lose precision',
Expand Down
1 change: 1 addition & 0 deletionspackages/eslint-plugin/src/rules/no-magic-numbers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ export default createRule<Options, MessageIds>({
name: 'no-magic-numbers',
meta: {
type: 'suggestion',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description: 'Disallow magic numbers',
extendsBaseRule: true,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,7 @@ export default createRule<Options, MessageIds>({
name: 'no-restricted-imports',
meta: {
type: 'suggestion',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description: 'Disallow specified modules when loaded by `import`',
extendsBaseRule: true,
Expand Down
17 changes: 10 additions & 7 deletionspackages/eslint-plugin/src/rules/no-unused-expressions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,19 @@ const baseRule = getESLintCoreRule('no-unused-expressions');
type MessageIds = InferMessageIdsTypeFromRule<typeof baseRule>;
type Options = InferOptionsTypeFromRule<typeof baseRule>;

const defaultOptions: Options = [
{
allowShortCircuit: false,
allowTaggedTemplates: false,
allowTernary: false,
},
];

export default createRule<Options, MessageIds>({
name: 'no-unused-expressions',
meta: {
type: 'suggestion',
defaultOptions,
docs: {
description: 'Disallow unused expressions',
extendsBaseRule: true,
Expand All@@ -26,13 +35,7 @@ export default createRule<Options, MessageIds>({
messages: baseRule.meta.messages,
schema: baseRule.meta.schema,
},
defaultOptions: [
{
allowShortCircuit: false,
allowTaggedTemplates: false,
allowTernary: false,
},
],
defaultOptions,
create(context, [{ allowShortCircuit = false, allowTernary = false }]) {
const rules = baseRule.create(context);

Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export default createRule<Options, MessageIds>({
name: 'no-useless-constructor',
meta: {
type: 'problem',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description: 'Disallow unnecessary constructors',
extendsBaseRule: true,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ export default createRule<Options, MessageIds>({
name: 'prefer-destructuring',
meta: {
type: 'suggestion',
// defaultOptions, -- base rule does not use defaultOptions
docs: {
description: 'Require destructuring from arrays and/or objects',
extendsBaseRule: true,
Expand Down
7 changes: 4 additions & 3 deletionspackages/utils/src/eslint-utils/RuleCreator.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,10 @@ export type NamedCreateRuleMetaDocs = Omit<RuleMetaDataDocs, 'url'>;
export type NamedCreateRuleMeta<
MessageIds extends string,
PluginDocs = unknown,
Options extends readonly unknown[] = [],
> = {
docs: PluginDocs & RuleMetaDataDocs;
} & Omit<RuleMetaData<MessageIds, PluginDocs>, 'docs'>;
} & Omit<RuleMetaData<MessageIds, PluginDocs, Options>, 'docs'>;

export interface RuleCreateAndOptions<
Options extends readonly unknown[],
Expand All@@ -34,15 +35,15 @@ export interface RuleWithMeta<
MessageIds extends string,
Docs = unknown,
> extends RuleCreateAndOptions<Options, MessageIds> {
meta: RuleMetaData<MessageIds, Docs>;
meta: RuleMetaData<MessageIds, Docs, Options>;
}

export interface RuleWithMetaAndName<
Options extends readonly unknown[],
MessageIds extends string,
Docs = unknown,
> extends RuleCreateAndOptions<Options, MessageIds> {
meta: NamedCreateRuleMeta<MessageIds, Docs>;
meta: NamedCreateRuleMeta<MessageIds, Docs, Options>;
name: string;
}

Expand Down
22 changes: 18 additions & 4 deletionspackages/utils/src/ts-eslint/Rule.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,11 @@ export interface RuleMetaDataDocs {
url?: string;
}

export interface RuleMetaData<MessageIds extends string, PluginDocs = unknown> {
export interface RuleMetaData<
MessageIds extends string,
PluginDocs = unknown,
Options extends readonly unknown[] = [],
> {
/**
* True if the rule is deprecated, false otherwise
*/
Expand DownExpand Up@@ -65,12 +69,22 @@ export interface RuleMetaData<MessageIds extends string, PluginDocs = unknown> {
* - `"layout"` means the rule cares primarily about whitespace, semicolons, commas, and parentheses, all the parts of the program that determine how the code looks rather than how it executes. These rules work on parts of the code that aren’t specified in the AST.
*/
type: 'layout' | 'problem' | 'suggestion';

/**
* Specifies default options for the rule. If present, any user-provided options in their config will be merged on top of them recursively.
* This merging will be applied directly to `context.options`.
* If you want backwards-compatible support for earlier ESLint version; consider using the top-level `defaultOptions` instead.
*
* since ESLint 9.15.0
*/
defaultOptions?: Options;
}

export interface RuleMetaDataWithDocs<
MessageIds extends string,
PluginDocs = unknown,
> extends RuleMetaData<MessageIds, PluginDocs> {
Options extends readonly unknown[] = [],
> extends RuleMetaData<MessageIds, PluginDocs, Options> {
/**
* Documentation for the rule
*/
Expand DownExpand Up@@ -655,7 +669,7 @@ export interface RuleModule<
/**
* Metadata about the rule
*/
meta: RuleMetaData<MessageIds, Docs>;
meta: RuleMetaData<MessageIds, Docs, Options>;
}

export type AnyRuleModule = RuleModule<string, readonly unknown[]>;
Expand All@@ -670,7 +684,7 @@ export interface RuleModuleWithMetaDocs<
/**
* Metadata about the rule
*/
meta: RuleMetaDataWithDocs<MessageIds, Docs>;
meta: RuleMetaDataWithDocs<MessageIds, Docs, Options>;
}

export type AnyRuleModuleWithMetaDocs = RuleModuleWithMetaDocs<
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp