prettier-plugin-sort 1.1.0 → 1.1.1

package/README.md

@@ -56,20 +56,20 @@ Dynamic `import()` calls and import-like text in strings or comments are left un
 
 `esmImportGroups` accepts these values:
 
-| Group      | Matches                                                            |
-| ---------- | ------------------------------------------------------------------ |
-| `builtin`  | Modules beginning with `node:` or `bun:`, plus `bun`               |
-| `external` | Packages and module paths not matched by any other group           |
-| `internal` | Path aliases defined by `compilerOptions.paths` in `tsconfig.json` |
-| `parent`   | Parent-relative paths such as `../utils`                           |
-| `sibling`  | Sibling paths such as `./Button`                                   |
-| `index`    | `.`, `./`, `./index`, and `./index` with an optional extension     |
+| Group      | Matches                                                                                         |
+| ---------- | ----------------------------------------------------------------------------------------------- |
+| `builtin`  | Modules beginning with `node:` or `bun:`, plus `bun`                                            |
+| `external` | Packages and module paths not matched by any other group                                        |
+| `internal` | Path aliases from `compilerOptions.paths` in the TypeScript project containing the current file |
+| `parent`   | Parent-relative paths such as `../utils`                                                        |
+| `sibling`  | Sibling paths such as `./Button`                                                                |
+| `index`    | `.`, `./`, `./index`, and `./index` with an optional extension                                  |
 
 Modern Node.js code should reference built-ins explicitly with [`node:` URLs](https://nodejs.org/api/esm.html#node-imports). The plugin also classifies only `node:`-prefixed modules as `builtin`. Module specifiers without the prefix, such as `fs` and `path`, belong to `external`.
 
 The table also shows the default order. Duplicate entries are removed automatically, and omitted default groups are appended in their default order.
 
-The plugin searches upward from the current file for the nearest `tsconfig.json` and identifies `internal` imports from the resolved `compilerOptions.paths`. Inherited `paths` are supported. Non-relative paths not declared in `paths` remain `external`. The catch-all pattern `*` is ignored because it cannot distinguish project modules from third-party packages.
+The plugin searches upward from the current file for the nearest `tsconfig.json`, then uses `files`, `include`, and `exclude` to select the TypeScript project containing the file, following `references` when necessary. Each project is resolved through `extends` before matching the file and reading `compilerOptions.paths`. Only `paths` from the selected project are used to classify `internal`; `paths` from other referenced projects are not merged. Non-relative paths not declared there remain `external`. The catch-all pattern `*` is ignored because it cannot distinguish project modules from third-party packages.
 
 With `esmImportSeparation` set to `false`, blank lines are removed both between groups and around side-effect imports.
 

package/README.zh.md

@@ -56,20 +56,20 @@ npm i -D prettier prettier-plugin-sort
 
 `esmImportGroups` 支持以下分组：
 
-| 分组       | 匹配范围                                                  |
-| ---------- | --------------------------------------------------------- |
-| `builtin`  | 以 `node:`、`bun:` 开头的模块，以及 `bun`                 |
-| `external` | 第三方包，以及没有匹配其他分组的模块路径                  |
-| `internal` | `tsconfig.json` 中 `compilerOptions.paths` 定义的路径别名 |
-| `parent`   | `../utils` 这类指向上级目录的相对路径                     |
-| `sibling`  | `./Button` 这类指向同级目录的相对路径                     |
-| `index`    | `.`、`./`、`./index` 及带扩展名的 `./index`               |
+| 分组       | 匹配范围                                                                    |
+| ---------- | --------------------------------------------------------------------------- |
+| `builtin`  | 以 `node:`、`bun:` 开头的模块，以及 `bun`                                   |
+| `external` | 第三方包，以及没有匹配其他分组的模块路径                                    |
+| `internal` | 当前文件所属 TypeScript project 的 `compilerOptions.paths` 中定义的路径别名 |
+| `parent`   | `../utils` 这类指向上级目录的相对路径                                       |
+| `sibling`  | `./Button` 这类指向同级目录的相对路径                                       |
+| `index`    | `.`、`./`、`./index` 及带扩展名的 `./index`                                 |
 
 现代 Node.js 代码应使用 [`node:` URL](https://nodejs.org/api/esm.html#node-imports) 显式引用内置模块。本插件也只把带 `node:` 前缀的内置模块归入 `builtin`。`fs`、`path` 等未带前缀的模块归入 `external`。
 
 默认顺序就是表中的顺序。配置数组会自动去重，遗漏的默认分组则按默认顺序补到末尾。
 
-插件会从当前文件所在目录向上查找最近的 `tsconfig.json`，并根据解析后的 `compilerOptions.paths` 识别 `internal`。继承配置中的 `paths` 同样有效。没有在 `paths` 中声明的非相对路径仍归入 `external`。`*` 无法区分项目代码和第三方包，因此不会用于判断 `internal`。
+插件会从当前文件所在目录向上查找最近的 `tsconfig.json`，根据 `files`、`include` 和 `exclude` 选择包含当前文件的 TypeScript project，并在需要时沿 `references` 查找。每个 project 都会先解析 `extends`，再匹配文件并读取 `compilerOptions.paths`。识别 `internal` 时只使用当前文件所属 project 的 `paths`，不会合并其他 referenced project 的 `paths`。没有在该 `paths` 中声明的非相对路径仍归入 `external`。`*` 无法区分项目代码和第三方包，因此不会用于判断 `internal`。
 
 将 `esmImportSeparation` 设为 `false` 后，分组之间和副作用 `import` 上下两侧都不再留空行。
 

package/dist/index.js

@@ -2307,14 +2307,92 @@ function buildImportSortingEdits(sourceText, programStatements, sortedComments,
 }
 
 // src/sort-typescript.ts
+var SCRIPT_FILE_EXTENSION_PATTERN = /\.[cm]?[jt]sx?$/i;
 async function getTsconfigPathPatterns(filePath) {
   if (!filePath) {
     return [];
   }
   try {
-    const { getTsconfig } = await import("get-tsconfig");
-    const paths = getTsconfig(filePath)?.config.compilerOptions?.paths;
-    return paths ? Object.keys(paths) : [];
+    let isFileIncluded = function(project) {
+      try {
+        if (createFilesMatcher(project, isFileSystemCaseSensitive)(absoluteFilePath)) {
+          return true;
+        }
+        const fileExtension = extname(absoluteFilePath);
+        if (!fileExtension || SCRIPT_FILE_EXTENSION_PATTERN.test(fileExtension)) {
+          return false;
+        }
+        const virtualExtension = ".ts";
+        const normalizedFileExtension = isFileSystemCaseSensitive ? fileExtension : fileExtension.toLowerCase();
+        const addVirtualExtension = (patterns) => patterns?.map((pattern) => {
+          const normalizedPattern = isFileSystemCaseSensitive ? pattern : pattern.toLowerCase();
+          return normalizedPattern.endsWith(normalizedFileExtension) ? `${pattern}${virtualExtension}` : pattern;
+        });
+        const virtualConfig = {
+          ...project.config,
+          files: addVirtualExtension(project.config.files),
+          include: addVirtualExtension(project.config.include),
+          exclude: addVirtualExtension(project.config.exclude)
+        };
+        return Boolean(createFilesMatcher({ path: project.path, config: virtualConfig }, isFileSystemCaseSensitive)(`${absoluteFilePath}${virtualExtension}`));
+      } catch {
+        return false;
+      }
+    }, findProjectForFile = function(project) {
+      if (visitedConfigPaths.has(project.path)) {
+        return;
+      }
+      visitedConfigPaths.add(project.path);
+      if (isFileIncluded(project)) {
+        return project;
+      }
+      for (const reference of project.config.references ?? []) {
+        if (typeof reference.path !== "string") {
+          continue;
+        }
+        let referencedProject;
+        try {
+          const referencePath = resolve(dirname(project.path), reference.path);
+          const configPath = extname(referencePath).toLowerCase() === ".json" ? referencePath : join(referencePath, "tsconfig.json");
+          referencedProject = {
+            path: configPath,
+            config: parseTsconfig(configPath, cache)
+          };
+        } catch {
+          continue;
+        }
+        const selectedProject = findProjectForFile(referencedProject);
+        if (selectedProject) {
+          return selectedProject;
+        }
+      }
+      return;
+    };
+    const { createFilesMatcher, getTsconfig, parseTsconfig } = await import("get-tsconfig");
+    const { dirname, extname, join, resolve } = await import("node:path");
+    const cache = new Map;
+    const absoluteFilePath = resolve(filePath);
+    const isFileSystemCaseSensitive = !["darwin", "win32"].includes(process.platform);
+    const nearestProject = getTsconfig(absoluteFilePath, "tsconfig.json", cache);
+    if (!nearestProject) {
+      return [];
+    }
+    const visitedConfigPaths = new Set;
+    let currentProject = nearestProject;
+    while (currentProject) {
+      const selectedProject = findProjectForFile(currentProject);
+      if (selectedProject) {
+        const paths = selectedProject.config.compilerOptions?.paths;
+        return paths ? Object.keys(paths) : [];
+      }
+      const configDirectory = dirname(currentProject.path);
+      const parentDirectory = dirname(configDirectory);
+      if (parentDirectory === configDirectory) {
+        break;
+      }
+      currentProject = getTsconfig(parentDirectory, "tsconfig.json", cache);
+    }
+    return [];
   } catch {
     return [];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sort",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A Prettier plugin for sorting ES module imports, export specifiers, and fields in package.json and tsconfig.json.",
   "keywords": [
     "imports",