Skip to content

Commit 7739c6b

Browse files
style: fix import/no-duplicates
1 parent 4c80b0a commit 7739c6b

25 files changed

+30
-50
lines changed

src/rules/functional-parameters.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import { deepmerge } from "deepmerge-ts";
99
import {
1010
type IgnoreIdentifierPatternOption,
1111
type IgnorePrefixSelectorOption,
12-
} from "#eslint-plugin-functional/options";
13-
import {
1412
shouldIgnorePattern,
1513
ignoreIdentifierPatternOptionSchema,
1614
ignorePrefixSelectorOptionSchema,
@@ -19,8 +17,8 @@ import { type ESFunction } from "#eslint-plugin-functional/utils/node-types";
1917
import {
2018
type RuleResult,
2119
type NamedCreateRuleMetaWithCategory,
20+
createRuleUsingFunction,
2221
} from "#eslint-plugin-functional/utils/rule";
23-
import { createRuleUsingFunction } from "#eslint-plugin-functional/utils/rule";
2422
import {
2523
isArgument,
2624
isGetter,

src/rules/immutable-data.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import {
1010
type IgnoreAccessorPatternOption,
1111
type IgnoreIdentifierPatternOption,
1212
type IgnoreClassesOption,
13-
} from "#eslint-plugin-functional/options";
14-
import {
1513
shouldIgnorePattern,
1614
shouldIgnoreClasses,
1715
ignoreAccessorPatternOptionSchema,
@@ -22,8 +20,6 @@ import { isExpected } from "#eslint-plugin-functional/utils/misc";
2220
import {
2321
createRule,
2422
getTypeOfNode,
25-
} from "#eslint-plugin-functional/utils/rule";
26-
import {
2723
type RuleResult,
2824
type NamedCreateRuleMetaWithCategory,
2925
} from "#eslint-plugin-functional/utils/rule";

src/rules/no-classes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type ESClass } from "#eslint-plugin-functional/utils/node-types";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010

1111
/**
1212
* The name of this rule.

src/rules/no-conditional-statements.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import tsApiUtils from "#eslint-plugin-functional/conditional-imports/ts-api-uti
77
import {
88
type RuleResult,
99
type NamedCreateRuleMetaWithCategory,
10-
} from "#eslint-plugin-functional/utils/rule";
11-
import {
1210
createRule,
1311
getTypeOfNode,
1412
} from "#eslint-plugin-functional/utils/rule";

src/rules/no-expression-statements.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ import { isThisKeyword } from "ts-api-utils";
99

1010
import tsApiUtils from "#eslint-plugin-functional/conditional-imports/ts-api-utils";
1111
import typescript from "#eslint-plugin-functional/conditional-imports/typescript";
12-
import { type IgnoreCodePatternOption } from "#eslint-plugin-functional/options";
1312
import {
13+
type IgnoreCodePatternOption,
1414
shouldIgnorePattern,
1515
ignoreCodePatternOptionSchema,
1616
} from "#eslint-plugin-functional/options";
1717
import { isDirectivePrologue } from "#eslint-plugin-functional/utils/misc";
1818
import {
1919
type RuleResult,
2020
type NamedCreateRuleMetaWithCategory,
21-
} from "#eslint-plugin-functional/utils/rule";
22-
import {
2321
createRule,
2422
getTypeOfNode,
2523
} from "#eslint-plugin-functional/utils/rule";

src/rules/no-let.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ import {
66
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
77
import { deepmerge } from "deepmerge-ts";
88

9-
import { type IgnoreIdentifierPatternOption } from "#eslint-plugin-functional/options";
109
import {
10+
type IgnoreIdentifierPatternOption,
1111
shouldIgnorePattern,
1212
shouldIgnoreInFunction,
1313
ignoreIdentifierPatternOptionSchema,
1414
} from "#eslint-plugin-functional/options";
1515
import {
1616
type RuleResult,
1717
type NamedCreateRuleMetaWithCategory,
18+
createRule,
1819
} from "#eslint-plugin-functional/utils/rule";
19-
import { createRule } from "#eslint-plugin-functional/utils/rule";
2020
import { isInForLoopInitializer } from "#eslint-plugin-functional/utils/tree";
2121

2222
/**

src/rules/no-loop-statements.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type ESLoop } from "#eslint-plugin-functional/utils/node-types";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010

1111
/**
1212
* The name of this rule.

src/rules/no-mixed-types.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import { type TSESTree } from "@typescript-eslint/utils";
2-
import { AST_NODE_TYPES } from "@typescript-eslint/utils";
1+
import { type TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
32
import { type JSONSchema4 } from "@typescript-eslint/utils/json-schema";
43
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
54

65
import {
76
type RuleResult,
87
type NamedCreateRuleMetaWithCategory,
8+
createRuleUsingFunction,
99
} from "#eslint-plugin-functional/utils/rule";
10-
import { createRuleUsingFunction } from "#eslint-plugin-functional/utils/rule";
1110
import {
1211
isIdentifier,
1312
isTSPropertySignature,

src/rules/no-promise-reject.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010
import {
1111
isIdentifier,
1212
isMemberExpression,

src/rules/no-return-void.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import { type ESFunctionType } from "#eslint-plugin-functional/utils/node-types"
66
import {
77
type RuleResult,
88
type NamedCreateRuleMetaWithCategory,
9-
} from "#eslint-plugin-functional/utils/rule";
10-
import {
119
createRule,
1210
getTypeOfNode,
1311
} from "#eslint-plugin-functional/utils/rule";

src/rules/no-this-expressions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010

1111
/**
1212
* The name of this rule.

src/rules/no-throw-statements.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010
import { isInFunctionBody } from "#eslint-plugin-functional/utils/tree";
1111

1212
/**

src/rules/no-try-statements.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010

1111
/**
1212
* The name of this rule.

src/rules/prefer-immutable-types.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
import { deepmerge } from "deepmerge-ts";
1111
import { Immutability } from "is-immutable-type";
1212

13-
import { type IgnoreClassesOption } from "#eslint-plugin-functional/options";
1413
import {
14+
type IgnoreClassesOption,
1515
ignoreClassesOptionSchema,
1616
shouldIgnoreClasses,
1717
shouldIgnoreInFunction,
@@ -21,8 +21,6 @@ import { type ESFunctionType } from "#eslint-plugin-functional/utils/node-types"
2121
import {
2222
type RuleResult,
2323
type NamedCreateRuleMetaWithCategory,
24-
} from "#eslint-plugin-functional/utils/rule";
25-
import {
2624
createRule,
2725
getReturnTypesOfFunction,
2826
getTypeImmutabilityOfNode,

src/rules/prefer-property-signatures.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
55
import {
66
type RuleResult,
77
type NamedCreateRuleMetaWithCategory,
8+
createRule,
89
} from "#eslint-plugin-functional/utils/rule";
9-
import { createRule } from "#eslint-plugin-functional/utils/rule";
1010
import { isInReadonly } from "#eslint-plugin-functional/utils/tree";
1111

1212
/**

src/rules/prefer-readonly-type.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
55
import {
66
type IgnoreCodePatternOption,
77
type IgnoreAccessorPatternOption,
8-
} from "#eslint-plugin-functional/options";
9-
import {
108
shouldIgnoreInFunction,
119
shouldIgnoreClasses,
1210
shouldIgnorePattern,
@@ -16,8 +14,6 @@ import {
1614
type BaseOptions,
1715
type RuleResult,
1816
type NamedCreateRuleMetaWithCategory,
19-
} from "#eslint-plugin-functional/utils/rule";
20-
import {
2117
createRule,
2218
getTypeOfNode,
2319
} from "#eslint-plugin-functional/utils/rule";

src/rules/prefer-tacit.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import { type ESFunction } from "#eslint-plugin-functional/utils/node-types";
1515
import {
1616
type RuleResult,
1717
type NamedCreateRuleMetaWithCategory,
18-
} from "#eslint-plugin-functional/utils/rule";
19-
import {
2018
createRule,
2119
getESTreeNode,
2220
getTypeOfNode,

src/rules/readonly-type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
type RuleContext,
66
} from "@typescript-eslint/utils/ts-eslint";
77

8-
import { createRule } from "#eslint-plugin-functional/utils/rule";
98
import {
9+
createRule,
1010
type RuleResult,
1111
type NamedCreateRuleMetaWithCategory,
1212
} from "#eslint-plugin-functional/utils/rule";

src/rules/type-declaration-immutability.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
77
import { deepmerge } from "deepmerge-ts";
88
import { Immutability } from "is-immutable-type";
99

10-
import { type IgnoreIdentifierPatternOption } from "#eslint-plugin-functional/options";
1110
import {
11+
type IgnoreIdentifierPatternOption,
1212
shouldIgnorePattern,
1313
ignoreIdentifierPatternOptionSchema,
1414
} from "#eslint-plugin-functional/options";
@@ -17,8 +17,6 @@ import { type ESTypeDeclaration } from "#eslint-plugin-functional/utils/node-typ
1717
import {
1818
type RuleResult,
1919
type NamedCreateRuleMetaWithCategory,
20-
} from "#eslint-plugin-functional/utils/rule";
21-
import {
2220
getTypeImmutabilityOfNode,
2321
createRule,
2422
} from "#eslint-plugin-functional/utils/rule";

src/settings/immutability.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import { type SharedConfigurationSettings } from "@typescript-eslint/utils";
22
import {
33
type ImmutabilityOverrides,
44
type TypeSpecifier,
5-
} from "is-immutable-type";
6-
import {
75
Immutability,
86
getDefaultOverrides as getDefaultImmutabilityOverrides,
97
} from "is-immutable-type";

src/utils/misc.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { type TSESTree } from "@typescript-eslint/utils";
2-
import { AST_NODE_TYPES } from "@typescript-eslint/utils";
1+
import { type TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
32
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
43

54
import { type BaseOptions } from "#eslint-plugin-functional/utils/rule";

src/utils/rule.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ import {
1010
type ReportDescriptor,
1111
type RuleListener,
1212
} from "@typescript-eslint/utils/ts-eslint";
13-
import { type ImmutabilityOverrides } from "is-immutable-type";
14-
import { getTypeImmutability, Immutability } from "is-immutable-type";
13+
import {
14+
type ImmutabilityOverrides,
15+
getTypeImmutability,
16+
Immutability,
17+
} from "is-immutable-type";
1518
import { type Node as TSNode, type Type, type TypeNode } from "typescript";
1619

1720
import ts from "#eslint-plugin-functional/conditional-imports/typescript";

src/utils/type-guards.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
* @file Functions that type guard the given node/type.
33
*/
44

5-
import { type TSESTree } from "@typescript-eslint/utils";
6-
import { AST_NODE_TYPES } from "@typescript-eslint/utils";
5+
import { type TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
76
import { type Type, type UnionType } from "typescript";
87

98
import ts from "#eslint-plugin-functional/conditional-imports/typescript";

tests/common/ignore-options.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
type IgnoreIdentifierPatternOption,
99
type IgnoreAccessorPatternOption,
1010
type IgnoreCodePatternOption,
11+
shouldIgnorePattern,
1112
} from "#eslint-plugin-functional/options";
12-
import { shouldIgnorePattern } from "#eslint-plugin-functional/options";
1313
import { getRuleTester } from "#eslint-plugin-functional/tests/helpers/RuleTester";
1414
import {
1515
filename,

tests/helpers/testers.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ import { type RuleModule } from "@typescript-eslint/utils/ts-eslint";
22

33
import { getRuleTester } from "./RuleTester";
44
import { configs } from "./configs";
5-
import { processInvalidTestCase, processValidTestCase } from "./util";
6-
import { type ValidTestCaseSet, type InvalidTestCaseSet } from "./util";
5+
import {
6+
processInvalidTestCase,
7+
processValidTestCase,
8+
type ValidTestCaseSet,
9+
type InvalidTestCaseSet,
10+
} from "./util";
711

812
type TestFunction<
913
TMessageIds extends string,

0 commit comments

Comments
 (0)