@dword-design/eslint-plugin-import-alias 8.1.1 → 8.1.3

package/dist/rules/prefer-alias.js

@@ -25,7 +25,7 @@ const loadTsConfigPathsFromFile = (configPath, cwd, visitedConfigs = /* @__PURE_
     paths = []
   } = parsedConfig.options;
   const projectReferences = parsedConfig.projectReferences ?? [];
-  const includePatterns = result.config.include ?? ["**/*"];
+  const includePatterns = result.config.include ?? [];
   const configDir = pathLib.dirname(configPath);
   const basePath = baseUrl ? pathLib.resolve(configDir, baseUrl) : configDir;
   const aliases = Object.fromEntries(Object.entries(paths).map(([key, values]) => {
@@ -77,9 +77,9 @@ const findMatchingAlias = (sourcePath, currentFilename, options, {
   cwd = "."
 } = {}) => {
   const absoluteSourcePath = pathLib.resolve(pathLib.dirname(currentFilename), sourcePath);
-  const matches = Object.entries(options.alias).flatMap(([aliasName, aliasInfos]) => aliasInfos.map(info => [aliasName, info])).filter(([, info]) => micromatch.isMatch(currentFilename, info.includePatterns, {
+  const matches = Object.entries(options.alias).flatMap(([aliasName, aliasInfos]) => aliasInfos.map(info => [aliasName, info])).filter(([, info]) => info.includePatterns.length > 0 ? micromatch.isMatch(pathLib.relative(info.configDir, currentFilename), info.includePatterns, {
     cwd: info.configDir
-  })).map(([aliasName, info]) => {
+  }) : true).map(([aliasName, info]) => {
     const path = pathLib.resolve(pathLib.dirname(currentFilename), options.resolvePath(`${aliasName}/`, currentFilename, {
       alias: {
         [aliasName]: info.path
@@ -104,7 +104,7 @@ const withNormalizedAliases = (options, {
   ...options,
   alias: mapValues(options.alias, aliasPath => typeof aliasPath === "string" ? [{
     configDir: cwd,
-    includePatterns: ["**/*"],
+    includePatterns: [],
     path: aliasPath
   }] : aliasPath)
 });
@@ -146,7 +146,10 @@ export default createRule({
     return {
       ImportDeclaration: node => {
         const sourcePath = node.source.value;
-        const hasAlias = Object.keys(options.alias).some(alias => sourcePath.startsWith(`${alias}/`));
+        const filteredAliases = Object.fromEntries(Object.entries(options.alias).flatMap(([aliasName, aliasInfos]) => aliasInfos.map(info => [aliasName, info])).filter(([, info]) => info.includePatterns.length > 0 ? micromatch.isMatch(pathLib.relative(info.configDir, context.filename), info.includePatterns, {
+          cwd: info.configDir
+        }) : true).map(([aliasName, info]) => [aliasName, info.path]));
+        const hasAlias = Object.keys(filteredAliases).some(alias => sourcePath.startsWith(`${alias}/`));
         if (isParentImport(sourcePath)) {
           const matchingAlias = findMatchingAlias(sourcePath, context.filename, pick(options, ["alias", "resolvePath"]), {
             cwd: context.cwd
@@ -166,9 +169,6 @@ export default createRule({
             node
           });
         }
-        const filteredAliases = Object.fromEntries(Object.entries(options.alias).flatMap(([aliasName, aliasInfos]) => aliasInfos.map(info => [aliasName, info])).filter(([, info]) => micromatch.isMatch(context.filename, info.includePatterns, {
-          cwd: info.configDir
-        })).map(([aliasName, info]) => [aliasName, info.path]));
         const importWithoutAlias = options.resolvePath(sourcePath, context.filename, {
           alias: filteredAliases,
           cwd: options.cwd
@@ -184,7 +184,6 @@ export default createRule({
             node
           });
         }
-        return;
       }
     };
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/eslint-plugin-import-alias",
-  "version": "8.1.1",
+  "version": "8.1.3",
   "description": "An ESLint plugin that enforces the use of import aliases. Also supports autofixing.",
   "keywords": [
     "alias",