eslint-config-typed 6.0.0 → 7.0.0

package/dist/plugins/strict-dependencies/rules/resolve-import-path.d.mts

@@ -5,7 +5,13 @@ import * as ts from 'typescript';
  *
  * `readCompilerOptions` は tsconfig の compilerOptions を返す関数で、既定では
  * カレントディレクトリの tsconfig.json を読む。テストが `typescript` を
- * モジュールごと差し替えずにすむよう引数にしている。
+ * モジュールごと差し替えずにすむよう引数にしている。返す `paths` の値は
+ * カレントディレクトリからの相対パスとして扱う。
  */
 export declare const resolveImportPath: (importPath: string, relativeFilePath: string | undefined, pathIndexMap: ReadonlyRecord<string, number>, readCompilerOptions?: () => ts.CompilerOptions | undefined) => string;
+/**
+ * Reads the tsconfig.json found from `cwd` upward, with `paths` rewritten as
+ * relative to `cwd`.
+ */
+export declare const readTsConfig: (cwd: string) => ts.CompilerOptions | undefined;
 //# sourceMappingURL=resolve-import-path.d.mts.map

package/dist/plugins/strict-dependencies/rules/resolve-import-path.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-import-path.d.mts","sourceRoot":"","sources":["../../../../src/plugins/strict-dependencies/rules/resolve-import-path.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAIjC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,eAChB,MAAM,oBACA,MAAM,GAAG,SAAS,gBACtB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,wBACvB,MAAM,EAAE,CAAC,eAAe,GAAG,SAAS,KAExD,MA4DF,CAAC"}
+{"version":3,"file":"resolve-import-path.d.mts","sourceRoot":"","sources":["../../../../src/plugins/strict-dependencies/rules/resolve-import-path.mts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAIjC;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,eAChB,MAAM,oBACA,MAAM,GAAG,SAAS,gBACtB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,wBACvB,MAAM,EAAE,CAAC,eAAe,GAAG,SAAS,KAExD,MAmDF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,EAAE,CAAC,eAAe,GAAG,SAoD/D,CAAC"}

package/dist/plugins/strict-dependencies/rules/resolve-import-path.mjs

@@ -1,5 +1,5 @@
 import * as path from 'node:path';
-import { Arr, isNonEmptyString, mapNullable } from 'ts-data-forge';
+import { Arr, isNonEmptyString, isString, mapNullable, Obj, } from 'ts-data-forge';
 import * as ts from 'typescript';
 
 
@@ -9,6 +9,7 @@ import * as ts from 'typescript';
 
 
 
+
 export const resolveImportPath = (importPath, relativeFilePath, pathIndexMap, readCompilerOptions = () => readTsConfig(process.cwd())) => {
 
     const mut_importAliasMap = {};
@@ -25,14 +26,8 @@ export const resolveImportPath = (importPath, relativeFilePath, pathIndexMap, re
                 if (!Arr.isNonEmpty(value)) {
                     continue;
                 }
-                const pathValue = mapNullable(pathIndex, (i) => value[i]) ?? value[0];
-
-
-
-
-                const { baseUrl } = tsconfigOptions;
                 mut_importAliasMap[key] =
-                    baseUrl !== undefined ? path.join(baseUrl, pathValue) : pathValue;
+                    mapNullable(pathIndex, (i) => value[i]) ?? value[0];
             }
         }
     }
@@ -48,14 +43,12 @@ export const resolveImportPath = (importPath, relativeFilePath, pathIndexMap, re
     (resolvedImportPath, key) => resolvedImportPath.replace(key.replace('*', ''), mut_importAliasMap[key]?.replace('*', '') ?? ''), mut_importPath);
     return path.normalize(absolutePath);
 };
-const readTsConfig = (tsconfigPath) => {
-
-    const basePath = ts.sys.directoryExists(tsconfigPath)
-        ? tsconfigPath
-        : path.dirname(tsconfigPath);
-    const found = ts.findConfigFile(basePath, (filePath) => ts.sys.fileExists(filePath), ts.sys.directoryExists(tsconfigPath)
-        ? 'tsconfig.json'
-        : path.basename(tsconfigPath));
+
+
+
+
+export const readTsConfig = (cwd) => {
+    const found = ts.findConfigFile(cwd, (filePath) => ts.sys.fileExists(filePath), 'tsconfig.json');
     if (found === undefined) {
 
         return undefined;
@@ -77,6 +70,24 @@ const readTsConfig = (tsconfigPath) => {
     });
 
 
-    return result?.options;
+    if (result?.options.paths === undefined) {
+        return result?.options;
+    }
+
+
+
+    const pathsBasePath = result.options['pathsBasePath'];
+    const baseDir = isString(pathsBasePath) ? pathsBasePath : path.dirname(found);
+    return {
+        ...result.options,
+        paths: Obj.map(result.options.paths, (values) => values.map((value) => relativeTo(cwd, baseDir, value))),
+    };
+};
+
+const relativeTo = (cwd, baseDir, value) => {
+    const relative = path.relative(cwd, path.resolve(baseDir, value));
+    const nonEmpty = relative === '' ? '.' : relative;
+
+    return value.endsWith('/') ? `${nonEmpty}/` : nonEmpty;
 };
 //# sourceMappingURL=resolve-import-path.mjs.map

package/dist/plugins/strict-dependencies/rules/resolve-import-path.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-import-path.mjs","sourceRoot":"","sources":["../../../../src/plugins/strict-dependencies/rules/resolve-import-path.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-import-path.mjs","sourceRoot":"","sources":["../../../../src/plugins/strict-dependencies/rules/resolve-import-path.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,GAAG,EACH,gBAAgB,EAChB,QAAQ,EACR,WAAW,EACX,GAAG,GACJ,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,wIAAwI;AAExI;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,UAAkB,EAClB,gBAAoC,EACpC,YAA4C,EAC5C,mBAAmB,GAAyC,GAAG,EAAE,CAC/D,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EACrB,EAAE;IACV,mCAAmC;IACnC,MAAM,kBAAkB,GAAkC,EAAE,CAAC;IAE7D,IAAI,cAAc,GAAG,UAAU,CAAC;IAEhC,uBAAuB;IACvB,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,mBAAmB,EAAE,CAAC;QAE9C,yBAAyB;QACzB,IAAI,eAAe,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjE,MAAM,UAAU,GAAuB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CACnE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CACjB,CAAC;gBAEF,oEAAoE;gBACpE,MAAM,SAAS,GACb,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE1D,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,kBAAkB,CAAC,GAAG,CAAC;oBACrB,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,aAAa;IACf,CAAC;IAED,IACE,gBAAgB,CAAC,gBAAgB,CAAC;QAClC,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EACrE,CAAC;QACD,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM;IACzD,iDAAiD;IACjD,CAAC,kBAAkB,EAAE,GAAG,EAAE,EAAE,CAC1B,kBAAkB,CAAC,OAAO,CACxB,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EACpB,kBAAkB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAChD,EACH,cAAc,CACf,CAAC;IAEF,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAkC,EAAE;IAC1E,MAAM,KAAK,GAAG,EAAE,CAAC,cAAc,CAC7B,GAAG,EACH,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EACzC,eAAe,CAChB,CAAC;IAEF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,mCAAmC;QACnC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,yBAAyB;IACzB,MAAM,MAAM,GAAG,EAAE,CAAC,gCAAgC,CAChD,KAAK;IACL,mBAAmB,CAAC,EAAE,EACtB;QACE,GAAG,EAAE,CAAC,GAAG;QACT,mCAAmC,EAAE,CAAC,CAAC,EAAE,EAAE;YACzC,cAAc;YACd,MAAM,GAAG,GAAG,EAAE,CAAC,4BAA4B,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAEjE,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,mBAAmB,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,mBAAmB,EAAE;QACvD,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,CAChE,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC;QACtE,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;QACrD,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACjD,yBAAyB,EAAE,EAAE,CAAC,GAAG,CAAC,yBAAyB;KAC5D,CACF,CAAC;IAEF,yCAAyC;IACzC,yCAAyC;IACzC,IAAI,MAAM,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,MAAM,EAAE,OAAO,CAAC;IACzB,CAAC;IAED,wEAAwE;IACxE,mEAAmE;IACnE,yEAAyE;IACzE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAE9E,OAAO;QACL,GAAG,MAAM,CAAC,OAAO;QACjB,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAC9C,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CACvD;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,qEAAqE;AACrE,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,OAAe,EAAE,KAAa,EAAU,EAAE;IACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAElE,MAAM,QAAQ,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;IAElD,4EAA4E;IAC5E,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;AACzD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-typed",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "private": false,
   "keywords": [
     "typescript"
@@ -90,7 +90,7 @@
     "@vitest/ui": "5.0.5",
     "cspell": "10.4.0",
     "dedent": "1.7.2",
-    "eslint-config-typed": "6.0.0",
+    "eslint-config-typed": "7.0.0",
     "eslint-plugin-ts-data-forge": "0.10.4",
     "eslint-plugin-ts-fortress": "1.3.9",
     "eslint-plugin-ts-type-forge": "0.8.14",

package/src/plugins/strict-dependencies/rules/resolve-import-path.mts

@@ -1,5 +1,11 @@
 import * as path from 'node:path';
-import { Arr, isNonEmptyString, mapNullable } from 'ts-data-forge';
+import {
+  Arr,
+  isNonEmptyString,
+  isString,
+  mapNullable,
+  Obj,
+} from 'ts-data-forge';
 import type { MutableRecord, ReadonlyRecord } from 'ts-type-forge';
 import * as ts from 'typescript';
 
@@ -10,7 +16,8 @@ import * as ts from 'typescript';
  *
  * `readCompilerOptions` は tsconfig の compilerOptions を返す関数で、既定では
  * カレントディレクトリの tsconfig.json を読む。テストが `typescript` を
- * モジュールごと差し替えずにすむよう引数にしている。
+ * モジュールごと差し替えずにすむよう引数にしている。返す `paths` の値は
+ * カレントディレクトリからの相対パスとして扱う。
  */
 export const resolveImportPath = (
   importPath: string,
@@ -43,17 +50,8 @@ export const resolveImportPath = (
           continue;
         }
 
-        const pathValue: string =
-          mapNullable(pathIndex, (i) => value[i]) ?? value[0];
-
-        // `baseUrl` is deprecated in TypeScript 6.0, but this rule still
-        // needs to read it (if present) to resolve legacy `baseUrl`-relative
-        // `paths` entries the same way `tsc` does.
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        const { baseUrl } = tsconfigOptions;
-
         mut_importAliasMap[key] =
-          baseUrl !== undefined ? path.join(baseUrl, pathValue) : pathValue;
+          mapNullable(pathIndex, (i) => value[i]) ?? value[0];
       }
     }
   } catch {
@@ -80,22 +78,19 @@ export const resolveImportPath = (
   return path.normalize(absolutePath);
 };
 
-const readTsConfig = (tsconfigPath: string): ts.CompilerOptions | undefined => {
-  // プロジェクトルート探索: tsconfigPath がディレクトリならその中を探す
-  const basePath = ts.sys.directoryExists(tsconfigPath)
-    ? tsconfigPath
-    : path.dirname(tsconfigPath);
-
+/**
+ * Reads the tsconfig.json found from `cwd` upward, with `paths` rewritten as
+ * relative to `cwd`.
+ */
+export const readTsConfig = (cwd: string): ts.CompilerOptions | undefined => {
   const found = ts.findConfigFile(
-    basePath,
+    cwd,
     (filePath) => ts.sys.fileExists(filePath),
-    ts.sys.directoryExists(tsconfigPath)
-      ? 'tsconfig.json'
-      : path.basename(tsconfigPath),
+    'tsconfig.json',
   );
 
   if (found === undefined) {
-    // tsconfig not found under: ${tsconfigPath}
+    // tsconfig not found under: ${cwd}
     return undefined;
   }
 
@@ -122,5 +117,31 @@ const readTsConfig = (tsconfigPath: string): ts.CompilerOptions | undefined => {
 
   // undefined: 'Failed to parse tsconfig.'
   // result.options: 正規化済みの compilerOptions
-  return result?.options;
+  if (result?.options.paths === undefined) {
+    return result?.options;
+  }
+
+  // `baseUrl` is not read: `paths` are relative to the tsconfig.json that
+  // declares them, as `tsc` resolves them without `baseUrl`. That is
+  // `pathsBasePath` (internal to TypeScript) when it is an `extends` base.
+  const pathsBasePath = result.options['pathsBasePath'];
+
+  const baseDir = isString(pathsBasePath) ? pathsBasePath : path.dirname(found);
+
+  return {
+    ...result.options,
+    paths: Obj.map(result.options.paths, (values) =>
+      values.map((value) => relativeTo(cwd, baseDir, value)),
+    ),
+  };
+};
+
+/** Rewrites `value`, relative to `baseDir`, as relative to `cwd`. */
+const relativeTo = (cwd: string, baseDir: string, value: string): string => {
+  const relative = path.relative(cwd, path.resolve(baseDir, value));
+
+  const nonEmpty = relative === '' ? '.' : relative;
+
+  // `path.resolve` drops a trailing slash, which an alias with one relies on.
+  return value.endsWith('/') ? `${nonEmpty}/` : nonEmpty;
 };

package/src/plugins/strict-dependencies/rules/resolve-import-path.test.mts

@@ -1,12 +1,13 @@
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import type { ReadonlyRecord } from 'ts-type-forge';
 import type * as ts from 'typescript';
-import { resolveImportPath } from './resolve-import-path.mjs';
+import { readTsConfig, resolveImportPath } from './resolve-import-path.mjs';
 
 // FIXME: https://github.com/knowledge-work/eslint-plugin-strict-dependencies/tree/v1.3.27 のテストをコピーしてきて
 // Codex でテスト・型チェックが通るようにさせただけなので、意味の無いテストになっていないかチェックして修正する
 
-// `baseUrl` is deprecated in TypeScript 6.0, but the rule still resolves legacy
-// `baseUrl`-relative `paths`, so the fixtures below have to set it.
 const compilerOptionsByFixture = {
   'no-paths': {},
   'paths-basic': {
@@ -16,55 +17,14 @@ const compilerOptionsByFixture = {
       '@/components/*': ['components/*'],
     },
   },
-  'base-url-dot': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
-    baseUrl: '.',
-    paths: {
-      '@/components/': ['components/'],
-    },
-  },
-  'base-url-dot-slash': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
-    baseUrl: './',
-    paths: {
-      '@/components/': ['components/'],
-    },
-  },
-  'base-url-parent': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
-    baseUrl: '../',
-    paths: {
-      '@/components/': ['components/'],
-    },
-  },
+  // `paths` are resolved from the tsconfig.json whatever `baseUrl` says.
   'base-url-src': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- the fixture is about the deprecated option
     baseUrl: 'src',
     paths: {
       '@/components/': ['components/'],
     },
   },
-  'base-url-dot-src': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
-    baseUrl: './src',
-    paths: {
-      '@/components/': ['components/'],
-    },
-  },
-  'base-url-src-slash': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
-    baseUrl: 'src/',
-    paths: {
-      '@/components/': ['components/'],
-    },
-  },
-  'base-url-dot-src-slash': {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated -- see the note above the table
-    baseUrl: './src/',
-    paths: {
-      '@/components/': ['components/'],
-    },
-  },
   'paths-multiple': {
     paths: {
       '@/components/*': ['src/components/*', 'src/alternativeComponents/*'],
@@ -103,40 +63,6 @@ const aliasCases = [
   },
 ] as const;
 
-const baseUrlCases = [
-  {
-    fixtureName: 'base-url-dot',
-    expected: 'components/aaa/bbb',
-  },
-  {
-    fixtureName: 'base-url-dot-slash',
-    expected: 'components/aaa/bbb',
-  },
-  {
-    fixtureName: 'base-url-parent',
-    expected: '../components/aaa/bbb',
-  },
-  {
-    fixtureName: 'base-url-src',
-    expected: 'src/components/aaa/bbb',
-  },
-  {
-    fixtureName: 'base-url-dot-src',
-    expected: 'src/components/aaa/bbb',
-  },
-  {
-    fixtureName: 'base-url-src-slash',
-    expected: 'src/components/aaa/bbb',
-  },
-  {
-    fixtureName: 'base-url-dot-src-slash',
-    expected: 'src/components/aaa/bbb',
-  },
-] as const satisfies readonly Readonly<{
-  fixtureName: FixtureName;
-  expected: string;
-}>[];
-
 describe(resolveImportPath, () => {
   test('should resolve relative path', () => {
     expect(
@@ -192,30 +118,16 @@ describe(resolveImportPath, () => {
     },
   );
 
-  test.each(baseUrlCases)(
-    'baseUrl $fixtureName',
-    ({ fixtureName, expected }: Readonly<(typeof baseUrlCases)[number]>) => {
-      const readCompilerOptions = readFixture(fixtureName);
-
-      expect(
-        resolveImportPath(
-          'components/aaa/bbb',
-          undefined,
-          {},
-          readCompilerOptions,
-        ),
-      ).toBe('components/aaa/bbb');
-
-      expect(
-        resolveImportPath(
-          '@/components/aaa/bbb',
-          undefined,
-          {},
-          readCompilerOptions,
-        ),
-      ).toBe(expected);
-    },
-  );
+  test('should ignore baseUrl', () => {
+    expect(
+      resolveImportPath(
+        '@/components/aaa/bbb',
+        undefined,
+        {},
+        readFixture('base-url-src'),
+      ),
+    ).toBe('components/aaa/bbb');
+  });
 
   test('should resolve path alias with specified index in pathIndexMap', () => {
     expect(
@@ -250,3 +162,120 @@ describe(resolveImportPath, () => {
     ).toBe('src/components/aaa/bbb');
   });
 });
+
+describe(readTsConfig, () => {
+  test('should resolve paths from the directory of tsconfig.json', () => {
+    expect(
+      resolveWithTsconfig(
+        { paths: { '@/*': ['./src/*'] } },
+        '.',
+        '@/components/aaa',
+      ),
+    ).toBe('src/components/aaa');
+  });
+
+  test('should keep a trailing slash of a paths entry', () => {
+    expect(
+      resolveWithTsconfig(
+        { paths: { '@/components/': ['src/components/'] } },
+        '.',
+        '@/components/aaa',
+      ),
+    ).toBe('src/components/aaa');
+  });
+
+  test('should resolve a paths entry naming the directory of tsconfig.json', () => {
+    expect(
+      resolveWithTsconfig({ paths: { '@/': ['./'] } }, '.', '@/components/aaa'),
+    ).toBe('components/aaa');
+  });
+
+  test('should resolve paths from a tsconfig.json found above the working directory', () => {
+    expect(
+      resolveWithTsconfig(
+        { paths: { '@/*': ['./src/*'] } },
+        'packages/a',
+        '@/components/aaa',
+      ),
+    ).toBe('../../src/components/aaa');
+  });
+
+  test('should resolve paths from the directory of the tsconfig.json declaring them', () => {
+    expect(
+      resolveWithFiles(
+        {
+          'configs/tsconfig.base.json': {
+            compilerOptions: { paths: { '@/*': ['../src/*'] } },
+          },
+          'tsconfig.json': {
+            extends: './configs/tsconfig.base.json',
+            files: [],
+          },
+        },
+        '.',
+        '@/components/aaa',
+      ),
+    ).toBe('src/components/aaa');
+  });
+
+  test('should ignore baseUrl', () => {
+    expect(
+      resolveWithTsconfig(
+        {
+          baseUrl: 'src',
+          ignoreDeprecations: '6.0',
+          paths: { '@/*': ['./lib/*'] },
+        },
+        '.',
+        '@/components/aaa',
+      ),
+    ).toBe('lib/components/aaa');
+  });
+});
+
+/**
+ * Writes `files` (JSON, by path) into a new directory, runs
+ * `resolveImportPath` with `readTsConfig` from `cwdSubdirectory` of it, and
+ * removes the directory.
+ */
+const resolveWithFiles = (
+  files: ReadonlyRecord<string, unknown>,
+  cwdSubdirectory: string,
+  importPath: string,
+): string => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'resolve-import-path-'));
+
+  try {
+    for (const [filePath, content] of Object.entries(files)) {
+      // eslint-disable-next-line security/detect-non-literal-fs-filename
+      fs.mkdirSync(path.dirname(path.join(root, filePath)), {
+        recursive: true,
+      });
+
+      // eslint-disable-next-line security/detect-non-literal-fs-filename
+      fs.writeFileSync(path.join(root, filePath), JSON.stringify(content));
+    }
+
+    const cwd = path.join(root, cwdSubdirectory);
+
+    // eslint-disable-next-line security/detect-non-literal-fs-filename
+    fs.mkdirSync(cwd, { recursive: true });
+
+    return resolveImportPath(importPath, undefined, {}, () =>
+      readTsConfig(cwd),
+    );
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+};
+
+const resolveWithTsconfig = (
+  compilerOptions: ReadonlyRecord<string, unknown>,
+  cwdSubdirectory: string,
+  importPath: string,
+): string =>
+  resolveWithFiles(
+    { 'tsconfig.json': { compilerOptions, files: [] } },
+    cwdSubdirectory,
+    importPath,
+  );