revert(#111): remove scc (#118)

un-ts · Jul 23, 2024 · 0307ff2 · 0307ff2
1 parent 38aa4cb
commit 0307ff2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 307 deletions.
diff --git a/.changeset/hungry-clocks-pretend.md b/.changeset/hungry-clocks-pretend.md
@@ -0,0 +1,7 @@
+---
+"eslint-plugin-import-x": patch
+---
+
+Reverts #111. The introduction of SCC causes extra overhead that overcomes the early return it introduced.
+
+A new `no-cycle-next` rule is being implemented using the graph. It won't be backward compatible with the current rule `no-cycle`. The current `no-cycle` rule will become `no-cycle-legacy` in the next major version.
diff --git a/package.json b/package.json
@@ -48,7 +48,6 @@
     "eslint": "^8.56.0 || ^9.0.0-0"
   },
   "dependencies": {
-    "@rtsao/scc": "^1.1.0",
     "@typescript-eslint/utils": "^7.4.0",
     "debug": "^4.3.4",
     "doctrine": "^3.0.0",

diff --git a/src/rules/no-cycle.ts b/src/rules/no-cycle.ts
@@ -5,7 +5,6 @@
 import type { DeclarationMetadata, ModuleOptions } from '../utils'
 import {
   ExportMap,
-  StronglyConnectedComponents,
   isExternalModule,
   createRule,
   moduleVisitor,
@@ -89,8 +88,6 @@ export = createRule<[Options?], MessageId>({
           isExternalModule(name, resolve(name, context)!, context)
       : () => false
 
-    const scc = StronglyConnectedComponents.get(filename, context)
-
     return {
       ...moduleVisitor(function checkSourceValue(sourceNode, importer) {
         if (ignoreModule(sourceNode.value)) {
@@ -130,18 +127,6 @@ export = createRule<[Options?], MessageId>({
           return // no-self-import territory
         }
 
-        /* If we're in the same Strongly Connected Component,
-         * Then there exists a path from each node in the SCC to every other node in the SCC,
-         * Then there exists at least one path from them to us and from us to them,
-         * Then we have a cycle between us.
-         */
-        if (scc) {
-          const hasDependencyCycle = scc[filename] === scc[imported.path]
-          if (!hasDependencyCycle) {
-            return
-          }
-        }
-
         const untraversed: Traverser[] = [{ mget: () => imported, route: [] }]
 
         function detectCycle({ mget, route }: Traverser) {

diff --git a/src/utils/export-map.ts b/src/utils/export-map.ts
@@ -1094,7 +1094,7 @@ export function recursivePatternCapture(
  * don't hold full context object in memory, just grab what we need.
  * also calculate a cacheKey, where parts of the cacheKey hash are memoized
  */
-export function childContext(
+function childContext(
   path: string,
   context: RuleContext | ChildContext,
 ): ChildContext {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -17,7 +17,6 @@ export * from './pkg-dir'
 export * from './pkg-up'
 export * from './read-pkg-up'
 export * from './resolve'
-export * from './scc'
 export * from './static-require'
 export * from './unambiguous'
 export * from './visit'
diff --git a/src/utils/scc.ts b/src/utils/scc.ts
diff --git a/test/utils/scc.spec.ts b/test/utils/scc.spec.ts
diff --git a/yarn.lock b/yarn.lock
@@ -1886,11 +1886,6 @@
   dependencies:
     "@xml-tools/parser" "^1.0.11"
 
-"@rtsao/scc@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
-  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
-
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"