@dword-design/eslint-plugin-import-alias 8.1.7 → 8.1.8

package/dist/babel-plugin-module-resolver.d.ts

@@ -3,7 +3,7 @@ declare module 'babel-plugin-module-resolver' {
     sourcePath: string,
     currentFile: string,
     options: { alias?: Record<string, string>; cwd?: string },
-  ): string;
+  ): string | null;
 }
 declare module '@babel/core' {
   export type BabelPlugin = { key: string; options?: Record<string, unknown> };

package/dist/rules/is-parent-import/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (path: string) => boolean;
+export default _default;

package/dist/rules/is-parent-import/index.js

@@ -0,0 +1,7 @@
+export default path => {
+  const segments = path.split("/");
+  if (segments[0] === ".") {
+    segments.shift();
+  }
+  return segments[0] === "..";
+};

package/dist/rules/prefer-alias.d.ts

@@ -3,7 +3,7 @@ import { ESLintUtils } from '@typescript-eslint/utils';
 export interface BabelPluginModuleResolverOptions {
     alias?: Record<string, string>;
     cwd?: string;
-    resolvePath?: (sourcePath: string, currentFile: string, options: Pick<BabelPluginModuleResolverOptions, 'alias' | 'cwd'>) => string;
+    resolvePath?: (sourcePath: string, currentFile: string, options: Pick<BabelPluginModuleResolverOptions, 'alias' | 'cwd'>) => string | null;
 }
 interface AliasInfo {
     path: string;
@@ -15,7 +15,7 @@ export interface Options {
     aliasForSubpaths: boolean;
     shouldReadTsConfig: boolean;
     shouldReadBabelConfig: boolean;
-    resolvePath: (sourcePath: string, currentFile: string, options: Pick<BabelPluginModuleResolverOptions, 'alias' | 'cwd'>) => string;
+    resolvePath: (sourcePath: string, currentFile: string, options: Pick<BabelPluginModuleResolverOptions, 'alias' | 'cwd'>) => string | null;
 }
 type BabelOptions = Exclude<Parameters<typeof loadOptions>[0], undefined>;
 export type OptionsInput = Omit<Partial<Options>, 'alias'> & {

package/dist/rules/prefer-alias.js

@@ -5,6 +5,7 @@ import { ESLintUtils } from "@typescript-eslint/utils";
 import { resolvePath as defaultResolvePath } from "babel-plugin-module-resolver";
 import { mapValues, omit, orderBy, pick } from "lodash-es";
 import micromatch from "micromatch";
+import isParentImport from "./is-parent-import/index.js";
 const ts = await import("typescript").then(module => module.default).catch(() => null);
 const loadTsConfigPathsFromFile = (configPath, cwd, visitedConfigs = /* @__PURE__ */new Set()) => {
   if (!ts || visitedConfigs.has(configPath)) {
@@ -72,7 +73,6 @@ const loadTsConfigPaths = (currentFile, cwd) => {
   return loadTsConfigPathsFromFile(configPath, cwd);
 };
 const createRule = ESLintUtils.RuleCreator(() => "");
-const isParentImport = path => /^(\.\/)?\.\.\//.test(path);
 const findMatchingAlias = (sourcePath, currentFilename, options, {
   cwd = "."
 } = {}) => {
@@ -80,12 +80,16 @@ const findMatchingAlias = (sourcePath, currentFilename, options, {
   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
   }) : true).map(([aliasName, info]) => {
-    const path = pathLib.resolve(pathLib.dirname(currentFilename), options.resolvePath(`${aliasName}/`, currentFilename, {
+    const resolvedRelativePath = options.resolvePath(`${aliasName}/`, currentFilename, {
       alias: {
         [aliasName]: info.path
       },
       cwd
-    }));
+    });
+    if (!resolvedRelativePath) {
+      return null;
+    }
+    const path = pathLib.resolve(pathLib.dirname(currentFilename), resolvedRelativePath);
     if (absoluteSourcePath.startsWith(path)) {
       return {
         name: aliasName,
@@ -158,7 +162,8 @@ export default createRule({
             return;
           }
           const absoluteImportPath = pathLib.resolve(folder, sourcePath);
-          const rewrittenImport = `${matchingAlias.name}/${pathLib.relative(matchingAlias.path, absoluteImportPath).replaceAll("\\", "/")}`;
+          const relativePath = pathLib.relative(matchingAlias.path, absoluteImportPath).replaceAll("\\", "/");
+          const rewrittenImport = [matchingAlias.name, ...(relativePath ? [relativePath] : [])].join("/");
           return context.report({
             data: {
               rewrittenImport,
@@ -173,7 +178,7 @@ export default createRule({
           alias: filteredAliases,
           cwd: options.cwd
         });
-        if (!isParentImport(importWithoutAlias) && hasAlias && !options.aliasForSubpaths) {
+        if (importWithoutAlias && !isParentImport(importWithoutAlias) && hasAlias && !options.aliasForSubpaths) {
           return context.report({
             data: {
               rewrittenImport: importWithoutAlias,

package/package.json

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