feat: update utils

lzear · Nov 4, 2023 · f6fe552 · f6fe552
1 parent 1d84c7f
commit f6fe552
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 16 deletions.
diff --git a/utils/compare.ts b/utils/compare.ts
@@ -1,8 +1,8 @@
 import naturalCompare from 'natural-compare-lite'
 
-import type { SortingNode, SortOrder } from '../typings'
+import type { SortingNode, SortOrder } from '../typings/index.js'
 
-import { SortType } from '../typings'
+import { SortType } from '../typings/index.js'
 
 export const compare = (
   a: SortingNode,

diff --git a/utils/create-eslint-rule.ts b/utils/create-eslint-rule.ts
@@ -1,5 +1,19 @@
-import { ESLintUtils } from '@typescript-eslint/utils'
+/* eslint-disable */
+import * as uuu from '@typescript-eslint/utils'
+import { RuleWithMetaAndName } from './eslint-types/RuleCreator.js'
+import { RuleListener, RuleModule } from './eslint-types/Rule.js'
 
-export const createEslintRule = ESLintUtils.RuleCreator(
+export let createEslintRule: <
+  TOptions extends readonly unknown[],
+  TMessageIds extends string,
+>({
+  name,
+  meta,
+  ...rule
+}: Readonly<RuleWithMetaAndName<TOptions, TMessageIds>>) => RuleModule<
+  TMessageIds,
+  TOptions,
+  RuleListener
+> = uuu.ESLintUtils.RuleCreator(
   ruleName => `https://www.dont.ninja/rules/${ruleName}`,
 )
diff --git a/utils/get-group-number.ts b/utils/get-group-number.ts
@@ -1,4 +1,4 @@
-import type { SortingNode } from '../typings'
+import type { SortingNode } from '../typings/index.js'
 
 export const getGroupNumber = (
   groups: (string[] | string)[],

diff --git a/utils/get-node-range.ts b/utils/get-node-range.ts
@@ -3,10 +3,10 @@ import type { TSESLint } from '@typescript-eslint/utils'
 
 import { ASTUtils } from '@typescript-eslint/utils'
 
-import type { PartitionComment } from '../typings'
+import type { PartitionComment } from '../typings/index.js'
 
-import { isPartitionComment } from './is-partition-comment'
-import { getCommentBefore } from './get-comment-before'
+import { isPartitionComment } from './is-partition-comment.js'
+import { getCommentBefore } from './get-comment-before.js'
 
 export const getNodeRange = (
   node: TSESTree.Node,

diff --git a/utils/is-partition-comment.ts b/utils/is-partition-comment.ts
@@ -1,6 +1,7 @@
-import { minimatch } from 'minimatch'
+import * as minimatchModule from '../node_modules/minimatch/dist/mjs/index.js'
+const { minimatch } = minimatchModule
 
-import type { PartitionComment } from '../typings'
+import type { PartitionComment } from '../typings/index.js'
 
 export const isPartitionComment = (
   partitionComment: PartitionComment,

diff --git a/utils/make-fixes.ts b/utils/make-fixes.ts
@@ -1,10 +1,10 @@
 import type { TSESTree } from '@typescript-eslint/types'
 import type { TSESLint } from '@typescript-eslint/utils'
 
-import type { PartitionComment, SortingNode } from '../typings'
+import type { PartitionComment, SortingNode } from '../typings/index.js'
 
-import { getCommentAfter } from './get-comment-after'
-import { getNodeRange } from './get-node-range'
+import { getCommentAfter } from './get-comment-after.js'
+import { getNodeRange } from './get-node-range.js'
 
 export const makeFixes = (
   fixer: TSESLint.RuleFixer,

diff --git a/utils/sort-nodes.ts b/utils/sort-nodes.ts
@@ -1,6 +1,6 @@
-import type { SortingNode, SortOrder, SortType } from '../typings'
+import type { SortingNode, SortOrder, SortType } from '../typings/index.js'
 
-import { compare } from './compare'
+import { compare } from './compare.js'
 
 export const sortNodes = <T extends SortingNode>(
   nodes: T[],

diff --git a/utils/use-groups.ts b/utils/use-groups.ts
@@ -1,4 +1,6 @@
-import { minimatch } from 'minimatch'
+import * as minimatchModule from '../node_modules/minimatch/dist/mjs/index.js'
+
+const { minimatch } = minimatchModule
 
 export const useGroups = (groups: (string[] | string)[]) => {
   let group: undefined | string