prettier-plugin-sort 0.1.0 → 0.1.1

package/README.md

@@ -56,7 +56,7 @@ import react from 'react';
 import App from './App.tsx';
 ```
 
-Each import belongs to a group. For example, `node:fs` is a `builtin` (covers Node.js / Bun / Deno built-ins), while `react` and `lodash` are `external` npm packages. The plugin first classifies each import by group, then sorts alphabetically within each group.
+Each import belongs to a group. For example, `node:fs` is a `builtin` (covers Node.js and Bun **runtime** built-ins), while `react` and `lodash` are `external` npm packages. The plugin first classifies each import by group, then sorts alphabetically within each group.
 
 Grouping and ordering follow the conventions of [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import)'s [import/order](https://github.com/import-js/eslint-plugin-import/blob/main/docs/rules/order.md) rule.
 
@@ -76,7 +76,7 @@ Group matchers:
 
 | Group      | Matches                                                     | Examples                           |
 | ---------- | ----------------------------------------------------------- | ---------------------------------- |
-| `builtin`  | `node:*`, `bun:*`, `deno:*`, and unprefixed Node built-ins  | `node:fs`, `path`                  |
+| `builtin`  | `node:*`, `bun:*`, `bun`, and unprefixed Node built-ins     | `node:fs`, `path`, `bun`           |
 | `external` | npm packages, and anything that doesn't match another group | `react`, `@scope/pkg`              |
 | `internal` | Project absolute paths and aliases                          | `/utils`, `~/app`, `@/shared`      |
 | `parent`   | Parent-relative paths                                       | `../Button`                        |

package/README.zh.md

@@ -56,7 +56,7 @@ import react from 'react';
 import App from './App.tsx';
 ```
 
-import 的模块一般可以按其来源分为不同的类别，例如上面的示例代码，'node:fs' 就属于 builtin 分类，该分类涵盖 Node.js、Bun、Deno 等**运行时**的内置模块。而像 react 和 lodash 这种直接从 npm 下载的依赖模块，属于 external 分类。
+import 的模块一般可以按其来源分为不同的类别，例如上面的示例代码，'node:fs' 就属于 builtin 分类，该分类涵盖 Node.js 和 Bun **运行时**的内置模块。而像 react 和 lodash 这种直接从 npm 下载的依赖模块，属于 external 分类。
 
 插件会先根据不同的模块进行分类，然后在模块内部基于字母顺序进行排列。
 
@@ -76,14 +76,14 @@ import 的模块一般可以按其来源分为不同的类别，例如上面的
 
 各分组的匹配规则如下：
 
-| 分组       | 匹配内容                                                | 示例                               |
-| ---------- | ------------------------------------------------------- | ---------------------------------- |
-| `builtin`  | `node:*`、`bun:*`、`deno:*`，以及无前缀的 Node 内置模块 | `node:fs`、`path`                  |
-| `external` | npm 包，以及不属于其他分组的模块                        | `react`、`@scope/pkg`              |
-| `internal` | 项目绝对路径与别名                                      | `/utils`、`~/app`、`@/shared`      |
-| `parent`   | 向上跳级的相对路径                                      | `../Button`                        |
-| `sibling`  | 同级相对路径（不包含 index）                            | `./Icon`                           |
-| `index`    | 当前目录的 index 模块                                   | `.`、`./`、`./index`、`./index.ts` |
+| 分组       | 匹配内容                                             | 示例                               |
+| ---------- | ---------------------------------------------------- | ---------------------------------- |
+| `builtin`  | `node:*`、`bun:*`、`bun`，以及无前缀的 Node 内置模块 | `node:fs`、`path`、`bun`           |
+| `external` | npm 包，以及不属于其他分组的模块                     | `react`、`@scope/pkg`              |
+| `internal` | 项目绝对路径与别名                                   | `/utils`、`~/app`、`@/shared`      |
+| `parent`   | 向上跳级的相对路径                                   | `../Button`                        |
+| `sibling`  | 同级相对路径（不包含 index）                         | `./Icon`                           |
+| `index`    | 当前目录的 index 模块                                | `.`、`./`、`./index`、`./index.ts` |
 
 > **关于 `internal` 的检测方式：** 插件目前通过说明符的前缀硬编码（`/`、`~`、`@/`）来判断，不会读取 tsconfig `paths` 或任何构建工具的配置。后续版本可能会提供 `importOrderInternalPatterns` 选项，支持自定义正则匹配。
 

package/dist/index.js

@@ -173,7 +173,7 @@ function stripTypePrefix(member) {
 import { builtinModules } from "node:module";
 var NODE_BUILTINS = new Set(builtinModules);
 function detectGroup(source) {
-  if (source.startsWith("node:") || source.startsWith("bun:") || source.startsWith("deno:")) {
+  if (source === "bun" || source.startsWith("bun:") || source.startsWith("node:")) {
     return "builtin";
   }
   const slashIndex = source.indexOf("/");
@@ -251,7 +251,7 @@ function parseImport(statement) {
   };
 }
 function extractImportBlock(text) {
-  const firstRe = /(?:^|\n)(?:[ \t]*(?:\/\/[^\n]*|\/\*[\s\S]*?\*\/)[ \t]*\n)*[ \t]*import\b/;
+  const firstRe = /(?:^|\n)(?:[ \t]*(?:\/\/[^\n]*|\/\*[\s\S]*?\*\/)[ \t]*\n)*[ \t]*import\b(?![.(])/;
   const first = firstRe.exec(text);
   if (!first) {
     return null;
@@ -260,7 +260,7 @@ function extractImportBlock(text) {
 ` ? 1 : 0);
   const statements = [];
   const skipRe = /(?:[ \t]*(?:\/\/[^\n]*|\/\*[\s\S]*?\*\/)?[ \t]*\n)*/y;
-  const importRe = /[ \t]*(import\b[\s\S]*?(?:from\s*(['"])[^'"]+\2|(['"])[^'"]+\3)(?:\s+with\s*\{[^}]*\})?\s*;?)/y;
+  const importRe = /[ \t]*(import\b(?![.(])[\s\S]*?(?:from\s*(['"])[^'"]+\2|(['"])[^'"]+\3)(?:\s+with\s*\{[^}]*\})?\s*;?)/y;
   let cursor = start;
   while (cursor < text.length) {
     skipRe.lastIndex = cursor;
@@ -338,7 +338,7 @@ function normalizeTypeClause(importDecl) {
   };
 }
 function mergeImportsFromSameSource(imports) {
-  const indexBySource = new Map;
+  const indexByKey = new Map;
   const result = [];
   for (const rawImport of imports) {
     const importDecl = normalizeTypeClause(rawImport);
@@ -346,9 +346,10 @@ function mergeImportsFromSameSource(imports) {
       result.push(importDecl);
       continue;
     }
-    const existingIndex = indexBySource.get(importDecl.source);
+    const mergeKey = `${importDecl.source}\x00${importDecl.attributes ?? ""}`;
+    const existingIndex = indexByKey.get(mergeKey);
     if (existingIndex === undefined) {
-      indexBySource.set(importDecl.source, result.length);
+      indexByKey.set(mergeKey, result.length);
       result.push(importDecl);
       continue;
     }
@@ -360,7 +361,7 @@ function mergeImportsFromSameSource(imports) {
       defaultSpec: existing.defaultSpec ?? importDecl.defaultSpec,
       namespaceSpec: existing.namespaceSpec ?? importDecl.namespaceSpec,
       members: existing.members === null && importDecl.members === null ? null : [...existing.members ?? [], ...importDecl.members ?? []],
-      attributes: existing.attributes ?? importDecl.attributes,
+      attributes: existing.attributes,
       leadingComments: existing.leadingComments
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sort",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "An all-in-one Prettier plugin to sort imports, package.json keys, and more.",
   "keywords": [
     "imports",