prettier-plugin-sort 1.0.0 → 1.0.1

package/README.md

@@ -136,6 +136,8 @@ Set `esmImportSeparation` to `false` to remove blank lines between groups and ab
 
 `separate` is the default. Type-only default and namespace imports keep their original form.
 
+`import type { T }` and `import { type T }` have different runtime behavior under [`verbatimModuleSyntax`](https://www.typescriptlang.org/tsconfig/verbatimModuleSyntax.html). The plugin converts between them only when the same module also has a value import. Otherwise, it preserves the original form to avoid changing module loading behavior.
+
 ### Merging and sorting boundaries
 
 With `esmImportMerge` enabled, imports from the same module are merged when it is safe to do so.

package/README.zh.md

@@ -136,6 +136,8 @@ import App from './App';
 
 默认值为 `separate`。包含默认导入或命名空间导入的仅类型 `import` 会保留原有形式。
 
+`import type { T }` 和 `import { type T }` 在 [`verbatimModuleSyntax`](https://www.typescriptlang.org/tsconfig/verbatimModuleSyntax.html) 下具有不同的运行时行为。仅当同一模块同时存在值导入时，插件才会在两种写法之间转换。否则保留原写法，避免改变模块的加载行为。
+
 ### 合并与排序边界
 
 启用 `esmImportMerge` 后，来自同一模块的 `import` 会在安全的情况下合并。

package/dist/index.js

@@ -77,7 +77,7 @@ var options = {
     type: "choice",
     default: DEFAULT_SORT_OPTIONS.esmImportTypeStyle,
     category: "ES Module Imports",
-    description: "Format named type imports as separate declarations or inline specifiers.",
+    description: "Format named type imports as separate declarations or inline specifiers without changing runtime module requests.",
     choices: [
       {
         value: "separate",
@@ -119,6 +119,7 @@ var options = {
 
 // src/sort-package.ts
 import findMinimumSemanticVersion from "semver/ranges/min-version.js";
+import getValidSemanticVersionRange from "semver/ranges/valid.js";
 
 // src/parser-ast.ts
 function getAstNodeTextRange(node) {
@@ -911,11 +912,38 @@ function getDependencyName(dependencyIdentifier) {
   const versionSeparatorIndex = dependencyIdentifier.indexOf("@", dependencyIdentifier.startsWith("@") ? 1 : 0);
   return versionSeparatorIndex < 0 ? dependencyIdentifier : dependencyIdentifier.slice(0, versionSeparatorIndex);
 }
+function getPackageVersionSeparatorIndex(packageSelector) {
+  return packageSelector.indexOf("@", packageSelector.startsWith("@") ? 1 : 0);
+}
+function isCompletePackageSelector(packageSelector) {
+  const versionSeparatorIndex = getPackageVersionSeparatorIndex(packageSelector);
+  if (versionSeparatorIndex < 0) {
+    return packageSelector !== "";
+  }
+  const name = packageSelector.slice(0, versionSeparatorIndex);
+  const versionRange = packageSelector.slice(versionSeparatorIndex + 1);
+  return name !== "" && versionRange.trim() !== "" && !versionRange.trimEnd().endsWith("||") && getValidSemanticVersionRange(versionRange) !== null;
+}
+function findPnpmDependencySeparator(packageSelector) {
+  for (let separatorIndex = packageSelector.indexOf(">");separatorIndex >= 0; separatorIndex = packageSelector.indexOf(">", separatorIndex + 1)) {
+    const isSemverComparator = packageSelector[separatorIndex - 1]?.trim() === "";
+    if (isSemverComparator) {
+      continue;
+    }
+    const parentSelector = packageSelector.slice(0, separatorIndex);
+    const dependencySelector = packageSelector.slice(separatorIndex + 1);
+    if (dependencySelector.trim() !== "" && isCompletePackageSelector(parentSelector)) {
+      return separatorIndex;
+    }
+  }
+  return -1;
+}
 function parsePackageSelector(packageSelector) {
-  const [nameAndVersion = packageSelector] = packageSelector.split(">");
-  const versionSeparatorIndex = nameAndVersion.lastIndexOf("@");
-  if (versionSeparatorIndex <= 0) {
-    return { name: packageSelector, versionRange: null };
+  const dependencySeparatorIndex = findPnpmDependencySeparator(packageSelector);
+  const nameAndVersion = dependencySeparatorIndex < 0 ? packageSelector : packageSelector.slice(0, dependencySeparatorIndex);
+  const versionSeparatorIndex = getPackageVersionSeparatorIndex(nameAndVersion);
+  if (versionSeparatorIndex < 0) {
+    return { name: nameAndVersion, versionRange: null };
   }
   return {
     name: nameAndVersion.slice(0, versionSeparatorIndex),
@@ -1532,19 +1560,6 @@ function getLocalBindingNames(importDeclaration) {
   }
   return localBindingNames;
 }
-function normalizeNamedTypeOnlyImport(importDeclaration) {
-  if (!importDeclaration.isTypeOnly || !importDeclaration.namedSpecifiers || importDeclaration.defaultBinding || importDeclaration.namespaceBinding || importDeclaration.verbatimDeclaration !== null) {
-    return importDeclaration;
-  }
-  return {
-    ...importDeclaration,
-    isTypeOnly: false,
-    namedSpecifiers: importDeclaration.namedSpecifiers.map((importSpecifier) => ({
-      ...importSpecifier,
-      isTypeOnly: true
-    }))
-  };
-}
 function getImportRequestKey(importDeclaration) {
   return `${importDeclaration.moduleSpecifier}\x00${importDeclaration.importAttributes ?? ""}`;
 }
@@ -1564,9 +1579,10 @@ function isImportDeclarationMergeSafe(targetImportDeclaration, candidateImportDe
 }
 function mergeImportDeclarations(targetImportDeclaration, candidateImportDeclaration) {
   let namedSpecifiers = null;
+  const isTypeOnly = targetImportDeclaration.isTypeOnly && candidateImportDeclaration.isTypeOnly;
   const mergedNamedSpecifiers = [
-    ...targetImportDeclaration.namedSpecifiers ?? [],
-    ...candidateImportDeclaration.namedSpecifiers ?? []
+    ...getNamedSpecifiersForMerge(targetImportDeclaration, isTypeOnly),
+    ...getNamedSpecifiersForMerge(candidateImportDeclaration, isTypeOnly)
   ];
   if (mergedNamedSpecifiers.length > 0) {
     namedSpecifiers = mergedNamedSpecifiers;
@@ -1574,7 +1590,7 @@ function mergeImportDeclarations(targetImportDeclaration, candidateImportDeclara
   return {
     moduleSpecifier: targetImportDeclaration.moduleSpecifier,
     moduleSpecifierText: targetImportDeclaration.moduleSpecifierText,
-    isTypeOnly: false,
+    isTypeOnly,
     isSideEffectOnly: false,
     defaultBinding: targetImportDeclaration.defaultBinding ?? candidateImportDeclaration.defaultBinding,
     namespaceBinding: targetImportDeclaration.namespaceBinding ?? candidateImportDeclaration.namespaceBinding,
@@ -1586,6 +1602,12 @@ function mergeImportDeclarations(targetImportDeclaration, candidateImportDeclara
     isMergeBoundary: false
   };
 }
+function getNamedSpecifiersForMerge(importDeclaration, isMergedTypeOnly) {
+  return (importDeclaration.namedSpecifiers ?? []).map((importSpecifier) => ({
+    ...importSpecifier,
+    isTypeOnly: !isMergedTypeOnly && (importDeclaration.isTypeOnly || importSpecifier.isTypeOnly)
+  }));
+}
 function mergeCompatibleImports(importDeclarations) {
   const bindingCountsByImportDeclaration = new Map;
   const currentBindingCountsByRequest = new Map;
@@ -1613,10 +1635,9 @@ function mergeCompatibleImports(importDeclarations) {
     bindingCountsByImportDeclaration.set(importDeclaration, bindingCounts);
   }
   const mergedImportDeclarations = [];
-  for (const originalImportDeclaration of importDeclarations) {
-    const importDeclaration = normalizeNamedTypeOnlyImport(originalImportDeclaration);
+  for (const importDeclaration of importDeclarations) {
     const importRequestKey = getImportRequestKey(importDeclaration);
-    const bindingCounts = bindingCountsByImportDeclaration.get(originalImportDeclaration) ?? {
+    const bindingCounts = bindingCountsByImportDeclaration.get(importDeclaration) ?? {
       defaultBindingCount: 0,
       namespaceBindingCount: 0
     };
@@ -1638,18 +1659,19 @@ function applyTypeImportStyle(importDeclaration, typeImportStyle) {
     return [importDeclaration];
   }
   const namedSpecifiers = importDeclaration.namedSpecifiers;
+  if (importDeclaration.isTypeOnly) {
+    return [
+      {
+        ...importDeclaration,
+        namedSpecifiers: sortNamedImportSpecifiers(namedSpecifiers)
+      }
+    ];
+  }
   if (typeImportStyle === "separate") {
-    if (importDeclaration.isTypeOnly) {
-      return [
-        {
-          ...importDeclaration,
-          namedSpecifiers: sortNamedImportSpecifiers(namedSpecifiers)
-        }
-      ];
-    }
     const typeSpecifiers2 = namedSpecifiers.filter((importSpecifier) => importSpecifier.isTypeOnly);
     const valueSpecifiers2 = namedSpecifiers.filter((importSpecifier) => !importSpecifier.isTypeOnly);
-    if (typeSpecifiers2.length > 0 && (importDeclaration.importAttributes !== null || importDeclaration.leadingCommentsText.trim() !== "" || importDeclaration.trailingCommentsText !== "")) {
+    const hasValueBinding = valueSpecifiers2.length > 0 || importDeclaration.defaultBinding !== null || importDeclaration.namespaceBinding !== null;
+    if (typeSpecifiers2.length > 0 && (!hasValueBinding || importDeclaration.importAttributes !== null || importDeclaration.leadingCommentsText.trim() !== "" || importDeclaration.trailingCommentsText !== "")) {
       return [
         {
           ...importDeclaration,
@@ -1687,32 +1709,21 @@ function applyTypeImportStyle(importDeclaration, typeImportStyle) {
     }
     return styledImportDeclarations;
   }
-  let inlineImportDeclaration = { ...importDeclaration, namedSpecifiers };
-  if (importDeclaration.isTypeOnly) {
-    inlineImportDeclaration = {
-      ...importDeclaration,
-      isTypeOnly: false,
-      namedSpecifiers: namedSpecifiers.map((importSpecifier) => ({
-        ...importSpecifier,
-        isTypeOnly: true
-      }))
-    };
-  }
   if (typeImportStyle === "mixed") {
     return [
       {
-        ...inlineImportDeclaration,
-        namedSpecifiers: sortNamedImportSpecifiers(inlineImportDeclaration.namedSpecifiers)
+        ...importDeclaration,
+        namedSpecifiers: sortNamedImportSpecifiers(namedSpecifiers)
       }
     ];
   }
-  const typeSpecifiers = sortNamedImportSpecifiers(inlineImportDeclaration.namedSpecifiers.filter((importSpecifier) => importSpecifier.isTypeOnly));
-  const valueSpecifiers = sortNamedImportSpecifiers(inlineImportDeclaration.namedSpecifiers.filter((importSpecifier) => !importSpecifier.isTypeOnly));
+  const typeSpecifiers = sortNamedImportSpecifiers(namedSpecifiers.filter((importSpecifier) => importSpecifier.isTypeOnly));
+  const valueSpecifiers = sortNamedImportSpecifiers(namedSpecifiers.filter((importSpecifier) => !importSpecifier.isTypeOnly));
   let orderedSpecifiers = [...valueSpecifiers, ...typeSpecifiers];
   if (typeImportStyle === "inline-first") {
     orderedSpecifiers = [...typeSpecifiers, ...valueSpecifiers];
   }
-  return [{ ...inlineImportDeclaration, namedSpecifiers: orderedSpecifiers }];
+  return [{ ...importDeclaration, namedSpecifiers: orderedSpecifiers }];
 }
 function getImportBindingShapeRank(importDeclaration) {
   if (importDeclaration.defaultBinding !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sort",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Prettier plugin for sorting ES module imports, export specifiers, and package.json keys.",
   "keywords": [
     "imports",
@@ -29,18 +29,17 @@
       "default": "./dist/index.js"
     }
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "bun run scripts/build.ts",
-    "format": "prettier **/*.{json,ts,md} --write --experimental-cli",
-    "lint": "eslint src/ --cache",
-    "lint:fix": "eslint src/ --fix --cache",
+    "format": "prettier \"**/*.{json,md,ts,yaml,yml}\" --write --experimental-cli",
+    "format:check": "prettier \"**/*.{json,md,ts,yaml,yml}\" --check --experimental-cli",
+    "lint": "eslint --cache",
+    "lint:fix": "eslint --fix --cache",
     "prepare": "husky",
-    "test": "bun test tests/",
+    "test": "bun test",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {