From 5c9f36b23fce3bfea6794724148fd615e5f3b87b Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 30 Aug 2024 08:02:06 -0600 Subject: [PATCH] Move old utilities into separate dir --- src/rules/order.ts | 8 ++++---- src/utils/{ => old}/alphabetize-ranks.ts | 2 +- src/utils/{ => old}/find-comment.ts | 2 +- src/utils/{ => old}/find-root-node.ts | 2 +- src/utils/{ => old}/make-newlines-between-report.ts | 2 +- src/utils/{ => old}/make-out-of-order-report.ts | 2 +- src/utils/{ => old}/resolve-import-group.ts | 0 src/utils/{ => old}/take-tokens.ts | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename src/utils/{ => old}/alphabetize-ranks.ts (98%) rename src/utils/{ => old}/find-comment.ts (96%) rename src/utils/{ => old}/find-root-node.ts (87%) rename src/utils/{ => old}/make-newlines-between-report.ts (98%) rename src/utils/{ => old}/make-out-of-order-report.ts (98%) rename src/utils/{ => old}/resolve-import-group.ts (100%) rename src/utils/{ => old}/take-tokens.ts (97%) diff --git a/src/rules/order.ts b/src/rules/order.ts index 32462d7..649b630 100644 --- a/src/rules/order.ts +++ b/src/rules/order.ts @@ -1,10 +1,10 @@ import { AST_NODE_TYPES, ESLintUtils, type TSESLint, type TSESTree } from '@typescript-eslint/utils' import type { ImportDeclaration } from 'estree' -import { mutateRanksToAlphabetize } from '../utils/alphabetize-ranks.js' -import { makeNewlinesBetweenReport } from '../utils/make-newlines-between-report.js' -import { makeOutOfOrderReport } from '../utils/make-out-of-order-report.js' -import { resolveImportGroup } from '../utils/resolve-import-group.js' +import { mutateRanksToAlphabetize } from '../utils/old/alphabetize-ranks.js' +import { makeNewlinesBetweenReport } from '../utils/old/make-newlines-between-report.js' +import { makeOutOfOrderReport } from '../utils/old/make-out-of-order-report.js' +import { resolveImportGroup } from '../utils/old/resolve-import-group.js' const IMPORT_GROUPS = [ 'builtin', diff --git a/src/utils/alphabetize-ranks.ts b/src/utils/old/alphabetize-ranks.ts similarity index 98% rename from src/utils/alphabetize-ranks.ts rename to src/utils/old/alphabetize-ranks.ts index ce37376..4878493 100644 --- a/src/utils/alphabetize-ranks.ts +++ b/src/utils/old/alphabetize-ranks.ts @@ -1,6 +1,6 @@ import groupBy from 'object.groupby' -import type { ImportNodeObject } from '../rules/order.js' +import type { ImportNodeObject } from '../../rules/order.js' type OrderDirection = 'asc' | 'desc' diff --git a/src/utils/find-comment.ts b/src/utils/old/find-comment.ts similarity index 96% rename from src/utils/find-comment.ts rename to src/utils/old/find-comment.ts index 76cc272..325ee71 100644 --- a/src/utils/find-comment.ts +++ b/src/utils/old/find-comment.ts @@ -1,6 +1,6 @@ import type { TSESLint } from '@typescript-eslint/utils' -import type { ImportNode } from '../rules/order.js' +import type { ImportNode } from '../../rules/order.js' import { takeTokensAfterWhile, takeTokensBeforeWhile } from './take-tokens.js' export function findStartOfLineWithComments(sourceCode: TSESLint.SourceCode, node: ImportNode) { diff --git a/src/utils/find-root-node.ts b/src/utils/old/find-root-node.ts similarity index 87% rename from src/utils/find-root-node.ts rename to src/utils/old/find-root-node.ts index 83f968a..b21cead 100644 --- a/src/utils/find-root-node.ts +++ b/src/utils/old/find-root-node.ts @@ -1,4 +1,4 @@ -import type { ImportNode } from '../rules/order.js' +import type { ImportNode } from '../../rules/order.js' export function findRootNode(node: ImportNode) { let parent = node diff --git a/src/utils/make-newlines-between-report.ts b/src/utils/old/make-newlines-between-report.ts similarity index 98% rename from src/utils/make-newlines-between-report.ts rename to src/utils/old/make-newlines-between-report.ts index 9400c1d..b10063a 100644 --- a/src/utils/make-newlines-between-report.ts +++ b/src/utils/old/make-newlines-between-report.ts @@ -1,7 +1,7 @@ import type { TSESLint } from '@typescript-eslint/utils' import type { AST } from 'eslint' -import type { ImportNodeObject } from '../rules/order.js' +import type { ImportNodeObject } from '../../rules/order.js' import { commentOnSameLineAs, findEndOfLineWithComments, diff --git a/src/utils/make-out-of-order-report.ts b/src/utils/old/make-out-of-order-report.ts similarity index 98% rename from src/utils/make-out-of-order-report.ts rename to src/utils/old/make-out-of-order-report.ts index d9747ae..948d307 100644 --- a/src/utils/make-out-of-order-report.ts +++ b/src/utils/old/make-out-of-order-report.ts @@ -1,6 +1,6 @@ import { AST_NODE_TYPES, type TSESLint } from '@typescript-eslint/utils' -import type { ImportNode, ImportNodeObject } from '../rules/order.js' +import type { ImportNode, ImportNodeObject } from '../../rules/order.js' import { findEndOfLineWithComments, findStartOfLineWithComments } from './find-comment.js' import { findRootNode } from './find-root-node.js' diff --git a/src/utils/resolve-import-group.ts b/src/utils/old/resolve-import-group.ts similarity index 100% rename from src/utils/resolve-import-group.ts rename to src/utils/old/resolve-import-group.ts diff --git a/src/utils/take-tokens.ts b/src/utils/old/take-tokens.ts similarity index 97% rename from src/utils/take-tokens.ts rename to src/utils/old/take-tokens.ts index a905e12..ccb02e6 100644 --- a/src/utils/take-tokens.ts +++ b/src/utils/old/take-tokens.ts @@ -1,7 +1,7 @@ import type { TSESLint } from '@typescript-eslint/utils' import type { AST } from 'eslint' -import type { ImportNode } from '../rules/order.js' +import type { ImportNode } from '../../rules/order.js' function getTokensOrCommentsBefore(sourceCode: TSESLint.SourceCode, node: ImportNode, count = 100) { let currentNodeOrToken = node