style: fix import/no-duplicates

eslint-functional · Jul 30, 2023 · 7739c6b · 7739c6b
1 parent 4c80b0a
commit 7739c6b
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 50 deletions.
diff --git a/src/rules/functional-parameters.ts b/src/rules/functional-parameters.ts
@@ -9,8 +9,6 @@ import { deepmerge } from "deepmerge-ts";
 import {
   type IgnoreIdentifierPatternOption,
   type IgnorePrefixSelectorOption,
-} from "#eslint-plugin-functional/options";
-import {
   shouldIgnorePattern,
   ignoreIdentifierPatternOptionSchema,
   ignorePrefixSelectorOptionSchema,
@@ -19,8 +17,8 @@ import { type ESFunction } from "#eslint-plugin-functional/utils/node-types";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRuleUsingFunction,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRuleUsingFunction } from "#eslint-plugin-functional/utils/rule";
 import {
   isArgument,
   isGetter,

diff --git a/src/rules/immutable-data.ts b/src/rules/immutable-data.ts
@@ -10,8 +10,6 @@ import {
   type IgnoreAccessorPatternOption,
   type IgnoreIdentifierPatternOption,
   type IgnoreClassesOption,
-} from "#eslint-plugin-functional/options";
-import {
   shouldIgnorePattern,
   shouldIgnoreClasses,
   ignoreAccessorPatternOptionSchema,
@@ -22,8 +20,6 @@ import { isExpected } from "#eslint-plugin-functional/utils/misc";
 import {
   createRule,
   getTypeOfNode,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/rules/no-classes.ts b/src/rules/no-classes.ts
@@ -5,8 +5,8 @@ import { type ESClass } from "#eslint-plugin-functional/utils/node-types";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 
 /**
  * The name of this rule.

diff --git a/src/rules/no-conditional-statements.ts b/src/rules/no-conditional-statements.ts
@@ -7,8 +7,6 @@ import tsApiUtils from "#eslint-plugin-functional/conditional-imports/ts-api-uti
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   createRule,
   getTypeOfNode,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/rules/no-expression-statements.ts b/src/rules/no-expression-statements.ts
@@ -9,17 +9,15 @@ import { isThisKeyword } from "ts-api-utils";
 
 import tsApiUtils from "#eslint-plugin-functional/conditional-imports/ts-api-utils";
 import typescript from "#eslint-plugin-functional/conditional-imports/typescript";
-import { type IgnoreCodePatternOption } from "#eslint-plugin-functional/options";
 import {
+  type IgnoreCodePatternOption,
   shouldIgnorePattern,
   ignoreCodePatternOptionSchema,
 } from "#eslint-plugin-functional/options";
 import { isDirectivePrologue } from "#eslint-plugin-functional/utils/misc";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   createRule,
   getTypeOfNode,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/rules/no-let.ts b/src/rules/no-let.ts
@@ -6,17 +6,17 @@ import {
 import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import { deepmerge } from "deepmerge-ts";
 
-import { type IgnoreIdentifierPatternOption } from "#eslint-plugin-functional/options";
 import {
+  type IgnoreIdentifierPatternOption,
   shouldIgnorePattern,
   shouldIgnoreInFunction,
   ignoreIdentifierPatternOptionSchema,
 } from "#eslint-plugin-functional/options";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 import { isInForLoopInitializer } from "#eslint-plugin-functional/utils/tree";
 
 /**

diff --git a/src/rules/no-loop-statements.ts b/src/rules/no-loop-statements.ts
@@ -5,8 +5,8 @@ import { type ESLoop } from "#eslint-plugin-functional/utils/node-types";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 
 /**
  * The name of this rule.

diff --git a/src/rules/no-mixed-types.ts b/src/rules/no-mixed-types.ts
@@ -1,13 +1,12 @@
-import { type TSESTree } from "@typescript-eslint/utils";
-import { AST_NODE_TYPES } from "@typescript-eslint/utils";
+import { type TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
 import { type JSONSchema4 } from "@typescript-eslint/utils/json-schema";
 import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRuleUsingFunction,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRuleUsingFunction } from "#eslint-plugin-functional/utils/rule";
 import {
   isIdentifier,
   isTSPropertySignature,

diff --git a/src/rules/no-promise-reject.ts b/src/rules/no-promise-reject.ts
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 import {
   isIdentifier,
   isMemberExpression,

diff --git a/src/rules/no-return-void.ts b/src/rules/no-return-void.ts
@@ -6,8 +6,6 @@ import { type ESFunctionType } from "#eslint-plugin-functional/utils/node-types"
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   createRule,
   getTypeOfNode,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/rules/no-this-expressions.ts b/src/rules/no-this-expressions.ts
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 
 /**
  * The name of this rule.

diff --git a/src/rules/no-throw-statements.ts b/src/rules/no-throw-statements.ts
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 import { isInFunctionBody } from "#eslint-plugin-functional/utils/tree";
 
 /**

diff --git a/src/rules/no-try-statements.ts b/src/rules/no-try-statements.ts
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 
 /**
  * The name of this rule.

diff --git a/src/rules/prefer-immutable-types.ts b/src/rules/prefer-immutable-types.ts
@@ -10,8 +10,8 @@ import {
 import { deepmerge } from "deepmerge-ts";
 import { Immutability } from "is-immutable-type";
 
-import { type IgnoreClassesOption } from "#eslint-plugin-functional/options";
 import {
+  type IgnoreClassesOption,
   ignoreClassesOptionSchema,
   shouldIgnoreClasses,
   shouldIgnoreInFunction,
@@ -21,8 +21,6 @@ import { type ESFunctionType } from "#eslint-plugin-functional/utils/node-types"
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   createRule,
   getReturnTypesOfFunction,
   getTypeImmutabilityOfNode,

diff --git a/src/rules/prefer-property-signatures.ts b/src/rules/prefer-property-signatures.ts
@@ -5,8 +5,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
+  createRule,
 } from "#eslint-plugin-functional/utils/rule";
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 import { isInReadonly } from "#eslint-plugin-functional/utils/tree";
 
 /**

diff --git a/src/rules/prefer-readonly-type.ts b/src/rules/prefer-readonly-type.ts
@@ -5,8 +5,6 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import {
   type IgnoreCodePatternOption,
   type IgnoreAccessorPatternOption,
-} from "#eslint-plugin-functional/options";
-import {
   shouldIgnoreInFunction,
   shouldIgnoreClasses,
   shouldIgnorePattern,
@@ -16,8 +14,6 @@ import {
   type BaseOptions,
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   createRule,
   getTypeOfNode,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/rules/prefer-tacit.ts b/src/rules/prefer-tacit.ts
@@ -15,8 +15,6 @@ import { type ESFunction } from "#eslint-plugin-functional/utils/node-types";
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   createRule,
   getESTreeNode,
   getTypeOfNode,

diff --git a/src/rules/readonly-type.ts b/src/rules/readonly-type.ts
@@ -5,8 +5,8 @@ import {
   type RuleContext,
 } from "@typescript-eslint/utils/ts-eslint";
 
-import { createRule } from "#eslint-plugin-functional/utils/rule";
 import {
+  createRule,
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/rules/type-declaration-immutability.ts b/src/rules/type-declaration-immutability.ts
@@ -7,8 +7,8 @@ import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 import { deepmerge } from "deepmerge-ts";
 import { Immutability } from "is-immutable-type";
 
-import { type IgnoreIdentifierPatternOption } from "#eslint-plugin-functional/options";
 import {
+  type IgnoreIdentifierPatternOption,
   shouldIgnorePattern,
   ignoreIdentifierPatternOptionSchema,
 } from "#eslint-plugin-functional/options";
@@ -17,8 +17,6 @@ import { type ESTypeDeclaration } from "#eslint-plugin-functional/utils/node-typ
 import {
   type RuleResult,
   type NamedCreateRuleMetaWithCategory,
-} from "#eslint-plugin-functional/utils/rule";
-import {
   getTypeImmutabilityOfNode,
   createRule,
 } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/settings/immutability.ts b/src/settings/immutability.ts
@@ -2,8 +2,6 @@ import { type SharedConfigurationSettings } from "@typescript-eslint/utils";
 import {
   type ImmutabilityOverrides,
   type TypeSpecifier,
-} from "is-immutable-type";
-import {
   Immutability,
   getDefaultOverrides as getDefaultImmutabilityOverrides,
 } from "is-immutable-type";

diff --git a/src/utils/misc.ts b/src/utils/misc.ts
@@ -1,5 +1,4 @@
-import { type TSESTree } from "@typescript-eslint/utils";
-import { AST_NODE_TYPES } from "@typescript-eslint/utils";
+import { type TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
 import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
 
 import { type BaseOptions } from "#eslint-plugin-functional/utils/rule";

diff --git a/src/utils/rule.ts b/src/utils/rule.ts
@@ -10,8 +10,11 @@ import {
   type ReportDescriptor,
   type RuleListener,
 } from "@typescript-eslint/utils/ts-eslint";
-import { type ImmutabilityOverrides } from "is-immutable-type";
-import { getTypeImmutability, Immutability } from "is-immutable-type";
+import {
+  type ImmutabilityOverrides,
+  getTypeImmutability,
+  Immutability,
+} from "is-immutable-type";
 import { type Node as TSNode, type Type, type TypeNode } from "typescript";
 
 import ts from "#eslint-plugin-functional/conditional-imports/typescript";

diff --git a/src/utils/type-guards.ts b/src/utils/type-guards.ts
@@ -2,8 +2,7 @@
  * @file Functions that type guard the given node/type.
  */
 
-import { type TSESTree } from "@typescript-eslint/utils";
-import { AST_NODE_TYPES } from "@typescript-eslint/utils";
+import { type TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
 import { type Type, type UnionType } from "typescript";
 
 import ts from "#eslint-plugin-functional/conditional-imports/typescript";

diff --git a/tests/common/ignore-options.test.ts b/tests/common/ignore-options.test.ts
@@ -8,8 +8,8 @@ import {
   type IgnoreIdentifierPatternOption,
   type IgnoreAccessorPatternOption,
   type IgnoreCodePatternOption,
+  shouldIgnorePattern,
 } from "#eslint-plugin-functional/options";
-import { shouldIgnorePattern } from "#eslint-plugin-functional/options";
 import { getRuleTester } from "#eslint-plugin-functional/tests/helpers/RuleTester";
 import {
   filename,

diff --git a/tests/helpers/testers.ts b/tests/helpers/testers.ts
@@ -2,8 +2,12 @@ import { type RuleModule } from "@typescript-eslint/utils/ts-eslint";
 
 import { getRuleTester } from "./RuleTester";
 import { configs } from "./configs";
-import { processInvalidTestCase, processValidTestCase } from "./util";
-import { type ValidTestCaseSet, type InvalidTestCaseSet } from "./util";
+import {
+  processInvalidTestCase,
+  processValidTestCase,
+  type ValidTestCaseSet,
+  type InvalidTestCaseSet,
+} from "./util";
 
 type TestFunction<
   TMessageIds extends string,