Add importOrderCaseSensitive to ExtendedOptions so it passes through

IanVS · Sep 28, 2024 · f070d8a · f070d8a
1 parent d7cc4cf
commit f070d8a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -26,7 +26,7 @@ export interface PrettierOptions
 /** Subset of options that need to be normalized, or affect normalization */
 export type NormalizableOptions = Pick<
     PrettierOptions,
-    'importOrder' | 'importOrderParserPlugins' | 'importOrderTypeScriptVersion'
+    'importOrder' | 'importOrderParserPlugins' | 'importOrderTypeScriptVersion' | 'importOrderCaseSensitive'
 > &
     // filepath can be undefined when running prettier via the api on text input
     Pick<Partial<PrettierOptions>, 'filepath'>;
@@ -63,6 +63,7 @@ export type ImportRelated = ImportOrLine | SomeSpecifier;
 export interface ExtendedOptions {
     importOrder: PrettierOptions['importOrder'];
     importOrderCombineTypeAndValueImports: boolean;
+    importOrderCaseSensitive: boolean;
     hasAnyCustomGroupSeparatorsInImportOrder: boolean;
     provideGapAfterTopOfFileComments: boolean;
     plugins: ParserPlugin[];

diff --git a/src/utils/__tests__/merge-nodes-with-matching-flavors.spec.ts b/src/utils/__tests__/merge-nodes-with-matching-flavors.spec.ts
@@ -13,6 +13,7 @@ const defaultOptions = examineAndNormalizePluginOptions({
     // First separator for top-of-file comments, second to separate side-effect and ignored chunks, for easier test readability
     importOrder: testingOnly.normalizeImportOrderOption(['', '']),
     importOrderTypeScriptVersion: '5.0.0',
+    importOrderCaseSensitive: false,
     importOrderParserPlugins: [],
     filepath: __filename,
 });

diff --git a/src/utils/__tests__/normalize-plugin-options.spec.ts b/src/utils/__tests__/normalize-plugin-options.spec.ts
@@ -96,6 +96,7 @@ describe('examineAndNormalizePluginOptions', () => {
             examineAndNormalizePluginOptions({
                 importOrder: DEFAULT_IMPORT_ORDER,
                 importOrderParserPlugins: [],
+                importOrderCaseSensitive: false,
                 importOrderTypeScriptVersion: '1.0.0',
                 filepath: __filename,
             } as NormalizableOptions),
@@ -107,6 +108,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 '^[.]',
             ],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: [],
             provideGapAfterTopOfFileComments: false,
         });
@@ -121,6 +123,7 @@ describe('examineAndNormalizePluginOptions', () => {
                     '^[./]',
                 ],
                 importOrderParserPlugins: [],
+                importOrderCaseSensitive: false,
                 importOrderTypeScriptVersion: '1.0.0',
                 filepath: __filename,
             } as NormalizableOptions),
@@ -133,6 +136,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 '^[./]',
             ],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: [],
             provideGapAfterTopOfFileComments: false,
         });
@@ -142,6 +146,7 @@ describe('examineAndNormalizePluginOptions', () => {
             examineAndNormalizePluginOptions({
                 importOrder: [''],
                 importOrderParserPlugins: [],
+                importOrderCaseSensitive: false,
                 importOrderTypeScriptVersion: '1.0.0',
                 filepath: __filename,
             } as NormalizableOptions),
@@ -153,6 +158,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 THIRD_PARTY_MODULES_SPECIAL_WORD,
             ],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: [],
             provideGapAfterTopOfFileComments: true,
         });
@@ -173,6 +179,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 '^[.]',
             ],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: ['typescript'],
             provideGapAfterTopOfFileComments: false,
         });
@@ -184,6 +191,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 importOrder: DEFAULT_IMPORT_ORDER,
                 importOrderParserPlugins: ['typescript', 'jsx'],
                 importOrderTypeScriptVersion: '5.0.0',
+                importOrderCaseSensitive: false,
                 filepath: __filename,
             } as NormalizableOptions),
         ).toEqual({
@@ -194,6 +202,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 '^[.]',
             ],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: ['typescript'],
             provideGapAfterTopOfFileComments: false,
         });
@@ -203,6 +212,7 @@ describe('examineAndNormalizePluginOptions', () => {
             examineAndNormalizePluginOptions({
                 importOrder: DEFAULT_IMPORT_ORDER,
                 importOrderParserPlugins: [],
+                importOrderCaseSensitive: false,
                 importOrderTypeScriptVersion: '1.0.0',
                 filepath: undefined,
             } as NormalizableOptions),
@@ -214,6 +224,7 @@ describe('examineAndNormalizePluginOptions', () => {
                 '^[.]',
             ],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: [],
             provideGapAfterTopOfFileComments: false,
         });
@@ -224,13 +235,15 @@ describe('examineAndNormalizePluginOptions', () => {
             examineAndNormalizePluginOptions({
                 importOrder: [],
                 importOrderParserPlugins: [],
+                importOrderCaseSensitive: false,
                 importOrderTypeScriptVersion: '1.0.0',
                 filepath: __filename,
             } as NormalizableOptions),
         ).toEqual({
             hasAnyCustomGroupSeparatorsInImportOrder: false,
             importOrder: [],
             importOrderCombineTypeAndValueImports: true,
+            importOrderCaseSensitive: false,
             plugins: [],
             provideGapAfterTopOfFileComments: false,
         });

diff --git a/src/utils/normalize-plugin-options.ts b/src/utils/normalize-plugin-options.ts
@@ -107,6 +107,7 @@ export function examineAndNormalizePluginOptions(
     return {
         importOrder,
         importOrderCombineTypeAndValueImports,
+        importOrderCaseSensitive: !!options.importOrderCaseSensitive,
         hasAnyCustomGroupSeparatorsInImportOrder: importOrder.some(
             isCustomGroupSeparator,
         ),

diff --git a/tests/ImportOrderCaseSensitive/__snapshots__/ppsi.spec.ts.snap b/tests/ImportOrderCaseSensitive/__snapshots__/ppsi.spec.ts.snap
@@ -10,11 +10,11 @@ import {cat, Dog} from "C";
 import B from "B";
 import A from "A";
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-import a from "a";
 import A from "A";
-import b from "b";
 import B from "B";
+import { Dog, cat } from "C";
+import a from "a";
+import b from "b";
 import c from "c";
-import { cat, Dog } from "C";
 
 `;