refactor: remove method alias (#71)

un-ts · Apr 4, 2024 · 8b53954 · 8b53954
1 parent 0a84314
commit 8b53954
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 34 deletions.
diff --git a/src/rules/newline-after-import.ts b/src/rules/newline-after-import.ts
@@ -5,7 +5,7 @@
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
 import debug from 'debug'
 
-import { isStaticRequire, createRule, getScope } from '../utils'
+import { isStaticRequire, createRule } from '../utils'
 
 const log = debug('eslint-plugin-import-x:rules:newline-after-import')
 
@@ -276,7 +276,7 @@ export = createRule<[Options?], MessageId>({
       'Program:exit'(node) {
         log('exit processing for', context.physicalFilename)
 
-        const scopeBody = getScopeBody(getScope(context, node))
+        const scopeBody = getScopeBody(context.sourceCode.getScope(node))
 
         log('got scope:', scopeBody)
 

diff --git a/src/rules/no-amd.ts b/src/rules/no-amd.ts
@@ -2,7 +2,7 @@
  * Rule to prefer imports to AMD
  */
 
-import { createRule, getScope } from '../utils'
+import { createRule } from '../utils'
 
 type MessageId = 'amd'
 
@@ -23,7 +23,7 @@ export = createRule<[], MessageId>({
   create(context) {
     return {
       CallExpression(node) {
-        if (getScope(context, node).type !== 'module') {
+        if (context.sourceCode.getScope(node).type !== 'module') {
           return
         }
 

diff --git a/src/rules/no-commonjs.ts b/src/rules/no-commonjs.ts
@@ -4,7 +4,7 @@
 
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
 
-import { createRule, getScope } from '../utils'
+import { createRule } from '../utils'
 
 type NormalizedOptions = {
   allowPrimitiveModules?: boolean
@@ -127,16 +127,16 @@ export = createRule<[Options?], MessageId>({
 
         // exports.
         if ('name' in node.object && node.object.name === 'exports') {
-          const isInScope = getScope(context, node).variables.some(
-            variable => variable.name === 'exports',
-          )
+          const isInScope = context.sourceCode
+            .getScope(node)
+            .variables.some(variable => variable.name === 'exports')
           if (!isInScope) {
             context.report({ node, messageId: 'export' })
           }
         }
       },
       CallExpression(call) {
-        if (!validateScope(getScope(context, call))) {
+        if (!validateScope(context.sourceCode.getScope(call))) {
           return
         }
 

diff --git a/src/rules/no-mutable-exports.ts b/src/rules/no-mutable-exports.ts
@@ -1,6 +1,6 @@
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
 
-import { createRule, getScope } from '../utils'
+import { createRule } from '../utils'
 
 type MessageId = 'noMutable'
 
@@ -48,14 +48,14 @@ export = createRule<[], MessageId>({
 
     return {
       ExportDefaultDeclaration(node) {
-        const scope = getScope(context, node)
+        const scope = context.sourceCode.getScope(node)
 
         if ('name' in node.declaration) {
           checkDeclarationsInScope(scope, node.declaration.name)
         }
       },
       ExportNamedDeclaration(node) {
-        const scope = getScope(context, node)
+        const scope = context.sourceCode.getScope(node)
 
         if (node.declaration) {
           checkDeclaration(node.declaration)

diff --git a/src/rules/no-namespace.ts b/src/rules/no-namespace.ts
@@ -5,7 +5,7 @@
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
 import { minimatch } from 'minimatch'
 
-import { createRule, getScope } from '../utils'
+import { createRule } from '../utils'
 
 type MessageId = 'noNamespace'
 
@@ -59,7 +59,7 @@ export = createRule<[Options?], MessageId>({
           return
         }
 
-        const scopeVariables = getScope(context, node).variables
+        const scopeVariables = context.sourceCode.getScope(node).variables
         const namespaceVariable = scopeVariables.find(
           variable => variable.defs[0].node === node,
         )!

diff --git a/src/utils/declared-scope.ts b/src/utils/declared-scope.ts
@@ -2,14 +2,12 @@ import type { TSESTree } from '@typescript-eslint/utils'
 
 import type { RuleContext } from '../types'
 
-import { getScope } from './get-scope'
-
 export function declaredScope(
   context: RuleContext,
   node: TSESTree.Node,
   name: string,
 ) {
-  const references = getScope(context, node).references
+  const references = context.sourceCode.getScope(node).references
   const reference = references.find(x => x.identifier.name === name)
   if (!reference || !reference.resolved) {
     return

diff --git a/src/utils/get-ancestors.ts b/src/utils/get-ancestors.ts
diff --git a/src/utils/get-scope.ts b/src/utils/get-scope.ts
diff --git a/src/utils/import-declaration.ts b/src/utils/import-declaration.ts
@@ -2,12 +2,10 @@ import type { TSESTree } from '@typescript-eslint/utils'
 
 import type { RuleContext } from '../types'
 
-import { getAncestors } from './get-ancestors'
-
 export const importDeclaration = (
   context: RuleContext,
   node: TSESTree.Node,
 ) => {
-  const ancestors = getAncestors(context, node)
+  const ancestors = context.sourceCode.getAncestors(node)
   return ancestors[ancestors.length - 1] as TSESTree.ImportDeclaration
 }
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -3,8 +3,6 @@ export * from './create-rule'
 export * from './declared-scope'
 export * from './docs-url'
 export * from './export-map'
-export * from './get-ancestors'
-export * from './get-scope'
 export * from './get-value'
 export * from './hash'
 export * from './ignore'