feat: ordering by configuration

nivekcode · Jun 30, 2022 · c39c7e8 · c39c7e8
1 parent cd79f13
commit c39c7e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/cliOptions.ts b/src/cliOptions.ts
@@ -25,6 +25,13 @@ export const optionDefinitions = [
     multiple: true,
     description: 'The prefix of custom user libraries',
   },
+  {
+    name: 'groupOrder',
+    alias: 'g',
+    type: String,
+    multiple: true,
+    description: 'The group order should be organized',
+  },
   {
     name: 'staged',
     type: Boolean,

diff --git a/src/conductor/format-import-statements.ts b/src/conductor/format-import-statements.ts
@@ -3,13 +3,11 @@ import { ImportCategories } from '../types';
 
 type CategoryEntry = [string, Map<string, string>];
 
-const categoriesOrder = ['thirdParty', 'userLibrary', 'differentModule', 'sameModule']; // <<<<
-
 export function formatImportStatements(importCategories: ImportCategories, lineEnding: string) {
   const { separator } = getConfig();
   const [first, ...otherCategories] = Object.entries(importCategories)
     .filter(hasImports)
-    .sort(byCategoriesOrder)
+    .sort(byCategoriesOrder(getConfig().groupOrder))
     .map((imports) => toImportBlock(imports, lineEnding));
 
   let result = first || '';
@@ -21,8 +19,8 @@ export function formatImportStatements(importCategories: ImportCategories, lineE
   return result;
 }
 
-function byCategoriesOrder([a]: CategoryEntry, [b]: CategoryEntry): number {
-  return categoriesOrder.indexOf(a) - categoriesOrder.indexOf(b);
+function byCategoriesOrder(categoriesOrder: string[]) {
+  return ([a]: CategoryEntry, [b]: CategoryEntry): number => categoriesOrder.indexOf(a) - categoriesOrder.indexOf(b);
 }
 
 function hasImports([, imports]: CategoryEntry) {