Merge pull request #55 from kreuzerk/feature/handleCRLFLineEnding

fix: 🐛 handle multiple line endings

Author: nivekcode

src/conductor/format-import-statements.ts

@@ -5,14 +5,17 @@ type CategoryEntry = [string, Map<string, string>];
 
 const categoriesOrder = ['thirdParty', 'userLibrary', 'differentModule', 'sameModule'];
 
-export function formatImportStatements(importCategories: ImportCategories) {
+export function formatImportStatements(importCategories: ImportCategories, lineEnding: string) {
   const { separator } = getConfig();
-  const [first, ...otherCategories] = Object.entries(importCategories).filter(hasImports).sort(byCategoriesOrder).map(toImportBlock);
+  const [first, ...otherCategories] = Object.entries(importCategories)
+    .filter(hasImports)
+    .sort(byCategoriesOrder)
+    .map((imports) => toImportBlock(imports, lineEnding));
 
   let result = first || '';
 
   for (const imports of otherCategories) {
-    result += `${separator}\n${imports}`;
+    result += `${separator}${lineEnding}${imports}`;
   }
 
   return result;
@@ -26,8 +29,8 @@ function hasImports([, imports]: CategoryEntry) {
   return imports.size > 0;
 }
 
-function toImportBlock([, imports]: CategoryEntry) {
-  return [...imports.values()].map((l) => trim(l, ' \n')).join('\n');
+function toImportBlock([, imports]: CategoryEntry, lineEnding: string) {
+  return [...imports.values()].map((l) => trim(l, ` ${lineEnding}`)).join(lineEnding);
 }
 
 function escapeRegex(string: string) {

src/conductor/optimize-imports.ts

@@ -3,11 +3,12 @@ import simpleGit, { SimpleGit } from 'simple-git';
 import ts from 'typescript';
 
 import { getConfig } from '../config';
+import { detectLineEnding } from '../helpers/line-ending-detector';
 import { log } from '../helpers/log';
 
-import { collectNonImportNodes } from './collect-non-import-nodes';
 import { categorizeImportLiterals } from './categorize-imports';
 import { collectImportNodes } from './collect-import-nodes';
+import { collectNonImportNodes } from './collect-non-import-nodes';
 import { formatImportStatements } from './format-import-statements';
 import { getImportStatementMap } from './get-import-statement-map';
 import { sortImportCategories } from './sort-import-categories';
@@ -37,6 +38,7 @@ export async function optimizeImports(filePath: string): Promise<string> {
   }
 
   let fileContent = readFileSync(filePath).toString();
+  const lineEnding = detectLineEnding(fileContent);
   const { staged, autoAdd, dryRun } = getConfig();
   if (/\/[/*]\s*import-conductor-skip/.test(fileContent)) {
     log('gray', filePath, 'skipped (via comment)');
@@ -58,7 +60,7 @@ export async function optimizeImports(filePath: string): Promise<string> {
 
   const categorizedImports = categorizeImportLiterals(importStatementMap);
   const sortedAndCategorizedImports = sortImportCategories(categorizedImports);
-  let updatedContent = formatImportStatements(sortedAndCategorizedImports);
+  let updatedContent = formatImportStatements(sortedAndCategorizedImports, lineEnding);
 
   const lastImport = importNodes.pop();
   const contentWithoutImportStatements = fileContent.slice(lastImport.end);

src/helpers/line-ending-detector.ts

@@ -0,0 +1,15 @@
+export const detectLineEnding = (value: string) => {
+  if (typeof value !== 'string') {
+    throw new TypeError('Expected a string for new line detection');
+  }
+  const newlines = value.match(/(?:\r?\n)/g) || [];
+
+  if (newlines.length === 0) {
+    return;
+  }
+
+  const crlf = newlines.filter((newline) => newline === '\r\n').length;
+  const lf = newlines.length - crlf;
+  console.log(crlf > lf ? 'returning r and n' : 'returning r');
+  return crlf > lf ? '\r\n' : '\n';
+};