chore(type-utils) refactored scoped package matching to do only one p…

…ass over the package name
typescript-eslint · Apr 17, 2023 · e97628f · e97628f
1 parent d0b5e15
commit e97628f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/type-utils/src/TypeOrValueSpecifier.ts b/packages/type-utils/src/TypeOrValueSpecifier.ts
@@ -153,10 +153,11 @@ function typeDeclaredInPackage(
   // Handle scoped packages - if the name starts with @, remove it and replace / with __
   const typesPackageName =
     '@types/' + packageName.replace(/^@([^/]+)\//, '$1__');
-  return declarationFiles.some(
-    declaration =>
-      declaration.fileName.includes(`node_modules/${packageName}/`) ||
-      declaration.fileName.includes(`node_modules/${typesPackageName}/`),
+  const matcher = new RegExp(
+    `node_modules/(?:${packageName}|${typesPackageName})/`,
+  );
+  return declarationFiles.some(declaration =>
+    matcher.test(declaration.fileName),
   );
 }