Skip to content

Commit 2241095

Browse files
RebeccaStevensRebeccaStevens
committed
refactor: simplify paths (#837)
1 parent c2f1cf4 commit 2241095

File tree

125 files changed

+348
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+348
-492
lines changed

‎cz-adapter/engine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import chalk from "chalk";
22
import wrap from "word-wrap";
33

4-
import { rules } from "#eslint-plugin-functional/rules";
4+
import { rules } from "#/rules";
55

66
import { type Options } from "./options";
77

‎rollup.config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const classicCJS = {
3131
...resolvedConfig,
3232
paths: {
3333
...resolvedConfig.paths,
34-
"#eslint-plugin-functional/conditional-imports/*": [
34+
"#/conditional-imports/*": [
3535
"src/utils/conditional-imports/cjs/*",
3636
],
3737
},
@@ -65,7 +65,7 @@ const classicESM = {
6565
...resolvedConfig,
6666
paths: {
6767
...resolvedConfig.paths,
68-
"#eslint-plugin-functional/conditional-imports/*": [
68+
"#/conditional-imports/*": [
6969
"src/utils/conditional-imports/esm/*",
7070
],
7171
},
@@ -99,7 +99,7 @@ const flatCJS = {
9999
...resolvedConfig,
100100
paths: {
101101
...resolvedConfig.paths,
102-
"#eslint-plugin-functional/conditional-imports/*": [
102+
"#/conditional-imports/*": [
103103
"src/utils/conditional-imports/cjs/*",
104104
],
105105
},
@@ -133,7 +133,7 @@ const flatESM = {
133133
...resolvedConfig,
134134
paths: {
135135
...resolvedConfig.paths,
136-
"#eslint-plugin-functional/conditional-imports/*": [
136+
"#/conditional-imports/*": [
137137
"src/utils/conditional-imports/esm/*",
138138
],
139139
},

‎src/classic.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { type Linter } from "@typescript-eslint/utils/ts-eslint";
22

3-
import all from "#eslint-plugin-functional/configs/all";
4-
import currying from "#eslint-plugin-functional/configs/currying";
5-
import disableTypeChecked from "#eslint-plugin-functional/configs/disable-type-checked";
6-
import externalTypeScriptRecommended from "#eslint-plugin-functional/configs/external-typescript-recommended";
7-
import externalVanillaRecommended from "#eslint-plugin-functional/configs/external-vanilla-recommended";
8-
import lite from "#eslint-plugin-functional/configs/lite";
9-
import noExceptions from "#eslint-plugin-functional/configs/no-exceptions";
10-
import noMutations from "#eslint-plugin-functional/configs/no-mutations";
11-
import noOtherParadigms from "#eslint-plugin-functional/configs/no-other-paradigms";
12-
import noStatements from "#eslint-plugin-functional/configs/no-statements";
13-
import off from "#eslint-plugin-functional/configs/off";
14-
import recommended from "#eslint-plugin-functional/configs/recommended";
15-
import strict from "#eslint-plugin-functional/configs/strict";
16-
import stylistic from "#eslint-plugin-functional/configs/stylistic";
17-
import { rules } from "#eslint-plugin-functional/rules";
18-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import all from "#/configs/all";
4+
import currying from "#/configs/currying";
5+
import disableTypeChecked from "#/configs/disable-type-checked";
6+
import externalTypeScriptRecommended from "#/configs/external-typescript-recommended";
7+
import externalVanillaRecommended from "#/configs/external-vanilla-recommended";
8+
import lite from "#/configs/lite";
9+
import noExceptions from "#/configs/no-exceptions";
10+
import noMutations from "#/configs/no-mutations";
11+
import noOtherParadigms from "#/configs/no-other-paradigms";
12+
import noStatements from "#/configs/no-statements";
13+
import off from "#/configs/off";
14+
import recommended from "#/configs/recommended";
15+
import strict from "#/configs/strict";
16+
import stylistic from "#/configs/stylistic";
17+
import { rules } from "#/rules";
18+
import { ruleNameScope } from "#/utils/misc";
1919

2020
export default {
2121
rules,

‎src/configs/all.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default {
77
...Object.fromEntries(

‎src/configs/currying.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/disable-type-checked.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/external-typescript-recommended.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import externalVanillaRecommended from "#eslint-plugin-functional/configs/external-vanilla-recommended";
3+
import externalVanillaRecommended from "#/configs/external-vanilla-recommended";
44

55
const tsConfig = {
66
"@typescript-eslint/prefer-readonly": "error",

‎src/configs/lite.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import * as functionalParameters from "#eslint-plugin-functional/rules/functional-parameters";
4-
import * as immutableData from "#eslint-plugin-functional/rules/immutable-data";
5-
import * as noConditionalStatements from "#eslint-plugin-functional/rules/no-conditional-statements";
6-
import * as noExpressionStatements from "#eslint-plugin-functional/rules/no-expression-statements";
7-
import * as preferImmutableTypes from "#eslint-plugin-functional/rules/prefer-immutable-types";
3+
import * as functionalParameters from "#/rules/functional-parameters";
4+
import * as immutableData from "#/rules/immutable-data";
5+
import * as noConditionalStatements from "#/rules/no-conditional-statements";
6+
import * as noExpressionStatements from "#/rules/no-expression-statements";
7+
import * as preferImmutableTypes from "#/rules/prefer-immutable-types";
88

99
import recommended from "./recommended";
1010

‎src/configs/no-exceptions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/no-mutations.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/no-other-paradigms.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/no-statements.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/off.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules).map(([name]) => [`${ruleNameScope}/${name}`, "off"]),

‎src/configs/recommended.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22
import { Immutability } from "is-immutable-type";
33

4-
import { rules } from "#eslint-plugin-functional/rules";
5-
import * as functionalParameters from "#eslint-plugin-functional/rules/functional-parameters";
6-
import * as noConditionalStatements from "#eslint-plugin-functional/rules/no-conditional-statements";
7-
import * as noLet from "#eslint-plugin-functional/rules/no-let";
8-
import * as noThisExpressions from "#eslint-plugin-functional/rules/no-this-expressions";
9-
import * as noThrowStatements from "#eslint-plugin-functional/rules/no-throw-statements";
10-
import * as noTryStatements from "#eslint-plugin-functional/rules/no-try-statements";
11-
import * as preferImmutableTypes from "#eslint-plugin-functional/rules/prefer-immutable-types";
12-
import * as typeDeclarationImmutability from "#eslint-plugin-functional/rules/type-declaration-immutability";
13-
import { RuleEnforcementComparator } from "#eslint-plugin-functional/rules/type-declaration-immutability";
14-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
4+
import { rules } from "#/rules";
5+
import * as functionalParameters from "#/rules/functional-parameters";
6+
import * as noConditionalStatements from "#/rules/no-conditional-statements";
7+
import * as noLet from "#/rules/no-let";
8+
import * as noThisExpressions from "#/rules/no-this-expressions";
9+
import * as noThrowStatements from "#/rules/no-throw-statements";
10+
import * as noTryStatements from "#/rules/no-try-statements";
11+
import * as preferImmutableTypes from "#/rules/prefer-immutable-types";
12+
import * as typeDeclarationImmutability from "#/rules/type-declaration-immutability";
13+
import { RuleEnforcementComparator } from "#/rules/type-declaration-immutability";
14+
import { ruleNameScope } from "#/utils/misc";
1515

1616
const recommended = Object.fromEntries(
1717
Object.entries(rules)

‎src/configs/strict.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/configs/stylistic.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import { rules } from "#eslint-plugin-functional/rules";
4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
3+
import { rules } from "#/rules";
4+
import { ruleNameScope } from "#/utils/misc";
55

66
export default Object.fromEntries(
77
Object.entries(rules)

‎src/flat.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
22

3-
import all from "#eslint-plugin-functional/configs/all";
4-
import currying from "#eslint-plugin-functional/configs/currying";
5-
import disableTypeChecked from "#eslint-plugin-functional/configs/disable-type-checked";
6-
import externalTypeScriptRecommended from "#eslint-plugin-functional/configs/external-typescript-recommended";
7-
import externalVanillaRecommended from "#eslint-plugin-functional/configs/external-vanilla-recommended";
8-
import lite from "#eslint-plugin-functional/configs/lite";
9-
import noExceptions from "#eslint-plugin-functional/configs/no-exceptions";
10-
import noMutations from "#eslint-plugin-functional/configs/no-mutations";
11-
import noOtherParadigms from "#eslint-plugin-functional/configs/no-other-paradigms";
12-
import noStatements from "#eslint-plugin-functional/configs/no-statements";
13-
import off from "#eslint-plugin-functional/configs/off";
14-
import recommended from "#eslint-plugin-functional/configs/recommended";
15-
import strict from "#eslint-plugin-functional/configs/strict";
16-
import stylistic from "#eslint-plugin-functional/configs/stylistic";
17-
import { rules } from "#eslint-plugin-functional/rules";
18-
import { __VERSION__ } from "#eslint-plugin-functional/utils/constants";
3+
import all from "#/configs/all";
4+
import currying from "#/configs/currying";
5+
import disableTypeChecked from "#/configs/disable-type-checked";
6+
import externalTypeScriptRecommended from "#/configs/external-typescript-recommended";
7+
import externalVanillaRecommended from "#/configs/external-vanilla-recommended";
8+
import lite from "#/configs/lite";
9+
import noExceptions from "#/configs/no-exceptions";
10+
import noMutations from "#/configs/no-mutations";
11+
import noOtherParadigms from "#/configs/no-other-paradigms";
12+
import noStatements from "#/configs/no-statements";
13+
import off from "#/configs/off";
14+
import recommended from "#/configs/recommended";
15+
import strict from "#/configs/strict";
16+
import stylistic from "#/configs/stylistic";
17+
import { rules } from "#/rules";
18+
import { __VERSION__ } from "#/utils/constants";
1919

2020
const meta = {
2121
name: "eslint-plugin-functional",

‎src/options/ignore.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@ import { type JSONSchema4ObjectSchema } from "@typescript-eslint/utils/json-sche
33
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
44
import escapeRegExp from "escape-string-regexp";
55

6-
import {
7-
getNodeCode,
8-
getNodeIdentifierTexts,
9-
} from "#eslint-plugin-functional/utils/misc";
10-
import { type BaseOptions } from "#eslint-plugin-functional/utils/rule";
11-
import {
12-
isInClass,
13-
isInFunctionBody,
14-
} from "#eslint-plugin-functional/utils/tree";
6+
import { getNodeCode, getNodeIdentifierTexts } from "#/utils/misc";
7+
import { type BaseOptions } from "#/utils/rule";
8+
import { isInClass, isInFunctionBody } from "#/utils/tree";
159
import {
1610
isAssignmentExpression,
1711
isClassLike,
1812
isMemberExpression,
1913
isPropertyDefinition,
2014
isThisExpression,
21-
} from "#eslint-plugin-functional/utils/type-guards";
15+
} from "#/utils/type-guards";
2216

2317
/**
2418
* The option to ignore patterns.

‎src/rules/functional-parameters.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ import {
1212
shouldIgnorePattern,
1313
type IgnoreIdentifierPatternOption,
1414
type IgnorePrefixSelectorOption,
15-
} from "#eslint-plugin-functional/options";
16-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
17-
import { type ESFunction } from "#eslint-plugin-functional/utils/node-types";
15+
} from "#/options";
16+
import { ruleNameScope } from "#/utils/misc";
17+
import { type ESFunction } from "#/utils/node-types";
1818
import {
1919
createRuleUsingFunction,
2020
type NamedCreateRuleCustomMeta,
2121
type RuleResult,
22-
} from "#eslint-plugin-functional/utils/rule";
22+
} from "#/utils/rule";
2323
import {
2424
isArgument,
2525
isGetter,
2626
isIIFE,
2727
isPropertyAccess,
2828
isPropertyName,
2929
isSetter,
30-
} from "#eslint-plugin-functional/utils/tree";
31-
import { isRestElement } from "#eslint-plugin-functional/utils/type-guards";
30+
} from "#/utils/tree";
31+
import { isRestElement } from "#/utils/type-guards";
3232

3333
/**
3434
* The name of this rule.

‎src/rules/immutable-data.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,19 @@ import {
1515
type IgnoreAccessorPatternOption,
1616
type IgnoreClassesOption,
1717
type IgnoreIdentifierPatternOption,
18-
} from "#eslint-plugin-functional/options";
19-
import {
20-
isExpected,
21-
ruleNameScope,
22-
} from "#eslint-plugin-functional/utils/misc";
18+
} from "#/options";
19+
import { isExpected, ruleNameScope } from "#/utils/misc";
2320
import {
2421
createRule,
2522
getTypeOfNode,
2623
type NamedCreateRuleCustomMeta,
2724
type RuleResult,
28-
} from "#eslint-plugin-functional/utils/rule";
25+
} from "#/utils/rule";
2926
import {
3027
findRootIdentifier,
3128
isDefinedByMutableVariable,
3229
isInConstructor,
33-
} from "#eslint-plugin-functional/utils/tree";
30+
} from "#/utils/tree";
3431
import {
3532
isArrayConstructorType,
3633
isArrayExpression,
@@ -41,7 +38,7 @@ import {
4138
isNewExpression,
4239
isObjectConstructorType,
4340
isTSAsExpression,
44-
} from "#eslint-plugin-functional/utils/type-guards";
41+
} from "#/utils/type-guards";
4542

4643
/**
4744
* The name of this rule.

‎src/rules/no-classes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { type JSONSchema4 } from "@typescript-eslint/utils/json-schema";
22
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
33

4-
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
5-
import { type ESClass } from "#eslint-plugin-functional/utils/node-types";
4+
import { ruleNameScope } from "#/utils/misc";
5+
import { type ESClass } from "#/utils/node-types";
66
import {
77
createRule,
88
type NamedCreateRuleCustomMeta,
99
type RuleResult,
10-
} from "#eslint-plugin-functional/utils/rule";
10+
} from "#/utils/rule";
1111

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

0 commit comments

Comments
 (0)