Feature: importOrderCombineTypeAndValueImports

README.md

@@ -100,6 +100,7 @@ module.exports = {
   "importOrderCaseInsensitive": true,
   "importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy"],
   "importOrderMergeDuplicateImports": true,
+  "importOrderMergeTypeImportsIntoRegular": true,
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,
 }
@@ -218,6 +219,28 @@ import ExampleView from './ExampleView';
 
 When `true`, multiple import statements from the same module will be combined into a single import.
 
+#### `importOrderMergeTypeImportsIntoRegular`
+
+**type**: `boolean`
+
+**default value:** `false`
+
+A boolean value to control merging `import type` expressions into `import {…}`.
+
+```diff
+- import type { C1 } from 'c';
+- import { C2 } from 'c';
++ import { type C1, C2 } from "c";
+
+- import { D1 } from 'd';
+- import type { D2 } from 'd';
++ import { D1, type D2 } from "d";
+
+- import type { A1 } from 'a';
+- import type { A2 } from 'a';
++ import type { A1, A2 } from "a";
+```
+
 #### `importOrderParserPlugins`
 
 **type**: `Array<string>`

src/index.ts

@@ -72,6 +72,13 @@ const options: Record<
         default: false,
         description: 'Should duplicate imports be merged?',
     },
+    importOrderMergeTypeImportsIntoRegular: {
+        type: 'boolean',
+        category: 'Global',
+        default: false,
+        description:
+            'Should import-type expressions be merged into import-value expressions?',
+    },
 };
 
 module.exports = {

src/preprocessor.ts

@@ -15,10 +15,20 @@ export function preprocessor(code: string, options: PrettierOptions): string {
         importOrderCaseInsensitive,
         importOrderGroupNamespaceSpecifiers,
         importOrderMergeDuplicateImports,
+        importOrderMergeTypeImportsIntoRegular,
         importOrderSeparation,
         importOrderSortSpecifiers,
     } = options;
 
+    if (
+        importOrderMergeTypeImportsIntoRegular &&
+        !importOrderMergeDuplicateImports
+    ) {
+        console.warn(
+            "[@ianvs/prettier-plugin-sort-imports]: Option combination of both importOrderMergeTypeImportsIntoRegular: true and importOrderMergeDuplicateImports: false is not won't do anything!",
+        );
+    }
+
     const allOriginalImportNodes: ImportDeclaration[] = [];
     const parserOptions: ParserOptions = {
         sourceType: 'module',
@@ -52,6 +62,7 @@ export function preprocessor(code: string, options: PrettierOptions): string {
         importOrderCaseInsensitive,
         importOrderGroupNamespaceSpecifiers,
         importOrderMergeDuplicateImports,
+        importOrderMergeTypeImportsIntoRegular,
         importOrderSeparation,
         importOrderSortSpecifiers,
     });

src/types.ts

@@ -16,6 +16,7 @@ export interface PrettierOptions extends RequiredOptions {
     importOrderBuiltinModulesToTop: boolean;
     importOrderGroupNamespaceSpecifiers: boolean;
     importOrderMergeDuplicateImports: boolean;
+    importOrderMergeTypeImportsIntoRegular: boolean;
     importOrderSeparation: boolean;
     importOrderSortSpecifiers: boolean;
     // should be of type ParserPlugin from '@babel/parser' but prettier does not support nested arrays in options
@@ -46,6 +47,7 @@ export type GetSortedNodes = (
         | 'importOrderCaseInsensitive'
         | 'importOrderGroupNamespaceSpecifiers'
         | 'importOrderMergeDuplicateImports'
+        | 'importOrderMergeTypeImportsIntoRegular'
         | 'importOrderSeparation'
         | 'importOrderSortSpecifiers'
     >,
@@ -57,4 +59,5 @@ export type GetImportFlavorOfNode = (node: ImportDeclaration) => FlavorType;
 
 export type MergeNodesWithMatchingImportFlavors = (
     nodes: ImportDeclaration[],
+    options: { importOrderMergeTypeImportsIntoRegular: boolean },
 ) => ImportDeclaration[];

src/utils/__tests__/get-all-comments-from-nodes.spec.ts

@@ -14,6 +14,7 @@ const getSortedImportNodes = (code: string, options?: ParserOptions) => {
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     });

src/utils/__tests__/get-code-from-ast.spec.ts

@@ -21,6 +21,7 @@ import a from 'a';
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     });
@@ -47,14 +48,13 @@ it('merges duplicate imports correctly', () => {
 // second comment
 import z from 'z';
 import c from 'c';
-import type {C} from 'c';
-import type {See} from 'c';
 import g from 'g';
 import t from 't';
 import k from 'k';
 import a from 'a';
-import {b} from 'a';
-import {type Bee} from 'a';
+import {b, type Bee} from 'a';
+import type {C} from 'c';
+import type {See} from 'c';
 `;
     const importNodes = getImportNodes(code, { plugins: ['typescript'] });
     const sortedNodes = getSortedNodes(importNodes, {
@@ -63,6 +63,7 @@ import {type Bee} from 'a';
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: true,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     });

src/utils/__tests__/get-sorted-nodes-by-import-order.spec.ts

@@ -32,6 +32,7 @@ test('it returns all sorted nodes', () => {
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -86,6 +87,7 @@ test('it returns all sorted nodes case-insensitive', () => {
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -140,6 +142,7 @@ test('it returns all sorted nodes with sort order', () => {
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -194,6 +197,7 @@ test('it returns all sorted nodes with sort order case-insensitive', () => {
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -247,6 +251,7 @@ test('it returns all sorted import nodes with sorted import specifiers', () => {
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: true,
     }) as ImportDeclaration[];
@@ -300,6 +305,7 @@ test('it returns all sorted import nodes with sorted import specifiers with case
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: true,
     }) as ImportDeclaration[];
@@ -353,6 +359,7 @@ test('it returns all sorted nodes with custom third party modules', () => {
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -383,6 +390,7 @@ test('it returns all sorted nodes with namespace specifiers at the top', () => {
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: true,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -414,6 +422,7 @@ test('it returns all sorted nodes with builtin specifiers at the top, ', () => {
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -445,6 +454,7 @@ test('it returns all sorted nodes with custom third party modules and builtins a
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -475,6 +485,7 @@ test('it adds newlines when importOrderSeparation is true', () => {
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: true,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -515,6 +526,7 @@ test('it returns all sorted nodes with custom separation', () => {
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -553,6 +565,7 @@ test('it allows both importOrderSeparation and custom separation (but why?)', ()
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: true,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];
@@ -597,6 +610,7 @@ test('it does not add multiple custom import separators', () => {
         importOrderCaseInsensitive: true,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];

src/utils/__tests__/get-sorted-nodes.spec.ts

@@ -33,6 +33,7 @@ test('it returns all sorted nodes, preserving the order side effect nodes', () =
         importOrderCaseInsensitive: false,
         importOrderGroupNamespaceSpecifiers: false,
         importOrderMergeDuplicateImports: false,
+        importOrderMergeTypeImportsIntoRegular: false,
         importOrderSeparation: false,
         importOrderSortSpecifiers: false,
     }) as ImportDeclaration[];