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
refactor: simplify paths (#837)
  • Loading branch information
RebeccaStevens committed Jun 19, 2024
commit 2241095c535d3e4f43f3f7b5c4517def0b1dc304
2 changes: 1 addition & 1 deletion cz-adapter/engine.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import chalk from "chalk";
import wrap from "word-wrap";

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

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

Expand Down
8 changes: 4 additions & 4 deletions rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const classicCJS = {
...resolvedConfig,
paths: {
...resolvedConfig.paths,
"#eslint-plugin-functional/conditional-imports/*": [
"#/conditional-imports/*": [
"src/utils/conditional-imports/cjs/*",
],
},
Expand Down Expand Up @@ -65,7 +65,7 @@ const classicESM = {
...resolvedConfig,
paths: {
...resolvedConfig.paths,
"#eslint-plugin-functional/conditional-imports/*": [
"#/conditional-imports/*": [
"src/utils/conditional-imports/esm/*",
],
},
Expand Down Expand Up @@ -99,7 +99,7 @@ const flatCJS = {
...resolvedConfig,
paths: {
...resolvedConfig.paths,
"#eslint-plugin-functional/conditional-imports/*": [
"#/conditional-imports/*": [
"src/utils/conditional-imports/cjs/*",
],
},
Expand Down Expand Up @@ -133,7 +133,7 @@ const flatESM = {
...resolvedConfig,
paths: {
...resolvedConfig.paths,
"#eslint-plugin-functional/conditional-imports/*": [
"#/conditional-imports/*": [
"src/utils/conditional-imports/esm/*",
],
},
Expand Down
32 changes: 16 additions & 16 deletions src/classic.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { type Linter } from "@typescript-eslint/utils/ts-eslint";

import all from "#eslint-plugin-functional/configs/all";
import currying from "#eslint-plugin-functional/configs/currying";
import disableTypeChecked from "#eslint-plugin-functional/configs/disable-type-checked";
import externalTypeScriptRecommended from "#eslint-plugin-functional/configs/external-typescript-recommended";
import externalVanillaRecommended from "#eslint-plugin-functional/configs/external-vanilla-recommended";
import lite from "#eslint-plugin-functional/configs/lite";
import noExceptions from "#eslint-plugin-functional/configs/no-exceptions";
import noMutations from "#eslint-plugin-functional/configs/no-mutations";
import noOtherParadigms from "#eslint-plugin-functional/configs/no-other-paradigms";
import noStatements from "#eslint-plugin-functional/configs/no-statements";
import off from "#eslint-plugin-functional/configs/off";
import recommended from "#eslint-plugin-functional/configs/recommended";
import strict from "#eslint-plugin-functional/configs/strict";
import stylistic from "#eslint-plugin-functional/configs/stylistic";
import { rules } from "#eslint-plugin-functional/rules";
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
import all from "#/configs/all";
import currying from "#/configs/currying";
import disableTypeChecked from "#/configs/disable-type-checked";
import externalTypeScriptRecommended from "#/configs/external-typescript-recommended";
import externalVanillaRecommended from "#/configs/external-vanilla-recommended";
import lite from "#/configs/lite";
import noExceptions from "#/configs/no-exceptions";
import noMutations from "#/configs/no-mutations";
import noOtherParadigms from "#/configs/no-other-paradigms";
import noStatements from "#/configs/no-statements";
import off from "#/configs/off";
import recommended from "#/configs/recommended";
import strict from "#/configs/strict";
import stylistic from "#/configs/stylistic";
import { rules } from "#/rules";
import { ruleNameScope } from "#/utils/misc";

export default {
rules,
Expand Down
4 changes: 2 additions & 2 deletions src/configs/all.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default {
...Object.fromEntries(
Expand Down
4 changes: 2 additions & 2 deletions src/configs/currying.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/disable-type-checked.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
2 changes: 1 addition & 1 deletion src/configs/external-typescript-recommended.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

const tsConfig = {
"@typescript-eslint/prefer-readonly": "error",
Expand Down
10 changes: 5 additions & 5 deletions src/configs/lite.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

import * as functionalParameters from "#eslint-plugin-functional/rules/functional-parameters";
import * as immutableData from "#eslint-plugin-functional/rules/immutable-data";
import * as noConditionalStatements from "#eslint-plugin-functional/rules/no-conditional-statements";
import * as noExpressionStatements from "#eslint-plugin-functional/rules/no-expression-statements";
import * as preferImmutableTypes from "#eslint-plugin-functional/rules/prefer-immutable-types";
import * as functionalParameters from "#/rules/functional-parameters";
import * as immutableData from "#/rules/immutable-data";
import * as noConditionalStatements from "#/rules/no-conditional-statements";
import * as noExpressionStatements from "#/rules/no-expression-statements";
import * as preferImmutableTypes from "#/rules/prefer-immutable-types";

import recommended from "./recommended";

Expand Down
4 changes: 2 additions & 2 deletions src/configs/no-exceptions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/no-mutations.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/no-other-paradigms.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/no-statements.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/off.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules).map(([name]) => [`${ruleNameScope}/${name}`, "off"]),
Expand Down
22 changes: 11 additions & 11 deletions src/configs/recommended.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";
import { Immutability } from "is-immutable-type";

import { rules } from "#eslint-plugin-functional/rules";
import * as functionalParameters from "#eslint-plugin-functional/rules/functional-parameters";
import * as noConditionalStatements from "#eslint-plugin-functional/rules/no-conditional-statements";
import * as noLet from "#eslint-plugin-functional/rules/no-let";
import * as noThisExpressions from "#eslint-plugin-functional/rules/no-this-expressions";
import * as noThrowStatements from "#eslint-plugin-functional/rules/no-throw-statements";
import * as noTryStatements from "#eslint-plugin-functional/rules/no-try-statements";
import * as preferImmutableTypes from "#eslint-plugin-functional/rules/prefer-immutable-types";
import * as typeDeclarationImmutability from "#eslint-plugin-functional/rules/type-declaration-immutability";
import { RuleEnforcementComparator } from "#eslint-plugin-functional/rules/type-declaration-immutability";
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
import { rules } from "#/rules";
import * as functionalParameters from "#/rules/functional-parameters";
import * as noConditionalStatements from "#/rules/no-conditional-statements";
import * as noLet from "#/rules/no-let";
import * as noThisExpressions from "#/rules/no-this-expressions";
import * as noThrowStatements from "#/rules/no-throw-statements";
import * as noTryStatements from "#/rules/no-try-statements";
import * as preferImmutableTypes from "#/rules/prefer-immutable-types";
import * as typeDeclarationImmutability from "#/rules/type-declaration-immutability";
import { RuleEnforcementComparator } from "#/rules/type-declaration-immutability";
import { ruleNameScope } from "#/utils/misc";

const recommended = Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/strict.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
4 changes: 2 additions & 2 deletions src/configs/stylistic.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

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

export default Object.fromEntries(
Object.entries(rules)
Expand Down
32 changes: 16 additions & 16 deletions src/flat.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { type FlatConfig } from "@typescript-eslint/utils/ts-eslint";

import all from "#eslint-plugin-functional/configs/all";
import currying from "#eslint-plugin-functional/configs/currying";
import disableTypeChecked from "#eslint-plugin-functional/configs/disable-type-checked";
import externalTypeScriptRecommended from "#eslint-plugin-functional/configs/external-typescript-recommended";
import externalVanillaRecommended from "#eslint-plugin-functional/configs/external-vanilla-recommended";
import lite from "#eslint-plugin-functional/configs/lite";
import noExceptions from "#eslint-plugin-functional/configs/no-exceptions";
import noMutations from "#eslint-plugin-functional/configs/no-mutations";
import noOtherParadigms from "#eslint-plugin-functional/configs/no-other-paradigms";
import noStatements from "#eslint-plugin-functional/configs/no-statements";
import off from "#eslint-plugin-functional/configs/off";
import recommended from "#eslint-plugin-functional/configs/recommended";
import strict from "#eslint-plugin-functional/configs/strict";
import stylistic from "#eslint-plugin-functional/configs/stylistic";
import { rules } from "#eslint-plugin-functional/rules";
import { __VERSION__ } from "#eslint-plugin-functional/utils/constants";
import all from "#/configs/all";
import currying from "#/configs/currying";
import disableTypeChecked from "#/configs/disable-type-checked";
import externalTypeScriptRecommended from "#/configs/external-typescript-recommended";
import externalVanillaRecommended from "#/configs/external-vanilla-recommended";
import lite from "#/configs/lite";
import noExceptions from "#/configs/no-exceptions";
import noMutations from "#/configs/no-mutations";
import noOtherParadigms from "#/configs/no-other-paradigms";
import noStatements from "#/configs/no-statements";
import off from "#/configs/off";
import recommended from "#/configs/recommended";
import strict from "#/configs/strict";
import stylistic from "#/configs/stylistic";
import { rules } from "#/rules";
import { __VERSION__ } from "#/utils/constants";

const meta = {
name: "eslint-plugin-functional",
Expand Down
14 changes: 4 additions & 10 deletions src/options/ignore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,16 @@ import { type JSONSchema4ObjectSchema } from "@typescript-eslint/utils/json-sche
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";
import escapeRegExp from "escape-string-regexp";

import {
getNodeCode,
getNodeIdentifierTexts,
} from "#eslint-plugin-functional/utils/misc";
import { type BaseOptions } from "#eslint-plugin-functional/utils/rule";
import {
isInClass,
isInFunctionBody,
} from "#eslint-plugin-functional/utils/tree";
import { getNodeCode, getNodeIdentifierTexts } from "#/utils/misc";
import { type BaseOptions } from "#/utils/rule";
import { isInClass, isInFunctionBody } from "#/utils/tree";
import {
isAssignmentExpression,
isClassLike,
isMemberExpression,
isPropertyDefinition,
isThisExpression,
} from "#eslint-plugin-functional/utils/type-guards";
} from "#/utils/type-guards";

/**
* The option to ignore patterns.
Expand Down
12 changes: 6 additions & 6 deletions src/rules/functional-parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ import {
shouldIgnorePattern,
type IgnoreIdentifierPatternOption,
type IgnorePrefixSelectorOption,
} from "#eslint-plugin-functional/options";
import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
import { type ESFunction } from "#eslint-plugin-functional/utils/node-types";
} from "#/options";
import { ruleNameScope } from "#/utils/misc";
import { type ESFunction } from "#/utils/node-types";
import {
createRuleUsingFunction,
type NamedCreateRuleCustomMeta,
type RuleResult,
} from "#eslint-plugin-functional/utils/rule";
} from "#/utils/rule";
import {
isArgument,
isGetter,
isIIFE,
isPropertyAccess,
isPropertyName,
isSetter,
} from "#eslint-plugin-functional/utils/tree";
import { isRestElement } from "#eslint-plugin-functional/utils/type-guards";
} from "#/utils/tree";
import { isRestElement } from "#/utils/type-guards";

/**
* The name of this rule.
Expand Down
13 changes: 5 additions & 8 deletions src/rules/immutable-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,19 @@ import {
type IgnoreAccessorPatternOption,
type IgnoreClassesOption,
type IgnoreIdentifierPatternOption,
} from "#eslint-plugin-functional/options";
import {
isExpected,
ruleNameScope,
} from "#eslint-plugin-functional/utils/misc";
} from "#/options";
import { isExpected, ruleNameScope } from "#/utils/misc";
import {
createRule,
getTypeOfNode,
type NamedCreateRuleCustomMeta,
type RuleResult,
} from "#eslint-plugin-functional/utils/rule";
} from "#/utils/rule";
import {
findRootIdentifier,
isDefinedByMutableVariable,
isInConstructor,
} from "#eslint-plugin-functional/utils/tree";
} from "#/utils/tree";
import {
isArrayConstructorType,
isArrayExpression,
Expand All @@ -41,7 +38,7 @@ import {
isNewExpression,
isObjectConstructorType,
isTSAsExpression,
} from "#eslint-plugin-functional/utils/type-guards";
} from "#/utils/type-guards";

/**
* The name of this rule.
Expand Down
6 changes: 3 additions & 3 deletions src/rules/no-classes.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { type JSONSchema4 } from "@typescript-eslint/utils/json-schema";
import { type RuleContext } from "@typescript-eslint/utils/ts-eslint";

import { ruleNameScope } from "#eslint-plugin-functional/utils/misc";
import { type ESClass } from "#eslint-plugin-functional/utils/node-types";
import { ruleNameScope } from "#/utils/misc";
import { type ESClass } from "#/utils/node-types";
import {
createRule,
type NamedCreateRuleCustomMeta,
type RuleResult,
} from "#eslint-plugin-functional/utils/rule";
} from "#/utils/rule";

/**
* The name of this rule.
Expand Down
Loading