Remove importOrderMergeDuplicateImports option (always on)

README.md

@@ -13,7 +13,7 @@ Since then more critical features & fixes have been added, and the options have
 **Features not currently supported by upstream:**
 
 -   Do not re-order across side-effect imports
--   Combine imports from the same source ([`importOrderMergeDuplicateImports`](#importordermergeduplicateimports))
+-   Combine imports from the same source
 -   Combine type and value imports ([`importOrderCombineTypeAndValueImports`](#importordercombinetypeandvalueimports))
 -   Type import grouping with `<TYPES>` keyword
 -   Sorts node.js builtin modules to top
@@ -31,7 +31,6 @@ Since then more critical features & fixes have been added, and the options have
   - [How does import sort work?](#how-does-import-sort-work)
   - [Options](#options)
     - [`importOrder`](#importorder)
-    - [`importOrderMergeDuplicateImports`](#importordermergeduplicateimports)
     - [`importOrderCombineTypeAndValueImports`](#importordercombinetypeandvalueimports)
     - [`importOrderParserPlugins`](#importorderparserplugins)
   - [Prevent imports from being sorted](#prevent-imports-from-being-sorted)
@@ -130,7 +129,6 @@ module.exports = {
     semi: true,
     importOrder: ['^@core/(.*)$', '', '^@server/(.*)$', '', '^@ui/(.*)$', '', '^[./]'],
     importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
-    importOrderMergeDuplicateImports: true,
     importOrderCombineTypeAndValueImports: true,
 };
 ```
@@ -219,14 +217,6 @@ _Note:_ If you want to separate some groups from others, you can add an empty st
 ],
 ```
 
-#### `importOrderMergeDuplicateImports`
-
-**type**: `boolean`
-
-**default value:** `false`
-
-When `true`, multiple import statements from the same module will be combined into a single import.
-
 #### `importOrderCombineTypeAndValueImports`
 
 **type**: `boolean`

src/index.ts

@@ -37,12 +37,6 @@ export const options: Record<
         default: [{ value: ['typescript', 'jsx'] }],
         description: 'Provide a list of plugins for special syntax',
     },
-    importOrderMergeDuplicateImports: {
-        type: 'boolean',
-        category: 'Global',
-        default: false,
-        description: 'Should duplicate imports be merged?',
-    },
     importOrderCombineTypeAndValueImports: {
         type: 'boolean',
         category: 'Global',

src/preprocessors/preprocessor.ts

@@ -9,23 +9,10 @@ import { getExperimentalParserPlugins } from '../utils/get-experimental-parser-p
 import { getSortedNodes } from '../utils/get-sorted-nodes';
 
 export function preprocessor(code: string, options: PrettierOptions): string {
-    const {
-        importOrderParserPlugins,
-        importOrder,
-        importOrderMergeDuplicateImports,
-    } = options;
+    const { importOrderParserPlugins, importOrder } = options;
 
     let { importOrderCombineTypeAndValueImports } = options;
 
-    if (
-        importOrderCombineTypeAndValueImports &&
-        !importOrderMergeDuplicateImports
-    ) {
-        console.warn(
-            '[@ianvs/prettier-plugin-sort-imports]: The option importOrderCombineTypeAndValueImports will have no effect since importOrderMergeDuplicateImports is not also enabled.',
-        );
-    }
-
     if (
         importOrderCombineTypeAndValueImports &&
         importOrder.some((group) => group.includes(TYPES_SPECIAL_WORD))
@@ -65,7 +52,6 @@ export function preprocessor(code: string, options: PrettierOptions): string {
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         importOrder,
-        importOrderMergeDuplicateImports,
         importOrderCombineTypeAndValueImports,
     });
 

src/types.ts

@@ -34,9 +34,7 @@ export type GetSortedNodes = (
     nodes: ImportDeclaration[],
     options: Pick<
         PrettierOptions,
-        | 'importOrder'
-        | 'importOrderMergeDuplicateImports'
-        | 'importOrderCombineTypeAndValueImports'
+        'importOrder' | 'importOrderCombineTypeAndValueImports'
     >,
 ) => ImportOrLine[];
 

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

@@ -11,7 +11,6 @@ const getSortedImportNodes = (code: string, options?: ParserOptions) => {
 
     return getSortedNodes(importNodes, {
         importOrder: [],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     });
 };

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

@@ -18,7 +18,6 @@ import a from 'a';
     const importNodes = getImportNodes(code);
     const sortedNodes = getSortedNodes(importNodes, {
         importOrder: [],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     });
     const formatted = getCodeFromAst({
@@ -55,7 +54,6 @@ import type {See} from 'c';
     const importNodes = getImportNodes(code, { plugins: ['typescript'] });
     const sortedNodes = getSortedNodes(importNodes, {
         importOrder: [],
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: false,
     });
     const formatted = getCodeFromAst({

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

@@ -29,7 +29,6 @@ test('it returns all sorted nodes', () => {
     const result = getImportNodes(code);
     const sorted = getSortedNodesByImportOrder(result, {
         importOrder: ['^[./]'],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
 
@@ -79,7 +78,6 @@ test('it returns all sorted nodes with sort order', () => {
     const result = getImportNodes(code);
     const sorted = getSortedNodesByImportOrder(result, {
         importOrder: ['^a$', '^t$', '^k$', '^B', '^[./]'],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
     expect(getSortedNodesNamesAndNewlines(sorted)).toEqual([
@@ -136,7 +134,6 @@ import {type B, A} from 'z';
     });
     const sorted = getSortedNodesByImportOrder(result, {
         importOrder: ['^[./]'],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
     expect(getSortedNodesNamesAndNewlines(sorted)).toEqual(['k', 't', 'z']);
@@ -157,7 +154,6 @@ test('it returns all sorted nodes with builtin specifiers at the top', () => {
     const result = getImportNodes(code);
     const sorted = getSortedNodesByImportOrder(result, {
         importOrder: ['^[./]'],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
 
@@ -184,7 +180,6 @@ test('it returns all sorted nodes with custom third party modules and builtins a
     const result = getImportNodes(code);
     const sorted = getSortedNodesByImportOrder(result, {
         importOrder: ['^a$', '<THIRD_PARTY_MODULES>', '^t$', '^k$', '^[./]'],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
     expect(getSortedNodesNamesAndNewlines(sorted)).toEqual([
@@ -217,7 +212,6 @@ test('it returns all sorted nodes with custom separation', () => {
             '^k$',
             '^[./]',
         ],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
     expect(getSortedNodesNamesAndNewlines(sorted)).toEqual([
@@ -253,7 +247,6 @@ test('it does not add multiple custom import separators', () => {
             '^k$',
             '^[./]',
         ],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
     expect(getSortedNodesNamesAndNewlines(sorted)).toEqual([

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

@@ -30,7 +30,6 @@ test('it returns all sorted nodes, preserving the order side effect nodes', () =
     const result = getImportNodes(code);
     const sorted = getSortedNodes(result, {
         importOrder: [],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     }) as ImportDeclaration[];
     expect(getSortedNodesNamesAndNewlines(sorted)).toEqual([

src/utils/__tests__/merge-nodes-with-matching-flavors.spec.ts

@@ -7,7 +7,6 @@ import { getSortedNodes } from '../get-sorted-nodes';
 
 const defaultOptions = {
     importOrder: [''], // Separate side-effect and ignored chunks, for easier test readability
-    importOrderMergeDuplicateImports: false,
     importOrderCombineTypeAndValueImports: false,
 };
 
@@ -46,7 +45,6 @@ test('should merge duplicate imports within a given chunk', () => {
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: false,
     });
     const formatted = getCodeFromAst({
@@ -106,7 +104,6 @@ test('should merge type imports into regular imports', () => {
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -139,7 +136,6 @@ import defaultValue from './source';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -165,7 +161,6 @@ import * as Namespace from './source';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -192,7 +187,6 @@ import {value as alias} from './source';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -218,7 +212,6 @@ import {value, SecondValue} from './source';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -246,7 +239,6 @@ import {otherValue} from './other';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -275,7 +267,6 @@ import {SecondValue} from './source';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -303,7 +294,6 @@ import {value} from './source';
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({
@@ -320,83 +310,6 @@ import { thirdValue } from "./third";
 `);
 });
 
-test("doesn't merge duplicate imports if option disabled", () => {
-    const code = `
-    import type { A } from 'a';
-    import { Junk } from 'junk-group-1'
-    import type { B } from 'a';
-    import "./side-effects1";
-    // C, E and D will be separated from A, B because side-effects in-between
-    import type { C } from 'a';
-    import { D } from "a";
-    import type { E } from "a";
-    // prettier-ignore
-    import type { NoMerge1 } from "a";
-    // prettier-ignore
-    import { NoMerge2 } from "a";
-    import { H } from 'b';
-    import { F } from 'a';
-    // F Will be alone because prettier-ignore in-between
-
-    import { G } from 'b';
-    import * as J from 'c';
-    import { Junk2 } from 'junk-group-2'
-    import * as K from "c";
-    // * as J, * as K can't merge because both Namespaces
-    import {I} from "c"
-    import { default as Def2 } from 'd';
-    import { default as Def1 } from 'd';
-    import Foo1 from 'e';
-    import Foo2 from 'e';
-`;
-    const allOriginalImportNodes = getImportNodes(code, {
-        plugins: ['typescript'],
-    });
-
-    const nodesToOutput = getSortedNodes(
-        allOriginalImportNodes,
-        defaultOptions,
-    );
-    const formatted = getCodeFromAst({
-        nodesToOutput,
-        allOriginalImportNodes,
-        originalCode: code,
-        directives: [],
-    });
-
-    expect(format(formatted, { parser: 'babel' }))
-        .toEqual(`import type { A } from "a";
-import type { B } from "a";
-import { Junk } from "junk-group-1";
-
-import "./side-effects1";
-
-// C, E and D will be separated from A, B because side-effects in-between
-import type { C } from "a";
-import { D } from "a";
-import type { E } from "a";
-
-// prettier-ignore
-import type { NoMerge1 } from "a";
-// prettier-ignore
-import { NoMerge2 } from "a";
-
-import { F } from "a";
-import { H } from "b";
-// F Will be alone because prettier-ignore in-between
-import { G } from "b";
-import * as J from "c";
-import * as K from "c";
-// * as J, * as K can't merge because both Namespaces
-import { I } from "c";
-import { default as Def2 } from "d";
-import { default as Def1 } from "d";
-import Foo1 from "e";
-import Foo2 from "e";
-import { Junk2 } from "junk-group-2";
-`);
-});
-
 test('should not combine default type imports', () => {
     const code = `
     import { ComponentProps, useEffect } from "react";
@@ -408,7 +321,6 @@ test('should not combine default type imports', () => {
 
     const nodesToOutput = getSortedNodes(allOriginalImportNodes, {
         ...defaultOptions,
-        importOrderMergeDuplicateImports: true,
         importOrderCombineTypeAndValueImports: true,
     });
     const formatted = getCodeFromAst({

src/utils/__tests__/remove-nodes-from-original-code.spec.ts

@@ -24,7 +24,6 @@ test('it should remove nodes from the original code', () => {
     const importNodes = getImportNodes(code);
     const sortedNodes = getSortedNodes(importNodes, {
         importOrder: [],
-        importOrderMergeDuplicateImports: false,
         importOrderCombineTypeAndValueImports: false,
     });
     const allCommentsFromImports = getAllCommentsFromNodes(sortedNodes);

src/utils/get-sorted-nodes.ts

@@ -29,11 +29,7 @@ import { mergeNodesWithMatchingImportFlavors } from './merge-nodes-with-matching
  * @returns A sorted array of the remaining import nodes
  */
 export const getSortedNodes: GetSortedNodes = (nodes, options) => {
-    const {
-        importOrder,
-        importOrderMergeDuplicateImports,
-        importOrderCombineTypeAndValueImports,
-    } = options;
+    const { importOrder, importOrderCombineTypeAndValueImports } = options;
 
     // Split nodes at each boundary between a side-effect node and a
     // non-side-effect node, keeping both types of nodes together.
@@ -68,11 +64,9 @@ export const getSortedNodes: GetSortedNodes = (nodes, options) => {
                 finalNodes.push(...chunk.nodes);
             }
         } else {
-            let nodes = importOrderMergeDuplicateImports
-                ? mergeNodesWithMatchingImportFlavors(chunk.nodes, {
-                      importOrderCombineTypeAndValueImports,
-                  })
-                : chunk.nodes;
+            let nodes = mergeNodesWithMatchingImportFlavors(chunk.nodes, {
+                importOrderCombineTypeAndValueImports,
+            });
             // If type ordering is specified explicitly, we need to break apart type and value specifiers
             if (
                 importOrder.some((group) => group.includes(TYPES_SPECIAL_WORD))

tests/Flow/ppsi.spec.ts

@@ -3,6 +3,5 @@ import {run_spec} from '../../test-setup/run_spec';
 run_spec(__dirname, ['flow'], {
     importOrder: ['^@core/(.*)$', '^@server/(.*)', '^@ui/(.*)$', '^[./]'],
     importOrderParserPlugins: ['flow'],
-    importOrderMergeDuplicateImports: true,
     importOrderCombineTypeAndValueImports: true,
 });